diff options
-rw-r--r-- | maintainers/scripts/find-tarballs.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/network-filesystems/u9fs.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix | 62 | ||||
-rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/optipng/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/cjdns/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/security/sshuttle/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive-new/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
9 files changed, 59 insertions, 61 deletions
diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 0065945966026..ad79af90901e8 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -14,12 +14,12 @@ let operator = const [ ]; }); - urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies; + urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies; fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat" - && drv.postFetch or "" == "" && drv ? urls) + && drv.postFetch or "" == "" && (drv ? url || drv ? urls)) dependencies; dependencies = map (x: x.value) (genericClosure { diff --git a/nixos/modules/services/network-filesystems/u9fs.nix b/nixos/modules/services/network-filesystems/u9fs.nix index 648097274641c..8bc37f0f62c37 100644 --- a/nixos/modules/services/network-filesystems/u9fs.nix +++ b/nixos/modules/services/network-filesystems/u9fs.nix @@ -27,10 +27,17 @@ in ''; }; + user = mkOption { + type = types.str; + default = "nobody"; + description = + "User to run u9fs under."; + }; + extraArgs = mkOption { type = types.str; default = ""; - example = "-a none -u nobody"; + example = "-a none"; description = '' Extra arguments to pass on invocation, @@ -38,13 +45,6 @@ in ''; }; - fsroot = mkOption { - type = types.path; - default = "/"; - example = "/srv"; - description = "File system root to serve to clients."; - }; - }; }; @@ -63,9 +63,10 @@ in reloadIfChanged = true; requires = [ "u9fs.socket" ]; serviceConfig = - { ExecStart = "-${pkgs.u9fs}/bin/u9fs ${cfg.extraArgs} ${cfg.fsroot}"; + { ExecStart = "-${pkgs.u9fs}/bin/u9fs ${cfg.extraArgs}"; StandardInput = "socket"; StandardError = "journal"; + User = cfg.user; }; }; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 2b6b0d5b41236..d1a00f1bd0440 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,6 +36,13 @@ }: +/* When updating this package, test that the following derivations build: + + * flashplayer + * flashplayer-standalone + * flashplayer-standalone-debugger +*/ + let arch = if stdenv.system == "x86_64-linux" then @@ -49,66 +56,59 @@ let suffix = if stdenv.system == "x86_64-linux" then if debug then throw "no x86_64 debugging version available" - else "-release.x86_64" + else "_linux.x86_64" else if stdenv.system == "i686-linux" then if debug then "_linux_debug.i386" else "_linux.i386" else throw "Flash Player is not supported on this platform"; + saname = + if debug then "flashplayerdebugger" + else "flashplayer"; + is-i686 = (stdenv.system == "i686-linux"); in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.577"; + version = "11.2.202.616"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "1k02d6c9y8z9lxyqyq04zsc5735cvm30mkwli71mh87fr1va2q4j"; + sha256 = "0y4bjkla6ils4crmx61pi31s4gscy8rgiv7xccx1z0g6hba9j73l"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; + + sourceRoot = "."; postUnpack = '' - pushd $sourceRoot - tar -xvzf *${arch}/*${suffix}.tar.gz + cd *${arch} - ${ lib.optionalString is-i686 '' - tar -xvzf */*_sa.*.tar.gz - tar -xvzf */*_sa_debug.*.tar.gz - ''} + tar -xvzf *${suffix}.tar.gz - popd + ${lib.optionalString is-i686 '' + tar -xvzf *_sa[_.]*.tar.gz + ''} ''; - sourceRoot = "fp_${version}_archive"; - dontStrip = true; dontPatchELF = true; - outputs = [ "out" ] ++ lib.optionals is-i686 ["sa" "saDbg" ]; + outputs = [ "out" ] ++ lib.optional is-i686 "sa"; installPhase = '' mkdir -p $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins - patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so - - ${ lib.optionalString is-i686 '' - mkdir -p $sa/bin - cp flashplayer $sa/bin/ - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $sa/bin/flashplayer + patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so - mkdir -p $saDbg/bin - cp flashplayerdebugger $saDbg/bin/ + ${lib.optionalString is-i686 '' + install -Dm755 ${saname} $sa/bin/flashplayer - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $saDbg/bin/flashplayerdebugger + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$rpath" \ + $sa/bin/flashplayer ''} ''; @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { mozillaPlugin = "/lib/mozilla/plugins"; }; - rpath = stdenv.lib.makeLibraryPath + rpath = lib.makeLibraryPath [ zlib alsaLib curl nspr fontconfig freetype expat libX11 libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf libvdpau nss diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index b99727b2c9b61..f44baad4715b0 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -3,7 +3,7 @@ , ApplicationServices, cf-private }: let - version = "3.7.1"; + version = "3.7.3"; name = "mercurial-${version}"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1vfgqlb8z2k1vcx2nvcianxmml79cqqqncchw6aj40sa8hgpvlwn"; + sha256 = "0c2vkad9piqkggyk8y310rf619qgdfcwswnk3nv21mg2fhnw96f0"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 08f99469d255b..767ea0e542540 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "optipng-0.7.5"; + name = "optipng-0.7.6"; src = fetchurl { url = "mirror://sourceforge/optipng/${name}.tar.gz"; - sha256 = "17b197437z5wn29llpwklk7ihgx8bhc913gvjf4zyb81idwlprbl"; + sha256 = "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28"; }; buildInputs = [ libpng ]; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 906ca5f39dd3b..2ccfbb816fba2 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,17 +1,12 @@ -{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: +{ stdenv, fetchurl, nodejs, which, python27, utillinux }: -let - version = "16"; # see ${src}/util/version/Version.h - date = "20150509"; -in +let version = "17.3"; in stdenv.mkDerivation { - name = "cjdns-${version}-${date}"; + name = "cjdns-"+version; - src = fetchFromGitHub { - owner = "cjdelisle"; - repo = "cjdns"; - rev = "a05ade40dc31caebaf3aa770aac3ab2ecb02d867"; - sha256 = "07vwsw5d0sdxypl187cyzzdrv0chf4yyjxcymf847afkfr249n29"; + src = fetchurl { + url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; + sha256 = "00p62y7b89y3piirpj27crprji8nh0zv7zh4mcqhzh6r39jxz4ri"; }; buildInputs = [ which python27 nodejs ] ++ @@ -35,7 +30,7 @@ stdenv.mkDerivation { homepage = https://github.com/cjdelisle/cjdns; description = "Encrypted networking for regular people"; license = licenses.gpl3; - maintainers = with maintainers; [ viric ehmry ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 4a8d7518e9c28..4111957476787 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -3,10 +3,10 @@ pythonPackages.buildPythonApplication rec { name = "sshuttle-${version}"; - version = "0.77.2"; + version = "0.78.0"; src = fetchurl { - sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10"; + sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b"; url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz"; }; diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index fbf4adde2ae72..a2f0bf706c870 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -104,6 +104,7 @@ let mkUrlName = { pname, tlType, ... }: pname + lib.optionalString (tlType != "run") ".${tlType}"; + # command to unpack a single TL package unpackPkg = { # url ? null, urlPrefix ? null md5, pname, tlType, postUnpack ? "", stripPrefix ? 1, ... @@ -119,6 +120,7 @@ let -C "$out" --anchored --exclude=tlpkg --keep-old-files '' + postUnpack; + # create a derivation that contains unpacked upstream TL packages mkPkgs = { pname, tlType, version, pkgList }@args: /* TODOs: - "historic" isn't mirrored; posted a question at #287 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfb1d258ba3a2..8eb73ff9d9097 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12378,7 +12378,7 @@ in flashplayer-standalone = pkgsi686Linux.flashplayer.sa; - flashplayer-standalone-debugger = pkgsi686Linux.flashplayer.saDbg; + flashplayer-standalone-debugger = (pkgsi686Linux.flashplayer.override { debug = true; }).sa; fluxbox = callPackage ../applications/window-managers/fluxbox { }; |