Merge pull request #108423 from NixOS/staging-next

Staging next

nixos/modules/system/boot/stage-1.nix

@@ -513,7 +513,12 @@ in
     };
 
     boot.initrd.compressor = mkOption {
-      default = "gzip";
+      default = (
+        if lib.versionAtLeast config.boot.kernelPackages.kernel.version "5.9"
+        then "zstd"
+        else "gzip"
+      );
+      defaultText = "zstd if the kernel supports it (5.9+), gzip if not.";
       type = types.unspecified; # We don't have a function type...
       description = ''
         The compressor to use on the initrd image. May be any of:

nixos/tests/systemd-journal.nix

@@ -13,6 +13,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
   testScript = ''
     machine.wait_for_unit("multi-user.target")
 
+    machine.succeed("journalctl --grep=systemd")
+
     machine.succeed(
         "${pkgs.curl}/bin/curl -s localhost:19531/machine | ${pkgs.jq}/bin/jq -e '.hostname == \"machine\"'"
     )

pkgs/applications/audio/aj-snapshot/default.nix

@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files";
     longDescription = ''
-    Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. 
-    Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. 
-    ALSA, on the other hand, only provides routing facilities for MIDI clients. 
+    Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients.
+    Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK.
+    ALSA, on the other hand, only provides routing facilities for MIDI clients.
     You can also run aj-snapshot in daemon mode if you want to have your connections continually restored.
     '';
 

pkgs/applications/audio/artyFX/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
+{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "artyFX";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk   ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ cairomm libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ];
 
   meta = with stdenv.lib; {
     homepage = "http://openavproductions.com/artyfx/";

pkgs/applications/audio/cantata/default.nix

@@ -75,8 +75,6 @@ in mkDerivation {
 
   nativeBuildInputs = [ cmake pkgconfig qttools ];
 
-  enableParallelBuilding = true;
-
   cmakeFlags = lib.flatten [
     (fstats withTaglib        [ "TAGLIB" "TAGLIB_EXTRAS" ])
     (fstats withReplaygain    [ "FFMPEG" "MPG123" "SPEEXDSP" ])

pkgs/applications/audio/clementine/default.nix

@@ -79,8 +79,6 @@ let
       "-DSPOTIFY_BLOB=OFF"
     ];
 
-    enableParallelBuilding = true;
-
     passthru.unfree = unfree;
 
     postInstall = ''
@@ -122,7 +120,7 @@ let
         ln -s "${free}/share/$dir" "$out/share/$dir"
       done
     '';
-    enableParallelBuilding = true;
+
     meta = with stdenv.lib; {
       homepage = "https://www.clementine-player.org";
       description = "Spotify integration for Clementine";

pkgs/applications/audio/csound/default.nix

@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
   # version and remove fluidsynth 1.x from nixpkgs again.
   version = "6.15.0";
 
-  enableParallelBuilding = true;
-
   hardeningDisable = [ "format" ];
 
   src = fetchFromGitHub {

pkgs/applications/audio/eq10q/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig
+{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkg-config
 , xorg }:
 stdenv.mkDerivation rec {
   pname = "eq10q";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
 
   patches = [
     (fetchpatch {

pkgs/applications/audio/eteroj.lv2/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuv, lv2 }:
+{ stdenv, fetchFromGitHub, cmake, pkg-config, libuv, lv2 }:
 
 stdenv.mkDerivation rec {
   pname = "eteroj.lv2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libuv lv2 ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   meta = with stdenv.lib; {
     description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2";

pkgs/applications/audio/game-music-emu/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home";

pkgs/applications/audio/jack-oscrolloscope/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     mv jack_oscrolloscope $out/bin/
   '';
 
-  meta = with stdenv.lib; { 
+  meta = with stdenv.lib; {
     description = "A simple waveform viewer for JACK";
     homepage = "http://das.nasophon.de/jack_oscrolloscope";
     license = licenses.gpl2;

pkgs/applications/audio/jackmeter/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libjack2 ];
 
-  meta = { 
+  meta = {
     description = "Console jack loudness meter";
     homepage = "https://www.aelius.com/njh/jackmeter/";
     license = stdenv.lib.licenses.gpl2;

pkgs/applications/audio/kid3/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, pkgconfig, cmake, python3, ffmpeg_3, phonon, automoc4
+, pkg-config, cmake, python3, ffmpeg_3, phonon, automoc4
 , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt
 , id3lib, taglib, mp4v2, flac, libogg, libvorbis
 , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols
@@ -15,12 +15,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc=";
   };
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
-  buildInputs = [
-    pkgconfig cmake python3 ffmpeg_3 phonon automoc4
-    chromaprint docbook_xml_dtd_45 docbook_xsl libxslt
-    id3lib taglib mp4v2 flac libogg libvorbis zlib readline
-    qtbase qttools qtmultimedia qtquickcontrols ];
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+  buildInputs = [ python3 ffmpeg_3 phonon automoc4 chromaprint
+    docbook_xml_dtd_45 docbook_xsl libxslt id3lib taglib mp4v2 flac
+    libogg libvorbis zlib readline qtbase qttools qtmultimedia
+    qtquickcontrols ];
 
   cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ];
   NIX_LDFLAGS = "-lm -lpthread";
@@ -29,8 +28,6 @@ stdenv.mkDerivation rec {
     export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/"
   '';
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "A simple and powerful audio tag editor";
     longDescription = ''

pkgs/applications/audio/lmms/default.nix

@@ -37,7 +37,6 @@ mkDerivation rec {
   ];
 
   cmakeFlags = [ "-DWANT_QT5=ON" ];
-  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "DAW similar to FL Studio (music production software)";

pkgs/applications/audio/ncpamixer/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkgconfig }:
+{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }:
 
 stdenv.mkDerivation rec {
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ncurses libpulseaudio ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   configurePhase = ''
     make PREFIX=$out build/Makefile

pkgs/applications/audio/petrifoo/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas
 , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
-, pkgconfig, openssl }:
+, pkg-config, openssl }:
 
 stdenv.mkDerivation  rec {
   pname = "petri-foo";
@@ -11,10 +11,10 @@ stdenv.mkDerivation  rec {
     sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
   };
 
-  buildInputs =
-   [ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs
-     libsamplerate libsndfile libtool libxml2 pkgconfig openssl
-   ];
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  buildInputs = [ alsaLib gtk2 libjack2 libgnomecanvas libpthreadstubs
+                  libsamplerate libsndfile libtool libxml2 openssl ];
 
   meta = with stdenv.lib; {
     description = "MIDI controllable audio sampler";

pkgs/applications/audio/qmmp/default.nix

@@ -51,8 +51,6 @@ mkDerivation rec {
       libsamplerate
     ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Qt-based audio player that looks like Winamp";
     homepage = "http://qmmp.ylsoftware.com/";

pkgs/applications/audio/radiotray-ng/default.nix

@@ -80,8 +80,6 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}"
   ];
 
-  enableParallelBuilding = true;
-
   checkInputs = [ gtest ];
   doCheck = !stdenv.isAarch64; # single failure that I can't explain
 

pkgs/applications/audio/rosegarden/default.nix

@@ -33,8 +33,6 @@ stdenv.mkDerivation (rec {
     alsaLib
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     homepage = "https://www.rosegardenmusic.com/";
     description = "Music composition and editing environment";

pkgs/applications/audio/sorcer/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
+{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config, python }:
 
 stdenv.mkDerivation rec {
   pname = "sorcer";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ boost cairomm libsndfile lv2 ntk python ];
 
   postPatch = ''
      # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://openavproductions.com/sorcer/";
     description = "A wavetable LV2 plugin synth, targeted at the electronic / dubstep genre";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = [ maintainers.magnetophon ];
     platforms = platforms.linux;
   };

pkgs/applications/audio/soundkonverter/default.nix

@@ -62,7 +62,7 @@ mkDerivation rec {
       stripLen = 1;
     })
   ];
-  enableParallelBuilding = true;
+
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ];
   propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon];
   buildInputs = [ taglib ] ++ runtimeDeps;

pkgs/applications/audio/traverso/default.nix

@@ -18,7 +18,6 @@ mkDerivation {
 
   cmakeFlags = [ "-DWANT_PORTAUDIO=1" "-DWANT_PULSEAUDIO=1" "-DWANT_MP3_ENCODE=1" "-DWANT_LV2=0" ];
 
-  enableParallelBuilding = true;
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {

pkgs/applications/audio/ympd/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }:
+{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "ympd";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake mpd_clientlib openssl ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ mpd_clientlib openssl ];
 
   meta = {
     homepage = "https://www.ympd.org";

pkgs/applications/blockchains/bitcoin-abc.nix

@@ -32,8 +32,6 @@ mkDerivation rec {
     find ./. -type f -iname "*.sh" -exec chmod +x {} \;
   '';
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Peer-to-peer electronic cash system (Cash client)";
     longDescription= ''

pkgs/applications/blockchains/bitcoin-gold.nix

@@ -19,7 +19,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  
+
   pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold";
   version = "0.15.2";
 

pkgs/applications/blockchains/dero.nix

@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     description = "Secure, private blockchain with smart contracts based on Monero";
     homepage = "https://dero.io/";

pkgs/applications/blockchains/masari.nix

@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol";
     homepage = "https://www.getmasari.org/";

pkgs/applications/blockchains/pivx.nix

@@ -4,7 +4,7 @@
 , util-linux, qtbase ? null, qttools ? null
 , enableUpnp ? false
 , disableWallet ? false
-, disableDaemon ? false 
+, disableDaemon ? false
 , withGui ? false }:
 
 with stdenv.lib;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
                     ++ optionals withGui [ "--with-gui=yes"
                                            "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
                                          ];
-  
+
   enableParallelBuilding = true;
   doChecks = true;
   postBuild = ''

pkgs/applications/blockchains/sumokoin.nix

@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
     "-DLMDB_INCLUDE=${lmdb}/include"
   ];
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     description = "A fork of Monero and a truely fungible cryptocurrency";
     homepage = "https://www.sumokoin.org/";

pkgs/applications/display-managers/ly/default.nix

@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, linux-pam }:
 
-stdenv.mkDerivation rec { 
+stdenv.mkDerivation rec {
   pname = "ly";
   version = "0.2.1";
 
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
     rev = version;
     sha256 = "16gjcrd4a6i4x8q8iwlgdildm7cpdsja8z22pf2izdm6rwfki97d";
     fetchSubmodules = true;
-  }; 
+  };
 
   buildInputs = [ linux-pam ];
   makeFlags = [ "FLAGS=-Wno-error" ];
 
   installPhase = ''
     mkdir -p $out/bin
-    cp bin/ly $out/bin 
+    cp bin/ly $out/bin
   '';
 
   meta = with lib; {

pkgs/applications/editors/aseprite/default.nix

@@ -96,8 +96,6 @@ stdenv.mkDerivation rec {
     rm -rf "$out"/include "$out"/lib
   '';
 
-  enableParallelBuilding = true;
-
   passthru = { inherit skia; };
 
   meta = with lib; {

pkgs/applications/editors/bonzomatic/default.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg";
   };
 
-  buildInputs = [ cmake makeWrapper alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ];
+  nativeBuildInputs = [ cmake makeWrapper ];
+  buildInputs = [ alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ];
 
   postFixup = ''
     wrapProgram $out/bin/Bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib"

pkgs/applications/editors/dhex/default.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ncurses ];
- 
+
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/share/man/man1

pkgs/applications/editors/emacs-modes/melpa-packages.nix

@@ -578,7 +578,8 @@ let
         };
 
         vterm = super.vterm.overrideAttrs (old: {
-          buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ];
+          nativeBuildInputs = [ pkgs.cmake ];
+          buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ];
           cmakeFlags = [
             "-DEMACS_SOURCE=${self.emacs.src}"
             "-DUSE_SYSTEM_LIBVTERM=ON"

pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix

@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation {
   name = "session-management-for-emacs-2.2a";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz";
     sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
   };
 
   buildInputs = [emacs];
-  
+
   installPhase = ''
     mkdir -p "$out/share/emacs/site-lisp"
     cp lisp/*.el "$out/share/emacs/site-lisp/"
   '';
 
-  meta = { 
+  meta = {
     /* installation: add to your ~/.emacs
        (require 'session)
        (add-hook 'after-init-hook 'session-initialize)

pkgs/applications/editors/jed/default.nix

@@ -0,0 +1,95 @@
+{ stdenv, fetchzip
+, pkg-config
+, gpm
+, libXext
+, libXft
+, libXt
+, ncurses5
+, slang
+} :
+
+stdenv.mkDerivation rec {
+  pname = "jed";
+  version = "0.99-19";
+
+  src = fetchzip {
+    url = "https://www.jedsoft.org/releases/${pname}/${pname}-${version}.tar.bz2";
+    sha256 = "sha256-vzeX0P+2+IuKtrX+2lQDeJj7VMDS6XurD2pb2jhxy2Q=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    gpm
+    libXext
+    libXft
+    libXt
+    ncurses5
+    slang
+  ];
+
+  configureFlags = [
+    "CC=cc"
+    "--with-slang=${slang}"
+    "JED_ROOT=${placeholder "out"}/share/jed"
+  ];
+
+  makeFlags = [
+    "jed" "xjed" "rgrep"
+  ];
+
+  postPatch = ''
+    for i in autoconf/Makefile autoconf/Makefile.in \
+             doc/tm/Makefile src/Makefile.in; do
+      sed -e 's|/bin/cp|cp|' -i $i
+    done
+    for i in autoconf/aclocal.m4 configure; do
+      sed -e 's|ncurses5|ncurses|' -i $i
+    done
+  '';
+
+  postInstall = ''
+    install -D src/objs/rgrep $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A programmable text editor written around S-Lang";
+    longDescription = ''
+      JED is a freely available text editor for Unix, VMS, MSDOS, OS/2, BeOS,
+      QNX, and win9X/NT platforms. Although it is a powerful editor designed for
+      use by programmers, its drop-down menu facility make it one of the
+      friendliest text editors around. Hence it is ideal for composing simple
+      email messages as well as editing complex programs in a variety of
+      computer languages.
+
+      JED makes extensive use of the S-Lang library, which endows it with the
+      powerful S-Lang scripting language. Some of its features are:
+
+      - Color syntax highlighting on color terminals, e.g., Linux console or a
+        remote color terminal via dialup (as well as Xjed)
+      - Folding support
+      - Drop-down menus on _ALL_ terminals/platforms
+      - Emulation of Emacs, EDT, Wordstar, Borland, and Brief editors
+      - Extensible in the C-like S-Lang language making the editor completely
+        customizable.
+      - Capable of reading GNU info files from within JED's info browser
+      - A variety of programming modes (with syntax highlighting) are available
+        including C, C++, FORTRAN, TeX, HTML, SH, python, IDL, DCL, NROFF...
+      - Edit TeX files with AUC-TeX style editing (BiBTeX support too)
+      - Asynchronous subprocess support allowing one to compile from within the
+        editor
+      - Built-in support for the GPM mouse driver on Linux console
+      - Abbreviation mode and Dynamic abbreviation mode
+      - 8 bit clean with mute/dead key support
+      - Supported on most Unix, VMS, OS/2, MSDOS (386+), win9X/NT, QNX, and BeOS
+        systems
+      - Rectangular cut/paste; regular expressions; incremental searches; search
+        replace across multiple files; multiple windows; multiple buffers; shell
+        modes; directory editor (dired); mail; rmail; ispell; and much, much
+        more
+    '';
+    homepage = "https://www.jedsoft.org/jed/index.html";
+    license = licenses.gpl2Plus;
+    platforms = slang.meta.platforms;
+  };
+}
+# TODO: build tex documentation

pkgs/applications/editors/jove/default.nix

@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub
+, groff
+, ncurses
+, makeWrapper
+} :
+
+stdenv.mkDerivation rec {
+  pname = "jove";
+  version = "4.17.3.6";
+
+  src = fetchFromGitHub {
+    owner = "jonmacs";
+    repo = "jove";
+    rev = version;
+    sha256 = "sha256-uQRNKV06ipOHrOsvsceqIFGGlRv5qOQy18q0tFkR6Kg=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [
+    groff
+    ncurses
+  ];
+
+  dontConfigure = true;
+
+  preBuild = ''
+    makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \
+      TERMCAPLIB=-lncurses JOVEHOME=${placeholder "out"})
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/teachjove \
+      --prefix PATH ":" "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Jonathan's Own Version or Emacs";
+    homepage = "https://github.com/jonmacs/jove";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+}

pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix

@@ -7,14 +7,14 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  
+
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
     sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1";
   };
 
   nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
-  
+
   buildInputs = [ qtbase ];
 
   meta = with stdenv.lib; {

pkgs/applications/editors/monodevelop/default.nix

@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX
     > export PATH=${mono}/bin:\$PATH
     > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH
-    > 
+    >
     EOF
     done
 

pkgs/applications/editors/neovim/default.nix

@@ -48,7 +48,6 @@ in
     ];
 
     dontFixCmake = true;
-    enableParallelBuilding = true;
 
     buildInputs = [
       gperf

pkgs/applications/editors/neovim/qt.nix

@@ -27,8 +27,6 @@ let
 
     nativeBuildInputs = [ cmake doxygen ];
 
-    enableParallelBuilding = true;
-
     preCheck = ''
       # The GUI tests require a running X server, disable them
       sed -i ../test/CMakeLists.txt \

pkgs/applications/editors/rstudio/default.nix

@@ -109,8 +109,6 @@ mkDerivation rec {
       popd
     '';
 
-  enableParallelBuilding = true;
-
   cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
 
   desktopItem = makeDesktopItem {

pkgs/applications/editors/sigil/default.nix

@@ -36,8 +36,6 @@ mkDerivation rec {
        ''${qtWrapperArgs[@]}
   '';
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Free, open source, multi-platform ebook (ePub) editor";
     homepage = "https://github.com/Sigil-Ebook/Sigil/";

pkgs/applications/editors/texmacs/default.nix

@@ -31,8 +31,6 @@ mkDerivation {
     sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105";
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [
     guile_1_8

pkgs/applications/graphics/antimony/default.nix

@@ -40,8 +40,6 @@ in
       "-DGITBRANCH=${gitBranch}"
     ];
 
-    enableParallelBuilding = true;
-
     meta = with stdenv.lib; {
       description = "A computer-aided design (CAD) tool from a parallel universe";
       homepage    = "https://github.com/mkeeter/antimony";

pkgs/applications/graphics/apitrace/default.nix

@@ -27,13 +27,13 @@ stdenv.mkDerivation rec {
     # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers.
     # `RUNPATH` doesn't propagate throughout the whole application, but only
     # from the module performing the `dlopen()`.
-    # 
+    #
     # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so`
     # files in $out/lib/apitrace/wrappers.
-    # 
+    #
     # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd`
     # and other dispatcher libraries, and run `dlopen()`  by themselves.
-    # 
+    #
     # As `RUNPATH` doesn't propagate through the whole library, and they're now the
     # library doing the real `dlopen()`, they also need to have
     # `/run-opengl-driver[-32]` added to their `RUNPATH`.

pkgs/applications/graphics/autopanosiftc/default.nix

@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s";
   };
 
-  buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libpng libtiff libjpeg panotools libxml2 ];
 
   patches = [
     (fetchurl {

pkgs/applications/graphics/digikam/default.nix

@@ -109,8 +109,6 @@ mkDerivation rec {
     threadweaver
   ];
 
-  enableParallelBuilding = true;
-
   cmakeFlags = [
     "-DENABLE_MYSQLSUPPORT=1"
     "-DENABLE_INTERNALMYSQL=1"

pkgs/applications/graphics/drawing/default.nix

@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
   version = "0.4.13";
 
   format = "other";
-  
+
   src = fetchFromGitHub {
     owner = "maoschanz";
     repo = pname;

pkgs/applications/graphics/freecad/default.nix

@@ -27,7 +27,7 @@ in mkDerivation rec {
   ];
 
   buildInputs = [
-    cmake coin3d xercesc ode eigen opencascade-occt gts
+    coin3d xercesc ode eigen opencascade-occt gts
     zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
     libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns
   ] ++ (with pythonPackages; [

pkgs/applications/graphics/freepv/default.nix

@@ -9,8 +9,8 @@ stdenv.mkDerivation {
     sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56";
   };
 
-  buildInputs = [ libjpeg libGLU libGL freeglut zlib cmake libX11 libxml2 libpng
-    libXxf86vm ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ];
 
   postPatch = ''
     sed -i -e '/GECKO/d' CMakeLists.txt

pkgs/applications/graphics/fstl/default.nix

@@ -13,7 +13,7 @@ mkDerivation rec {
   preBuild = ''
     qmake qt/fstl.pro
   '';
-  
+
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/Applications
     mv fstl.app $out/Applications

pkgs/applications/graphics/hugin/default.nix

@@ -31,8 +31,6 @@ stdenv.mkDerivation rec {
   # disable installation of the python scripting interface
   cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
 
-  enableParallelBuilding = true;
-
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 
   postInstall = ''

pkgs/applications/graphics/kcc/default.nix

@@ -14,7 +14,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     pname = "KindleComicConverter";
     sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";
   };
-  
+
   propagatedBuildInputs = with python3Packages ; [
     pillow
     pyqt5

pkgs/applications/graphics/kgraphviewer/default.nix

@@ -27,8 +27,6 @@ mkDerivation rec {
     kconfig kinit kio kparts kwidgetsaddons
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "A Graphviz dot graph viewer for KDE";
     license     = licenses.gpl2;

pkgs/applications/graphics/meshlab/default.nix

@@ -84,8 +84,6 @@ mkDerivation rec {
   #     |
   hardeningDisable = [ "format" ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "A system for processing and editing 3D triangular meshes";
     homepage = "https://www.meshlab.net/";

pkgs/applications/graphics/nomacs/default.nix

@@ -27,8 +27,6 @@ mkDerivation rec {
     sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4";
   };
 
-  enableParallelBuilding = true;
-
   setSourceRoot = ''
     sourceRoot=$(echo */ImageLounge)
   '';

pkgs/applications/graphics/pbrt/default.nix

@@ -1,7 +1,6 @@
 {stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}:
 
 stdenv.mkDerivation {
-
   version = "2018-08-15";
   pname = "pbrt-v3";
 
@@ -18,12 +17,13 @@ stdenv.mkDerivation {
     ./openexr-cmake-3.12.patch
   ];
 
-  buildInputs = [ git flex bison cmake zlib ];
+  nativeBuildInputs = [ flex bison cmake ];
+  buildInputs = [ zlib ];
 
   meta = with stdenv.lib; {
     homepage = "http://pbrt.org";
     description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
-    platforms = platforms.linux ;
+    platforms = platforms.linux;
     license = licenses.bsd2;
     maintainers = [ maintainers.juliendehos ];
     priority = 10;

pkgs/applications/graphics/photivo/default.nix

@@ -32,8 +32,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     license = licenses.gpl3;

pkgs/applications/graphics/photoqt/default.nix

@@ -37,8 +37,6 @@ mkDerivation rec {
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
   '';
 
-  enableParallelBuilding = true;
-
   meta = {
     homepage = "https://photoqt.org/";
     description = "Simple, yet powerful and good looking image viewer";

pkgs/applications/graphics/rawtherapee/default.nix

@@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
     echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake
   '';
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "RAW converter and digital photo processing software";
     homepage = "http://www.rawtherapee.com/";

pkgs/applications/graphics/renderdoc/default.nix

@@ -61,8 +61,6 @@ mkDerivation rec {
     addOpenGLRunpath $out/lib/librenderdoc.so
   '';
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "A single-frame graphics debugger";
     homepage = "https://renderdoc.org/";

pkgs/applications/graphics/sane/backends/brscan4/default.nix

@@ -11,7 +11,7 @@ let
 
 in stdenv.mkDerivation rec {
   name = "brscan4-0.4.8-1";
-  src = 
+  src =
     if stdenv.hostPlatform.system == "i686-linux" then
       fetchurl {
         url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb";

pkgs/applications/graphics/scantailor/default.nix

@@ -8,9 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg";
   };
 
-  buildInputs = [ qt4 cmake libjpeg libtiff boost ];
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 libjpeg libtiff boost ];
 
   meta = {
     homepage = "http://scantailor.org/";

pkgs/applications/graphics/screencloud/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   # for tracking usage.
   consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6";
   consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216";
-  
+
   src = fetchFromGitHub {
     owner = "olav-st";
     repo = "screencloud";
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";
   };
 
-  buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];
 
   patchPhase = ''
     # Required to make the configure script work. Normally, screencloud's
@@ -28,8 +29,6 @@ stdenv.mkDerivation rec {
     substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" ""
   '';
 
-  enableParallelBuilding = true;
-
   # We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not
   # to add the argument for us.
   dontAddPrefix = true;

pkgs/applications/graphics/smartdeblur/default.nix

@@ -16,9 +16,8 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
-  enableParallelBuilding = true;
-
-  buildInputs = [ cmake qt4 fftw ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 fftw ];
 
   cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ];
 

pkgs/applications/graphics/solvespace/default.nix

@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
     json_c fontconfig gtkmm3 pangomm glew libGLU
     xorg.libpthreadstubs xorg.libXdmcp pcre
   ];
-  enableParallelBuilding = true;
 
   preConfigure = ''
     patch CMakeLists.txt <<EOF

pkgs/applications/misc/albert/default.nix

@@ -18,8 +18,6 @@ mkDerivation rec {
 
   buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 qtcharts ];
 
-  enableParallelBuilding = true;
-
   # We don't have virtualbox sdk so disable plugin
   cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ];
 

pkgs/applications/misc/apvlv/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy
 , gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook
 }:
 
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
 
   nativeBuildInputs = [
-    pkgconfig
+    cmake
+    pkg-config
     wrapGAppsHook
   ];
 
   buildInputs = [
-    cmake
     poppler pcre libxkbcommon epoxy
     freetype gtk3
     libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation

pkgs/applications/misc/audio/wavrsocvt/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   phases = [ "unpackPhase" "installPhase" ];
 
   unpackPhase = ''
-    tar -zxf $src 
+    tar -zxf $src
     '';
 
   installPhase = ''

pkgs/applications/misc/blender/default.nix

@@ -128,8 +128,6 @@ stdenv.mkDerivation rec {
   # libstdc++ in our RPATH. Sigh.
   NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib";
 
-  enableParallelBuilding = true;
-
   blenderExecutable =
     placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender");
   # --python-expr is used to workaround https://developer.blender.org/T74304

pkgs/applications/misc/candle/default.nix

@@ -12,7 +12,7 @@ mkDerivation rec {
   };
 
   nativeBuildInputs = [ qmake ];
-  
+
   sourceRoot = "source/src";
 
   installPhase = ''

pkgs/applications/misc/deadd-notification-center/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     cp $src $out/bin/deadd-notification-center
     chmod +x $out/bin/deadd-notification-center
 
-    sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service 
+    sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service
   '';
 
   meta = with stdenv.lib; {

pkgs/applications/misc/dfilemanager/default.nix

@@ -11,7 +11,8 @@ mkDerivation {
     sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY=";
   };
 
-  buildInputs = [ cmake qtbase qttools file solid ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qtbase qttools file solid ];
 
   cmakeFlags = [ "-DQT5BUILD=true" ];
 

pkgs/applications/misc/elf-dissector/default.nix

@@ -15,8 +15,6 @@ mkDerivation rec {
 
   buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ];
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     homepage = "https://invent.kde.org/sdk/elf-dissector";
     description = "Tools for inspecting, analyzing and optimizing ELF files";

pkgs/applications/misc/far2l/default.nix

@@ -76,8 +76,6 @@ stdenv.mkDerivation rec {
 
   stripDebugList = [ "bin" "share" ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "An orthodox file manager";
     homepage = "https://github.com/elfmz/far2l";

pkgs/applications/misc/fme/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   pname = "fme";
   version = "1.1.3";
-  
+
   src = fetchurl {
     url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz";
     sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d";

pkgs/applications/misc/fusee-interfacee-tk/default.nix

@@ -1,40 +1,40 @@
-{ stdenv , fetchFromGitHub , python3 , makeWrapper }: 
+{ stdenv , fetchFromGitHub , python3 , makeWrapper }:
 
-let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); 
-in stdenv.mkDerivation rec { 
+let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]);
+in stdenv.mkDerivation rec {
   pname = "fusee-interfacee-tk";
   version = "1.0.1";
 
-  src = fetchFromGitHub { 
+  src = fetchFromGitHub {
     owner = "nh-server";
     repo = pname;
-    rev = "V${version}"; 
+    rev = "V${version}";
     sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ pythonEnv ];
 
-  installPhase = '' 
+  installPhase = ''
     mkdir -p $out/bin
-			      
-    # The program isn't just called app, so I'm renaming it based on the repo name 
+
+    # The program isn't just called app, so I'm renaming it based on the repo name
     # It also isn't a standard program, so we need to append the shebang to the top
-    echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk 
+    echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk
     cat app.py >> $out/bin/fusee-interfacee-tk
-    chmod +x $out/bin/fusee-interfacee-tk 
-							      
-    # app.py depends on these to run 
-    cp *.py $out/bin/ 
+    chmod +x $out/bin/fusee-interfacee-tk
+
+    # app.py depends on these to run
+    cp *.py $out/bin/
     cp intermezzo.bin $out/bin/intermezzo.bin
   '';
 
-  meta = with stdenv.lib; { 
+  meta = with stdenv.lib; {
     homepage = "https://github.com/nh-server/fusee-interfacee-tk";
     description = "A tool to send .bin files to a Nintendo Switch in RCM mode";
-    longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. 
+    longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM.
     Must be run as sudo.";
     maintainers = with maintainers; [ kristian-brucaj ];
     license = licenses.gpl2;
   };
-} 
+}

pkgs/applications/misc/gammu/default.nix

@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
   ++ optionals dbiSupport [ libdbi libdbiDrivers ]
   ++ optionals postgresSupport [ postgresql ];
 
-  enableParallelBuilding = true;
-
   meta = {
     homepage = "https://wammu.eu/gammu/";
     description = "Command line utility and library to control mobile phones";

pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh

@@ -43,7 +43,7 @@ if [ "ico" = "$rscFileExt" ]; then
 else
     wrestool -x --output=$tmp/ico -t14 $rscFile
 fi
-    
+
 icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico
 
 mkdir -p $out

pkgs/applications/misc/keepassx/2.0.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:
+{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "keepassx2";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3";
   };
 
-  buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libgcrypt qt4 xorg.libXtst ];
 
   meta = {
     description = "Qt password manager compatible with its Win32 and Pocket PC versions";

pkgs/applications/misc/kiwix/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig
+{ stdenv, fetchurl, makeWrapper, pkg-config
 , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
 , libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
 , gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
@@ -38,7 +38,7 @@ let
       sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
     };
 
-    buildInputs = [ cmake ];
+    nativeBuildInputs = [ cmake ];
 
     unpackPhase = ''
       # not a nice src archive: all the files are in the root :(
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     zip python zlib xapian which icu libmicrohttpd
     lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml

pkgs/applications/misc/lenmus/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, fetchFromGitHub, fetchpatch
+{ stdenv, pkg-config, fetchFromGitHub, fetchpatch
 , cmake, boost
 , portmidi, sqlite
 , freetype, libpng, pngpp, zlib
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p";
   };
 
-  enableParallelBuilding = true;
-
   patches = [
     (fetchpatch {
       url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch";
@@ -29,9 +27,9 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [
-    cmake boost
+    boost
     portmidi sqlite
     freetype libpng pngpp zlib
     wxGTK30 wxsqlite3

pkgs/applications/misc/minergate-cli/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
     patchelf --set-interpreter "$interpreter" $pgm
 
-    wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} 
+    wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]}
 
     rm $out/usr/bin/minergate-cli
     mkdir -p $out/bin

pkgs/applications/misc/nanoblogger/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cp -r * $out
-    cat > $out/bin/nb << EOF 
+    cat > $out/bin/nb << EOF
     #!${bash}/bin/bash
     $out/nb "\$@"
     EOF

pkgs/applications/misc/opencpn/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, gtk2, wxGTK30, libpulseaudio, curl,
+{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl,
   gettext, glib, portaudio }:
 
 stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext
                   glib portaudio ];
 
   cmakeFlags = [
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
   ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "A concise ChartPlotter/Navigator";
     maintainers = [ stdenv.lib.maintainers.kragniz ];

pkgs/applications/misc/opentx/default.nix

@@ -15,8 +15,6 @@ mkDerivation rec {
     sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq";
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];
 
   buildInputs = [ qtbase qtmultimedia qttranslations SDL ];

pkgs/applications/misc/phwmon/default.nix

@@ -16,11 +16,11 @@ stdenv.mkDerivation {
   buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ];
 
   pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ];
-  
+
   patchPhase = ''
     substituteInPlace install.sh --replace "/usr/local" "$out"
   '';
-    
+
   installPhase = ''
     mkdir -p $out/bin $out/share/applications
     ./install.sh

pkgs/applications/misc/playonlinux/default.nix

@@ -27,7 +27,7 @@
 let
   version = "4.4";
 
-  binpath = stdenv.lib.makeBinPath [ 
+  binpath = stdenv.lib.makeBinPath [
     cabextract
     python
     gettext
@@ -70,7 +70,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = [ 
+  buildInputs = [
     xorg.libX11
     libGL
     python

pkgs/applications/misc/posterazor/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }:
+{ stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }:
 
 stdenv.mkDerivation {
   name = "posterazor-1.5.1";
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake unzip libXpm fltk13 freeimage ];
+  nativeBuildInputs = [ cmake pkg-config unzip ];
+  buildInputs = [ libXpm fltk13 freeimage ];
 
   unpackPhase = ''
     unzip $src -d posterazor

pkgs/applications/misc/prusa-slicer/default.nix

@@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
   pname = "prusa-slicer";
   version = "2.2.0";
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [
     cmake
     pkgconfig

pkgs/applications/misc/pwsafe/default.nix

@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
     "-DNO_GTEST=ON"
     "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1"
   ];
-  enableParallelBuilding = true;
 
   postPatch = ''
     # Fix perl scripts used during the build.

pkgs/applications/misc/qlandkartegt/default.nix

@@ -63,8 +63,6 @@ mkDerivation rec {
     "-DEXIF_INCLUDE_DIRS=${libexif}/include"
   ];
 
-  enableParallelBuilding = true;
-
   postPatch = ''
     substituteInPlace ConfigureChecks.cmake \
       --replace \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt"

pkgs/applications/misc/qlandkartegt/garmindev.nix

@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libusb-compat-0_1 ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     homepage = "http://www.qlandkarte.org/";
     description = "Garmin Device Drivers for QlandkarteGT";

pkgs/applications/misc/qolibri/default.nix

@@ -17,8 +17,6 @@ mkDerivation {
     libeb lzo qtbase qtmultimedia qttools qtwebengine
   ];
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     homepage = "https://github.com/ludios/qolibri";
     description = "EPWING reader for viewing Japanese dictionaries";

pkgs/applications/misc/qsyncthingtray/default.nix

@@ -53,8 +53,6 @@ mkDerivation rec {
     runHook postInstall
   '';
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     homepage = "https://github.com/sieren/QSyncthingTray/";
     description = "A Traybar Application for Syncthing written in C++";

pkgs/applications/misc/slade/default.nix

@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig zip ];
   buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Doom editor";
     homepage = "http://slade.mancubus.net/";

pkgs/applications/misc/slade/git.nix

@@ -14,8 +14,6 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pkgconfig zip ];
   buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Doom editor";
     homepage = "http://slade.mancubus.net/";

pkgs/applications/misc/sleepyhead/default.nix

@@ -24,7 +24,7 @@ in mkDerivation {
   patchPhase = ''
     patchShebangs configure
   '';
-  
+
   installPhase = if stdenv.isDarwin then ''
     mkdir -p $out/Applications
     cp -r sleepyhead/SleepyHead.app $out/Applications

pkgs/applications/misc/sqliteman/default.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs";
   };
 
-  buildInputs = [ cmake qt4 qscintilla ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 qscintilla ];
 
   prePatch = ''
     sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp