1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 19:45:54 +00:00
Commit graph

972 commits

Author SHA1 Message Date
Matthew Justin Bauer cf6fdcabac
Merge pull request #36964 from ryantm/auto-update/buildbot
buildbot: 1.0.0 -> 1.1.0
2018-04-23 12:03:46 -05:00
Tim Cuthbertson ad5b090853 gup: add passthru.updateScript 2018-04-22 15:16:36 +10:00
Tim Cuthbertson b52f5dba48 gup: simplify build expression 2018-04-22 15:16:02 +10:00
Tim Steinbach 82f70b63c0
gradle: 4.6 -> 4.7 2018-04-21 11:25:22 -04:00
Matthew Justin Bauer 615344b5f6
Merge pull request #37168 from ryantm/auto-update/buildbot-worker
buildbot-worker: 1.0.0 -> 1.1.0
2018-04-17 10:17:43 -05:00
aszlig 492ca7be2b
gnumake3: Fix build against glibc-2.27
This has already been patched against gnumake4 (519f0b8db2)
but we still have packages depending on gnumake3, so let's also apply
the same patch to gnumake 3.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @shlevy, @vcunat
2018-04-12 16:21:30 +02:00
Robert Schütz 80fc5f2a24 Merge branch 'master' into staging 2018-04-10 09:13:36 +02:00
Tim Steinbach 83229813b3
sbt: 1.1.3 -> 1.1.4 2018-04-09 17:05:25 -04:00
Frederik Rietdijk 0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Tim Steinbach 2ab846211c
sbt: 1.1.2 -> 1.1.3 2018-04-09 08:56:39 -04:00
Frederik Rietdijk a799c45192 python: buildbot-pkg: 1.1.0 -> 1.1.1 2018-04-08 11:36:07 +02:00
Frederik Rietdijk 869854dd09 python: pantsbuild.pants: 1.4.0 -> 1.5.0 2018-04-08 11:34:57 +02:00
Frederik Rietdijk dfc2426563 python: buildbot-pkg: 1.0.0 -> 1.1.0 2018-04-08 11:34:56 +02:00
Frederik Rietdijk a9f37d1c25 Merge master into staging 2018-04-05 19:25:05 +02:00
Giulio Eulisse 606a945f64 Allow remake to build on darwin 2018-04-05 11:29:00 +02:00
Frederik Rietdijk 23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Pascal Wittmann c70addc2ae
Merge pull request #38247 from r-ryantm/auto-update/doit
doit: 0.31.0 -> 0.31.1
2018-04-04 15:21:46 +02:00
Benjamin Staffin 09b16a92af bazel: 0.10.1 -> 0.11.1 2018-04-03 12:45:30 +02:00
Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00
Matthew Justin Bauer d8e1a52326
Merge pull request #37797 from bhmiller/master
pants: 1.3.0 -> 1.4.0
2018-03-31 19:30:26 -05:00
R. RyanTM 2ad2e5f0f7 doit: 0.31.0 -> 0.31.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/doit/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/.doit-wrapped --help` got 0 exit code
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/.doit-wrapped help` got 0 exit code
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/.doit-wrapped --version` and found version 0.31.1
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/doit --help` got 0 exit code
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/doit help` got 0 exit code
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/doit --version` and found version 0.31.1
- found 0.31.1 with grep in /nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1
- directory tree listing: https://gist.github.com/a0ba66d49e0c01c3003ca50e9ad705a0
2018-03-31 11:07:24 -07:00
Jan Tojnar 372b00dfe9
Merge pull request #37935 from jtojnar/meson-0.45
meson: 0.44.0 → 0.45.1
2018-03-30 23:20:39 +02:00
Shea Levy 05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Matthew Justin Bauer 75616ceb49
Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
2018-03-27 18:43:03 -05:00
Matthew Bauer 49455d7bae treewide: replace utillinux refs of {u,}mount
umount and mount are now provided top-level
2018-03-27 18:17:46 -05:00
Matthew Bauer 11f0e07d4f unixtools: replace darwin.ps 2018-03-27 18:17:46 -05:00
Jan Tojnar fdd1625d17
meson: 0.44.0 → 0.45.1
http://mesonbuild.com/Release-notes-for-0-45-0.html
2018-03-27 22:34:30 +02:00
Tim Steinbach ca28546bfc
sbt: 1.1.1 -> 1.1.2 2018-03-27 08:56:36 -04:00
Brendan Miller 58d520b824 pants: 1.3.0 -> 1.4.0
Tested via running "nix-build -A pkgs.pants"
2018-03-26 08:40:50 -04:00
Matthew Bauer 675dc1bfbf apache-ant: init 1.9
1.9.x is a legacy version of ant supporting Java 5, 6, and 7

