Commit graph

3918 commits

Author SHA1 Message Date
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
worldofpeace
5f07745f09
light-locker: wrapGAppsHook to nativeBuildInputs 2019-09-02 00:08:17 -04:00
Frederik Rietdijk
98ef78326d Merge staging-next into staging 2019-08-31 18:07:33 +02:00
Niklas Hambüchen
9e78f76ade treewide: Remove unnecessary --disable-static (#66759)
* freetype: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes freetype not being overridable to have static libs.

* treewide: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes these packages not being overridable to have static libs.
2019-08-31 08:10:53 -04:00
Samuel Leathers
4b515cf6ef
Merge remote-tracking branch 'upstream/master' into staging-next
* upstream/master:
  vimPlugins: update (#67823)
  mattermost-desktop: 4.2.0 -> 4.2.3 (#67717)
  lightspark: init at 0.8.1 (#67425)
  anki: 2.1.11 -> 2.1.14 (#67738)
  nixos/{namecoind,bitcoind}: removing the altcoin prefix
  rust-cbindgen: 0.8.7 -> 0.9.0
2019-08-31 06:53:44 -04:00
Timo Kaufmann
b4e1c45e4c
vimPlugins: update (#67823) 2019-08-31 12:16:02 +02:00
John Chadwick
e3aaada61d lightspark: init at 0.8.1 (#67425) 2019-08-31 06:00:20 -04:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Aaron Andersen
765596278b
Merge pull request #67380 from doronbehar/package-uq
uq: init at 2018-05-27
2019-08-30 15:49:04 -04:00
Doron Behar
c11fd45c24 uq: init at 2018-05-27 2019-08-30 19:54:02 +03:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
worldofpeace
fa29f98bb5
Merge pull request #67368 from tadeokondrak/wine-4.0.2
wine{,-mono,-unstable,-staging}: update
2019-08-27 15:05:07 -04:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Edmund Wu
4b60e0d6bc
vscode-extensions.ms-vscode.cpptools: 0.24.1 -> 0.25.0 2019-08-26 18:49:15 -04:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
José Romildo Malaquias
86e1452556 theme-obsidian2: 2.8 -> 2.9 (#67501)
* theme-obsidian2: 2.8 -> 2.9

* theme-obsidian2: move to pkgs/data

* theme-obsidian2: use pname

* theme-obsidian2: run hooks preInstall and postInstall in install phase
2019-08-26 23:11:52 +08:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Vladyslav M
e5d8f76616
scrcpy: 1.8 -> 1.10 2019-08-24 16:39:42 +03:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Tadeo Kondrak
58d383a5dc
wine{,-mono,-unstable,-staging}: update
wine: 4.0.1 -> 4.0.2
wine-mono: 4.9.0 -> 4.9.2
wine-unstable: 4.12.1 -> 4.14
wine-staging: 4.12.1 -> 4.14
2019-08-23 14:25:12 -06:00
Linus Heckemann
d1d602f559 Merge remote-tracking branch 'origin/master' into openssl-1.1 2019-08-23 17:27:39 +02:00
Sarah Brofeldt
33e33eebbe
Merge pull request #66252 from ivan/scream-receivers
scream-receivers: init at 3.3
2019-08-23 15:30:48 +02:00
ash lea
fe9e1854cc dolphinEmuMaster: update to latest upstream 2019-08-23 02:41:36 -07:00
ash lea
44b0d3ff6b dolphinEmuMaster: add ashkitten as maintainer 2019-08-23 02:41:36 -07:00
ash lea
acbe898c8b dolphinEmuMaster: use lib instead of stdenv.lib 2019-08-23 02:41:36 -07:00
ash lea
32f332fded dolphinEmu: use lib instead of stdenv.lib 2019-08-23 02:41:36 -07:00
ash lea
bd8f12024b dolphinEmuMaster: use wrapQtAppsHook 2019-08-23 02:41:36 -07:00
ash lea
4a7992d2b8 dolphinEmu: fix build 2019-08-23 02:41:36 -07:00
Malo Bourgon
b433ba7d82 vimPlugins.coc-nvim: 0.0.73 -> 0.0.74 2019-08-23 11:12:12 +09:00
Robin Gloster
f651422a25
tw-rs: remove
Dead project, broken with openssl 1.1
2019-08-21 21:01:52 +02:00
worldofpeace
7667ae1a2e
Merge pull request #66842 from tilpner/maintainer-fixup
tree-wide: fix malformed meta.maintainers
2019-08-19 11:35:10 -04:00
parisni
cc0fbe5893 vimPlugins.readline.vim: init at 2019-06-10 2019-08-19 21:57:45 +09:00
tilpner
0281599ad2
tree-wide: fix malformed meta.maintainers
These packages stood out while processing packages.json.gz,
where the maintainer field of some packages wasn't a list of sets,
but a nested list, or a string.
2019-08-19 11:58:27 +02:00
gnidorah
71a3c13d6b qtcurve: use qt5's mkDerivation 2019-08-19 08:04:51 +02:00
gnidorah
95cec2ffe3 kde2-decoration: use qt5's mkDerivation 2019-08-19 08:04:51 +02:00
Frederik Rietdijk
f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Timo Kaufmann
1eddfda963
vimPlugins: update (#66749) 2019-08-17 12:06:45 +02:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Tmplt
8294b9bde6 Merge remote-tracking branch 'upstream/master' into vim-plugins 2019-08-15 11:28:44 +02:00
Matthew Bauer
e9b7085ff8 cups: add myself as maintainer 2019-08-14 11:47:48 -04:00
symphorien
757ac88383 utsushi: init at 3.57.0 (#65223) 2019-08-14 08:37:19 +00:00
Wael Nasreddine
a3bf0c2e40
vimPlugins: turn filetype and syntax before sourcing the plugins (#66536)
Vim Terraform expects the `filetypedetect` group to exist. However, since we were enabling the filetype and the syntax *after* loading the plugins, it was exiting with an error preventing us from generating the remote plugins manifest with the plugin enabled. See #65894 for context.
2019-08-13 12:25:06 -07:00
Marek Mahut
d4b6735f55
Merge pull request #63424 from r-ryantm/auto-update/seafile-shared
seafile-shared: 6.2.11 -> 7.0.2
2019-08-12 18:48:30 +02:00
Timo Kaufmann
5fa2f51448
vimPlugins: update (#66491) 2019-08-12 11:29:07 +02:00