Merge master into haskell-updates

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

@@ -1867,6 +1867,15 @@ Superuser created successfully.
           directory.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Loki has had another release. Some default values have been
+          changed for the configuration and some configuration options
+          have been renamed. For more details, please check
+          <link xlink:href="https://grafana.com/docs/loki/latest/upgrading/#240">the
+          upgrade guide</link>.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
 </section>

nixos/doc/manual/release-notes/rl-2111.section.md

@@ -518,3 +518,5 @@ In addition to numerous new and upgraded packages, this release has the followin
   - The unifi run directory can now be found under: `/run/unifi` instead of `/var/lib/unifi/run`.
 
 - `security.pam.services.<name>.makeHomeDir` now uses `umask=0077` instead of `umask=0022` when creating the home directory.
+
+- Loki has had another release. Some default values have been changed for the configuration and some configuration options have been renamed. For more details, please check [the upgrade guide](https://grafana.com/docs/loki/latest/upgrading/#240).

nixos/modules/module-list.nix

@@ -1189,6 +1189,7 @@
   ./virtualisation/virtualbox-guest.nix
   ./virtualisation/virtualbox-host.nix
   ./virtualisation/vmware-guest.nix
+  ./virtualisation/waydroid.nix
   ./virtualisation/xen-dom0.nix
   ./virtualisation/xe-guest-utilities.nix
 ]

nixos/modules/programs/neovim.nix

@@ -41,7 +41,19 @@ in {
     withRuby = mkOption {
       type = types.bool;
       default = true;
-      description = "Enable ruby provider.";
+      description = "Enable Ruby provider.";
+    };
+
+    withPython3 = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable Python 3 provider.";
+    };
+
+    withNodeJs = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable Node provider.";
     };
 
     configure = mkOption {
@@ -142,7 +154,7 @@ in {
     environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");
 
     programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package {
-      inherit (cfg) viAlias vimAlias;
+      inherit (cfg) viAlias vimAlias withPython3 withNodeJs withRuby;
       configure = cfg.configure // {
 
         customRC = (cfg.configure.customRC or "") + ''

nixos/modules/services/web-apps/mastodon.nix

@@ -545,7 +545,7 @@ in {
         RuntimeDirectory = "mastodon-web";
         RuntimeDirectoryMode = "0750";
         # System Call Filtering
-        SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ];
+        SystemCallFilter = [ ("~" + lib.concatStringsSep " " systemCallsList) "@chown" "pipe" "pipe2" ];
       } // cfgService;
       path = with pkgs; [ file imagemagick ffmpeg ];
     };

nixos/modules/virtualisation/proxmox-image.nix

@@ -0,0 +1,169 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+  options.proxmox = {
+    qemuConf = {
+      # essential configs
+      boot = mkOption {
+        type = types.str;
+        default = "";
+        example = "order=scsi0;net0";
+        description = ''
+          Default boot device. PVE will try all devices in its default order if this value is empty.
+        '';
+      };
+      scsihw = mkOption {
+        type = types.str;
+        default = "virtio-scsi-pci";
+        example = "lsi";
+        description = ''
+          SCSI controller type. Must be one of the supported values given in
+          <link xlink:href="https://pve.proxmox.com/wiki/Qemu/KVM_Virtual_Machines"/>
+        '';
+      };
+      virtio0 = mkOption {
+        type = types.str;
+        default = "local-lvm:vm-9999-disk-0";
+        example = "ceph:vm-123-disk-0";
+        description = ''
+          Configuration for the default virtio disk. It can be used as a cue for PVE to autodetect the target sotrage.
+          This parameter is required by PVE even if it isn't used.
+        '';
+      };
+      ostype = mkOption {
+        type = types.str;
+        default = "l26";
+        description = ''
+          Guest OS type
+        '';
+      };
+      cores = mkOption {
+        type = types.ints.positive;
+        default = 1;
+        description = ''
+          Guest core count
+        '';
+      };
+      memory = mkOption {
+        type = types.ints.positive;
+        default = 1024;
+        description = ''
+          Guest memory in MB
+        '';
+      };
+
+      # optional configs
+      name = mkOption {
+        type = types.str;
+        default = "nixos-${config.system.nixos.label}";
+        description = ''
+          VM name
+        '';
+      };
+      net0 = mkOption {
+        type = types.commas;
+        default = "virtio=00:00:00:00:00:00,bridge=vmbr0,firewall=1";
+        description = ''
+          Configuration for the default interface. When restoring from VMA, check the
+          "unique" box to ensure device mac is randomized.
+        '';
+      };
+      serial0 = mkOption {
+        type = types.str;
+        default = "socket";
+        example = "/dev/ttyS0";
+        description = ''
+          Create a serial device inside the VM (n is 0 to 3), and pass through a host serial device (i.e. /dev/ttyS0),
+          or create a unix socket on the host side (use qm terminal to open a terminal connection).
+        '';
+      };
+      agent = mkOption {
+        type = types.bool;
+        apply = x: if x then "1" else "0";
+        default = true;
+        description = ''
+          Expect guest to have qemu agent running
+        '';
+      };
+    };
+    qemuExtraConf = mkOption {
+      type = with types; attrsOf (oneOf [ str int ]);
+      default = {};
+      example = literalExpression ''{
+        cpu = "host";
+        onboot = 1;
+      }'';
+      description = ''
+        Additional options appended to qemu-server.conf
+      '';
+    };
+    filenameSuffix = mkOption {
+      type = types.str;
+      default = config.proxmox.qemuConf.name;
+      example = "999-nixos_template";
+      description = ''
+        Filename of the image will be vzdump-qemu-''${filenameSuffix}.vma.zstd.
+        This will also determine the default name of the VM on restoring the VMA.
+        Start this value with a number if you want the VMA to be detected as a backup of
+        any specific VMID.
+      '';
+    };
+  };
+
+  config = let
+    cfg = config.proxmox;
+    cfgLine = name: value: ''
+      ${name}: ${builtins.toString value}
+    '';
+    cfgFile = fileName: properties: pkgs.writeTextDir fileName ''
+      # generated by NixOS
+      ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)}
+      #qmdump#map:virtio0:drive-virtio0:local-lvm:raw:
+    '';
+  in {
+    system.build.VMA = import ../../lib/make-disk-image.nix {
+      name = "proxmox-${cfg.filenameSuffix}";
+      postVM = let
+        # Build qemu with PVE's patch that adds support for the VMA format
+        vma = pkgs.qemu_kvm.overrideAttrs ( super: {
+          patches = let
+            rev = "cc707c362ea5c8d832aac270d1ffa7ac66a8908f";
+            path = "debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch";
+            vma-patch = pkgs.fetchpatch {
+              url = "https://git.proxmox.com/?p=pve-qemu.git;a=blob_plain;hb=${rev};f=${path}";
+              sha256 = "1z467xnmfmry3pjy7p34psd5xdil9x0apnbvfz8qbj0bf9fgc8zf";
+            };
+          in super.patches ++ [ vma-patch ];
+          buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
+        });
+      in
+      ''
+        ${vma}/bin/vma create "vzdump-qemu-${cfg.filenameSuffix}.vma" \
+          -c ${cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)}/qemu-server.conf drive-virtio0=$diskImage
+        rm $diskImage
+        ${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma"
+        mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/
+      '';
+      format = "raw";
+      inherit config lib pkgs;
+    };
+
+    boot = {
+      growPartition = true;
+      kernelParams = [ "console=ttyS0" ];
+      loader.grub.device = lib.mkDefault "/dev/vda";
+      loader.timeout = 0;
+      initrd.availableKernelModules = [ "uas" "virtio_blk" "virtio_pci" ];
+    };
+
+    fileSystems."/" = {
+      device = "/dev/disk/by-label/nixos";
+      autoResize = true;
+      fsType = "ext4";
+    };
+
+    services.qemuGuest.enable = lib.mkDefault true;
+  };
+}

nixos/modules/virtualisation/virtualbox-host.nix

@@ -6,7 +6,7 @@ let
   cfg = config.virtualisation.virtualbox.host;
 
   virtualbox = cfg.package.override {
-    inherit (cfg) enableHardening headless;
+    inherit (cfg) enableHardening headless enableWebService;
     extensionPack = if cfg.enableExtensionPack then pkgs.virtualboxExtpack else null;
   };
 
@@ -80,6 +80,14 @@ in
         and when virtual machines are controlled only via SSH.
       '';
     };