Fixes #37747
2018-03-25 14:11:00 -05:00
Shea Levy b2a2131ff0
meson: Patch around overly strict struct size check.
Fixes systemd cross-compile.
2018-03-24 07:50:16 -04:00
Shea Levy 0f854cd2d1
Merge branch 'master' into staging 2018-03-24 01:34:53 -04:00
Ryan Mulligan 88d2722d5f waf: 2.0.4 -> 2.0.6
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.6 with grep in /nix/store/5rgayqfl64bn9pyrfsc9kcm2c4vdqybi-waf-2.0.6
- found 2.0.6 in filename of file in /nix/store/5rgayqfl64bn9pyrfsc9kcm2c4vdqybi-waf-2.0.6
2018-03-23 14:53:24 -05:00
Matthew Justin Bauer 92a5b1b055
Merge pull request #37015 from matthewbauer/cmake-mac-flags
cmake: Setup default macOS flags
2018-03-22 11:16:03 -05:00
Tuomas Tynkkynen 809b0d26bd Merge remote-tracking branch 'upstream/master' into staging 2018-03-22 09:54:10 +02:00
Jan Tojnar bfa24c12a5
meson: set multiple output dirs in setup hook
Closes: #32636
2018-03-22 07:33:49 +01:00
Jan Tojnar fe73013e7d
meson: allow dirs outside of prefix
Upstream insists on not allowing bindir and other dir options
outside of prefix for some reason:

https://github.com/mesonbuild/meson/issues/2561

We remove the check so multiple outputs can work sanely.
2018-03-22 07:33:49 +01:00
Jan Tojnar de910a040b
meson: fix rpath fixup
In common distributions, RPATH is only needed for internal libraries so
meson removes everything else. With Nix, the locations of libraries
are not as predictable, therefore we need to keep them in the RPATH. [1]

Previously we have just kept the RPATH produced by the linker, patching
meson not to remove it. This deprived us of potentially replacing it
with install_rpath provided by project so we had to re-add it manually,
and also introduced a vulnerability of keeping build paths in RPATH.

This commit restores the clean-up but modifies it so the items starting
with /nix/store are retained.

This should be relatively safe since the store is immutable, however,
there might be some unwanted retainment of build_rpath [2] if it contains
paths from Nix store.

[1]: https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
[2]: http://mesonbuild.com/Release-notes-for-0-42-0.html#added-build_rpath-keyword-argument
2018-03-22 07:30:58 +01:00
Matthew Justin Bauer e2e3b35e10
Merge pull request #37238 from matthewbauer/auto-update/ant
ant: 1.9.6 -> 1.10.2
2018-03-21 23:41:52 -05:00
Shea Levy 4250dd5de4
Merge branch 'master' into staging 2018-03-20 08:38:28 -04:00
Matthew Justin Bauer 4f338db600
Merge pull request #36681 from ryantm/auto-update/redo-sh
redo-sh: 1.2.6 -> 2.0.3
2018-03-19 12:28:03 -05:00
Matthew Bauer 4cc1cd8516 cmake-2.8: supports darwin
builds fine, just need to enable to
2018-03-19 05:42:15 -05:00
Pascal Wittmann a4752e1132
icmake: 9.02.06 -> 9.02.07 2018-03-18 20:44:29 +01:00
Matthew Bauer 26398c030b ant: 1.9.6 -> 1.10.2
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.10.2 with grep in /nix/store/ymhiik4c7604dxzlnvrrzj88d2lkcy16-ant-1.10.2
2018-03-17 03:53:31 -05:00
Shea Levy 519f0b8db2
gnumake: Unconditionally fix build against glibc-2.27 2018-03-16 14:43:12 -04:00
Ryan Mulligan d32ea36e8c buildbot-worker: 1.0.0 -> 1.1.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/.buildbot-worker-wrapped --help` got 0 exit code
- ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/.buildbot-worker-wrapped --version` and found version 1.1.0
- ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/buildbot-worker --help` got 0 exit code
- ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/buildbot-worker --version` and found version 1.1.0
- found 1.1.0 with grep in /nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0
2018-03-16 05:25:15 -07:00
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
Timo Kaufmann 488835ec6e conan: Locally pin deps, enable tests 2018-03-15 13:48:58 +01:00
Joachim F 95e28a6c39
Merge pull request #36509 from ryantm/auto-update/doit
doit: 0.30.3 -> 0.31.0
2018-03-14 19:48:20 +00:00
Matthew Bauer bd9b17f762 cmake: correctly detect clang compiler on macOS 2018-03-14 14:36:27 -05:00