John Ericson
de6e133486
Merge branch 'ericson2314-cross-base' into staging
...
All the underlying commits are already on master
2017-12-10 17:16:11 -05:00
John Ericson
0c88078d37
Merge branch 'fix-splice' into ericson2314-cross-base
2017-12-10 17:15:07 -05:00
John Ericson
6c36d3c9e0
top-level: Fix splicing, again
2017-12-10 17:01:23 -05:00
John Ericson
79816cd64b
Merge branch 'fix-splice' into ericson2314-cross-base
2017-12-10 15:16:42 -05:00
Orivej Desh
dd604d575f
Merge branch 'master' into staging
...
* master: (39 commits)
pythonPackages: rename dns -> dnspython
awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5]
qt4: fix qmake on darwin and delete custom install phase
python.buildEnv: always include the $out output
nix-bash-completions: lazy load aware install
borg: 1.1.1 -> 1.1.3
nixos/programs/bash: document that /etc/bash_completion.d is obsolete
ocamlPackages.markup: 0.7.4 -> 0.7.5
hhvm: 3.21 -> 3.23.2
ocamlPackages.ulex: 1.1 -> 1.2
notmuch: 0.25.2 -> 0.25.3
gmime3: 3.0.1 -> 3.0.5
qt4: fix darwin install phase
nixos/programs/bash: Let bash-completion lazy load scripts
Revert "gmime: 3.0.1 -> 3.0.5"
rawtherapee: delete unused files
pythonPackages: rename dns -> dnspython
nixpkgs: remove sqlite/kyotocabinet deps for leveldb
tor-browser-bundle-bin: 7.0.10 -> 7.0.11
networkmanager: remove restart after suspend from resume
...
2017-12-10 15:24:30 +00:00
Frederik Rietdijk
b459c8475c
Merge pull request #32541 from rnhmjoj/dnspython
...
pythonPackages: rename dns -> dnspython (round 2)
2017-12-10 15:44:25 +01:00
rnhmjoj
491bc4cfed
pythonPackages: rename dns -> dnspython
2017-12-10 15:27:06 +01:00
Aristid Breitkreuz
5f4e80a86f
awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5]
2017-12-10 15:23:55 +01:00
Orivej Desh
f601ecfb21
qt4: fix qmake on darwin and delete custom install phase
...
Since keeping `installPhase = ""` to signify "use the default installPhase" will
be surprising, this deletes the installPhase and rebuilds qt4 on all platforms.
Fixes #30238
2017-12-10 14:22:02 +00:00
Frederik Rietdijk
163ba09117
python.buildEnv: always include the $out output
...
28299f669a#31857 ).
This commit modifies `python.buildEnv` so that it always includes the
$out output and thus fixes #31857 .
2017-12-10 15:21:35 +01:00
Orivej Desh
5fdffa084f
Merge pull request #32539 from hedning/nix-bash-completion-symlink
...
nix-bash-completions: lazy load aware install
2017-12-10 14:18:06 +00:00
Tor Hedin Brønner
f79d69113e
nix-bash-completions: lazy load aware install
...
`bash-completion` lazy loads completion scripts by looking up the command name
in the completion directory. As such we need to create a symlink for every
nix command.
The problem had been masked by nixos sourcing all completion scripts on startup.
2017-12-10 14:07:13 +00:00
Aristid Breitkreuz
c4a5ab728b
borg: 1.1.1 -> 1.1.3
2017-12-10 14:26:03 +01:00
Vincent Laporte
746d9d1b7b
ocamlPackages.markup: 0.7.4 -> 0.7.5
2017-12-10 13:01:40 +01:00
Orivej Desh
166536e152
Merge pull request #32535 from Gerschtli/update/hhvm
...
hhvm: 3.21 -> 3.23.2
2017-12-10 11:50:41 +00:00
Tobias Happ
d5d7220770
hhvm: 3.21 -> 3.23.2
2017-12-10 11:50:15 +00:00
Vincent Laporte
d98d944d5d
Merge pull request #32494 from mpickering/ber-metaocaml2
...
ber_metaocaml: (re)init at 104
2017-12-10 12:36:30 +01:00
Vincent Laporte
b1659c89c1
ocamlPackages.ulex: 1.1 -> 1.2
2017-12-10 12:24:10 +01:00
Moritz Ulrich
8974a9bf9a
notmuch: 0.25.2 -> 0.25.3
2017-12-10 12:15:50 +01:00
Moritz Ulrich
7df7739888
gmime3: 3.0.1 -> 3.0.5
2017-12-10 12:15:50 +01:00
Orivej Desh
5b53774f89
qt4: fix darwin install phase
...
by creating $out before copying lib to $out
2017-12-10 10:22:08 +00:00
Frederik Rietdijk
c6fbf4a15a
Merge pull request #32531 from rnhmjoj/dnspython
...
pythonPackages: rename dns -> dnspython
2017-12-10 10:09:05 +01:00
Orivej Desh
b6bf8db29f
Revert "gmime: 3.0.1 -> 3.0.5"
...
It breaks notmuch 0.25.2 tests, and updating notmuch to 0.25.3 does not fix them.
2017-12-10 09:07:04 +00:00
Orivej Desh
fc930e055a
rawtherapee: delete unused files
2017-12-10 08:44:04 +00:00
Jörg Thalheim
8bdbb21f9c
Merge pull request #31182 from yegortimoshenko/chroot-user/c-rewrite
...
chroot-user: rewrite in C, drop CHROOTENV_EXTRA_BINDS
2017-12-10 08:20:59 +00:00
rnhmjoj
b56d92a53b
pythonPackages: rename dns -> dnspython
2017-12-10 03:22:52 +01:00
Austin Seipp
5ae883b8c3
nixpkgs: remove sqlite/kyotocabinet deps for leveldb
...
These are only needed for some benchmarking utilities but they aren't
going to be generally useful to most people, I imagine.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-12-09 19:40:23 -06:00
Jörg Thalheim
05d2a9efb5
Merge pull request #32528 from dtzWill/fix/issue-32264
...
tetex: patch off-by-one to fix segfault
2017-12-10 01:27:21 +00:00
John Ericson
965cc5da57
top-level: Fix splicing in the presence of evaluation errors
...
- No more `or {}`, this was misleading at best since those values
wouldn't be used unless the attr they are defined from was present
anyways.
- `tryEval` for get outputs. This ensures that if some derivations fail, they
won't take out the others. This benefited from the `or {}` before, but that
was never good enough. `tryEval` is strictly better.
2017-12-09 20:02:45 -05:00
Joachim Fasting
eae2aa7eae
tor-browser-bundle-bin: 7.0.10 -> 7.0.11
2017-12-10 00:32:59 +01:00
Orivej Desh
b687ffa0d2
gurobipy: fix eval
2017-12-09 22:41:18 +00:00
Orivej Desh
8e2f912b65
Merge pull request #32526 from andir/rawtherapee-git-removal
...
rawtherapee-git: remove `-git` version
2017-12-09 22:19:45 +00:00
Will Dietz
5c81453477
tetex: patch off-by-one to fix segfault
...
Fixes #32264 .
Patch based on one from Fedora texlive-2007-66 source rpm.
References:
https://bugzilla.redhat.com/show_bug.cgi?id=754517
http://tug.org/pipermail/tex-k/2011-July/002317.html
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633011
https://www.mail-archive.com/tetex@dbs.uni-hannover.de/msg00968.html
Redhat discussion suggests this happens when using -Wl,-z,relro
(or other linker flags) that change the default memory layout.
2017-12-09 16:05:49 -06:00
Orivej Desh
926aaa4870
Merge pull request #32215 from dtzWill/feature/clang-multilib
...
multilib-capable clang, multilib tests
2017-12-09 21:41:54 +00:00
Andreas Rammhold
241f3bb673
rawtherapee-git: remove -git version
...
As discussed in #32337 the `-git` version is outdated since a while and
doesn't compile with modern compilers anymore.
closes #32337
2017-12-09 22:04:33 +01:00
Orivej Desh
80b6ef9f19
Merge pull request #32524 from mbode/kops_1_8_0
...
kops: 1.7.1 -> 1.8.0
2017-12-09 20:59:50 +00:00
Orivej Desh
d61b1cee5c
Merge pull request #32522 from bhipple/python-cryptop-0.2
...
cryptop: 0.1 -> 0.2
2017-12-09 20:59:15 +00:00
Orivej Desh
50d3dfc82d
Merge pull request #32523 from mbode/gradle_4_4
...
gradle: 4.3.1 -> 4.4
2017-12-09 20:56:04 +00:00
Orivej Desh
d1e3e83d67
cryptop: alias to altcoins.cryptop
2017-12-09 20:53:04 +00:00
Orivej Desh
06a1e2ab98
Merge pull request #32518 from KaiHa/gmailieer-0.5
...
gmailieer: 0.4 -> 0.5
2017-12-09 20:45:22 +00:00
Orivej Desh
5da9f614df
Merge pull request #32520 from KaiHa/gmime-3.0.5
...
gmime: 3.0.1 -> 3.0.5
2017-12-09 20:44:53 +00:00
Orivej Desh
ea1f6c38a2
Merge pull request #32525 from dtzWill/fix/allowInsecurePredicate
...
fix use of config-specified allowInsecurePredicate
2017-12-09 20:44:00 +00:00
Will Dietz
db7bee240e
stdenv: fix use of config-specified allowInsecurePredicate
...
for some reason we were checking allowUnfreePredicate instead
2017-12-09 20:43:30 +00:00
Orivej Desh
88f7171fe0
Merge pull request #32519 from mbode/kontemplate_1_3_0
...
kontemplate: init at 1.3.0
2017-12-09 20:33:18 +00:00
Shea Levy
286eadc147
Add gurobipy for python2.7 on Linux
2017-12-09 15:28:39 -05:00
Maximilian Bode
377cd99e4b
gradle: 4.3.1 -> 4.4
2017-12-09 21:08:41 +01:00
Shea Levy
bfb63ae2d0
Merge branch 'master' of github.com:NixOS/nixpkgs
2017-12-09 15:07:59 -05:00
Maximilian Bode
094c9ac655
kops: 1.7.1 -> 1.8.0
2017-12-09 21:02:00 +01:00
Shea Levy
3dfbf51a25
Add gurobipy for python2.7 on darwin.
2017-12-09 15:00:43 -05:00
Vladimír Čunát
2309acf723
Merge branch 'master' into staging
2017-12-09 21:00:07 +01:00
