Commit graph

7056 commits

Author SHA1 Message Date
Matthew Bauer b300dddae1 xcbuild: only override version with 1 arg
sometimes we want the "SDK" version from xcbuild so we do something
like:

$ xcbuild -version -sdk MacOSX10.10
SDKSettings.plist - MacOSX10.10 (MacOSX10.10)
SDKVersion: 10.10
Path: /nix/store/6k7crm1n4drf09ga0dwvbmb59x4zl2i2-SDKs/MacOSX10.10.sdk
PlatformPath: /nix/store/vhfwb1znfy65s2xs27j8xribk6mp6lbw-Platforms/MacOSX.platform
ProductName: Mac OS X
ProductVersion: 10.10

This was previously overriden by the current xcode version so you
would get:

Xcode 9.4.1
Build version 17E189

This should fix the other usage of -version in nodejs 6.x.
2018-08-20 13:16:37 -05:00
Vladimír Čunát 153a19df05
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
xeji 08f69510e5
Merge pull request #45341 from flokli/sqldeveloper-18.2
sqldeveloper_18: init at 18.2.0.183.1748
2018-08-19 23:44:39 +02:00
Urban Skudnik af5511659c backblaze-b2: Fix backblaze bash autocomplete issue
Backblaze's CLI tool is relying on `have` function which is
deprecated[1] and gets dereferenced[2] at the end of `bash-completion`.

This causes issues for NixOS because those bash completions are
run after bash-completion[3] has already run and unset the
`have` function.

[1] 4d88339928/bash_completion (L114)
[2] 4d88339928/bash_completion (L2103)
[3] 80b6513fbf/nixos/modules/programs/bash/bash.nix (L22)
2018-08-19 22:13:42 +02:00
Florian Klink 3edf605622 sqldeveloper: add flokli to maintainers 2018-08-19 17:32:10 +02:00
Maximilian Bosch 5354e99401 sqldeveloper_18: init at 18.2.0.183.1748 2018-08-19 17:32:10 +02:00
Joachim F f1c5054d78
Merge pull request #45002 from q3k/q3k/diamond
diamond: init at 3.10
2018-08-19 10:09:56 +00:00
Joachim F ed7b0f6f4f
Merge pull request #44977 from alyssais/puppet-lint
puppet-lint: init at 2.3.6
2018-08-19 09:54:47 +00:00
Vladimír Čunát 14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát 209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Peter Simons aa5a93e21d multi-ghc-travis: update to latest git version 2018-08-17 19:27:19 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Jörg Thalheim d6d9ca679e
Merge pull request #45233 from r-ryantm/auto-update/ghp-import
ghp-import: 0.4.1 -> 0.5.5
2018-08-17 12:43:38 +01:00
R. RyanTM dec5067b16 ghp-import: 0.4.1 -> 0.5.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ghp-import/versions.
2018-08-17 03:14:21 -07:00
Wael M. Nasreddine 9c5b7cc5d1 bazel: patch //tools/bash/runfiles/runfiles.bash to include defaultShellPath in PATH
closes #43955
2018-08-17 10:51:03 +02:00
Ruben Maher d591f8a54d flow: 0.78.0 -> 0.79.0 2018-08-17 12:08:53 +09:30
Jörg Thalheim 6b900840bc
Merge pull request #45151 from r-ryantm/auto-update/react-native-debugger
react-native-debugger: 0.7.18 -> 0.7.20
2018-08-17 00:33:47 +02:00
Jörg Thalheim d70d575151
Merge pull request #45156 from markuskowa/lics-tools
Add license meta tags
2018-08-17 00:31:26 +02:00
R. RyanTM a1f77fbf9c react-native-debugger: 0.7.18 -> 0.7.20
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/react-native-debugger/versions.
2018-08-16 13:38:48 -07:00
Markus Kowalewski f9a1aef084
flex: add license 2018-08-16 21:51:07 +02:00
Jörg Thalheim c4dbfa0321
Merge pull request #45115 from dtzWill/update/strace-4.24
strace: 4.23 -> 4.24
2018-08-16 15:44:17 +02:00
Jörg Thalheim 1fd75a1003
Merge pull request #45110 from flokli/sqldeveloper
sqldeveloper: simplify, add darwin support
2018-08-16 15:20:46 +02:00
Will Dietz 42f5a23fc2 strace: 4.23 -> 4.24 2018-08-16 07:59:27 -05:00
Vincent Demeester 560f95b5e3
pprof: 2017-08-28 -> 2018-08-15
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-08-16 13:43:56 +02:00
Florian Klink 29503b1fec sqldeveloper: simplify, add darwin support
Use unpackCmd and installPhase instead of overwriting buildCommand.
This makes the derivation more readable, and adds binary stripping and
shebang patching of the output as a bonus :-)

Use makeWrapper instead of a custom wrapper script, and only export
environment variables that are used.

