Merge staging-next into staging

.github/CODEOWNERS

@@ -298,9 +298,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /doc/languages-frameworks/javascript.section.md @winterqt
 
 # OCaml
-/pkgs/build-support/ocaml           @romildo @ulrikstrid
+/pkgs/build-support/ocaml           @ulrikstrid
-/pkgs/development/compilers/ocaml   @romildo @ulrikstrid
+/pkgs/development/compilers/ocaml   @ulrikstrid
-/pkgs/development/ocaml-modules     @romildo @ulrikstrid
+/pkgs/development/ocaml-modules     @ulrikstrid
 
 # ZFS
 pkgs/os-specific/linux/zfs                @raitobezarius

maintainers/maintainer-list.nix

@@ -2222,6 +2222,13 @@
     githubId = 68566724;
     name = "bootstrap-prime";
   };
+  boozedog = {
+    email = "code@booze.dog";
+    github = "boozedog";
+    githubId = 1410808;
+    matrix = "@boozedog:matrix.org";
+    name = "David A. Buser";
+  };
   borisbabic = {
     email = "boris.ivan.babic@gmail.com";
     github = "borisbabic";

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

@@ -201,7 +201,7 @@ In addition to numerous new and updated packages, this release has the following
 
 - `graylog` has been updated to version 5, which can not be updated directly from the previously packaged version 3.3. If you had installed the previously packaged version 3.3, please follow the [upgrade path](https://go2docs.graylog.org/5-0/upgrading_graylog/upgrade_path.htm) from 3.3 to 4.0 to 4.3 to 5.0.
 
-- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.
+- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChroot` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.
 
 - `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch).
 

nixos/modules/services/web-apps/openvscode-server.nix

@@ -4,7 +4,8 @@ let
   cfg = config.services.openvscode-server;
   defaultUser = "openvscode-server";
   defaultGroup = defaultUser;
-in {
+in
+{
   options = {
     services.openvscode-server = {
       enable = lib.mkEnableOption (lib.mdDoc "openvscode-server");
@@ -126,12 +127,12 @@ in {
       };
 
       telemetryLevel = lib.mkOption {
-        default = "off";
+        default = null;
         example = "crash";
         description = lib.mdDoc ''
           Sets the initial telemetry level. Valid levels are: 'off', 'crash', 'error' and 'all'.
         '';
-        type = lib.types.str;
+        type = lib.types.nullOr (lib.types.enum [ "off" "crash" "error" "all" ]);
       };
 
       connectionToken = lib.mkOption {
@@ -167,9 +168,9 @@ in {
             --accept-server-license-terms \
             --host=${cfg.host} \
             --port=${toString cfg.port} \
-          '' + lib.optionalString (cfg.telemetryLevel == true) ''
+        '' + lib.optionalString (cfg.telemetryLevel != null) ''
           --telemetry-level=${cfg.telemetryLevel} \
-          '' + lib.optionalString (cfg.withoutConnectionToken == true) ''
+        '' + lib.optionalString (cfg.withoutConnectionToken) ''
           --without-connection-token \
         '' + lib.optionalString (cfg.socketPath != null) ''
           --socket-path=${cfg.socketPath} \

nixos/tests/matomo.nix

@@ -41,10 +41,10 @@ let
 in {
   matomo = matomoTest pkgs.matomo // {
     name = "matomo";
-    meta.maintainers = with maintainers; [ florianjacob kiwi mmilata ];
+    meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ];
   };
   matomo-beta = matomoTest pkgs.matomo-beta // {
     name = "matomo-beta";
-    meta.maintainers = with maintainers; [ florianjacob kiwi mmilata ];
+    meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ];
   };
 }

pkgs/applications/audio/tauon/default.nix

@@ -10,6 +10,7 @@
 , gobject-introspection
 , gtk3
 , kissfft
+, libappindicator
 , libnotify
 , libsamplerate
 , libvorbis
@@ -75,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     flac
     gobject-introspection
     gtk3
+    libappindicator
     libnotify
     libopenmpt
     librsvg

pkgs/applications/backup/timeshift/unwrapped.nix

@@ -2,9 +2,11 @@
 , stdenv
 , fetchFromGitHub
 , gettext
+, help2man
+, meson
+, ninja
 , pkg-config
 , vala
-, which
 , gtk3
 , json-glib
 , libgee
@@ -15,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "timeshift";
-  version = "22.11.2";
+  version = "23.06.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "timeshift";
     rev = version;
-    sha256 = "yZNERRoNZ1K7BRiAu7sqVQyhghsS/AeZSODMVSm46oY=";
+    sha256 = "epj0oaV+4lebRxcj6MQ2+lJ3juv9JZ+2UPLRc6UisX4=";
   };
 
   patches = [
@@ -29,6 +31,8 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
+    substituteInPlace ./files/meson.build \
+      --replace "/etc/timeshift" "$out/etc/timeshift"
     while IFS="" read -r -d $'\0' FILE; do
       substituteInPlace "$FILE" \
         --replace "/sbin/blkid" "${util-linux}/bin/blkid"
@@ -42,9 +46,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
+    help2man
+    meson
+    ninja
     pkg-config
     vala
-    which
   ];
 
   buildInputs = [
@@ -55,14 +61,6 @@ stdenv.mkDerivation rec {
     xapp
   ];
 
-  preBuild = ''
-    makeFlagsArray+=( \
-      "-C" "src" \
-      "prefix=$out" \
-      "sysconfdir=$out/etc" \
-    )
-  '';
-
   meta = with lib; {
     description = "A system restore tool for Linux";
     longDescription = ''
@@ -70,7 +68,7 @@ stdenv.mkDerivation rec {
       Snapshots can be restored using TimeShift installed on the system or from Live CD or USB.
     '';
     homepage = "https://github.com/linuxmint/timeshift";
-    license = licenses.gpl3;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ShamrockLee bobby285271 ];
   };

pkgs/applications/blockchains/lndhub-go/default.nix

@@ -25,6 +25,5 @@ buildGoModule rec {
     homepage = "https://github.com/getAlby/lndhub.go";
     license = licenses.gpl3;
     maintainers = with maintainers; [ prusnak ];
-    platforms = platforms.unix;
   };
 }

pkgs/applications/editors/orbiton/default.nix

@@ -4,13 +4,13 @@
 
 buildGoModule rec {
   pname = "orbiton";
-  version = "2.62.1";
+  version = "2.62.3";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "orbiton";
     rev = "v${version}";
-    hash = "sha256-viJlbBzV6zA/RbdF6kTNbER3ECayqS9hIns60kOa47c=";
+    hash = "sha256-/zIAF3LqOeIN91o33vntkBtQnESJhEDBljGPbMZvelc=";
   };
 
   vendorHash = null;

pkgs/applications/file-managers/lf/default.nix

@@ -43,7 +43,6 @@ buildGoModule rec {
     homepage = "https://godoc.org/github.com/gokcehan/lf";
     changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}";
     license = licenses.mit;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ dotlambda ];
   };
 }

