Merge master into staging-next

2021-03-14 00:41:40 +00:00 · 2021-03-14 00:41:40 +00:00 · c596c93079
commit c596c93079
parent 01a4d350c7 86c7e9297d
49 changed files with 124 additions and 105 deletions
--- a/pkgs/applications/misc/deadd-notification-center/default.nix
+++ b/pkgs/applications/misc/deadd-notification-center/default.nix
@ -7,19 +7,25 @@
 , gtk3
 , gobject-introspection
 , libxml2
+, fetchpatch
 }:
 stdenv.mkDerivation rec {
  pname = "deadd-notification-center";
-  version = "1.7.3";
+  version = "2021-03-10";

  src = fetchFromGitHub {
    owner = "phuhl";
    repo = "linux_notification_center";
-    rev = version;
-    sha256 = "QaOLrtlhQyhMOirk6JO1yMGRrgycHmF9FAdKNbN2TRk=";
+    rev = "640ce0f";
+    sha256 = "12ldr8vppylr90849g3mpjphmnr4lp0vsdkj01a5f4bv4ksx35fm";
  };

-  dontUnpack = true;
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/phuhl/linux_notification_center/commit/5244e1498574983322be97925e1ff7ebe456d974.patch";
+      sha256 = "sha256-hbqbgBmuewOhtx0na2tmFa5W128ZrBvDcyPme/mRzlI=";
+    })
+  ];

  nativeBuildInputs = [
    autoPatchelfHook
@ -33,15 +39,18 @@ stdenv.mkDerivation rec {
    hicolor-icon-theme
  ];

-  installPhase = ''
-    mkdir -p $out/bin $out/share/dbus-1/services
+  buildFlags = [
+    # Exclude stack from `make all` to use the prebuilt binary from .out/
+    "service"
+  ];

-    cp $src/.out/${pname} $out/bin/
-    chmod +x $out/bin/${pname}
-
-    sed "s|##PREFIX##|$out|g" $src/${pname}.service.in > \
-      $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service
-  '';
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "SERVICEDIR_SYSTEMD=${placeholder "out"}/etc/systemd/user"
+    "SERVICEDIR_DBUS=${placeholder "out"}/share/dbus-1/services"
+    # Override systemd auto-detection.
+    "SYSTEMD=1"
+  ];

  meta = with lib; {
    description = "A haskell-written notification center for users that like a desktop with style";
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@ -19,24 +19,29 @@
 }:

 mkDerivation rec {
-  version = "1.1.2";
+  version = "1.1.3";
  pname = "syncthingtray";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = "syncthingtray";
    rev = "v${version}";
-    sha256 = "sha256-I5QhnYp4ga3ERJ3w4qjh5gFFU+S1Htw26vHK/2M8j5s=";
+    sha256 = "sha256-ovit2XSkxSjcbpqQUv8IzMqfsfItbtXLbx0/Vy0+J0Y=";
  };

  buildInputs = [ qtbase cpp-utilities qtutilities ]
    ++ lib.optionals webviewSupport [ qtwebengine ]
    ++ lib.optionals jsSupport [ qtdeclarative ]
    ++ lib.optionals kioPluginSupport [ kio ]
-    ++ lib.optionals plasmoidSupport [ extra-cmake-modules plasma-framework ]
+    ++ lib.optionals plasmoidSupport [ plasma-framework ]
  ;

-  nativeBuildInputs = [ cmake qttools ];
+  nativeBuildInputs = [
+    cmake
+    qttools
+  ]
+    ++ lib.optionals plasmoidSupport [ extra-cmake-modules ]
+  ;

  # No tests are available by upstream, but we test --help anyway
  doInstallCheck = true;
