Commit Graph

2213 Commits

Author SHA1 Message Date
John Ericson
9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
John Ericson
f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
Daiderd Jordan
f35140fafc
vim-plugins: add ale 2017-07-25 19:28:05 +02:00
Daiderd Jordan
0f536deb74
vim-plugins: update 2017-07-25 19:28:05 +02:00
Guillaume Maudoux
6b286fa339 cups-filters: 0.14.0 -> 0.15.0 2017-07-25 19:00:06 +02:00
Jörg Thalheim
aba21d99da vimPlugins.command-t: 2017-07-11 -> 2017-06-23
a7f4c879e5 (commitcomment-23287795)
2017-07-25 14:15:55 +01:00
Jörg Thalheim
a7f4c879e5 vim-plugins: update set 2017-07-25 13:50:35 +01:00
Herwig Hochleitner
7d83f048e2 cdemu: 3.0.x -> 3.1.0
fixes cdemu for kernel >= 4.11
fixes client by adding pygobject3
2017-07-25 11:56:59 +02:00
John Ericson
b087618ac0 Revert "stdenv: Store one package per line in nix-support/propagated-*"
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.

This reverts commit 3cb745d5a6.

[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
2017-07-24 01:05:30 -04:00
Peter Hoeg
0345aed90c mfcj6510dwlpr: use new xxd package instead of vim 2017-07-24 09:37:58 +08:00
Chris Martin
63aa5df737 alock: 20160713 -> 20170720 2017-07-20 23:30:05 +02:00
Cray Elliott
faad06df6b wine: 2.0.1 -> 2.0.2 2017-07-20 13:52:43 -07:00
Chris Martin
60c9a4c94a alock: 20150418 -> 20160713 2017-07-19 18:02:37 +02:00
Cray Elliott
ccf7b4b57e wine-mono: 4.6.4 -> 4.7.0 2017-07-18 12:10:29 -07:00
Benno Fünfstück
99fbd867ef Merge pull request #27031 from jerith666/cnijfilter-2-80
cnijfilter: init at 2.80
2017-07-18 14:37:32 +02:00
Matt McHenry
67d02cd60a cnijfilter: init at 2.80
this driver reads support files from lib/bjlib as well as lib/cups,
which is why the path in cupsd.nix is tweaked
2017-07-17 07:32:23 -04:00
romildo
8df013c786 zuki-themes: 3.20.2017-02-17 -> 3.20.2017-04-23
zuki-themes: 3.22.2017-02-17 -> 3.22.2017-04-23
zuki-themes: add src for gtk-3.24 (3.24.2017-04-23)
2017-07-15 23:58:35 -03:00
Domen Kožar
0eb4f6fd25
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417'
Merge staging. It includes fixes for cc-wrapper parsing speed and
some other minor things.

http://hydra.nixos.org/eval/1375094
2017-07-14 11:55:41 +02:00
Jörg Thalheim
fc44b573ca mfcl2700dnlpr: remove meta.version 2017-07-14 08:44:20 +01:00
Cray Elliott
f91c591ea2 wineUnstable, wineStaging: 2.11 -> 2.12 2017-07-13 14:44:18 -07:00
Jörg Thalheim
30223dd334 Merge pull request #25654 from 4z3/mfcl2700dn
Add support for Brother MFC-L2700DN
2017-07-13 21:48:48 +01:00
John Ericson
a889454869 Merge pull request #27284 from obsidiansystems/prop-lines
stdenv: Store one package per line in nix-support/propagated-*
2017-07-11 14:33:23 -04:00
John Ericson
3cb745d5a6 stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
2017-07-10 13:32:13 -04:00
Will Dietz
fe3fb77774 vim-plugins: Add nim.vim 2017-07-10 12:29:03 -05:00
Cray Elliott
3365fdea04 wineUnstable: 2.10 -> 2.11
2.11 was picked instead of 2.12 since staging hasn't caught up yet,
 also updates staging
2017-07-09 21:23:05 -07:00
Joachim F
8c1c2a5bd4 Merge pull request #27136 from gnidorah/gtk-bluecurve
gtk-engine-bluecurve: init at 1.0
2017-07-09 20:18:23 +01:00
Jörg Thalheim
f939630615 Merge pull request #27232 from Ma27/init/jenkinsfile-vim-support
Jenkinsfile-vim-syntax: init
2017-07-09 19:18:46 +01:00
Maximilian Bosch
6152f4af26
Jenkinsfile-vim-syntax: init 2017-07-09 18:42:01 +02:00
0xABAB
784240de3e wine: add missing dependency libcap on Linux 2017-07-09 10:40:53 +02:00
Cray Elliott
b963ba1bee dolphinEmuMaster: 20150802 -> 20170705
removed a substitution that is no longer needed, add new
dependencies, and use fetchFromGitHub instead of fetchgit
2017-07-08 14:24:42 -07:00
gnidorah
b5c94380e0 gtk-engine-bluecurve: init at 1.0 2017-07-06 09:49:47 +03:00
Emmanuel Rosa
7ec7aa0bb1 Revert "splix: enable JBIG" (#27054)
This reverts commit 0878ca7ab4.

My change to enable JBIG for splix did not work correctly. I was unable to get to the bottom of it because the build never completed. Given that it's also timing out in Hydra (see https://hydra.nixos.org/eval/1372226) I think it's best to simply back it out.
2017-07-03 08:09:54 +01:00
Emmanuel Rosa
0878ca7ab4 splix: enable JBIG
Enables JBIG given that according to OpenPrinting.org, the patents have expired.
See https://www.openprinting.org/driver/splix/license/

Closes #25929
2017-07-01 19:36:12 -04:00
Joachim F
c043bf955f Merge pull request #26620 from rnhmjoj/gnash
gnash: init at 0.8.11-2017-03-08 [WIP]
2017-06-30 20:27:14 +01:00
John Ericson
e1faeb574a Merge pull request #26884 from obsidiansystems/purge-stdenv-cross
Purge stdenv cross
2017-06-28 21:39:16 -04:00
hsloan
a7f81284a5 uboot: Don't use stdenv.cross 2017-06-28 19:43:08 -04:00
Cray Elliott
71e495e10f winetricks: 20170327 -> 20170614 2017-06-27 02:00:49 -07:00
Bas van Dijk
35e5719fe9 elasticsearch: 5.4.0 -> 5.4.2 2017-06-26 08:47:28 +02:00
Jörg Thalheim
ea5330c0e2 Merge pull request #26118 from yurrriq/update/pkgs/misc/lilypond-with-fonts
lilypond-with-fonts: fix quoting
2017-06-25 18:30:15 +01:00
mingchuan
722d61c2f2 slock: Avoid chmod u+s (#26600) 2017-06-22 22:55:04 +08:00
aszlig
4007ee974c
vlock: Don't try to install setuid binary
With newer Nix it's (fortunately) no longer possible to create a file
with setuid bits, even though the permissions are fixed later the build
will fail during installPhase already.

I've verified whether the contents of the output path are the same as
before this change and the contents match.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-06-22 04:01:27 +02:00
Jörg Thalheim
d3ceaccb42 nerdtree-git-plugin: init at 2017-03-12 2017-06-21 10:23:21 +01:00
Cray Elliott
922d706e81 wineStaging: 2.7 -> 2.10
wineUnstable: 2.7 -> 2.10
2017-06-20 11:23:37 -07:00
Jörg Thalheim
10c2f39df0
vimPlugins.vimwiki: readd
was remove accidentally removed in 425bc07d43
2017-06-19 18:56:38 +01:00
goibhniu
7d747e1b16 Merge pull request #26626 from magnetophon/jackaudio
jackaudio: 1.9.10 -> 1.9.11-RC1
2017-06-19 16:44:59 +02:00
Bart Brouns
9d0441434d jackaudio: 1.9.10 -> 1.9.11-RC1 2017-06-19 15:11:41 +02:00
rnhmjoj
7f89293051
gnash: init at 0.8.11-2017-03-08 2017-06-19 15:08:57 +02:00
Jörg Thalheim
3477f56027
vimPlugins.command-t: fix ruby build 2017-06-18 12:56:45 +01:00
romildo
89b1d4cbe2 greybird: 3.22.3 -> 3.22.4 2017-06-14 04:48:31 +02:00
Bas van Dijk
2444eab485 ELK: update kibana and the elastic beats to 5.4 (#26252)
* Add kibana5 and logstash5
* Upgrade the elastic beats to 5.4
* Make sure all elastic products use the same version
  (see elk5Version)
* Add a test for the ELK stack
2017-06-13 22:36:08 +02:00