diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 527 |
1 files changed, 289 insertions, 238 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fed01028d37b..9e9ee8797ff1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -142,6 +142,8 @@ with pkgs; inherit dhall-nix; }; + deadcode = callPackage ../development/tools/deadcode { }; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; @@ -591,12 +593,17 @@ with pkgs; gsl = gsl_1; }; - atomicparsley = callPackage ../tools/video/atomicparsley { }; + atomicparsley = callPackage ../tools/video/atomicparsley { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; autoflake = callPackage ../development/tools/analysis/autoflake { }; avfs = callPackage ../tools/filesystems/avfs { }; + avldrums-lv2 = callPackage ../applications/audio/avldrums-lv2 { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; awscli = callPackage ../tools/admin/awscli { }; @@ -675,6 +682,8 @@ with pkgs; cconv = callPackage ../tools/text/cconv { }; + go-check = callPackage ../development/tools/check { }; + chkcrontab = callPackage ../tools/admin/chkcrontab { }; cozy = callPackage ../applications/audio/cozy-audiobooks { }; @@ -790,6 +799,7 @@ with pkgs; androidenv = callPackage ../development/mobile/androidenv { pkgs_i686 = pkgsi686Linux; + licenseAccepted = (config.android_sdk.accept_license or false); }; inherit (androidenv) androidndk; @@ -818,6 +828,8 @@ with pkgs; }; aria = aria2; + asmfmt = callPackage ../development/tools/asmfmt { }; + aspcud = callPackage ../tools/misc/aspcud { }; at = callPackage ../tools/system/at { }; @@ -850,7 +862,10 @@ with pkgs; libssl = openssl; }; - axoloti = callPackage ../applications/audio/axoloti { }; + axoloti = callPackage ../applications/audio/axoloti { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { inherit (darwin) libobjc; @@ -1046,10 +1061,10 @@ with pkgs; cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { + cabal2nix = haskell.lib.overrideCabal (haskell.lib.addOptparseApplicativeCompletionScripts "cabal2nix" haskellPackages.cabal2nix) (drv: { isLibrary = false; enableSharedExecutables = false; - executableToolDepends = [ makeWrapper ]; + executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ]; postInstall = '' exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} install -D $out/bin/${drv.pname} $exe @@ -1057,11 +1072,7 @@ with pkgs; makeWrapper $exe $out/bin/${drv.pname} \ --prefix PATH ":" "${nix}/bin" \ --prefix PATH ":" "${nix-prefetch-scripts}/bin" - mkdir -p $out/share/{bash-completion/completions,zsh/vendor-completions,fish/completions} - $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname} - $exe --zsh-completion-script $exe >$out/share/zsh/vendor-completions/_${drv.pname} - $exe --fish-completion-script $exe >$out/share/fish/completions/${drv.pname}.fish - ''; + '' + (drv.postInstall or ""); }); stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: { @@ -1154,8 +1165,6 @@ with pkgs; consul = callPackage ../servers/consul { }; - consul-ui = callPackage ../servers/consul/ui.nix { }; - consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; consul-template = callPackage ../tools/system/consul-template { }; @@ -1187,6 +1196,7 @@ with pkgs; codec2 = callPackage ../development/libraries/codec2 { }; contacts = callPackage ../tools/misc/contacts { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; }; @@ -1196,6 +1206,8 @@ with pkgs; coursier = callPackage ../development/tools/coursier {}; + cppclean = callPackage ../development/tools/cppclean {}; + cri-tools = callPackage ../tools/virtualization/cri-tools {}; crip = callPackage ../applications/audio/crip { }; @@ -1327,6 +1339,8 @@ with pkgs; envsubst = callPackage ../tools/misc/envsubst { }; + errcheck = callPackage ../development/tools/errcheck { }; + eschalot = callPackage ../tools/security/eschalot { }; esptool = callPackage ../tools/misc/esptool { }; @@ -1549,6 +1563,8 @@ with pkgs; patdiff = callPackage ../tools/misc/patdiff { }; + pbpst = callPackage ../applications/misc/pbpst { }; + pbzx = callPackage ../tools/compression/pbzx { }; pev = callPackage ../development/tools/analysis/pev { }; @@ -2078,8 +2094,12 @@ with pkgs; cudatoolkit_7 cudatoolkit_7_5 cudatoolkit_8 + cudatoolkit_9 cudatoolkit_9_0 - cudatoolkit_9; + cudatoolkit_9_1 + cudatoolkit_9_2 + cudatoolkit_10 + cudatoolkit_10_0; cudatoolkit = cudatoolkit_9; @@ -2089,7 +2109,11 @@ with pkgs; cudnn6_cudatoolkit_8 cudnn_cudatoolkit_8 cudnn_cudatoolkit_9 - cudnn_cudatoolkit_9_0; + cudnn_cudatoolkit_9_0 + cudnn_cudatoolkit_9_1 + cudnn_cudatoolkit_9_2 + cudnn_cudatoolkit_10 + cudnn_cudatoolkit_10_0; cudnn = cudnn_cudatoolkit_9; @@ -2355,6 +2379,8 @@ with pkgs; easyrsa2 = callPackage ../tools/networking/easyrsa/2.x.nix { }; + easysnap = callPackage ../tools/backup/easysnap { }; + ebook_tools = callPackage ../tools/text/ebook-tools { }; ecryptfs = callPackage ../tools/security/ecryptfs { }; @@ -3302,6 +3328,8 @@ with pkgs; hwinfo = callPackage ../tools/system/hwinfo { }; + hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { }; + hylafaxplus = callPackage ../servers/hylafaxplus { }; i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; @@ -3413,6 +3441,8 @@ with pkgs; ip2location = callPackage ../tools/networking/ip2location { }; + ip2unix = callPackage ../tools/networking/ip2unix { }; + ipad_charge = callPackage ../tools/misc/ipad_charge { }; iperf2 = callPackage ../tools/networking/iperf/2.nix { }; @@ -4171,6 +4201,8 @@ with pkgs; modemmanager = callPackage ../tools/networking/modem-manager {}; + modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; + modsecurity_standalone = callPackage ../tools/security/modsecurity { }; molly-guard = callPackage ../os-specific/linux/molly-guard { }; @@ -4388,6 +4420,8 @@ with pkgs; nms = callPackage ../tools/misc/nms { }; + nomachine-client = callPackage ../tools/admin/nomachine-client { }; + notify-desktop = callPackage ../tools/misc/notify-desktop {}; nkf = callPackage ../tools/text/nkf {}; @@ -4522,8 +4556,6 @@ with pkgs; openobex = callPackage ../tools/bluetooth/openobex { }; - openopc = callPackage ../tools/misc/openopc { }; - openresolv = callPackage ../tools/networking/openresolv { }; opensc = callPackage ../tools/security/opensc { @@ -4563,7 +4595,7 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; - opentracing-cpp = callPackages ../development/libraries/opentracing-cpp { }; + opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; openvswitch = callPackage ../os-specific/linux/openvswitch { }; @@ -4780,6 +4812,7 @@ with pkgs; }; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -4965,10 +4998,6 @@ with pkgs; esteidfirefoxplugin = callPackage ../applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin { }; - qgifer = callPackage ../applications/video/qgifer { - giflib = giflib_4_1; - }; - qhull = callPackage ../development/libraries/qhull { }; qjoypad = callPackage ../tools/misc/qjoypad { }; @@ -5091,6 +5120,8 @@ with pkgs; recoverjpeg = callPackage ../tools/misc/recoverjpeg { }; + reftools = callPackage ../development/tools/reftools { }; + reposurgeon = callPackage ../applications/version-management/reposurgeon { }; reptyr = callPackage ../os-specific/linux/reptyr {}; @@ -6050,11 +6081,6 @@ with pkgs; libpng = libpng12; }; - truecrypt = callPackage ../applications/misc/truecrypt { - stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; - wxGUI = config.truecrypt.wxGUI or true; - }; - ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; ttwatch = callPackage ../tools/misc/ttwatch { }; @@ -6159,7 +6185,7 @@ with pkgs; }; veracrypt = callPackage ../applications/misc/veracrypt { - wxGUI = true; + wxGTK = wxGTK30; }; vlan = callPackage ../tools/networking/vlan { }; @@ -6209,6 +6235,8 @@ with pkgs; wol = callPackage ../tools/networking/wol { }; + wolf-shaper = callPackage ../applications/audio/wolf-shaper { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -6451,6 +6479,23 @@ with pkgs; abcl = callPackage ../development/compilers/abcl {}; + adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; + adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; + + adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; + + # no OpenJ9 for Darwin + adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}; + adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}; + + adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; + adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; + aldor = callPackage ../development/compilers/aldor { }; aliceml = callPackage ../development/compilers/aliceml { }; @@ -6841,36 +6886,6 @@ with pkgs; gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.7-2013q3-20130916"; - releaseType = "update"; - sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.8-2014q1-20140314"; - releaseType = "update"; - sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.9-2015q1-20150306"; - releaseType = "update"; - sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - dirName = "5.0"; - subdirName = "5-2016-q2-update"; - version = "5.4-2016q2-20160622"; - releaseType = "update"; - sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; - gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; - gcc-arm-embedded = gcc-arm-embedded-7; - gforth = callPackage ../development/compilers/gforth {}; gtk-server = callPackage ../development/interpreters/gtk-server {}; @@ -6879,7 +6894,7 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc843.override { + haskellPackages = haskell.packages.ghc844.override { overrides = config.haskellPackageOverrides or haskell.packageOverrides; }; @@ -6959,6 +6974,10 @@ with pkgs; go-junit-report = callPackage ../development/tools/go-junit-report { }; + gogetdoc = callPackage ../development/tools/gogetdoc { }; + + gometalinter = callPackage ../development/tools/gometalinter { }; + gox = callPackage ../development/tools/gox { }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -7000,11 +7019,11 @@ with pkgs; inherit (gnome2) GConf gnome_vfs; }; - openjdk10 = + openjdk11 = if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin/10.nix { } + callPackage ../development/compilers/openjdk/darwin/11.nix { } else - callPackage ../development/compilers/openjdk/10.nix { + callPackage ../development/compilers/openjdk/11.nix { inherit (gnome2) GConf gnome_vfs; }; @@ -7024,17 +7043,14 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk10 = openjdk10 // { outputs = [ "out" ]; }; - jre10 = lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (openjdk10.jre // { outputs = [ "jre" ]; })); - jre10_headless = + jdk11 = openjdk11 // { outputs = [ "out" ]; }; + jdk11_headless = if stdenv.isDarwin then - jre10 + jdk11 else - lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - ((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + lib.setName "openjdk-${lib.getVersion pkgs.openjdk11}-headless" + (lib.addMetaAttrs {} + ((openjdk11.override { minimal = true; }) // {})); jdk = jdk8; jre = jre8; @@ -7052,18 +7068,12 @@ with pkgs; oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; - oraclejdk10 = pkgs.oraclejdk10distro "JDK" false; - oraclejre = lowPrio (pkgs.jdkdistro false false); oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); - oraclejre10 = lowPrio (pkgs.oraclejdk10distro "JRE" false); - - oracleserverjre10 = lowPrio (pkgs.oraclejdk10distro "ServerJRE" false); - jrePlugin = jre8Plugin; jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); @@ -7078,9 +7088,6 @@ with pkgs; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); - oraclejdk10distro = packageType: _: - (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; }); - javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; jikes = callPackage ../development/compilers/jikes { }; @@ -7210,10 +7217,6 @@ with pkgs; manticore = callPackage ../development/compilers/manticore { }; - mentorToolchains = recurseIntoAttrs ( - pkgsi686Linux.callPackage ../development/compilers/mentor {} - ); - mercury = callPackage ../development/compilers/mercury { }; microscheme = callPackage ../development/compilers/microscheme { }; @@ -7246,16 +7249,6 @@ with pkgs; mono5 = mono58; mono4 = mono48; - mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; @@ -7399,9 +7392,12 @@ with pkgs; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-update = callPackage ../tools/package-management/cargo-update { }; - cargo-asm = callPackage ../development/tools/rust/cargo-asm { }; + cargo-asm = callPackage ../development/tools/rust/cargo-asm { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; @@ -7590,6 +7586,8 @@ with pkgs; dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; + dhallPackages = import ../development/dhall-modules { inherit pkgs; }; + duktape = callPackage ../development/interpreters/duktape { }; beam = callPackage ./beam-packages.nix { }; @@ -7813,7 +7811,6 @@ with pkgs; python2Full = python2.override{x11Support=true;}; python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; - python34Full = python34.override{x11Support=true;}; python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; python37Full = python37.override{x11Support=true;}; @@ -7827,10 +7824,6 @@ with pkgs; self = python27; inherit (darwin) CF configd; }; - python34 = callPackage ../development/interpreters/python/cpython/3.4 { - inherit (darwin) CF configd; - self = python34; - }; python35 = callPackage ../development/interpreters/python/cpython/3.5 { inherit (darwin) CF configd; self = python35; @@ -7852,7 +7845,6 @@ with pkgs; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); - python34Packages = python34.pkgs; python35Packages = python35.pkgs; python36Packages = recurseIntoAttrs python36.pkgs; python37Packages = python37.pkgs; @@ -8006,17 +7998,17 @@ with pkgs; amtk = callPackage ../development/libraries/amtk { }; - avrgcclibc = throw "avrgcclibs are now separate packages, install avrbinutils, avrgcc and avrlibc"; - - avrbinutils = callPackage ../development/misc/avr/binutils {}; - - avrgcc = callPackage ../development/misc/avr/gcc {}; - - avrlibc = callPackage ../development/misc/avr/libc {}; + avrlibc = callPackage ../development/misc/avr/libc {}; + avrlibcCross = callPackage ../development/misc/avr/libc { + stdenv = crossLibcStdenv; + }; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/misc/stm32/betaflight { }; + betaflight = callPackage ../development/misc/stm32/betaflight { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; @@ -8024,6 +8016,8 @@ with pkgs; jython = callPackage ../development/interpreters/jython {}; + gImageReader = callPackage ../applications/misc/gImageReader { }; + guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; @@ -8052,7 +8046,10 @@ with pkgs; guile = guile_2_0; }; - inav = callPackage ../development/misc/stm32/inav { }; + inav = callPackage ../development/misc/stm32/inav { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; @@ -8095,6 +8092,7 @@ with pkgs; ansible_2_4 ansible_2_5 ansible_2_6 + ansible_2_7 ansible2 ansible; @@ -8167,10 +8165,10 @@ with pkgs; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; - bazel_jdk10 = callPackage ../development/tools/build-managers/bazel { + bazel_jdk11 = callPackage ../development/tools/build-managers/bazel { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - runJdk = jdk10; + runJdk = jdk11; }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; @@ -8210,6 +8208,8 @@ with pkgs; blackmagic = callPackage ../development/tools/misc/blackmagic { stdenv = overrideCC stdenv gcc6; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; bloaty = callPackage ../development/tools/bloaty { }; @@ -9004,10 +9004,6 @@ with pkgs; qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind {}; - verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { - coq = coq_8_4; - }; - visualvm = callPackage ../development/tools/java/visualvm { }; vultr = callPackage ../development/tools/vultr { }; @@ -9589,6 +9585,8 @@ with pkgs; frog = self.languageMachines.frog; + fstrcmp = callPackage ../development/libraries/fstrcmp { }; + fstrm = callPackage ../development/libraries/fstrm { }; cfitsio = callPackage ../development/libraries/cfitsio { }; @@ -9759,11 +9757,13 @@ with pkgs; # 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 == "bionic" then targetPackages.bionic - else if name == "uclibc" then targetPackages.uclibcCross + else if name == "bionic" then targetPackages.bionic or bionic + else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross + else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross + else if name == "newlib" then targetPackages.newlibCross or newlibCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 - else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries + else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode else throw "Unknown libc"; @@ -10166,6 +10166,8 @@ with pkgs; imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ; + ineffassign = callPackage ../development/tools/ineffassign { }; + ijs = callPackage ../development/libraries/ijs { }; incrtcl = callPackage ../development/libraries/incrtcl { }; @@ -11643,6 +11645,7 @@ with pkgs; opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { }; + openscenegraph_3_4 = callPackage ../development/libraries/openscenegraph/3.4.0.nix { }; openslp = callPackage ../development/libraries/openslp {}; @@ -11731,7 +11734,9 @@ with pkgs; pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; plv8 = callPackage ../servers/sql/postgresql/plv8 { - v8 = v8_6_x; + v8 = callPackage ../development/libraries/v8/plv8_6_x.nix { + inherit (python2Packages) python; + }; }; phonon = callPackage ../development/libraries/phonon {}; @@ -12159,10 +12164,7 @@ with pkgs; schroedinger = callPackage ../development/libraries/schroedinger { }; SDL = callPackage ../development/libraries/SDL { - openglSupport = libGLSupported; - alsaSupport = stdenv.isLinux; - x11Support = !stdenv.isCygwin; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; }; @@ -12183,12 +12185,7 @@ with pkgs; SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; SDL2 = callPackage ../development/libraries/SDL2 { - openglSupport = libGLSupported; - alsaSupport = stdenv.isLinux; - x11Support = !stdenv.isCygwin; - waylandSupport = stdenv.isLinux; - udevSupport = stdenv.isLinux; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; @@ -12222,9 +12219,13 @@ with pkgs; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; - simavr = callPackage ../development/tools/simavr { }; + simavr = callPackage ../development/tools/simavr { + avrgcc = pkgsCross.avr.buildPackages.gcc; + avrbinutils = pkgsCross.avr.buildPackages.binutils; + avrlibc = pkgsCross.avr.libcCross; + }; - simgear = callPackage ../development/libraries/simgear { }; + simgear = callPackage ../development/libraries/simgear { openscenegraph = openscenegraph_3_4; }; simp_le = callPackage ../tools/admin/simp_le { }; @@ -12552,6 +12553,8 @@ with pkgs; vala = vala_0_40; }; + unconvert = callPackage ../development/tools/unconvert { }; + unibilium = callPackage ../development/libraries/unibilium { }; unicap = callPackage ../development/libraries/unicap {}; @@ -13223,6 +13226,8 @@ with pkgs; dex-oidc = callPackage ../servers/dex { }; + doh-proxy = callPackage ../servers/dns/doh-proxy { }; + dgraph = callPackage ../servers/dgraph { }; dico = callPackage ../servers/dico { }; @@ -13560,6 +13565,8 @@ with pkgs; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; + miniflux = callPackage ../servers/miniflux { }; + nagios = callPackage ../servers/monitoring/nagios { }; munin = callPackage ../servers/monitoring/munin { }; @@ -13613,22 +13620,25 @@ with pkgs; pgbouncer = callPackage ../servers/sql/pgbouncer { }; - pgpool93 = pgpool.override { postgresql = postgresql93; }; - pgpool94 = pgpool.override { postgresql = postgresql94; }; + pgpool93 = pgpool.override { postgresql = postgresql_9_3; }; + pgpool94 = pgpool.override { postgresql = postgresql_9_4; }; pgpool = callPackage ../servers/sql/pgpool { pam = if stdenv.isLinux then pam else null; libmemcached = null; # Detection is broken upstream }; - postgresql = postgresql96; + timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; + + postgresql = postgresql_9_6; inherit (callPackages ../servers/sql/postgresql { }) - postgresql93 - postgresql94 - postgresql95 - postgresql96 - postgresql100; + postgresql_9_3 + postgresql_9_4 + postgresql_9_5 + postgresql_9_6 + postgresql_10 + postgresql_11; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; @@ -13873,10 +13883,14 @@ with pkgs; xqilla = callPackage ../development/tools/xqilla { }; - xquartz = callPackage ../servers/x11/xquartz { }; + xquartz = callPackage ../servers/x11/xquartz { + inherit (darwin) cf-private; + }; + quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; - inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) AppKit Foundation; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -13885,7 +13899,9 @@ with pkgs; # have created a cycle. xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { - inherit (darwin) apple_sdk; + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; + inherit (darwin.apple_sdk.libs) Xplugin; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; @@ -14047,6 +14063,8 @@ with pkgs; drbd = callPackage ../os-specific/linux/drbd { }; + dropwatch = callPackage ../os-specific/linux/dropwatch { }; + dstat = callPackage ../os-specific/linux/dstat { }; # unstable until the first 1.x release @@ -14231,14 +14249,6 @@ with pkgs; klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); - linux_beagleboard = callPackage ../os-specific/linux/kernel/linux-beagleboard.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_mptcp = linux_mptcp_94; linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = @@ -14301,11 +14311,6 @@ with pkgs; # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - # https://github.com/NixOS/nixpkgs/issues/42755 - # Remove these xen-netfront patches once they're included in - # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755 - kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock - kernelPatches.xen-netfront_update_features_after_registering_netdev ]; }; @@ -14343,24 +14348,6 @@ with pkgs; ]; }; - linux_riscv = callPackage ../os-specific/linux/kernel/linux-riscv.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14393,6 +14380,8 @@ with pkgs; python = python3; }; + bpftrace = callPackage ../os-specific/linux/bpftrace { }; + bbswitch = callPackage ../os-specific/linux/bbswitch {}; beegfs-module = callPackage ../os-specific/linux/beegfs/kernel-module.nix { }; @@ -14527,7 +14516,6 @@ with pkgs; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. - linuxPackages_beagleboard = linuxPackagesFor pkgs.linux_beagleboard; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); @@ -14587,11 +14575,6 @@ with pkgs; linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); - # Samus kernels - linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); - linuxPackages_samus_latest = linuxPackages_samus_4_12; - linux_samus_latest = linuxPackages_samus_latest.kernel; - # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; @@ -14720,19 +14703,24 @@ with pkgs; easyjson = callPackage ../development/tools/easyjson { }; + iferr = callPackage ../development/tools/iferr { }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; go-protobuf = callPackage ../development/tools/go-protobuf { }; - go-symbols = callPackage ../development/tools/go-symbols { }; go-outline = callPackage ../development/tools/go-outline { }; gocode = callPackage ../development/tools/gocode { }; + gocode-gomod = callPackage ../development/tools/gocode-gomod { }; + + goconst = callPackage ../development/tools/goconst { }; + goconvey = callPackage ../development/tools/goconvey { }; gotags = callPackage ../development/tools/gotags { }; @@ -14741,14 +14729,20 @@ with pkgs; golangci-lint = callPackage ../development/tools/golangci-lint { }; + gocyclo = callPackage ../development/tools/gocyclo { }; + godef = callPackage ../development/tools/godef { }; gopkgs = callPackage ../development/tools/gopkgs { }; + gosec = callPackage ../development/tools/gosec { }; + govers = callPackage ../development/tools/govers { }; govendor = callPackage ../development/tools/govendor { }; + go-tools = callPackage ../development/tools/go-tools { }; + gotools = callPackage ../development/tools/gotools { }; gotop = callPackage ../tools/system/gotop { }; @@ -14761,6 +14755,8 @@ with pkgs; gotests = callPackage ../development/tools/gotests { }; + impl = callPackage ../development/tools/impl { }; + quicktemplate = callPackage ../development/tools/quicktemplate { }; gogoclient = callPackage ../os-specific/linux/gogoclient { }; @@ -14828,8 +14824,6 @@ with pkgs; pmutils = callPackage ../os-specific/linux/pm-utils { }; - pmtools = callPackage ../os-specific/linux/pmtools { }; - policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; @@ -15526,6 +15520,10 @@ with pkgs; hasklig = callPackage ../data/fonts/hasklig {}; + interfacer = callPackage ../development/tools/interfacer { }; + + maligned = callPackage ../development/tools/maligned { }; + inter-ui = callPackage ../data/fonts/inter-ui { }; siji = callPackage ../data/fonts/siji { }; @@ -16019,13 +16017,18 @@ with pkgs; bookworm = callPackage ../applications/office/bookworm { }; - chromium = callPackage ../applications/networking/browsers/chromium { + chromium = callPackage ../applications/networking/browsers/chromium ({ channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; - gnome = gnome2; - }; + } // (if stdenv.isAarch64 then { + stdenv = gcc8Stdenv; + } else { + llvmPackages = llvmPackages_7; + stdenv = llvmPackages_7.stdenv; + }) + ); chronos = callPackage ../applications/networking/cluster/chronos { }; @@ -16069,6 +16072,8 @@ with pkgs; pulseaudioSupport = config.pulseaudio or false; }; + cmusfm = callPackage ../applications/audio/cmusfm { }; + cni = callPackage ../applications/networking/cluster/cni {}; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; @@ -16303,7 +16308,7 @@ with pkgs; eaglemode = callPackage ../applications/misc/eaglemode { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { - jdk = jdk10; + jdk = jdk11; }); ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; @@ -16339,6 +16344,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; @@ -17186,6 +17192,8 @@ with pkgs; gxmessage = callPackage ../applications/misc/gxmessage { }; + gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { }; + hackrf = callPackage ../applications/misc/hackrf { }; hakuneko = callPackage ../tools/misc/hakuneko { }; @@ -17259,6 +17267,8 @@ with pkgs; slack-cli = callPackage ../tools/networking/slack-cli { }; + slack-term = callPackage ../applications/networking/instant-messengers/slack-term { }; + singularity = callPackage ../applications/virtualization/singularity { }; spectmorph = callPackage ../applications/audio/spectmorph { }; @@ -17488,6 +17498,8 @@ with pkgs; jwm = callPackage ../applications/window-managers/jwm { }; + jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; + k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; stdenv = overrideCC stdenv gcc6; @@ -18310,7 +18322,10 @@ with pkgs; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentx = callPackage ../applications/misc/opentx { }; + opentx = callPackage ../applications/misc/opentx { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -18770,6 +18785,10 @@ with pkgs; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { boost = boost166; }; + rstudio-preview = libsForQt5.callPackage ../applications/editors/rstudio/preview.nix { + boost = boost166; + llvmPackages = llvmPackages_7; + }; rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); @@ -19053,6 +19072,8 @@ with pkgs; apiKey = config.libspotify.apiKey or null; }; + sourcetrail = callPackage ../development/tools/sourcetrail { }; + spotifywm = callPackage ../applications/audio/spotifywm { }; squeezelite = callPackage ../applications/audio/squeezelite { }; @@ -19173,6 +19194,8 @@ with pkgs; taskjuggler = callPackage ../applications/misc/taskjuggler { }; + tabula = callPackage ../applications/misc/tabula { }; + tasknc = callPackage ../applications/misc/tasknc { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -19394,6 +19417,7 @@ with pkgs; }; vim = callPackage ../applications/editors/vim { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -19752,6 +19776,8 @@ with pkgs; gtk = gtk2; }; + x11basic = callPackage ../development/compilers/x11basic { }; + x11vnc = callPackage ../tools/X11/x11vnc { }; x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { }; @@ -20251,7 +20277,7 @@ with pkgs; fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; - flightgear = libsForQt5.callPackage ../games/flightgear { }; + flightgear = libsForQt5.callPackage ../games/flightgear { openscenegraph = openscenegraph_3_4; }; flock = callPackage ../development/tools/flock { }; @@ -20693,6 +20719,7 @@ with pkgs; # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC libpng = libpng12; + openscenegraph = openscenegraph_3_4; }; torcs = callPackage ../games/torcs { }; @@ -21358,9 +21385,7 @@ with pkgs; abella = callPackage ../applications/science/logic/abella {}; - acgtk = callPackage ../applications/science/logic/acgtk { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }; + acgtk = callPackage ../applications/science/logic/acgtk {}; alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; @@ -21371,13 +21396,14 @@ with pkgs; boogie = dotnetPackages.Boogie; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_02 - ocamlPackages_4_05 - ; + inherit (ocaml-ng) ocamlPackages_4_05; }) mkCoqPackages - coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 - coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 - coqPackages coq + coqPackages_8_5 coq_8_5 + coqPackages_8_6 coq_8_6 + coqPackages_8_7 coq_8_7 + coqPackages_8_8 coq_8_8 + coqPackages_8_9 coq_8_9 + coqPackages coq ; coq2html = callPackage ../applications/science/logic/coq2html { @@ -21989,14 +22015,9 @@ with pkgs; gnome-breeze = callPackage ../misc/themes/gnome-breeze { }; gnuk = callPackage ../misc/gnuk { - gcc-arm-embedded = gcc-arm-embedded-4_9; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - gnuk-unstable = lowPrio (callPackage ../misc/gnuk/unstable.nix { - gcc-arm-embedded = gcc-arm-embedded-4_9; - }); - gnuk-git = lowPrio (callPackage ../misc/gnuk/git.nix { - gcc-arm-embedded = gcc-arm-embedded-4_9; - }); greybird = callPackage ../misc/themes/greybird { }; @@ -22106,38 +22127,56 @@ with pkgs; nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; - /* - * Evaluate a NixOS configuration using this evaluation of Nixpkgs. - * - * With this function you can write, for example, a package that - * depends on a custom virtual machine image. - * - * Parameter: A module, path or list of those that represent the - * configuration of the NixOS system to be constructed. - * - * Result: An attribute set containing packages produced by this - * evaluation of NixOS, such as toplevel, kernel and - * initialRamdisk. - * The result can be extended in the modules by defining - * extra options in system.build. - * - * Unlike in plain NixOS, the nixpkgs.config, nixpkgs.overlays and - * nixpkgs.system options will be ignored by default. Instead, - * nixpkgs.pkgs will have the default value of pkgs as it was - * constructed right after invoking the nixpkgs function (e.g. the - * value of import <nixpkgs> { overlays = [./my-overlay.nix]; } - * but not the value of (import <nixpkgs> {} // { extra = ...; }). - * - * If you do want to use the config.nixpkgs options, you are - * probably better off by calling nixos/lib/eval-config.nix - * directly, even though it is possible to set config.nixpkgs.pkgs. - * - * For more information about writing NixOS modules, see - * https://nixos.org/nixos/manual/index.html#sec-writing-modules - * - * Note that you will need to have called Nixpkgs with the system - * parameter set to the right value for your deployment target. - */ + /* Evaluate a NixOS configuration using this evaluation of Nixpkgs. + + With this function you can write, for example, a package that + depends on a custom virtual machine image. + + Parameter: A module, path or list of those that represent the + configuration of the NixOS system to be constructed. + + Result: An attribute set containing packages produced by this + evaluation of NixOS, such as toplevel, kernel and + initialRamdisk. + The result can be extended in the modules by defining + extra attributes in system.build. + + Example: + + let + myOS = pkgs.nixos ({ lib, pkgs, config, ... }: { + + config.services.nginx = { + enable = true; + # ... + }; + + # Use config.system.build to exports relevant parts of a + # configuration. The runner attribute should not be + # considered a fully general replacement for systemd + # functionality. + config.system.build.run-nginx = config.systemd.services.nginx.runner; + }); + in + myOS.run-nginx + + Unlike in plain NixOS, the nixpkgs.config, nixpkgs.overlays and + nixpkgs.system options will be ignored by default. Instead, + nixpkgs.pkgs will have the default value of pkgs as it was + constructed right after invoking the nixpkgs function (e.g. the + value of import <nixpkgs> { overlays = [./my-overlay.nix]; } + but not the value of (import <nixpkgs> {} // { extra = ...; }). + + If you do want to use the config.nixpkgs options, you are + probably better off by calling nixos/lib/eval-config.nix + directly, even though it is possible to set config.nixpkgs.pkgs. + + For more information about writing NixOS modules, see + https://nixos.org/nixos/manual/index.html#sec-writing-modules + + Note that you will need to have called Nixpkgs with the system + parameter set to the right value for your deployment target. + */ nixos = configuration: (import (self.path + "/nixos/lib/eval-config.nix") { inherit (pkgs.stdenv.hostPlatform) system; @@ -22154,6 +22193,8 @@ with pkgs; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; + nixdoc = callPackage ../tools/nix/nixdoc {}; + nix-bundle = callPackage ../tools/package-management/nix-bundle { }; nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; @@ -22729,9 +22770,7 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; - tomboy = callPackage ../applications/misc/tomboy { - mono = mono46; - }; + tomboy = callPackage ../applications/misc/tomboy { }; imatix_gsl = callPackage ../development/tools/imatix_gsl {}; @@ -22842,4 +22881,16 @@ with pkgs; }; tsung = callPackage ../applications/networking/tsung {}; + + qmk_firmware = callPackage ../development/misc/qmk_firmware { + avrgcc = pkgsCross.avr.buildPackages.gcc; + avrbinutils = pkgsCross.avr.buildPackages.binutils; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; + + newlib = callPackage ../development/misc/newlib { }; + newlibCross = callPackage ../development/misc/newlib { + stdenv = crossLibcStdenv; + }; } |