pkgs/applications/misc/autospotting/default.nix

@@ -23,6 +23,5 @@ buildGoModule rec {
     license = licenses.osl3;
     maintainers = with maintainers; [ costrouc ];
     mainProgram = "AutoSpotting";
-    platforms = platforms.unix;
   };
 }

pkgs/applications/misc/dasel/default.nix

@@ -42,7 +42,6 @@ buildGoModule rec {
     homepage = "https://github.com/TomWright/dasel";
     changelog = "https://github.com/TomWright/dasel/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ _0x4A6F ];
   };
 }

pkgs/applications/misc/fluidd/default.nix

@@ -2,12 +2,12 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "fluidd";
-  version = "1.24.0";
+  version = "1.24.1";
 
   src = fetchurl {
     name = "fluidd-v${version}.zip";
     url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
-    sha256 = "sha256-2J5SVEtlLhZhDzqakOh/gt8XTkSaM9KBa0zCYM4UZAQ=";
+    sha256 = "sha256-iTh8vU6NrJZLyUdeY1wegUue0NIHQtpCEr9pJnC2Wx4=";
   };
 
   nativeBuildInputs = [ unzip ];

pkgs/applications/misc/gpxsee/default.nix

@@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gpxsee";
-  version = "13.3";
+  version = "13.4";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    hash = "sha256-eJ5jW81GQr/MvOrxinZdalZ4cvGYlVGv7JbePwHGEDY=";
+    hash = "sha256-Zf2eyDx5QK69W6HNz/IGGHkX2qCDnxYsU8KLCgU9teY=";
   };
 
   patches = (substituteAll {

pkgs/applications/misc/madonctl/default.nix

@@ -32,7 +32,6 @@ buildGoModule rec {
     description = "CLI for the Mastodon social network API";
     homepage = "https://github.com/McKael/madonctl";
     license = licenses.mit;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ aaronjheng ];
   };
 }

pkgs/applications/misc/sampler/default.nix

@@ -35,6 +35,5 @@ buildGoModule rec {
     homepage = "https://sampler.dev";
     license = licenses.gpl3;
     maintainers = with maintainers; [ uvnikita ];
-    platforms = platforms.unix;
   };
 }

pkgs/applications/misc/timewarrior/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor }:
+{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor, installShellFiles }:
 
 stdenv.mkDerivation rec {
   pname = "timewarrior";
@@ -12,10 +12,15 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ cmake asciidoctor ];
+  nativeBuildInputs = [ cmake asciidoctor installShellFiles ];
 
   dontUseCmakeBuildDir = true;
 
+  postInstall = ''
+    installShellCompletion --cmd timew \
+      --bash completion/timew-completion.bash
+  '';
+
   meta = with lib; {
     description = "A command-line time tracker";
     homepage = "https://timewarrior.net";

pkgs/applications/misc/todoist/default.nix

@@ -19,6 +19,5 @@ buildGoModule rec {
     homepage = "https://github.com/sachaos/todoist";
     description = "Todoist CLI Client";
     license = lib.licenses.mit;
-    platforms = lib.platforms.unix;
   };
 }

pkgs/applications/misc/tut/default.nix

@@ -18,6 +18,5 @@ buildGoModule rec {
     homepage = "https://github.com/RasmusLindroth/tut";
     license = licenses.mit;
     maintainers = with maintainers; [ equirosa ];
-    platforms = platforms.unix;
   };
 }

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

@@ -37,6 +37,5 @@ buildGoModule rec {
     homepage = "https://helmfile.readthedocs.io/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
-    platforms = lib.platforms.unix;
   };
 }

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

@@ -20,6 +20,5 @@ buildGoModule rec {
     homepage = "https://github.com/Praqma/helmsman";
     license = licenses.mit;
     maintainers = with maintainers; [ lynty ];
-    platforms = platforms.unix;
   };
 }

pkgs/applications/networking/cluster/hetzner-kube/default.nix

@@ -44,6 +44,5 @@ buildGoModule rec {
     homepage = "https://github.com/xetys/hetzner-kube";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ eliasp ];
-    platforms = lib.platforms.unix;
   };
 }

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

@@ -43,6 +43,5 @@ buildGoModule rec {
     homepage = "https://istio.io/latest/docs/reference/commands/istioctl";
     license = licenses.asl20;
     maintainers = with maintainers; [ bryanasdev000 veehaitch ];
-    platforms = platforms.unix;
   };
 }

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

@@ -43,6 +43,5 @@ buildGoModule rec {
     homepage = "https://kompose.io";
     license = licenses.asl20;
     maintainers = with maintainers; [ thpham vdemeester ];
-    platforms = platforms.unix;
   };
 }

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

@@ -42,7 +42,6 @@ let
           changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases";
           license = licenses.asl20;
           maintainers = with maintainers; [ offline zimbatm diegolelis yurrriq ];
-          platforms = platforms.unix;
         };
       } // attrs';
 in

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

@@ -37,6 +37,5 @@ buildGoModule rec {
     changelog = "https://github.com/kubecfg/kubecfg/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
   };
 }

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

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kubefirst";
-  version = "2.0.8";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "kubefirst";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-JGseXRUehRuH1kuTfmkAJcfRN3vM0zN7K8pnOfJ0LAs=";
+    hash = "sha256-t5tbgLXpJX2yWUdEW7zKb4A7B7budAOitOkL5I2CWpk=";
   };
 
-  vendorHash = "sha256-Sc6HXJXkZ9vW6sxEKCTo6LDHeOGLTz0oN9JH11iUA/k=";
+  vendorHash = "sha256-D2Gi90seLPTM0ttlz7V6FW1ZMiVN22YLWKeTquXvagY=";
 
   ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"];
 

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

@@ -31,6 +31,5 @@ buildGoModule rec {
     homepage = "https://github.com/pulumi/kubespy";
     license = licenses.asl20;
     maintainers = with maintainers; [ blaggacao ];
-    platforms = platforms.unix;
   };
 }

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

