Merge staging-next into staging

nixos/doc/manual/release-notes/rl-2105.xml

@@ -703,6 +703,12 @@ environment.systemPackages = [
        <literal>skip-kernel-setup true</literal> and takes care of setting forwarding and rp_filter sysctls by itself as well
        as for each interface in <varname>services.babeld.interfaces</varname>.
      </para>
+    </listitem>
+   <listitem>
+     <para>
+      The <option>services.zigbee2mqtt.config</option> option has been renamed to <option>services.zigbee2mqtt.settings</option> and
+      now follows <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC 0042</link>.
+     </para>
    </listitem>
   </itemizedlist>
  </section>

nixos/modules/module-list.nix

@@ -631,6 +631,7 @@
   ./services/network-filesystems/xtreemfs.nix
   ./services/network-filesystems/ceph.nix
   ./services/networking/3proxy.nix
+  ./services/networking/adguardhome.nix
   ./services/networking/amuled.nix
   ./services/networking/aria2.nix
   ./services/networking/asterisk.nix

nixos/modules/services/misc/zigbee2mqtt.nix

@@ -5,29 +5,17 @@ with lib;
 let
   cfg = config.services.zigbee2mqtt;
 
-  configJSON = pkgs.writeText "configuration.json"
+  format = pkgs.formats.yaml { };
-    (builtins.toJSON (recursiveUpdate defaultConfig cfg.config));
+  configFile = format.generate "zigbee2mqtt.yaml" cfg.settings;
-  configFile = pkgs.runCommand "configuration.yaml" { preferLocalBuild = true; } ''
-    ${pkgs.remarshal}/bin/json2yaml -i ${configJSON} -o $out
-  '';
 
-  # the default config contains all required settings,
-  # so the service starts up without crashing.
-  defaultConfig = {
-    homeassistant = false;
-    permit_join = false;
-    mqtt = {
-      base_topic = "zigbee2mqtt";
-      server = "mqtt://localhost:1883";
-    };
-    serial.port = "/dev/ttyACM0";
-    # put device configuration into separate file because configuration.yaml
-    # is copied from the store on startup
-    devices = "devices.yaml";
-  };
 in
 {
-  meta.maintainers = with maintainers; [ sweber ];
+  meta.maintainers = with maintainers; [ sweber hexa ];
+
+  imports = [
+    # Remove warning before the 21.11 release
+    (mkRenamedOptionModule [ "services" "zigbee2mqtt" "config" ] [ "services" "zigbee2mqtt" "settings" ])
+  ];
 
   options.services.zigbee2mqtt = {
     enable = mkEnableOption "enable zigbee2mqtt service";
@@ -37,7 +25,11 @@ in
       default = pkgs.zigbee2mqtt.override {
         dataDir = cfg.dataDir;
       };
-      defaultText = "pkgs.zigbee2mqtt";
+      defaultText = literalExample ''
+        pkgs.zigbee2mqtt {
+          dataDir = services.zigbee2mqtt.dataDir
+        }
+      '';
       type = types.package;
     };
 
@@ -47,9 +39,9 @@ in
       type = types.path;
     };
 
-    config = mkOption {
+    settings = mkOption {
+      type = format.type;
       default = {};
-      type = with types; nullOr attrs;
       example = literalExample ''
         {
           homeassistant = config.services.home-assistant.enable;
@@ -61,11 +53,28 @@ in
       '';
       description = ''
         Your <filename>configuration.yaml</filename> as a Nix attribute set.
+        Check the <link xlink:href="https://www.zigbee2mqtt.io/information/configuration.html">documentation</link>
+        for possible options.
       '';
     };
   };
 
   config = mkIf (cfg.enable) {
+
+    # preset config values
+    services.zigbee2mqtt.settings = {
+      homeassistant = mkDefault config.services.home-assistant.enable;
+      permit_join = mkDefault false;
+      mqtt = {
+        base_topic = mkDefault "zigbee2mqtt";
+        server = mkDefault "mqtt://localhost:1883";
+      };
+      serial.port = mkDefault "/dev/ttyACM0";
+      # reference device configuration, that is kept in a separate file
+      # to prevent it being overwritten in the units ExecStartPre script
+      devices = mkDefault "devices.yaml";
+    };
+
     systemd.services.zigbee2mqtt = {
       description = "Zigbee2mqtt Service";
       wantedBy = [ "multi-user.target" ];
@@ -76,10 +85,48 @@ in
         User = "zigbee2mqtt";
         WorkingDirectory = cfg.dataDir;
         Restart = "on-failure";
+
+        # Hardening
+        CapabilityBoundingSet = "";
+        DeviceAllow = [
+          config.services.zigbee2mqtt.settings.serial.port
+        ];
+        DevicePolicy = "closed";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = false;
+        NoNewPrivileges = true;
+        PrivateDevices = false; # prevents access to /dev/serial, because it is set 0700 root:root
+        PrivateUsers = true;
+        PrivateTmp = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProcSubset = "pid";
         ProtectSystem = "strict";
         ReadWritePaths = cfg.dataDir;
-        PrivateTmp = true;
         RemoveIPC = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SupplementaryGroups = [
+          "dialout"
+        ];
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+          "~@resources"
+        ];
+        UMask = "0077";
       };
       preStart = ''
         cp --no-preserve=mode ${configFile} "${cfg.dataDir}/configuration.yaml"
@@ -90,7 +137,6 @@ in
       home = cfg.dataDir;
       createHome = true;
       group = "zigbee2mqtt";
-      extraGroups = [ "dialout" ];
       uid = config.ids.uids.zigbee2mqtt;
     };
 

nixos/modules/services/networking/adguardhome.nix

@@ -0,0 +1,78 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.adguardhome;
+
+  args = concatStringsSep " " ([
+    "--no-check-update"
+    "--pidfile /run/AdGuardHome/AdGuardHome.pid"
+    "--work-dir /var/lib/AdGuardHome/"
+    "--config /var/lib/AdGuardHome/AdGuardHome.yaml"
+    "--host ${cfg.host}"
+    "--port ${toString cfg.port}"
+  ] ++ cfg.extraArgs);
+
+in
+{
+  options.services.adguardhome = with types; {
+    enable = mkEnableOption "AdGuard Home network-wide ad blocker";
+
+    host = mkOption {
+      default = "0.0.0.0";
+      type = str;
+      description = ''
+        Host address to bind HTTP server to.
+      '';
+    };
+
+    port = mkOption {
+      default = 3000;
+      type = port;
+      description = ''
+        Port to serve HTTP pages on.
+      '';
+    };
+
+    openFirewall = mkOption {
+      default = false;
+      type = bool;
+      description = ''
+        Open ports in the firewall for the AdGuard Home web interface. Does not
+        open the port needed to access the DNS resolver.
+      '';
+    };
+
+    extraArgs = mkOption {
+      default = [ ];
+      type = listOf str;
+      description = ''
+        Extra command line parameters to be passed to the adguardhome binary.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.adguardhome = {
+      description = "AdGuard Home: Network-level blocker";
+      after = [ "syslog.target" "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      unitConfig = {
+        StartLimitIntervalSec = 5;
+        StartLimitBurst = 10;
+      };
+      serviceConfig = {
+        DynamicUser = true;
+        ExecStart = "${pkgs.adguardhome}/bin/adguardhome ${args}";
+        AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+        Restart = "always";
+        RestartSec = 10;
+        RuntimeDirectory = "AdGuardHome";
+        StateDirectory = "AdGuardHome";
+      };
+    };
+
+    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
+  };
+}

nixos/modules/services/web-servers/nginx/default.nix

@@ -819,28 +819,38 @@ in
         # Logs directory and mode
         LogsDirectory = "nginx";
         LogsDirectoryMode = "0750";
+        # Proc filesystem
+        ProcSubset = "pid";
+        ProtectProc = "invisible";
+        # New file permissions
+        UMask = "0027"; # 0640 / 0750
         # Capabilities
         AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ];
         CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ];
         # Security
         NoNewPrivileges = true;
-        # Sandboxing
+        # Sandboxing (sorted by occurrence in https://www.freedesktop.org/software/systemd/man/systemd.exec.html)
         ProtectSystem = "strict";
         ProtectHome = mkDefault true;
         PrivateTmp = true;
         PrivateDevices = true;
         ProtectHostname = true;
+        ProtectClock = true;
         ProtectKernelTunables = true;
         ProtectKernelModules = true;
+        ProtectKernelLogs = true;
         ProtectControlGroups = true;
         RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
+        RestrictNamespaces = true;
         LockPersonality = true;
         MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules);
         RestrictRealtime = true;
         RestrictSUIDSGID = true;
+        RemoveIPC = true;
         PrivateMounts = true;
         # System Call Filtering
         SystemCallArchitectures = "native";
+        SystemCallFilter = "~@chown @cpu-emulation @debug @keyring @ipc @module @mount @obsolete @privileged @raw-io @reboot @setuid @swap";
       };
     };
 

nixos/modules/virtualisation/nixos-containers.nix

@@ -35,6 +35,9 @@ let
       ''
         #! ${pkgs.runtimeShell} -e
 
+        # Exit early if we're asked to shut down.
+        trap "exit 0" SIGRTMIN+3
+
         # Initialise the container side of the veth pair.
         if [ -n "$HOST_ADDRESS" ]   || [ -n "$HOST_ADDRESS6" ]  ||
            [ -n "$LOCAL_ADDRESS" ]  || [ -n "$LOCAL_ADDRESS6" ] ||
@@ -60,8 +63,12 @@ let
 
         ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
 
-        # Start the regular stage 1 script.
+        # Start the regular stage 2 script.
-        exec "$1"
+        # We source instead of exec to not lose an early stop signal, which is
+        # also the only _reliable_ shutdown signal we have since early stop
+        # does not execute ExecStop* commands.
+        set +e
+        . "$1"
       ''
     );
 
@@ -127,12 +134,16 @@ let
       ''}
 
       # Run systemd-nspawn without startup notification (we'll
-      # wait for the container systemd to signal readiness).
+      # wait for the container systemd to signal readiness)
+      # Kill signal handling means systemd-nspawn will pass a system-halt signal
+      # to the container systemd when it receives SIGTERM for container shutdown;
+      # containerInit and stage2 have to handle this as well.
       exec ${config.systemd.package}/bin/systemd-nspawn \
         --keep-unit \
         -M "$INSTANCE" -D "$root" $extraFlags \
         $EXTRA_NSPAWN_FLAGS \
         --notify-ready=yes \
