diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 106 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 45 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 108 | ||||
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 1 |
4 files changed, 173 insertions, 87 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae7e30d0ff89..3e0e4ba200de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -185,12 +185,14 @@ with pkgs; fetchFromGitHub = { owner, repo, rev, name ? "${repo}-${rev}-src", - fetchSubmodules ? false, + fetchSubmodules ? false, private ? false, + githubBase ? "github.com", varPrefix ? null, ... # For hash agility - }@args: + }@args: assert private -> !fetchSubmodules; let - baseUrl = "https://github.com/${owner}/${repo}"; - passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" ]; + baseUrl = "https://${githubBase}/${owner}/${repo}"; + passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; + varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; in if fetchSubmodules then fetchgit ({ inherit name rev fetchSubmodules; @@ -203,6 +205,19 @@ with pkgs; inherit name; url = "${baseUrl}/archive/${rev}.tar.gz"; meta.homepage = "${baseUrl}/"; + } // lib.optionalAttrs private { + netrcPhase = '' + if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then + echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 + exit 1 + fi + cat > netrc <<EOF + machine ${githubBase} + login ''$${varBase}USERNAME + password ''$${varBase}PASSWORD + EOF + ''; + netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; } // passthruAttrs) // { inherit rev; }; fetchFromBitbucket = { @@ -257,6 +272,8 @@ with pkgs; libredirect = callPackage ../build-support/libredirect { }; + madonctl = callPackage ../applications/misc/madonctl { }; + makeDesktopItem = callPackage ../build-support/make-desktopitem { }; makeAutostartItem = callPackage ../build-support/make-startupitem { }; @@ -518,6 +535,8 @@ with pkgs; autorevision = callPackage ../tools/misc/autorevision { }; + bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; + bonnie = callPackage ../tools/filesystems/bonnie { }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -1080,6 +1099,10 @@ with pkgs; mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + mozlz4a = callPackage ../tools/compression/mozlz4a { + pylz4 = python3Packages.lz4; + }; + msr-tools = callPackage ../os-specific/linux/msr-tools { }; mstflint = callPackage ../tools/misc/mstflint { }; @@ -1512,8 +1535,6 @@ with pkgs; desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; - despotify = callPackage ../development/libraries/despotify { }; - dfc = callPackage ../tools/system/dfc { }; dev86 = callPackage ../development/compilers/dev86 { }; @@ -2006,6 +2027,8 @@ with pkgs; git-lfs = callPackage ../applications/version-management/git-lfs { }; + git-series = callPackage ../development/tools/git-series { }; + git-up = callPackage ../applications/version-management/git-up { }; gitfs = callPackage ../tools/filesystems/gitfs { }; @@ -2102,6 +2125,8 @@ with pkgs; # rename to upower-notify? go-upower-notify = callPackage ../tools/misc/upower-notify { }; + google-app-engine-go-sdk = callPackage ../development/tools/google-app-engine-go-sdk { }; + google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; @@ -2620,6 +2645,8 @@ with pkgs; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; + lldpd = callPackage ../tools/networking/lldpd { }; + lnav = callPackage ../tools/misc/lnav { }; loc = callPackage ../development/misc/loc { }; @@ -3003,12 +3030,16 @@ with pkgs; metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; + metar = callPackage ../applications/misc/metar { }; + mfcuk = callPackage ../tools/security/mfcuk { }; mfoc = callPackage ../tools/security/mfoc { }; mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; + mimeo = callPackage ../tools/misc/mimeo { }; mimetic = callPackage ../development/libraries/mimetic { }; @@ -3192,6 +3223,8 @@ with pkgs; networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; + networkmanager_fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; + networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; @@ -4101,6 +4134,8 @@ with pkgs; squashfsTools = callPackage ../tools/filesystems/squashfs { }; + srcml = callPackage ../applications/version-management/srcml { }; + sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshuttle = callPackage ../tools/security/sshuttle { }; @@ -4210,6 +4245,8 @@ with pkgs; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; + tcptraceroute = callPackage ../tools/networking/tcptraceroute { }; + tboot = callPackage ../tools/security/tboot { }; tcpdump = callPackage ../tools/networking/tcpdump { }; @@ -4218,6 +4255,8 @@ with pkgs; tcpkali = callPackage ../applications/networking/tcpkali { }; + tcpreplay = callPackage ../tools/networking/tcpreplay { }; + teamviewer = callPackage ../applications/networking/remote/teamviewer { stdenv = stdenv_32bit; }; @@ -4245,6 +4284,8 @@ with pkgs; timemachine = callPackage ../applications/audio/timemachine { }; + timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; + timetrap = callPackage ../applications/office/timetrap { }; tinc = callPackage ../tools/networking/tinc { }; @@ -5978,6 +6019,10 @@ with pkgs; lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; + lxpanel = callPackage ../desktops/lxde/core/lxpanel { + gtk2 = gtk2-x11; + }; + kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -7722,7 +7767,6 @@ with pkgs; glibc = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; - gccCross = null; }; glibc_memusage = callPackage ../development/libraries/glibc { @@ -7730,13 +7774,23 @@ with pkgs; withGd = true; }; - glibcCross = forcedNativePackages.glibc.override { - gccCross = gccCrossStageStatic; - inherit (forcedNativePackages) linuxHeaders; + # Being redundant to avoid cycles on boot. TODO: find a better way + glibcCross = callPackage ../development/libraries/glibc { + installLocales = config.glibc.locales or false; + # Can't just overrideCC, because then the stdenv-cross mkDerivation will be + # thrown away. TODO: find a better solution for this. + stdenv = buildPackages.makeStdenvCross + buildPackages.buildPackages.stdenv + buildPackages.targetPlatform + buildPackages.binutils + buildPackages.gccCrossStageStatic; }; # We can choose: - libcCrossChooser = name: if name == "glibc" then glibcCross + libcCrossChooser = name: + # libc is hackily often used from the previous stage. This `or` + # hack fixes the hack, *sigh*. + /**/ if name == "glibc" then __targetPackages.glibcCross or glibcCross else if name == "uclibc" then uclibcCross else if name == "msvcrt" then windows.mingw_w64 else if name == "libSystem" then darwin.xcode @@ -11808,20 +11862,6 @@ with pkgs; ]; }; - linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - kernelPatches.cpu-cgroup-v2."4.10" - kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_11 = callPackage ../os-specific/linux/kernel/linux-4.11.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12015,7 +12055,6 @@ with pkgs; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10); linuxPackages_4_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_11); # Don't forget to update linuxPackages_latest! @@ -13308,6 +13347,8 @@ with pkgs; clipit = callPackage ../applications/misc/clipit { }; + cloud-print-connector = callPackage ../servers/cloud-print-connector { }; + cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { @@ -14325,6 +14366,8 @@ with pkgs; i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; + i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled/default.nix { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; @@ -15050,6 +15093,8 @@ with pkgs; inherit (gnome3) defaultIconTheme; }; + typora = callPackage ../applications/editors/typora { }; + librep = callPackage ../development/libraries/librep { }; rep-gtk = callPackage ../development/libraries/rep-gtk { }; @@ -15682,6 +15727,7 @@ with pkgs; st = callPackage ../applications/misc/st { conf = config.st.conf or null; patches = config.st.patches or null; + extraLibs = config.st.extraLibs or []; }; st-wayland = callPackage ../applications/misc/st/wayland.nix { @@ -17978,7 +18024,7 @@ with pkgs; megam = callPackage ../applications/science/misc/megam { }; root = callPackage ../applications/science/misc/root { - inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; simgrid = callPackage ../applications/science/misc/simgrid { }; @@ -18263,6 +18309,8 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + inherit (callPackages ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; @@ -18472,6 +18520,8 @@ with pkgs; terraform_0_9 = terraform_0_9_4; terraform = terraform_0_9; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; + terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix { @@ -18774,4 +18824,6 @@ with pkgs; xib2nib = callPackage ../development/tools/xib2nib {}; linode-cli = callPackage ../tools/virtualization/linode-cli { }; + + hss = callPackage ../tools/networking/hss {}; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c1114fd049a5..4874d5d01a2d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5535,6 +5535,19 @@ let self = _self // overrides; _self = with self; { FileTemp = null; + FileType = buildPerlPackage { + name = "File-Type-0.22"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; + sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k"; + }; + meta = { + description = "File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; + }; + FileSlurp = buildPerlPackage { name = "File-Slurp-9999.19"; # WARNING: check on next update if deprecation warning is gone @@ -9838,6 +9851,18 @@ let self = _self // overrides; _self = with self; { }; }; + NetCIDRLite = buildPerlPackage rec { + name = "Net-CIDR-Lite-0.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DOUGW/${name}.tar.gz"; + sha256 = "cfa125e8a2aef9259bc3a44e07cbdfb7894b64d22e7c0cee92aee2f5c7915093"; + }; + meta = { + description = "Perl extension for merging IPv4 or IPv6 CIDR addresses"; + license = "unknown"; + }; + }; + NetCoverArtArchive = buildPerlPackage { name = "Net-CoverArtArchive-1.02"; src = fetchurl { @@ -9970,6 +9995,18 @@ let self = _self // overrides; _self = with self; { }; }; + NetPatricia = buildPerlPackage rec { + name = "Net-Patricia-1.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GRUBER/${name}.tar.gz"; + sha256 = "70835a926e1c5a8d0324c72fffee82eeb7ec6c141dee04fd446820b64f71c552"; + }; + propagatedBuildInputs = [ NetCIDRLite Socket6 ]; + meta = { + license = "unknown"; + }; + }; + NetPing = buildPerlPackage { name = "Net-Ping-2.41"; src = fetchurl { @@ -11666,13 +11703,17 @@ let self = _self // overrides; _self = with self; { }; Socket6 = buildPerlPackage rec { - name = "Socket6-0.25"; + name = "Socket6-0.28"; src = fetchurl { url = "mirror://cpan/authors/id/U/UM/UMEMOTO/${name}.tar.gz"; - sha256 = "1ads4k4vvq6pnxkdw0s8gaj03w4h9snxyw7zyikfzd20fy76yx6s"; + sha256 = "bfd49ab99f3197c99285fed4683c4edc06277c1e4453f593e694d7bff0974586"; }; setOutputFlags = false; buildInputs = [ pkgs.which ]; + meta = { + description = "IPv6 related part of the C socket.h defines and structure manipulators"; + license = stdenv.lib.licenses.bsd3; + }; }; SoftwareLicense = buildPerlPackage rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c86376a2441..f210537618ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -153,10 +153,14 @@ in { bap = pkgs.ocamlPackages_4_02.bap; }; + bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + blivet = callPackage ../development/python-modules/blivet { }; breathe = callPackage ../development/python-modules/breathe { }; + browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy {}; + bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; dbf = callPackage ../development/python-modules/dbf { }; @@ -2619,19 +2623,7 @@ in { }; - rarfile = self.buildPythonPackage rec { - name = "rarfile-2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rarfile/rarfile-2.6.tar.gz"; - sha256 = "326700c5450cfb367f612e918866ea27551bac02f4656f340003c88873fa1a56"; - }; - - meta = { - description = "rarfile - RAR archive reader for Python"; - homepage = https://github.com/markokr/rarfile; - }; - }; + rarfile = callPackage ../development/python-modules/rarfile {}; proboscis = buildPythonPackage rec { name = "proboscis-1.2.6.0"; @@ -4071,6 +4063,8 @@ in { }; }; + confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; + construct = buildPythonPackage rec { name = "construct-${version}"; @@ -4259,11 +4253,11 @@ in { sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi"; }; - # On i686-linux and Python 2.x this test fails because the result is "3L" - # instead of "3", so let's fix it in-place. + # With Python 2.x on i686-linux or 32-bit ARM this test fails because the + # result is "3L" instead of "3", so let's fix it in-place. # # Upstream issue: https://github.com/cython/cython/issues/1548 - postPatch = optionalString (stdenv.isi686 && !isPy3k) '' + postPatch = optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ tests/run/cpdef_enums.pyx ''; @@ -6471,6 +6465,8 @@ in { propagatedBuildInputs = with self; [ configparser ]; }; + enzyme = callPackage ../development/python-modules/enzyme {}; + escapism = buildPythonPackage rec { name = "escapism-${version}"; version = "0.0.1"; @@ -7653,25 +7649,7 @@ in { }; }; - jsbeautifier = buildPythonApplication rec { - name = "jsbeautifier-1.6.4"; - - propagatedBuildInputs = with self; [ six ]; - - buildInputs = with self; [ EditorConfig pytest six ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; - sha256 = "074n8f4ncz5pf0jkkf6i6by30qnaj5208sszaf9p86kgdigcdaf8"; - }; - - meta = { - homepage = "http://jsbeautifier.org"; - description = "JavaScript unobfuscator and beautifier."; - license = stdenv.lib.licenses.mit; - maintainers = with maintainers; [ apeyroux ]; - }; - }; + jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; jug = buildPythonPackage rec { version = "1.4.0"; @@ -9148,6 +9126,8 @@ in { }; }; + pysrt = callPackage ../development/python-modules/pysrt { }; + pytools = buildPythonPackage rec { name = "pytools-${version}"; version = "2016.2.1"; @@ -9367,6 +9347,8 @@ in { }; }; + subliminal = callPackage ../development/python-modules/subliminal {}; + hyp = buildPythonPackage rec { name = "hyp-server-${version}"; version = "1.2.0"; @@ -13784,6 +13766,21 @@ in { }; }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; + marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; + mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {}; + mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix {}; + mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix {}; + mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix {}; + mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix {}; + mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix {}; + moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix {}; + mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix {}; + mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix {}; + mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix {}; + moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix {}; + mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix {}; + marionette-harness = callPackage ../development/python-modules/marionette-harness {}; markupsafe = buildPythonPackage rec { name = "markupsafe-${version}"; @@ -14034,6 +14031,8 @@ in { }; }; + metaphone = callPackage ../development/python-modules/metaphone { }; + mezzanine = buildPythonPackage rec { version = "3.1.10"; name = "mezzanine-${version}"; @@ -16387,23 +16386,7 @@ in { buildInputs = with self; [ oslotest mock coverage simplejson oslo-i18n ]; }; - rfc3986 = buildPythonPackage rec { - name = "rfc3986-${version}"; - version = "0.2.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rfc3986/rfc3986-0.2.2.tar.gz"; - sha256 = "0yvzz7gp84qqdadbjdh9ch7dz4w19nmhwa704s9m11bljgp3hqmn"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = [ pkgs.glibcLocales ]; - - meta = with stdenv.lib; { - description = "rfc3986"; - homepage = https://rfc3986.rtfd.org; - }; - }; + rfc3986 = callPackage ../development/python-modules/rfc3986 { }; pycadf = buildPythonPackage rec { name = "pycadf-${version}"; @@ -18374,6 +18357,8 @@ in { }; }; + pika-pool = callPackage ../development/python-modules/pika-pool { }; + platformio = buildPythonPackage rec { name = "platformio-${version}"; version="2.10.3"; @@ -18506,10 +18491,10 @@ in { python-jenkins = buildPythonPackage rec { name = "python-jenkins-${version}"; - version = "0.4.11"; + version = "0.4.14"; src = pkgs.fetchurl { url = "mirror://pypi/p/python-jenkins/${name}.tar.gz"; - sha256 = "153gm7pmmn0bymglsgcr2ya0752r2v1hajkx73gl1pk4jifb2gdf"; + sha256 = "1n8ikvd9jf4dlki7nqlwjlsn8wpsx4x7wg4h3d6bkvyvhwwf8yqf"; }; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf @@ -18517,7 +18502,7 @@ in { buildInputs = with self; [ mock ]; propagatedBuildInputs = with self; [ pbr pyyaml six multi_key_dict testtools - testscenarios testrepository ]; + testscenarios testrepository kerberos ]; meta = { description = "Python bindings for the remote Jenkins API"; @@ -19894,7 +19879,11 @@ in { pyopencl = callPackage ../development/python-modules/pyopencl { }; - pyproj = callPackage ../development/python-modules/pyproj { }; + pyproj = callPackage ../development/python-modules/pyproj { + # pyproj does *work* if you want to use a system supplied proj, but with the current version(s) the tests fail by + # a few decimal places, so caveat emptor. + proj = null; + }; pyrr = buildPythonPackage rec { name = "pyrr-${version}"; @@ -29445,12 +29434,12 @@ EOF }; jenkins-job-builder = buildPythonPackage rec { - name = "jenkins-job-builder-1.6.1"; + name = "jenkins-job-builder-2.0.0.0b2"; disabled = ! (isPy26 || isPy27); src = pkgs.fetchurl { url = "mirror://pypi/j/jenkins-job-builder/${name}.tar.gz"; - sha256 = "1v3xknfzgsp35nn3ma4imz233v569v3x75mx2yxlv1xf32nn7yk4"; + sha256 = "1y0yl2w6c9c91f9xbjkvff1ag8p72r24nzparrzrw9sl8kn9632x"; }; patchPhase = '' @@ -29467,6 +29456,7 @@ EOF python-jenkins pyyaml six + stevedore ] ++ optionals isPy26 [ ordereddict argparse @@ -31227,6 +31217,8 @@ EOF }; }; + wptserve = callPackage ../development/python-modules/wptserve {}; + yenc = callPackage ../development/python-modules/yenc { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ad868531598e..1e764ef00727 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -15,6 +15,7 @@ let common = { buildPackages.binutils = nativePlatforms; gmp = nativePlatforms; + libcCross = nativePlatforms; }; gnuCommon = lib.recursiveUpdate common { |