Vladimír Čunát
4aec96b379
Merge the two "same" merges
...
This only takes the state from the second parent.
The purpose is that when this commit depends on the failed one,
simply merging this commit is a safe way to fix the problems. Details:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 19:08:59 +02:00
Vladimír Čunát
6617c8bd87
A fixed version of commit eb750f9a7b
...
For detailed explanation see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 18:59:36 +02:00
Daiderd Jordan
eb750f9a7b
Merge branch 'master' into staging
2017-04-12 21:34:36 +02:00
Daiderd Jordan
ce4c9c4d86
Merge pull request #24826 from kirelagin/bonniepp
...
bonnie: Update Darwin patch
2017-04-12 19:51:09 +02:00
Joachim Fasting
13a0ad3108
opal: NIX_CFLAGS -> NIX_CFLAGS_COMPILE
...
Seeing as the build already passes, I suspect this is strictly redundant
...
Tested with nix-build -A opal
2017-04-12 19:27:06 +02:00
Joachim Fasting
540a6412e3
suitesparse_4_4: NIX_CFLAGS -> NIX_CFLAGS_COMPILE
...
Tested with nix-build -A suitesparse_4_4
2017-04-12 19:27:03 +02:00
Joachim Fasting
a883581ddb
suitesparse_4_2: remove bogus NIX_CFLAGS
...
NIX_CFLAGS should be NIX_CFLAGS_COMPILE; since pic is the default, we
simply remove the bogus declaration.
Tested with nix-build -A suitesparse_4_2
2017-04-12 19:26:58 +02:00
Daiderd Jordan
5ba445752b
Merge pull request #24700 from hamishmack/fixes-for-macos
...
gtk fixes for macos
2017-04-12 19:26:32 +02:00
Joachim Fasting
3fa5605b41
grsecurity: 4.9.21-201704091948 -> 4.9.22-201704120836
2017-04-12 18:58:29 +02:00
Shea Levy
b2c87fbf98
lib: Add test for composeExtensions
2017-04-12 12:40:24 -04:00
Tim Steinbach
ae002d6ecb
Merge pull request #24845 from lsix/update_nano
...
nano: 2.8.0 -> 2.8.1
2017-04-12 10:29:30 -04:00
Domen Kožar
635822da82
nixos: escape brackets in systemd units
...
One day we should just whitelist instead of blacklist chars.
Fixes https://github.com/NixOS/nixops/issues/614
2017-04-12 15:56:26 +02:00
Nikolay Amiantov
8c56608078
unity3d: 5.3.5 -> 5.5.3
...
Also add udev to dependencies and don't strip unneeded ones.
Fixes #22513 .
2017-04-12 16:52:18 +03:00
Lancelot SIX
474d112b7a
nano: 2.8.0 -> 2.8.1
...
See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00005.html
for release announcement
2017-04-12 15:44:18 +02:00
Tim Steinbach
5f05792417
linux: 4.4.60 -> 4.4.61
2017-04-12 09:17:53 -04:00
Tim Steinbach
6860eedfd6
linux: 4.10.9 -> 4.10.10
2017-04-12 09:16:08 -04:00
Tim Steinbach
224a8f7358
linux: 4.9.21 -> 4.9.22
2017-04-12 09:13:56 -04:00
Nikolay Amiantov
54bbf91479
buildFHSEnv: add ACLOCAL_PATH
...
Fixes #24620 .
2017-04-12 14:43:08 +03:00
Peter Hoeg
ffa2bc2382
terragrunt: 0.11.0 -> 0.11.1
2017-04-12 14:08:53 +08:00
Tristan Helmich
0f64656dca
matrix-synapse: 0.19.3 -> 0.20.0
2017-04-12 01:58:28 +02:00
Tristan Helmich
cf957fedea
pythonPackages.phonenumbers: init at 8.4.0
2017-04-12 01:58:28 +02:00
Profpatsch
048114eb4f
compile-daemon: init at 2013-03-08
2017-04-12 00:07:55 +02:00
Profpatsch
9b7b950832
/lib/default.nix: Add file docstring & unit test hint
2017-04-12 00:01:38 +02:00
Bjørn Forsman
d916ce2ef4
nixos/lighttpd: set $HOME for gitweb sub-service
...
This allows gitweb to expand '~' in /etc/gitconfig. Without a $HOME
variable, it fails to list any projects and instead show the text
"No such projects found" in the UI.
Setting $HOME to the gitweb project root seems like a sensible value.
2017-04-11 22:54:31 +02:00
Tuomas Tynkkynen
0d86c0692f
gawk: Disable tests that don't work in sandbox
2017-04-11 23:37:31 +03:00
Tuomas Tynkkynen
1e1b68b4a0
patchutils: Drop patch applied upstream
2017-04-11 23:13:28 +03:00
Daiderd Jordan
d55ab1a6b9
Merge pull request #23572 from rycee/fix/gpsbabel-darwin
...
gpsbabel: fix darwin build
2017-04-11 20:40:52 +02:00
Daiderd Jordan
9561fecd02
gpsbabel: fix build with llvm-4
2017-04-11 20:23:43 +02:00
Franz Pletz
73f04ddd57
nginxMainline: 1.11.10 -> 1.11.13
2017-04-11 19:57:28 +02:00
Bjørn Forsman
d45df036c3
release(-lib).nix: add nixpkgsArgs parameter
...
This allows customizing the nixpkgs arguments by the caller. My use case
is creating a personal nixpkgs channel containing some unfree packages.
The default is still to not build unfree packages, so for nixpkgs this
is no functional change.
2017-04-11 19:43:34 +02:00
Franz Pletz
e8351fd305
libressl: 2.5 branch is now stable
2017-04-11 19:41:02 +02:00
Franz Pletz
29ed67faea
libressl_2_5: 2.5.1 -> 2.5.3
2017-04-11 19:41:01 +02:00
Bjørn Forsman
9c830c8456
hydra: add dependency on Nix' perl bindings
...
This unbreaks the build since the latest nixUnstable update
(3dd66ec6e9
).
It's basically the same fix as in hydra git repo:
a0376a92e5
2017-04-11 19:34:25 +02:00
Bjørn Forsman
6047401a71
pythonPackages.boto3: disable tests (fails due to network access)
...
The test failure started happening with commit
8d18f67a97
("awscli: 1.11.45 -> 1.11.75"). That commit
also updates botocore, a dependency of boto3.
This unbreaks 'nixops' (a dependee).
2017-04-11 19:14:56 +02:00
edanaher
e3559c23c2
acme: Add "domain" option to separate domain from name
...
Fixes #24731 .
2017-04-11 18:28:05 +02:00
Lancelot SIX
54fff9ec1a
Merge pull request #24780 from cko/django_1_7_remove
...
django_1_7: remove
2017-04-11 17:45:21 +02:00
Shea Levy
52f998a2ce
Merge branch 'composeExtensions'
2017-04-11 11:16:29 -04:00
Jörg Thalheim
58771c482c
Merge pull request #24571 from jbgi/kodi-dvdfix
...
Kodi: use kodi fork of libdvdnav/libdvdread. Fix #24153 (dvd playback)
2017-04-11 16:11:17 +02:00
Eelco Dolstra
29b415dcdb
Add nixUnstable.perl-bindings
2017-04-11 15:36:51 +02:00
Kirill Elagin
4f61dd7581
bonnie: Update Darwin patch
2017-04-11 16:23:10 +03:00
Eelco Dolstra
3dd66ec6e9
nix: 1.12pre5122_c60715e -> 1.12pre152_915f62fa
2017-04-11 15:02:45 +02:00
Eelco Dolstra
b40cca244c
Merge pull request #24825 from dezgeg/pr-stdenv-updates
...
stdenv package updates
2017-04-11 14:38:29 +02:00
Rok Garbas
8fcb9275d1
pypi2nix: 1.6.0 -> 1.8.0
2017-04-11 14:33:54 +02:00
Rok Garbas
8c8942a5e4
firefox-bin: alsaLib.dev is needed
2017-04-11 14:33:54 +02:00
Thomas Tuegel
149ba2e9dc
Merge pull request #24811 from mdorman/emacs-updates
...
Automated emacs package updates
2017-04-11 07:20:10 -05:00
Benno Fünfstück
285097af27
rustRegistry: 2017-04-08 -> 2017-04-11
2017-04-11 14:16:28 +02:00
Jörg Thalheim
c84dd4f09e
Merge pull request #24526 from miltador/jetbrains
...
idea: numerous fixes and improvements
2017-04-11 13:56:20 +02:00
Tuomas Tynkkynen
e4b48c7186
libsigsegv: Remove aarch64 patch, enable tests
...
The aarch64 patch has been applied upstream. Let's hope that the new
release fixes the tests as well.
2017-04-11 14:01:34 +03:00
Tuomas Tynkkynen
7f8202bf83
Fix tarball evaluation
...
http://hydra.nixos.org/build/51460386
This seems the path of least resistance. Adding "x86_64-darwin" to
supportedSystems causes other errors.
2017-04-11 13:45:29 +03:00
Arseniy Seroka
3bbe26cf5f
Merge pull request #24793 from sargon/update/trayer
...
trayer: 1.1.6 -> 1.1.7
2017-04-11 13:09:43 +03:00