@ -56,7 +61,7 @@ mkDerivation rec {
  meta = with lib; {
    homepage = "https://github.com/Martchus/syncthingtray";
    description = "Tray application and Dolphin/Plasma integration for Syncthing";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ doronbehar ];
    platforms = platforms.linux;
  };
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -1,8 +1,8 @@
 {
  "stable": {
-    "version": "89.0.4389.82",
-    "sha256": "0yg33d6zldz3j1jghhdci63fn46i10dkz3nb95jdrbv8gd018jfz",
-    "sha256bin64": "1sqzzillq38qyh85449ncz8bni93mjxb6r4z8y5h8k2w3j38jc0q",
+    "version": "89.0.4389.90",
+    "sha256": "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi",
+    "sha256bin64": "1hgpx7isp9krarj7jpbhs97ym4i9j9a1srywv9pdfzbhw6cid2pk",
    "deps": {
      "gn": {
        "version": "2021-01-07",
--- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "zulip-term";
-  version = "0.5.2";
+  version = "0.6.0";

  # no tests on PyPI
  src = fetchFromGitHub {
    owner = "zulip";
    repo = "zulip-terminal";
    rev = version;
-    sha256 = "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf";
+    sha256 = "sha256-nlvZaGMVRRCu8PZHxPWjNSxkqhZs0T/tE1js/3pDUFk=";
  };

  patches = [
@ -26,7 +26,9 @@ python3.pkgs.buildPythonApplication rec {
    urwid-readline
    beautifulsoup4
    lxml
-    mypy-extensions
+    typing-extensions
+    python-dateutil
+    tzlocal
  ];

  checkInputs = [
--- a/pkgs/development/guile-modules/guile-opengl/default.nix
+++ b/pkgs/development/guile-modules/guile-opengl/default.nix
@ -18,6 +18,6 @@ in stdenv.mkDerivation {
    homepage = "https://www.gnu.org/software/guile-opengl/";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ vyp ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
      CLucene is a port of the very popular Java Lucene text search engine API.
    '';
    homepage = "http://clucene.sourceforge.net";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    license = with licenses; [ asl20 lgpl2 ];
  };
 }
--- a/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/pkgs/development/libraries/gtkdatabox/default.nix
@ -17,6 +17,6 @@ stdenv.mkDerivation rec {

    license = lib.licenses.lgpl2;

-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, libiconv }:

 stdenv.mkDerivation rec {
  pname = "htmlcxx";
@ -9,12 +9,13 @@ stdenv.mkDerivation rec {
    sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";
  };

+  buildInputs = [ libiconv ];
  patches = [ ./ptrdiff.patch ];

  meta = with lib; {
    homepage = "http://htmlcxx.sourceforge.net/";
    description = "A simple non-validating css1 and html parser for C++";
    license = licenses.lgpl2;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/kissfft/default.nix
+++ b/pkgs/development/libraries/kissfft/default.nix
@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
    })
  ];

+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "gcc" "${stdenv.cc.targetPrefix}cc" \
+      --replace "ar" "${stdenv.cc.targetPrefix}ar"
+  '';
  makeFlags = [
    "PREFIX=${placeholder "out"}"
    "DATATYPE=double"
@ -40,6 +45,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/mborgerding/kissfft";
    license = licenses.bsd3;
    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/levmar/default.nix
+++ b/pkgs/development/libraries/levmar/default.nix
@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
  };

  patchPhase = ''
-    sed -i 's/define HAVE_LAPACK/undef HAVE_LAPACK/' levmar.h
+    substituteInPlace levmar.h --replace "define HAVE_LAPACK" "undef HAVE_LAPACK"
    sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile
+    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
  '';

  installPhase = ''
@ -23,6 +24,6 @@ stdenv.mkDerivation rec {
    description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
    homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
  };
 }
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@ -18,7 +18,7 @@ stdenv.mkDerivation {
    homepage = "https://github.com/Pulse-Eight/platform";
    repositories.git = "https://github.com/Pulse-Eight/platform.git";
    license = lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = [ maintainers.titanous ];
  };
 }
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@ -20,12 +20,12 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ];

  meta = with lib; {
    description = "Emulate a Cisco-style telnet command-line interface";
    homepage = "http://sites.dparrish.com/libcli";
    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/libcredis/default.nix
+++ b/pkgs/development/libraries/libcredis/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation {
    description = "C client library for Redis (key-value database)";
    homepage = "https://code.google.com/archive/p/credis/";
    license = licenses.bsd3; # from homepage
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = [ maintainers.bjornfor ];
  };
 }
--- a/pkgs/development/libraries/libcsptr/default.nix
+++ b/pkgs/development/libraries/libcsptr/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    description = "Smart pointer constructs for the (GNU) C programming language";
    homepage = "https://github.com/Snaipe/libcsptr";
    license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = platforms.all;
    maintainers = [ maintainers.fragamus ];
  };
 }
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/EasyRPG/liblcf";
    license = licenses.mit;
    maintainers = with maintainers; [ yegortimoshenko ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
    sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
  };

