diff options
author | John Ericson <git@JohnEricson.me> | 2019-03-10 13:53:59 -0400 |
---|---|---|
committer | John Ericson <git@JohnEricson.me> | 2019-03-10 13:53:59 -0400 |
commit | 4dfe9f9eb859c71d05fc1f1c90b71d5e01a18ba1 (patch) | |
tree | debb3e1ba8ea732e8c27a1ee30b8bbf5f1c6d8c7 /pkgs/tools/package-management | |
parent | bfc72142e0b05ce103988baf4d8cff602c132a4d (diff) | |
parent | 213d6dd6ac1e440e95398448dae4bd6cf24989dd (diff) |
Merge remote-tracking branch 'upstream/master' into override-unstable-nix
Diffstat (limited to 'pkgs/tools/package-management')
17 files changed, 310 insertions, 133 deletions
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index af42b579a423..49fe307667af 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,123 +1,15 @@ -{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive -, extraPkgs ? pkgs: [] }: +{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive, runtimeShell +, extraPkgs ? pkgs: [], appimageTools }: -buildFHSUserEnv { +let + fhsArgs = appimageTools.defaultFhsEnvArgs; +in buildFHSUserEnv (fhsArgs // { name = "appimage-run"; - # Most of the packages were taken from the Steam chroot - targetPkgs = pkgs: with pkgs; [ - gtk3 - bashInteractive - gnome3.zenity - python2 - xorg.xrandr - which - perl - xdg_utils - iana-etc - ] ++ extraPkgs pkgs; - - multiPkgs = pkgs: with pkgs; [ - desktop-file-utils - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes - libGL - - gst_all_1.gstreamer - gst_all_1.gst-plugins-ugly - libdrm - xorg.xkeyboardconfig - xorg.libpciaccess - - glib - gtk2 - bzip2 - zlib - gdk_pixbuf - - xorg.libXinerama - xorg.libXdamage - xorg.libXcursor - xorg.libXrender - xorg.libXScrnSaver - xorg.libXxf86vm - xorg.libXi - xorg.libSM - xorg.libICE - gnome2.GConf - freetype - (curl.override { gnutlsSupport = true; sslSupport = false; }) - nspr - nss - fontconfig - cairo - pango - expat - dbus - cups - libcap - SDL2 - libusb1 - udev - dbus-glib - libav - atk - at-spi2-atk - libudev0-shim - networkmanager098 - - xorg.libXt - xorg.libXmu - xorg.libxcb - libGLU - libuuid - libogg - libvorbis - SDL - SDL2_image - glew110 - openssl - libidn - tbb - wayland - mesa_noglu - libxkbcommon - - flac - freeglut - libjpeg - libpng12 - libsamplerate - libmikmod - libtheora - libtiff - pixman - speex - SDL_image - SDL_ttf - SDL_mixer - SDL2_ttf - SDL2_mixer - gstreamer - gst-plugins-base - libappindicator-gtk2 - libcaca - libcanberra - libgcrypt - libvpx - librsvg - xorg.libXft - libvdpau - alsaLib - strace - ]; + targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = writeScript "appimage-exec" '' - #!${stdenv.shell} + #!${runtimeShell} APPIMAGE="$(realpath "$1")" if [ ! -x "$APPIMAGE" ]; then @@ -153,4 +45,4 @@ buildFHSUserEnv { exec ./AppRun ''; -} +}) diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index 988147d7ab00..2912999fafa9 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "apt-dater-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "DE-IBH"; repo = "apt-dater"; rev = "v${version}"; - sha256 = "1flr6cm72cywmwp5h7pbmmpq057xsi9shkczyplxqaqrb2gns5fl"; + sha256 = "1r6gz9jkh1wxi11mcq5p9mqg0szclsaq8ic79vnfnbjdrmmdfi4y"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 3ab7aa99c8df..864c229b8803 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.4"; + version = "1.19.5"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1bp0zq3h1ad6rzljmmalkh9ms4y6znk1gmgjpy39as2mhvlk8ln1"; + sha256 = "0i1mwqf60n25f89zfvp7fsa4v5rlqxhkhqah35g6j2k1ffcpqcpd"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 27dbad884132..51a963497fa2 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "morph-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "0pixm48is9if9d2b4qc5mwwa4lzma6snkib6z2a1d4pmdx1lmpmm"; + sha256 = "0jhypvj45yjg4cn4rvb2j9091pl6z5j541vcfaln5sb3ds14fkwf"; }; goPackagePath = "github.com/dbcdk/morph"; @@ -16,6 +16,12 @@ buildGoPackage rec { buildInputs = [ go-bindata ]; + buildFlagsArray = '' + -ldflags= + -X + main.version=${version} + ''; + prePatch = '' go-bindata -pkg assets -o assets/assets.go data/ ''; diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 74c2fd59d4e3..41471b2c8a7a 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -24,6 +24,6 @@ buildGoPackage rec { ''; license = licenses.asl20; maintainers = with maintainers; [ pjones ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index 063c173a4019..efedb8b67da9 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,4 +1,5 @@ -{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }: +{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper +, runtimeShell }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; version = "0.4.0"; @@ -26,7 +27,7 @@ let self = stdenv.mkDerivation rec { let impl = import "${self}/share/nix/api.nix" { inherit pkgs pinConfig; }; in { inherit (impl) augmentedPkgs pins callPackage; }; updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix new file mode 100644 index 000000000000..96a283a8ea8a --- /dev/null +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt +, coreutils, gawk, gnugrep, gnused, jq, nix }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "nix-prefetch"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "msteen"; + repo = "nix-prefetch"; + rev = "f9507a655651b51f3a3ebacde85bb40758853615"; + sha256 = "0ykrbvbwwpz348424yy2452idgw8dffi3klh7n85n96dfflyyd4s"; + }; + + nativeBuildInputs = [ + makeWrapper + asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt + ]; + + configurePhase = '' + . configure.sh + ''; + + buildPhase = '' + a2x -f manpage doc/nix-prefetch.1.asciidoc + ''; + + installPhase = '' + lib=$out/lib/${pname} + mkdir -p $lib + substitute src/main.sh $lib/main.sh \ + --subst-var-by lib $lib \ + --subst-var-by version '${version}' + chmod +x $lib/main.sh + patchShebangs $lib/main.sh + cp lib/*.nix $lib/ + + mkdir -p $out/bin + makeWrapper $lib/main.sh $out/bin/${pname} \ + --prefix PATH : '${makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}' + + substitute src/tests.sh $lib/tests.sh \ + --subst-var-by bin $out/bin + chmod +x $lib/tests.sh + patchShebangs $lib/tests.sh + + mkdir -p $out/share/man/man1 + substitute doc/nix-prefetch.1 $out/share/man/man1/nix-prefetch.1 \ + --subst-var-by version '${version}' \ + --replace '01/01/1970' "$date" + + install -D contrib/nix-prefetch-completion.bash $out/share/bash-completion/completions/nix-prefetch + install -D contrib/nix-prefetch-completion.zsh $out/share/zsh/site-functions/_nix_prefetch + + mkdir $out/contrib + cp -r contrib/hello_rs $out/contrib/ + ''; + + meta = { + description = "Prefetch any fetcher function call, e.g. package sources"; + homepage = https://github.com/msteen/nix-prefetch; + license = licenses.mit; + maintainers = with maintainers; [ msteen ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index 7584496f2585..cabd1e491a76 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }: +{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts +, runtimeShell }: python3Packages.buildPythonApplication rec { version = "0.6.3"; name = "nix-update-source-${version}"; @@ -28,7 +29,7 @@ python3Packages.buildPythonApplication rec { overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; }); }; updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 37c7cfa8f3b0..d725692f4054 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -177,13 +177,13 @@ in rec { }; nixUnstable = lib.lowPrio (callPackage common rec { - name = "nix-2.2${suffix}"; - suffix = "pre6600_85488a93"; + name = "nix-2.3${suffix}"; + suffix = "pre6631_e58a7144"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "85488a93ec3b07210339f2b05aa93e970f9ac3be"; - sha256 = "1n5dp7p2lzpnj7f834d25k020v16gnnsm56jz46y87v2x7b69ccm"; + rev = "e58a71442ad4a538b48fc7a9938c3690628c4741"; + sha256 = "1hbjhnvjbh8bi8cjjgyrj4z1gw03ws12m2wi5azzj3rmhnh4c802"; }; fromGit = true; diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix new file mode 100644 index 000000000000..462c9e615a13 --- /dev/null +++ b/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix @@ -0,0 +1,37 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-mgmt-common +}: + +buildPythonPackage rec { + version = "0.20.1"; + pname = "azure-mgmt-compute"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix new file mode 100644 index 000000000000..fd47f8895fd4 --- /dev/null +++ b/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix @@ -0,0 +1,37 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-mgmt-common +, python +}: + +buildPythonPackage rec { + version = "0.20.1"; + pname = "azure-mgmt-network"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix new file mode 100644 index 000000000000..aa037b48b4f5 --- /dev/null +++ b/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix @@ -0,0 +1,25 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-nspkg +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "azure-mgmt-nspkg"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; + }; + + propagatedBuildInputs = [ azure-nspkg ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix new file mode 100644 index 000000000000..b60e3aee3402 --- /dev/null +++ b/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix @@ -0,0 +1,38 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-mgmt-common +}: + + +buildPythonPackage rec { + version = "0.20.1"; + pname = "azure-mgmt-resource"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix new file mode 100644 index 000000000000..2e0523bb25cc --- /dev/null +++ b/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix @@ -0,0 +1,37 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-mgmt-common +}: + +buildPythonPackage rec { + version = "0.20.0"; + pname = "azure-mgmt-storage"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 56e0a31a97ec..73e8c90d4e42 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl }: +{ callPackage, newScope, pkgs, fetchurl }: callPackage ./generic.nix (rec { version = "1.6.1"; @@ -6,4 +6,19 @@ callPackage ./generic.nix (rec { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; }; +# nixops is incompatible with the most recent versions of listed +# azure-mgmt-* packages, therefore we are pinning them to +# package-private versions, so that they don't get trampled by +# updates. +# see +# https://github.com/NixOS/nixops/issues/1065 + python2Packages = pkgs.python2Packages.override { + overrides = (self: super: let callPackage = newScope self; in { + azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; + azure-mgmt-network = callPackage ./azure-mgmt-network { }; + azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; + azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; + azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; + }); + }; }) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 2ce7f9858a5b..813ae64bef55 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -1,6 +1,7 @@ { lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert # version args , src, version +, meta ? {} }: python2Packages.buildPythonApplication { @@ -55,5 +56,5 @@ python2Packages.buildPythonApplication { maintainers = with lib.maintainers; [ eelco rob domenkozar ]; platforms = lib.platforms.unix; license = lib.licenses.lgpl3; - }; + } // meta; } diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index dc71914f087b..88d9d0c94bef 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -10,4 +10,21 @@ callPackage ./generic.nix (rec { url = "https://hydra.nixos.org/build/88329589/download/2/nixops-${version}.tar.bz2"; sha256 = "1ppnhqmsbiijm6r77h86abv3fjny5iq35yvj207s520kjwzaj7kc"; }; + # # Marking unstable as broken, instead of using the pinned version, + # # like stable does You might be able to use the following code (as + # # in stable), to run unstable against the pinned packages + # python2Packages = pkgs.python2Packages.override { + # overrides = (self: super: let callPackage = newScope self; in { + # azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; + # azure-mgmt-network = callPackage ./azure-mgmt-network { }; + # azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; + # azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; + # azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; + # }); + # }; + # # otherwise + # # see https://github.com/NixOS/nixpkgs/pull/52550 + # # see https://github.com/NixOS/nixops/issues/1065 + # # see https://github.com/NixOS/nixpkgs/issues/52547 + meta.broken = true; }) |