Commit graph

105926 commits

Author SHA1 Message Date
John Ericson db5a921945 crossStdenv on iphone: Just get info from targetPlatform 2017-04-24 16:12:26 -04:00
John Ericson bef5278664 top-level: Common subexpression elimination for cc-wrapper usage
- `ccWrapperFun` can be used in a few more places instead of
   duplicating its definition.

 - `ccWrapper` parameter on `wrapCC` is always substituted with
   `ccWrapperFun` so just get rid of that parameter.
2017-04-24 13:57:27 -04:00
John Ericson 863d79b364 top-level: Introduce targetPackages and a "double link fold"
Each bootstrapping stage ought to just depend on the previous stage, but
poorly-written compilers break this elegence. This provides an easy-enough
way to depend on the next stage: targetPackages. PLEASE DO NOT USE IT
UNLESS YOU MUST!

I'm hoping someday in a pleasant future I can revert this commit :)
2017-04-23 14:01:12 -04:00
John Ericson d59e4fbb75 stage.nix: Better explain why buildPackages as null is valid arg 2017-04-23 14:01:12 -04:00
John Ericson af8f87a3a1 top-level: Do not splice pkgs, buildPackages or *Platform
- `pkgs` is self-similar, and thus already spliced
 - `buildPackages` is an ingredient of splicing and should be kept as is
 - The platforms are not packages or package sets and couldn't be spliced

There's probably other things that shouldn't be spliced too. The best long-
term solution is simply to stop splicing altogether.
2017-04-23 13:54:42 -04:00
Rok Garbas 0feca1abb6 Merge pull request #25135 from garbas/update-asciinema
Update asciinema
2017-04-23 04:33:27 +02:00
Rok Garbas 93cacf61a8
asciinema: 1.3.0 -> 1.4.0 2017-04-23 04:18:11 +02:00
Michael Weiss e1244f6e8a Revert "display-manager: fix argument handling of sddm"
This reverts commit 6b7c5ba535.