Set JAVA_HOME to ${jdk.home}, making it more generic and independent of
the specific jdk path being used (was a different one on zulu). This
fixes sqldeveloper on darwin, so add it to supported platforms
(plus the known-working x86_64-linux)
2018-08-16 11:38:56 +02:00
Jörg Thalheim 78b357924a
Merge pull request #45089 from frontsideair/flow-0.78.0
flow: 0.77.0 -> 0.78.0
2018-08-16 10:11:33 +02:00
Jörg Thalheim 890c6d407d
Merge pull request #44904 from ThomasMader/dlang-update
Dlang update
2018-08-16 08:06:55 +02:00
Fatih Altinok f5da6ff71c
flow: 0.77.0 -> 0.78.0 2018-08-16 00:44:41 +03:00
Pascal Wittmann 6af971573a
intel-gpu-tools: 1.22 -> 1.23 2018-08-14 22:14:55 +02:00
Domen Kožar 849b27c62b
hydra: remove me as maintainer 2018-08-14 11:44:07 +01:00
lewo f2cab31ae9
Merge pull request #44841 from Ma27/bump-hydra
hydra: 2017-11-21 -> 2018-08-07
2018-08-14 09:55:11 +02:00
Sergiusz Bazanski d640cab823 diamond: init at 3.10
This change adds the properietary Lattice Diamond FPGA suite.
2018-08-14 01:38:55 +01:00
Maximilian Bosch 7682c2fd61
hydra: 2017-11-21 -> 2018-08-07
This bumps Hydra to the latest revision available. As Hydra doesn't have
a release model (and therefore no tags) ATM, the derivation will pin
against the actual git revision and the date of the commit in the
derivation name.

Additionally the following changes have been made:

* Dropped `postUnpack` phase. It is useful when working with the Hydra
  source (and no dirty changes shall be used in `release.nix`, but is has
  no use in `nixpkgs`).

* Added myself as maintainer to have more folks available in case of
  future breakage.

* Implemented support for Nix 2.0 and `unstable` (currently 2.1):

  Since 1672bcd230447f1ce0c3291950bdd9a662cee974 in NixOS/nix the
  evaluator differentiates between `settings` and `evalSettings`.
  Previously `restrictEval` in `hydra-eval-jobs.cc` has been set in
  `settings`, this doesn't work anymore in Nix 2.1 and is therefore
  incompatible to Nix 2.0 on an API level.

  To resolve this, the flag `isGreaterNix20` parses the version string
  of `pkgs.nix` and applies a patch if nix.version<=2.0.

  Furthermore the Hydra build with Nix 2.1 requires `boost` as build input
  which is not needed for Nix 2.0. To avoid unnecessary increase in the
  closure size this library will only used as build input for
  nix.version>2.0.

* Fixed the NixOS test for `hydra`:
  disabled binary cache to allow sandbox builds (otherwise it would
  query `cache.nixos.org` during the Hydra build inside the test).

  Additionally the trivial.nix jobset required simplification (as done
  in NixOS/hydra, e.g. tests/api-test.nix) as bash is not available in
  the build sandbox as builder (even when adding pkgs.bash to
  systemPackages).

  The easiest workaround to confirm a the functionality of a jobset
  without importing nixpkgs is to use the default shell /bin/sh which
  is mounted from `pkgs.busybox` into the build env
  (https://github.com/NixOS/nixpkgs/pull/44841#discussion_r209751972) in the
  VM and a named pipe to create $out.

Closes #44044
2018-08-13 22:56:27 +02:00
Vladimír Čunát ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Alyssa Ross 43b6d46f4f
puppet-lint: init at 2.3.6 2018-08-13 11:37:59 +01:00
Uri Baghin 8c802d42ad bazel: fix darwin build on hydra 2018-08-13 08:32:27 +02:00
Matthew Bauer 4c1d5a8dac
Merge pull request #44899 from bhipple/fix/antlr-license
antlr: fix license
2018-08-12 09:00:26 -05:00
Periklis Tsirakidis 56b756e757 kubectx: init at v0.5.1 2018-08-12 12:02:52 +02:00
Vladimír Čunát 00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Matthew Bauer c391bd3dd3 xcbuild: cleanup
fix shell shebang
2018-08-11 22:54:48 -05:00
Matthew Bauer b5d529d52f xcbuild: cleanup 2018-08-11 22:54:48 -05:00
Matthew Bauer 0edb441a0e firefox: build on darwin
Fixes #30285
2018-08-11 22:54:48 -05:00
Michael Hoang 78961b663c flootty: 3.2.1 -> 3.2.2 2018-08-12 12:46:05 +10:00
Samuel Dionne-Riel a3722a69be
Merge pull request #44676 from yrashk/nwjs-0.32.1
nwjs: 0.23.6 -> 0.32.1
2018-08-11 22:00:46 -04:00
Thomas Mader c685f15dc2 dub: 1.8.1 -> 1.10.0 2018-08-11 16:53:00 +02:00
Thomas Mader 6301b09eaa dtools: 2.079.1 -> 2.081.1 2018-08-11 16:53:00 +02:00
Benjamin Hipple 34d7a370c1 antlr: fix license
See #43716
2018-08-11 13:43:56 +00:00
Timo Kaufmann 921e5ceef3
Merge pull request #44894 from markuskowa/sqlite-lic
Fix licenses (#43716)
2018-08-11 15:31:29 +02:00
Markus Kowalewski 31d2f03fb9
sqsh: add license 2018-08-11 14:33:05 +02:00