diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cebcaccb4d8..9abd2802fda9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -424,13 +424,17 @@ let makeAutostartItem = callPackage ../build-support/make-startupitem { }; - makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }@args: - callPackage ../build-support/kernel/make-initrd.nix args; + makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: + callPackage ../build-support/kernel/make-initrd.nix { + inherit contents compressor prepend; + }; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; - makeModulesClosure = { kernel, rootModules, allowMissing ? false }@args: - callPackage ../build-support/kernel/modules-closure.nix args; + makeModulesClosure = { kernel, rootModules, allowMissing ? false }: + callPackage ../build-support/kernel/modules-closure.nix { + inherit kernel rootModules allowMissing; + }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; @@ -473,6 +477,8 @@ let deps = [ makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; + separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; + ### TOOLS @@ -3065,7 +3071,7 @@ let svnfs = callPackage ../tools/filesystems/svnfs { }; svtplay-dl = callPackage ../tools/misc/svtplay-dl { - inherit (pythonPackages) nose mock; + inherit (pythonPackages) nose mock requests2; }; sysbench = callPackage ../development/tools/misc/sysbench {}; @@ -5746,7 +5752,7 @@ let tcptrack = callPackage ../development/tools/misc/tcptrack { }; - teensy-loader = callPackage ../development/tools/misc/teensy { }; + teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; @@ -8412,6 +8418,8 @@ let czmq = callPackage ../development/libraries/czmq { }; + zimlib = callPackage ../development/libraries/zimlib { }; + zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { }; @@ -9665,9 +9673,14 @@ let grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage; # Stable kernels - linux_grsec_stable_desktop = grKernel grFlavors.linux_grsec_stable_desktop; - linux_grsec_stable_server = grKernel grFlavors.linux_grsec_stable_server; - linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen; + # This is no longer supported. Please see the official announcement on the + # grsecurity page. https://grsecurity.net/announce.php + linux_grsec_stable_desktop = throw "No longer supported due to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_desktop."; + linux_grsec_stable_server = throw "No longer supported due to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_server."; + linux_grsec_stable_server_xen = throw "No longer supporteddue to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_server_xen."; # Testing kernels linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; @@ -10250,8 +10263,6 @@ let xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { }; - xf86_video_nouveau = xorg.xf86videonouveau; - xmoto = callPackage ../games/xmoto { }; xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; @@ -12428,10 +12439,16 @@ let inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2; }; + rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; + rakarrack = callPackage ../applications/audio/rakarrack { fltk = fltk13; }; + renoise = callPackage ../applications/audio/renoise { + demo = false; + }; + rapcad = callPackage ../applications/graphics/rapcad {}; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -15033,6 +15050,7 @@ let rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 |