diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-30 13:26:04 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-30 13:26:04 -0700 |
| commit | e7bb9e102323f79832c2e0553b98651a582368c9 (patch) | |
| tree | 029f5217f94e4a0d1f082fb19b90d5b8a00ca6ee /pkgs/tools | |
| parent | d14bb302a7de75ec91e48e1efb4ed5c123c96e3b (diff) | |
| parent | 647671bc537d35923fdaa6f7c03385868635d615 (diff) | |
| download | nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.gz nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.bz2 nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.lz nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.xz nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.tar.zst nixlib-e7bb9e102323f79832c2e0553b98651a582368c9.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nixops/unstable.nix | 48 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive-new/default.nix | 2 |
2 files changed, 1 insertions, 49 deletions
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix deleted file mode 100644 index 011ebf7198e6..000000000000 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, pythonPackages, fetchgit, libxslt, docbook5_xsl, openssh }: - -pythonPackages.buildPythonPackage rec { - name = "nixops-1.3pre-cefcd9ba"; - namePrefix = ""; - - src = fetchgit { - url = https://github.com/NixOS/nixops; - rev = "9a05ebc332701247fa99fbf6d1215d48e08f3edd"; - sha256 = "17vxr51wpdd5dnasiaafga3a6ddhxyrwgr0yllczxj6bq0n5skp2"; - }; - - buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ]; - - propagatedBuildInputs = - [ pythonPackages.prettytable - pythonPackages.boto - pythonPackages.hetzner - pythonPackages.libcloud - pythonPackages.sqlite3 - ]; - - doCheck = true; - - postInstall = - '' - # Backward compatibility symlink. - ln -s nixops $out/bin/charon - - # Documentation build is currently broken. Re-try with newer version. - : make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ - docdir=$out/share/doc/nixops mandir=$out/share/man - - mkdir -p $out/share/nix/nixops - cp -av "nix/"* $out/share/nix/nixops - - # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL - # the version of openssh is causing errors when have big networks (40+) - wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" - ''; - - meta = { - homepage = https://github.com/NixOS/nixops; - description = "NixOS cloud provisioning and deployment tool"; - maintainers = [ lib.maintainers.tv ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index 961fbc26ba47..c8b2a414fa31 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -129,7 +129,7 @@ let urlPrefix = args.urlPrefix or ("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"); # beware: standard mirrors http://mirror.ctan.org/ don't have releases - mirror = "ftp://tug.ctan.org"; # also works: ftp.math.utah.edu but same IP + mirror = "http://ftp.math.utah.edu"; # ftp://tug.ctan.org no longer works, although same IP in '' tar -xf '${ fetchurl { inherit url md5; } }' \ '--strip-components=${toString stripPrefix}' \ |