diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 135 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 91 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 5 |
4 files changed, 132 insertions, 101 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6759098dfaa..f6d3a7a5b937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -61,6 +61,8 @@ with pkgs; by Hydra. ''; + tests = recurseIntoAttrs (callPackages ../test {}); + ### Nixpkgs maintainer tools nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; @@ -611,6 +613,8 @@ with pkgs; bonfire = callPackage ../tools/misc/bonfire { }; + cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; cconv = callPackage ../tools/text/cconv { }; @@ -772,8 +776,6 @@ with pkgs; backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; - backup = callPackage ../tools/backup/backup { }; - bar = callPackage ../tools/system/bar {}; base16-builder = callPackage ../misc/base16-builder { }; @@ -2215,6 +2217,8 @@ with pkgs; exiftool = perlPackages.ImageExifTool; + ext4magic = callPackage ../tools/filesystems/ext4magic { }; + extundelete = callPackage ../tools/filesystems/extundelete { }; expect = callPackage ../tools/misc/expect { }; @@ -3051,6 +3055,8 @@ with pkgs; innoextract = callPackage ../tools/archivers/innoextract { }; + input-utils = callPackage ../os-specific/linux/input-utils { }; + intecture-agent = callPackage ../tools/admin/intecture/agent.nix { }; intecture-auth = callPackage ../tools/admin/intecture/auth.nix { }; @@ -5197,6 +5203,8 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tio = callPackage ../tools/misc/tio { }; + tldr = callPackage ../tools/misc/tldr { }; tldr-hs = haskellPackages.tldr; @@ -5712,28 +5720,14 @@ with pkgs; x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; - xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec { + xbursttools = callPackage ../tools/misc/xburst-tools { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote - crossPrefix = "mipsel-unknown-linux-gnu"; gccCross = let pkgsCross = nixpkgsFun { # Ben Nanonote system - crossSystem = { - config = crossPrefix; - arch = "mips"; - float = "soft"; - libc = "uclibc"; - platform = { - name = "ben_nanonote"; - kernelMajor = "2.6"; - kernelArch = "mips"; - }; - gcc = { - arch = "mips32"; - }; - }; + crossSystem = lib.systems.examples.ben-nanonote; }; in pkgsCross.buildPackages.gccCrossStageStatic; @@ -8535,6 +8529,8 @@ with pkgs; backward-cpp = callPackage ../development/libraries/backward-cpp { }; + bamf = callPackage ../development/libraries/bamf { }; + bctoolbox = callPackage ../development/libraries/bctoolbox { mbedtls = mbedtls_1_3; }; @@ -8874,6 +8870,10 @@ with pkgs; ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; + ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + }; + # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; @@ -9103,7 +9103,7 @@ with pkgs; # hack fixes the hack, *sigh*. /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross else if name == "bionic" then targetPackages.bionic - else if name == "uclibc" then uclibcCross + else if name == "uclibc" then targetPackages.uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries @@ -11513,6 +11513,8 @@ with pkgs; simp_le = callPackage ../tools/admin/simp_le { }; + simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + sfml = callPackage ../development/libraries/sfml { }; csfml = callPackage ../development/libraries/csfml { }; @@ -12071,6 +12073,8 @@ with pkgs; czmq = czmq3; }; + zmqpp = callPackage ../development/libraries/zmqpp { }; + zig = callPackage ../development/compilers/zig { llvmPackages = llvmPackages_6; }; @@ -13438,11 +13442,6 @@ with pkgs; kernelPatches.p9_fixes kernelPatches.cpu-cgroup-v2."4.9" 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 ]; }; @@ -13457,11 +13456,6 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" 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 ]; }; @@ -13470,11 +13464,6 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.9" 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 ]; }; @@ -13485,11 +13474,6 @@ with pkgs; # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" 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 ]; }; @@ -13501,11 +13485,6 @@ with pkgs; # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16! - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 ]; }; @@ -13513,10 +13492,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper 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 ]; }; @@ -13524,11 +13499,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper 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 ]; }; @@ -14171,10 +14141,9 @@ with pkgs; uclibc = callPackage ../os-specific/linux/uclibc { }; - uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { - gccCross = gccCrossStageStatic; - cross = assert targetPlatform != buildPlatform; targetPlatform; - }); + uclibcCross = callPackage ../os-specific/linux/uclibc { + stdenv = crossLibcStdenv; + }; udev = systemd; libudev = udev; @@ -15337,10 +15306,10 @@ with pkgs; # go 1.9 pin until https://github.com/moby/moby/pull/35739 inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) docker_18_03 - docker_18_04; + docker_18_05; docker = docker_18_03; - docker-edge = docker_18_04; + docker-edge = docker_18_05; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -16056,6 +16025,14 @@ with pkgs; inherit (gnome3) dconf; }; + gnucash24 = callPackage ../applications/office/gnucash/2.4.nix { + inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl; + gconf = gnome2.GConf; + guile = guile_1_8; + slibGuile = slibGuile.override { scheme = guile_1_8; }; + goffice = goffice_0_8; + }; + gnucash26 = lowPrio (callPackage ../applications/office/gnucash/2.6.nix { inherit (gnome2) libgnomecanvas; inherit (gnome3) dconf; @@ -16142,6 +16119,8 @@ with pkgs; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; + graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { }; + grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; gtkpod = callPackage ../applications/audio/gtkpod { }; @@ -16166,6 +16145,8 @@ with pkgs; gollum = callPackage ../applications/misc/gollum { }; + googleearth = callPackage ../applications/misc/googleearth { }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; @@ -17094,6 +17075,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul {}; + plank = callPackage ../applications/misc/plank { }; + planner = callPackage ../applications/office/planner { }; playonlinux = callPackage ../applications/misc/playonlinux { @@ -19791,10 +19774,12 @@ with pkgs; numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; - theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; - onestepback = callPackage ../misc/themes/onestepback { }; + theme-jade1 = callPackage ../misc/themes/jade1 { }; + + theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; + theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { @@ -20538,7 +20523,9 @@ with pkgs; pythia = callPackage ../development/libraries/physics/pythia { }; - rivet = callPackage ../development/libraries/physics/rivet { }; + rivet = callPackage ../development/libraries/physics/rivet { + imagemagick = graphicsmagick-imagemagick-compat; + }; thepeg = callPackage ../development/libraries/physics/thepeg { }; @@ -21451,30 +21438,6 @@ with pkgs; openfst = callPackage ../development/libraries/openfst {}; - # `recurseIntoAttrs` for sake of hydra, not nix-env - tests = recurseIntoAttrs { - cc-wrapper = callPackage ../test/cc-wrapper { }; - cc-wrapper-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; }; - cc-wrapper-gcc7 = callPackage ../test/cc-wrapper { stdenv = gcc7Stdenv; }; - cc-wrapper-gcc8 = callPackage ../test/cc-wrapper { stdenv = gcc8Stdenv; }; - cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; }; - cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; - cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; }; - cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; }; - cc-wrapper-clang-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.stdenv; }; - cc-wrapper-libcxx-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; }; - cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; }; - cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; }; - cc-wrapper-clang-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.stdenv; }; - cc-wrapper-libcxx-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; }; - stdenv-inputs = callPackage ../test/stdenv-inputs { }; - - cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; - cc-multilib-clang = callPackage ../test/cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; - - macOSSierraShared = callPackage ../test/macos-sierra-shared {}; - }; - duti = callPackage ../os-specific/darwin/duti {}; dnstracer = callPackage ../tools/networking/dnstracer { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3278311f25c0..9a23eff2e7ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -450,20 +450,6 @@ let self = _self // overrides; _self = with self; { }; }; - ListCompare = buildPerlPackage rec { - name = "List-Compare-0.53"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz"; - sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; - }; - buildInputs = [ IOCaptureOutput ]; - meta = { - homepage = http://thenceforward.net/perl/modules/List-Compare/; - description = "Compare elements of two or more lists"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - ArchiveCpio = buildPerlPackage rec { name = "Archive-Cpio-0.10"; src = fetchurl { @@ -2078,6 +2064,19 @@ let self = _self // overrides; _self = with self; { }; }; + ClassEHierarchy = buildPerlPackage rec { + name = "Class-EHierarchy-2.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/${name}.tar.gz"; + sha256 = "8498baaf7539eaa3422c6fe1055a0fc9a0c02e94dad0c63405373528e622bacb"; + }; + meta = { + description = "Base class for hierarchally ordered objects"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + ClassFactory = buildPerlPackage { name = "Class-Factory-1.06"; src = fetchurl { @@ -8524,6 +8523,21 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + LinuxACL = buildPerlPackage rec { + name = "Linux-ACL-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz"; + sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371"; + }; + buildInputs = [ pkgs.acl ]; + NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl"; + meta = { + maintainers = [ maintainers.limeytexan ]; + description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LinuxDistribution = buildPerlModule { name = "Linux-Distribution-0.23"; src = fetchurl { @@ -8571,6 +8585,20 @@ let self = _self // overrides; _self = with self; { }; }; + ListCompare = buildPerlPackage rec { + name = "List-Compare-0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz"; + sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; + }; + buildInputs = [ IOCaptureOutput ]; + meta = { + homepage = http://thenceforward.net/perl/modules/List-Compare/; + description = "Compare elements of two or more lists"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ListMoreUtils = buildPerlPackage rec { name = "List-MoreUtils-0.428"; src = fetchurl { @@ -11758,6 +11786,22 @@ let self = _self // overrides; _self = with self; { }; }; + NetZooKeeper = buildPerlPackage rec { + name = "Net-ZooKeeper-0.41"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAF/${name}.tar.gz"; + sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; + }; + buildInputs = [ pkgs.zookeeper_mt ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; + meta = { + maintainers = [ maintainers.limeytexan ]; + homepage = https://github.com/mark-5/p5-net-zookeeper; + license = stdenv.lib.licenses.asl20; + }; + }; + PackageConstants = buildPerlPackage { name = "Package-Constants-0.06"; src = fetchurl { @@ -11923,6 +11967,25 @@ let self = _self // overrides; _self = with self; { }; }; + Paranoid = buildPerlPackage rec { + name = "Paranoid-2.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/${name}.tar.gz"; + sha256 = "583dfa0279733531f360795ad1cf4aa652d537b2b0bbd3c6925d0c8d75cbb3df"; + }; + patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ]; + preConfigure = '' + # Capture the path used when compiling this module as the "blessed" + # system path, analogous to the module's own use of '/bin:/sbin'. + sed -i "s#__BLESSED_PATH__#${pkgs.coreutils}/bin#" lib/Paranoid.pm t/01_init_core.t + ''; + meta = { + description = "General function library for safer, more secure programming"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + PARDist = buildPerlPackage { name = "PAR-Dist-0.49"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfeeb96e8834..c805a8ba520e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18226,6 +18226,8 @@ EOF pyspark = callPackage ../development/python-modules/pyspark { }; + pysensors = callPackage ../development/python-modules/pysensors { }; + sseclient = callPackage ../development/python-modules/sseclient { }; warrant = callPackage ../development/python-modules/warrant { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5233051cad83..efced59ad91b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -110,7 +110,10 @@ let jobs.tests.cc-wrapper-gcc7.x86_64-linux jobs.tests.cc-wrapper-gcc7.x86_64-darwin jobs.tests.cc-wrapper-gcc8.x86_64-linux - jobs.tests.cc-wrapper-gcc8.x86_64-darwin + + # broken see issue #40038 + # jobs.tests.cc-wrapper-gcc8.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-linux |