@@ -21,6 +21,5 @@ buildGoModule rec {
     homepage = "https://github.com/hashicorp/levant";
     license = licenses.mpl20;
     maintainers = with maintainers; [ max-niederman ];
-    platforms = platforms.unix;
   };
 }

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

@@ -50,6 +50,5 @@ buildGoModule rec {
     description = "A tool that makes it easy to run Kubernetes locally";
     license = licenses.asl20;
     maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang Chili-Man ];
-    platforms = platforms.unix;
   };
 }

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

@@ -39,7 +39,6 @@ let
       meta = with lib; {
         homepage = "https://www.nomadproject.io/";
         description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
-        platforms = platforms.unix;
         license = licenses.mpl20;
         maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ];
       };

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

@@ -34,6 +34,5 @@ buildGoModule rec {
     homepage = "https://odo.dev";
     changelog = "https://github.com/redhat-developer/odo/releases/v${version}";
     maintainers = with maintainers; [ stehessel ];
-    platforms = platforms.unix;
   };
 }

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

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pachyderm";
-  version = "2.6.1";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "pachyderm";
     repo = "pachyderm";
     rev = "v${version}";
-    hash = "sha256-C3qzf/+A1pYTYR3FMtUuqZNU+j8oOHSBLDfyuWYCh5I=";
+    hash = "sha256-e/pdNS3GOTKknh4Qbfc9Uf5uK2Zjsev8RkSg4QIxM8Y=";
   };
 
   vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY=";

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

@@ -34,6 +34,5 @@ buildGoModule rec {
     homepage = "https://github.com/stern/stern";
     license = licenses.asl20;
     maintainers = with maintainers; [ mbode preisschild ];
-    platforms = platforms.unix;
   };
 }

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

@@ -32,6 +32,5 @@ buildGoModule rec {
     license = licenses.asl20;
     maintainers = with maintainers; [ mikefaille ];
     mainProgram = "tk";
-    platforms = platforms.unix;
   };
 }

pkgs/applications/networking/drive/default.nix

@@ -30,6 +30,5 @@ buildGoModule rec {
     description = "Google Drive client for the commandline";
     license = licenses.asl20;
     maintainers = with maintainers; [ aaronjheng ];
-    platforms = platforms.unix;
   };
 }

pkgs/applications/networking/gdrive/default.nix

@@ -28,7 +28,6 @@ buildGoModule rec {
     homepage = "https://github.com/prasmussen/gdrive";
     description = "A command line utility for interacting with Google Drive";
     license = licenses.mit;
-    platforms = platforms.unix;
     maintainers = [ maintainers.rzetterberg ];
   };
 }

pkgs/applications/networking/hydroxide/default.nix

@@ -22,6 +22,5 @@ buildGoModule rec {
     homepage = "https://github.com/emersion/hydroxide";
     license = licenses.mit;
     maintainers = with maintainers; [ Br1ght0ne ];
-    platforms = platforms.unix;
   };
 }

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

@@ -20,6 +20,5 @@ buildGoModule rec {
     description = "Discord terminal client";
     license = licenses.bsd3;
     maintainers = with maintainers; [ colemickens ];
-    platforms = platforms.unix;
   };
 }

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

@@ -53,6 +53,5 @@ buildGoModule rec {
     description = "A terminal based Matrix client written in Go";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ chvp emily ];
-    platforms = platforms.unix;
   };
 }

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

@@ -36,6 +36,5 @@ buildGoModule rec {
     homepage = "https://signald.org/signaldctl/";
     license = licenses.gpl3;
     maintainers = with maintainers; [ colinsane ];
-    platforms = platforms.unix;
   };
 }

pkgs/applications/networking/ipfs-cluster/default.nix

@@ -17,7 +17,6 @@ buildGoModule rec {
     description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
     homepage = "https://ipfscluster.io";
     license = licenses.mit;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ Luflosi jglukasik ];
   };
 }

pkgs/applications/networking/ipget/default.nix

@@ -25,6 +25,5 @@ buildGoModule rec {
     homepage = "https://ipfs.io/";
     license = licenses.mit;
     maintainers = with maintainers; [ Luflosi ];
-    platforms = platforms.unix;
   };
 }

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

@@ -21,7 +21,6 @@ buildGoModule rec {
     longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness";
     homepage = "https://github.com/folbricht/desync";
     license = licenses.bsd3;
-    platforms = platforms.unix; # *may* work on Windows, but varies between releases.
     maintainers = [ maintainers.chaduffy ];
   };
 }

pkgs/applications/networking/wgcf/default.nix

@@ -19,7 +19,6 @@ buildGoModule rec {
     description = "Cross-platform, unofficial CLI for Cloudflare Warp";
     homepage    = "https://github.com/ViRb3/wgcf";
     license     = licenses.mit;
-    platforms   = platforms.unix;
     maintainers = with maintainers; [ yureien ];
   };
 }

pkgs/applications/version-management/gitty/default.nix

@@ -19,7 +19,6 @@ buildGoModule rec {
     homepage = "https://github.com/muesli/gitty/";
     description = "Contextual information about your git projects, right on the command-line";
     license = licenses.mit;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ izorkin ];
   };
 }

pkgs/applications/virtualization/umoci/default.nix

@@ -35,6 +35,5 @@ buildGoModule rec {
     homepage = "https://umo.ci";
     license = licenses.asl20;
     maintainers = with maintainers; [ zokrezyl ];
-    platforms = platforms.unix;
   };
 }

pkgs/desktops/pantheon/granite/7/default.nix

@@ -5,6 +5,7 @@
 , python3
 , meson
 , ninja
+, sassc
 , vala
 , pkg-config
 , libgee
@@ -18,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "granite";
-  version = "7.2.0";
+  version = "7.3.0";
 
   outputs = [ "out" "dev" ];
 
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-LU2eIeaNqO4/6dPUuzOQ/w4tx0dEm26JwZ87yQ16c4o=";
+    sha256 = "sha256-siFS8BiHVlDtM5odL0Lf1aRMoG6qqQOnbsXGKVyc218=";
   };
 
   nativeBuildInputs = [
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     python3
+    sassc
     vala
     wrapGAppsHook4
   ];

pkgs/development/compilers/chicken/5/overrides.nix

@@ -17,7 +17,11 @@ let
     (addPkgConfig old) // (addToPropagatedBuildInputs pkg old);
   broken = addMetaAttrs { broken = true; };
   brokenOnDarwin = addMetaAttrs { broken = stdenv.isDarwin; };