Unfortunately it seems like this broke slim, lightdm and gdm (see #25068
and #23264). This is already reverted in the 17.03 branch (99dfb6d).

TODO: We need tests for slim and lightdm and fix the test for gdm
(failing since 2016-10-26) to prevent such breakage in the future.
2017-04-23 03:19:07 +02:00
Thomas Tuegel e019978d02 Merge pull request #23922 from gnidorah/master
mytetra: init at 1.42.2
2017-04-22 15:06:44 -05:00
Domen Kožar e30b5c198a Merge pull request #25118 from dmjio/patch-1
HaLVM: Shebang fix for Hydra
2017-04-22 20:13:24 +02:00
David Johnson bcd5865adf HaLVM: Shebang fix for Hydra
On my local nixos machine, `useSandbox = true;` wasn't enabled. This exposed the fact that various scripts weren't shebang-patched. @cleverca22 has provided the fix.

cc @peti @domenkozar @Ericson2314
2017-04-22 10:33:01 -07:00
Richard Szibele 5f9096a033 curlcpp: 20160901 -> 1.0 (#25104) 2017-04-22 16:14:32 +01:00
Vladimír Čunát b72d4e13c7
kdiff3: fixup patch hash after #25059
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.
2017-04-22 16:37:48 +02:00
Joachim Fasting 9e6c96f8fc
grsecurity: 4.9.24-201704210851 -> 4.9.24-2201704220732 2017-04-22 16:37:24 +02:00
Vladimír Čunát 5cdf192827
Merge #25043: firefox-{bin,esr}: critical security 2017-04-22 11:51:02 +02:00
Edward Tjörnhammar da2518fe25
i2pd: 0.12.0 -> 0.13.0 2017-04-22 09:43:24 +02:00
Edward Tjörnhammar ad84b1e4b9
jackett: 0.7.1197 -> 0.7.1308 2017-04-22 09:43:00 +02:00
romildo 2f481960cf ephoto: init at 1.0 2017-04-22 03:06:12 +03:00
Benno Fünfstück cfcceaee27 Merge pull request #24473 from jgertm/tj/xsv
xsv: init at 0.11.0
2017-04-22 00:26:10 +02:00
Benno Fünfstück 1db5cf49d3 Merge pull request #24479 from Ma27/init/lambda-mod-zsh-theme
lambda-mod-zsh-theme: init at eceee68cf46bba9f7f42887c2128b48e8861e31b
2017-04-22 00:10:14 +02:00
Benno Fünfstück 855155083a Merge pull request #24755 from LumiGuide/bepasty-secretKeyFile
bepasty: add secretKeyFile option
2017-04-22 00:07:04 +02:00
Benno Fünfstück a0e60af067 Merge pull request #24819 from dbrock/ethrun
ethrun: init at 0.1.0
2017-04-21 23:54:07 +02:00
Eelco Dolstra d387a1f0ae youtube-dl: 2017.04.02 -> 2017.04.17 2017-04-21 23:32:37 +02:00
Benno Fünfstück bd78749d33 rust: improve fetch-cargo-deps determinism for non-sandboxed builds
When not using sandboxing, /usr/share/git-core/templates may leak into the
nix build through the libgit2 hardcoded default template search path. We now
explictly set the templatedir to avoid this problem.

See https://github.com/bennofs/nix-index/issues/2#issuecomment-296268983 for
an example case of nondeterminism.
2017-04-21 23:26:46 +02:00
Daiderd Jordan 5238b85207 Merge pull request #25069 from matthewbauer/libbsd-darwin
libbsd: fixup on darwin
2017-04-21 22:55:08 +02:00
obadz c4fecfb1ec ecryptfs-helper: fix makeWrapper use after 7ff6eec5 2017-04-21 21:25:30 +01:00
obadz dbb06ea3d2 pythonPackages.typeguard: init at 2.3.1 (#25040) 2017-04-21 21:20:49 +01:00
Frederik Rietdijk c6b3c66277 wineUnstable: 2.5 -> 2.6 2017-04-21 21:38:54 +02:00
Frederik Rietdijk d16a4512d0 wine: 2.0 -> 2.0.1 2017-04-21 21:38:54 +02:00
Eelco Dolstra 20647f8a8e Merge pull request #25091 from joepie91/patch-2
fetchurl: fixed typo in error message
2017-04-21 17:54:06 +02:00
Peter Hoeg 6695c95ebd unifi: 5.4.11 -> 5.4.14 2017-04-21 23:13:47 +08:00
Chris Hodapp 5864baa4c6
mapnik: add optional PostgreSQL dependency
Closes #25063.
2017-04-21 16:50:43 +02:00
Jörg Thalheim f88085d45f Merge pull request #25089 from Mic92/dino
dino: disable parallel build
2017-04-21 16:45:39 +02:00
Sven Slootweg fa8adf2c47 fetchurl: fixed typo in error message
This typo was likely introduced by copy-pasting the error message from elsewhere and forgetting to change the text, during the MD5 deprecation process (#4491).
2017-04-21 16:41:09 +02:00
Jörg Thalheim 95d9b582f1
dino: disable parallel build
attempt to fix hydra build: https://hydra.nixos.org/build/51816616/nixlog/1
2017-04-21 16:26:29 +02:00
Peter Simons 4c0098f1dc haskell-old-time: fix build with GHC HEAD 2017-04-21 16:25:54 +02:00
Peter Simons 7462c7d2f7 haskell-utf8-string: fix build with GHC HEAD 2017-04-21 16:25:53 +02:00
Peter Simons 25a1ef369b haskell-hsdns: fix build with GHC 7.0.x and 7.2.x 2017-04-21 16:25:53 +02:00
Peter Simons f4ed1f98d1 haskell-gtksourceview: clean up overrides for versions 2 and 3 of the package 2017-04-21 16:25:53 +02:00
Benno Fünfstück 5f33eb493f haskell-packages: factor package set construction in new file
Closes https://github.com/NixOS/nixpkgs/pull/24850.
2017-04-21 16:25:53 +02:00
Peter Simons 6e50b4532c halvm: mark build as broken
The build relies on /usr/bin/env, which does not exist in chroot build
environments: http://hydra.nixos.org/build/51814615.

Ping: @dmjio
2017-04-21 16:25:53 +02:00
Peter Simons 9a7ba4e7a9 haskell-stack: fix build by passing an old version of "store" 2017-04-21 16:25:53 +02:00
Peter Simons 87ec7bb087 haskell-dbus: drop semicolons.patch; this change appears to have been included upstream 2017-04-21 16:25:52 +02:00
Peter Simons 4c8056a8d9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
0d6c9d1b64.
2017-04-21 16:25:45 +02:00
Peter Simons 7cfb6509ed hackage2nix: provide old versions of "store" so that we can build stack 2017-04-21 16:24:54 +02:00
Peter Simons 6c36c19f7d LTS Haskell 8.11 2017-04-21 16:24:54 +02:00
Tristan Helmich e39264ee6f radarr: 0.2.0.596 -> 0.2.0.654 (#25082) 2017-04-21 14:17:11 +01:00
José Romildo Malaquias af1621a232 xfce4-whiskermenu-plugin: 1.6.2 -> 1.7.2 (#25084) 2017-04-21 14:16:25 +01:00
Joachim Fasting 05911da7bb
grsecurity: 4.9.23-201704181901 -> 4.9.24-201704210851 2017-04-21 15:09:32 +02:00
Tim Steinbach 7fb1b54cc1
linux: 4.4.62 -> 4.4.63 2017-04-21 08:03:43 -04:00