diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index a3b711d1388e..95d5a80b7330 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -209,6 +209,16 @@
services.opensnitch.rules
+
+
+ The module usbmuxd now has the ability to
+ change the package used by the daemon. In case you’re
+ experiencing issues with usbmuxd you can
+ try an alternative program like usbmuxd2.
+ Available as
+ services.usbmuxd.package
+
+
services.mastodon gained a tootctl wrapped
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index d2cc43a5dffc..de376a7403b9 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -61,6 +61,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules)
+- The module `usbmuxd` now has the ability to change the package used by the daemon. In case you're experiencing issues with `usbmuxd` you can try an alternative program like `usbmuxd2`. Available as [services.usbmuxd.package](#opt-services.usbmuxd.package)
+
- `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables.
- The `dnsmasq` service now takes configuration via the
diff --git a/nixos/modules/misc/man-db.nix b/nixos/modules/misc/man-db.nix
index df903259fa42..299b11d1fcef 100644
--- a/nixos/modules/misc/man-db.nix
+++ b/nixos/modules/misc/man-db.nix
@@ -52,13 +52,11 @@ in
environment.systemPackages = [ cfg.package ];
environment.etc."man_db.conf".text =
let
- mandbForBuild = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
- cfg.package
- else
- pkgs.buildPackages.man-db;
- manualCache = pkgs.runCommand "man-cache" { } ''
+ manualCache = pkgs.runCommand "man-cache" {
+ nativeBuildInputs = [ cfg.package ];
+ } ''
echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf
- ${mandbForBuild}/bin/mandb -C man.conf -psc >/dev/null 2>&1
+ mandb -C man.conf -psc >/dev/null 2>&1
'';
in
''
diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix
index 602278d1ba9b..f753cf5f97e5 100644
--- a/nixos/modules/programs/nix-ld.nix
+++ b/nixos/modules/programs/nix-ld.nix
@@ -1,10 +1,68 @@
{ pkgs, lib, config, ... }:
+let
+ cfg = config.programs.nix-ld;
+
+ # TODO make glibc here configureable?
+ nix-ld-so = pkgs.runCommand "ld.so" {} ''
+ ln -s "$(cat '${pkgs.stdenv.cc}/nix-support/dynamic-linker')" $out
+ '';
+
+ nix-ld-libraries = pkgs.buildEnv {
+ name = "lb-library-path";
+ pathsToLink = [ "/lib" ];
+ paths = map lib.getLib cfg.libraries;
+ extraPrefix = "/share/nix-ld";
+ ignoreCollisions = true;
+ };
+
+ # We currently take all libraries from systemd and nix as the default.
+ # Is there a better list?
+ baseLibraries = with pkgs; [
+ zlib
+ zstd
+ stdenv.cc.cc
+ curl
+ openssl
+ attr
+ libssh
+ bzip2
+ libxml2
+ acl
+ libsodium
+ util-linux
+ xz
+ systemd
+ ];
+in
{
meta.maintainers = [ lib.maintainers.mic92 ];
options = {
- programs.nix-ld.enable = lib.mkEnableOption (lib.mdDoc ''nix-ld, Documentation: '');
+ programs.nix-ld = {
+ enable = lib.mkEnableOption (lib.mdDoc ''nix-ld, Documentation: '');
+ package = lib.mkOption {
+ type = lib.types.package;
+ description = lib.mdDoc "Which package to use for the nix-ld.";
+ default = pkgs.nix-ld;
+ defaultText = lib.mdDoc "pkgs.nix-ld";
+ };
+ libraries = lib.mkOption {
+ type = lib.types.listOf lib.types.package;
+ description = lib.mdDoc "Libraries that automatically become available to all programs. The default set includes common libraries.";
+ default = baseLibraries;
+ defaultText = lib.mdDoc "baseLibraries";
+ };
+ };
};
config = lib.mkIf config.programs.nix-ld.enable {
- systemd.tmpfiles.packages = [ pkgs.nix-ld ];
+ systemd.tmpfiles.packages = [ cfg.package ];
+
+ environment.systemPackages = [ nix-ld-libraries ];
+
+ environment.pathsToLink = [ "/share/nix-ld" ];
+
+ environment.variables = {
+ NIX_LD = toString nix-ld-so;
+ NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib";
+ };
};
}
diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix
index b4c954906dd3..9466ea26995b 100644
--- a/nixos/modules/services/hardware/usbmuxd.nix
+++ b/nixos/modules/services/hardware/usbmuxd.nix
@@ -13,6 +13,7 @@ in
{
options.services.usbmuxd = {
+
enable = mkOption {
type = types.bool;
default = false;
@@ -39,6 +40,15 @@ in
The group usbmuxd should use to run after startup.
'';
};
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.usbmuxd;
+ defaultText = literalExpression "pkgs.usbmuxd";
+ description = lib.mdDoc "Which package to use for the usbmuxd daemon.";
+ relatedPackages = [ "usbmuxd" "usbmuxd2" ];
+ };
+
};
config = mkIf cfg.enable {
@@ -68,7 +78,7 @@ in
# Trigger the udev rule manually. This doesn't require replugging the
# device when first enabling the option to get it to work
ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}";
- ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f";
+ ExecStart = "${cfg.package}/bin/usbmuxd -U ${cfg.user} -v";
};
};
diff --git a/nixos/tests/nix-ld.nix b/nixos/tests/nix-ld.nix
index ae5297ab87ea..8733f5b0c397 100644
--- a/nixos/tests/nix-ld.nix
+++ b/nixos/tests/nix-ld.nix
@@ -12,9 +12,6 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
};
testScript = ''
start_all()
- path = "${pkgs.stdenv.cc}/nix-support/dynamic-linker"
- with open(path) as f:
- real_ld = f.read().strip()
- machine.succeed(f"NIX_LD={real_ld} hello")
+ machine.succeed("hello")
'';
})
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 7e3dd42b578d..7bd88eaa7545 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -34,6 +34,7 @@
, pango
, pipewire
, systemd
+, wayland
, xdg-utils
, xorg
}:
@@ -121,6 +122,7 @@ let
pipewire
stdenv.cc.cc
systemd
+ wayland
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix
index 12289f2fb2ad..9c2cabe7e8f0 100644
--- a/pkgs/desktops/enlightenment/terminology/default.nix
+++ b/pkgs/desktops/enlightenment/terminology/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "terminology";
- version = "1.12.1";
+ version = "1.13.0";
src = fetchurl {
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1aasddf2343qj798b5s8qwif3lxj4pyjax6fa9sfi6if9icdkkpq";
+ sha256 = "FqN/7Ne71j7J3j7GwK8zHO531t/ag4obFXPW8phHTaU=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index d79923c0f81a..60ad2868318f 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -54,14 +54,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flatpak";
- version = "1.14.0";
+ version = "1.14.1";
# TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
- sha256 = "sha256-jidpc3cOok3fJZetSuzTa5g5PmvekeSOF0OqymfyeBU="; # Taken from https://github.com/flatpak/flatpak/releases/
+ sha256 = "sha256-CjyCM0MBjMWJhrbIJUVgnIzb8Pul8B2IMHvRSstd058="; # Taken from https://github.com/flatpak/flatpak/releases/
};
patches = [
@@ -89,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/NixOS/nixpkgs/issues/53441
./unset-env-vars.patch
- # Do not clear XDG_DATA_DIRS in fish shell
- # https://github.com/flatpak/flatpak/pull/5123
- ./no-breaking-fish.patch
-
# The icon validator needs to access the gdk-pixbuf loaders in the Nix store
# and cannot bind FHS paths since those are not available on NixOS.
finalAttrs.passthru.icon-validator-patch
diff --git a/pkgs/development/libraries/flatpak/no-breaking-fish.patch b/pkgs/development/libraries/flatpak/no-breaking-fish.patch
deleted file mode 100644
index 2a67aead1201..000000000000
--- a/pkgs/development/libraries/flatpak/no-breaking-fish.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/profile/flatpak.fish
-+++ b/profile/flatpak.fish
-@@ -1,7 +1,7 @@
- if type -q flatpak
- # Set XDG_DATA_DIRS to include Flatpak installations
-
-- set -x --path XDG_DATA_DIRS
-+ set -x --path XDG_DATA_DIRS $XDG_DATA_DIRS
-
- set -q XDG_DATA_DIRS[1]; or set XDG_DATA_DIRS /usr/local/share /usr/share
- set -q XDG_DATA_HOME; or set -l XDG_DATA_HOME $HOME/.local/share
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 438940f3bac6..2cadab4a6742 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -27,7 +27,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xdg-desktop-portal";
- version = "1.15.0";
+ version = "1.16.0";
outputs = [ "out" "installedTests" ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "flatpak";
repo = "xdg-desktop-portal";
rev = finalAttrs.version;
- sha256 = "sha256-Kw3zJeGwPfw1fDo8HsgYmrpgCk/PUvWZPRloKJNAJVc=";
+ sha256 = "sha256-5VNauinTvZrSaQzyP/quL/3p2RPcTJUDLscEQMJpvYA=";
};
patches = [
diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
index 3d10fca06c05..95b1b5600959 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -5,45 +5,49 @@
, jinja2
, pytestCheckHook
, railroad-diagrams
+, pyparsing
}:
-let
- pyparsing = buildPythonPackage rec {
- pname = "pyparsing";
- version = "3.0.9";
- format = "pyproject";
+buildPythonPackage rec {
+ pname = "pyparsing";
+ version = "3.0.9";
+ format = "pyproject";
- src = fetchFromGitHub {
- owner = "pyparsing";
- repo = pname;
- rev = "pyparsing_${version}";
- sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE=";
- };
-
- nativeBuildInputs = [
- flit-core
- ];
-
- # circular dependencies with pytest if enabled by default
- doCheck = false;
- checkInputs = [
- jinja2
- pytestCheckHook
- railroad-diagrams
- ];
-
- pythonImportsCheck = [ "pyparsing" ];
-
- passthru.tests = {
- check = pyparsing.overridePythonAttrs (_: { doCheck = true; });
- };
-
- meta = with lib; {
- homepage = "https://github.com/pyparsing/pyparsing";
- description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
- license = licenses.mit;
- maintainers = with maintainers; [ kamadorueda ];
- };
+ src = fetchFromGitHub {
+ owner = "pyparsing";
+ repo = pname;
+ rev = "pyparsing_${version}";
+ sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE=";
};
-in
-pyparsing
+
+ nativeBuildInputs = [
+ flit-core
+ ];
+
+ # circular dependencies with pytest if enabled by default
+ doCheck = false;
+ checkInputs = [
+ jinja2
+ pytestCheckHook
+ railroad-diagrams
+ ];
+
+ pythonImportsCheck = [ "pyparsing" ];
+
+ passthru.tests = {
+ check = pyparsing.overridePythonAttrs (_: { doCheck = true; });
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/pyparsing/pyparsing";
+ description = "Python library for creating PEG parsers";
+ longDescription = ''
+ The pyparsing module is an alternative approach to creating and executing
+ simple grammars, vs. the traditional lex/yacc approach, or the use of
+ regular expressions. The pyparsing module provides a library of classes
+ that client code uses to construct the grammar directly in Python code.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ kamadorueda ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index c3042ef2c178..aa7f997d1935 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
- rev = "14623b935766e11a0a3f6ab1f686bb1c5d244b21";
- version = "2022-10-17";
+ rev = "5eeee846642c8226931263ed758ef80f077cadaf";
+ version = "2022-11-11";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
- sha256 = "nwhNevyLOzkYdpm1AK5I4ByJ7VdnlgwcSjXV11pzZkw=";
+ sha256 = "2eUGQa0SdfnENbnjy9ZDxd0lKhUrzmTyDLB4fupqVIs=";
};
dontBuild = true;
diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix
new file mode 100644
index 000000000000..39ec1d018d37
--- /dev/null
+++ b/pkgs/development/tools/supabase-cli/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+}:
+
+buildGoModule rec {
+ pname = "supabase-cli";
+ version = "1.27.0";
+
+ src = fetchFromGitHub {
+ owner = "supabase";
+ repo = "cli";
+ rev = "v${version}";
+ sha256 = "sha256-gAfgqOeJ1cQ5Igxcut0FXkzhK38Q/mUTXfFaZE0dNCs=";
+ };
+
+ vendorSha256 = "sha256-RO9dZP236Kt8SSpZFF7KRksrjgwiEkPxE5DIMUK69Kw=";
+
+ ldflags = [ "-s" "-w" "-X" "github.com/supabase/cli/cmd.version=${version}" ];
+
+ doCheck = false; # tests are trying to connect to localhost
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ rm $out/bin/{codegen,docgen,listdep}
+ mv $out/bin/{cli,supabase}
+
+ installShellCompletion --cmd supabase \
+ --bash <($out/bin/supabase completion bash) \
+ --fish <($out/bin/supabase completion fish) \
+ --zsh <($out/bin/supabase completion zsh)
+ '';
+
+ meta = with lib; {
+ description = "A CLI for interacting with supabase";
+ homepage = "https://github.com/supabase/cli";
+ license = licenses.mit;
+ maintainers = with maintainers; [ gerschtli ];
+ mainProgram = "supabase";
+ };
+}
diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix
index 8511d3c249aa..357ae08a5acc 100644
--- a/pkgs/development/tools/uniffi-bindgen/default.nix
+++ b/pkgs/development/tools/uniffi-bindgen/default.nix
@@ -11,14 +11,14 @@
rustPlatform.buildRustPackage rec {
pname = "uniffi-bindgen";
- version = "0.21.0";
+ version = "0.22.0";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-yVpxyYaFkX1HuFi4xcj45rsMbMIcdTHs9zfGvtcFdH8=";
+ sha256 = "sha256-cUJsfAlzdoGMeFcdXwdPU0JcruneY60pssJPkJtb5gs=";
};
- cargoSha256 = "sha256-qn27aRVdD+/EWmCSF2t+CdMhtOknDCVnG9uDa2Rwf0A=";
+ cargoSha256 = "sha256-k5uIR5rO4T1Xsu50vdLxCgSsVkNcxXHT4MitnMZkY6g=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix
index 4fc37b0ca25c..227de62b4734 100644
--- a/pkgs/games/airshipper/default.nix
+++ b/pkgs/games/airshipper/default.nix
@@ -12,30 +12,58 @@
, libXrandr
, libXi
, libXcursor
+, udev
+, alsa-lib
+, stdenv
+, libxcb
, pkg-config
, makeWrapper
+, writeShellScript
+, patchelf
}:
-
-rustPlatform.buildRustPackage rec {
+let
+ version = "0.10.0";
+ # Patch for airshipper to install veloren
+ patch = let
+ runtimeLibs = [
+ udev
+ alsa-lib
+ stdenv.cc.cc.lib
+ libxkbcommon
+ libxcb
+ libX11
+ libXcursor
+ libXrandr
+ libXi
+ vulkan-loader
+ libGL
+ ];
+ in
+ writeShellScript "patch" ''
+ echo "making binaries executable"
+ chmod +x {veloren-voxygen,veloren-server-cli}
+ echo "patching dynamic linkers"
+ ${patchelf}/bin/patchelf \
+ --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \
+ veloren-server-cli
+ ${patchelf}/bin/patchelf \
+ --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \
+ --set-rpath "${lib.makeLibraryPath runtimeLibs}" \
+ veloren-voxygen
+ '';
+in
+rustPlatform.buildRustPackage {
pname = "airshipper";
- version = "0.7.0";
+ inherit version;
src = fetchFromGitLab {
owner = "Veloren";
repo = "airshipper";
rev = "v${version}";
- sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug=";
+ sha256 = "sha256-5zP1Ye1fJNQp8eWKwdxLqBr4qzBfWEEBsJ9s7+8idL4=";
};
- patches = [
- # this *should* be merged in time for the release following 0.7.0
- (fetchpatch {
- url = "https://github.com/veloren/Airshipper/commit/97fc986ab4cbf59f2c764f647710f19db86031b4.patch";
- hash = "sha256-Sg5et+yP6Z44wV/t9zqKLpg1C0cq6rV+3WrzAH4Za3U=";
- })
- ];
-
- cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw=";
+ cargoSha256 = "sha256-oksJYuuHdfP5mMQ+zYHH5SgD6YUK+zE3+AY90ZzHRUU=";
buildInputs = [
openssl
@@ -49,9 +77,11 @@ rustPlatform.buildRustPackage rec {
];
nativeBuildInputs = [ pkg-config makeWrapper ];
+ RUSTC_BOOTSTRAP = 1; # We need rust unstable features
+
postInstall = ''
install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop"
- install -Dm444 "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico"
+ install -Dm444 "client/assets/net.veloren.airshipper.png" "$out/share/icons/net.veloren.airshipper.png"
'';
postFixup =
@@ -70,6 +100,7 @@ rustPlatform.buildRustPackage rec {
in
''
patchelf --set-rpath "${libPath}" "$out/bin/airshipper"
+ wrapProgram "$out/bin/airshipper" --set VELOREN_PATCHER "${patch}"
'';
doCheck = false;
diff --git a/pkgs/os-specific/linux/nix-ld/default.nix b/pkgs/os-specific/linux/nix-ld/default.nix
index b54f9e36515d..0ce112e0a13d 100644
--- a/pkgs/os-specific/linux/nix-ld/default.nix
+++ b/pkgs/os-specific/linux/nix-ld/default.nix
@@ -12,13 +12,13 @@ let
in
stdenv.mkDerivation rec {
pname = "nix-ld";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "mic92";
repo = "nix-ld";
rev = version;
- sha256 = "sha256-DlWU5i/MykqWgB9vstYbECy3e+XagXWCxi+XDJNey0s=";
+ sha256 = "sha256-KmnT8YfU/KI4VxBlFMUltlAVLNvF7fTEQEsp41ZUHlA=";
};
doCheck = true;
diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix
index caf9ce9c581a..c1c76934945f 100644
--- a/pkgs/tools/admin/pulumi-packages/default.nix
+++ b/pkgs/tools/admin/pulumi-packages/default.nix
@@ -6,7 +6,7 @@ in
{
pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { };
pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { };
- pulumi-language-python = callPackage ./pulumi-language-python.nix { };
pulumi-language-nodejs = callPackage ./pulumi-language-nodejs.nix { };
+ pulumi-language-python = callPackage ./pulumi-language-python.nix { };
pulumi-random = callPackage' ./pulumi-random.nix { };
}
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix
index 828483c22859..c599d6e0a9d1 100644
--- a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix
@@ -4,13 +4,13 @@
, nodejs
}:
buildGoModule rec {
- inherit (pulumi) version src;
+ inherit (pulumi) version src sdkVendorHash;
pname = "pulumi-language-nodejs";
sourceRoot = "${src.name}/sdk";
- vendorHash = "sha256-IZIdLmNGMFjRdkLPoE9UyON3pX/GBIgz/rv108v8iLY=";
+ vendorHash = sdkVendorHash;
subPackages = [
"nodejs/cmd/pulumi-language-nodejs"
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix
index 1bd996e88b41..2f0810b04b83 100644
--- a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix
@@ -4,13 +4,13 @@
, python3
}:
buildGoModule rec {
- inherit (pulumi) version src;
+ inherit (pulumi) version src sdkVendorHash;
pname = "pulumi-language-python";
sourceRoot = "${src.name}/sdk";
- vendorHash = "sha256-gM3VpX6r/BScUyvk/XefAfbx0qYzdzSBGaWZN+89BS8=";
+ vendorHash = sdkVendorHash;
postPatch = ''
# Requires network
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index d487d60437b1..ddfbfee6107f 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -16,6 +16,9 @@ buildGoModule rec {
pname = "pulumi";
version = "3.49.0";
+ # Used in pulumi-language packages, which inherit this prop
+ sdkVendorHash = "sha256-gM3VpX6r/BScUyvk/XefAfbx0qYzdzSBGaWZN+89BS8=";
+
src = fetchFromGitHub {
owner = pname;
repo = pname;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0636572aa450..730841f0ad5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18119,6 +18119,8 @@ with pkgs;
summon = callPackage ../development/tools/summon { };
+ supabase-cli = callPackage ../development/tools/supabase-cli { };
+
svlint = callPackage ../development/tools/analysis/svlint { };
svls = callPackage ../development/tools/misc/svls { };