3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

110641 commits

Author SHA1 Message Date
John Ericson 3739858571 cc-wrapper: Use new bash uppercase subsitution syntax in setup hook
While this requires newer bash, stdenv's setup.sh now does across the
board anyways. This way is more concise.
2017-07-15 20:33:10 -04:00
John Ericson 093cc00cdd cc-wrapper: Always export environment variables for binutils
Before, this only happened when cross compiling.
2017-07-15 16:01:03 -04:00
John Ericson aaaa470ff8 mkDerivation: Fix errors from #27365
`nix-build pkgs/top-level/release.nix -A tarball` now succeeds.

`configureFlags = null` lead to a type error, and one overrideDrv
needed to be converted to to append a configureFlags list instead of
string due to the normalization.

Thanks @vcunat for alerting me to the issues---sorry I did not catch
them before merging my own PR.
2017-07-15 13:47:21 -04:00
John Ericson aca5ba405e cc-wrapper: Unify and improve dynamic linker flag logic
Besides deduplicating overlapping logic, clear warning messages were
added for:

 - No glob/path for dynamic linker provided (use default glob)

 - Glob did not expand to anything (don't append flag)

 - glob expanded to multiple things (take first, like before)
2017-07-14 15:21:34 -04:00
John Ericson e826a6a247 stdenv: Move some logic from cross adapter to stdenv proper
Eventually the adapter will be removed.  Moved is

 - Name suffix from hostPlatform

 - configurePlatforms

   To not cause more breakage, the default is currently [], but
   eventually it will be [ "build" "host" ], as the cross adapter makes
   it today.
2017-07-13 19:05:36 -04:00
John Ericson 30a1420414 stdenv-setup: Pull out and explain 3-part printing of commands
@Dezgeg made the good point that the reasons for doing this were not at
all intuitive.
2017-07-13 16:31:39 -04:00
John Ericson 2743078f66 stdenv-setup: Remove useless quotes
foo=$1 surprisingly doesn't need quotes in Bash. Word splits are only
syntactic in string variable (not array var!) assignments.
2017-07-13 14:59:53 -04:00
John Ericson 273a4c1c78 stdenv-setup: Combine [[ .. ]] && [[ .. ]] into one [[ .. && .. ]]
Also remove useless quotes on same line
2017-07-13 14:57:16 -04:00
John Ericson 5d693c84d2 stdenv-setup: Clean up 'substitute()' for style and error handling
It now blows up on null byte in file (rather than silently truncating),
and invalid arguments (rather than silently skipping).
2017-07-12 17:47:20 -04:00
John Ericson 5d4efb2c81 stdenv-setup: Misc improvements as directed by ShellCheck
I took some liberties with the flags-echoing code to make it more
concise and correct. Also, a few warnings in findInputs and friends I
skipped because I am going to rewrite those anyways.

Thanks @grahamc for telling me about this great linter!
2017-07-12 15:31:10 -04:00
John Ericson 8d76effc17 stdenv-setup: Make the package accumulators associative arrays instead of strings
This is generally cleaner: less eval, less worrying about separators,
and probably also faster. I got the idea from that python wrapper
script.
2017-07-12 15:30:56 -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
Eelco Dolstra f385e224e5 Merge pull request #27279 from obsidiansystems/stdenv-misc
Two misc changes for stdenv
2017-07-10 17:27:24 +02:00
John Ericson 5896d84dbb stdenv: Stop reversing the list of sandbox stuff
We're breaking hashes anyways
2017-07-10 11:25:51 -04:00
John Ericson 2f198956c7 stdenv: Make separate-debug-info.sh a nativeBuildInput 2017-07-10 11:25:51 -04:00
John Ericson 5c4fa41d2a Merge a lib change into staging 2017-07-10 11:24:35 -04:00
John Ericson 02464668c0 lib: Add isPowerPC predicate, and fix family name 2017-07-10 11:13:56 -04:00
Vladimír Čunát bfb7ef86f3
Merge branch 'master' into staging
Mass rebuilds incoming.  The mass-rebuild situation got really messy
this weekend.
2017-07-09 18:07:52 +02:00
zimbatm 466e7e23c6 caddy: 0.10.3 -> 0.10.4
The dependencies are now fully vendored
2017-07-09 17:04:04 +01:00
Michael Walker 4aad6d800d ezstream: init at 0.6.0 (#27259)
* ezstream: init at 0.6.0

* ezstream: pkgconfig belongs to nativeBuildInput
2017-07-09 16:46:16 +01:00
Jörg Thalheim e86a7e439a Merge pull request #27229 from bachp/minio-more-config
minio service: add additional config options
2017-07-09 16:38:45 +01:00
Graham Christensen 26a69b1bbc Merge pull request #27243 from richardipsum/richardipsum/fix-lrexlib
lrexlib: 2.7.2 (broken) -> 2.8.0
2017-07-09 10:56:30 -04:00
Peter Hoeg f2be840e98 re2c: minor cleanup 2017-07-09 22:43:38 +08:00
Pascal Bach 0fb8456b13 minio service: add additional config options
Set access and secret key and disable browser.
Tests extended to do real operations against minio.
2017-07-09 15:19:50 +02:00
Jörg Thalheim 154efd8ec5 Merge pull request #27246 from dywedir/ion
ion: init at 1.0.3
2017-07-09 13:55:05 +01:00
Jörg Thalheim aacb816eb6 Merge pull request #27213 from sigma/pr/gx
gx: 20160601-f84ddf7 -> 0.12.0
2017-07-09 13:19:15 +01:00
Jörg Thalheim 2841f7e5ea Merge pull request #27235 from wizzup/fix-25793
btrfs-progs : fix bash-completion
2017-07-09 13:15:43 +01:00
Aristid Breitkreuz 01557ee8b9 sshuttle: clean up expression a little bit 2017-07-09 12:17:14 +02:00
Daiderd Jordan 5ba05aaab9 Merge pull request #26716 from ankhers/generalize-elixir
Generalize building of Elixir interpreter
2017-07-09 10:50:24 +02:00
Frederik Rietdijk ad358f7651 Merge pull request #27253 from 0xABAB/patch-4
wine: add missing dependency libcap on Linux
2017-07-09 10:48:39 +02:00
Daiderd Jordan 8189811d3f Merge pull request #25648 from yacinehmito/custom
Make zshrc more predictable
2017-07-09 10:45:40 +02:00
Karn Kallio bd129c2b3e unzipNLS : Fix build by removing patch fuzz. 2017-07-09 10:44:48 +02:00
0xABAB 784240de3e wine: add missing dependency libcap on Linux 2017-07-09 10:40:53 +02:00
Vladimír Čunát 3a891c67fc
re2c: fix sourceRoot in a more robust way
Reverting ee5a17514c would also work.
The temporary confusion was due to #26877 changes.
2017-07-09 10:40:11 +02:00
Joachim F c5fdfffa46 Merge pull request #27155 from bachp/gitlab-runner-1.11.5
gitlab-runner_1_11: 1.11.4 -> 1.11.5
2017-07-09 09:35:57 +01:00
Joachim F a00a880572 Merge pull request #27055 from jfrankenau/mpd-startWhenNeeded
mpd service: Start when needed and harden
2017-07-09 09:34:31 +01:00
Vladimír Čunát 986c17727e
Merge: more compatibility for git* fetchers
They're additional commits from #26877.
Changing names of the fetched stuff was changing very many hashes,
and I think it's better to avoid that for the moment to reduce work
needed by nixpkgs users.  The fetchers are expected to be commonly
used even outside nixpkgs, and the current naming wasn't that bad
usually.

(commit analogical to d10c3cc5eedf58e80e2; I haven't noticed the part of
the PR has already got to master)
2017-07-09 10:31:24 +02:00
Joachim F 316dd74ab1 Merge pull request #27193 from calvertvl/upd_qutebrowser-0.11.0
qutebrowser: 0.10.1 -> 0.11.0
2017-07-09 09:29:10 +01:00
Joachim F 12216a69b4 Merge pull request #27249 from jensbin/corebird
corebird: 1.5 -> 1.5.1
2017-07-09 09:27:46 +01:00
Joachim F 079b4957df Merge pull request #27251 from jfrankenau/update-feh
feh: 2.18.2 -> 2.19
2017-07-09 09:20:51 +01:00
Aristid Breitkreuz 19dfb63036 sshuttle: 0.78.0 -> 0.78.3, use py3 for tests to succeed 2017-07-09 09:59:20 +02:00
Vladimír Čunát d10c3cc5ee
Merge: more compatibility for git* fetchers
They're additional commits from #26877.
Changing names of the fetched stuff was changing very many hashes,
and I think it's better to avoid that for the moment to reduce work
needed by nixpkgs users.  The fetchers are expected to be commonly
used even outside nixpkgs, and the current naming wasn't that bad
usually.
2017-07-09 09:50:30 +02:00
Karn Kallio ee5a17514c re2c : Fix build by adjusting sourceRoot. 2017-07-09 07:36:51 +00:00
wisut hantanong 25028cb750 add btrfs-progs bash-completion, fix #25793 2017-07-09 14:29:34 +07:00
Johannes Frankenau 1df820cd3d feh: 2.18.2 -> 2.19 2017-07-09 08:52:27 +02:00
Jens Binkert cf515b0f9f corebird: 1.5 -> 1.5.1 2017-07-09 08:01:28 +02:00
Peter Hoeg 6e2579c465 partition-manager: add missing dependencies 2017-07-09 04:44:32 +02:00
Peter Hoeg e9c803f09f peruse: one last missing dependency 2017-07-09 04:25:37 +02:00
Peter Hoeg a8c1419d53 peruse: add missing dependencies 2017-07-09 09:39:06 +08:00
Peter Hoeg 5906a2714d krusader: add missing dependencies 2017-07-09 09:36:58 +08:00