diff options
author | Orivej Desh <orivej@gmx.fr> | 2018-06-09 07:41:38 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2018-06-09 07:41:38 +0000 |
commit | a448357dc62b26c95c3df84a156656e54aaf58b1 (patch) | |
tree | f12d66a0b81f2fbaa70db89b516a66bddc1b838c /pkgs/development/tools | |
parent | 06fa8674984e8ab637a29b91bdaa11dc5cbacb80 (diff) | |
parent | 0e07efa3c53b588dcd2efca8fafb35c779869d4e (diff) | |
download | nixpkgs-a448357dc62b26c95c3df84a156656e54aaf58b1.tar nixpkgs-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.gz nixpkgs-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.bz2 nixpkgs-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.lz nixpkgs-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.xz nixpkgs-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.zst nixpkgs-a448357dc62b26c95c3df84a156656e54aaf58b1.zip |
Merge branch 'master' into staging
* master: (71 commits) xen: enable parallel building spice: 0.13.3 -> 0.14.0 powerline-rs: 0.1.7 -> 0.1.8 (#41736) xidlehook: 0.4.6 -> 0.4.8 (#41094) serf: update scons patch, enable kerberos on darwin firefox-bin: Add ffmpeg to lib path firefox-beta-bin: 61.0b10 -> 61.0b12 firefox-devedition-bin: 61.0b10 -> 61.0b12 wireguard-go: assign yegortimoshenko as maintainer wireguard-go: 0.0.20180519 -> 0.0.20180531 zfs: Fix "zfs-sync" for modern systemd nixos/memcached: added simple set/get test jenkins: 2.89.4 -> 2.107.3 (#41618) focuswriter: 1.6.12 -> 1.6.13 (#41567) ne: 3.0.1 -> 3.1.1 (#41536) libpqxx: 6.2.3 -> 6.2.4 (#41547) mate.mate-applets: 1.20.1 -> 1.20.2 (#41546) mate.mate-themes: 3.22.16 -> 3.22.17 (#41541) nixos/munge: run munge as user munge instead of root. (#41509) pstoedit: 3.71 -> 3.73 (#41528) ...
Diffstat (limited to 'pkgs/development/tools')
4 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 2d534435b5f..ebbf5023374 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.89.4"; + version = "2.107.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0lwv3y12r36amkr70fap5g1zfd7vv92809lh9w7178s91sikm28x"; + sha256 = "1f4sz1dqcfypdywdwcz4byjmir7ismcpzg2hbgg6pcf5pq4yba8p"; }; buildCommand = '' diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index e25b94714b6..18b84e2c961 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/" fi - if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"; then - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs" + if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"; then + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" fi export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" if test -n "$createFindlibDestdir"; then diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index 38fd4323d5c..abfcdb61c1e 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, opam }: +{ stdenv, fetchFromGitHub, ocamlPackages, opaline }: stdenv.mkDerivation rec { name = "jbuilder-${version}"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f"; }; - buildInputs = [ ocaml ]; + buildInputs = with ocamlPackages; [ ocaml findlib ]; dontAddPrefix = true; - installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; + installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; preFixup = "rm -rf $out/jbuilder"; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Fast, portable and opinionated build system"; maintainers = [ stdenv.lib.maintainers.vbgl ]; license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; + inherit (ocamlPackages.ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 469e97e19de..aa9feda985a 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -71,8 +71,12 @@ in stdenv.mkDerivation rec { # Dirty, but apparently ocp-build requires a TERM makeFlags = ["TERM=screen"]; + # change argv0 to "opam" as a workaround for + # https://github.com/ocaml/opam/issues/2142 postInstall = '' - wrapProgram $out/bin/opam \ + mv $out/bin/opam $out/bin/.opam-wrapped + makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ + --argv0 "opam" \ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin ''; |