+        --kill-signal=SIGRTMIN+3 \
         --bind-ro=/nix/store \
         --bind-ro=/nix/var/nix/db \
         --bind-ro=/nix/var/nix/daemon-socket \
@@ -259,13 +270,10 @@ let
     Slice = "machine.slice";
     Delegate = true;
 
-    # Hack: we don't want to kill systemd-nspawn, since we call
+    # We rely on systemd-nspawn turning a SIGTERM to itself into a shutdown
-    # "machinectl poweroff" in preStop to shut down the
+    # signal (SIGRTMIN+3) for the inner container.
-    # container cleanly. But systemd requires sending a signal
-    # (at least if we want remaining processes to be killed
-    # after the timeout). So send an ignored signal.
     KillMode = "mixed";
-    KillSignal = "WINCH";
+    KillSignal = "TERM";
 
     DevicePolicy = "closed";
     DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices;
@@ -747,8 +755,6 @@ in
 
       postStart = postStartScript dummyConfig;
 
-      preStop = "machinectl poweroff $INSTANCE";
-
       restartIfChanged = false;
 
       serviceConfig = serviceDirectives dummyConfig;

nixos/tests/containers-imperative.nix

@@ -111,6 +111,26 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
           machine.succeed(f"nixos-container stop {id1}")
           machine.succeed(f"nixos-container start {id1}")
 
+      # clear serial backlog for next tests
+      machine.succeed("logger eat console backlog 3ea46eb2-7f82-4f70-b810-3f00e3dd4c4d")
+      machine.wait_for_console_text(
+          "eat console backlog 3ea46eb2-7f82-4f70-b810-3f00e3dd4c4d"
+      )
+
+      with subtest("Stop a container early"):
+          machine.succeed(f"nixos-container stop {id1}")
+          machine.succeed(f"nixos-container start {id1} &")
+          machine.wait_for_console_text("Stage 2")
+          machine.succeed(f"nixos-container stop {id1}")
+          machine.wait_for_console_text(f"Container {id1} exited successfully")
+          machine.succeed(f"nixos-container start {id1}")
+
+      with subtest("Stop a container without machined (regression test for #109695)"):
+          machine.systemctl("stop systemd-machined")
+          machine.succeed(f"nixos-container stop {id1}")
+          machine.wait_for_console_text(f"Container {id1} has been shut down")
+          machine.succeed(f"nixos-container start {id1}")
+
       with subtest("tmpfiles are present"):
           machine.log("creating container tmpfiles")
           machine.succeed(

nixos/tests/zigbee2mqtt.nix

@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
 
   {
     machine = { pkgs, ... }:
@@ -6,6 +6,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
         services.zigbee2mqtt = {
           enable = true;
         };
+
+        systemd.services.zigbee2mqtt.serviceConfig.DevicePolicy = lib.mkForce "auto";
       };
 
     testScript = ''
@@ -14,6 +16,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
       machine.succeed(
           "journalctl -eu zigbee2mqtt | grep \"Error: Error while opening serialport 'Error: Error: No such file or directory, cannot open /dev/ttyACM0'\""
       )
+
+      machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service"))
     '';
   }
 )

pkgs/applications/audio/kid3/default.nix

@@ -6,7 +6,7 @@
 , cmake
 , docbook_xml_dtd_45
 , docbook_xsl
-, ffmpeg_3
+, ffmpeg
 , flac
 , id3lib
 , libogg
@@ -31,21 +31,22 @@ stdenv.mkDerivation rec {
   version = "3.8.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
+    url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-ce+MWCJzAnN+u+07f0dvn0jnbqiUlS2RbcM9nAj5bgg=";
+    hash = "sha256-R4gAWlCw8RezhYbw1XDo+wdp797IbLoM3wqHwr+ul6k=";
   };
 
   nativeBuildInputs = [
     cmake
+    docbook_xml_dtd_45
+    docbook_xsl
     pkg-config
+    python3
     wrapQtAppsHook
   ];
   buildInputs = [
     automoc4
     chromaprint
-    docbook_xml_dtd_45
+    ffmpeg
-    docbook_xsl
-    ffmpeg_3
     flac
     id3lib
     libogg
@@ -53,7 +54,6 @@ stdenv.mkDerivation rec {
     libxslt
     mp4v2
     phonon
-    python3
     qtbase
     qtmultimedia
     qtquickcontrols
@@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    homepage = "https://kid3.kde.org/";
     description = "A simple and powerful audio tag editor";
     longDescription = ''
       If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC,
@@ -101,7 +102,6 @@ stdenv.mkDerivation rec {
       - Edit synchronized lyrics and event timing codes, import and export
         LRC files.
     '';
-    homepage = "http://kid3.sourceforge.net/";
     license = licenses.lgpl2Plus;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.linux;

pkgs/applications/audio/quodlibet/default.nix

@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg,
   tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,
   gst_all_1, withGstPlugins ? true,
-  xineBackend ? false, xineLib,
+  xineBackend ? false, xine-lib,
   withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
   webkitgtk ? null,
   keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }:
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
   checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]);
 
   buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
-    ++ (if xineBackend then [ xineLib ] else with gst_all_1;
+    ++ (if xineBackend then [ xine-lib ] else with gst_all_1;
     [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
 
   propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ]

pkgs/applications/misc/eaglemode/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkg-config,
-librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }:
+librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xine-lib, ghostscript, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "eaglemode";
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff
-    librsvg glib gtk2 libXxf86vm libXext poppler xineLib ghostscript makeWrapper ];
+    librsvg glib gtk2 libXxf86vm libXext poppler xine-lib ghostscript makeWrapper ];
 
   # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
-  # I use 'yes y' to skip a build error linking with xineLib,
+  # I use 'yes y' to skip a build error linking with xine-lib,
   # because xine stopped exporting "_x_vo_new_port"
   #  https://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
   buildPhase = ''

pkgs/applications/networking/sync/rclone/default.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.55.0";
+  version = "1.55.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "01pvcns3n735s848wc11q40pkkv646gn3cxkma866k44a9c2wirl";
+    sha256 = "1fyi12qz2igcf9rqsp9gmcgfnmgy4g04s2b03b95ml6klbf73cns";
   };
 
-  vendorSha256 = "05f9nx5sa35q2szfkmnkhvqli8jlqja8ghiwyxk7cvgjl7fgd6zk";
+  vendorSha256 = "199z3j62xw9h8yviyv4jfls29y2ri9511hcyp5ix8ahgk6ypz8vw";
 
   subPackages = [ "." ];
 

pkgs/applications/video/aegisub/default.nix

@@ -3,22 +3,22 @@
 , stdenv
 , fetchurl
 , fetchpatch
-, libX11
+, boost
-, wxGTK
+, ffmpeg
-, libiconv
+, ffms
+, fftw
 , fontconfig
 , freetype
-, libGLU
-, libGL
-, libass
-, fftw
-, ffms
-, ffmpeg_3
-, pkg-config
-, zlib
 , icu
-, boost
 , intltool
+, libGL
+, libGLU
+, libX11
+, libass
+, libiconv
+, pkg-config
+, wxGTK
+, zlib
 
 , spellcheckSupport ? true
 , hunspell ? null
@@ -46,71 +46,75 @@ assert alsaSupport -> (alsaLib != null);
 assert pulseaudioSupport -> (libpulseaudio != null);
 assert portaudioSupport -> (portaudio != null);
 