+
+    enableWebService = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Build VirtualBox web service tool (vboxwebsrv) to allow managing VMs via other webpage frontend tools. Useful for headless servers.
+      '';
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [{

nixos/modules/virtualisation/waydroid.nix

@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.virtualisation.waydroid;
+  kernelPackages = config.boot.kernelPackages;
+  waydroidGbinderConf = pkgs.writeText "waydroid.conf" ''
+    [Protocol]
+    /dev/binder = aidl2
+    /dev/vndbinder = aidl2
+    /dev/hwbinder = hidl
+
+    [ServiceManager]
+    /dev/binder = aidl2
+    /dev/vndbinder = aidl2
+    /dev/hwbinder = hidl
+  '';
+
+in {
+
+  options.virtualisation.waydroid = {
+    enable = mkEnableOption "Waydroid";
+  };
+
+  config = mkIf cfg.enable {
+    assertions = singleton {
+      assertion = versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.18";
+      message = "Waydroid needs user namespace support to work properly";
+    };
+
+    system.requiredKernelConfig = with config.lib.kernelConfig; [
+      (isEnabled "ANDROID_BINDER_IPC")
+      (isEnabled "ANDROID_BINDERFS")
+      (isEnabled "ASHMEM")
+    ];
+
+    environment.etc."gbinder.d/waydroid.conf".source = waydroidGbinderConf;
+
+    environment.systemPackages = with pkgs; [ waydroid ];
+
+    networking.firewall.trustedInterfaces = [ "waydroid0" ];
+
+    virtualisation.lxc.enable = true;
+
+    systemd.services.waydroid-container = {
+      description = "Waydroid Container";
+
+      wantedBy = [ "multi-user.target" ];
+
+      path = with pkgs; [ getent iptables iproute kmod nftables util-linux which ];
+
+      unitConfig = {
+        ConditionPathExists = "/var/lib/waydroid/lxc/waydroid";
+      };
+
+      serviceConfig = {
+        ExecStart = "${pkgs.waydroid}/bin/waydroid container start";
+        ExecStop = "${pkgs.waydroid}/bin/waydroid container stop";
+        ExecStopPost = "${pkgs.waydroid}/bin/waydroid session stop";
+      };
+    };
+  };
+
+}

nixos/tests/handbrake.nix

@@ -1,11 +1,15 @@
 import ./make-test-python.nix ({ pkgs, ... }:
+
 let
   # Download Big Buck Bunny example, licensed under CC Attribution 3.0.
   testMkv = pkgs.fetchurl {
     url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true";
     sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9";
+    name = "test1.mkv";
   };
-in {
+
+in
+{
   name = "handbrake";
 
   meta = {
@@ -21,11 +25,9 @@ in {
     # only takes a few seconds.
     start_all()
 
-    machine.succeed(
-        "HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160"
-    )
-    machine.succeed(
-        "HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160"
-    )
+    machine.succeed("HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160")
+    machine.succeed("test -e test.mp4")
+    machine.succeed("HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160")
+    machine.succeed("test -e test.mkv")
   '';
 })

pkgs/applications/audio/aumix/default.nix

@@ -1,19 +1,26 @@
-{lib, stdenv, fetchurl, gettext, ncurses
+{ lib
+, stdenv
+, fetchurl
+, gettext
+, ncurses
 , gtkGUI ? false
 , pkg-config ? null
-, gtk2 ? null}:
+, gtk2 ? null
+}:
 
 assert gtkGUI -> pkg-config != null && gtk2 != null;
 
 stdenv.mkDerivation rec {
-  name = "aumix-2.9.1";
+  pname = "aumix";
+  version = "2.9.1";
+
   src = fetchurl {
-    url = "http://www.jpj.net/~trevor/aumix/releases/${name}.tar.bz2";
+    url = "http://www.jpj.net/~trevor/aumix/releases/aumix-${version}.tar.bz2";
     sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj";
   };
 
   buildInputs = [ gettext ncurses ]
-    ++ (if gtkGUI then [pkg-config gtk2] else []);
+    ++ lib.optionals gtkGUI [ pkg-config gtk2 ];
 
   meta = {
     description = "Audio mixer for X and the console";

pkgs/applications/audio/clerk/default.nix

@@ -1,8 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl,
-util-linux, python3Packages, libnotify }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, rofi
+, mpc_cli
+, perl
+, util-linux
+, python3Packages
+, libnotify
+}:
 
 stdenv.mkDerivation {
-  name = "clerk-2016-10-14";
+  pname = "clerk";
+  version = "unstable-2016-10-14";
 
   src = fetchFromGitHub {
     owner = "carnager";

pkgs/applications/audio/espeak/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, unzip, portaudio }:
 
 stdenv.mkDerivation rec {
-  name = "espeak-1.48.04";
+  pname = "espeak";
+  version = "1.48.04";
 
   src = fetchurl {
-    url = "mirror://sourceforge/espeak/${name}-source.zip";
+    url = "mirror://sourceforge/espeak/espeak-${version}-source.zip";
     sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz";
   };
 

pkgs/applications/audio/espeak/edit.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }:
 
 stdenv.mkDerivation rec {
-  name = "espeakedit-1.48.03";
+  pname = "espeakedit";
+  version = "1.48.03";
 
   src = fetchurl {
-    url = "mirror://sourceforge/espeak/${name}.zip";
+    url = "mirror://sourceforge/espeak/espeakedit-${version}.zip";
     sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
   };
 

pkgs/applications/audio/nootka/unstable.nix

@@ -1,20 +1,38 @@
-{ lib, stdenv, fetchurl, cmake
-, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch
-, qtbase, qtdeclarative, qtquickcontrols2
+{ lib
+, stdenv
+, fetchurl
+, cmake
+, alsa-lib
+, fftwSinglePrec
+, libjack2
+, libpulseaudio
+, libvorbis
+, soundtouch
+, qtbase
+, qtdeclarative
+, qtquickcontrols2
 }:
 
 stdenv.mkDerivation rec {
-  name = "nootka-1.7.0-beta1";
+  pname = "nootka";
+  version = "1.7.0-beta1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nootka/${name}-source.tar.bz2";
+    url = "mirror://sourceforge/nootka/nootka-${version}-source.tar.bz2";
     sha256 = "13b50vnpr1zx2mrgkc8fmhsyfa19rqq1rksvn31145dy6fk1f3gc";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch
-    qtbase qtdeclarative qtquickcontrols2
+    alsa-lib
+    fftwSinglePrec
+    libjack2
+    libpulseaudio
+    libvorbis
+    soundtouch
+    qtbase
+    qtdeclarative
+    qtquickcontrols2
   ];
 
   dontWrapQtApps = true;

pkgs/applications/audio/paprefs/default.nix

@@ -1,5 +1,6 @@
 { fetchurl
-, lib, stdenv
+, lib
+, stdenv
 , meson
 , ninja
 , gettext
@@ -11,10 +12,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "paprefs-1.1";
+  pname = "paprefs";
+  version = "1.1";
 
   src = fetchurl {
-    url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz";
+    url = "https://freedesktop.org/software/pulseaudio/paprefs/paprefs-${version}.tar.xz";
     sha256 = "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf";
   };
 

pkgs/applications/audio/wavegain/default.nix

@@ -1,7 +1,9 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "wavegain-1.3.1";
+  pname = "wavegain";
+  version = "1.3.1";
+
   src = fetchFromGitHub {
     owner = "MestreLion";
     repo = "wavegain";

pkgs/applications/backup/areca/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }:
 
-stdenv.mkDerivation {
-  name = "areca-7.5";
+stdenv.mkDerivation rec {
+  pname = "areca";
+  version = "7.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz";
+    url = "mirror://sourceforge/project/areca/areca-stable/areca-${version}/areca-${version}-src.tar.gz";
     sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb";
   };
 

pkgs/applications/editors/bluefish/default.nix

@@ -1,24 +1,41 @@
-{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2
-, enchant, gucharmap, python3, gnome
+{ lib
+, stdenv
+, fetchurl
+, intltool
+, wrapGAppsHook
+, pkg-config
+, gtk
+, libxml2
+, enchant
+, gucharmap
+, python3
+, gnome
 }:
 
 stdenv.mkDerivation rec {
-  name = "bluefish-2.2.12";
+  pname = "bluefish";
+  version = "2.2.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bluefish/${name}.tar.bz2";
+    url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2";
     sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d";
   };
 
   nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ];
-  buildInputs = [ gnome.adwaita-icon-theme gtk libxml2
-    enchant gucharmap python3 ];
+  buildInputs = [
+    gnome.adwaita-icon-theme
+    gtk
+    libxml2
+    enchant
+    gucharmap
+    python3
+  ];
 
   meta = with lib; {
     description = "A powerful editor targeted towards programmers and webdevelopers";
     homepage = "http://bluefish.openoffice.nl/";
     license = licenses.gpl3Plus;
-    maintainers = [maintainers.vbgl];
+    maintainers = with maintainers; [ vbgl ];
     platforms = platforms.all;
   };
 }

pkgs/applications/editors/elvis/default.nix

@@ -1,19 +1,22 @@
 { fetchurl, fetchpatch, lib, stdenv, ncurses }:
 
-stdenv.mkDerivation {
-  name = "elvis-2.2_0";
+stdenv.mkDerivation rec {
+  pname = "elvis";
+  version = "2.2_0";
 
   src = fetchurl {
-    url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-2.2_0.tar.gz";
+    url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${version}.tar.gz";
     sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s";
   };
 
   buildInputs = [ ncurses ];
 
-  patches = [ (fetchpatch {
+  patches = [
+    (fetchpatch {
       url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch";
       sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc";
-  }) ];
+    })
+  ];
 
   postPatch = ''
     substituteInPlace configure \

pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix

@@ -1,10 +1,11 @@
 { lib, fetchurl, stdenv, emacs, python }:
 
 stdenv.mkDerivation rec {
-  name = "cedet-1.1";
+  pname = "cedet";
+  version = "1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cedet/${name}.tar.gz";
+    url = "mirror://sourceforge/cedet/cedet-${version}.tar.gz";
     sha256 = "0p2bwlpwwa019axvgj09xkxbr53j0pq23d46s4la9jfhl47nbh22";
   };
 

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

@@ -1,14 +1,15 @@
-{stdenv, fetchurl, emacs}:
+{ stdenv, fetchurl, emacs }:
 
-stdenv.mkDerivation {
-  name = "session-management-for-emacs-2.2a";
+stdenv.mkDerivation rec {
+  pname = "session-management-for-emacs";
+  version = "2.2a";
 
   src = fetchurl {
-    url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz";
+    url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz";
     sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
   };
 
-  buildInputs = [emacs];
+  buildInputs = [ emacs ];
 
   installPhase = ''
     mkdir -p "$out/share/emacs/site-lisp"
@@ -16,10 +17,9 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    /* installation: add to your ~/.emacs
-       (require 'session)
-       (add-hook 'after-init-hook 'session-initialize)
-    */
+    # installation: add to your ~/.emacs
+    #  (require 'session)
+    #  (add-hook 'after-init-hook 'session-initialize)
     description = "Small session management for emacs";
     homepage = "http://emacs-session.sourceforge.net/";
     license = "GPL";

pkgs/applications/editors/fte/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }:
 
 stdenv.mkDerivation rec {
-  name = "fte-0.50.02";
+  pname = "fte";
+  version = "0.50.02";
 
   nativeBuildInputs = [ unzip ];
   buildInputs = [ perl libX11 libXpm gpm ncurses slang ];

pkgs/applications/editors/kile/default.nix

@@ -22,10 +22,11 @@
 }:
 
 mkDerivation rec {
-  name = "kile-2.9.93";
+  pname = "kile";
+  version = "2.9.93";
 
   src = fetchurl {
-    url = "mirror://sourceforge/kile/${name}.tar.bz2";
+    url = "mirror://sourceforge/kile/kile-${version}.tar.bz2";
     sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA=";
   };
 

pkgs/applications/editors/sublime/2/default.nix

@@ -1,26 +1,28 @@
 { fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }:
 let
-  libPath = lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo];
+  libPath = lib.makeLibraryPath [ glib xorg.libX11 gtk2 cairo ];
 in
 
 stdenv.mkDerivation rec {
-  name = "sublimetext-2.0.2";
+  pname = "sublimetext";
+  version = "2.0.2";
+
   src =
     if stdenv.hostPlatform.system == "i686-linux" then
       fetchurl {
-        name = "sublimetext-2.0.2.tar.bz2";
+        name = "sublimetext-${version}.tar.bz2";
         urls = [
-          "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2"
-          "https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2"
+          "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2"
+          "https://download.sublimetext.com/Sublime%20Text%20${version}.tar.bz2"
         ];
         sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7";
       }
     else
       fetchurl {
-        name = "sublimetext-2.0.2.tar.bz2";
+        name = "sublimetext-${version}.tar.bz2";
         urls = [
-          "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2"
-          "https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2"
+          "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2"
+          "https://download.sublimetext.com/Sublime%20Text%20${version}%20x64.tar.bz2"
         ];
         sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1";
       };

pkgs/applications/editors/vscode/vscode.nix

@@ -14,17 +14,17 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1yfaf9qdaf6njvj8kilmivyl0nnhdvd9hbzpf8hv3kw5rfpdvy89";
-    x86_64-darwin = "10rx5aif61xipf5lcjzkidz9dhbm5gc2wf87c2j456nixaxbx0b4";
-    aarch64-linux = "13h4ffdm9y9p3jnqcjvapykbm73bkjy5jaqwhsi293f9r7jfp9rf";
-    aarch64-darwin = "07nmrxc25rfp5ibarhg3c14ksk2ymqmsnc55hicvvhw93g2qczby";
-    armv7l-linux = "1gz1mmw2vp986l9sm7rd6hypxs70sz63sbmzyxwfqpvj973dl23q";
+    x86_64-linux = "18sa2avr7xl8d0yaxs0df1pkwx7bbg21s8qf3mijdndsnhri0j1c";
+    x86_64-darwin = "0vx0jiw341gsf00xw92fwwylnsi5c0ybrbj5syag4vkqddvp410k";
+    aarch64-linux = "0jswwz1rxddaxz6v7hzpvddhx9dia5nk5rdsaj93q4gs3nda90hk";
+    aarch64-darwin = "11lxg543kl85vbndqcq5zccycxfk63ijmka0jb973jfp0nm4iq60";
+    armv7l-linux = "1ryr6k93z24yk0qqv3yasbp4achwpn0mpi6f28d2pvnsr9v9bh3y";
   }.${system};
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.61.2";
+    version = "1.62.0";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";

pkgs/applications/editors/vscode/vscodium.nix

@@ -13,10 +13,10 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1q260kjhyx8djl82275ii63z1mzypsz7rkz3pj1n2wjkwsnw276x";
-    x86_64-darwin = "1scx155rm8j6dwn0i31b6ajsdxcn1n24p3k6dx248w0zyiwd5wm1";
-    aarch64-linux = "1j788a0p767i65ying9pfg6rss8l7g76n2323dnmj12bhxs6cqd1";
-    armv7l-linux = "1yfwmfxpilfv2h3pp698pg4wr6dnyzwg0r266xiwsw7z38jh54fk";
+    x86_64-linux = "17vrz16q4fhc6b2rlddhz3m6y780gi9vzk28l0fcj12l9z5iprn9";
+    x86_64-darwin = "1hn8sjmndmicl3gjrsb163wn5j36ij5b68mw7n6v6lqaf0a75xah";
+    aarch64-linux = "0ikdy9c2ldrxyh8ij2qskv4m7j5azr1hbi53ddzgj1j6nms68lkh";
+    armv7l-linux = "07a3kz4c8wzid0rd1rdzndy8c1cdg4hba7p1jmdf7zclr702i2j7";
   }.${system};
 
   sourceRoot = {
@@ -31,7 +31,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.61.2";
+    version = "1.62.0";
     pname = "vscodium";
 
     executableName = "codium";

pkgs/applications/graphics/autopanosiftc/default.nix

@@ -1,10 +1,11 @@
-{lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }:
+{ lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }:
 
-stdenv.mkDerivation {
-  name = "autopano-sift-C-2.5.1";
+stdenv.mkDerivation rec {
+  pname = "autopano-sift-C";
+  version = "2.5.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz";
+    url = "mirror://sourceforge/hugin/autopano-sift-C-${version}.tar.gz";
     sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s";
   };
 

pkgs/applications/graphics/autotrace/autofig.nix

@@ -1,7 +1,8 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "autofig-0.1";
+  pname = "autofig";
+  version = "0.1";
 
   src = fetchurl {
     url = "http://autotrace.sourceforge.net/tools/autofig.tar.gz";

pkgs/applications/graphics/comical/default.nix

@@ -1,13 +1,16 @@
-{lib, stdenv, fetchurl, wxGTK, util-linux, zlib }:
+{ lib, stdenv, fetchurl, wxGTK, util-linux, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "comical-0.8";
+  pname = "comical";
+  version = "0.8";
+
   src = fetchurl {
-    url = "mirror://sourceforge/comical/${name}.tar.gz";
+    url = "mirror://sourceforge/comical/comical-${version}.tar.gz";
     sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e";
   };
+
   buildInputs = [ wxGTK util-linux zlib ];
-  preBuild="makeFlags=\"prefix=$out\"";
+  makeFlags = [ "prefix=${placeholder "out"}" ];
 
   patches = [ ./wxgtk-2.8.patch ];
 
@@ -17,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Viewer of CBR and CBZ files, often used to store scanned comics";
     homepage = "http://comical.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = with lib.maintainers; [ viric ];
     platforms = with lib.platforms; linux;
   };
 }

pkgs/applications/graphics/exrdisplay/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }:
 
-stdenv.mkDerivation {
-  name ="openexr_viewers-2.2.1";
+stdenv.mkDerivation rec {
+  pname = "openexr_viewers";
+  version = "2.2.1";
 
   src = fetchurl {
-    url =  "mirror://savannah/openexr/openexr_viewers-2.2.1.tar.gz";
+    url = "mirror://savannah/openexr/openexr_viewers-${version}.tar.gz";
     sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8";
   };
 

pkgs/applications/graphics/fbida/default.nix

@@ -1,12 +1,33 @@
-{ lib, stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng, libwebp, libdrm
-, pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm
-, epoxy, poppler, mesa, lirc }:
+{ lib
+, stdenv
+, fetchurl
+, libjpeg
+, libexif
+, giflib
+, libtiff
+, libpng
+, libwebp
+, libdrm
+, pkg-config
+, freetype
+, fontconfig
+, which
+, imagemagick
+, curl
+, sane-backends
+, libXpm
+, epoxy
+, poppler
+, mesa
+, lirc
+}:
 
 stdenv.mkDerivation rec {
-  name = "fbida-2.14";
+  pname = "fbida";
+  version = "2.14";
 
   src = fetchurl {
-    url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
+    url = "http://dl.bytesex.org/releases/fbida/fbida-${version}.tar.gz";
     sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm";
   };
 
@@ -21,8 +42,22 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config which ];
   buildInputs = [
-    libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp
-    imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc
+    libexif
+    libjpeg
+    libpng
+    giflib
+    freetype
+    fontconfig
+    libtiff
+    libwebp
+    imagemagick
+    curl
+    sane-backends
+    libdrm
+    libXpm
+    epoxy
+    poppler
+    lirc
     mesa
   ];
 

pkgs/applications/graphics/freepv/default.nix

@@ -1,11 +1,24 @@
-{ lib, stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng,
-  libXxf86vm }:
+{ lib
+, stdenv
+, fetchurl
+, libjpeg
+, libGLU
+, libGL
+, freeglut
+, zlib
+, cmake
+, libX11
+, libxml2
+, libpng
+, libXxf86vm
+}:
 
-stdenv.mkDerivation {
-  name = "freepv-0.3.0";
+stdenv.mkDerivation rec {
+  pname = "freepv";
+  version = "0.3.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/freepv/freepv-0.3.0.tar.gz";
+    url = "mirror://sourceforge/freepv/freepv-${version}.tar.gz";
     sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56";
   };
 

pkgs/applications/graphics/gocr/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, tk }:
 
 stdenv.mkDerivation rec {
-  name = "gocr-0.52";
+  pname = "gocr";
+  version = "0.52";
 
   src = fetchurl {
-    url = "https://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz";
+    url = "https://www-e.uni-magdeburg.de/jschulen/ocr/gocr-${version}.tar.gz";
     sha256 = "11l6gds1lrm8lwrrsxnm5fjlwz8q1xbh896cprrl4psz21in946z";
   };
 

pkgs/applications/graphics/gpicview/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }:
 
-stdenv.mkDerivation {
-  name = "gpicview-0.2.4";
+stdenv.mkDerivation rec {
+  pname = "gpicview";
+  version = "0.2.4";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/lxde/gpicview-0.2.4.tar.gz";
+    url = "mirror://sourceforge/lxde/gpicview-${version}.tar.gz";
     sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr";
   };
 

pkgs/applications/graphics/gqview/default.nix

@@ -1,20 +1,21 @@
-{lib, stdenv, fetchurl, pkg-config, gtk2, libpng}:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, libpng }:
 
 assert pkg-config != null && gtk2 != null && libpng != null;
 # Note that we cannot just copy gtk's png attribute, since gtk might
 # not be linked against png.
 # !!! assert libpng == gtk2.libpng;
 
-stdenv.mkDerivation {
-  name = "gqview-2.1.5";
+stdenv.mkDerivation rec {
+  pname = "gqview";
+  version = "2.1.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gqview/gqview-2.1.5.tar.gz";
+    url = "mirror://sourceforge/gqview/gqview-${version}.tar.gz";
     sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk2 libpng];
+  buildInputs = [ gtk2 libpng ];
 
   hardeningDisable = [ "format" ];
 

pkgs/applications/graphics/hugin/default.nix

@@ -1,14 +1,46 @@
-{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkg-config, fetchpatch
-, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
-, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
-, libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
+{ lib
+, stdenv
+, cmake
+, fetchurl
+, gnumake
+, makeWrapper
+, pkg-config
+, fetchpatch
+, autopanosiftc
+, boost
+, cairo
+, enblend-enfuse
+, exiv2
+, fftw
+, flann
+, gettext
+, glew
+, ilmbase
+, lcms2
+, lensfun
+, libjpeg
+, libpng
+, libtiff
+, libX11
+, libXi
+, libXmu
+, libGLU
+, libGL
+, openexr
+, panotools
+, perlPackages
+, sqlite
+, vigra
+, wxGTK
+, zlib
 }:
 
 stdenv.mkDerivation rec {
-  name = "hugin-2019.0.0";
+  pname = "hugin";
+  version = "2019.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/hugin/${name}.tar.bz2";
+    url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2";
     sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr";
   };
 
@@ -21,9 +53,30 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg
-    libpng libtiff libX11 libXi libXmu libGLU libGL openexr panotools sqlite vigra
-    wxGTK zlib
+    boost
+    cairo
+    exiv2
+    fftw
+    flann
+    gettext
+    glew
+    ilmbase
+    lcms2
+    lensfun
+    libjpeg
+    libpng
+    libtiff
+    libX11
+    libXi
+    libXmu
+    libGLU
+    libGL
+    openexr
+    panotools
+    sqlite
+    vigra
+    wxGTK
+    zlib
   ];
 
   nativeBuildInputs = [ cmake makeWrapper pkg-config ];

pkgs/applications/graphics/minidjvu/default.nix

@@ -1,9 +1,11 @@
-{lib, stdenv, fetchurl, libtiff, gettext }:
+{ lib, stdenv, fetchurl, libtiff, gettext }:
+
+stdenv.mkDerivation rec {
+  pname = "minidjvu";
+  version = "0.8";
 
-stdenv.mkDerivation {
-  name = "minidjvu-0.8";
   src = fetchurl {
-    url = "mirror://sourceforge/minidjvu/minidjvu-0.8.tar.gz";
+    url = "mirror://sourceforge/minidjvu/minidjvu-${version}.tar.gz";
     sha256 = "0jmpvy4g68k6xgplj9zsl6brg6vi81mx3nx2x9hfbr1f4zh95j79";
   };
 
@@ -11,7 +13,7 @@ stdenv.mkDerivation {
     sed -i s,/usr/bin/gzip,gzip, Makefile.in
   '';
 
-  buildInputs = [ libtiff gettext];
+  buildInputs = [ libtiff gettext ];
 
   preInstall = ''
     mkdir -p $out/lib

pkgs/applications/graphics/photivo/default.nix

@@ -1,8 +1,22 @@
-{ lib, stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16,
-  lcms2, lensfun, pkg-config, libjpeg, exiv2, liblqr1 }:
+{ lib
+, stdenv
+, fetchhg
+, fetchpatch
+, cmake
+, qt4
+, fftw
+, graphicsmagick_q16
+, lcms2
+, lensfun
+, pkg-config
+, libjpeg
+, exiv2
+, liblqr1
+}:
 
 stdenv.mkDerivation {
-  name = "photivo-2014-01-25";
+  pname = "photivo";
+  version = "2014-01-25";
 
   src = fetchhg {
     url = "http://code.google.com/p/photivo/";

pkgs/applications/graphics/pinta/default.nix

@@ -1,14 +1,18 @@
-{ lib, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp,
-  gettext }:
+{ lib
+, fetchFromGitHub
+, buildDotnetPackage
+, dotnetPackages
+, gtksharp
+, gettext
+}:
 
 let
   mono-addins = dotnetPackages.MonoAddins;
 in
 buildDotnetPackage rec {
-  name = "pinta-1.6";
-
   baseName = "Pinta";
   version = "1.6";
+
   outputFiles = [ "bin/*" ];
   buildInputs = [ gtksharp mono-addins gettext ];
   xBuildFiles = [ "Pinta.sln" ];
@@ -37,10 +41,12 @@ buildDotnetPackage rec {
       "Mono\\.Addins\\.Setup"
     ];
 
-    stripVersion = name: file: let
+    stripVersion = name: file:
+      let
         match = ''<Reference Include="${name}([ ,][^"]*)?"'';
         replace = ''<Reference Include="${name}"'';
-      in "sed -i -re 's/${match}/${replace}/g' ${file}\n";
+      in
+      "sed -i -re 's/${match}/${replace}/g' ${file}\n";
 
     # Map all possible pairs of two lists
     map2 = f: listA: listB: concatMap (a: map (f a) listB) listA;

pkgs/applications/graphics/qscreenshot/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }:
 
 stdenv.mkDerivation rec {
-  name = "qscreenshot-1.0";
+  pname = "qscreenshot";
+  version = "1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qscreenshot/${name}-src.tar.gz";
+    url = "mirror://sourceforge/qscreenshot/qscreenshot-${version}-src.tar.gz";
     sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx";
   };
 

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

@@ -1,10 +1,11 @@
-{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}:
+{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49" }:
 
 stdenv.mkDerivation rec {
-  name = "brother-udev-rule-type1-1.0.0-1";
+  pname = "brother-udev-rule-type1";
+  version = "1.0.0-1";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf006654/${name}.all.deb";
+    url = "http://download.brother.com/welcome/dlf006654/brother-udev-rule-type1-${version}.all.deb";
     sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi";
   };
 

pkgs/applications/graphics/sane/xsane.nix

@@ -1,15 +1,25 @@
-{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkg-config, libpng
+{ lib
+, stdenv
+, fetchurl
+, sane-backends
+, sane-frontends
+, libX11
+, gtk2
+, pkg-config
+, libpng
 , libusb-compat-0_1 ? null
-, gimpSupport ? false, gimp ? null
+, gimpSupport ? false
+, gimp ? null
 }:
 
 assert gimpSupport -> gimp != null;
 
 stdenv.mkDerivation rec {
-  name = "xsane-0.999";
+  pname = "xsane";
+  version = "0.999";
 
   src = fetchurl {
-    url = "http://www.xsane.org/download/${name}.tar.gz";
+    url = "http://www.xsane.org/download/xsane-${version}.tar.gz";
     sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp";
   };
 
@@ -19,8 +29,8 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ]
-    ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else [])
+  buildInputs = [ libpng sane-backends sane-frontends libX11 gtk2 ]
+    ++ (if libusb-compat-0_1 != null then [ libusb-compat-0_1 ] else [ ])
     ++ lib.optional gimpSupport gimp;
 
   meta = {

pkgs/applications/graphics/scantailor/default.nix

@@ -1,10 +1,11 @@
-{lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }:
+{ lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }:
 
-stdenv.mkDerivation {
-  name = "scantailor-0.9.12.1";
+stdenv.mkDerivation rec {
+  pname = "scantailor";
+  version = "0.9.12.1";
 
   src = fetchurl {
-    url = "https://github.com/scantailor/scantailor/archive/RELEASE_0_9_12_1.tar.gz";
+    url = "https://github.com/scantailor/scantailor/archive/RELEASE_${lib.replaceStrings ["."] ["_"] version}.tar.gz";
     sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg";
   };
 

pkgs/applications/graphics/wings/default.nix

@@ -1,9 +1,11 @@
 { fetchurl, lib, stdenv, erlang, cl, libGL, libGLU, runtimeShell }:
 
 stdenv.mkDerivation rec {
-  name = "wings-2.2.4";
+  pname = "wings";
+  version = "2.2.4";
+
   src = fetchurl {
-    url = "mirror://sourceforge/wings/${name}.tar.bz2";
+    url = "mirror://sourceforge/wings/wings-${version}.tar.bz2";
     sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3";
   };
 
@@ -24,13 +26,13 @@ stdenv.mkDerivation rec {
 
   # I did not test the *cl* part. I added the -pa just by imitation.
   installPhase = ''
-    mkdir -p $out/bin $out/lib/${name}/ebin
-    cp ebin/* $out/lib/${name}/ebin
-    cp -R textures shaders plugins $out/lib/$name
+    mkdir -p $out/bin $out/lib/wings-${version}/ebin
+    cp ebin/* $out/lib/wings-${version}/ebin
+    cp -R textures shaders plugins $out/lib/wings-${version}
     cat << EOF > $out/bin/wings
     #!${runtimeShell}
     ${erlang}/bin/erl \
-      -pa $out/lib/${name}/ebin -run wings_start start_halt "$@"
+      -pa $out/lib/wings-${version}/ebin -run wings_start start_halt "$@"
     EOF
     chmod +x $out/bin/wings
   '';
@@ -39,7 +41,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.wings3d.com/";
     description = "Subdivision modeler inspired by Nendo and Mirai from Izware";
     license = lib.licenses.tcltk;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = with lib.maintainers; [ viric ];
     platforms = with lib.platforms; linux;
   };
 }

pkgs/applications/kde/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.2/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.3/src -A '*.tar.xz' )

pkgs/applications/misc/abook/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "abook-0.6.1";
+  pname = "abook";
+  version = "0.6.1";
 
   src = fetchurl {
-    url = "http://abook.sourceforge.net/devel/${name}.tar.gz";
+    url = "http://abook.sourceforge.net/devel/abook-${version}.tar.gz";
     sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh";
   };
 

pkgs/applications/misc/adobe-reader/default.nix

@@ -1,17 +1,31 @@
-{ lib, stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
-, gdk-pixbuf, gdk-pixbuf-xlib }:
+{ lib
+, stdenv
+, fetchurl
+, libX11
+, cups
+, zlib
+, libxml2
+, pango
+, atk
+, gtk2
+, glib
+, gdk-pixbuf
+, gdk-pixbuf-xlib
+}:
 
 assert stdenv.hostPlatform.system == "i686-linux";
 
-let version = "9.5.5"; in
-
-stdenv.mkDerivation {
-  name = "adobe-reader-${version}-1";
+let
+  baseVersion = "9.5.5";
+in
+stdenv.mkDerivation rec {
+  pname = "adobe-reader";
+  version = "${baseVersion}-1";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${version}/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2";
+    url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${baseVersion}/enu/AdbeRdr${version}_i486linux_enu.tar.bz2";
     sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf";
   };
 

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

@@ -1,26 +1,46 @@
-{ config, lib, stdenv, fetchurl, pkg-config, CoreAudio
-, enableAlsa ? true, alsa-lib ? null
-, enableLibao ? true, libao ? null
-, enableLame ? config.sox.enableLame or false, lame ? null
-, enableLibmad ? true, libmad ? null
-, enableLibogg ? true, libogg ? null, libvorbis ? null
-, enableOpusfile ? true, opusfile ? null
-, enableFLAC ? true, flac ? null
-, enablePNG ? true, libpng ? null
-, enableLibsndfile ? true, libsndfile ? null
-, enableWavpack ? true, wavpack ? null
-# amrnb and amrwb are unfree, disabled by default
-, enableAMR ? false, amrnb ? null, amrwb ? null
-, enableLibpulseaudio ? true, libpulseaudio ? null
+{ config
+, lib
+, stdenv
+, fetchurl
+, pkg-config
+, CoreAudio
+, enableAlsa ? true
+, alsa-lib ? null
+, enableLibao ? true
+, libao ? null
+, enableLame ? config.sox.enableLame or false
+, lame ? null
+, enableLibmad ? true
+, libmad ? null
+, enableLibogg ? true
+, libogg ? null
+, libvorbis ? null
+, enableOpusfile ? true
+, opusfile ? null
+, enableFLAC ? true
+, flac ? null
+, enablePNG ? true
+, libpng ? null
+, enableLibsndfile ? true
+, libsndfile ? null
+, enableWavpack ? true
+, wavpack ? null
+  # amrnb and amrwb are unfree, disabled by default
+, enableAMR ? false
+, amrnb ? null
+, amrwb ? null
+, enableLibpulseaudio ? true
+, libpulseaudio ? null
 }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "sox-14.4.2";
+  pname = "sox";
+  version = "14.4.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sox/${name}.tar.gz";
+    url = "mirror://sourceforge/sox/sox-${version}.tar.gz";
     sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl";
   };
 

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

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
 
-stdenv.mkDerivation {
-  name = "wavesurfer-1.8.5";
+stdenv.mkDerivation rec {
+  pname = "wavesurfer";
+  version = "1.8.5";
 
   src = fetchurl {
-    url = "https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz";
+    url = "https://www.speech.kth.se/wavesurfer/wavesurfer-${version}.tar.gz";
     sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
   };
 

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

@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "wavrsocvt-1.0.2.0";
+  pname = "wavrsocvt";
+  version = "1.0.2.0";
 
   src = fetchurl {
     url = "http://bricxcc.sourceforge.net/wavrsocvt.tgz";

pkgs/applications/misc/avrdudess/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg-utils }:
 
 stdenv.mkDerivation {
-  name = "avrdudess-2.2.20140102";
+  pname = "avrdudess";
+  version = "2.2.20140102";
 
   src = fetchurl {
     url = "http://blog.zakkemble.co.uk/download/avrdudess_20140102.zip";

pkgs/applications/misc/catclock/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }:
 
 stdenv.mkDerivation {
-  name = "catclock-2015-10-04";
+  pname = "catclock";
+  version = "unstable-2015-10-04";
 
   src = fetchFromGitHub {
     owner = "BarkyTheDog";

pkgs/applications/misc/cherrytree/default.nix

@@ -13,7 +13,6 @@
 , sqlite
 , curl
 , libuchardet
-, fmt
 , spdlog
 }:
 
@@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
     sqlite
     curl
     libuchardet
-    fmt
     spdlog
   ];
 

pkgs/applications/misc/colort/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "colort-unstable-2017-03-12";
+  pname = "colort";
+  version = "unstable-2017-03-12";
 
   src = fetchFromGitHub {
     owner = "neeasade";
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw";
   };
 
-  makeFlags = ["PREFIX=$(out)"];
+  makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
     description = "A program for 'tinting' color values";

pkgs/applications/misc/ding/default.nix

@@ -10,10 +10,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "ding-1.9";
+  pname = "ding";
+  version = "1.9";
 
   src = fetchurl {
-    url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz";
+    url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${version}.tar.gz";
     sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU=";
   };
 

pkgs/applications/misc/dmenu/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-5.0";
+  pname = "dmenu";
+  version = "5.0";
 
   src = fetchurl {
-    url = "https://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz";
     sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y";
   };
 

pkgs/applications/misc/far2l/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
 , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick
-, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }:
+, libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }:
 
 stdenv.mkDerivation rec {
   pname = "far2l";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ];
 
-  buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build
+  buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build
     ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats
     #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below
 

pkgs/applications/misc/fbreader/default.nix

@@ -1,9 +1,21 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config
-, bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, pkg-config
+, bzip2
+, curl
+, expat
+, fribidi
+, libunibreak
+, sqlite
+, zlib
 , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx"
 , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa"
-, qt4, gtk2
-, AppKit, Cocoa
+, qt4
+, gtk2
+, AppKit
+, Cocoa
 }:
 
 with lib;
@@ -16,7 +28,8 @@ assert uiTarget == "macosx" -> uiType == "cocoa";
 # which is way to old and no longer in nixpkgs.
 
 stdenv.mkDerivation {
-  name = "fbreader-${uiType}-0.99.6";
+  pname = "fbreader-${uiType}";
+  version = "0.99.6";
 
   src = fetchFromGitHub {
     owner = "geometer";
@@ -53,7 +66,13 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    bzip2 curl expat fribidi libunibreak sqlite zlib
+    bzip2
+    curl
+    expat
+    fribidi
+    libunibreak
+    sqlite
+    zlib
   ]
   ++ optional (uiType == "qt4") qt4
   ++ optional (uiType == "gtk") gtk2

pkgs/applications/misc/fehlstart/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, pkg-config, gtk2, keybinder, fetchFromGitLab }:
 
 stdenv.mkDerivation {
-  name = "fehlstart-9f4342d7";
+  pname = "fehlstart";
+  version = "unstable-2016-05-23";
 
   src = fetchFromGitLab {
     owner = "fehlstart";

pkgs/applications/misc/garmin-plugin/default.nix

@@ -1,11 +1,13 @@
 { lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }:
-stdenv.mkDerivation {
-  name = "garmin-plugin-0.3.26";
+stdenv.mkDerivation rec {
+  pname = "garmin-plugin";
+  version = "0.3.26";
+
   src = fetchurl {
-    url = "https://github.com/adiesner/GarminPlugin/archive/V0.3.26.tar.gz";
+    url = "https://github.com/adiesner/GarminPlugin/archive/V${version}.tar.gz";
     sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0";
   };
-  sourceRoot = "GarminPlugin-0.3.26/src";
+  sourceRoot = "GarminPlugin-${version}/src";
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ];
   configureFlags = [

pkgs/applications/misc/gkrellm/default.nix

@@ -1,19 +1,33 @@
-{ lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which
-, IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook
+{ lib
+, fetchurl
+, stdenv
+, gettext
+, pkg-config
+, glib
+, gtk2
+, libX11
+, libSM
+, libICE
+, which
+, IOKit
+, copyDesktopItems
+, makeDesktopItem
+, wrapGAppsHook
 }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "gkrellm-2.3.11";
+  pname = "gkrellm";
+  version = "2.3.11";
 
   src = fetchurl {
-    url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2";
+    url = "http://gkrellm.srcbox.net/releases/gkrellm-${version}.tar.bz2";
     sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y";
   };
 
   nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ];
-  buildInputs = [gettext glib gtk2 libX11 libSM libICE]
+  buildInputs = [ gettext glib gtk2 libX11 libSM libICE ]
     ++ optionals stdenv.isDarwin [ IOKit ];
 
   hardeningDisable = [ "format" ];

pkgs/applications/misc/gpa/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpg-error, libassuan }:
 
 stdenv.mkDerivation rec {
-  name = "gpa-0.10.0";
+  pname = "gpa";
+  version = "0.10.0";
 
   src = fetchurl {
-    url = "mirror://gnupg/gpa/${name}.tar.bz2";
+    url = "mirror://gnupg/gpa/gpa-${version}.tar.bz2";
     sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm";
   };
 

pkgs/applications/misc/grip/default.nix

@@ -15,10 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "grip-4.2.2";
+  pname = "grip";
+  version = "4.2.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/grip/${name}.tar.gz";
+    url = "mirror://sourceforge/grip/grip-${version}.tar.gz";
     sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE=";
   };
 

pkgs/applications/misc/gv/default.nix

@@ -1,13 +1,11 @@
 { lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }:
 
-let
-  name = "gv-3.7.4";
-in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  pname = "gv";
+  version = "3.7.4";
 
   src = fetchurl {
-    url = "mirror://gnu/gv/${name}.tar.gz";
+    url = "mirror://gnu/gv/gv-${version}.tar.gz";
     sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
   };
 

pkgs/applications/misc/gxneur/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }:
 
-stdenv.mkDerivation {
-  name = "gxneur-0.20.0";
+stdenv.mkDerivation rec {
+  pname = "gxneur";
+  version = "0.20.0";
 
   src = fetchurl {
-    url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz";
+    url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/${version}/gxneur_${version}.orig.tar.gz";
     sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";
   };
 
@@ -13,8 +14,17 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config intltool ];
   buildInputs = [
-    xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur
-    libglade GConf pcre libappindicator-gtk2
+    xorg.libX11
+    glib
+    gtk2
+    xorg.libXpm
+    xorg.libXt
+    xorg.libXext
+    xneur
+    libglade
+    GConf
+    pcre
+    libappindicator-gtk2
   ];
 
   meta = with lib; {

pkgs/applications/misc/jigdo/default.nix

@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, db, gtk2, bzip2 }:
 
-stdenv.mkDerivation {
-  name = "jigdo-0.7.3";
+stdenv.mkDerivation rec {
+  pname = "jigdo";
+  version = "0.7.3";
 
   # Debian sources
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz";
+    url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_${version}.orig.tar.gz";
     sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
   };
 

pkgs/applications/misc/loxodo/default.nix

@@ -4,7 +4,8 @@ let
   python = py.python;
 in
 py.buildPythonApplication {
-  name = "loxodo-0.20150124";
+  pname = "loxodo";
+  version = "0.20150124";
 
   src = fetchgit {
     url = "https://github.com/sommer/loxodo.git";

pkgs/applications/misc/mencal/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mencal-3.0";
+  pname = "mencal";
+  version = "3.0";
 
   src = fetchurl {
-    url = "http://kyberdigi.cz/projects/mencal/files/${name}.tar.gz";
+    url = "http://kyberdigi.cz/projects/mencal/files/mencal-${version}.tar.gz";
     sha256 = "9328d0b2f3f57847e8753c5184531f4832be7123d1b6623afdff892074c03080";
   };
 

pkgs/applications/misc/metar/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, fetchgit, curl }:
 
 stdenv.mkDerivation {
-  name = "metar-20161013.1";
+  pname = "metar";
+  version = "20161013.1";
 
   src = fetchgit {
     url = "https://github.com/keesL/metar.git";

pkgs/applications/misc/mpvc/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, socat, fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "mpvc-unstable-2017-03-18";
+  pname = "mpvc";
+  version = "unstable-2017-03-18";
 
   src = fetchFromGitHub {
     owner = "wildefyr";

pkgs/applications/misc/navipowm/default.nix

@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, qt4, qmake4Hook }:
 stdenv.mkDerivation rec {
-  name = "navipowm-0.2.4";
+  pname = "navipowm";
+  version = "0.2.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/navipowm/NaviPOWM-0.2.4.tar.gz";
+    url = "mirror://sourceforge/navipowm/NaviPOWM-${version}.tar.gz";
     sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b";
   };
 
@@ -12,10 +13,10 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/${name}/Icons
+    mkdir -p $out/bin $out/share/navipowm-${version}/Icons
     cp bin/NaviPOWM $out/bin
-    cp ../../common/Config/navipowm.ini $out/share/${name}
-    cp ../../common/Images/* $out/share/${name}
+    cp ../../common/Config/navipowm.ini $out/share/navipowm-${version}
+    cp ../../common/Images/* $out/share/navipowm-${version}
   '';
 
   buildInputs = [ qt4 ];

pkgs/applications/misc/openbrf/default.nix

@@ -2,7 +2,8 @@
 
 
 mkDerivation {
-  name = "openbrf-unstable-2016-01-09";
+  pname = "openbrf";
+  version = "unstable-2016-01-09";
 
   src = fetchFromGitHub {
     owner = "cfcohen";

pkgs/applications/misc/pcmanfm/default.nix

@@ -1,5 +1,18 @@
-{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config
-, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }:
+{ lib
+, stdenv
+, fetchurl
+, glib
+, intltool
+, libfm
+, libX11
+, pango
+, pkg-config
+, wrapGAppsHook
+, gnome
+, withGtk3 ? true
+, gtk2
+, gtk3
+}:
 
 let
   libfm' = libfm.override { inherit withGtk3; };
@@ -7,9 +20,11 @@ let
   inherit (lib) optional;
 in
 stdenv.mkDerivation rec {
-  name = "pcmanfm-1.3.2";
+  pname = "pcmanfm";
+  version = "1.3.2";
+
   src = fetchurl {
-    url = "mirror://sourceforge/pcmanfm/${name}.tar.xz";
+    url = "mirror://sourceforge/pcmanfm/pcmanfm-${version}.tar.xz";
     sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc=";
   };
 

pkgs/applications/misc/posterazor/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }:
 
-stdenv.mkDerivation {
-  name = "posterazor-1.5.1";
+stdenv.mkDerivation rec {
+  pname = "posterazor";
+  version = "1.5.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/posterazor/1.5.1/PosteRazor-1.5.1-Source.zip";
+    url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip";
     sha256 = "1dqpdk8zl0smdg4fganp3hxb943q40619qmxjlga9jhjc01s7fq5";
   };
 

pkgs/applications/misc/procmail/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "procmail-3.22";
+stdenv.mkDerivation rec {
+  pname = "procmail";
+  version = "3.22";
 
   patches = [
     ./CVE-2014-3618.patch
@@ -20,12 +21,12 @@ stdenv.mkDerivation {
         sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile
         sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h
         sed -e "3i\
-.PHONY: install
-" -i Makefile
+    .PHONY: install
+    " -i Makefile
   '';
 
   src = fetchurl {
-    url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz";
+    url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz";
     sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
   };
 

pkgs/applications/misc/ptask/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }:
 
 stdenv.mkDerivation rec {
-  name = "ptask-1.0.0";
+  pname = "ptask";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "https://wpitchoune.net/ptask/files/${name}.tar.gz";
+    url = "https://wpitchoune.net/ptask/files/ptask-${version}.tar.gz";
     sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq";
   };
 

pkgs/applications/misc/rofi-menugen/default.nix

@@ -2,7 +2,9 @@
 
 stdenv.mkDerivation rec {
   rev = "168efd2608fdb88b1aff3e0244bda8402169f207";
-  name = "rofi-menugen-2015-12-28-${builtins.substring 0 7 rev}";
+  pname = "rofi-menugen";
+  version = "unstable-2015-12-28-${builtins.substring 0 7 rev}";
+
   src = fetchFromGitHub {
     owner = "octotep";
     repo = "menugen";

pkgs/applications/misc/sbagen/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sbagen-1.4.4";
+  pname = "sbagen";
+  version = "1.4.4";
 
   src = fetchurl {
-    url = "https://uazu.net/sbagen/${name}.tgz";
+    url = "https://uazu.net/sbagen/sbagen-${version}.tgz";
     sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
   };
 

pkgs/applications/misc/slade/git.nix

@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib
+, stdenv
+, fetchFromGitHub
 , cmake
 , pkg-config
 , wxGTK
@@ -15,7 +17,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "slade-git-3.2.0.2021.05.13";
+  pname = "slade";
+  version = "unstable-2021-05-13";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";

pkgs/applications/misc/smpq/default.nix

@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl, cmake, StormLib }:
+
+stdenv.mkDerivation {
+  pname = "smpq";
+  version = "1.6";
+
+  src = fetchurl {
+    url = "https://launchpad.net/smpq/trunk/1.6/+download/smpq_1.6.orig.tar.gz";
+    sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm";
+  };
+
+  cmakeFlags = [
+    "-DWITH_KDE=OFF"
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ StormLib ];
+
+  meta = with lib; {
+    description = "StormLib MPQ archiving utility";
+    homepage = "https://launchpad.net/smpq";
+    license = licenses.gpl3Only;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ aanderse karolchmist ];
+  };
+}

pkgs/applications/misc/speedread/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "speedread-unstable-2016-09-21";
+  pname = "speedread";
+  version = "unstable-2016-09-21";
 
   src = fetchFromGitHub {
     owner = "pasky";

pkgs/applications/misc/stag/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, fetchgit, curses }:
 
 stdenv.mkDerivation {
-  name = "stag-1.0";
+  pname = "stag";
+  version = "1.0";
 
   src = fetchgit {
     url = "https://github.com/seenaburns/stag.git";

pkgs/applications/misc/twmn/default.nix

@@ -1,7 +1,8 @@
 { lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkg-config, boost }:
 
 mkDerivation {
-  name = "twmn-git-2018-10-01";
+  pname = "twmn";
+  version = "unstable-2018-10-01";
 
   src = fetchFromGitHub {
     owner = "sboli";

pkgs/applications/misc/waybar/default.nix

@@ -10,7 +10,6 @@
 , gtkmm3
 , libsigcxx
 , jsoncpp
-, fmt
 , scdoc
 , spdlog
 , gtk-layer-shell
@@ -51,7 +50,7 @@ stdenv.mkDerivation rec {
   strictDeps = false;
 
   buildInputs = with lib;
-    [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
+    [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
     ++ optional  traySupport  libdbusmenu-gtk3
     ++ optional  pulseSupport libpulseaudio
     ++ optional  sndioSupport sndio

pkgs/applications/misc/wmname/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "wmname-0.1";
+  pname = "wmname";
+  version = "0.1";
 
   src = fetchurl {
-    url = "https://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/wmname-${version}.tar.gz";
     sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5";
   };
 

pkgs/applications/misc/xcruiser/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }:
 
-stdenv.mkDerivation {
-  name = "xcruiser-0.30";
+stdenv.mkDerivation rec {
+  pname = "xcruiser";
+  version = "0.30";
 
   src = fetchurl {
-      url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz";
+    url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-${version}/xcruiser-${version}.tar.gz";
     sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";
   };
 

pkgs/applications/misc/xfe/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "xfe-1.42";
+  pname = "xfe";
+  version = "1.42";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xfe/${name}.tar.gz";
+    url = "mirror://sourceforge/xfe/xfe-${version}.tar.gz";
     sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1";
   };
 
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with lib; {
     description = "MS-Explorer like file manager for X";
     longDescription = ''
       X File Explorer (Xfe) is an MS-Explorer like file manager for X.
@@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
       Xfe aims to be the filemanager of choice for all the Unix addicts!
     '';
     homepage = "https://sourceforge.net/projects/xfe/";
-    license = lib.licenses.gpl2;
-    maintainers = [];
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.linux;
   };
 }

pkgs/applications/misc/xfontsel/default.nix

@@ -2,17 +2,18 @@
 # at https://www.x.org/releases/individual/.
 # That is why this expression is not inside pkgs.xorg
 
-{lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw}:
+{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }:
 stdenv.mkDerivation rec {
-  name = "xfontsel-1.0.6";
+  pname = "xfontsel";
+  version = "1.0.6";
 
   src = fetchurl {
-    url = "mirror://xorg/individual/app/${name}.tar.bz2";
+    url = "mirror://xorg/individual/app/xfontsel-${version}.tar.bz2";
     sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";
   };
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
-  buildInputs = [libX11 libXaw];
+  buildInputs = [ libX11 libXaw ];
 
   # Without this, it gets Xmu as a dependency, but without rpath entry
   NIX_LDFLAGS = "-lXmu";
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.x.org/";
     description = "Allows testing the fonts available in an X server";
     license = lib.licenses.free;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = with lib.maintainers; [ viric ];
     platforms = with lib.platforms; linux ++ darwin;
   };
 }

pkgs/applications/misc/xpdf/libxpdf.nix

@@ -1,8 +1,11 @@
-{ lib, stdenv, fetchurl
+{ lib
+, stdenv
+, fetchurl
 }:
 
 stdenv.mkDerivation {
-  name = "libxpdf-3.02pl5";
+  pname = "libxpdf";
+  version = "3.02pl5";
 
   src = fetchurl {
     url = "https://dl.xpdfreader.com/old/xpdf-3.02.tar.gz";

pkgs/applications/misc/xrq/default.nix

@@ -1,7 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, libX11}:
+{ lib, stdenv, fetchFromGitHub, libX11 }:
 
 stdenv.mkDerivation {
-  name = "xrq-unstable-2016-01-15";
+  pname = "xrq";
+  version = "unstable-2016-01-15";
 
   src = fetchFromGitHub {
     owner = "arianon";

pkgs/applications/misc/xxkb/default.nix

@@ -1,21 +1,37 @@
-{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep
-, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkg-config
+{ lib
+, stdenv
+, fetchurl
+, libX11
+, libXt
+, libXext
+, libXpm
+, imake
+, gccmakedep
+, svgSupport ? false
+, librsvg
+, glib
+, gdk-pixbuf
+, pkg-config
 }:
 
 assert svgSupport ->
-  librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null;
+librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null;
 
 stdenv.mkDerivation rec {
-  name = "xxkb-1.11.1";
+  pname = "xxkb";
+  version = "1.11.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xxkb/${name}-src.tar.gz";
+    url = "mirror://sourceforge/xxkb/xxkb-${version}-src.tar.gz";
     sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
   };
 
   nativeBuildInputs = [ imake gccmakedep ];
   buildInputs = [
-    libX11 libXt libXext libXpm
+    libX11
+    libXt
+    libXext
+    libXpm
   ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ];
 
   outputs = [ "out" "man" ];

pkgs/applications/networking/browsers/firefox/packages.nix

@@ -7,10 +7,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    version = "94.0";
+    version = "94.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "5eb65450a0f1842d28d73235f3ef95fa1dbf8cf1467c354f13df51313bd227aaf5a48b741ee49b13378aaaf054bff52004c1dd5a274eddef4a3cf1b913ef7071";
+      sha512 = "634665ed64f2ef205fad03ba023bc915df110c0d4b0a5e36aa470627808fbb3bce5418ea607f909d4e1eaf7d90c5dcacf398b8a434e26906dcfa366292a18b66";
     };
 
     meta = {

pkgs/applications/networking/cluster/helmfile/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "helmfile";
@@ -15,17 +15,10 @@ buildGoModule rec {
 
   doCheck = false;
 
-  nativeBuildInputs = [ makeWrapper ];
-
   subPackages = [ "." ];
 
   ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ];
 
-  postInstall = ''
-    wrapProgram $out/bin/helmfile \
-      --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
-  '';
-
   meta = {
     description = "Deploy Kubernetes Helm charts";
     homepage = "https://github.com/roboll/helmfile";

pkgs/applications/networking/dropbox/default.nix

@@ -26,6 +26,7 @@ let
     genericName = "File Synchronizer";
     categories = "Network;FileTransfer;";
     startupNotify = "false";
+    icon = "dropbox";
   };
 in
 

pkgs/applications/networking/feedreaders/newsflash/default.nix

@@ -21,19 +21,19 @@
 
 stdenv.mkDerivation rec {
   pname = "newsflash";
-  version = "1.4.3";
+  version = "1.5.1";
 
   src = fetchFromGitLab {
     owner = "news-flash";
     repo = "news_flash_gtk";
-    rev = "v.${version}";
-    hash = "sha256-c/zT+FNRDu7jdooNTEYbeG9jLrL+9txe+aC7nSy4bB0=";
+    rev = version;
+    hash = "sha256-fLG7oYt+gdl3Lwnu6c7VLJWSHCFY5LyNeDKoUNGg3Yw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-yTElaPSoTiJpfIGzuNJCWxVzdWBzim5rt0N2r0ARhvM=";
+    hash = "sha256-dQlbK3SfY6p1xinroXz5wcaBbq2LuDM9sMlfJ6ueTTg=";
   };
 
   patches = [
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     description = "A modern feed reader designed for the GNOME desktop";
     homepage = "https://gitlab.com/news-flash/news_flash_gtk";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ kira-bruneau ];
+    maintainers = with maintainers; [ kira-bruneau stunkymonkey ];
     platforms = platforms.unix;
   };
 }

pkgs/applications/networking/instant-messengers/nheko/default.nix

@@ -18,7 +18,6 @@
 , mtxclient
 , boost17x
 , spdlog
-, fmt
 , olm
 , pkg-config
 , nlohmann_json
@@ -52,7 +51,6 @@ mkDerivation rec {
     libsecret
     lmdb
     spdlog
-    fmt
     cmark
     qtbase
     qtmultimedia

pkgs/applications/networking/irc/tiny/default.nix

@@ -10,21 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tiny";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "osa1";
     repo = pname;
     rev = "v${version}";
-    sha256 = "gKyHR3FZHDybaP38rqB8/gvr8T+mDO4QQxoTtWS+TlE=";
+    sha256 = "177d1x4z0mh0p7c5ldq70cn1j3pac50d8cil2ni50hl49c3x6yy1";
   };
 
-  cargoSha256 = "0ChfW8vaqC2kCp4lpS0HOvhuihPw9G5TOmgwKzVDfws=";
-
-  # Fix Cargo.lock version. Remove with the next release.
-  cargoPatches = [
-    ./fix-Cargo.lock.patch
-  ];
+  cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1";
 
   cargoBuildFlags = lib.optionals stdenv.isLinux [ "--features=desktop-notifications" ];
 
@@ -34,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "A console IRC client";
     homepage = "https://github.com/osa1/tiny";
-    changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/osa1/tiny/raw/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ Br1ght0ne vyp ];
   };

pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch

@@ -1,13 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 3a184dc..0e58cb1 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1023,7 +1023,7 @@ dependencies = [
- 
- [[package]]
- name = "tiny"
--version = "0.8.0"
-+version = "0.9.0"
- dependencies = [
-  "clap",
-  "dirs 3.0.1",