diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d831893b9018..2aec0fbc6759 100644 --- a/.github/CODEOWNERS +++ b/.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/development/compilers/ocaml @romildo @ulrikstrid -/pkgs/development/ocaml-modules @romildo @ulrikstrid +/pkgs/build-support/ocaml @ulrikstrid +/pkgs/development/compilers/ocaml @ulrikstrid +/pkgs/development/ocaml-modules @ulrikstrid # ZFS pkgs/os-specific/linux/zfs @raitobezarius diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7f8fa9425e7..20b2c80841c5 100644 --- a/maintainers/maintainer-list.nix +++ b/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"; diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index cca1d48ec564..0d3b4705ec90 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/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). diff --git a/nixos/modules/services/web-apps/openvscode-server.nix b/nixos/modules/services/web-apps/openvscode-server.nix index d0db614d8d72..3daf238c57e1 100644 --- a/nixos/modules/services/web-apps/openvscode-server.nix +++ b/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,23 +168,23 @@ in { --accept-server-license-terms \ --host=${cfg.host} \ --port=${toString cfg.port} \ - '' + lib.optionalString (cfg.telemetryLevel == true) '' - --telemetry-level=${cfg.telemetryLevel} \ - '' + lib.optionalString (cfg.withoutConnectionToken == true) '' - --without-connection-token \ - '' + lib.optionalString (cfg.socketPath != null) '' - --socket-path=${cfg.socketPath} \ - '' + lib.optionalString (cfg.userDataDir != null) '' - --user-data-dir=${cfg.userDataDir} \ - '' + lib.optionalString (cfg.serverDataDir != null) '' - --server-data-dir=${cfg.serverDataDir} \ - '' + lib.optionalString (cfg.extensionsDir != null) '' - --extensions-dir=${cfg.extensionsDir} \ - '' + lib.optionalString (cfg.connectionToken != null) '' - --connection-token=${cfg.connectionToken} \ - '' + lib.optionalString (cfg.connectionTokenFile != null) '' - --connection-token-file=${cfg.connectionTokenFile} \ - '' + lib.escapeShellArgs cfg.extraArguments; + '' + lib.optionalString (cfg.telemetryLevel != null) '' + --telemetry-level=${cfg.telemetryLevel} \ + '' + lib.optionalString (cfg.withoutConnectionToken) '' + --without-connection-token \ + '' + lib.optionalString (cfg.socketPath != null) '' + --socket-path=${cfg.socketPath} \ + '' + lib.optionalString (cfg.userDataDir != null) '' + --user-data-dir=${cfg.userDataDir} \ + '' + lib.optionalString (cfg.serverDataDir != null) '' + --server-data-dir=${cfg.serverDataDir} \ + '' + lib.optionalString (cfg.extensionsDir != null) '' + --extensions-dir=${cfg.extensionsDir} \ + '' + lib.optionalString (cfg.connectionToken != null) '' + --connection-token=${cfg.connectionToken} \ + '' + lib.optionalString (cfg.connectionTokenFile != null) '' + --connection-token-file=${cfg.connectionTokenFile} \ + '' + lib.escapeShellArgs cfg.extraArguments; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; RuntimeDirectory = cfg.user; User = cfg.user; diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index 0e09ad295f95..7dbef63136aa 100644 --- a/nixos/tests/matomo.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index f0e99f0f7ec9..62272aef4df0 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/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 diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 8e86b35cf7cc..6c2a42923908 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/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 ]; }; diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index 7b969f0e27d0..4f292d44d6e1 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/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; }; } diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 878c587e5abd..5c08af915d97 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/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; diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index d84e3dc6afdd..0ef56e8a2bd1 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index a0bc7ba01a90..985b8136a0a6 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -23,6 +23,5 @@ buildGoModule rec { license = licenses.osl3; maintainers = with maintainers; [ costrouc ]; mainProgram = "AutoSpotting"; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 7dfe56f54483..d3b72568cbd5 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 3599785b736c..00e53d3a82e3 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/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 ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 85b83674edb9..694323df82d9 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/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 { diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index b9a1c0fd5371..df783aa36a9c 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index c668edc9a17b..bea22977097a 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 0918b91f48c5..026f5ae5014e 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/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"; diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index 2a8d925f7800..fc600ab7710c 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 16d091aa7b1a..8033cbfa865d 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index ccbc414e4294..06612be06299 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index b09d167c24af..9e7b1fc236a5 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index bf4183268e53..828194c8e9b2 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index b51664064885..be498c5c2d17 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 13684d441492..c1df35b75dc6 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 490b924ad9cb..7431b5474b33 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/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 diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 9fd3fc41ce51..fb555545c047 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index c90460d1692b..87aeb15141ab 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/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}"]; diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix index 43c4adc555c9..88a56e3c72e3 100644 --- a/pkgs/applications/networking/cluster/kubespy/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/applications/networking/cluster/levant/default.nix index 07d9c360de7e..be25739db2cb 100644 --- a/pkgs/applications/networking/cluster/levant/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 99b9b942196e..fc53e14a41f5 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 998f7f6069a0..3bb12d740b98 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/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 ]; }; diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index 1099c1b08195..fc9ab61d3733 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index b21b50397e9e..9fd167f6ebe8 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/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="; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 473377c22eef..0631dd1788b7 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 470a4bdf7ef3..62d89e78c757 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 576133e650c8..b90be9e2a55d 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index 20ef4e682c7e..c442303e6758 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index df6f1e2d793f..73b4da770809 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix index a906c46c4aef..3f388f958c87 100644 --- a/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 55b3ef6899f7..cc0a654ad2a0 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/instant-messengers/signaldctl/default.nix b/pkgs/applications/networking/instant-messengers/signaldctl/default.nix index cb241bac8fc2..82637dbbb0c9 100644 --- a/pkgs/applications/networking/instant-messengers/signaldctl/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 689cef0db0b3..e23fa2f6c6fb 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index fa93ad14a741..8ff8811381b4 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/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; }; } diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 8af7c3bca40e..487b3e2fc878 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/applications/networking/wgcf/default.nix index 3487ad6395cf..5a9f4b43ce67 100644 --- a/pkgs/applications/networking/wgcf/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/version-management/gitty/default.nix b/pkgs/applications/version-management/gitty/default.nix index 12a82143c35b..da24cb2988eb 100644 --- a/pkgs/applications/version-management/gitty/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index 99e8ddf34a51..6af9382d2b7d 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/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; }; } diff --git a/pkgs/desktops/pantheon/granite/7/default.nix b/pkgs/desktops/pantheon/granite/7/default.nix index 0903dc697096..0904fbe2579f 100644 --- a/pkgs/desktops/pantheon/granite/7/default.nix +++ b/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 ]; diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index b471dab135bd..e707190adc05 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/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: - # fatal error: 'ffi/ffi.h' file not found - (brokenOnDarwin old) - // (addToBuildInputs pkgs.libffi old); + inotify = old: + (addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libinotify-kqueue) old) + // lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" 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" - (brokenOnDarwin old) - // (addToBuildInputs pkgs.libstemmer old); + (addToBuildInputs pkgs.libstemmer old) + // (addToCscOptions "-L -lstemmer" old); stfl = old: - # Undefined symbols for architecture arm64: "_clearok" - (brokenOnDarwin old) - // (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old); + (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old) + // (addToCscOptions "-L -lncurses" 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' diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 0fd99ac0c375..cd0b7620a607 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/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"; }; -} +}) diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 679408c89828..3ff3a4ffa9fb 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/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; { diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index fd62b9813435..f5af2e8284c8 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 16a496ad2c3b..e73d33004447 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/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; diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 78b3486c72e6..77d5ea8a4eba 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index 61efa78eaef4..720c3fa05aa9 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/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 ]; }; diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix index a7a7b0622b6e..2a8a1eda465a 100644 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ b/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 ]; }; } diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 3b509f03c5ff..1ea575013bb0 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/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; }; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 5db0e341f35c..031d71a7babd 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/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" } } } diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index 5285637d77e9..71344ea3ca32 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index fcca97ff9e1a..6e5c98dae0ef 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 91d90044b5a0..5ec86e703127 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/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"; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 4a300df0577c..c7ae1b885639 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/development/tools/github-commenter/default.nix index b1c247c70f97..196d078c3027 100644 --- a/pkgs/development/tools/github-commenter/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 42b4fbe1d3cd..0f2e302aad05 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index bd4411ad768c..5a536db51c22 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/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; diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index 3dbcf0fdc20e..b89ab9e98fce 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/json2tsv/default.nix b/pkgs/development/tools/json2tsv/default.nix index 9f074fd8b2e5..49d0812eba44 100644 --- a/pkgs/development/tools/json2tsv/default.nix +++ b/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 = '' diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index e52eda11bb3a..3528777f787a 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -32,6 +32,5 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ grburst ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 2b37e756be79..f06b575f5377 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix index 78e9f91b3af8..2bfcf2ca9f67 100644 --- a/pkgs/development/tools/krew/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index ce948edd5aa3..a6e41844508c 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix index 55087a502100..a1481fe2d385 100644 --- a/pkgs/development/tools/misc/go-md2man/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 90947dc850ea..b906456116c5 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 68a908483d13..3a7a7836df98 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index 2d9313a566cf..840bea3eb3e9 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 3a5eeeb9c8b6..40b41d8df9ed 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index fcbe98003151..7ece35e9c94e 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/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 ] diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index e0a176a15bac..68a606edcd6a 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/development/tools/packet-sd/default.nix index f8caeb7f684d..fb2cc85ec5d2 100644 --- a/pkgs/development/tools/packet-sd/default.nix +++ b/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"; }; diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index e58b89a27363..d0f141f52404 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 533d4171fd24..11af71b96a8c 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix index c437d93f1013..879131213a03 100644 --- a/pkgs/development/tools/reflex/default.nix +++ b/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 ]; }; } diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 585da934955c..ea7b8880636e 100644 --- a/pkgs/development/tools/run/default.nix +++ b/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; }; } diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index 9b132d4a862b..658de97af29c 100644 --- a/pkgs/games/harmonist/default.nix +++ b/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 ]; }; } diff --git a/pkgs/games/ironwail/default.nix b/pkgs/games/ironwail/default.nix new file mode 100644 index 000000000000..f55d72c4a40b --- /dev/null +++ b/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"; + }; +}) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 81129ba1d695..516e8d4e4653 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/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."); diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 304c40b3fbea..8a7045db1d5a 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/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"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 2bf41c8028d1..e853ff5b25e8 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/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.Veldrid"; version = "4.9.3-gf1f8dc0432"; sha256 = "01xnb43gkbrn3wnb79k9k5cg2xhq4vf94i7c648003i0pdvm0rbz"; }) - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-gf1f8dc0432"; sha256 = "0w15rfshjrkblk91gl7mqdvbfrqi19bpgx60zm42znx5r4ryjix8"; }) - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-gf1f8dc0432"; sha256 = "1mr7mcpjb4fz3lbxi1qv9vwjsbm8sgh20gb8xbvpjkzj9hk5xbp3"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.669-alpha"; sha256 = "0frazc37k9nqzk3sqcy3jzibg9v6dp0ga95yx0rkmjm8jfbw3l9r"; }) + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g31346ea477"; sha256 = "0wrb1skyj58p23ryjkmlk8f1sdhplr5c43w31sw8bhv0yqmhjd80"; }) + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g31346ea477"; sha256 = "0x4i7v7z9n4yryi68h973f5kxiszjdy3hvkgbk4wa9g2skxyknhx"; }) + (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"; }) diff --git a/pkgs/os-specific/linux/pam_rssh/default.nix b/pkgs/os-specific/linux/pam_rssh/default.nix new file mode 100644 index 000000000000..51cba4d84200 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index ee8145dca40c..171724598d44 100644 --- a/pkgs/servers/consul/default.nix +++ b/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; diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 01d71f73a6c9..f85c9aa483c3 100644 --- a/pkgs/servers/dex/default.nix +++ b/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; }; } diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index a324f64abfb4..00b85ddb859f 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/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; }; } diff --git a/pkgs/servers/geospatial/mbtileserver/default.nix b/pkgs/servers/geospatial/mbtileserver/default.nix index 6d53b602b9f6..03c7d33aefad 100644 --- a/pkgs/servers/geospatial/mbtileserver/default.nix +++ b/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; }; } diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/servers/geospatial/pg_featureserv/default.nix index d3be7cd4a4fc..5da5d16e90d9 100644 --- a/pkgs/servers/geospatial/pg_featureserv/default.nix +++ b/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 }; } diff --git a/pkgs/servers/geospatial/pg_tileserv/default.nix b/pkgs/servers/geospatial/pg_tileserv/default.nix index 59d58a6a61c8..5cd8466f97fc 100644 --- a/pkgs/servers/geospatial/pg_tileserv/default.nix +++ b/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; }; } diff --git a/pkgs/servers/geospatial/tegola/default.nix b/pkgs/servers/geospatial/tegola/default.nix index df2ee4330d7c..6cdfe22a7a5a 100644 --- a/pkgs/servers/geospatial/tegola/default.nix +++ b/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; }; } diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 1810a74d0bea..0d175f026c29 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/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; }; } diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index 6cd944470338..8f3f6d1ac61e 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/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; }; } diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 775b4353ab61..18630690cce2 100644 --- a/pkgs/servers/minio/default.nix +++ b/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; }; } diff --git a/pkgs/servers/minio/legacy_fs.nix b/pkgs/servers/minio/legacy_fs.nix index 13c29ac6e399..b1a1499767d1 100644 --- a/pkgs/servers/minio/legacy_fs.nix +++ b/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; }; } diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index b85be770e791..c7b29036a416 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -48,6 +48,5 @@ buildGoModule rec { ''; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 6acfe0dc9f23..412f76aaec73 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -79,7 +79,6 @@ buildGoModule rec { homepage = "https://www.navidrome.org/"; license = lib.licenses.gpl3Only; sourceProvenance = with lib.sourceTypes; [ fromSource ]; - platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aciceri squalus ]; # Broken on Darwin: sandbox-exec: pattern serialization length exceeds maximum (NixOS/nix#4119) broken = stdenv.isDarwin; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index aaea36532158..d001d245d4c0 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -22,7 +22,6 @@ buildGoModule { license = licenses.mit; homepage = "https://bosun.org"; maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix index 238f497776ed..3f6b33b6c1e7 100644 --- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -29,7 +29,6 @@ buildGoModule rec { license = licenses.bsd3; homepage = "https://github.com/esnet/gdg"; maintainers = with maintainers; teams.bitnomial.members; - platforms = platforms.unix; mainProgram = "gdg"; changelog = "https://github.com/esnet/gdg/releases/tag/v${version}"; diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index a8d83d151eab..a32ff40ef03c 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -42,6 +42,5 @@ buildGoModule rec { homepage = "https://github.com/grafana/mimir"; license = licenses.agpl3Only; maintainers = with maintainers; [ happysalada bryanhonof ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index d7e6c01fe022..ab543143eaa2 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -45,6 +45,5 @@ buildGoModule rec { changelog = "https://github.com/prometheus/alertmanager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz globin Frostman ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 20da4e64c1e4..8610a888c48a 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/digitalocean/bind_exporter"; license = licenses.asl20; maintainers = with maintainers; [ rtreffer ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index fe1cdc817ac4..39f37ae58e1d 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/blackbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ globin fpletz willibutz Frostman ma27 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index b4db3ee5679f..3c34ca8b56fa 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/collectd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index cab01f1eb75f..ef6cd07e9f0e 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -27,6 +27,5 @@ buildGoModule rec { changelog = "https://github.com/prometheus/consul_exporter/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ hectorj ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index bd8f667b11c2..0a852b35ecb4 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/mxschmitt/fritzbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp flokli sbruder ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 24784e23585e..aa558bc8c9fd 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/haproxy_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 25fd4552daed..2a546672ec7b 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -32,6 +32,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/mysqld_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley globin ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index cbe5c6ebbace..a0984b510260 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -21,6 +21,5 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ willibutz ]; mainProgram = "nextcloud-exporter"; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 903ae7aa2cae..1b5d81e03623 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz willibutz globin ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 5778bdd589da..c197bf6366c3 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -18,6 +18,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/prom2json"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix index 7dcc5f01e47c..42c624c30010 100644 --- a/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -50,7 +50,6 @@ buildGoModule rec { homepage = "https://github.com/timescale/promscale"; changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ _0x4A6F anpin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 5c7aef8dd059..b32c5a89c6f7 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -32,6 +32,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/pushgateway"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index ff89469c2ead..dca320ccd403 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -18,6 +18,5 @@ buildGoModule rec { homepage = "https://github.com/kbudde/rabbitmq_exporter"; license = licenses.mit; maintainers = with maintainers; [ ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index f0090b97032b..c744aaee92a8 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -29,6 +29,5 @@ buildGoModule rec { homepage = "https://github.com/oliver006/redis_exporter"; license = licenses.mit; maintainers = with maintainers; [ eskytthe srhb ma27 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index 8515bcdd59a4..bb1b8db62e9d 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -33,6 +33,5 @@ buildGoModule rec { homepage = "https://github.com/SuperQ/smokeping_prober"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 7c880509d779..90ba57bd841c 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -24,6 +24,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/snmp_exporter"; license = licenses.asl20; maintainers = with maintainers; [ oida willibutz Frostman ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index cc9fd7d484f5..861ffbaa9796 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -33,6 +33,5 @@ buildGoModule rec { homepage = "https://github.com/justwatchcom/sql_exporter"; license = licenses.mit; maintainers = with maintainers; [ justinas ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 922f4330902e..a08a5b41cc8d 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -22,6 +22,5 @@ buildGoModule rec { changelog = "https://github.com/prometheus/statsd_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ benley ivan ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index 4d5d97da7683..e9aff3c75757 100644 --- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/povilasv/systemd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ chkno ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 9112a1c51c53..079a4c53a384 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -25,6 +25,5 @@ buildGoModule rec { homepage = "https://github.com/pdf/zfs_exporter"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 09c35def8801..37814a417491 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -37,6 +37,5 @@ buildGoModule rec { homepage = "https://github.com/thanos-io/thanos"; license = licenses.asl20; maintainers = with maintainers; [ basvandijk ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 1043ee519bc8..8928234f9672 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -31,6 +31,5 @@ buildGoModule rec { homepage = "https://github.com/Luzifer/nginx-sso"; license = licenses.asl20; maintainers = with maintainers; [ delroth ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index a1c7bcb75553..17c53a2de8ff 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -1,13 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper -, cacert, moreutils, jq, git, pkg-config, yarn, python3 -, esbuild, nodejs, libsecret, xorg, ripgrep -, AppKit, Cocoa, Security, cctools, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +, makeWrapper +, cacert +, moreutils +, jq +, git +, pkg-config +, yarn +, python3 +, esbuild +, nodejs +, libsecret +, xorg +, ripgrep +, AppKit +, Cocoa +, Security +, cctools +, nixosTests +}: let system = stdenv.hostPlatform.system; yarn' = yarn.override { inherit nodejs; }; - defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; + defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress" ]; vsBuildTarget = { x86_64-linux = "linux-x64"; @@ -30,27 +49,27 @@ let }; # replaces esbuild's download script with a binary from nixpkgs - patchEsbuild = path : version : '' + patchEsbuild = path: version: '' mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation (finalAttrs: { pname = "openvscode-server"; - version = "1.78.2"; + version = "1.79.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; - rev = "openvscode-server-v${version}"; - sha256 = "sha256-+Q/j3h7ZvNDxrjEk01QUOrVwcwGW4OBBpmfjEtHQj2o="; + rev = "openvscode-server-v${finalAttrs.version}"; + hash = "sha256-dVzGyK1ybZywCm602zWJroSCQ2wx5IzV+HqwZUsEgKU="; }; yarnCache = stdenv.mkDerivation { - name = "${pname}-${version}-${system}-yarn-cache"; - inherit src; + name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache"; + inherit (finalAttrs) src; nativeBuildInputs = [ cacert yarn' git ]; buildPhase = '' export HOME=$PWD @@ -68,17 +87,27 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-XOFBXYP3c4vbvl0/uXsmo8FdO/2PudzJhm9L+9VArdI="; + outputHash = "sha256-P6mzeE3HnS/KoP7kCXJlDkFWkTKiGjJkOUXfGOru/xE="; }; nativeBuildInputs = [ - nodejs yarn' python3 pkg-config makeWrapper git jq moreutils + nodejs + yarn' + python3 + pkg-config + makeWrapper + git + jq + moreutils ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ (with xorg; [ libX11 libxkbfile ]) ++ lib.optionals stdenv.isDarwin [ - AppKit Cocoa Security cctools - ]; + AppKit + Cocoa + Security + cctools + ]; patches = [ # Patch out remote download of nodejs from build script @@ -100,19 +129,25 @@ in stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure + # set default yarn opts ${lib.concatMapStrings (option: '' yarn --offline config set ${option} '') defaultYarnOpts} # set offline mirror to yarn cache we created in previous steps - yarn --offline config set yarn-offline-mirror "${yarnCache}" + yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" # set nodedir, so we can build binaries later npm config set nodedir "${nodejs}" + + runHook postConfigure ''; buildPhase = '' + runHook preBuild + # install dependencies yarn --offline --ignore-scripts @@ -155,27 +190,33 @@ in stdenv.mkDerivation rec { # build and minify yarn --offline gulp vscode-reh-web-${vsBuildTarget}-min + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out cp -R -T ../vscode-reh-web-${vsBuildTarget} $out ln -s ${nodejs}/bin/node $out + + runHook postInstall ''; passthru.tests = { inherit (nixosTests) openvscode-server; }; - meta = with lib; { + meta = { description = "Run VS Code on a remote machine"; longDescription = '' Run upstream VS Code on a remote machine with access through a modern web browser from any device, anywhere. ''; homepage = "https://github.com/gitpod-io/openvscode-server"; - license = licenses.mit; - maintainers = with maintainers; [ dguenther ghuntley emilytrau ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dguenther ghuntley emilytrau ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index f43a9576b5cc..4756ae22ab7d 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.16"; + version = "0.3.17"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-sE+HeXg6JovLXhFFJhgsASfObvzgeYX+MjwI5b7G0gI="; + sha256 = "sha256-UsoNsGS2JWiI1EotUXjKwtR0WIk+z/5/a0AJySw4xnQ="; fetchSubmodules = true; }; - cargoHash = "sha256-7ykVKPjCFwpLqdPiWlxO/rBofgbfv+U3aM50RhzjGVY="; + cargoHash = "sha256-lQVWpIhWTUQTcMaPJ1z8wJI7/EBU+YoFkC92JhLCxe8="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ee118b89b4ab..104f48407fe6 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -149,6 +149,9 @@ let ./patch/cmake-plugin-includedir.patch ]; + buildInputs = common.buildInputs + ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; + cmakeFlags = common.cmakeFlags ++ [ "-DPLUGIN_AUTH_PAM=NO" "-DWITHOUT_SERVER=ON" diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 4d9b0fce6f2e..20ef33ea3216 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-5cVfZk2bFop/EQjvfObiN/AF/iv3DqDIKb/BkbEyKbE="; + hash = "sha256-01d5pH7QK72orttbelTzqwpDBS9+qYYgn7cc9qGZ/RI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index f01a060c528e..db4aa9dbcea6 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { license = licenses.lgpl3Only; maintainers = with maintainers; [ canndrew jb55 prusnak mmahut _1000101 ]; mainProgram = "trezord-go"; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch index c8840db42e7b..0731e64fefd0 100644 --- a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch +++ b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch @@ -1,10 +1,11 @@ --- a/plugins/GeoIp2/config/config.php +++ b/plugins/GeoIp2/config/config.php -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ DI\string('{path.root}/misc/'), + 'path.geoip2' => PIWIK_USER_PATH . '/misc/', + 'geopip2.ispEnabled' => true ]; \ Pas de fin de ligne à la fin du fichier diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 57b70abe4669..fbf16151ef10 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,19 +3,18 @@ let versions = { matomo = { - version = "4.10.1"; - sha256 = "sha256-TN2xy3YHhtuewmi7h9vtMKElRI8uWOvnYzG1RlIGT3U="; + version = "4.14.2"; + hash = "sha256-jPs/4bgt7VqeSoeLnwHr+FI426hAhwiP8RciQDNwCpo="; }; - matomo-beta = { - version = "4.11.0"; + version = "4.14.3"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "rc2"; - sha256 = "sha256-PYzv4OJYI4Zf7LMXQvX7fhvXryS6XPbmA0pTesF1vQ8="; + beta = "b6"; + hash = "sha256-WGyGoTugxHgB2by1F57PQhyqQRjoKBCvwFBZvpsHwZg="; }; }; - common = pname: { version, sha256, beta ? null }: + common = pname: { version, hash, beta ? null }: let fullVersion = version + lib.optionalString (beta != null) "-${toString beta}"; name = "${pname}-${fullVersion}"; @@ -27,7 +26,7 @@ let src = fetchurl { url = "https://builds.matomo.org/matomo-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ makeWrapper ]; @@ -109,7 +108,7 @@ let license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi sebbel ]; + maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ]; }; }; in diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index bf4ed7feb7dd..edbc3a624337 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://rsteube.github.io/carapace-bin/"; maintainers = with maintainers; [ star-szr ]; license = licenses.mit; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 5d228e93f118..965c6807803e 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -24,6 +24,5 @@ buildGoModule rec { homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; maintainers = [ maintainers.mbode ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index f9af2e94c015..75a4bc591e7b 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -56,6 +56,5 @@ buildGoModule rec { description = "A tool for managing secrets on Google Cloud"; homepage = "https://github.com/GoogleCloudPlatform/berglas"; license = licenses.asl20; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 0fea9e35bd29..393fc0d3df20 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { version = "3.69.0"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-oXsU4h4CwukJHttYLT7JiW2He8Yq5qAwnxL8+G5FIpc="; + sdkVendorHash = "sha256-S8eb2V7ZHhQ0xas+88lwxjL50+22dbyJ0aM60dAtb5k="; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/tools/admin/scalr-cli/default.nix b/pkgs/tools/admin/scalr-cli/default.nix index eaccb70f0f7d..125d20351464 100644 --- a/pkgs/tools/admin/scalr-cli/default.nix +++ b/pkgs/tools/admin/scalr-cli/default.nix @@ -38,6 +38,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ dylanmtaylor ]; mainProgram = "scalr"; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index d7548bf9abf5..39dbcb952329 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -29,6 +29,5 @@ buildGoModule rec { homepage = "https://github.com/natsukagami/mpd-mpris"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/tools/backup/gamerbackup/default.nix index a6e6246bb339..3ed1df9058cf 100644 --- a/pkgs/tools/backup/gamerbackup/default.nix +++ b/pkgs/tools/backup/gamerbackup/default.nix @@ -26,6 +26,5 @@ buildGoModule { homepage = "https://github.com/leijurv/gb"; license = licenses.agpl3Only; maintainers = with maintainers; [ babbaj ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index 4eb50aa9de10..ded6bbaa533b 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -17,7 +17,6 @@ buildGoModule rec { changelog = "https://github.com/restic/rest-server/blob/${src.rev}/CHANGELOG.md"; description = "A high performance HTTP server that implements restic's REST backend API"; homepage = "https://github.com/restic/rest-server"; - platforms = platforms.unix; license = licenses.bsd2; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 795e653087b1..b04497b1104c 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -42,7 +42,6 @@ buildGoModule rec { homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 8805da7ebe71..fd774726285b 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -1,32 +1,23 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, libXrandr, libX11 }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "shotgun"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "neXromancers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fcb+eZXzpuEPFSZexbgDpoBX85gsiIqPlcPXruNGenk="; + sha256 = "sha256-ovqPBZznDQnQa9YW1xXA02Jl0AQ7sJNpzovA1SVR8Zc="; }; - cargoSha256 = "sha256-n5HPl2h0fr0MyGBivNVrrs23HAllIYtwaw1aaKWHCe4="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libXrandr libX11 ]; - - # build script tries to run git to get the current tag - postPatch = '' - echo "fn main() {}" > build.rs - ''; + cargoSha256 = "sha256-mWifSN9Hpsivq0RdZ9l9+8CWaZMHfzzhT2r27FAuesU="; meta = with lib; { description = "Minimal X screenshot utility"; homepage = "https://github.com/neXromancers/shotgun"; license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ figsoda lumi ]; + maintainers = with maintainers; [ figsoda lumi novenary ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/adrgen/default.nix b/pkgs/tools/misc/adrgen/default.nix index 777994d83edd..6f8c50bd19d0 100644 --- a/pkgs/tools/misc/adrgen/default.nix +++ b/pkgs/tools/misc/adrgen/default.nix @@ -38,7 +38,6 @@ buildGoModule rec { homepage = "https://github.com/asiermarques/adrgen"; description = "A command-line tool for generating and managing Architecture Decision Records"; license = licenses.mit; - platforms = platforms.unix; maintainers = [ maintainers.ivar ]; }; } diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index e42d4871e117..7af1612acdd3 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -35,7 +35,6 @@ buildGoModule rec { homepage = "https://www.aptly.info"; description = "Debian repository management tool"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members; changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${version}"; diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix index 7c9a35f1ebce..9d360e40c2a8 100644 --- a/pkgs/tools/misc/claws/default.nix +++ b/pkgs/tools/misc/claws/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { homepage = "https://github.com/thehowl/claws"; description = "Interactive command line client for testing websocket servers"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 5359c37e01bc..5416f0c87cf1 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -25,7 +25,6 @@ buildGoModule rec { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ penguwin SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/dwarf2json/default.nix b/pkgs/tools/misc/dwarf2json/default.nix index acad4c64bfee..57aaf861186d 100644 --- a/pkgs/tools/misc/dwarf2json/default.nix +++ b/pkgs/tools/misc/dwarf2json/default.nix @@ -17,7 +17,6 @@ buildGoModule rec { homepage = "https://github.com/volatilityfoundation/dwarf2json"; description = "Convert ELF/DWARF symbol and type information into vol3's intermediate JSON"; license = licenses.vol-sl; - platforms = platforms.unix; maintainers = with maintainers; [ arkivm ]; }; } diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 0f2300a74805..7111d7c82306 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/kshvmdn/fsql"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/grit/default.nix b/pkgs/tools/misc/grit/default.nix index 04f88360fed7..5b3aca5e25ce 100644 --- a/pkgs/tools/misc/grit/default.nix +++ b/pkgs/tools/misc/grit/default.nix @@ -18,7 +18,6 @@ buildGoModule rec { description = "A multitree-based personal task manager"; homepage = "https://github.com/climech/grit"; license = licenses.mit; - platforms = platforms.unix; maintainers = [ maintainers.ivar ]; }; } diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index cd569b8cc624..e5e7d4bcdb41 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -25,6 +25,5 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ timstott ]; mainProgram = "lokalise2"; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 970d7a0c3952..2b328e474bb9 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -21,7 +21,6 @@ buildGoModule rec { homepage = "https://github.com/justjanne/powerline-go"; changelog = "https://github.com/justjanne/powerline-go/releases/tag/v${version}"; license = licenses.gpl3Plus; - platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; mainProgram = "powerline-go"; }; diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index b507aecb2867..ed01beeb7838 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -17,7 +17,6 @@ buildGoModule rec { homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; license = with licenses; [ gpl3Only ]; - platforms = platforms.unix; maintainers = with maintainers; [ xrelkd ]; }; } diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index b79df12bfb49..f56e4cc7f201 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/tools/networking/doggo/default.nix index d267cf276c49..10d2fef2ef3a 100644 --- a/pkgs/tools/networking/doggo/default.nix +++ b/pkgs/tools/networking/doggo/default.nix @@ -38,7 +38,6 @@ buildGoModule rec { It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well ''; license = licenses.gpl3Only; - platforms = platforms.unix; maintainers = with maintainers; [ georgesalkhouri ]; }; } diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix index 5d65e110d9c6..404ed07460ac 100644 --- a/pkgs/tools/networking/goreplay/default.nix +++ b/pkgs/tools/networking/goreplay/default.nix @@ -31,7 +31,6 @@ buildGoModule rec { homepage = "https://github.com/buger/goreplay"; license = lib.licenses.lgpl3Only; description = "Open-source tool for capturing and replaying live HTTP traffic"; - platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ lovek323 ]; }; } diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index c2a9cf425245..fabd4de1f49f 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -24,7 +24,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/tnpitsecurity/ligolo-ng"; description = "A tunneling/pivoting tool that uses a TUN interface"; - platforms = platforms.unix; license = licenses.gpl3Only; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 39ef3ae81cb6..f8c4175e8a3c 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -33,7 +33,6 @@ buildGoModule rec { description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; maintainers = with maintainers; [ bachp eelco ]; mainProgram = "mc"; - platforms = platforms.unix; license = licenses.asl20; }; } diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index c8c5ca118dd4..371d39193f36 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -23,6 +23,5 @@ buildGoModule rec { homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bbigras danderson ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index b8810ad36dfc..ec2e63fe3972 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -33,6 +33,5 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/dbcdk/morph"; maintainers = with maintainers; [adamt johanot]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 9d97a472a160..ea0c1d06073f 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -33,6 +33,5 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ pjones ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 52fedf3feef4..71368e35d5e1 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -14,7 +14,6 @@ buildGoModule { meta = with lib; { homepage = "https://keybase.io/docs/kbfs"; description = "The Keybase filesystem"; - platforms = platforms.unix; maintainers = with maintainers; [ avaq rvolosatovs bennofs np shofius ]; license = licenses.bsd3; }; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 57655b32dc6a..cddb284e80c3 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -25,7 +25,6 @@ buildGoModule rec { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; homepage = "https://github.com/Versent/saml2aws"; license = licenses.mit; - platforms = lib.platforms.unix; maintainers = [ lib.maintainers.pmyjavec ]; }; } diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index ec69085db959..2d0b7330e3ee 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -26,6 +26,5 @@ buildGoModule rec { homepage = "https://github.com/Mic92/ssh-to-age"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index 40fc48b8ffa6..1de0fa7c4e3c 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -22,8 +22,6 @@ buildGoModule rec { homepage = "https://github.com/DataDog/gohai"; license = licenses.mit; maintainers = with maintainers; [ tazjin ]; - platforms = platforms.unix; - longDescription = '' Gohai is a tool which collects an inventory of system information. It is used by the Datadog agent to provide detailed diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index db8d1003cd3c..21db5f5c72ff 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/parse-nl/SystemdJournal2Gelf"; license = licenses.bsd2; maintainers = with maintainers; [ fadenb fpletz ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index efddd0ab6c79..839e36bba8f4 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "d2"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-kfpCu79lJUxPvxSKplRziVnDyohY8xnxnO3ZoG2WgEs="; + hash = "sha256-Oq6bJ/cX+kDyVUVP/RpCIcNeWpT3HESUMmR6mEi9X4Q="; }; - vendorHash = "sha256-oPI6FPfBIPKZDLoyGblcG5UcmoFWufZ2NIEClpSIJzU="; + vendorHash = "sha256-SocBC/1LrdSQNfcNVa9nnPaq/UvLVIghHlUSJB7ImBk="; excludedPackages = [ "./e2etests" ]; diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index b30a21a6f49c..855a61186a87 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://github.com/noqcks/gucci"; license = licenses.mit; maintainers = with maintainers; [ braydenjw ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 55de563c538b..0cb100dde5e3 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -27,6 +27,5 @@ buildGoModule rec { homepage = "https://github.com/mmarkdown/mmark"; license = with lib.licenses; bsd2; maintainers = with lib.maintainers; [ yrashk ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbc9e27480c8..ef5d803a3d0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27608,6 +27608,8 @@ with pkgs; pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { }; + pam_rssh = callPackage ../os-specific/linux/pam_rssh { }; + pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; pam_tmpdir = callPackage ../os-specific/linux/pam_tmpdir { }; @@ -36801,6 +36803,8 @@ with pkgs; # used as base package for iortcw forks iortcw_sp = callPackage ../games/iortcw/sp.nix { }; + ironwail = callPackage ../games/ironwail { }; + ivan = callPackage ../games/ivan { }; ja2-stracciatella = callPackage ../games/ja2-stracciatella {