-with lib;
+let
-stdenv.mkDerivation
+  inherit (lib) optional;
- rec {
+in
+stdenv.mkDerivation rec {
   pname = "aegisub";
   version = "3.2.2";
 
   src = fetchurl {
     url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz";
-    sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
+    hash = "sha256-xV4zlFuC2FE8AupueC8Ncscmrc03B+lbjAAi9hUeaIU=";
   };
 
   patches = [
     # Compatibility with ICU 59
     (fetchpatch {
       url = "https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721f6ff16a49.patch";
-      sha256 = "07qqlckiyy64lz8zk1as0vflk9kqnjb340420lp9f0xj93ncssj7";
+      sha256 = "sha256-R2rN7EiyA5cuBYIAMpa0eKZJ3QZahfnRp8R4HyejGB8=";
     })
 
     # Compatbility with Boost 1.69
     (fetchpatch {
       url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch";
-      sha256 = "1n8wmjka480j43b1pr30i665z8hdy6n3wdiz1ls81wyv7ai5yygf";
+      sha256 = "sha256-7nlfojrb84A0DT82PqzxDaJfjIlg5BvWIBIgoqasHNk=";
     })
 
     # Compatbility with make 4.3
     (fetchpatch {
       url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch";
-      sha256 = "1s9cc5rikrqb9ivjbag4b8yxcyjsmmmw744394d5xq8xi4k12vxc";
+      sha256 = "sha256-rG8RJokd4V4aSYOQw2utWnrWPVrkqSV3TAvnGXNhLOk=";
     })
   ];
 
   nativeBuildInputs = [
-    pkg-config
     intltool
+    pkg-config
   ];
-
+  buildInputs = [
-  buildInputs = with lib; [
+    boost
-    libX11
+    ffmpeg
-    wxGTK
+    ffms
+    fftw
     fontconfig
     freetype
-    libGLU
-    libGL
-    libass
-    fftw
-    ffms
-    ffmpeg_3
-    zlib
     icu
-    boost
+    libGL
+    libGLU
+    libX11
+    libass
     libiconv
+    wxGTK
+    zlib
   ]
-    ++ optional spellcheckSupport hunspell
+  ++ optional alsaSupport alsaLib
-    ++ optional automationSupport lua
+  ++ optional automationSupport lua
-    ++ optional openalSupport openal
+  ++ optional openalSupport openal
-    ++ optional alsaSupport alsaLib
+  ++ optional portaudioSupport portaudio
-    ++ optional pulseaudioSupport libpulseaudio
+  ++ optional pulseaudioSupport libpulseaudio
-    ++ optional portaudioSupport portaudio
+  ++ optional spellcheckSupport hunspell
-    ;
+  ;
 
   enableParallelBuilding = true;
 
-  hardeningDisable = [ "bindnow" "relro" ];
+  hardeningDisable = [
+    "bindnow"
+    "relro"
+  ];
 
-  # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
+  # compat with icu61+
+  # https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
   CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
 
   # this is fixed upstream though not yet in an officially released version,
@@ -119,7 +123,8 @@ stdenv.mkDerivation
 
   postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
 
-  meta = {
+  meta = with lib; {
+    homepage = "https://github.com/Aegisub/Aegisub";
     description = "An advanced subtitle editor";
     longDescription = ''
       Aegisub is a free, cross-platform open source tool for creating and
@@ -127,12 +132,11 @@ stdenv.mkDerivation
       audio, and features many powerful tools for styling them, including a
       built-in real-time video preview.
     '';
-    homepage = "http://www.aegisub.org/";
+    # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd
-    # The Aegisub sources are itself BSD/ISC,
+    # softwares - so the resulting program will be GPL
-    # but they are linked against GPL'd softwares
-    # - so the resulting program will be GPL
     license = licenses.bsd3;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
+# TODO [ AndersonTorres ]: update to fork release

pkgs/applications/video/dvdstyler/default.nix

@@ -1,84 +1,107 @@
-{ lib, stdenv, fetchurl, pkg-config
+{ lib
-, flex, bison, gettext
+, stdenv
-, xineUI, wxSVG
+, fetchurl
+, bison
+, cdrtools
+, docbook5
+, dvdauthor
+, dvdplusrwtools
+, flex
 , fontconfig
-, xmlto, docbook5, zip
+, gettext
-, cdrtools, dvdauthor, dvdplusrwtools
+, makeWrapper
+, pkg-config
+, wxSVG
+, xine-ui
+, xmlto
+, zip
+
 , dvdisasterSupport ? true, dvdisaster ? null
 , thumbnailSupport ? true, libgnomeui ? null
 , udevSupport ? true, udev ? null
 , dbusSupport ? true, dbus ? null
-, makeWrapper }:
+}:
-
-with lib;
-stdenv.mkDerivation rec {
 
+let
+  inherit (lib) optionals makeBinPath;
+in stdenv.mkDerivation rec {
   pname = "dvdstyler";
-  srcName = "DVDStyler-${version}";
   version = "3.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2";
+    url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2";
     sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4";
   };
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
-  [ pkg-config ];
+    pkg-config
-
+  ];
-  packagesToBinPath =
+  buildInputs = [
-  [ cdrtools dvdauthor dvdplusrwtools ];
+    bison
-
+    cdrtools
-  buildInputs =
+    docbook5
-  [ flex bison gettext xineUI
+    dvdauthor
-    wxSVG fontconfig xmlto
+    dvdplusrwtools
-    docbook5 zip makeWrapper ]
+    flex
-  ++ packagesToBinPath
+    fontconfig
+    gettext
+    makeWrapper
+    wxSVG
+    xine-ui
+    xmlto
+    zip
+ ]
   ++ optionals dvdisasterSupport [ dvdisaster ]
   ++ optionals udevSupport [ udev ]
   ++ optionals dbusSupport [ dbus ]
   ++ optionals thumbnailSupport [ libgnomeui ];
 
-  binPath = makeBinPath packagesToBinPath;
 
-  postInstall = ''
+  postInstall = let
-    wrapProgram $out/bin/dvdstyler \
+    binPath = makeBinPath [
-      --prefix PATH ":" "${binPath}"
+      cdrtools
-  '';
+      dvdauthor
+      dvdplusrwtools
+    ]; in
+    ''
+       wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}"
+    '';
 
   meta = with lib; {
+    homepage = "https://www.dvdstyler.org/";
     description = "A DVD authoring software";
     longDescription = ''
-    DVDStyler is a cross-platform free DVD authoring application for the
+      DVDStyler is a cross-platform free DVD authoring application for the
-    creation of professional-looking DVDs. It allows not only burning of video
+      creation of professional-looking DVDs. It allows not only burning of video
-    files on DVD that can be played practically on any standalone DVD player,
+      files on DVD that can be played practically on any standalone DVD player,
-    but also creation of individually designed DVD menus. It is Open Source
+      but also creation of individually designed DVD menus. It is Open Source
-    Software and is completely free.
+      Software and is completely free.
 
-    Some of its features include:
+      Some of its features include:
-    -  create and burn DVD video with interactive menus
+
-    - design your own DVD menu or select one from the list of ready to use menu
+      - create and burn DVD video with interactive menus
-      templates
+      - design your own DVD menu or select one from the list of ready to use menu
-    - create photo slideshow
+        templates
-    - add multiple subtitle and audio tracks
+      - create photo slideshow
-    - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats
+      - add multiple subtitle and audio tracks
-    - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and
+      - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats
-      video formats
+      - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and
-    - support of multi-core processor
+        video formats
-    - use MPEG and VOB files without reencoding
+      - support of multi-core processor
-    - put files with different audio/video format on one DVD (support of
+      - use MPEG and VOB files without reencoding
-      titleset)
+      - put files with different audio/video format on one DVD (support of
-    - user-friendly interface with support of drag & drop
+        titleset)
-    - flexible menu creation on the basis of scalable vector graphic
+      - user-friendly interface with support of drag & drop
-    - import of image file for background
+      - flexible menu creation on the basis of scalable vector graphic
-    - place buttons, text, images and other graphic objects anywhere on the menu
+      - import of image file for background
-      screen
+      - place buttons, text, images and other graphic objects anywhere on the menu
-    - change the font/color and other parameters of buttons and graphic objects
+        screen
-    - scale any button or graphic object
+      - change the font/color and other parameters of buttons and graphic objects
-    - copy any menu object or whole menu
+      - scale any button or graphic object
-    - customize navigation using DVD scripting
+      - copy any menu object or whole menu
+      - customize navigation using DVD scripting
     '';
-    homepage = "http://www.dvdstyler.org/";
+    license = licenses.gpl2Plus;
-    license = with licenses; gpl2;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = with platforms; linux;
   };

pkgs/applications/video/vdr/xineliboutput/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, vdr
 , libav, libcap, libvdpau
-, xineLib, libjpeg, libextractor, libglvnd, libGLU
+, xine-lib, libjpeg, libextractor, libglvnd, libGLU
 , libX11, libXext, libXrender, libXrandr
 , makeWrapper
 }: let
@@ -34,7 +34,7 @@
     postFixup = ''
       for f in $out/bin/*; do
         wrapProgram $f \
-          --prefix XINE_PLUGIN_PATH ":" "${makeXinePluginPath [ "$out" xineLib ]}"
+          --prefix XINE_PLUGIN_PATH ":" "${makeXinePluginPath [ "$out" xine-lib ]}"
       done
     '';
 
@@ -53,10 +53,10 @@
       libXrender
       libX11
       vdr
-      xineLib
+      xine-lib
     ];
 
-    passthru.requiredXinePlugins = [ xineLib self ];
+    passthru.requiredXinePlugins = [ xine-lib self ];
 
     meta = with lib;{
       homepage = "https://sourceforge.net/projects/xineliboutput/";

pkgs/applications/video/xine-ui/default.nix

@@ -1,34 +1,63 @@
-{lib, stdenv, fetchurl, pkg-config, xorg, libpng, xineLib, readline, ncurses, curl
+{ lib
-, lirc, shared-mime-info, libjpeg }:
+, stdenv
+, fetchurl
+, curl
+, libjpeg
+, libpng
+, lirc
+, ncurses
+, pkg-config
+, readline
+, shared-mime-info
+, xine-lib
+, xorg
+}:
 
 stdenv.mkDerivation rec {
-  name = "xine-ui-0.99.12";
+  pname = "xine-ui";
+  version = "0.99.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xine/${name}.tar.xz";
+    url = "mirror://sourceforge/xine/${pname}-${version}.tar.xz";
     sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl";
   };
 
-  nativeBuildInputs = [ pkg-config shared-mime-info ];
+  nativeBuildInputs = [
+    pkg-config
+    shared-mime-info
+  ];
+  buildInputs = [
+    curl
+    libjpeg
+    libpng
+    lirc
+    ncurses
+    readline
+    xine-lib
+  ] ++ (with xorg; [
+    libXext
+    libXft
+    libXi
+    libXinerama
+    libXtst
+    libXv
+    libXxf86vm
+    xlibsWrapper
+    xorgproto
+  ]);
 
-  buildInputs =
+  postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c";
-    [ xineLib libpng readline ncurses curl lirc libjpeg
-      xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.xorgproto
-      xorg.libXinerama xorg.libXi xorg.libXft
-    ];
-
-  patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
 
   configureFlags = [ "--with-readline=${readline.dev}" ];
 
   LIRC_CFLAGS="-I${lirc}/include";
   LIRC_LIBS="-L ${lirc}/lib -llirc_client";
-#NIX_LDFLAGS = "-lXext -lgcc_s";
 
   meta = with lib; {
-    homepage = "http://www.xine-project.org/";
+    homepage = "http://xinehq.de/";
-    description = "Xlib-based interface to Xine, a video player";
+    description = "Xlib-based frontend for Xine video player";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.linux;
-    license = licenses.gpl2;
   };
 }

pkgs/applications/window-managers/leftwm/default.nix

@@ -6,16 +6,16 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "leftwm";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "leftwm";
     repo = "leftwm";
     rev = version;
-    sha256 = "sha256-hirT0gScC2LFPvygywgPiSVDUE/Zd++62wc26HlufYU=";
+    sha256 = "sha256-nRPt+Tyfq62o+3KjsXkHQHUMMslHFGNBd3s2pTb7l4w=";
   };
 
-  cargoSha256 = "sha256-j57LHPU3U3ipUGQDrZ8KCuELOVJ3BxhLXsJePOO6rTM=";
+  cargoSha256 = "sha256-lmzA7XM8B5QJI4Wo0cKeMR3+np6jT6mdGzTry4g87ng=";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ libX11 libXinerama ];

pkgs/data/misc/hackage/default.nix

@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/1aad60ed9679a7597f3fc3515a0fe26fdb896e55.tar.gz";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d202e2aff06500ede787ed63544476f6d41e9eb7.tar.gz";
-  sha256 = "0a7lm1ki8rz7m13x4zxlr1nkd93227xgmxbhvsmrj9fa4nc5bvyy";
+  sha256 = "00hmclrhr3a2h9vshsl909g0zgymlamx491lkhwr5kgb3qx9sfh2";
 }

pkgs/development/haskell-modules/configuration-common.nix

@@ -64,7 +64,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "13n62v3cdkx23fywdccczcr8vsf0vmjbimmgin766bf428jlhh6h";
+      sha256 = "1wig8nw2rxgq86y88m1f1qf93z5yckidf1cs33ribmhqa1hs300p";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -284,7 +284,10 @@ self: super: {
   hsbencher = dontCheck super.hsbencher;
   hsexif = dontCheck super.hsexif;
   hspec-server = dontCheck super.hspec-server;
-  HTF = dontCheck super.HTF;
+  HTF = overrideCabal super.HTF (orig: {
+    # The scripts in scripts/ are needed to build the test suite.
+    preBuild = "patchShebangs --build scripts";
+  });
   htsn = dontCheck super.htsn;
   htsn-import = dontCheck super.htsn-import;
   http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105

pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix

@@ -79,8 +79,8 @@ self: super: {
 
   # Apply patches from head.hackage.
   alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch";
-    sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh";
+    sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4";
   });
   doctest = dontCheck (doJailbreak super.doctest_0_18_1);
   generic-deriving = appendPatch (doJailbreak super.generic-deriving) (pkgs.fetchpatch {

pkgs/development/haskell-modules/configuration-hackage2nix.yaml

@@ -101,7 +101,7 @@ default-package-overrides:
   - gi-secret < 0.0.13
   - gi-vte < 2.91.28
 
-  # Stackage Nightly 2021-04-15
+  # Stackage Nightly 2021-04-28
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -319,7 +319,7 @@ default-package-overrides:
   - base64-string ==0.2
   - base-compat ==0.11.2
   - base-compat-batteries ==0.11.2
-  - basement ==0.0.11
+  - basement ==0.0.12
   - base-orphans ==0.8.4
   - base-prelude ==1.4
   - base-unicode-symbols ==0.2.4.2
@@ -437,6 +437,7 @@ default-package-overrides:
   - calendar-recycling ==0.0.0.1
   - call-stack ==0.3.0
   - can-i-haz ==0.3.1.0
+  - capability ==0.4.0.0
   - ca-province-codes ==1.0.0.0
   - cardano-coin-selection ==1.0.1
   - carray ==0.1.6.8
@@ -531,6 +532,7 @@ default-package-overrides:
   - composite-aeson ==0.7.5.0
   - composite-aeson-path ==0.7.5.0
   - composite-aeson-refined ==0.7.5.0
+  - composite-aeson-throw ==0.1.0.0
   - composite-base ==0.7.5.0
   - composite-binary ==0.7.5.0
   - composite-ekg ==0.7.5.0
@@ -710,7 +712,7 @@ default-package-overrides:
   - distributed-closure ==0.4.2.0
   - distribution-opensuse ==1.1.1
   - distributive ==0.6.2.1
-  - dl-fedora ==0.8
+  - dl-fedora ==0.9
   - dlist ==0.8.0.8
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
@@ -825,13 +827,13 @@ default-package-overrides:
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.10
   - exp-pairs ==0.2.1.0
-  - express ==0.1.4
+  - express ==0.1.6
   - extended-reals ==0.2.4.0
   - extensible-effects ==5.0.0.1
   - extensible-exceptions ==0.1.1.4
   - extra ==1.7.9
   - extractable-singleton ==0.0.1
-  - extrapolate ==0.4.2
+  - extrapolate ==0.4.4
   - fail ==4.9.0.0
   - failable ==1.2.4.0
   - fakedata ==0.8.0
@@ -901,7 +903,8 @@ default-package-overrides:
   - forma ==1.1.3
   - format-numbers ==0.1.0.1
   - formatting ==6.3.7
-  - foundation ==0.0.25
+  - foundation ==0.0.26.1
+  - fourmolu ==0.3.0.0
   - free ==5.1.5
   - free-categories ==0.2.0.2
   - freenect ==1.2.1
@@ -988,7 +991,7 @@ default-package-overrides:
   - ghc-lib ==8.10.4.20210206
   - ghc-lib-parser ==8.10.4.20210206
   - ghc-lib-parser-ex ==8.10.0.19
-  - ghc-parser ==0.2.2.0
+  - ghc-parser ==0.2.3.0
   - ghc-paths ==0.1.0.12
   - ghc-prof ==1.4.1.8
   - ghc-source-gen ==0.4.0.0
@@ -1081,6 +1084,7 @@ default-package-overrides:
   - hashmap ==1.3.3
   - hashtables ==1.2.4.1
   - haskeline ==0.8.1.2
+  - haskell-awk ==1.2
   - haskell-gi ==0.24.7
   - haskell-gi-base ==0.24.5
   - haskell-gi-overloading ==1.0
@@ -1089,6 +1093,7 @@ default-package-overrides:
   - haskell-lsp ==0.22.0.0
   - haskell-lsp-types ==0.22.0.0
   - haskell-names ==0.9.9
+  - HaskellNet ==0.6
   - haskell-src ==1.0.3.1
   - haskell-src-exts ==1.23.1
   - haskell-src-exts-util ==0.2.5
@@ -1187,15 +1192,15 @@ default-package-overrides:
   - hslua-module-path ==0.1.0.1
   - hslua-module-system ==0.2.2.1
   - hslua-module-text ==0.3.0.1
-  - HsOpenSSL ==0.11.6.2
+  - HsOpenSSL ==0.11.7
   - HsOpenSSL-x509-system ==0.1.0.4
   - hsp ==0.10.0
-  - hspec ==2.7.9
+  - hspec ==2.7.10
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.5.1
-  - hspec-core ==2.7.9
+  - hspec-core ==2.7.10
-  - hspec-discover ==2.7.9
+  - hspec-discover ==2.7.10
   - hspec-expectations ==0.8.2
   - hspec-expectations-json ==1.0.0.3
   - hspec-expectations-lifted ==0.10.0
@@ -1228,7 +1233,7 @@ default-package-overrides:
   - html-entities ==1.1.4.5
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
-  - http2 ==2.0.6
+  - http2 ==3.0.1
   - HTTP ==4000.3.16
   - http-api-data ==0.4.2
   - http-client ==0.6.4.1
@@ -1252,7 +1257,7 @@ default-package-overrides:
   - HUnit-approx ==1.1.1.1
   - hunit-dejafu ==2.0.0.4
   - hvect ==0.4.0.0
-  - hvega ==0.11.0.0
+  - hvega ==0.11.0.1
   - hw-balancedparens ==0.4.1.1
   - hw-bits ==0.7.2.1
   - hw-conduit ==0.2.1.0
@@ -1302,7 +1307,7 @@ default-package-overrides:
   - ieee754 ==0.8.0
   - if ==0.1.0.0
   - iff ==0.0.6
-  - ihaskell ==0.10.1.2
+  - ihaskell ==0.10.2.0
   - ihs ==0.1.0.3
   - ilist ==0.4.0.1
   - imagesize-conduit ==1.1
@@ -1330,7 +1335,7 @@ default-package-overrides:
   - inliterate ==0.1.0
   - input-parsers ==0.2.2
   - insert-ordered-containers ==0.2.4
-  - inspection-testing ==0.4.3.0
+  - inspection-testing ==0.4.4.0
   - instance-control ==0.1.2.0
   - int-cast ==0.2.0.0
   - integer-logarithms ==1.0.3.1
@@ -1356,6 +1361,7 @@ default-package-overrides:
   - io-streams ==1.5.2.0
   - io-streams-haproxy ==1.0.1.0
   - ip6addr ==1.0.2
+  - ipa ==0.3
   - iproute ==1.7.11
   - IPv6Addr ==2.0.2
   - ipynb ==0.1.0.1
@@ -1410,6 +1416,7 @@ default-package-overrides:
   - kind-generics ==0.4.1.0
   - kind-generics-th ==0.2.2.2
   - kmeans ==0.1.3
+  - koji ==0.0.1
   - koofr-client ==1.0.0.3
   - krank ==0.2.2
   - kubernetes-webhook-haskell ==0.2.0.3
@@ -1422,7 +1429,7 @@ default-package-overrides:
   - language-bash ==0.9.2
   - language-c ==0.8.3
   - language-c-quote ==0.12.2.1
-  - language-docker ==9.2.0
+  - language-docker ==9.3.0
   - language-java ==0.2.9
   - language-javascript ==0.7.1.0
   - language-protobuf ==1.0.1
@@ -1440,7 +1447,7 @@ default-package-overrides:
   - lazy-csv ==0.5.1
   - lazyio ==0.1.0.4
   - lca ==0.4
-  - leancheck ==0.9.3
+  - leancheck ==0.9.4
   - leancheck-instances ==0.0.4
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.5
@@ -1470,6 +1477,7 @@ default-package-overrides:
   - lifted-async ==0.10.2
   - lifted-base ==0.2.3.12
   - lift-generics ==0.2
+  - lift-type ==0.1.0.1
   - line ==4.0.1
   - linear ==1.21.5
   - linear-circuit ==0.1.0.2
@@ -1659,7 +1667,7 @@ default-package-overrides:
   - mwc-random ==0.14.0.0
   - mwc-random-monad ==0.7.3.1
   - mx-state-codes ==1.0.0.0
-  - mysql ==0.2
+  - mysql ==0.2.0.1
   - mysql-simple ==0.4.5
   - n2o ==0.11.1
   - nagios-check ==0.3.2
@@ -1689,6 +1697,7 @@ default-package-overrides:
   - network-ip ==0.3.0.3
   - network-messagepack-rpc ==0.1.2.0
   - network-messagepack-rpc-websocket ==0.1.1.1
+  - network-run ==0.2.4
   - network-simple ==0.4.5
   - network-simple-tls ==0.4
   - network-transport ==0.5.4
@@ -1713,9 +1722,9 @@ default-package-overrides:
   - no-value ==1.0.0.0
   - nowdoc ==0.1.1.0
   - nqe ==0.6.3
-  - nri-env-parser ==0.1.0.6
+  - nri-env-parser ==0.1.0.7
-  - nri-observability ==0.1.0.1
+  - nri-observability ==0.1.0.2
-  - nri-prelude ==0.5.0.3
+  - nri-prelude ==0.6.0.0
   - nsis ==0.3.3
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
@@ -1743,7 +1752,7 @@ default-package-overrides:
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.7.1.0
   - OpenAL ==1.7.0.5
-  - openapi3 ==3.0.2.0
+  - openapi3 ==3.1.0
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.2
   - OpenGL ==3.0.3.0
@@ -1777,7 +1786,9 @@ default-package-overrides:
   - pagination ==0.2.2
   - pagure-cli ==0.2
   - pandoc ==2.13
+  - pandoc-dhall-decoder ==0.1.0.1
   - pandoc-plot ==1.1.1
+  - pandoc-throw ==0.1.0.0
   - pandoc-types ==1.22
   - pantry ==0.5.1.5
   - parallel ==3.2.2.0
@@ -1861,7 +1872,7 @@ default-package-overrides:
   - pipes-safe ==2.3.3
   - pipes-wai ==3.2.0
   - pkcs10 ==0.2.0.0
-  - pkgtreediff ==0.4
+  - pkgtreediff ==0.4.1
   - place-cursor-at ==1.0.1
   - placeholders ==0.1
   - plaid ==0.1.0.4
@@ -1874,6 +1885,8 @@ default-package-overrides:
   - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.13
+  - polysemy ==1.5.0.0
+  - polysemy-plugin ==0.3.0.0
   - pooled-io ==0.0.2.2
   - port-utils ==0.2.1.0
   - posix-paths ==0.2.1.6
@@ -1929,7 +1942,7 @@ default-package-overrides:
   - promises ==0.3
   - prompt ==0.1.1.2
   - prospect ==0.1.0.0
-  - proto3-wire ==1.2.0
+  - proto3-wire ==1.2.1
   - protobuf ==0.2.1.3
   - protobuf-simple ==0.1.1.0
   - protocol-buffers ==2.4.17
@@ -1998,7 +2011,7 @@ default-package-overrides:
   - rate-limit ==1.4.2
   - ratel-wai ==1.1.5
   - rattle ==0.2
-  - rattletrap ==11.0.1
+  - rattletrap ==11.1.0
   - Rattus ==0.5
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
@@ -2059,7 +2072,6 @@ default-package-overrides:
   - resolv ==0.1.2.0
   - resource-pool ==0.2.3.2
   - resourcet ==1.2.4.2
-  - resourcet-pool ==0.1.0.0
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
   - retry ==0.8.1.2
@@ -2103,6 +2115,9 @@ default-package-overrides:
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.5
+  - sandwich ==0.1.0.3
+  - sandwich-slack ==0.1.0.3
+  - sandwich-webdriver ==0.1.0.4
   - say ==0.1.0.1
   - sbp ==2.6.3
   - scalpel ==0.6.2
@@ -2146,11 +2161,17 @@ default-package-overrides:
   - serf ==0.1.1.0
   - serialise ==0.2.3.0
   - servant ==0.18.2
+  - servant-auth ==0.4.0.0
+  - servant-auth-client ==0.4.1.0
+  - servant-auth-docs ==0.2.10.0
+  - servant-auth-server ==0.4.6.0
+  - servant-auth-swagger ==0.2.10.1
   - servant-blaze ==0.9.1
   - servant-client ==0.18.2
   - servant-client-core ==0.18.2
   - servant-conduit ==0.15.1
   - servant-docs ==0.11.8
+  - servant-elm ==0.7.2
   - servant-errors ==0.1.6.0
   - servant-exceptions ==0.2.1
   - servant-exceptions-server ==0.2.1
@@ -2158,13 +2179,13 @@ default-package-overrides:
   - servant-http-streams ==0.18.2
   - servant-machines ==0.15.1
   - servant-multipart ==0.12
-  - servant-openapi3 ==2.0.1.1
+  - servant-openapi3 ==2.0.1.2
   - servant-pipes ==0.15.2
   - servant-rawm ==1.0.0.0
   - servant-server ==0.18.2
   - servant-swagger ==1.1.10
-  - servant-swagger-ui ==0.3.4.3.37.2
+  - servant-swagger-ui ==0.3.5.3.47.1
-  - servant-swagger-ui-core ==0.3.4
+  - servant-swagger-ui-core ==0.3.5
   - serverless-haskell ==0.12.6
   - serversession ==1.0.2
   - serversession-frontend-wai ==1.0
@@ -2240,7 +2261,7 @@ default-package-overrides:
   - sop-core ==0.5.0.1
   - sort ==1.0.0.0
   - sorted-list ==0.2.1.0
-  - sourcemap ==0.1.6
+  - sourcemap ==0.1.6.1
   - sox ==0.2.3.1
   - soxlib ==0.0.3.1
   - spacecookie ==1.0.0.0
@@ -2248,7 +2269,7 @@ default-package-overrides:
   - sparse-tensor ==0.2.1.5
   - spatial-math ==0.5.0.1
   - special-values ==0.1.0.0
-  - speculate ==0.4.4
+  - speculate ==0.4.6
   - speedy-slice ==0.3.2
   - Spintax ==0.3.6
   - splice ==0.6.1.1
@@ -2289,7 +2310,7 @@ default-package-overrides:
   - storable-record ==0.0.5
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13.1
-  - store ==0.7.10
+  - store ==0.7.11
   - store-core ==0.4.4.4
   - store-streaming ==0.2.0.3
   - stratosphere ==0.59.1
@@ -2459,7 +2480,7 @@ default-package-overrides:
   - th-test-utils ==1.1.0
   - th-utilities ==0.2.4.3
   - thyme ==0.3.5.5
-  - tidal ==1.7.3
+  - tidal ==1.7.4
   - tile ==0.3.0.0
   - time-compat ==1.9.5
   - timeit ==2.0
@@ -2645,10 +2666,11 @@ default-package-overrides:
   - wai-rate-limit-redis ==0.1.0.0
   - wai-saml2 ==0.2.1.2
   - wai-session ==0.3.3
+  - wai-session-redis ==0.1.0.1
   - wai-slack-middleware ==0.2.0
   - wai-websockets ==3.0.1.2
   - wakame ==0.1.0.0
-  - warp ==3.3.14
+  - warp ==3.3.15
   - warp-tls ==3.3.0
   - warp-tls-uid ==0.2.0.6
   - wave ==0.2.0
@@ -2670,7 +2692,7 @@ default-package-overrides:
   - Win32 ==2.6.1.0
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
-  - witch ==0.0.0.5
+  - witch ==0.2.0.2
   - witherable ==0.4.1
   - within ==0.2.0.1
   - with-location ==0.1.0
@@ -2707,7 +2729,7 @@ default-package-overrides:
   - xlsx-tabular ==0.2.2.1
   - xml ==1.3.14
   - xml-basic ==0.1.3.1
-  - xml-conduit ==1.9.1.0
+  - xml-conduit ==1.9.1.1
   - xml-conduit-writer ==0.1.1.2
   - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0.1
@@ -2726,16 +2748,16 @@ default-package-overrides:
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.11.5.0
   - yamlparse-applicative ==0.1.0.3
-  - yesod ==1.6.1.0
+  - yesod ==1.6.1.1
-  - yesod-auth ==1.6.10.2
+  - yesod-auth ==1.6.10.3
-  - yesod-auth-hashdb ==1.7.1.5
+  - yesod-auth-hashdb ==1.7.1.6
   - yesod-auth-oauth2 ==0.6.3.0
   - yesod-bin ==1.6.1
   - yesod-core ==1.6.19.0
   - yesod-fb ==0.6.1
   - yesod-form ==1.6.7
   - yesod-gitrev ==0.2.1
-  - yesod-markdown ==0.12.6.8
+  - yesod-markdown ==0.12.6.9
   - yesod-newsfeed ==1.7.0.0
   - yesod-page-cursor ==2.0.0.6
   - yesod-paginator ==1.1.1.0
@@ -2857,8 +2879,6 @@ package-maintainers:
   cdepillabout:
     - pretty-simple
     - spago
-  rkrzr:
-    - icepeak
   terlar:
     - nix-diff
   maralorn:
@@ -3195,6 +3215,7 @@ broken-packages:
   - afv
   - ag-pictgen
   - Agata
+  - agda-language-server
   - agda-server
   - agda-snippets
   - agda-snippets-hakyll
@@ -3399,6 +3420,8 @@ broken-packages:
   - asn1-data
   - assert
   - assert4hs
+  - assert4hs-core
+  - assert4hs-hspec
   - assert4hs-tasty
   - assertions
   - asset-map
@@ -3802,6 +3825,7 @@ broken-packages:
   - boring-window-switcher
   - bot
   - botpp
+  - bottom
   - bound-extras
   - bounded-array
   - bowntz
@@ -4027,6 +4051,7 @@ broken-packages:
   - catnplus
   - cautious-file
   - cautious-gen
+  - cayene-lpp
   - cayley-client
   - CBOR
   - CC-delcont-alt
@@ -4305,6 +4330,7 @@ broken-packages:
   - computational-algebra
   - computational-geometry
   - computations
+  - ConClusion
   - concraft
   - concraft-hr
   - concraft-pl
@@ -4879,6 +4905,7 @@ broken-packages:
   - docker
   - docker-build-cacher
   - dockercook
+  - dockerfile-creator
   - docopt
   - docrecords
   - DocTest
@@ -5543,6 +5570,7 @@ broken-packages:
   - funpat
   - funsat
   - funspection
+  - fused-effects-exceptions
   - fused-effects-resumable
   - fused-effects-squeal
   - fused-effects-th
@@ -5612,6 +5640,7 @@ broken-packages:
   - generic-lens-labels
   - generic-lucid-scaffold
   - generic-maybe
+  - generic-optics
   - generic-override-aeson
   - generic-pretty
   - generic-server
@@ -5699,6 +5728,7 @@ broken-packages:
   - ghcup
   - ght
   - gi-cairo-again
+  - gi-gmodule
   - gi-graphene
   - gi-gsk
   - gi-gstaudio
@@ -5708,6 +5738,7 @@ broken-packages:
   - gi-gtksheet
   - gi-handy
   - gi-poppler
+  - gi-vips
   - gi-wnck
   - giak
   - Gifcurry
@@ -5837,8 +5868,10 @@ broken-packages:
   - gpah
   - GPipe
   - GPipe-Collada
+  - GPipe-Core
   - GPipe-Examples
   - GPipe-GLFW
+  - GPipe-GLFW4
   - GPipe-TextureLoad
   - gps
   - gps2htmlReport
@@ -6564,6 +6597,9 @@ broken-packages:
   - hipchat-hs
   - hipe
   - Hipmunk-Utils
+  - hipsql-api
+  - hipsql-client
+  - hipsql-server
   - hircules
   - hirt
   - Hish
@@ -6945,7 +6981,6 @@ broken-packages:
   - htdp-image
   - hTensor
   - htestu
-  - HTF
   - HTicTacToe
   - htiled
   - htlset
@@ -6983,6 +7018,8 @@ broken-packages:
   - http-server
   - http-shed
   - http-wget
+  - http2-client
+  - http2-client-exe
   - http2-client-grpc
   - http2-grpc-proto-lens
   - http2-grpc-proto3-wire
@@ -7093,6 +7130,7 @@ broken-packages:
   - iban
   - ical
   - ice40-prim
+  - icepeak
   - IcoGrid
   - iconv-typed
   - ide-backend
@@ -7274,6 +7312,7 @@ broken-packages:
   - isobmff-builder
   - isohunt
   - isotope
+  - it-has
   - itcli
   - itemfield
   - iter-stats
@@ -8639,6 +8678,7 @@ broken-packages:
   - ois-input-manager
   - olwrapper
   - om-actor
+  - om-doh
   - om-elm
   - om-fail
   - om-http-logging
@@ -8674,7 +8714,6 @@ broken-packages:
   - openai-servant
   - openapi-petstore
   - openapi-typed
-  - openapi3
   - openapi3-code-generator
   - opench-meteo
   - OpenCL
@@ -8728,7 +8767,6 @@ broken-packages:
   - org-mode-lucid
   - organize-imports
   - orgmode
-  - orgstat
   - origami
   - orizentic
   - OrPatterns
@@ -8911,6 +8949,9 @@ broken-packages:
   - perfecthash
   - perhaps
   - periodic
+  - periodic-client
+  - periodic-client-exe
+  - periodic-common
   - periodic-server
   - perm
   - permutation
@@ -9085,7 +9126,10 @@ broken-packages:
   - polynomial
   - polysemy-chronos
   - polysemy-conc
+  - polysemy-extra
+  - polysemy-fskvstore
   - polysemy-http
+  - polysemy-kvstore-jsonfile
   - polysemy-log
   - polysemy-log-co
   - polysemy-log-di
@@ -9097,6 +9141,8 @@ broken-packages:
   - polysemy-resume
   - polysemy-test
   - polysemy-time
+  - polysemy-vinyl
+  - polysemy-zoo
   - polyseq
   - polytypeable
   - polytypeable-utils
@@ -9626,6 +9672,7 @@ broken-packages:
   - remote-monad
   - remotion
   - render-utf8
+  - reorder-expression
   - repa-algorithms
   - repa-array
   - repa-bytestring
@@ -9874,6 +9921,7 @@ broken-packages:
   - scalpel-search
   - scan-metadata
   - scan-vector-machine
+  - scanner-attoparsec
   - scc
   - scenegraph
   - scgi
@@ -9994,6 +10042,7 @@ broken-packages:
   - servant-auth-token-rocksdb
   - servant-auth-wordpress
   - servant-avro
+  - servant-benchmark
   - servant-cassava
   - servant-checked-exceptions
   - servant-checked-exceptions-core
@@ -10028,7 +10077,6 @@ broken-packages:
   - servant-multipart
   - servant-namedargs
   - servant-nix
-  - servant-openapi3
   - servant-pagination
   - servant-pandoc
   - servant-polysemy
@@ -11380,6 +11428,7 @@ broken-packages:
   - vector-clock
   - vector-conduit
   - vector-endian
+  - vector-fftw
   - vector-functorlazy
   - vector-heterogenous
   - vector-instances-collections
@@ -11493,6 +11542,7 @@ broken-packages:
   - wai-session-alt
   - wai-session-mysql
   - wai-session-postgresql
+  - wai-session-redis
   - wai-static-cache
   - wai-thrift
   - wai-throttler
@@ -11502,6 +11552,7 @@ broken-packages:
   - wallpaper
   - warc
   - warp-dynamic
+  - warp-grpc
   - warp-static
   - warp-systemd
   - warped

pkgs/development/libraries/arrow-cpp/default.nix

@@ -1,6 +1,7 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames
+{ stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames
 , autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4
-, perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, zlib, zstd
+, perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, xsimd
+, zlib, zstd
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -15,18 +16,18 @@ let
   parquet-testing = fetchFromGitHub {
     owner = "apache";
     repo = "parquet-testing";
-    rev = "e31fe1a02c9e9f271e4bfb8002d403c52f1ef8eb";
+    rev = "ddd898958803cb89b7156c6350584d1cda0fe8de";
-    sha256 = "02f51dvx8w5mw0bx3hn70hkn55mn1m65kzdps1ifvga9hghpy0sh";
+    sha256 = "0n16xqlpxn2ryp43w8pppxrbwmllx6sk4hv3ycgikfj57nd3ibc0";
   };
 
 in stdenv.mkDerivation rec {
   pname = "arrow-cpp";
-  version = "3.0.0";
+  version = "4.0.0";
 
   src = fetchurl {
     url =
       "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "0yp2b02wrc3s50zd56fmpz4nhhbihp0zw329v4zizaipwlxwrhkk";
+    sha256 = "1bj9jr0pgq9f2nyzqiyj3cl0hcx3c83z2ym6rpdkp59ff2zx0caa";
   };
   sourceRoot = "apache-arrow-${version}/cpp";
 
@@ -90,6 +91,10 @@ in stdenv.mkDerivation rec {
     "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
     "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
     "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"
+    "-DARROW_COMPUTE=ON"
+    "-DARROW_CSV=ON"
+    "-DARROW_DATASET=ON"
+    "-DARROW_JSON=ON"
     "-DARROW_PLASMA=ON"
     # Disable Python for static mode because openblas is currently broken there.
     "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}"
@@ -111,6 +116,8 @@ in stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
   ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF";
 
+  ARROW_XSIMD_URL = xsimd.src;
+
   doInstallCheck = true;
   ARROW_TEST_DATA =
     if doInstallCheck then "${arrow-testing}/data" else null;

pkgs/development/libraries/wxSVG/default.nix

@@ -1,34 +1,43 @@
-{ lib, stdenv, fetchurl
+{ lib
-, pkg-config, wxGTK
+, stdenv
-, ffmpeg_3, libexif
+, fetchurl
-, cairo, pango }:
+, cairo
+, ffmpeg
+, libexif
+, pango
+, pkg-config
+, wxGTK
+}:
 
 stdenv.mkDerivation rec {
-
   pname = "wxSVG";
-  srcName = "wxsvg-${version}";
   version = "1.5.22";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
+    url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/wxsvg-${version}.tar.bz2";
-    sha256 = "0agmmwg0zlsw1idygvqjpj1nk41akzlbdha0hsdk1k8ckz6niq8d";
+    hash = "sha256-DeFozZ8MzTCbhkDBtuifKpBpg7wS7+dbDFzTDx6v9Sk=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
-
+    pkg-config
-  propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ];
+  ];
-
+  buildInputs = [
-  buildInputs = [ cairo pango ];
+    cairo
+    ffmpeg
+    libexif
+    pango
+    wxGTK
+  ];
 
   meta = with lib; {
+    homepage = "http://wxsvg.sourceforge.net/";
     description = "A SVG manipulation library built with wxWidgets";
     longDescription = ''
-    wxSVG is C++ library to create, manipulate and render
+      wxSVG is C++ library to create, manipulate and render Scalable Vector
-    Scalable Vector Graphics (SVG) files with the wxWidgets toolkit.
+      Graphics (SVG) files with the wxWidgets toolkit.
     '';
-    homepage = "http://wxsvg.sourceforge.net/";
+    license = with licenses; gpl2Plus;
-    license = with licenses; gpl2;
     maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; linux;
+    platforms = wxGTK.meta.platforms;
   };
 }

pkgs/development/libraries/xine-lib/default.nix

@@ -1,7 +1,27 @@
-{ lib, stdenv, fetchurl, pkg-config, xorg, alsaLib, libGLU, libGL, aalib
+{ lib
-, libvorbis, libtheora, speex, zlib, perl, ffmpeg_3
+, stdenv
-, flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
+, fetchurl
-, libmpcdec, ncurses
+, fetchpatch
+, aalib
+, alsaLib
+, ffmpeg
+, flac
+, libGL
+, libGLU
+, libcaca
+, libcdio
+, libmng
+, libmpcdec
+, libpulseaudio
+, libtheora
+, libv4l
+, libvorbis
+, perl
+, pkg-config
+, speex
+, vcdimager
+, xorg
+, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -10,27 +30,58 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xine/xine-lib-${version}.tar.xz";
-    sha256 = "01bhq27g5zbgy6y36hl7lajz1nngf68vs4fplxgh98fx20fv4lgg";
+    sha256 = "sha256-71GyHRDdoQRfp9cRvZFxz9rwpaKHQjO88W/98o7AcAU=";
   };
 
-  nativeBuildInputs = [ pkg-config perl ];
+  nativeBuildInputs = [
-
+    pkg-config
+    perl
+  ];
   buildInputs = [
-    xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext
+    aalib
-    alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg_3 flac
+    alsaLib
-    libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ncurses
+    ffmpeg
+    flac
+    libGL
+    libGLU
+    libcaca
+    libcdio
+    libmng
+    libmpcdec
+    libpulseaudio
+    libtheora
+    libv4l
+    libvorbis
+    perl
+    speex
+    vcdimager
+    zlib
+  ] ++ (with xorg; [
+    libX11
+    libXext
+    libXinerama
+    libXv
+    libxcb
+  ]);
+
+  patches = [
+    # splitting path plugin
+    (fetchpatch {
+      name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch";
+      url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/";
+      sha256 = "sha256-LJedxrD8JWITDo9pnS9BCmy7wiPTyJyoQ1puX49tOls=";
+    })
   ];
 
   NIX_LDFLAGS = "-lxcb-shm";
 
-  propagatedBuildInputs = [zlib];
-
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = "http://xine.sourceforge.net/home";
+    homepage = "http://www.xinehq.de/";
     description = "A high-performance, portable and reusable multimedia playback engine";
-    platforms = platforms.linux;
     license = with licenses; [ gpl2Plus lgpl2Plus ];
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.linux;
   };
 }

pkgs/development/libraries/xsimd/default.nix

@@ -0,0 +1,56 @@
+{ lib, stdenv, fetchFromGitHub, cmake, gtest }:
+let
+  version = "7.5.0";
+
+  darwin_src = fetchFromGitHub {
+    owner = "xtensor-stack";
+    repo = "xsimd";
+    rev = version;
+    sha256 = "eGAdRSYhf7rbFdm8g1Tz1ZtSVu44yjH/loewblhv9Vs=";
+    # Avoid requiring apple_sdk. We're doing this here instead of in the patchPhase
+    # because this source is directly used in arrow-cpp.
+    # pyconfig.h defines _GNU_SOURCE to 1, so we need to stamp that out too.
+    # Upstream PR with a better fix: https://github.com/xtensor-stack/xsimd/pull/463
+    postFetch = ''
+      mkdir $out
+      tar -xf $downloadedFile --directory=$out --strip-components=1
+      substituteInPlace $out/include/xsimd/types/xsimd_scalar.hpp \
+        --replace 'defined(__APPLE__)' 0 \
+        --replace 'defined(_GNU_SOURCE)' 0
+    '';
+  };
+
+  src = fetchFromGitHub {
+    owner = "xtensor-stack";
+    repo = "xsimd";
+    rev = version;
+    sha256 = "0c9pq5vz43j99z83w3b9qylfi66mn749k1afpv5cwfxggbxvy63f";
+  };
+in stdenv.mkDerivation {
+  pname = "xsimd";
+  inherit version;
+  src = if stdenv.hostPlatform.isDarwin then darwin_src else src;
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [ "-DBUILD_TESTS=ON" ];
+
+  doCheck = true;
+  checkInputs = [ gtest ];
+  checkTarget = "xtest";
+  GTEST_FILTER = let
+      # Upstream Issue: https://github.com/xtensor-stack/xsimd/issues/456
+      filteredTests = lib.optionals stdenv.hostPlatform.isDarwin [
+        "error_gamma_test/sse_double.gamma"
+        "error_gamma_test/avx_double.gamma"
+      ];
+    in "-${builtins.concatStringsSep ":" filteredTests}";
+
+  meta = with lib; {
+    description = "C++ wrappers for SIMD intrinsics";
+    homepage = "https://github.com/xtensor-stack/xsimd";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ tobim ];
+    platforms = platforms.all;
+  };
+}

pkgs/development/python-modules/pyarrow/default.nix

@@ -34,12 +34,17 @@ buildPythonPackage rec {
     export PYARROW_PARALLEL=$NIX_BUILD_CORES
   '';
 
-  # Deselect a single test because pyarrow prints a 2-line error message where
+  pytestFlagsArray = [
-  # only a single line is expected. The additional line of output comes from
+    # Deselect a single test because pyarrow prints a 2-line error message where
-  # the glog library which is an optional dependency of arrow-cpp that is
+    # only a single line is expected. The additional line of output comes from
-  # enabled in nixpkgs.
+    # the glog library which is an optional dependency of arrow-cpp that is
-  # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
+    # enabled in nixpkgs.
-  pytestFlagsArray = [ "--deselect=pyarrow/tests/test_memory.py::test_env_var" ];
+    # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
+    "--deselect=pyarrow/tests/test_memory.py::test_env_var"
+    # Deselect the parquet dataset write test because it erroneously fails to find the
+    # pyarrow._dataset module.
+    "--deselect=pyarrow/tests/parquet/test_dataset.py::test_write_to_dataset_filesystem"
+  ];
 
   dontUseSetuptoolsCheck = true;
   preCheck = ''

pkgs/development/python-modules/pykeepass/default.nix

@@ -1,15 +1,18 @@
-{ lib, fetchPypi, buildPythonPackage
+{ lib, fetchFromGitHub, buildPythonPackage
 , lxml, pycryptodomex, construct
 , argon2_cffi, dateutil, future
+, python
 }:
 
 buildPythonPackage rec {
   pname   = "pykeepass";
   version = "4.0.0";
 
-  src = fetchPypi {
+  src = fetchFromGitHub {
-    inherit pname version;
+    owner = "libkeepass";
-    sha256 = "1b41b3277ea4e044556e1c5a21866ea4dfd36e69a4c0f14272488f098063178f";
+    repo = "pykeepass";
+    rev = version;
+    sha256 = "1zw5hjk90zfxpgq2fz4h5qzw3kmvdnlfbd32gw57l034hmz2i08v";
   };
 
   postPatch = ''
@@ -21,13 +24,15 @@ buildPythonPackage rec {
     argon2_cffi dateutil future
   ];
 
-  # no tests in PyPI tarball
+  checkPhase = ''
-  doCheck = false;
+    ${python.interpreter} -m unittest tests.tests
+  '';
 
-  meta = {
+  meta = with lib; {
-    homepage = "https://github.com/pschmitt/pykeepass";
+    homepage = "https://github.com/libkeepass/pykeepass";
+    changelog = "https://github.com/libkeepass/pykeepass/blob/${version}/CHANGELOG.rst";
     description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";
-    license = lib.licenses.gpl3;
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ dotlambda ];
   };
-
 }

pkgs/development/tools/analysis/kcov/default.nix

@@ -1,38 +1,84 @@
-{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python3, libiberty, libopcodes}:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, zlib
+, curl
+, elfutils
+, python3
+, libiberty
+, libopcodes
+, runCommand
+, gcc
+, rustc
+}:
 
-stdenv.mkDerivation rec {
+let
-  pname = "kcov";
+  self =
-  version = "36";
+    stdenv.mkDerivation rec {
+      pname = "kcov";
+      version = "38";
 
-  src = fetchFromGitHub {
+      src = fetchFromGitHub {
-    owner = "SimonKagstrom";
+        owner = "SimonKagstrom";
-    repo = "kcov";
+        repo = "kcov";
-    rev = "v${version}";
+        rev = "v${version}";
-    sha256 = "1q1mw5mxz041lr6qc2v4280rmx13pg1bx5r3bxz9bzs941r405r3";
+        sha256 = "sha256-6LoIo2/yMUz8qIpwJVcA3qZjjF+8KEM1MyHuyHsQD38=";
-  };
+      };
 
-  preConfigure = "patchShebangs src/bin-to-c-source.py";
+      preConfigure = "patchShebangs src/bin-to-c-source.py";
-  nativeBuildInputs = [ cmake pkg-config python3 ];
+      nativeBuildInputs = [ cmake pkg-config python3 ];
 
-  buildInputs = [ curl zlib elfutils libiberty libopcodes ];
+      buildInputs = [ curl zlib elfutils libiberty libopcodes ];
 
-  strictDeps = true;
+      strictDeps = true;
 
-  meta = with lib; {
+      passthru.tests = {
-    description = "Code coverage tester for compiled programs, Python scripts and shell scripts";
+        works-on-c = runCommand "works-on-c" {} ''
+          set -ex
+          cat - > a.c <<EOF
+          int main() {}
+          EOF
+          ${gcc}/bin/gcc a.c -o a.out
+          ${self}/bin/kcov /tmp/kcov ./a.out
+          test -e /tmp/kcov/index.html
+          touch $out
+          set +x
+        '';
 
-    longDescription = ''
+        works-on-rust = runCommand "works-on-rust" {} ''
-      Kcov is a code coverage tester for compiled programs, Python
+          set -ex
-      scripts and shell scripts. It allows collecting code coverage
+          cat - > a.rs <<EOF
-      information from executables without special command-line
+          fn main() {}
-      arguments, and continuosly produces output from long-running
+          EOF
-      applications.
+          # Put gcc in the path so that `cc` is found
-    '';
+          PATH=${gcc}/bin:$PATH ${rustc}/bin/rustc a.rs -o a.out
+          ${self}/bin/kcov /tmp/kcov ./a.out
+          test -e /tmp/kcov/index.html
+          touch $out
+          set +x
+        '';
+      };
 
-    homepage = "http://simonkagstrom.github.io/kcov/index.html";
+      meta = with lib; {
-    license = licenses.gpl2;
+        description = "Code coverage tester for compiled programs, Python scripts and shell scripts";
 
-    maintainers = with maintainers; [ gal_bolle ekleog ];
+        longDescription = ''
-    platforms = platforms.linux;
+          Kcov is a code coverage tester for compiled programs, Python
-  };
+          scripts and shell scripts. It allows collecting code coverage
-}
+          information from executables without special command-line
+          arguments, and continuosly produces output from long-running
+          applications.
+        '';
+
+        homepage = "http://simonkagstrom.github.io/kcov/index.html";
+        license = licenses.gpl2;
+        changelog = "https://github.com/SimonKagstrom/kcov/blob/master/ChangeLog";
+
+        maintainers = with maintainers; [ gal_bolle ekleog ];
+        platforms = platforms.linux;
+      };
+    };
+in
+self

pkgs/games/steam/runtime.nix

@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
 
   pname = "steam-runtime";
   # from https://repo.steampowered.com/steamrt-images-scout/snapshots/
-  version = "0.20201203.1";
+  version = "0.20210317.0";
 
   src = fetchurl {
     url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
-    sha256 = "sha256-hOHfMi0x3K82XM3m/JmGYbVk5RvuHG+m275eAC0MoQc=";
+    sha256 = "061z2r33n2017prmhdxm82cly3qp3bma2q70pqs57adl65yvg7vw";
     name = "scout-runtime-${version}.tar.gz";
   };
 

pkgs/misc/emulators/mgba/default.nix

@@ -1,6 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkg-config
+{ lib
-, cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick
+, stdenv
-, qtbase, qtmultimedia, qttools, minizip }:
+, fetchFromGitHub
+, SDL2
+, cmake
+, epoxy
+, ffmpeg
+, imagemagick
+, libedit
+, libelf
+, libzip
+, makeDesktopItem
+, minizip
+, pkg-config
+, qtbase
+, qtmultimedia
+, qttools
+, wrapQtAppsHook
+}:
 
 let
   desktopItem = makeDesktopItem {
@@ -21,14 +37,26 @@ in stdenv.mkDerivation rec {
     owner = "mgba-emu";
     repo = "mgba";
     rev = version;
-    sha256 = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs=";
+    hash = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs=";
   };
 
-  nativeBuildInputs = [ wrapQtAppsHook pkg-config cmake ];
+  nativeBuildInputs = [
-
+    cmake
+    pkg-config
+    wrapQtAppsHook
+  ];
   buildInputs = [
-    epoxy libzip libelf libedit ffmpeg_3 SDL2 imagemagick
+    SDL2
-    qtbase qtmultimedia qttools minizip
+    epoxy
+    ffmpeg
+    imagemagick
+    libedit
+    libelf
+    libzip
+    minizip
+    qtbase
+    qtmultimedia
+    qttools
   ];
 
   postInstall = ''
@@ -38,21 +66,19 @@ in stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://mgba.io";
     description = "A modern GBA emulator with a focus on accuracy";
-
     longDescription = ''
       mGBA is a new Game Boy Advance emulator written in C.
 
-      The project started in April 2013 with the goal of being fast
+      The project started in April 2013 with the goal of being fast enough to
-      enough to run on lower end hardware than other emulators
+      run on lower end hardware than other emulators support, without
-      support, without sacrificing accuracy or portability. Even in
+      sacrificing accuracy or portability. Even in the initial version, games
-      the initial version, games generally play without problems. It
+      generally play without problems. It is loosely based on the previous
-      is loosely based on the previous GBA.js emulator, although very
+      GBA.js emulator, although very little of GBA.js can still be seen in mGBA.
-      little of GBA.js can still be seen in mGBA.
 
-      Other goals include accurate enough emulation to provide a
+      Other goals include accurate enough emulation to provide a development
-      development environment for homebrew software, a good workflow
+      environment for homebrew software, a good workflow for tool-assist
-      for tool-assist runners, and a modern feature set for emulators
+      runners, and a modern feature set for emulators that older emulators may
-      that older emulators may not support.
+      not support.
     '';
 
     license = licenses.mpl20;
@@ -60,3 +86,4 @@ in stdenv.mkDerivation rec {
     platforms = platforms.linux;
   };
 }
+# TODO [ AndersonTorres ]: use desktopItem functions

pkgs/misc/emulators/ppsspp/default.nix

@@ -1,11 +1,11 @@
-{ SDL2
+{ mkDerivation
-, cmake
 , fetchFromGitHub
-, ffmpeg_3
+, SDL2
+, cmake
+, ffmpeg
 , glew
 , lib
 , libzip
-, mkDerivation
 , pkg-config
 , python3
 , qtbase
@@ -23,7 +23,7 @@ mkDerivation rec {
     repo = pname;
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "19948jzqpclf8zfzp3k7s580xfjgqcyfwlcp7x7xj8h8lyypzymx";
+    sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU=";
   };
 
   postPatch = ''
@@ -35,7 +35,7 @@ mkDerivation rec {
 
   buildInputs = [
     SDL2
-    ffmpeg_3
+    ffmpeg
     glew
     libzip
     qtbase
@@ -45,23 +45,25 @@ mkDerivation rec {
   ];
 
   cmakeFlags = [
+    "-DHEADLESS=OFF"
     "-DOpenGL_GL_PREFERENCE=GLVND"
     "-DUSE_SYSTEM_FFMPEG=ON"
     "-DUSE_SYSTEM_LIBZIP=ON"
     "-DUSE_SYSTEM_SNAPPY=ON"
     "-DUSING_QT_UI=ON"
-    "-DHEADLESS=OFF"
   ];
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/share/ppsspp
     install -Dm555 PPSSPPQt $out/bin/ppsspp
     mv assets $out/share/ppsspp
+    runHook postInstall
   '';
 
   meta = with lib; {
-    description = "A HLE Playstation Portable emulator, written in C++";
     homepage = "https://www.ppsspp.org/";
+    description = "A HLE Playstation Portable emulator, written in C++";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.linux;

pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix

@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "rtl88xxau-aircrack-${kernel.version}-${version}";
-  rev = "fc0194c1d90453bf4943089ca237159ef19a7374";
+  rev = "c0ce81745eb3471a639f0efd4d556975153c666e";
   version = "${builtins.substring 0 6 rev}";
 
   src = fetchFromGitHub {
     owner = "aircrack-ng";
     repo = "rtl8812au";
     inherit rev;
-    sha256 = "0hf7mrvxaskc6qcjar5w81y9xc7s2rlsxp34achyqly2hjg7fgmy";
+    sha256 = "131cwwg3czq0i1xray20j71n836g93ac064nvf8wi13c2wr36ppc";
   };
 
   buildInputs = kernel.moduleBuildDependencies;

pkgs/servers/maddy/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "maddy";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "foxcpp";
     repo = "maddy";
     rev = "v${version}";
-    sha256 = "1mi607hl4c9y9xxv5lywh9fvpybprlrgqa7617km9rssbgk4x1v7";
+    sha256 = "sha256-IhVEb6tjfbWqhQdw1UYxy4I8my2L+eSOCd/BEz0qis0=";
   };
 
-  vendorSha256 = "16laf864789yiakvqs6dy3sgnnp2hcdbyzif492wcijqlir2swv7";
+  vendorSha256 = "sha256-FrKWlZ3pQB+oo+rfHA8AgGRAr7YRUcb064bZGTDSKkk=";
 
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ];
 

pkgs/servers/sql/postgresql/ext/pgvector.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgvector";
-  version = "0.1.0";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "ankane";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03i8rq9wp9j2zdba82q31lzbrqpnhrqc8867pxxy3z505fxsvfzb";
+    sha256 = "1vq672ghhv0azpzgfb7azb36kbjyz9ypcly7r16lrryvjgp5lcjs";
   };
 
   buildInputs = [ postgresql ];
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Open-source vector similarity search for PostgreSQL";
     homepage = "https://github.com/ankane/pgvector";
+    changelog = "https://github.com/ankane/pgvector/raw/v${version}/CHANGELOG.md";
     license = licenses.postgresql;
     platforms = postgresql.meta.platforms;
     maintainers = [ maintainers.marsam ];

pkgs/tools/networking/lldpd/default.nix

@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lldpd";
-  version = "1.0.8";
+  version = "1.0.10";
 
   src = fetchurl {
     url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
-    sha256 = "sha256-mNIA524w9iYsSkSTFIwYQIJ4mDKRRqV6NPjw+SjKPe8=";
+    sha256 = "sha256-RFstdgN+8+vQPUDh/B8p7wgQL6o6Cf6Ea5Unl8i8dyI=";
   };
 
   configureFlags = [

pkgs/tools/nix/nix-output-monitor/default.nix

@@ -5,11 +5,11 @@
 }:
 mkDerivation rec {
   pname = "nix-output-monitor";
-  version = "1.0.3.0";
+  version = "1.0.3.1";
   src = fetchFromGitHub {
     owner = "maralorn";
     repo = "nix-output-monitor";
-    sha256 = "1gidg03cwz8ss370bgz4a2g9ldj1lap5ws7dmfg6vigpx8mxigpb";
+    sha256 = "1kkf6cqq8aba8vmfcww30ah9j44bwakanyfdb6595vmaq5hrsq92";
     rev = "v${version}";
   };
   isLibrary = true;

pkgs/tools/package-management/cargo-deb/default.nix

@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deb";
-  version = "1.29.1";
+  version = "1.29.2";
 
   src = fetchFromGitHub {
     owner = "mmstick";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-oWivGy2azF9zpeZ0UAi7Bxm4iXFWAjcBG0pN7qtkSU8=";
+    sha256 = "sha256-2eOWhxKZ+YPj5oKTe5g7PyeakiSNnPz27dK150GAcVQ=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "0j9frvcmy9hydw73v0ffr0bjvq2ykylnpmiw700z344djpaaa08y";
+  cargoSha256 = "sha256-QmchuY+4R7w0zMOdReH1m8idl9RI1hHE9VtbwT2K9YM=";
 
   preCheck = ''
     substituteInPlace tests/command.rs \

pkgs/tools/security/pass/extensions/import.nix

@@ -17,9 +17,14 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA=";
   };
 
-  # by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..."
-  # This is a better way to do the same, and takes advantage of the existing Nix python environments
   patches = [
+    (fetchpatch {
+      name = "support-for-keepass-4.0.0.patch";
+      url = "https://github.com/roddhjav/pass-import/commit/86cfb1bb13a271fefe1e70f24be18e15a83a04d8.patch";
+      sha256 = "0mrlblqlmwl9gqs2id4rl4sivrcclsv6zyc6vjqi78kkqmnwzhxh";
+    })
+    # by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..."
+    # This is a better way to do the same, and takes advantage of the existing Nix python environments
     # from https://github.com/roddhjav/pass-import/pull/138
     (fetchpatch {
       name = "pass-import-pr-138-pimport-entrypoint.patch";

pkgs/tools/system/logcheck/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "logcheck";
-  version = "1.3.22";
+  version = "1.3.23";
   _name    = "logcheck_${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
-    sha256 = "sha256-e7XeRNlFsexlVskK2OnLTmNV/ES2xWU+/+AElexV6E4=";
+    sha256 = "sha256-ohiLpUn/9EEsggdLJxiE/2bSXz/bKkGRboF85naFWyk=";
   };
 
   prePatch = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       Logcheck was part of the Abacus Project of security tools, but this version has been rewritten.
     '';
     homepage = "https://salsa.debian.org/debian/logcheck";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     maintainers = [ maintainers.bluescreen303 ];
   };
 }

pkgs/top-level/aliases.nix

@@ -853,6 +853,8 @@ mapAliases ({
   xbmcPlain = kodiPlain; # added 2018-04-25
   xbmcPlugins = kodiPackages; # added 2018-04-25
   kodiPlugins = kodiPackages; # added 2021-03-09;
+  xineLib = xine-lib; # added 2021-04-27
+  xineUI = xine-ui; # added 2021-04-27
   xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
   xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
   pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";

pkgs/top-level/all-packages.nix

@@ -18097,7 +18097,7 @@ in
 
   xed = callPackage ../development/libraries/xed { };
 
-  xineLib = callPackage ../development/libraries/xine-lib { };
+  xine-lib = callPackage ../development/libraries/xine-lib { };
 
   xautolock = callPackage ../misc/screensavers/xautolock { };
 
@@ -18127,6 +18127,8 @@ in
 
   xlslib = callPackage ../development/libraries/xlslib { };
 
+  xsimd = callPackage ../development/libraries/xsimd { };
+
   xvidcore = callPackage ../development/libraries/xvidcore { };
 
   xxHash = callPackage ../development/libraries/xxHash {};
@@ -27159,7 +27161,7 @@ in
 
   xfractint = callPackage ../applications/graphics/xfractint {};
 
-  xineUI = callPackage ../applications/video/xine-ui { };
+  xine-ui = callPackage ../applications/video/xine-ui { };
 
   xlsxgrep = callPackage ../applications/search/xlsxgrep { };