diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/servers/http | |
parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
download | nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.gz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.bz2 nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.lz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.xz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.zst nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/joseki/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix index f42ae81a700d..59f9fd8624d1 100644 --- a/pkgs/servers/http/joseki/default.nix +++ b/pkgs/servers/http/joseki/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , unzip , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -47,13 +47,13 @@ rec { phaseNames = ["doDeploy" "fixScripts"]; fixScripts = a.doPatchShebangs ''$TARGET/bin''; - + doDeploy = a.fullDepEntry ('' ${a.lib.concatStringsSep ";" (map (y : "unzip ${y}") tarballFiles)} for i in */; do cp -rTf $i merged; done cd merged - - for i in "lib/"jsp-*/*.jar; do + + for i in "lib/"jsp-*/*.jar; do ln -s "''${i#lib/}" "lib" || true done @@ -67,7 +67,7 @@ rec { ls "lib/"tdb-[0-9]*.jar | sort | tac | tail -n +2 ls "lib/"jetty-[0-9]*.jar | sort | tac | tail -n +2 ls "lib/"jetty-util-[0-9]*.jar | sort | tac | tail -n +2 - ) | + ) | xargs -I @@ mv @@ lib/obsolete mv lib/slf4j-simple-*.jar lib/obsolete @@ -106,8 +106,7 @@ rec { raskin ]; hydraPlatforms = []; # Builder is just unpacking/mixing what is needed - license = "free"; # mix of packages under different licenses + license = a.lib.licenses.free; # mix of packages under different licenses homepage = "http://openjena.org/"; }; }) x - |