+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "gcc" "${stdenv.cc.targetPrefix}cc" \
+      --replace "ar" "${stdenv.cc.targetPrefix}ar"
+  '';
+
  makeFlags = [ "INSTALLPREFIX=$(out)" ];

  meta = with lib; {
@ -17,6 +23,6 @@ stdenv.mkDerivation rec {
    description = "NAT-PMP client";
    license = licenses.bsd3;
    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/libnest2d/default.nix
+++ b/pkgs/development/libraries/libnest2d/default.nix
@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
      "2D irregular bin packaging and nesting library written in modern C++";
    homepage = "https://github.com/Ultimaker/libnest2d";
    license = licenses.lgpl3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  '';

  meta = with lib; {
-    platforms = platforms.linux;
+    platforms = platforms.all;
    description = "C library implementing the OAuth secure authentication protocol";
    homepage = "http://liboauth.sourceforge.net/";
    repositories.git = "https://github.com/x42/liboauth.git";
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation {
    description = "Library for rasterizing 2-D vector graphics";
    homepage = "https://www.gnu.org/software/libxmi/";
    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice
+    platforms = lib.platforms.unix;
    maintainers = [ ];
  };
 }
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
      Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).
    '';
    license     = licenses.lgpl21Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.all;
  };

  src = fetchurl {
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
    '';
    maintainers = [ maintainers.AndersonTorres ];
    license = licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
  };
 }
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "A lightweight C library for the Jabber protocol";
-    platforms = platforms.linux;
+    platforms = platforms.all;
    downloadPage = "http://mcabber.com/files/loudmouth/";
    downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$";
    updateWalker = true;
--- a/pkgs/development/libraries/lrdf/default.nix
+++ b/pkgs/development/libraries/lrdf/default.nix
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
    homepage = "https://sourceforge.net/projects/lrdf/";
    license = lib.licenses.gpl2;
    maintainers = [ lib.maintainers.marcweber ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/development/libraries/metal/default.nix
+++ b/pkgs/development/libraries/metal/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/brunocodutra/metal";
    license = licenses.mit;
    maintainers = with maintainers; [ pmiddend ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };

 }
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    description = "A small XML library";
    homepage = "https://www.msweet.org/mxml/";
    license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = [ maintainers.goibhniu ];
  };
 }
--- a/pkgs/development/libraries/msgpuck/default.nix
+++ b/pkgs/development/libraries/msgpuck/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "A simple and efficient MsgPack binary serialization library in a self-contained header file";
     homepage = "https://github.com/rtsisyk/msgpuck";
     license = licenses.bsd2;
-     platforms = platforms.linux;
+     platforms = platforms.all;
     maintainers = with maintainers; [ izorkin ];
 };
 }
--- a/pkgs/development/libraries/orcania/default.nix
+++ b/pkgs/development/libraries/orcania/default.nix
@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, cmake, check, subunit }:
 stdenv.mkDerivation rec {
  pname = "orcania";
-  version = "2.1.1";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "babelouest";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0l035zbzyv623h5186rk6iq1097rxx64iwnk4s2c7l9gzv9wyapp";
+    sha256 = "sha256-tArXiXmoWHd42IGBZKtc4QJIBy3USPlSeW+Dv5xl1EU=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    homepage = "https://www.gnu.org/software/osip/";
    description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
    maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
    inherit version;
  };
 }
--- a/pkgs/development/libraries/pxlib/default.nix
+++ b/pkgs/development/libraries/pxlib/default.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    description = "Library to read and write Paradox files";
    homepage = "http://pxlib.sourceforge.net/";
    license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = [ maintainers.winpat ];
  };
 }
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    description = "File open routines to safely open a file when in the presence of an attack";
    license = lib.licenses.asl20 ;
    maintainers = [lib.maintainers.raskin];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
    homepage = "https://research.cs.wisc.edu/mist/safefile/";
    updateWalker = true;
  };
--- a/pkgs/development/libraries/shhmsg/default.nix
+++ b/pkgs/development/libraries/shhmsg/default.nix
@ -8,13 +8,16 @@ stdenv.mkDerivation rec {
    sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8";
  };