-in {
+  addToCscOptions = opt: old: {
+    CSC_OPTIONS = lib.concatStringsSep " " ([ old.CSC_OPTIONS or "" ] ++ lib.toList opt);
+  };
+in
+{
   allegro = addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd ]
     ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]);
   breadline = addToBuildInputs pkgs.readline;
@@ -35,17 +39,15 @@ in {
   ezxdisp = addToBuildInputsWithPkgConfig pkgs.xorg.libX11;
   freetype = addToBuildInputsWithPkgConfig pkgs.freetype;
   fuse = addToBuildInputsWithPkgConfig pkgs.fuse;
-  # git = addToBuildInputsWithPkgConfig pkgs.libgit2;
   gl-utils = addPkgConfig;
   glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3;
   glls = addPkgConfig;
   iconv = addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libiconv);
   icu = addToBuildInputsWithPkgConfig pkgs.icu;
   imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2;
-  lazy-ffi = old:
+  inotify = old:
-    # fatal error: 'ffi/ffi.h' file not found
+    (addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libinotify-kqueue) old)
-    (brokenOnDarwin old)
+    // lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old);
-    // (addToBuildInputs pkgs.libffi old);
   leveldb = addToBuildInputs pkgs.leveldb;
   magic = addToBuildInputs pkgs.file;
   mdh = addToBuildInputs pkgs.pcre;
@@ -53,10 +55,6 @@ in {
   ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ];
   opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ]
     ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]);
-  opengl = old:
-    # csc: invalid option `-framework OpenGL'
-    (brokenOnDarwin old)
-    // (addToBuildInputsWithPkgConfig [ pkgs.libGL pkgs.libGLU ] old);
   openssl = addToBuildInputs pkgs.openssl;
   plot = addToBuildInputs pkgs.plotutils;
   postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql;
@@ -69,13 +67,11 @@ in {
   soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy;
   sqlite3 = addToBuildInputs pkgs.sqlite;
   stemmer = old:
-    # Undefined symbols for architecture arm64: "_sb_stemmer_delete"
+    (addToBuildInputs pkgs.libstemmer old)
-    (brokenOnDarwin old)
+    // (addToCscOptions "-L -lstemmer" old);
-    // (addToBuildInputs pkgs.libstemmer old);
   stfl = old:
-    # Undefined symbols for architecture arm64: "_clearok"
+    (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old)
-    (brokenOnDarwin old)
+    // (addToCscOptions "-L -lncurses" old);
-    // (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old);
   taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ];
   uuid-lib = addToBuildInputs pkgs.libuuid;
   ws-client = addToBuildInputs pkgs.zlib;
@@ -85,6 +81,37 @@ in {
   zmq = addToBuildInputs pkgs.zeromq;
   zstd = addToBuildInputs pkgs.zstd;
 
+  # less trivial fixes, should be upstreamed
+  git = old: (addToBuildInputsWithPkgConfig pkgs.libgit2 old) // {
+    postPatch = ''
+      substituteInPlace libgit2.scm \
+        --replace "asize" "reserved"
+    '';
+  };
+  lazy-ffi = old: (addToBuildInputs pkgs.libffi old) // {
+    postPatch = ''
+      substituteInPlace lazy-ffi.scm \
+        --replace "ffi/ffi.h" "ffi.h"
+    '';
+  };
+  opengl = old:
+    (addToBuildInputsWithPkgConfig
+      (lib.optionals (!stdenv.isDarwin) [ pkgs.libGL pkgs.libGLU ]
+      ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ])
+      old)
+    // {
+      postPatch = ''
+        substituteInPlace opengl.egg \
+          --replace 'framework ' 'framework" "'
+      '';
+    };
+  posix-shm = old: {
+    postPatch = lib.optionalString stdenv.isDarwin ''
+      substituteInPlace build.scm \
+        --replace "-lrt" ""
+    '';
+  };
+
   # platform changes
   pledge = addMetaAttrs { platforms = lib.platforms.openbsd; };
   unveil = addMetaAttrs { platforms = lib.platforms.openbsd; };
@@ -99,7 +126,6 @@ in {
   comparse = broken;
   coops-utils = broken;
   crypt = broken;
-  git = broken;
   hypergiant = broken;
   iup = broken;
   kiwi = broken;
@@ -118,12 +144,8 @@ in {
 
   # mark broken darwin
 
-  # fatal error: 'sys/inotify.h' file not found
-  inotify = brokenOnDarwin;
   # fatal error: 'mqueue.h' file not found
   posix-mq = brokenOnDarwin;
-  # ld: library not found for -lrt
-  posix-shm = brokenOnDarwin;
   # Undefined symbols for architecture arm64: "_pthread_setschedprio"
   pthreads = brokenOnDarwin;
   # error: use of undeclared identifier 'B4000000'

pkgs/development/compilers/unison/default.nix

@@ -4,19 +4,19 @@
 , less
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "unison-code-manager";
   milestone_id = "M4i";
-  version = "1.0.${milestone_id}-alpha";
+  version = "1.0.${finalAttrs.milestone_id}-alpha";
 
   src = if (stdenv.isDarwin) then
     fetchurl {
-      url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";
+      url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-macos.tar.gz";
       hash = "sha256-1Qp1SB5rCsVimZzRo1NOX8HBoMEGlIycJPm3zGTUuOw=";
     }
   else
     fetchurl {
-      url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
+      url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-linux.tar.gz";
       hash = "sha256-Qx8vO/Vaz0VdCGXwIwRQIuMlp44hxCroQ7m7Y+m7aXk=";
     };
 
@@ -45,4 +45,4 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
     mainProgram = "ucm";
   };
-}
+})

pkgs/development/libraries/libmilter/default.nix

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   postInstall = lib.optionalString stdenv.isDarwin ''
-    fixDarwinDylibNames $out/lib/libmilter.dylib.1
+    fixDarwinDylibNames $out/lib/libmilter.*.1
   '';
 
   meta = with lib; {

pkgs/development/libraries/libwps/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libwps";
-  version = "0.4.13";
+  version = "0.4.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-eVwva90EwLZgrMpRTcc2cAc9PG5wbXbV2GtK2BMpLrk=";
+    sha256 = "sha256-xVEdlAngO446F50EZcHMKW7aBvyDcTVu9Egs2oaIadE=";
   };
 
   nativeBuildInputs = [ pkg-config ];

pkgs/development/python-modules/dask-image/default.nix

