3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

870 commits

Author SHA1 Message Date
Nikolay Amiantov c69d90b888 bazel: fix lost dependencies
Fixes #31249
2017-11-10 22:34:42 +03:00
Nikolay Amiantov 6bdee9c730 bazel: add Nix hacks
Those are needed to build Bazel packages in Nix.
2017-11-10 22:34:42 +03:00
Jan Tojnar 1dba3c06eb
meson: pass library install paths to g-ir-scanner
We are patching g-ir-scanner to produce absolute paths in the GIR
files. When an application uses an internal library placed in a
non-standard path (e.g. $out/lib/gnome-shell), the scanner needs
to be informed. For autotools-based apps, the full path was
obtained from libtool-wrapped files; with Meson, this is no longer
possible – we need to pass the path information in some other way.

This commit channels the --fallback-library-path option added
to g-ir-scanner in aforementioned patch.
2017-11-09 21:21:00 +01:00
Orivej Desh ad0c2d5a79
Merge pull request #31056 from purefn/master
make sure which and curl are available in the PATH for sbt-extras
2017-11-06 06:21:09 +00:00
Richard Wallace 29c182f2b2 sbt-extras: make sure which and curl are available in the PATH 2017-11-06 06:20:34 +00:00
Piotr Bogdan 8904ce343a fix source root locations.
These have changed following commit
c3255fe8ec.

See also:

- https://github.com/NixOS/nixpkgs/pull/31004
- https://github.com/NixOS/nixpkgs/pull/31106
2017-11-02 13:53:36 +00:00
Jörg Thalheim fbb0b8eaaf
Merge pull request #31087 from andrestylianos/boot
boot: 2.5.2 -> 2.7.2
2017-11-02 09:10:05 +00:00
Mateusz Kowalczyk ac2976d829 bazel: 0.6.1 -> 0.7.0 2017-11-01 20:03:58 +00:00
Mateusz Kowalczyk b902a88e80 buck: 2017.05.31.01 -> 2017.10.01.01 2017-11-01 19:34:19 +00:00
André Stylianos Ramos 8014307c64 boot: 2.5.2 -> 2.7.2 2017-11-01 14:10:07 +01:00
Vladimír Čunát 447802a683
Merge branch 'master' into staging 2017-10-31 23:47:34 +01:00
Tim Steinbach ec1f7a7e95
Merge pull request #31035 from cko/maven_3_5_2
maven: 3.5.0 -> 3.5.2
2017-10-31 08:56:20 -04:00
Christine Koppelt 2a09272b5b maven: 3.5.0 -> 3.5.2 2017-10-31 12:43:34 +01:00
Vladimír Čunát 53c6b01a81
Merge #30979: gnumake: fix occasional hangs 2017-10-30 22:31:03 +01:00
Vladimír Čunát 687943763c
Merge branch 'master' into staging 2017-10-30 22:30:14 +01:00
Tim Steinbach 25c8014a4b
gradle: 4.2.1 -> 4.3 2017-10-30 13:35:12 -04:00
Ricardo M. Correia 029522249b gnumake: fix occasional hangs in parallel builds
https://savannah.gnu.org/bugs/?49014
https://savannah.gnu.org/bugs/?51159
2017-10-30 16:15:43 +01:00
Frederik Rietdijk 6d41ae55dd Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-30 07:51:09 +01:00
Shea Levy 9e37df185c
fwupd: Remove manual rpath settings now that meson is fixed.
Thanks @yegortimoshenko!
2017-10-29 14:42:55 -04:00
Frederik Rietdijk 8634a2e2c5 Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-27 21:35:58 +02:00
Tim Steinbach a924cd2beb
sbt: No need for bc buildInput 2017-10-27 12:15:29 -04:00
Tim Steinbach eae5dfe134
sbt: 1.0.2 -> 1.0.3 2017-10-27 08:03:25 -04:00
Brian McKenna c3d24791f5 sbt-extras: init at 77686b3
Fixes #21783
2017-10-26 11:30:45 +11:00
Daniel Peebles 5541a9c26f Merge pull request #30640 from matthewbauer/cmake-frameworks
cmake: setup CMAKE_FRAMEWORK_PATH
2017-10-25 09:59:40 -04:00
Nikolay Amiantov 0ce09afcfa bazel_0_4: additonal fix for Darwin 2017-10-21 18:21:52 +03:00
Nikolay Amiantov a86fe917b9 bazel_0_4: try to fix on Darwin
First round of fixes -- let's see how Hydra reacts.
2017-10-21 17:36:54 +03:00
Matthew Bauer 24eb665695 cmake: setup CMAKE_FRAMEWORK_PATH
This tells cmake how to find macOS frameworks.

