Matthew Bauer
a56fe056ec
make-derivation: don’t add host suffix if there is no c compiler
...
Some trivial builders use the name attr to choose the exec name
produced. For example nixos-install,
nixos-install = makeProg {
name = "nixos-install";
src = ./nixos-install.sh;
nix = config.nix.package.out;
path = makeBinPath [ nixos-enter ];
};
When cross compiling, this puts the prog in,
/bin/nixos-install-powerpc64le-unknown-linux-gnu
2018-11-28 12:44:10 -06:00
Matthew Bauer
a9b7fa7634
Revert "treewide: for substituteAll: s/version/version_/"
...
This reverts commit 1e99582eaf
.
2018-11-28 12:30:24 -06:00
Matthew Bauer
d64f288154
make-derivation: don’t assert on separateDebugInfo
...
When separateDebugInfo = true & !stdenv.hostPlatform.isLinux, we
always gave an error. There is no reason to do this. Instead, just
don’t add separate debug info when we aren’t on Linux.
2018-11-28 12:29:00 -06:00
Matthew Bauer
13e45aeed3
make-derivation: remove selfConsistent check
...
version is set in lots of places but might not need to be in a name.
Alternative to #50364 .
2018-11-28 12:26:21 -06:00
Jack Kelly
5987c5c694
postgresql: Remove static libs using host platform extension
2018-11-28 10:49:13 -06:00
Jörg Thalheim
8e97e8009f
Merge branch 'fix/cross-swig' into HEAD
2018-11-28 10:31:23 +00:00
Jörg Thalheim
be6b461bb9
swig: document why pcre.dev is in nativeBuildInputs
2018-11-28 10:25:08 +00:00
eburimu
3c9d05389c
swig: fix cross compilation
2018-11-28 13:01:38 +03:00
Vladimír Čunát
834e7c4f0b
Merge #50249 : libjpeg-turbo: 1.5.3 -> 2.0.1
...
(into staging)
2018-11-28 10:23:33 +01:00
Will Dietz
41d887af6f
Merge pull request #51120 from dtzWill/fix/ical-test
...
libical: disable parallel check, fix
2018-11-27 18:58:00 -06:00
Léo Gaspard
8ecd555ded
Merge branch 'pr-46056' into staging
...
* pr-46056:
binutils: use shared libs
binutils: fix #44936 the huge size regression
2018-11-28 09:55:05 +09:00
Will Dietz
6cb1bdb67f
libical: disable parallel check, fix
2018-11-27 10:32:24 -06:00
Will Dietz
42213e4962
Merge pull request #50971 from dtzWill/update/pixman-0.36.0
...
pixman: 0.34.0 -> 0.36.0
2018-11-27 09:56:14 -06:00
Will Dietz
edb7146a6f
Merge pull request #50972 from dtzWill/update/bison-3.2.2
...
bison: 3.2.1 -> 3.2.2
2018-11-27 09:55:40 -06:00
Will Dietz
d0ed3e5079
nghttp2: 1.34.0 -> 1.35.0
...
https://nghttp2.org/blog/2018/11/23/nghttp2-v1-35-0/
2018-11-27 09:54:31 -06:00
Jörg Thalheim
dc8aca448d
Merge pull request #51028 from clefru/tmp-cargo-config
...
buildRustPackage: write cargo config to temporary file instead of source dir
2018-11-26 15:00:16 +00:00
Jörg Thalheim
7b63cdcc07
go_1_11: remove build artifacts
2018-11-26 07:22:50 +00:00
Clemens Fruhwirth
8d4fbc55d8
Write cargo config to temporary file instead of source dir.
...
... as this fails if the source dir contains a "config" directory.
2018-11-25 15:26:31 +01:00
Renaud
16dabf2d5b
Merge pull request #50068 from r-ryantm/auto-update/libevdev
...
libevdev: 1.5.9 -> 1.6.0
2018-11-25 11:46:04 +01:00
Renaud
4b66d9af3a
Merge pull request #49288 from r-ryantm/auto-update/rdkafka
...
rdkafka: 0.11.5 -> 0.11.6
2018-11-25 10:33:54 +01:00
Renaud
2e95a386fe
Merge pull request #50075 from r-ryantm/auto-update/kexec-tools
...
kexectools: 2.0.17 -> 2.0.18
2018-11-25 10:12:12 +01:00
Renaud
19f5629203
Merge pull request #50551 from r-ryantm/auto-update/vim
...
vim: 8.1.0490 -> 8.1.0535
2018-11-25 09:09:54 +01:00
Jörg Thalheim
b3ae7d1c8c
Merge pull request #50928 from Mic92/cross-go-windows
...
direnv: make cross-compile on windows
2018-11-25 00:13:26 +00:00
Jörg Thalheim
3681fa5456
direnv: make cross-compile on windows
2018-11-24 10:43:47 +00:00
Jörg Thalheim
6f2475f5bf
Merge pull request #50835 from Mic92/go-cross
...
Go cross compilation
2018-11-24 10:39:11 +00:00
Jörg Thalheim
79b9462468
go_1_11: fix cross compilation
2018-11-24 10:36:57 +00:00
Frederik Rietdijk
c1792242ef
Merge staging-next into staging
2018-11-24 10:44:50 +01:00
Frederik Rietdijk
e41154d1ab
Merge master into staging-next
2018-11-24 10:43:33 +01:00
Will Dietz
28cdb6e841
pyjwt: fix tests to work with pytest >= 3.9.0
2018-11-24 10:41:36 +01:00
Sarah Brofeldt
25c562e451
Merge pull request #50550 from jD91mZM2/xidlehook
...
xidlehook: 0.6.0 -> 0.6.1
2018-11-24 10:32:55 +01:00
Michael Raskin
f79bf0a924
Merge pull request #50973 from c0bw3b/pkg/nsjail
...
nsjail: 2.7 -> 2.8
2018-11-24 08:01:47 +00:00
worldofpeace
3ce5fac5e3
Merge pull request #50975 from worldofpeace/minizinc/2.2.3
...
minizinc: 2.2.1 -> 2.2.3
2018-11-24 00:18:10 -05:00
worldofpeace
598fcb0421
powershell: 6.1.0 -> 6.1.1
...
Also fix libraries for darwin.
Closes #50966
Co-authored-by: Robin Gloster <mail@glob.in>
2018-11-24 03:56:35 +01:00
Will Dietz
af9ba3758f
hyperfine: 1.3.0 -> 1.4.0
2018-11-23 19:26:11 -06:00
Will Dietz
d3c85e3314
webkitgtk: 2.22.3 -> 2.22.4
2018-11-23 19:25:16 -06:00
Franz Pletz
5ea22c49f1
browserpass: 2.0.18 -> 2.0.22
2018-11-24 01:35:47 +01:00
Will Dietz
e90f44f94b
pixman: remove unused args
2018-11-23 18:21:03 -06:00
Jörg Thalheim
6d9a35a6de
direnv: 2.17.0 -> 2.18.2
2018-11-24 00:16:01 +00:00
worldofpeace
1040875bf4
minizinc: 2.2.1 -> 2.2.3
...
Using a git revision for 2.2.3 because their tags are disappearing.
See:
- https://github.com/MiniZinc/libminizinc/issues/257
- https://github.com/MiniZinc/libminizinc/issues/248
2018-11-23 18:51:24 -05:00
worldofpeace
2c320ea8be
Merge pull request #50868 from jhillyerd/imwheel
...
imwheel: init at 1.0.0pre12
2018-11-23 18:30:22 -05:00
c0bw3b
9e5b98c81a
nsjail: 2.7 -> 2.8
...
Changelog: https://github.com/google/nsjail/releases/tag/2.8
2018-11-24 00:26:40 +01:00
James Hillyerd
c5933f4bf2
imwheel: init at 1.0.0pre12
2018-11-23 15:17:56 -08:00
Will Dietz
84634a3b91
bison: 3.2.1 -> 3.2.2
2018-11-23 17:07:55 -06:00
Will Dietz
d4f2925a1c
pixman: 0.34.0 -> 0.36.0
2018-11-23 17:05:36 -06:00
Michael Raskin
5e159d463b
Merge pull request #49228 from Ekleog/rss2email-module
...
rss2email module: init
2018-11-23 22:30:29 +00:00
Renaud
f11297acb9
Merge pull request #49892 from kalbasit/nixpkgs_add-ssh-agents
...
ssh-agents: init at 1.0.1
2018-11-23 22:43:54 +01:00
Wael M. Nasreddine
d4158b1b9c
ssh-agents: init at 1.0.1
2018-11-23 12:59:33 -08:00
Franz Pletz
2bf16cbbc3
matrix-synapse: 0.33.8 -> 0.33.9
2018-11-23 21:09:57 +01:00
Andreas Rammhold
b4d9f14d3c
Merge pull request #49756 from andir/prometheus
...
nixos/prometheus: check alertmanager configuration
2018-11-23 19:55:30 +01:00
Andreas Rammhold
51c3082119
nixos/prometheus: require one alertmanager configuration parameter
...
This commit adds an assertion that checks that either `configFile` or
`configuration` is configured for alertmanager. The alertmanager config
can not be an empty attributeset. The check executed with `amtool` fails
before the service even has the chance to start. We should probably not
allow a broken alertmanager configuration anyway.
This also introduces a test for alertmanager configuration that piggy
backs on the existing prometheus tests.
2018-11-23 19:45:17 +01:00