@@ -45,7 +45,6 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
     description = "Distributed image processing";
     homepage = "https://github.com/dask/dask-image";
     license = licenses.bsdOriginal;

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

@@ -59,6 +59,6 @@ buildPythonPackage rec {
     homepage = "http://wrf-python.rtfd.org";
     license = licenses.asl20;
     maintainers = with maintainers; [ mhaselsteiner ];
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
+    broken = stdenv.isDarwin;
   };
 }

pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix

@@ -31,7 +31,6 @@ buildGoModule rec {
   meta = with lib; {
     homepage = "https://github.com/terraform-linters/tflint-ruleset-aws";
     description = "TFLint ruleset plugin for Terraform AWS Provider";
-    platforms = platforms.unix;
     maintainers = with maintainers; [ flokli ];
     license = with licenses; [ mpl20 ];
   };

pkgs/development/tools/build-managers/bob/default.nix

@@ -24,7 +24,6 @@ buildGoModule rec {
     description = "A build system for microservices";
     homepage = "https://bob.build";
     license = licenses.asl20;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ zuzuleinen ];
   };
 }

pkgs/development/tools/build-managers/scala-cli/default.nix

@@ -73,6 +73,7 @@ stdenv.mkDerivation {
     license = licenses.asl20;
     description = "Command-line tool to interact with the Scala language";
     maintainers = [ maintainers.kubukoz ];
+    inherit platforms;
   };
 
   passthru.updateScript = callPackage ./update.nix { } { inherit platforms pname version; };

pkgs/development/tools/build-managers/scala-cli/sources.json

@@ -1,21 +1,21 @@
 {
-  "version": "1.0.0",
+  "version": "1.0.1",
   "assets": {
     "aarch64-darwin": {
       "asset": "scala-cli-aarch64-apple-darwin.gz",
-      "sha256": "0lkgfcbwmrrxvdyi76zgj2mbz6nyzc0raq4sd1lcyiyavnr3mxgq"
+      "sha256": "0n6jlxbfw21ck1qg2xzkrp0p4hlvr21cxfp3p27svp01104n6ig8"
     },
     "aarch64-linux": {
       "asset": "scala-cli-aarch64-pc-linux.gz",
-      "sha256": "1z7i2jq8lrrnw4wj78xb5c49nrbilr3yi1mda9vanssdy8x27ybh"
+      "sha256": "05rmxi7nwxkvx6as6sbfvrsyll2lp06iq77z22glkkv8y1dd6334"
     },
     "x86_64-darwin": {
       "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "1qgqp0cybijbz4nryrsb1x48kf0sja35rvmv1skg8m6ld7hwkn9s"
+      "sha256": "1vsjp3sdnclx5w4bv1kzkk23q848374phlx3ix0qln04ih821q0l"
     },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
-      "sha256": "0z94spyx8x9p0jzaq90vm6yrycyvfi11w1lpv9fzlwldpzk50lq8"
+      "sha256": "1904f2z3hvkl2rmj0czk5qkw9327zqf5m8i4ad0bzyrri5q7q4ki"
     }
   }
 }

pkgs/development/tools/butane/default.nix