Fixes #26197
2017-10-21 02:27:09 -05:00
Vladimír Čunát 1d317bd84a
scons: fix meta eval 2017-10-20 23:50:27 +02:00
Thomas Mader 75a536459a dub: 1.1.0 -> 1.4.1 (#28396)
- gcc not needed at all as dependency
- other D compilers can be used instead of dmd, so it's not good to use it as a runtime dependency.
- Adding checkPhase (disabled for now because network access is limited in sandbox mode)
- Improve package description.
2017-10-20 20:12:17 +00:00
Michael Weiss e40233e136 scons: 2.5.1 -> 3.0.0
"SCons release 3.0.0 now available from the download page at
SourceForge. This release should be used instead of 2.5.1. This release
fixes several issues.  TThis will be the first release to support Python
versions earlier than 2.7 as well as 3.5+."

"NOTE: This is a major release.  You should expect that some targets may
rebuild when upgrading.  Significant changes in some python action
signatures. Also switching between PY 2.7 and PY 3.5, 3.6 will cause
rebuilds."
2017-10-20 16:32:26 +02:00
Nikolay Amiantov 0d5ff53a15 bazel_0_4: build on Darwin 2017-10-19 16:38:06 +03:00
Nikolay Amiantov e3afbd6d26 bazel_0_4: set absolute path to /usr/bin/env
Also cleanup TMPDIR.
2017-10-19 13:19:11 +03:00
Nikolay Amiantov ba9cde1dd5 bazel_0_4: add optional Nix-specific hacks
* Skip verifying checksums for already fetched packages.
  Needed for two-staged building in Nix:
    1. Build a fixed derivation with `bazel fetch` (filtered out of non-reproducable bits).
    2. Build an actual derivation which uses fetched dependencies (skipping
       checksums needed here because they depend on the build directory).
* Don't clean environment variables for children processes.
  Needed for Nix compiler wrappers.
2017-10-19 13:19:11 +03:00
Yegor Timoshenko 8f95aef531 meson: do not strip RPATH
https://github.com/NixOS/nixpkgs/pull/28444#issuecomment-324033323
2017-10-15 12:13:58 -05:00
Vladimír Čunát 6525c22ef1
Merge branch 'master' into staging
Hydra: ?compare=1401528
2017-10-14 10:36:13 +02:00
Jörg Thalheim 6a404bba71 Merge pull request #30303 from jtojnar/meson
meson: 0.42.1 → 0.43.0
2017-10-11 13:25:47 +01:00
Franz Pletz 28407fad65 Merge pull request #29726 from stesie/v8
V8 6.2.414.15
2017-10-11 12:21:18 +02:00
Jan Tojnar 15c34cf1d8
meson: 0.42.1 → 0.43.0 2017-10-10 23:11:38 +02:00
Vladimír Čunát 2aca029ed2
cmake: maintenance 3.9.2 -> 3.9.4 2017-10-08 18:24:12 +02:00
Vladimír Čunát ef41fc7f51
Merge branch 'master' into staging
Hydra: ?compare=1399476
2017-10-07 10:17:42 +02:00
Yann Hodique 3e37e20fa5 bazel: 0.6.0 -> 0.6.1 2017-10-06 08:33:57 -07:00
Orivej Desh f137004179 Merge branch 'master' into staging
* master: (81 commits)
  Add NixOS 17.09 AMIs
  gradle: 4.2 -> 4.2.1
  maintainers.nix: use my GitHub handle as maintainer name
  fcitx-engines.rime: init at 0.3.2
  brise: init at 2017-09-16
  librime: init at 1.2.9
  marisa: init at 0.2.4
  opencc: build shared library and programs
  josm: 12712 -> 12914
  exa: 0.7.0 -> 0.8.0
  krb5: add deprecation date for old configuration
  rustRegistry: 2017-09-10 -> 2017-10-03
  go-ethereum: Fix libusb segmentation faults on Darwin
  tor-browser-bundle-bin: 7.0.5 -> 7.0.6
  libsodium: 1.0.13 -> 1.0.15
  tor-browser-bundle: geoip support
  tor-browser-bundle: support transports obfs2,obfs3
  tor-browser-bundle: bump https-everywhere to 2017.9.12
  tint2: limit platforms to Linux since macOS is not supported and fails the tests
  eclipse-plugin-vrapper: init at 0.72.0
  ...
2017-10-03 17:46:39 +00:00
Orivej Desh b465d9c1ff Merge pull request #29460 from sifmelcara/add/rime
fcitx-engines.rime: init at 0.3.2
2017-10-03 15:07:16 +00:00
Tim Steinbach 89e451f713
gradle: 4.2 -> 4.2.1 2017-10-03 10:53:23 -04:00
mingchuan d6b8ac6ca8 maintainers.nix: use my GitHub handle as maintainer name 2017-10-03 14:27:10 +00:00
Orivej Desh fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
Yann Hodique 1fcf8e24a0 bazel: 0.5.4 -> 0.6.0 (#29990) 2017-10-01 18:46:16 -04:00
Tim Steinbach e55a92141e Merge pull request #29639 from NeQuissimus/gradle_4_2
gradle: 4.1 -> 4.2
2017-09-29 09:06:09 -04:00
Charles Strahan b93ba5dcd7
envoy: fix by reviving bazel 0.4
/cc #28643
2017-09-28 16:51:32 -04:00
John Ericson f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Stefan Siegl 24ab22bea8
gn: fix sandbox build 2017-09-24 19:23:20 +02:00
Stefan Siegl 665918c24a
gn: init at 0.0.0.20170629 2017-09-24 11:37:28 +02:00
Vladimír Čunát cea9a52dac
cmake: maintenance 3.9.1 -> 3.9.2 2017-09-24 11:28:30 +02:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Tim Steinbach b390773310
gradle: 4.1 -> 4.2 2017-09-21 07:56:53 -04:00
Tim Steinbach e200cfbae1
sbt: 1.0.1 -> 1.0.2 2017-09-20 09:42:03 -04:00
Jörg Thalheim b6c68c34e5 Merge pull request #29327 from jtojnar/fix/meson-0.42.1
meson: 0.41.2 → 0.42.1
2017-09-13 22:16:32 +01:00
Jan Tojnar ad8e4c272a
meson: 0.41.2 → 0.42.1 2017-09-13 22:37:30 +02:00
Vladimír Čunát 422adc3063
Merge branch 'staging'
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
2017-09-12 19:17:52 +02:00
Guillaume Massé 49c7bed763 sbt-with-scala-native: does not support sbt 1.X yet (#29148)
https://github.com/scala-native/scala-native/issues/915
2017-09-12 08:43:40 +01:00
Jörg Thalheim b1140f92cc Merge pull request #29227 from gleber/beam-tooling-upgrade
beam: tooling upgrade (rebar3, hex2nix, relx, etc)
2017-09-12 08:24:15 +01:00
Artem Kazakov 60709abb82 buildbot: add wsgi dashboards plugin
fixes #29236
2017-09-12 08:16:57 +01:00
Gleb Peregud adbc1ed0d9 rebar3: 3.3.2 -> 3.4.3 2017-09-11 22:56:43 +02:00
Frederik Rietdijk 628b6c0e9d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-11 22:52:53 +02:00
James Kay cf497c60f0 buildbot: 0.9.9post2 -> 0.9.11 2017-09-11 13:25:53 +01:00
Frederik Rietdijk febd5e323d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-08 20:48:14 +02:00
Nikolay Amiantov e5059a8739 bazel: 0.4.5 -> 0.5.4 2017-09-07 17:04:29 +03:00
Peter Hoeg 0bac95c976 rake: 11.1.0 -> 12.0.0 2017-09-07 17:50:36 +08:00
Frederik Rietdijk d38ee5b46c Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-07 09:29:44 +02:00
Frederik Rietdijk b1504b444b conan: 0.21.2 -> 0.26.2, and fix build 2017-09-07 09:28:03 +02:00
Bernd Amend b49b9da3ce
cmake: add withQt5 option and make it the default 2017-09-06 08:02:08 -05:00
Bernd Amend f3ac052f24
cmake: 3.8.2 -> 3.9.1 2017-09-06 08:02:05 -05:00
Tim Steinbach aa59865333
sbt: 1.0.0 -> 1.0.1 2017-09-02 12:54:50 -04:00
Lukas Werling f0a1ab78b4 meson/ninja: add setup hooks (#28444)
* Add setupHook for meson/ninja build

* libhttpseverywhere: Use meson/ninja setupHooks

* jamomacore: Remove superfluous ninja buildInput

* Remove obsolete ninja buildPhases

These are all handled by ninja's setup hook.

* lean2, xcbuild: fix build with ninja setup hook

Ninja is a runtime dependency here. However, cmake can generate Ninja
build files as well to satisfy the setup hook.

* qtwebengine: fix build with ninja setup hook
2017-08-27 19:42:21 +02:00
Frederik Rietdijk 6bbc3a0b24 Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD 2017-08-21 04:44:40 +02:00
volth a0d87c6885 Delete 2.5.nix
delete orphan file

```gradle_2_5``` is in ```default.nix```
2017-08-18 01:46:50 +00:00
Frederik Rietdijk 8f2ea38f8f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-17 18:34:17 +02:00
mimadrid 4fb22bb622
meson: 0.40.0 -> 0.41.2 2017-08-15 11:54:43 +02:00
Frederik Rietdijk 62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Frederik Rietdijk 13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Vladimír Čunát 34946256a0
Merge #27424: stdenv: Don't put man pages into $doc 2017-08-13 19:32:51 +02:00
Tuomas Tynkkynen 1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Tim Steinbach ae5e8dda07
sbt: 0.13.16 -> 1.0.0 2017-08-11 10:22:20 -04:00
Tim Steinbach 4edcfa3eb7
gradle: 4.0.2 -> 4.1 2017-08-07 11:44:35 -04:00
mimadrid 09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Frederik Rietdijk 20b8e4b4cf Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-30 08:09:11 +02:00
Tim Steinbach 9ea8535fa7 Merge pull request #27717 from NeQuissimus/sbt_0_13_16
sbt: 0.13.15 -> 0.13.16
2017-07-30 00:21:55 -04:00
Tim Steinbach 324197e60e
sbt: 0.13.15 -> 0.13.16 2017-07-28 11:27:35 -04:00
Franz Pletz b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Tim Steinbach 8b3e9a1358
gradle: 4.0.1 -> 4.0.2 2017-07-26 14:19:01 -04:00
John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
Guillaume Maudoux 868dd0f7c1 tup: 0.7.3 -> 0.7.5 2017-07-26 15:38:43 +02:00
Eelco Dolstra 6669a3b477
stdenv: Remove log nesting
Nix/Hydra no longer support pretty printing of logs, so this is no
longer useful.
2017-07-24 14:30:46 +02:00
Eelco Dolstra 9f345ce2c7
gnumake41: Remove unused version 2017-07-24 14:27:12 +02:00
Eelco Dolstra 8cfe77444b
gnumake40: Remove unused version 2017-07-24 14:27:11 +02:00
Eelco Dolstra 969d7b0451
gnumake380: Remove
This hasn't been used in a long time.
2017-07-24 14:27:11 +02:00
Thomas Tuegel 4f88ceff49
jam: unset AR
Commit 093cc00cdd sets the AR environment variable
by default, but this causes the jam Makefile to use the wrong command.
2017-07-22 19:36:55 -05:00
Dan Peebles 8253fc2ae5 pants: 1.2.1 -> 1.3.0
I'm also removing the pants13-pre attribute since it's unnecessary and I
don't want to maintain 1.4.x prereleases yet.

I'm temporarily taking out the pants native rust engine shenanigans until
I can get a nix-native rust build of it to work (it works on Linux but
not on Darwin!)
2017-07-17 10:37:52 -04:00
Tim Steinbach 1a7d9f573b
gradle: 4.0 -> 4.0.1 2017-07-07 19:52:57 -04:00