+  postPatch = ''
+    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
+  '';
+
  installFlags = [ "INSTBASEDIR=$(out)" ];

  meta = with lib; {
    description = "A library for displaying messages";
    homepage = "https://shh.thathost.com/pub-unix/";
    license = licenses.artistic1;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
-
--- a/pkgs/development/libraries/shhopt/default.nix
+++ b/pkgs/development/libraries/shhopt/default.nix
@ -8,12 +8,16 @@ stdenv.mkDerivation rec {
    sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds";
  };

+  postPatch = ''
+    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
+  '';
+
  installFlags = [ "INSTBASEDIR=$(out)" ];

  meta = with lib; {
    description = "A library for parsing command line options";
    homepage = "https://shh.thathost.com/pub-unix/";
    license = licenses.artistic1;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/spglib/default.nix
+++ b/pkgs/development/libraries/spglib/default.nix
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
    homepage = "https://atztogo.github.io/spglib/";
    license = licenses.bsd3;
    maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
    homepage = "https://www.spice-space.org/";
    license = licenses.bsd3;
    maintainers = with maintainers; [ bluescreen303 ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/pkgs/development/libraries/tidyp/default.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "A program that can validate your HTML, as well as modify it to be more clean and standard";
    homepage = "http://tidyp.com/";
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = with maintainers; [ pSub ];
    license = licenses.bsd3;
  };
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@ -13,14 +13,14 @@
 # TODO: bzr support is missing because nixpkgs switched to `breezy`

 buildPythonPackage rec {
-  version  = "2.8.1";
+  version  = "2.8.2";
  pname = "powerline";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = version;
-    sha256 = "0xscckcbw75pbcl4546ndrjs4682pn2sqqrd6qvqm0s6zswg7a0y";
+    sha256 = "sha256-6V8ozl5KJQvytfflBmKJlIZQ5m3hkpCzMBtWZ2SzcQ0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
    '';
    homepage = "http://coan2.sourceforge.net/";
    license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
    description = "Exploit Development and Reverse Engineering with GDB Made Easy";
    homepage = "https://github.com/pwndbg/pwndbg";
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = with maintainers; [ mic92 ];
  };
 }
--- a/pkgs/development/tools/renderizer/default.nix
+++ b/pkgs/development/tools/renderizer/default.nix
@ -2,18 +2,20 @@

 buildGoModule rec {
  pname = "renderizer";
-  version = "2.0.9";
+  version = "2.0.12";

  src = fetchFromGitHub {
    owner = "gomatic";
    repo = pname;
-    rev = version;
-    sha256 = "1bip12pcn8bqgph7vd7bzzadwbyqh80fx7gqciv9fchycwsj04rf";
+    rev = "v${version}";
+    sha256 = "sha256-Ji+wTTXLp17EYRIjUiVgd33ZeBdT8K2O8R2Ejq2Ll5I=";
  };

-  vendorSha256 = "13z357ww4j5bmmy8ag6d6gd5b2dib8kby73q8317pqnqzaxrrbcj";
+  buildFlagsArray = [
+    "-ldflags=-s -w -X main.version=${version} -X main.commitHash=${src.rev} -X main.date=19700101T000000"
+  ];

-  doCheck = false;
+  vendorSha256 = null;

  meta = with lib; {
    description = "CLI to render Go template text files";
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
      homepage = "http://www.vassalengine.org/";
      license = licenses.lgpl21Only;
      maintainers = with maintainers; [ tvestelind ];
-      platforms = platforms.linux;
+      platforms = platforms.unix;
  };
 }
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "fatrace";
-  version = "0.16.1";
+  version = "0.16.2";

  src = fetchFromGitHub {
    owner = "martinpitt";
    repo = pname;
    rev = version;
-    sha256 = "0lxfqin2bw9235yah8ylb4p8lc3755050sjg30z3gy7bab0lfyg9";
+    sha256 = "sha256-1daYCVGz8Zd42j2QMFL5EAULKkmBnbE828i5NV9Kcb8=";
  };

  buildInputs = [ python3 which ];
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@ -7,8 +7,8 @@ stdenv.mkDerivation {
  src = fetchFromGitHub {
    owner = "lhmouse";
    repo = "mcfgthread";
-    rev = "9570e5ca7b98002d707c502c919d951bf256b9c6";
-    sha256 = "10y2x3x601a7c1hkd6zlr3xpfsnlr05xl28v23clf619756a5755";
+    rev = "c446cf4fcdc262fc899a188a4bb7136284c34222";
+    sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f";
  };

  outputs = [ "out" "dev" ];
@ -18,10 +18,6 @@ stdenv.mkDerivation {
    rm -r "$sourceRoot/debug" "$sourceRoot/release"
  '';

-  postPatch = ''
-    substituteInPlace Makefile.am --replace '-Werror' ""
-  '';
-
  nativeBuildInputs = [
    autoreconfHook
  ];
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@ -4,8 +4,8 @@
 let platformString = if stdenv.isDarwin then "osx"
                     else if stdenv.isLinux then "linux"
                     else throw "unsupported platform";
-    platformSha = if stdenv.isDarwin then "0zv02h3njphrs8kgmicy7w40mmhmigdfl38f2dpwrs6z67f8vrm2"
-                     else if stdenv.isLinux then "0dka2q8ijg3ryzwmxapf8aq55d0sgaj6jj0rzj2738in9g4w2hbh"
+    platformSha = if stdenv.isDarwin then "0w44ws8b6zfixf7xz93hmplqsx18279n9x8j77y4rbzs13fldvsn"
+                     else if stdenv.isLinux then "0xm7l49zhkz2fly3d751kjd5cy3ws9zji9i0061lkd06dvkch7jy"
                     else throw "unsupported platform";
    platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
                     else if stdenv.isLinux then "LD_LIBRARY_PATH"
@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx"
 in
 stdenv.mkDerivation rec {
  pname = "powershell";
-  version = "7.1.0";
+  version = "7.1.3";

  src = fetchzip {
    url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "eksctl";
-  version = "0.39.0";
+  version = "0.40.0";

  src = fetchFromGitHub {
    owner = "weaveworks";
    repo = pname;
    rev = version;
-    sha256 = "sha256-mq1/e9FW0jP6dY6zCBlPz5dBidKLS6IROBKESfHDvPI=";
+    sha256 = "sha256-2kxJcQ0kzIbXUSecDR5CRlgp0y59wftFPUwU1MSHOn0=";
  };

-  vendorSha256 = "sha256-ANOeU3cFSwLcpdbpApM+j4r296ZGj/tuDV8oiMA7kMo=";
+  vendorSha256 = "sha256-m+qldNgY3+DKTFjxwKo4Sbi0F7y4xomiIuR+apek61Q=";

  doCheck = false;

--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@ -22,9 +22,7 @@ stdenv.mkDerivation rec {

  patches = [
    ./playtests-darwin.patch
-  ] # This I didn't upstream because if you use posix threads with MinGW it will
-    # work fine, and I'm not sure how to write the condition.
-    ++ lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch;
+  ];

  postPatch = lib.optionalString (!static) ''
    substituteInPlace build/cmake/CMakeLists.txt \
--- a/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch
+++ b/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch
@ -1,13 +0,0 @@
-diff --git a/programs/Makefile b/programs/Makefile
-index 7882fe8c..1e8237bb 100644
--- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -107,7 +107,7 @@ HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS
- ifeq ($(HAVE_THREAD), 1)
- THREAD_MSG := ==> building with threading support
- THREAD_CPP := -DZSTD_MULTITHREAD
-THREAD_LD := -pthread
-+THREAD_LD :=
- else
- THREAD_MSG := $(NO_THREAD_MSG)
- endif
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "fzf";
-  version = "0.25.1";
+  version = "0.26.0";

  src = fetchFromGitHub {
    owner = "junegunn";
    repo = pname;
    rev = version;
-    sha256 = "085apa4msw8v8f57942xh7wfw3dkavrl9d58yj6i3yr75l3vg05r";
+    sha256 = "0p9hslaawnqnnf1s6hj3vdh11ncq7mrb4w4i933mdkychw5jav38";
  };

  vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
--- a/pkgs/tools/networking/kapp/default.nix
+++ b/pkgs/tools/networking/kapp/default.nix
@ -1,13 +1,13 @@
 { lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
  pname = "kapp";
-  version = "0.35.0";
+  version = "0.36.0";

  src = fetchFromGitHub {
    owner = "vmware-tanzu";
    repo = "carvel-kapp";
    rev = "v${version}";
-    sha256 = "1i4hpqpbwqb0yg3rx4z733zfslq3svmahfr39ss1ydylsipl02mg";
+    sha256 = "sha256-hYKRfAnpHw8hHT70sOQSGlDj0dgzU0wlZpXA5f2BBfg=";
  };

  vendorSha256 = null;
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  pname = "fio";
-  version = "3.25";
+  version = "3.26";

  src = fetchFromGitHub {
    owner  = "axboe";
    repo   = "fio";
    rev    = "fio-${version}";
-    sha256 = "1f20ihynwnz8jqqlr73i5glr8ziplz4mmcjgk340mj2yqqcnsqag";
+    sha256 = "sha256-/Si0McndJ6Xp3ifDr+BStv89LmZyAgof95QkHGT8MGQ=";
  };

  buildInputs = [ python zlib ]