@@ -30,6 +30,5 @@ buildGoModule rec {
     license = licenses.asl20;
     homepage = "https://github.com/coreos/butane";
     maintainers = with maintainers; [ elijahcaine ruuda ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/database/dbmate/default.nix

@@ -24,6 +24,5 @@ buildGoModule rec {
     changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ manveru ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/frugal/default.nix

@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "frugal";
-  version = "3.16.21";
+  version = "3.16.23";
 
   src = fetchFromGitHub {
     owner = "Workiva";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-iNj3E5JtvOHAiEC+81KnAb32TWi+Zq8Av24oLm01ty4=";
+    sha256 = "sha256-Ofem3oSwas5X3D8zSzS5HpJANR6TNVSJ8hWb13hr0W4=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-29LwvekhevOn/1zrtQEZWqeQMEAN2xPxSRzas/5EhVM=";
+  vendorHash = "sha256-wuT58Weyc8AB9i5bVe0696BGRWsl814Fz9bmnuJwgPM=";
 
   meta = with lib; {
     description = "Thrift improved";

pkgs/development/tools/gauge/default.nix

@@ -20,6 +20,5 @@ buildGoModule rec {
     homepage = "https://gauge.org";
     license = licenses.asl20;
     maintainers = [ maintainers.vdemeester ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/github-commenter/default.nix

@@ -18,6 +18,5 @@ buildGoModule rec {
     license = licenses.asl20;
     homepage = "https://github.com/cloudposse/github-commenter";
     maintainers = [ maintainers.mmahut ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/go-protobuf/default.nix

@@ -18,6 +18,5 @@ buildGoModule rec {
     description = " Go bindings for protocol buffer";
     maintainers = with maintainers; [ lewo ];
     license     = licenses.bsd3;
-    platforms   = platforms.unix;
   };
 }

pkgs/development/tools/go-swagger/default.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "go-swagger";
-  version = "0.30.4";
+  version = "0.30.5";
 
   src = fetchFromGitHub {
     owner = "go-swagger";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-5jnSuJqy5oaRxmZh2rr1hoBJPS4S9s0FhMZ4AY61w1I=";
+    hash = "sha256-38Ytv/mQVi0xTydFTPNizJIjYPL+lOws6jHsRjxSC4o=";
   };
 
-  vendorHash = "sha256-EVsJP04yBiquux5LRR23bGRzrLiXBO9VA8UGlZEpgi8=";
+  vendorHash = "sha256-TqoTzxPGF0BBUfLtYWkljRcmr08m4zo5iroWMklxL7U=";
 
   doCheck = false;
 

pkgs/development/tools/gron/default.nix

@@ -24,6 +24,5 @@ buildGoModule rec {
     homepage = "https://github.com/tomnomnom/gron";
     license = licenses.mit;
     maintainers = with maintainers; [ fgaz SuperSandro2000 ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/json2tsv/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "json2tsv";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchurl {
     url = "https://codemadness.org/releases/json2tsv/json2tsv-${version}.tar.gz";
-    hash = "sha256-BOamDWszYDqKGdKOlAOLY7F9ScZaBJXNdhz38iYW3ps=";
+    hash = "sha256-7r5+YoZVivCqDbfFUqTB/x41DrZi7GZRVcJhGZCpw0o=";
   };
 
   postPatch = ''

pkgs/development/tools/kafkactl/default.nix

@@ -32,6 +32,5 @@ buildGoModule rec {
     '';
     license = licenses.asl20;
     maintainers = with maintainers; [ grburst ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/kind/default.nix

@@ -39,6 +39,5 @@ buildGoModule rec {
     homepage    = "https://github.com/kubernetes-sigs/kind";
     maintainers = with maintainers; [ offline rawkode ];
     license     = licenses.asl20;
-    platforms   = platforms.unix;
   };
 }

pkgs/development/tools/krew/default.nix

@@ -20,6 +20,5 @@ buildGoModule rec {
     homepage = "https://github.com/kubernetes-sigs/krew";
     maintainers = with maintainers; [ vdemeester ];
     license = lib.licenses.asl20;
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/leaps/default.nix

@@ -23,6 +23,5 @@ buildGoModule rec {
     homepage = "https://github.com/jeffail/leaps/";
     license = licenses.mit;
     maintainers = with lib.maintainers; [ qknight ];
-    platforms = lib.platforms.unix;
   };
 }

pkgs/development/tools/misc/go-md2man/default.nix

@@ -18,6 +18,5 @@ buildGoModule rec {
     license = licenses.mit;
     homepage = "https://github.com/cpuguy83/go-md2man";
     maintainers = with maintainers; [offline];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/misc/hound/default.nix

@@ -37,6 +37,5 @@ buildGoModule rec {
     homepage = "https://github.com/hound-search/hound";
     license = licenses.mit;
     maintainers = with maintainers; [ grahamc SuperSandro2000 ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/misc/linuxkit/default.nix

@@ -56,6 +56,5 @@ buildGoModule rec {
     license = licenses.asl20;
     homepage = "https://github.com/linuxkit/linuxkit";
     maintainers = with maintainers; [ nicknovitski ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/misc/nix-build-uncached/default.nix

@@ -22,6 +22,5 @@ buildGoModule rec {
     license = licenses.mit;
     homepage = "https://github.com/Mic92/nix-build-uncached";
     maintainers = [ maintainers.mic92 ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/misc/scc/default.nix

@@ -21,6 +21,5 @@ buildGoModule rec {
     description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go";
     maintainers = with maintainers; [ sigma Br1ght0ne ];
     license = with licenses; [ unlicense /* or */ mit ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/misc/slint-lsp/default.nix

@@ -25,14 +25,14 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "slint-lsp";
-  version = "1.0.0";
+  version = "1.0.2";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-Ua8ENLxmfYv6zF/uihT49ZpphFaC3zS882cttJ/rvc4=";
+    sha256 = "sha256-KSpfi8hXMz5A5ra+oxOmKieKpjCTB565JDNrRwtIwxU=";
   };
 
-  cargoHash = "sha256-IzjOAy9zTtsD4jHjI1oVXBg7Si1AeDNH8ATK4yO8WVw=";
+  cargoHash = "sha256-tmbJBxQoXpHmBJI1z42Kg1XrZ+9+DE5nLmkIp5cWCF4=";
 
   nativeBuildInputs = [ cmake pkg-config fontconfig ];
   buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]

pkgs/development/tools/packer/default.nix

@@ -34,6 +34,5 @@ buildGoModule rec {
     license     = licenses.mpl20;
     maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick ];
     changelog   = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md";
-    platforms   = platforms.unix;
   };
 }

pkgs/development/tools/packet-sd/default.nix

@@ -18,7 +18,6 @@ buildGoModule rec {
     description = "Prometheus service discovery for Equinix Metal";
     homepage = "https://github.com/packethost/prometheus-packet-sd";
     license = licenses.asl20;
-    platforms = platforms.unix;
     maintainers = [ ];
     mainProgram = "prometheus-packet-sd";
   };

pkgs/development/tools/prototool/default.nix

@@ -30,6 +30,5 @@ buildGoModule rec {
     description = "Your Swiss Army Knife for Protocol Buffers";
     maintainers = [ maintainers.marsam ];
     license = licenses.mit;
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/rain/default.nix

@@ -33,6 +33,5 @@ buildGoModule rec {
     homepage = "https://github.com/aws-cloudformation/rain";
     license = licenses.asl20;
     maintainers = with maintainers; [ jiegec ];
-    platforms = platforms.unix;
   };
 }

pkgs/development/tools/reflex/default.nix

@@ -19,7 +19,6 @@ buildGoModule rec {
     description = "A small tool to watch a directory and rerun a command when certain files change";
     homepage = "https://github.com/cespare/reflex";
     license = licenses.mit;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ nicknovitski ];
   };
 }

pkgs/development/tools/run/default.nix

@@ -19,6 +19,5 @@ buildGoModule rec {
     homepage    = "https://github.com/TekWizely/run";
     license     = licenses.mit;
     maintainers = with maintainers; [ rawkode Br1ght0ne ];
-    platforms   = platforms.unix;
   };
 }

pkgs/games/harmonist/default.nix

@@ -25,7 +25,6 @@ buildGoModule rec {
     '';
     homepage = "https://harmonist.tuxfamily.org/";
     license = licenses.isc;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ aaronjheng ];
   };
 }

pkgs/games/ironwail/default.nix

@@ -0,0 +1,91 @@
+{ lib
+, stdenv
+, SDL2
+, fetchurl
+, gzip
+, libvorbis
+, libmad
+, flac
+, libopus
+, opusfile
+, libogg
+, curl
+, libxmp
+, vulkan-headers
+, vulkan-loader
+, copyDesktopItems
+, makeDesktopItem
+, pkg-config
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ironwail";
+  version = "0.7.0";
+
+  src = fetchurl {
+    url = "https://github.com/andrei-drexler/ironwail/archive/refs/tags/v${finalAttrs.version}.tar.gz";
+    hash = "sha256-NBG0wwQWqyGWQYJmiLKfxGxpDJLw7Kwf4EnYd33dOpU=";
+  };
+
+  sourceRoot = "${finalAttrs.pname}-${finalAttrs.version}/Quake";
+
+  nativeBuildInputs = [
+    copyDesktopItems pkg-config vulkan-headers
+    gzip libvorbis libmad flac curl libopus
+    opusfile libogg libxmp vulkan-loader SDL2
+  ];
+
+  buildFlags = [
+    "DO_USERDIRS=1"
+    # Makefile defaults, set here to enforce consistency on Darwin build
+    "USE_CODEC_WAVE=1"
+    "USE_CODEC_MP3=1"
+    "USE_CODEC_VORBIS=1"
+    "USE_CODEC_FLAC=1"
+    "USE_CODEC_OPUS=1"
+    "USE_CODEC_MIKMOD=0"
+    "USE_CODEC_UMX=0"
+    "USE_CODEC_XMP=1"
+    "MP3LIB=mad"
+    "VORBISLIB=vorbis"
+    "SDL_CONFIG=sdl2-config"
+    "USE_SDL2=1"
+  ];
+
+  preInstall = ''
+    mkdir -p "$out/bin"
+    mkdir -p "$out/share/quake"
+    substituteInPlace Makefile --replace "cp ironwail.pak /usr/local/games/quake" "cp ironwail.pak $out/share/quake/ironwail.pak"
+    substituteInPlace Makefile --replace "/usr/local/games" "$out/bin"
+  '';
+
+  enableParallelBuilding = true;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "ironwail";
+      exec = "quake";
+      desktopName = "Ironwail";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = {
+    description = "A fork of the QuakeSpasm engine for iD software's Quake";
+    homepage = "https://github.com/andrei-drexler/ironwail";
+    longDescription = ''
+      Ironwail is a fork of QuakeSpasm with focus on high performance instead of
+      compatibility.
+      It features the ability to play the 2021 re-release content with no setup
+      required, a mods menu for quick access to installation of mods, and ease of
+      switching to installed mods.
+      It also include various visual features as well as improved limits for playing
+      larger levels with less performance impacts.
+    '';
+
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.necrophcodr ];
+    mainProgram = "quake";
+  };
+})

pkgs/games/osu-lazer/bin.nix

@@ -7,21 +7,21 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2023.511.0";
+  version = "2023.610.0";
   name = "${pname}-${version}";
 
   osu-lazer-bin-src = {
     aarch64-darwin = {
       url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-      sha256 = "sha256-oy+MDLwi1hEb4NSYxdDE1rxBLHfio9t+n+/GE6FcLYc=";
+      sha256 = "sha256-MCQYtdTigE6Dyrst2KLoFthbrJjNXm3TQRiaTzp32Os=";
     };
     x86_64-darwin = {
       url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-      sha256 = "sha256-i4y2ySo0XEEZSBYQI17G8SdGXyunT2g1XECrlud7hIc=";
+      sha256 = "sha256-jA7fr9nntV5/J4/AUOH6HS6ZoYQ1ZZxY/ic6KeAch/c=";
     };
     x86_64-linux = {
       url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-      sha256 = "sha256-GUT0wlBUMJR/M2Ovwda0uMeDG1O8cqmrRoDlV2bGybU=";
+      sha256 = "sha256-QAFbTn30lSOjEC1ZT9caUR2WQmz+bNDhpd3RL7OJWWI=";
     };
   }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
 

pkgs/games/osu-lazer/default.nix

@@ -17,13 +17,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2023.511.0";
+  version = "2023.610.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     rev = version;
-    sha256 = "sha256-bwbryisUiRCv/N4RTHUecsJ5/JVM3XF3f9mKb1M6jow=";
+    sha256 = "sha256-2oCv+6cxhz1PU4Jh9Ux8RAcksqWiq2VVE6aKi6bJDIw=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

pkgs/games/osu-lazer/deps.nix

@@ -61,7 +61,7 @@
   (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; })
   (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; })
   (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
-  (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; })
+  (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; })
   (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2022.2.3"; sha256 = "0ck4nkk8wlj2gcgs7j4j6z4yqrnf2f5rs2pgwa8kar026sc29xsl"; })
   (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; })
   (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; })
@@ -112,7 +112,7 @@
   (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
   (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; })
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
   (fetchNuGet { pname = "NuGet.Common"; version = "5.11.0"; sha256 = "1amf6scr5mcjdvd1fflag6i4qjwmydq5qwp6g3f099n901zq0dr3"; })
   (fetchNuGet { pname = "NuGet.Configuration"; version = "5.11.0"; sha256 = "1s9pbrh7xy9jz7npz0sahdsj1cw8gfx1fwf3knv0ms1n0c9bk53l"; })
   (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.11.0"; sha256 = "0yllxfv8lx1b7zj114mpxw03186q5ynsdvza6llp3wypxp367inr"; })
@@ -134,15 +134,15 @@
   (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; })
   (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; })
   (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; })
-  (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.510.0"; sha256 = "0dkhw65rgclhg26hanmjvr72b12yg3snz7vjyxgqh38yvgd18z0b"; })
+  (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.608.0"; sha256 = "0qf9z0307sh1skixql23v4vjkz1jwz6qhjdzqhhyb708hx9p7a03"; })
   (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; })
   (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2022.1222.1"; sha256 = "1pwwsp4rfzl6166mhrn5lsnyazpckhfh1m6ggf9d1lw2wb58vxfr"; })
   (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.510.0"; sha256 = "155rjpr0vv4a2ar1xmh2zvg9rw07xii72gg11g5jkk5qxm9lkgk0"; })
   (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; })
-  (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.652-alpha"; sha256 = "104amh94xlnp13qfjkwwvi74qanx52k52dd7h7j2anaa0g350rrh"; })
+  (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.669-alpha"; sha256 = "0frazc37k9nqzk3sqcy3jzibg9v6dp0ga95yx0rkmjm8jfbw3l9r"; })
-  (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-gf1f8dc0432"; sha256 = "01xnb43gkbrn3wnb79k9k5cg2xhq4vf94i7c648003i0pdvm0rbz"; })
+  (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g31346ea477"; sha256 = "0wrb1skyj58p23ryjkmlk8f1sdhplr5c43w31sw8bhv0yqmhjd80"; })
-  (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-gf1f8dc0432"; sha256 = "0w15rfshjrkblk91gl7mqdvbfrqi19bpgx60zm42znx5r4ryjix8"; })
+  (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g31346ea477"; sha256 = "0x4i7v7z9n4yryi68h973f5kxiszjdy3hvkgbk4wa9g2skxyknhx"; })
-  (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-gf1f8dc0432"; sha256 = "1mr7mcpjb4fz3lbxi1qv9vwjsbm8sgh20gb8xbvpjkzj9hk5xbp3"; })
+  (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g31346ea477"; sha256 = "1k5by3zn4ih6d82l7rif25305js885qic44al47msidrq09rnacz"; })
   (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g3e4b9f196a"; sha256 = "0ijainvin0v01pk282985v0mwwa1s2b683wxg23jzk69pbvpyq6g"; })
   (fetchNuGet { pname = "Realm"; version = "10.20.0"; sha256 = "0gy0l2r7726wb6i599n55dn9035h0g7k0binfiy2dy9bjwz60jqk"; })
   (fetchNuGet { pname = "Realm.Fody"; version = "10.20.0"; sha256 = "0rwcbbzr41iww3k59rjgy5xy7bna1x906h5blbllpywgpc2l5afw"; })

pkgs/os-specific/linux/pam_rssh/default.nix

@@ -0,0 +1,71 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, pam
+, openssh
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "pam_rssh";
+  version = "unstable-2023-03-18";
+
+  src = fetchFromGitHub {
+    owner = "z4yx";
+    repo = "pam_rssh";
+    rev = "92c240bd079e9711c7afa8bacfcf01de48f42577";
+    hash = "sha256-mIQeItPh6RrF3cFbAth2Kmb2E/Xj+lOgatvjcLE4Yag=";
+    fetchSubmodules = true;
+  };
+
+  cargoHash = "sha256-/AQqjmAGgvnpVWyoK3ymZ1gNAhTSN30KQEiqv4G+zx8=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+    pam
+  ];
+
+  checkFlags = [
+    # Fails because it tries finding authorized_keys in /home/$USER.
+    "--skip=tests::parse_user_authorized_keys"
+  ];
+
+  nativeCheckInputs = [
+    openssh
+  ];
+
+  env.USER = "nixbld";
+
+  # Copied from https://github.com/z4yx/pam_rssh/blob/main/.github/workflows/rust.yml.
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    mkdir $HOME/.ssh
+    ssh-keygen -q -N "" -t ecdsa -b 521 -f $HOME/.ssh/id_ecdsa521
+    ssh-keygen -q -N "" -t ecdsa -b 384 -f $HOME/.ssh/id_ecdsa384
+    ssh-keygen -q -N "" -t ecdsa -b 256 -f $HOME/.ssh/id_ecdsa256
+    ssh-keygen -q -N "" -t ed25519 -f $HOME/.ssh/id_ed25519
+    ssh-keygen -q -N "" -t rsa -f $HOME/.ssh/id_rsa
+    ssh-keygen -q -N "" -t dsa -f $HOME/.ssh/id_dsa
+    export SSH_AUTH_SOCK=$HOME/ssh-agent.sock
+    eval $(ssh-agent -a $SSH_AUTH_SOCK)
+    ssh-add $HOME/.ssh/id_ecdsa521
+    ssh-add $HOME/.ssh/id_ecdsa384
+    ssh-add $HOME/.ssh/id_ecdsa256
+    ssh-add $HOME/.ssh/id_ed25519
+    ssh-add $HOME/.ssh/id_rsa
+    ssh-add $HOME/.ssh/id_dsa
+  '';
+
+  meta = with lib; {
+    description = "PAM module for authenticating via ssh-agent, written in Rust";
+    homepage = "https://github.com/z4yx/pam_rssh";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ kranzes ];
+  };
+}

pkgs/servers/consul/default.nix

@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.15.2";
+  version = "1.15.3";
   rev = "v${version}";
 
   # Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     inherit rev;
-    sha256 = "sha256-8C06arK7QnrT5qQZWBjamOOlejy69pxRHXKoncfMKAc=";
+    sha256 = "sha256-Xe+baALN8Ow6vjneWAvC65cBSsrMAsdxjEQRBcvWxCw=";
   };
 
   passthru.tests.consul = nixosTests.consul;
@@ -26,7 +26,7 @@ buildGoModule rec {
   # has a split module structure in one repo
   subPackages = ["." "connect/certgen"];
 
-  vendorHash = "sha256-Vcl23cWErAycmza1CS9rl+xJ7CBuocMAdSG9AA88SrQ=";
+  vendorHash = "sha256-tbwX/uF9+yIhd+KSGF2v7HjxGtfaZYSm+1GIspQmC9A=";
 
   doCheck = false;
 

pkgs/servers/dex/default.nix

@@ -33,6 +33,5 @@ buildGoModule rec {
     homepage = "https://github.com/dexidp/dex";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley techknowlogick ];
-    platforms = platforms.unix;
   };
 }

pkgs/servers/dgraph/default.nix

@@ -44,6 +44,5 @@ buildGoModule rec {
     maintainers = with maintainers; [ sigma ];
     # Apache 2.0 because we use only build "oss"
     license = licenses.asl20;
-    platforms = platforms.unix;
   };
 }

pkgs/servers/geospatial/mbtileserver/default.nix

@@ -19,6 +19,5 @@ buildGoModule rec {
     changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md";
     license = licenses.isc;
     maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
   };
 }

pkgs/servers/geospatial/pg_featureserv/default.nix

@@ -20,7 +20,6 @@ buildGoModule rec {
     homepage = "https://github.com/CrunchyData/pg_featureserv";
     license = licenses.asl20;
     maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
     broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
   };
 }

pkgs/servers/geospatial/pg_tileserv/default.nix

@@ -22,6 +22,5 @@ buildGoModule rec {
     homepage = "https://github.com/CrunchyData/pg_tileserv";
     license = licenses.asl20;
     maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
   };
 }

pkgs/servers/geospatial/tegola/default.nix

@@ -21,7 +21,6 @@ buildGoModule rec {
     homepage = "https://www.tegola.io/";
     description = "Mapbox Vector Tile server";
     maintainers = with maintainers; [ ingenieroariel ];
-    platforms = platforms.unix;
     license = licenses.mit;
   };
 }

pkgs/servers/matterbridge/default.nix

@@ -20,6 +20,5 @@ buildGoModule rec {
     homepage = "https://github.com/42wim/matterbridge";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ ryantm ];
-    platforms = platforms.unix;
   };
 }

pkgs/servers/mattermost/matterircd.nix

@@ -20,6 +20,5 @@ buildGoModule rec {
     homepage = "https://github.com/42wim/matterircd";
     license = licenses.mit;
     maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
   };
 }

pkgs/servers/minio/default.nix

@@ -45,7 +45,6 @@ buildGoModule rec {
     description = "An S3-compatible object storage server";
     changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}";
     maintainers = with maintainers; [ eelco bachp ];
-    platforms = platforms.unix;
     license = licenses.agpl3Plus;
   };
 }

pkgs/servers/minio/legacy_fs.nix

@@ -45,7 +45,6 @@ buildGoModule rec {
     description = "An S3-compatible object storage server";
     changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}";
     maintainers = with maintainers; [ eelco bachp ];
-    platforms = platforms.unix;
     license = licenses.agpl3Plus;
   };
 }