diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 74 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 45 | ||||
| -rw-r--r-- | pkgs/top-level/static.nix | 13 |
5 files changed, 108 insertions, 28 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6616960a76e..bb5fddf532b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -379,8 +379,6 @@ mapAliases ({ xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 - yarn2nix = throw "Use upstream https://github.com/moretea/yarn2nix"; # added 2019-04-12 - mkYarnPackage = yarn2nix; # added 2019-04-12 youtubeDL = youtube-dl; # added 2014-10-26 zdfmediathk = mediathekview; # added 2019-01-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9932678a98..c2906f85d15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1093,12 +1093,18 @@ in tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; - libtensorflow = callPackage ../development/libraries/libtensorflow { + libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; inherit (linuxPackages) nvidia_x11; - cudatoolkit = cudatoolkit_9_0; - cudnn = cudnn_cudatoolkit_9_0; + cudatoolkit = cudatoolkit_10_0; + cudnn = cudnn_cudatoolkit_10_0; }; + libtensorflow = + if python.pkgs.tensorflow ? libtensorflow + then python.pkgs.tensorflow.libtensorflow + else libtensorflow-bin; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; blink1-tool = callPackage ../tools/misc/blink1-tool { }; @@ -1276,6 +1282,8 @@ in ccnet = callPackage ../tools/networking/ccnet { }; + croc = callPackage ../tools/networking/croc { }; + cddl = callPackage ../development/tools/cddl { }; cedille = callPackage ../applications/science/logic/cedille @@ -1383,6 +1391,8 @@ in cucumber = callPackage ../development/tools/cucumber {}; + dabtools = callPackage ../applications/radio/dabtools { }; + daemontools = callPackage ../tools/admin/daemontools { }; dale = callPackage ../development/compilers/dale { }; @@ -2174,7 +2184,13 @@ in cmst = libsForQt5.callPackage ../tools/networking/cmst { }; - codimd = callPackage ../servers/web-apps/codimd { }; + codimd = callPackage ../servers/web-apps/codimd { + nodejs = nodejs-10_x; + yarn2nix = yarn2nix-moretea.override { + nodejs = nodejs-10_x; + yarn = yarn.override { nodejs = nodejs-10_x; }; + }; + }; colord = callPackage ../tools/misc/colord { }; @@ -4340,8 +4356,6 @@ in nodePackages = nodePackages_10_x; - npm2nix = nodePackages.npm2nix; - now-cli = callPackage ../development/web/now-cli {}; file-rename = callPackage ../tools/filesystems/file-rename { }; @@ -4562,7 +4576,7 @@ in mairix = callPackage ../tools/text/mairix { }; - makemkv = callPackage ../applications/video/makemkv { }; + makemkv = libsForQt5.callPackage ../applications/video/makemkv { }; makerpm = callPackage ../development/tools/makerpm { }; @@ -4599,6 +4613,8 @@ in }; }; + mediawiki = callPackage ../servers/web-apps/mediawiki { }; + memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { }; memtest86-efi = callPackage ../tools/misc/memtest86-efi { }; @@ -4921,6 +4937,8 @@ in mpack = callPackage ../tools/networking/mpack { }; + mtm = callPackage ../tools/misc/mtm { }; + pa_applet = callPackage ../tools/audio/pa-applet { }; pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; @@ -5515,6 +5533,8 @@ in pwgen = callPackage ../tools/security/pwgen { }; + pwgen-secure = callPackage ../tools/security/pwgen-secure { }; + pwnat = callPackage ../tools/networking/pwnat { }; pwndbg = python3Packages.callPackage ../development/tools/misc/pwndbg { }; @@ -5903,6 +5923,8 @@ in seqdiag = with python3Packages; toPythonApplication seqdiag; + sequoia-tool = callPackage ../tools/security/sequoia-tool { inherit (llvmPackages) libclang; }; + sewer = callPackage ../tools/admin/sewer { }; screenfetch = callPackage ../tools/misc/screenfetch { }; @@ -6033,6 +6055,8 @@ in sshguard = callPackage ../tools/security/sshguard {}; + suricata = callPackage ../applications/networking/ids/suricata { }; + softhsm = callPackage ../tools/security/softhsm { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Security; @@ -6401,6 +6425,8 @@ in trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; + kernelshark = libsForQt5.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; + traceroute = callPackage ../tools/networking/traceroute { }; tracebox = callPackage ../tools/networking/tracebox { }; @@ -7007,6 +7033,8 @@ in yarn = callPackage ../development/tools/yarn { }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; + yasr = callPackage ../applications/audio/yasr { }; yank = callPackage ../tools/misc/yank { }; @@ -8165,7 +8193,9 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; - rustracer = callPackage ../development/tools/rust/racer { }; + rustracer = callPackage ../development/tools/rust/racer { + inherit (darwin.apple_sdk.frameworks) Security; + }; rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { @@ -8260,6 +8290,8 @@ in urweb = callPackage ../development/compilers/urweb { }; + vlang = callPackage ../development/compilers/vlang { }; + inherit (callPackage ../development/compilers/vala { }) vala_0_36 vala_0_38 @@ -12931,7 +12963,7 @@ in inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; - inherit harfbuzz; + harfbuzz = harfbuzzFull; inherit libGL; inherit perl; inherit gtk3; @@ -14952,6 +14984,8 @@ in syncserver = callPackage ../servers/syncserver { }; + thanos = callPackage ../servers/monitoring/thanos { }; + inherit (callPackages ../servers/http/tomcat { }) tomcat7 tomcat8 @@ -15839,6 +15873,7 @@ in aggregateModules = modules: callPackage ../os-specific/linux/kmod/aggregator.nix { + inherit (buildPackages) kmod; inherit modules; }; @@ -16446,7 +16481,8 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; - font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; + font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; + font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; font-awesome = font-awesome_5; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -17446,6 +17482,8 @@ in cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; + dablin = callPackage ../applications/radio/dablin { }; + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); @@ -18799,6 +18837,8 @@ in josm = callPackage ../applications/misc/josm { }; + jormungandr = callPackage ../applications/altcoins/jormungandr { }; + jbrout = callPackage ../applications/graphics/jbrout { }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -19670,7 +19710,7 @@ in openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; - openscad = callPackage ../applications/graphics/openscad {}; + openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; @@ -20554,7 +20594,7 @@ in tambura = callPackage ../applications/audio/tambura { }; - teamspeak_client = libsForQt511.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskell = callPackage ../applications/misc/taskell { }; @@ -20573,8 +20613,14 @@ in taskopen = callPackage ../applications/misc/taskopen { }; - tdesktopPackages = dontRecurseIntoAttrs (callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }); - tdesktop = tdesktopPackages.stable; + # TODO (@primeos): Remove after the 19.09 branch-off: + tdesktopPackages = throw '' + The attributes "tdesktopPackages.*" where removed as the preview version + will not be maintained anymore (there are regular stable releases and we + depend on the patches from Arch Linux which only track the stable version + as well). Please switch to "tdesktop" (stable version). + ''; + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3b807c932f0..949c5b6a308 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -719,6 +719,8 @@ let stringext = callPackage ../development/ocaml-modules/stringext { }; + toml = callPackage ../development/ocaml-modules/toml { }; + topkg = callPackage ../development/ocaml-modules/topkg { }; tsdl = callPackage ../development/ocaml-modules/tsdl { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bb23598232..025564b0bd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -502,6 +502,8 @@ in { diff_cover = callPackage ../development/python-modules/diff_cover { }; + diofant = callPackage ../development/python-modules/diofant { }; + docrep = callPackage ../development/python-modules/docrep { }; dominate = callPackage ../development/python-modules/dominate { }; @@ -2353,7 +2355,11 @@ in { image-match = callPackage ../development/python-modules/image-match { }; - imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; + imbalanced-learn = + if isPy27 then + callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } + else + callPackage ../development/python-modules/imbalanced-learn { }; immutables = callPackage ../development/python-modules/immutables {}; @@ -4022,6 +4028,8 @@ in { fixtures = callPackage ../development/python-modules/fixtures { }; + fipy = callPackage ../development/python-modules/fipy { }; + pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; @@ -4287,6 +4295,8 @@ in { pyspread = callPackage ../development/python-modules/pyspread { }; + pysparse = callPackage ../development/python-modules/pysparse { }; + pyupdate = callPackage ../development/python-modules/pyupdate {}; pyx = callPackage ../development/python-modules/pyx { }; @@ -4463,6 +4473,8 @@ in { pyxattr = callPackage ../development/python-modules/pyxattr { }; + pyamg = callPackage ../development/python-modules/pyamg { }; + pyaml = callPackage ../development/python-modules/pyaml { }; pyyaml = callPackage ../development/python-modules/pyyaml { }; @@ -4693,6 +4705,8 @@ in { scikit-tda = callPackage ../development/python-modules/scikit-tda { }; + scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; + scp = callPackage ../development/python-modules/scp {}; seaborn = callPackage ../development/python-modules/seaborn { }; @@ -4715,6 +4729,8 @@ in { simplegeneric = callPackage ../development/python-modules/simplegeneric { }; + shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; + shodan = callPackage ../development/python-modules/shodan { }; should-dsl = callPackage ../development/python-modules/should-dsl { }; @@ -5178,6 +5194,8 @@ in { swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; + openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + freezegun = callPackage ../development/python-modules/freezegun { }; taskw = callPackage ../development/python-modules/taskw { }; @@ -5697,15 +5715,22 @@ in { tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflow = - if stdenv.isDarwin - then callPackage ../development/python-modules/tensorflow/bin.nix { } - else callPackage ../development/python-modules/tensorflow/bin.nix rec { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10_0; - cudnn = pkgs.cudnn_cudatoolkit_10_0; - }; + tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; + }; + + tensorflow-build = callPackage ../development/python-modules/tensorflow { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; + nccl = pkgs.nccl_cudatoolkit_10; + }; + + tensorflow = if stdenv.isDarwin then self.tensorflow-bin else self.tensorflow-build; tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 476ad9de3e9..108c6006fb6 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -12,7 +12,8 @@ self: super: let inherit (super.stdenvAdapters) makeStaticBinaries - makeStaticLibraries; + makeStaticLibraries + propagateBuildInputs; inherit (super.lib) foldl optional flip id composeExtensions; inherit (super) makeSetupHook; @@ -30,7 +31,7 @@ self: super: let }); }; - staticAdapters = [ makeStaticLibraries ] + staticAdapters = [ makeStaticLibraries propagateBuildInputs ] # Apple does not provide a static version of libSystem or crt0.o # So we can’t build static binaries without extensive hacks. @@ -53,6 +54,14 @@ self: super: let in { stdenv = foldl (flip id) super.stdenv staticAdapters; + gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters; + gcc5Stdenv = foldl (flip id) super.gcc5Stdenv staticAdapters; + gcc6Stdenv = foldl (flip id) super.gcc6Stdenv staticAdapters; + gcc7Stdenv = foldl (flip id) super.gcc7Stdenv staticAdapters; + gcc8Stdenv = foldl (flip id) super.gcc8Stdenv staticAdapters; + gcc9Stdenv = foldl (flip id) super.gcc9Stdenv staticAdapters; + clangStdenv = foldl (flip id) super.clangStdenv staticAdapters; + libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters; haskell = super.haskell // { packageOverrides = composeExtensions |