diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0c095db96bcd..338202655e42 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5312,6 +5312,12 @@
githubId = 39689;
name = "Hugo Tavares Reis";
};
+ hufman = {
+ email = "hufman@gmail.com";
+ github = "hufman";
+ githubId = 1592375;
+ name = "Walter Huf";
+ };
hugolgst = {
email = "hugo.lageneste@pm.me";
github = "hugolgst";
@@ -9563,6 +9569,15 @@
fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D";
}];
};
+ ocfox = {
+ email = "i@ocfox.me";
+ github = "ocfox";
+ githubId = 47410251;
+ name = "ocfox";
+ keys = [{
+ fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F";
+ }];
+ };
odi = {
email = "oliver.dunkl@gmail.com";
github = "odi";
@@ -12050,15 +12065,6 @@
githubId = 9720532;
name = "Sergei K";
};
- sondr3 = {
- email = "nilsen.sondre@gmail.com";
- github = "sondr3";
- githubId = 2280539;
- name = "Sondre Nilsen";
- keys = [{
- fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1";
- }];
- };
sophrosyne = {
email = "joshuaortiz@tutanota.com";
github = "sophrosyne97";
diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix
index 250f714be0a7..fc3dcb24ab9c 100644
--- a/nixos/lib/qemu-common.nix
+++ b/nixos/lib/qemu-common.nix
@@ -18,7 +18,7 @@ rec {
];
qemuSerialDevice = if pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isRiscV then "ttyS0"
- else if (with pkgs.stdenv.hostPlatform; isAarch32 || isAarch64 || isPower) then "ttyAMA0"
+ else if (with pkgs.stdenv.hostPlatform; isAarch || isPower) then "ttyAMA0"
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
qemuBinary = qemuPkg: {
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index 97e6405db91e..94c1c0514f9f 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -159,7 +159,11 @@ in
"${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup"
"${config.boot.initrd.systemd.package.kbd}/bin/setfont"
"${config.boot.initrd.systemd.package.kbd}/bin/loadkeys"
- "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # keyboard layouts are compressed
+ "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed
+ ] ++ optionals (hasPrefix builtins.storeDir cfg.font) [
+ "${cfg.font}"
+ ] ++ optionals (hasPrefix builtins.storeDir cfg.keyMap) [
+ "${cfg.keyMap}"
];
systemd.services.reload-systemd-vconsole-setup =
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 89a1217dfb31..bd5540646b08 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -62,7 +62,7 @@ in {
alsa-firmware
sof-firmware
libreelec-dvb-firmware
- ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware
+ ] ++ optional pkgs.stdenv.hostPlatform.isAarch raspberrypiWirelessFirmware
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
rtl8723bs-firmware
] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index d1ccc6c2072f..9309fe70a861 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -476,9 +476,9 @@ in
isoImage.squashfsCompression = mkOption {
default = with pkgs.stdenv.targetPlatform; "xz -Xdict-size 100% "
- + lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86"
+ + lib.optionalString isx86 "-Xbcj x86"
# Untested but should also reduce size for these platforms
- + lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm"
+ + lib.optionalString isAarch "-Xbcj arm"
+ lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
+ lib.optionalString (isSparc) "-Xbcj sparc";
description = ''
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 8347453d403b..af1e3d32a0a2 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -57,7 +57,7 @@ in
# Hyper-V support.
"hv_storvsc"
- ] ++ lib.optionals (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [
+ ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [
# Most of the following falls into two categories:
# - early KMS / early display
# - early storage (e.g. USB) support
diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix
index 2cff5051c757..1d76d2fd39c6 100644
--- a/nixos/modules/services/home-automation/home-assistant.nix
+++ b/nixos/modules/services/home-automation/home-assistant.nix
@@ -92,7 +92,7 @@ in {
"default_config"
"met"
"esphome"
- ] ++ optionals (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) [
+ ] ++ optionals pkgs.stdenv.hostPlatform.isAarch [
# Use the platform as an indicator that we might be running on a RaspberryPi and include
# relevant components
"rpi_power"
diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 386281e2b7cc..873c3b735193 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -38,6 +38,15 @@ in {
For this to work, the ssh SSS service must be enabled in the sssd configuration.
'';
};
+
+ kcm = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to use SSS as a Kerberos Cache Manager (KCM).
+ Kerberos will be configured to cache credentials in SSS.
+ '';
+ };
};
};
config = mkMerge [
@@ -79,6 +88,28 @@ in {
services.dbus.packages = [ pkgs.sssd ];
})
+ (mkIf cfg.kcm {
+ systemd.services.sssd-kcm = {
+ description = "SSSD Kerberos Cache Manager";
+ requires = [ "sssd-kcm.socket" ];
+ serviceConfig = {
+ ExecStartPre = "-${pkgs.sssd}/bin/sssd --genconf-section=kcm";
+ ExecStart = "${pkgs.sssd}/libexec/sssd/sssd_kcm --uid 0 --gid 0";
+ };
+ restartTriggers = [
+ config.environment.etc."sssd/sssd.conf".source
+ ];
+ };
+ systemd.sockets.sssd-kcm = {
+ description = "SSSD Kerberos Cache Manager responder socket";
+ wantedBy = [ "sockets.target" ];
+ # Matches the default in MIT krb5 and Heimdal:
+ # https://github.com/krb5/krb5/blob/krb5-1.19.3-final/src/include/kcm.h#L43
+ listenStreams = [ "/var/run/.heim_org.h5l.kcm-socket" ];
+ };
+ krb5.libdefaults.default_ccache_name = "KCM:";
+ })
+
(mkIf cfg.sshAuthorizedKeysIntegration {
# Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable.
# So indirect by a symlink.
diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix
index 5b07beadb45f..a9958c884da8 100644
--- a/nixos/modules/services/networking/headscale.nix
+++ b/nixos/modules/services/networking/headscale.nix
@@ -429,12 +429,16 @@ in
wantedBy = [ "multi-user.target" ];
restartTriggers = [ configFile ];
+ environment.GIN_MODE = "release";
+
script = ''
${optionalString (cfg.database.passwordFile != null) ''
export HEADSCALE_DB_PASS="$(head -n1 ${escapeShellArg cfg.database.passwordFile})"
''}
- export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.openIdConnect.clientSecretFile})"
+ ${optionalString (cfg.openIdConnect.clientSecretFile != null) ''
+ export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.openIdConnect.clientSecretFile})"
+ ''}
exec ${cfg.package}/bin/headscale serve
'';
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index e87f540fd57c..5b2d81eeb68f 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -870,7 +870,7 @@ in
(mkIf pkgs.stdenv.hostPlatform.isx86 [
"-usb" "-device usb-tablet,bus=usb-bus.0"
])
- (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [
+ (mkIf pkgs.stdenv.hostPlatform.isAarch [
"-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet"
])
(let
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b0dd7ca0766f..ff54a327424e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -254,7 +254,7 @@ in {
jibri = handleTest ./jibri.nix {};
jirafeau = handleTest ./jirafeau.nix {};
jitsi-meet = handleTest ./jitsi-meet.nix {};
- k3s-single-node = handleTest ./k3s-single-node.nix {};
+ k3s = handleTest ./k3s {};
kafka = handleTest ./kafka.nix {};
kanidm = handleTest ./kanidm.nix {};
kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};
diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix
new file mode 100644
index 000000000000..07d93c41c7a6
--- /dev/null
+++ b/nixos/tests/k3s/default.nix
@@ -0,0 +1,9 @@
+{ system ? builtins.currentSystem
+, pkgs ? import ../../.. { inherit system; }
+}:
+{
+ # Run a single node k3s cluster and verify a pod can run
+ single-node = import ./single-node.nix { inherit system pkgs; };
+ # Run a multi-node k3s cluster and verify pod networking works across nodes
+ multi-node = import ./multi-node.nix { inherit system pkgs; };
+}
diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix
new file mode 100644
index 000000000000..afb8c78f2339
--- /dev/null
+++ b/nixos/tests/k3s/multi-node.nix
@@ -0,0 +1,137 @@
+import ../make-test-python.nix ({ pkgs, ... }:
+ let
+ imageEnv = pkgs.buildEnv {
+ name = "k3s-pause-image-env";
+ paths = with pkgs; [ tini bashInteractive coreutils socat ];
+ };
+ pauseImage = pkgs.dockerTools.streamLayeredImage {
+ name = "test.local/pause";
+ tag = "local";
+ contents = imageEnv;
+ config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ];
+ };
+ # A daemonset that responds 'server' on port 8000
+ networkTestDaemonset = pkgs.writeText "test.yml" ''
+ apiVersion: apps/v1
+ kind: DaemonSet
+ metadata:
+ name: test
+ labels:
+ name: test
+ spec:
+ selector:
+ matchLabels:
+ name: test
+ template:
+ metadata:
+ labels:
+ name: test
+ spec:
+ containers:
+ - name: test
+ image: test.local/pause:local
+ imagePullPolicy: Never
+ resources:
+ limits:
+ memory: 20Mi
+ command: ["socat", "TCP4-LISTEN:8000,fork", "EXEC:echo server"]
+ '';
+ tokenFile = pkgs.writeText "token" "p@s$w0rd";
+ in
+ {
+ name = "k3s-multi-node";
+
+ nodes = {
+ server = { pkgs, ... }: {
+ environment.systemPackages = with pkgs; [ gzip jq ];
+ # k3s uses enough resources the default vm fails.
+ virtualisation.memorySize = 1536;
+ virtualisation.diskSize = 4096;
+
+ services.k3s = {
+ inherit tokenFile;
+ enable = true;
+ role = "server";
+ package = pkgs.k3s;
+ extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.1";
+ };
+ networking.firewall.allowedTCPPorts = [ 6443 ];
+ networking.firewall.allowedUDPPorts = [ 8472 ];
+ networking.firewall.trustedInterfaces = [ "flannel.1" ];
+ networking.useDHCP = false;
+ networking.defaultGateway = "192.168.1.1";
+ networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [
+ { address = "192.168.1.1"; prefixLength = 24; }
+ ];
+ };
+
+ agent = { pkgs, ... }: {
+ virtualisation.memorySize = 1024;
+ virtualisation.diskSize = 2048;
+ services.k3s = {
+ inherit tokenFile;
+ enable = true;
+ role = "agent";
+ serverAddr = "https://192.168.1.1:6443";
+ extraFlags = "--pause-image test.local/pause:local --node-ip 192.168.1.2";
+ };
+ networking.firewall.allowedTCPPorts = [ 6443 ];
+ networking.firewall.allowedUDPPorts = [ 8472 ];
+ networking.firewall.trustedInterfaces = [ "flannel.1" ];
+ networking.useDHCP = false;
+ networking.defaultGateway = "192.168.1.2";
+ networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [
+ { address = "192.168.1.2"; prefixLength = 24; }
+ ];
+ };
+ };
+
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ euank ];
+ };
+
+ testScript = ''
+ start_all()
+ machines = [server, agent]
+ for m in machines:
+ m.wait_for_unit("k3s")
+
+ # wait for the agent to show up
+ server.wait_until_succeeds("k3s kubectl get node agent")
+
+ for m in machines:
+ m.succeed("k3s check-config")
+ m.succeed(
+ "${pauseImage} | k3s ctr image import -"
+ )
+
+ server.succeed("k3s kubectl cluster-info")
+ # Also wait for our service account to show up; it takes a sec
+ server.wait_until_succeeds("k3s kubectl get serviceaccount default")
+
+ # Now create a pod on each node via a daemonset and verify they can talk to each other.
+ server.succeed("k3s kubectl apply -f ${networkTestDaemonset}")
+ server.wait_until_succeeds(f'[ "$(k3s kubectl get ds test -o json | jq .status.numberReady)" -eq {len(machines)} ]')
+
+ # Get pod IPs
+ pods = server.succeed("k3s kubectl get po -o json | jq '.items[].metadata.name' -r").splitlines()
+ pod_ips = [server.succeed(f"k3s kubectl get po {name} -o json | jq '.status.podIP' -cr").strip() for name in pods]
+
+ # Verify each server can ping each pod ip
+ for pod_ip in pod_ips:
+ server.succeed(f"ping -c 1 {pod_ip}")
+ agent.succeed(f"ping -c 1 {pod_ip}")
+
+ # Verify the pods can talk to each other
+ resp = server.wait_until_succeeds(f"k3s kubectl exec {pods[0]} -- socat TCP:{pod_ips[1]}:8000 -")
+ assert resp.strip() == "server"
+ resp = server.wait_until_succeeds(f"k3s kubectl exec {pods[1]} -- socat TCP:{pod_ips[0]}:8000 -")
+ assert resp.strip() == "server"
+
+ # Cleanup
+ server.succeed("k3s kubectl delete -f ${networkTestDaemonset}")
+
+ for m in machines:
+ m.shutdown()
+ '';
+ })
diff --git a/nixos/tests/k3s-single-node.nix b/nixos/tests/k3s/single-node.nix
similarity index 81%
rename from nixos/tests/k3s-single-node.nix
rename to nixos/tests/k3s/single-node.nix
index fb6510ee087b..27e1e455e641 100644
--- a/nixos/tests/k3s-single-node.nix
+++ b/nixos/tests/k3s/single-node.nix
@@ -1,5 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }:
-
+import ../make-test-python.nix ({ pkgs, ... }:
let
imageEnv = pkgs.buildEnv {
name = "k3s-pause-image-env";
@@ -11,20 +10,12 @@ import ./make-test-python.nix ({ pkgs, ... }:
contents = imageEnv;
config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ];
};
- # Don't use the default service account because there's a race where it may
- # not be created yet; make our own instead.
testPodYaml = pkgs.writeText "test.yml" ''
- apiVersion: v1
- kind: ServiceAccount
- metadata:
- name: test
- ---
apiVersion: v1
kind: Pod
metadata:
name: test
spec:
- serviceAccountName: test
containers:
- name: test
image: test.local/pause:local
@@ -66,13 +57,14 @@ import ./make-test-python.nix ({ pkgs, ... }:
machine.wait_for_unit("k3s")
machine.succeed("k3s kubectl cluster-info")
machine.fail("sudo -u noprivs k3s kubectl cluster-info")
- # FIXME: this fails with the current nixos kernel config; once it passes, we should uncomment it
- # machine.succeed("k3s check-config")
+ machine.succeed("k3s check-config")
machine.succeed(
"${pauseImage} | k3s ctr image import -"
)
+ # Also wait for our service account to show up; it takes a sec
+ machine.wait_until_succeeds("k3s kubectl get serviceaccount default")
machine.succeed("k3s kubectl apply -f ${testPodYaml}")
machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test")
machine.succeed("k3s kubectl delete -f ${testPodYaml}")
diff --git a/nixos/tests/nginx-etag.nix b/nixos/tests/nginx-etag.nix
index b69511d081d4..6f45eacf8b41 100644
--- a/nixos/tests/nginx-etag.nix
+++ b/nixos/tests/nginx-etag.nix
@@ -53,14 +53,14 @@ import ./make-test-python.nix {
driver.implicitly_wait(20)
driver.get('http://server/')
- driver.find_element_by_xpath('//div[@foo="bar"]')
+ driver.find_element('xpath', '//div[@foo="bar"]')
open('/tmp/passed_stage1', 'w')
while not os.path.exists('/tmp/proceed'):
time.sleep(0.5)
driver.get('http://server/')
- driver.find_element_by_xpath('//div[@foo="yay"]')
+ driver.find_element('xpath', '//div[@foo="yay"]')
open('/tmp/passed', 'w')
'';
in [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ];
diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix
index fd6726e9ac26..7aef140da651 100644
--- a/pkgs/applications/audio/fdkaac/default.nix
+++ b/pkgs/applications/audio/fdkaac/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fdkaac";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "nu774";
repo = pname;
rev = "v${version}";
- sha256 = "tHhICq/FzbkvWkDdNzGqGoo7nIDb+DJXmkFwtPIA89c=";
+ sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo=";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 26825f2dcc70..051a326c607d 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -1,115 +1,185 @@
-{ mkDerivation
+{ stdenv
, lib
-, qtbase
, fetchFromGitHub
-, ruby
-, erlang
-, aubio
-, alsa-lib
-, rtmidi
-, libsndfile
+, wrapQtAppsHook
+, makeDesktopItem
+, copyDesktopItems
, cmake
, pkg-config
+, catch2_3
+, qtbase
+, qtsvg
+, qttools
+, qwt
+, qscintilla
+, kissfftFloat
+, crossguid
+, reproc
+, platform-folders
+, ruby
+, erlang
+, elixir
+, beamPackages
+, alsa-lib
+, rtmidi
, boost
-, bash
+, aubio
, jack2
, supercollider-with-sc3-plugins
-, qwt
+, parallel
+
+, withTauWidget ? false
+, qtwebengine
+
+, withImGui ? false
+, gl3w
+, SDL2
+, fmt
}:
-let
+stdenv.mkDerivation rec {
pname = "sonic-pi";
- version = "3.3.1";
+ version = "4.0.3";
+
src = fetchFromGitHub {
owner = "sonic-pi-net";
- repo = "sonic-pi";
+ repo = pname;
rev = "v${version}";
- sha256 = "sha256-AE7iuSNnW1SAtBMplReGzXKcqD4GG23i10MIAWnlcPo=";
+ hash = "sha256-kTuW+i/kdPhyG3L6SkgQTE9UvADY49KahJcw3+5Uz4k=";
};
- # sonic pi uses it's own aubioonset with hardcoded parameters but will compile a whole aubio for it
- # let's just build the aubioonset instead and link against aubio from nixpkgs
- aubioonset = mkDerivation {
- name = "aubioonset";
- src = src;
- sourceRoot = "source/app/external/aubio/examples";
- buildInputs = [jack2 aubio libsndfile];
- patchPhase = ''
- sed -i "s@@@" jackio.c utils.h
- '';
- buildPhase = ''
- gcc -o aubioonset -laubio jackio.c utils.c aubioonset.c
- '';
- installPhase = ''
- install -D aubioonset $out/aubioonset
- '';
+ mixFodDeps = beamPackages.fetchMixDeps {
+ inherit version;
+ pname = "mix-deps-${pname}";
+ mixEnv = "test";
+ src = "${src}/app/server/beam/tau";
+ sha256 = "sha256-MvwUyVTS23vQKLpGxz46tEVCs/OyYk5dDaBlv+kYg1M=";
};
-in
+ strictDeps = true;
-mkDerivation rec {
- inherit pname version src;
+ nativeBuildInputs = [
+ wrapQtAppsHook
+ copyDesktopItems
- nativeBuildInputs = [ cmake ];
- buildInputs = [
- bash
+ cmake
pkg-config
- qtbase
- qwt
- ruby
- aubio
- supercollider-with-sc3-plugins
- boost
+
erlang
- alsa-lib
- rtmidi
+ elixir
+ beamPackages.hex
];
- dontUseCmakeConfigure = true;
+ buildInputs = [
+ qtbase
+ qtsvg
+ qttools
+ qwt
+ qscintilla
+ kissfftFloat
+ catch2_3
+ crossguid
+ reproc
+ platform-folders
+ ruby
+ alsa-lib
+ rtmidi
+ boost
+ aubio
+ ] ++ lib.optionals withTauWidget [
+ qtwebengine
+ ] ++ lib.optionals withImGui [
+ gl3w
+ SDL2
+ fmt
+ ];
- prePatch = ''
- sed -i '/aubio/d' app/external/linux_build_externals.sh
- sed -i '/aubio/d' app/linux-prebuild.sh
- patchShebangs app
+ checkInputs = [
+ parallel
+ ruby
+ supercollider-with-sc3-plugins
+ jack2
+ ];
+
+ cmakeFlags = [
+ "-DUSE_SYSTEM_LIBS=ON"
+ "-DBUILD_IMGUI_INTERFACE=${if withImGui then "ON" else "OFF"}"
+ "-DWITH_QT_GUI_WEBENGINE=${if withTauWidget then "ON" else "OFF"}"
+ ];
+
+ doCheck = true;
+
+ postPatch = ''
+ # Fix shebangs on files in app and bin scripts
+ patchShebangs app bin
'';
- configurePhase = ''
- runHook preConfigure
+ preConfigure = ''
+ # Set build environment
+ export SONIC_PI_HOME="$TMPDIR/spi"
- ./app/linux-prebuild.sh
- ./app/linux-config.sh
+ export HEX_HOME="$TEMPDIR/hex"
+ export HEX_OFFLINE=1
+ export MIX_REBAR3='${beamPackages.rebar3}/bin/rebar3'
+ export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3"
+ export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache"
+ export MIX_HOME="$TEMPDIR/mix"
+ export MIX_DEPS_PATH="$TEMPDIR/deps"
+ export MIX_ENV=prod
- runHook postConfigure
+ # Copy Mix dependency sources
+ echo 'Copying ${mixFodDeps} to Mix deps'
+ cp --no-preserve=mode -R '${mixFodDeps}' "$MIX_DEPS_PATH"
+
+ # Change to project base directory
+ cd app
+
+ # Prebuild Ruby vendored dependencies and Qt docs
+ ./linux-prebuild.sh -o
+
+ # Append CMake flag depending on the value of $out
+ cmakeFlags+=" -DAPP_INSTALL_ROOT=$out/app"
'';
- buildPhase = ''
- runHook preBuild
+ postBuild = ''
+ # Build BEAM server
+ ../linux-post-tau-prod-release.sh -o
+ '';
- pushd app/build
- cmake --build . --config Release
+ checkPhase = ''
+ runHook preCheck
+
+ # BEAM tests
+ pushd ../server/beam/tau
+ MIX_ENV=test TAU_ENV=test mix test
popd
- runHook postBuild
+ # Ruby tests
+ pushd ../server/ruby
+ rake test
+ popd
+
+ # API tests
+ pushd api-tests
+ # run JACK parallel to tests and quit both when one exits
+ SONIC_PI_ENV=test parallel --no-notice -j2 --halt now,done=1 ::: 'jackd -rd dummy' 'ctest --verbose'
+ popd
+
+ runHook postCheck
'';
installPhase = ''
runHook preInstall
+ # Run Linux release script
+ ../linux-release.sh
+
+ # Copy dist directory to output
mkdir $out
- cp -r {bin,etc} $out/
+ cp -r linux_dist/* $out/
- # Copy server whole.
- mkdir -p $out/app
- cp -r app/server $out/app/
-
- # We didn't build this during linux-prebuild.sh so copy from the separate derivation
- cp ${aubioonset}/aubioonset $out/app/server/native/
-
- # Copy only necessary files for the gui app.
- mkdir -p $out/app/gui/qt
- cp -r app/gui/qt/{book,fonts,help,html,images,image_source,info,lang,theme} $out/app/gui/qt/
- mkdir -p $out/app/build/gui/qt
- cp app/build/gui/qt/sonic-pi $out/app/build/gui/qt/sonic-pi
+ # Copy icon
+ install -Dm644 ../gui/qt/images/icon-smaller.png $out/share/icons/hicolor/256x256/apps/sonic-pi.png
runHook postInstall
'';
@@ -117,19 +187,42 @@ mkDerivation rec {
# $out/bin/sonic-pi is a shell script, and wrapQtAppsHook doesn't wrap them.
dontWrapQtApps = true;
preFixup = ''
- wrapQtApp "$out/bin/sonic-pi" \
- --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang] }
- makeWrapper \
- $out/app/server/ruby/bin/sonic-pi-server.rb \
- $out/bin/sonic-pi-server \
- --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang ] }
+ # Wrap Qt GUI (distributed binary)
+ wrapQtApp $out/bin/sonic-pi \
+ --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 ]}
+
+ # If ImGui was built
+ if [ -e $out/app/build/gui/imgui/sonic-pi-imgui ]; then
+ # Wrap ImGui into bin
+ makeWrapper $out/app/build/gui/imgui/sonic-pi-imgui $out/bin/sonic-pi-imgui \
+ --inherit-argv0 \
+ --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 ]}
+ fi
+
+ # Remove runtime Erlang references
+ for file in $(grep -FrIl '${erlang}/lib/erlang' $out/app/server/beam/tau); do
+ substituteInPlace "$file" --replace '${erlang}/lib/erlang' $out/app/server/beam/tau/_build/prod/rel/tau
+ done
'';
- meta = {
+ stripDebugList = [ "app" "bin" ];
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "sonic-pi";
+ exec = "sonic-pi";
+ icon = "sonic-pi";
+ desktopName = "Sonic Pi";
+ comment = meta.description;
+ categories = [ "Audio" "AudioVideo" "Education" ];
+ })
+ ];
+
+ meta = with lib; {
homepage = "https://sonic-pi.net/";
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ];
- platforms = lib.platforms.linux;
+ license = licenses.mit;
+ maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index cb7355aac17a..d039d4d5ec99 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
# fix "Killed: 9 test/test_bitcoin"
# https://github.com/NixOS/nixpkgs/issues/179474
- hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
+ hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ];
checkInputs = [ python3 ];
diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix
index 6bf26b525b51..f7dc988de153 100644
--- a/pkgs/applications/editors/greenfoot/default.nix
+++ b/pkgs/applications/editors/greenfoot/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "greenfoot";
- version = "3.7.0";
+ version = "3.7.1";
src = fetchurl {
# We use the deb here. First instinct might be to go for the "generic" JAR
# download, but that is actually a graphical installer that is much harder
# to unpack than the deb.
url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb";
- sha256 = "sha256-K9faU3ZarcR4g8riHpoZYVH0sXtueqfm3Fo+sZAHJA8=";
+ sha256 = "sha256-wGgKDsA/2luw+Nzs9dWb/HRHMx/0S0CFfoI53OCzxug=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix
index df20645a33e1..fba01f5bdb05 100644
--- a/pkgs/applications/editors/poke/default.nix
+++ b/pkgs/applications/editors/poke/default.nix
@@ -108,7 +108,7 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres kira-bruneau ];
platforms = platforms.unix;
- badPlatforms = [ "aarch64-darwin" ]; # Undefined symbols for architecture arm64
+ broken = stdenv.isDarwin && stdenv.isAarch64; # Undefined symbols for architecture arm64
};
}
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index d7746ac17838..38ac593db2f7 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "rednotebook";
- version = "2.24";
+ version = "2.25";
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
- rev = "v${version}";
- sha256 = "sha256-nTFyRNJAhTrVlKdLd2F0jv7VcNn2pGTAegvfMjfHY84=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-3FcnyiQc7XGiZVtqxVxqaWYxXejgy/eNQQ4QNTUsCUI=";
};
# We have not packaged tests.
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix
index b1a3917417d9..909dc69c02ed 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix
@@ -1,65 +1,76 @@
{ lib
, fetchurl
, vscode-utils
-, unzip
, patchelf
-, makeWrapper
, icu
, stdenv
, openssl
-, mono
}:
-
let
- # Get as close as possible as the `package.json` required version.
- # This is what drives omnisharp.
- rtDepsSrcsFromJson = lib.importJSON ./rt-deps-bin-srcs.json;
+ inherit (stdenv.hostPlatform) system;
- rtDepsBinSrcs = builtins.mapAttrs (k: v:
- let
- # E.g: "OmniSharp-x86_64-linux"
- kSplit = builtins.split "(__)" k;
- name = builtins.elemAt kSplit 0;
- system = builtins.elemAt kSplit 2;
- in
+ version = "1.25.0";
+
+
+ vsixInfo =
+ let
+ linuxDebuggerBins = [
+ ".debugger/vsdbg-ui"
+ ".debugger/vsdbg"
+ ];
+ darwinX86DebuggerBins = [
+ ".debugger/x86_64/vsdbg-ui"
+ ".debugger/x86_64/vsdbg"
+ ];
+ darwinAarch64DebuggerBins = [
+ ".debugger/arm64/vsdbg-ui"
+ ".debugger/arm64/vsdbg"
+ ];
+ omniSharpBins = [
+ ".omnisharp/1.39.0-net6.0/OmniSharp"
+ ];
+ razorBins = [
+ ".razor/createdump"
+ ".razor/rzls"
+ ];
+ in
{
- inherit name system;
- installPath = v.installPath;
- binaries = v.binaries;
- bin-src = fetchurl {
- urls = v.urls;
- inherit (v) sha256;
+ x86_64-linux = {
+ url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-x64.vsix";
+ sha256 = "1cqqjg8q6v56b19aabs9w1kxly457mpm0akbn5mis9nd1mrdmydl";
+ binaries = linuxDebuggerBins ++ omniSharpBins ++ razorBins;
};
- }
- )
- rtDepsSrcsFromJson;
-
- rtDepBinSrcByName = bSrcName:
- rtDepsBinSrcs."${bSrcName}__${stdenv.targetPlatform.system}";
-
- omnisharp = rtDepBinSrcByName "OmniSharp";
- vsdbgs = [
- (rtDepBinSrcByName "Debugger")
- ] ++ lib.optionals (stdenv.isDarwin) [
- # Include the aarch64-darwin debugger binaries on x86_64-darwin. Even though OmniSharp will be
- # running under Rosetta 2, debugging will fail to start if both sets of binaries are not present.
- (rtDepsBinSrcs."Debugger__aarch64-darwin")
- ];
- razor = rtDepBinSrcByName "Razor";
+ aarch64-linux = {
+ url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-arm64.vsix";
+ sha256 = "0nsjgrb7y4w71w1gnrf50ifwbmjidi4vrw2fyfmch7lgjl8ilnhd";
+ binaries = linuxDebuggerBins ++ omniSharpBins; # Linux aarch64 version has no Razor Language Server
+ };
+ x86_64-darwin = {
+ url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-x64.vsix";
+ sha256 = "01qn398vmjfi9imzlmzm0qi7y2h214wx6a8la088lfkhyj3gfjh8";
+ binaries = darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;
+ };
+ aarch64-darwin = {
+ url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-arm64.vsix";
+ sha256 = "020j451innh7jzarbv1ij57rfmqnlngdxaw6wdgp8sjkgbylr634";
+ binaries = darwinAarch64DebuggerBins ++ darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;
+ };
+ }.${system} or (throw "Unsupported system: ${system}");
in
-
-vscode-utils.buildVscodeMarketplaceExtension {
+vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "csharp";
publisher = "ms-dotnettools";
- version = "1.23.16";
- sha256 = "sha256-fM4vcSMi2tEjIox9Twh2sRiFhXgAeRwAM9to3vtcSqI=";
+ inherit version;
+ };
+
+ vsix = fetchurl {
+ name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
+ inherit (vsixInfo) url sha256;
};
nativeBuildInputs = [
- unzip
patchelf
- makeWrapper
];
postPatch = ''
@@ -78,23 +89,11 @@ vscode-utils.buildVscodeMarketplaceExtension {
-E -e 's/(this\._pipePath=[a-zA-Z0-9_]+\.join\()([a-zA-Z0-9_]+\.getExtensionPath\(\)[^,]*,)/\1require("os").tmpdir(), "'"$ext_unique_id"'"\+/g' \
"$PWD/dist/extension.js"
- unzip_to() {
- declare src_zip="''${1?}"
- declare target_dir="''${2?}"
- mkdir -p "$target_dir"
- if unzip "$src_zip" -d "$target_dir"; then
- true
- elif [[ "1" -eq "$?" ]]; then
- 1>&2 echo "WARNING: unzip('$?' -> skipped files)."
- else
- 1>&2 echo "ERROR: unzip('$?')."
- fi
- }
-
patchelf_add_icu_as_needed() {
declare elf="''${1?}"
declare icu_major_v="${
- with builtins; head (splitVersion (parseDrvName icu.name).version)}"
+ lib.head (lib.splitVersion (lib.getVersion icu.name))
+ }"
for icu_lib in icui18n icuuc icudata; do
patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf"
@@ -111,42 +110,22 @@ vscode-utils.buildVscodeMarketplaceExtension {
"$elf"
}
- declare omnisharp_dir="$PWD/${omnisharp.installPath}"
- unzip_to "${omnisharp.bin-src}" "$omnisharp_dir"
- rm "$omnisharp_dir/bin/mono"
- ln -s -T "${mono}/bin/mono" "$omnisharp_dir/bin/mono"
- chmod a+x "$omnisharp_dir/run"
- touch "$omnisharp_dir/install.Lock"
-
- '' + builtins.concatStringsSep "\n" (map (vsdbg: ''
- declare vsdbg_dir="$PWD/${vsdbg.installPath}"
- unzip_to "${vsdbg.bin-src}" "$vsdbg_dir"
- chmod a+x "$vsdbg_dir/vsdbg-ui"
- chmod a+x "$vsdbg_dir/vsdbg"
- touch "$vsdbg_dir/install.complete"
- touch "$vsdbg_dir/install.Lock"
-
- '') vsdbgs) + ''
- declare razor_dir="$PWD/${razor.installPath}"
- unzip_to "${razor.bin-src}" "$razor_dir"
- chmod a+x "$razor_dir/rzls"
- touch "$razor_dir/install.Lock"
-
- '' + lib.optionalString stdenv.isLinux ''
- patchelf_common "$vsdbg_dir/vsdbg"
- patchelf_common "$vsdbg_dir/vsdbg-ui"
- patchelf_common "$razor_dir/rzls"
-
- '' + lib.optionalString stdenv.isDarwin ''
- substituteInPlace $omnisharp_dir/etc/config \
- --replace "libmono-native-compat.dylib" "libmono-native.dylib"
- '';
+ '' + (lib.concatStringsSep "\n" (map
+ (bin: ''
+ chmod +x "${bin}"
+ '')
+ vsixInfo.binaries))
+ + lib.optionalString stdenv.isLinux (lib.concatStringsSep "\n" (map
+ (bin: ''
+ patchelf_common "${bin}"
+ '')
+ vsixInfo.binaries));
meta = with lib; {
description = "C# for Visual Studio Code (powered by OmniSharp)";
homepage = "https://github.com/OmniSharp/omnisharp-vscode";
license = licenses.mit;
maintainers = [ maintainers.jraygauthier ];
- platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json
deleted file mode 100644
index 13678d1097e0..000000000000
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "OmniSharp__x86_64-darwin": {
- "installPath": ".omnisharp/1.37.16",
- "binaries": [
- "./mono.osx",
- "./run"
- ],
- "urls": [
- "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/0ea1ea1eae48552a1992ed6df782353a/omnisharp-osx-1.37.16.zip",
- "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-osx-1.37.16.zip"
- ],
- "sha256": "0hhgfx7zs1rljhn3n9c7lci7j15yp2448z3f1d3c47a95l1hmlip"
- },
- "OmniSharp__x86_64-linux": {
- "installPath": ".omnisharp/1.37.16",
- "binaries": [
- "./mono.linux-x86_64",
- "./run"
- ],
- "urls": [
- "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9ae3ed99fc0c41c7139751dde6f2bc78/omnisharp-linux-x64-1.37.16.zip",
- "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-linux-x64-1.37.16.zip"
- ],
- "sha256": "0a2basc6dw42fnjv9zz93ff0bsw2i3446gvcjx5mn5d8dasi483i"
- },
- "Debugger__x86_64-darwin": {
- "installPath": ".debugger/x86_64",
- "binaries": [
- "./vsdbg-ui",
- "./vsdbg"
- ],
- "urls": [
- "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/c1122f7141735472d9583c1124024c55/coreclr-debug-osx-x64.zip",
- "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-x64.zip"
- ],
- "sha256": "08z3k0h25gdsbmlxwayd94672hp2z7zmwdmd0nyr9j82izj3ci2m"
- },
- "Debugger__aarch64-darwin": {
- "installPath": ".debugger/arm64",
- "binaries": [
- "./vsdbg-ui",
- "./vsdbg"
- ],
- "urls": [
- "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/96a88189c7904a517f3bb59b2dba8bd1/coreclr-debug-osx-arm64.zip",
- "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-arm64.zip"
- ],
- "sha256": "113kz02ihvb4y5fj01wamqz2jsql2q7n7f55s9kzs9dsrmq5ffa0"
- },
- "Debugger__aarch64-linux": {
- "installPath": ".debugger",
- "binaries": [
- "./vsdbg-ui",
- "./vsdbg"
- ],
- "urls": [
- "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/7a723bfbda6d196c52084226b6835b36/coreclr-debug-linux-arm64.zip",
- "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-arm64.zip"
- ],
- "sha256": "1d4a5q3f7qfk3jq2i4f6g50i9i4z8z7g8ss083y9n5c1yj3629kw"
- },
- "Debugger__x86_64-linux": {
- "installPath": ".debugger",
- "binaries": [
- "./vsdbg-ui",
- "./vsdbg"
- ],
- "urls": [
- "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/dd019b4c839f458596e26bfcfe6a3e7f/coreclr-debug-linux-x64.zip",
- "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-x64.zip"
- ],
- "sha256": "0c5y0035sa07bl3m3iiqccqd92xjwpcfjrqhmi5xligk40q2i2gk"
- },
- "Razor__x86_64-linux": {
- "installPath": ".razor",
- "binaries": [
- "./rzls"
- ],
- "urls": [
- "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/b846e9c7d7afdba54a72fae1dcb6c42c/razorlanguageserver-linux-x64-6.0.0-preview.5.21358.6.zip"
- ],
- "sha256": "0gb36nlb7fgcv03a0awna1qyrsky6ys5gkpsmvxc5j35f1yq337b"
- },
- "Razor__x86_64-darwin": {
- "installPath": ".razor",
- "binaries": [
- "./rzls"
- ],
- "urls": [
- "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/ad846449769eb2ae810d0236823a6aaa/razorlanguageserver-osx-x64-6.0.0-preview.5.21358.6.zip"
- ],
- "sha256": "0iqinpwwlqwajdq4i1qbb9hfpfmgy17av95bpw02ad2f9fnyh572"
- }
-}
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs
deleted file mode 100755
index 8c43231b1a7f..000000000000
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=../../../.. -i bash -p curl jq unzip
-set -euf -o pipefail
-
-declare scriptDir
-scriptDir=$(cd "$(dirname "$0")"; pwd)
-1>&2 echo "scriptDir='$scriptDir'"
-
-. "$scriptDir/../_maintainers/update-bin-srcs-lib.sh"
-
-declare extPublisher="ms-dotnettools"
-declare extName="csharp"
-declare defaultExtVersion="1.23.16"
-declare extVersion="${1:-$defaultExtVersion}"
-
-formatExtRuntimeDeps \
- "$extPublisher" "$extName" "$extVersion" \
- | computeAndAttachExtRtDepsChecksums \
- | jqStreamToJson \
- | tee "$scriptDir/rt-deps-bin-srcs.json" \
- | jq '.'
diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix
index f054b954b59b..4dfa3b864430 100644
--- a/pkgs/applications/emulators/openmsx/default.nix
+++ b/pkgs/applications/emulators/openmsx/default.nix
@@ -13,26 +13,26 @@
, libpng
, libtheora
, libvorbis
-, python
+, python3
, tcl
, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "openmsx";
- version = "17.0";
+ version = "18.0";
src = fetchFromGitHub {
owner = "openMSX";
repo = "openMSX";
- rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}";
- sha256 = "sha256-9PdUNahJZ2O6ASkzLW/uudP3hiIzTDpxzFy6Pjb8JiU=";
+ rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
+ sha256 = "sha256-4V2B+OQbPVRmkRuqfeqyd+7pz9Z1YISjI79WqZS0Qhc=";
fetchSubmodules = true;
};
nativeBuildInputs = [
pkg-config
- python
+ python3
];
buildInputs = [
@@ -72,4 +72,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix
index b84d18a4e7a0..14121a49bde5 100644
--- a/pkgs/applications/emulators/ppsspp/default.nix
+++ b/pkgs/applications/emulators/ppsspp/default.nix
@@ -16,14 +16,14 @@
mkDerivation rec {
pname = "ppsspp";
- version = "1.12.3";
+ version = "1.13.1";
src = fetchFromGitHub {
owner = "hrydgard";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "sha256-S16rTB0svksW5MwrPV/+qpTK4uKZ7mFcmbOyEmMmzhY=";
+ sha256 = "sha256-WsFy2aSOmkII2Lte5et4W6qj0AXUKWWkYe88T0OQP08=";
};
postPatch = ''
diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 698872f4a8ff..954f97bf9b4a 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
- version = "492";
+ version = "493";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
- sha256 = "sha256-KtuHPKVwk6nRQ5lqHxRgm7k7DfcGeRAzR/kkHVMizDM=";
+ sha256 = "sha256-sROmWFH3sDBDh1VSVLTM71Y9qD8CndvwW7PKzkavIuc=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix
index 50b1cb37ffaf..fb47a304f224 100644
--- a/pkgs/applications/graphics/lightburn/default.nix
+++ b/pkgs/applications/graphics/lightburn/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
- version = "1.1.03";
+ version = "1.2.01";
nativeBuildInputs = [
p7zip
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
- sha256 = "sha256-X7hAkzVqIABpyFokiYaMGZqSda69cKhKghFDWDEVOow=";
+ sha256 = "sha256-V4hswyj6Ly6inaIlHlxpvER8ar09wZ55Ad+xH4GbHfs=";
};
buildInputs = [
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index e44c49ac6bb8..e8a50dc6d8c9 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -32,13 +32,13 @@ let
in
mkDerivation rec {
pname = "renderdoc";
- version = "1.18";
+ version = "1.21";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
- sha256 = "sha256-nwERwdNQYY1Fd7llwZHrJBzWDJNdsySRQ3ZvXZjB7YY=";
+ sha256 = "sha256-T6OAr6Pl4VmXVSlNHF6kh8jIKs3FSTZsZ+Y4IH3SPTE=";
};
buildInputs = [
diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix
index e793618f9d2d..08af45be5d48 100644
--- a/pkgs/applications/misc/free42/default.nix
+++ b/pkgs/applications/misc/free42/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "free42";
- version = "3.0.9";
+ version = "3.0.13";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
- hash = "sha256-ZSwqgHsfe9apyYZ1fkvDMnQxdNb9E8U1l9jvC9t693w=";
+ hash = "sha256-0CFDkGUV9dihshYbjc0JL0axBcW499mt13xxdfO31vg=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix
index 80a423a3c83c..c06713c98a66 100644
--- a/pkgs/applications/misc/overmind/default.nix
+++ b/pkgs/applications/misc/overmind/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "overmind";
- version = "2.2.2";
+ version = "2.3.0";
nativeBuildInputs = [ makeWrapper ];
@@ -14,10 +14,10 @@ buildGoModule rec {
owner = "DarthSim";
repo = pname;
rev = "v${version}";
- sha256 = "zDjIwnhDoUj+zTAhtBa94dx7QhYMCTxv2DNUpeP8CP0=";
+ sha256 = "sha256-vmmSsg0JneMseFCcx/no2x/Ghppmyiod8ZAIb4JWW9I=";
};
- vendorSha256 = "KDMzR6qAruscgS6/bHTN6RnHOlLKCm9lxkr9k3oLY+Y=";
+ vendorSha256 = "sha256-QIKyLknPvmt8yiUCSCIqha8h9ozDGeQnKSM9Vwus0uY=";
meta = with lib; {
homepage = "https://github.com/DarthSim/overmind";
diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index c97d28de8d3d..87c459226831 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "argocd";
- version = "2.4.4";
+ version = "2.4.8";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
- sha256 = "sha256-rmgXsA9rOCUy1HDm09Aq5s8EfkM71We76gffPElnUAU=";
+ sha256 = "sha256-7eL6PQPB9xI5vmYuIaLHQLx6Dj/bRuv+Qw0MzJXUk4g=";
};
- vendorSha256 = "sha256-32cuYIySHtV+PfN2wrqf+p01+F6uBZJN3w2MeDQ8hbI=";
+ vendorSha256 = "sha256-dM7ahmBaXrLjOF8XAPdIkoyhfSTbgturrf1F8xSUvjk=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
@@ -26,9 +26,9 @@ buildGoModule rec {
"-X ${package_url}.gitCommit=${src.rev}"
"-X ${package_url}.gitTag=${src.rev}"
"-X ${package_url}.gitTreeState=clean"
- "-X ${package_url}.kubectlVersion=v0.23.3"
+ "-X ${package_url}.kubectlVersion=v0.23.1"
# NOTE: Update kubectlVersion when upgrading this package with
- # https://github.com/argoproj/argo-cd/blob/master/go.mod#L95
+ # https://github.com/argoproj/argo-cd/blob/v${version}/go.mod#L95
# Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18
# Will need a way to automate it :P
];
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index 3f216213849d..614ddc58dac5 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -323,7 +323,7 @@ buildGoModule rec {
passthru.updateScript = ./update.sh;
- passthru.tests = { inherit (nixosTests) k3s-single-node; };
+ passthru.tests = nixosTests.k3s;
meta = baseMeta;
}
diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix
index befec62fbc50..cab22babbcf4 100644
--- a/pkgs/applications/networking/cluster/k3sup/default.nix
+++ b/pkgs/applications/networking/cluster/k3sup/default.nix
@@ -2,24 +2,25 @@
, buildGoModule
, fetchFromGitHub
, makeWrapper
+, installShellFiles
, bash
, openssh
}:
buildGoModule rec {
pname = "k3sup";
- version = "0.11.3";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "alexellis";
repo = "k3sup";
rev = version;
- sha256 = "sha256-6WYUmC2uVHFGLsfkA2EUOWmmo1dSKJzI4MEdRnlLgYY=";
+ sha256 = "sha256-sb0cVLPIRD49AQ2XUsXkABFEZPrcuytr8Ht7Zt40H3o=";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper installShellFiles ];
- vendorSha256 = "sha256-Pd+BgPWoxf1AhP0o5SgFSvy4LyUQB7peKWJk0BMy7ds=";
+ vendorSha256 = "sha256-I2bODrGF4D7B13qBZtCAOWgAmrxdleqfDQz+vCGmdjQ=";
postConfigure = ''
substituteInPlace vendor/github.com/alexellis/go-execute/pkg/v1/exec.go \
@@ -37,6 +38,11 @@ buildGoModule rec {
postInstall = ''
wrapProgram "$out/bin/k3sup" \
--prefix PATH : ${lib.makeBinPath [ openssh ]}
+
+ installShellCompletion --cmd k3sup \
+ --bash <($out/bin/k3sup completion bash) \
+ --zsh <($out/bin/k3sup completion zsh) \
+ --fish <($out/bin/k3sup completion fish)
'';
meta = with lib; {
diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/applications/networking/cluster/levant/default.nix
index 7e9ca9a84a2b..afee16bf8f8f 100644
--- a/pkgs/applications/networking/cluster/levant/default.nix
+++ b/pkgs/applications/networking/cluster/levant/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "levant";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "levant";
rev = "v${version}";
- sha256 = "9M7a4i+DPKb1H9jOEVAvhvYxGwtj3dK/40n4GSy4Rqo=";
+ sha256 = "sha256-ujybD4nSHC/w2Pfu43eSO6rNJjXFAvc81T05icWFvbs=";
};
- vendorSha256 = "sha256-m3WSk5RvCmeIgX6SwHpWHvokgs71cY6XCKtHJ4jnonc=";
+ vendorSha256 = "sha256-pKxj0qz7adSuPpiXu4+2KBO3JZu8zZ8ycPF5LosF4T8=";
# The tests try to connect to a Nomad cluster.
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix
index fb1888d62358..a91ac4ce33e4 100644
--- a/pkgs/applications/networking/cluster/odo/default.nix
+++ b/pkgs/applications/networking/cluster/odo/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "odo";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "redhat-developer";
repo = "odo";
rev = "v${version}";
- sha256 = "KYJkCoF80UPsebWwxpc5gIfmT3Aj4OU8r6dDkaWXqbY=";
+ sha256 = "sha256-+UvG+aDji/GtkXdt+xZB06j6NxjeK2nhBjle5K+lx/A=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index de96a3ddaa8a..f13d3d321a15 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
pname = "compactor";
- version = "1.2.0";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "dns-stats";
repo = pname;
rev = version;
fetchSubmodules = true;
- hash = "sha256-AUNPUk70VwJ0nZgMPLMU258nqkL4QP6km0USrZi2ea0=";
+ hash = "sha256-SgmtlbYOrSMzVfzsrbg4qs+yGkXQialiJTI99EBsUjQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/ftp/gftp/default.nix b/pkgs/applications/networking/ftp/gftp/default.nix
index 37338d31e0dc..3007fdd67183 100644
--- a/pkgs/applications/networking/ftp/gftp/default.nix
+++ b/pkgs/applications/networking/ftp/gftp/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gftp";
- version = "2.8.0b";
+ version = "2.9.1b";
src = fetchFromGitHub {
owner = "masneyb";
repo = pname;
rev = version;
- hash = "sha256-syeRFpqbd1VhKhhs/fIByDSVpcY+SAlmikDo3J1ZHlo=";
+ hash = "sha256-0zdv2oYl24BXh61IGCWby/2CCkzNjLpDrAFc0J89Pw4=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix
index 635cc569e86f..f23b22022ebb 100644
--- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix
@@ -48,7 +48,7 @@ let
configureFlags = old.configureFlags
++ (readLinesToList ./config/ffmpeg_args_common)
++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux)
- ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86);
+ ++ lib.optionals stdenv.hostPlatform.isx86 (readLinesToList ./config/ffmpeg_args_x86);
outputs = [ "out" "doc" ];
meta = old.meta // {
# undefined reference to `ff_nlmeans_init_aarch64'
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix
new file mode 100644
index 000000000000..fd8342fbdead
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchFromGitHub, pidgin, json-glib, signald }:
+
+stdenv.mkDerivation rec {
+ pname = "purple-signald";
+ version = "0.11.0";
+
+ src = fetchFromGitHub {
+ owner = "hoehermann";
+ repo = "libpurple-signald";
+ rev = "v${version}";
+ sha256 = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc=";
+ fetchSubmodules = true;
+ };
+
+ buildInputs = [
+ pidgin
+ json-glib
+ signald
+ ];
+
+ PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
+ PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
+
+ installFlags = [ "DESTDIR=$(out)" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/hoehermann/libpurple-signald";
+ description = "Signal support for Pidgin / libpurple";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ hufman ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 47e295de29d3..739f45fd4ee9 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf
, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3
@@ -20,6 +20,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-6xQniOLNUk8tDkooDN3Tp6sb43GqoynO6+fN9yhNqZ4=";
};
+ patches = [
+ (fetchpatch {
+ name = "symbolic-icons.patch";
+ url =
+ "https://github.com/astroidmail/astroid/commit/7c2022f06a4146ad62e858bcaacdb4ee817851b9.patch";
+ hash = "sha256-hZHOg1wUR8Kpd6017fWzhMmG+/WQxSOCnsiyIvUcpbU=";
+ })
+ ];
+
nativeBuildInputs = [
cmake ronn pkg-config wrapGAppsHook gobject-introspection
python3 python3.pkgs.wrapPython
diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index e9dc1eb492bc..1dab78a8fca8 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
meta = with lib; {
description = "Simple and highly scalable distributed file system";
homepage = "https://github.com/chrislusf/seaweedfs";
- maintainers = with maintainers; [ cmacrae raboof ];
+ maintainers = with maintainers; [ cmacrae ];
mainProgram = "weed";
license = licenses.asl20;
};
diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix
index c1bf56b45d5b..47c738f4cd60 100644
--- a/pkgs/applications/science/logic/cvc5/default.nix
+++ b/pkgs/applications/science/logic/cvc5/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cvc5";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "cvc5";
repo = "cvc5";
rev = "cvc5-${version}";
- sha256 = "03sxqwmlajffmv7lncqs1bx8gyihkpnikk87q9wjrd4776n13ign";
+ sha256 = "sha256-D3rexkDc78w/HObT/WYPBo8mTBx1MAkxPXJvddg97ic=";
};
nativeBuildInputs = [ pkg-config cmake ];
diff --git a/pkgs/applications/science/math/primecount/default.nix b/pkgs/applications/science/math/primecount/default.nix
index 993092c4653f..a5ecd42a8e49 100644
--- a/pkgs/applications/science/math/primecount/default.nix
+++ b/pkgs/applications/science/math/primecount/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "primecount";
- version = "7.3";
+ version = "7.4";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primecount";
rev = "v${version}";
- hash = "sha256-hxnn1uiGSB6XRC7yK+SXTwTsJfjhemWXsMNhhL7Ghek=";
+ hash = "sha256-ZKrTeeDJgVy+6Q0twFW9+bQulUmOL1dxznYK9nWd07Y=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/science/math/primesieve/default.nix b/pkgs/applications/science/math/primesieve/default.nix
index c57e2d71f1ee..e43538e9babc 100644
--- a/pkgs/applications/science/math/primesieve/default.nix
+++ b/pkgs/applications/science/math/primesieve/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "primesieve";
- version = "7.9";
+ version = "8.0";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primesieve";
rev = "v${version}";
- hash = "sha256-lwT+adKFoNI125y5FuJMovtMh8sFi9oqMLYGLabzrCI=";
+ hash = "sha256-sqHNQXWeo+Iktq3gyiDLblBq/9QNlUQDvi1oHcZ2XYM=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix
index c128536d3434..71c8bf179041 100644
--- a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "git-delete-merged-branches";
- version = "6.4.0";
+ version = "7.0.0";
src = fetchFromGitHub {
owner = "hartwork";
repo = pname;
- rev = version;
- sha256 = "sha256-swAc8ObZY78nVQyjTrVG81xBqTYnWHVDFpiUApbowqU=";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-CPJhd3QXXNm4RGBEDnNOohVOYKVI6I8uc3cDiTrXKvc=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
index 98da70a274e4..b6595a7278ea 100644
--- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
@@ -31,6 +31,6 @@ buildRustPackage rec {
description = "Quickly and easily fetch .gitignore templates from gitignore.io";
homepage = "https://github.com/sondr3/git-ignore";
license = licenses.gpl3Plus;
- maintainers = [ maintainers.sondr3 ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
index 75bf008d1ec7..a697093e1f80 100644
--- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -1,23 +1,35 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "lefthook";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
- sha256 = "sha256-uaIZrxfzV2WPvnAPm6Q67yKx1EVmSMcChSxZG/Huw48=";
+ sha256 = "sha256-/y9UUVwJ/u1F9+hMxWqGENscTuf8GP4VZl7hTk3zyrM=";
};
vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI=";
+ nativeBuildInputs = [ installShellFiles ];
+
+ ldflags = [ "-s" "-w" ];
+
doCheck = false;
+ postInstall = ''
+ installShellCompletion --cmd lefthook \
+ --bash <($out/bin/lefthook completion bash) \
+ --fish <($out/bin/lefthook completion fish) \
+ --zsh <($out/bin/lefthook completion zsh)
+ '';
+
meta = with lib; {
description = "Fast and powerful Git hooks manager for any type of projects";
- homepage = "https://github.com/Arkweid/lefthook";
+ homepage = "https://github.com/evilmartians/lefthook";
+ changelog = "https://github.com/evilmartians/lefthook/raw/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ rencire ];
};
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index c9af0c8f1f02..c82951768cc6 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -14,21 +14,14 @@
buildGoPackage rec {
pname = "gitea";
- version = "1.16.9";
+ version = "1.17.0";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "sha256-LxPYUSyRSfDlGwCC2IFPEISP4wsRJsUbwi9F7sxbMOE=";
+ sha256 = "sha256-oBbAg2xQ58dLBCjhcKMoUf32ckoFfnFQHL3z3pAKW1Y=";
};
- unpackPhase = ''
- mkdir source/
- tar xvf $src -C source/
- '';
-
- sourceRoot = "source";
-
patches = [
./static-root-path.patch
];
diff --git a/pkgs/applications/version-management/verco/default.nix b/pkgs/applications/version-management/verco/default.nix
index 407608cc22d5..22fe2b2fbbd2 100644
--- a/pkgs/applications/version-management/verco/default.nix
+++ b/pkgs/applications/version-management/verco/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "verco";
- version = "6.8.0";
+ version = "6.12.0";
src = fetchFromGitHub {
owner = "vamolessa";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-E1kqJLnTLPu38zvDGaPHiKSW/yKormbx5N1CBSzQxgc=";
+ sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM=";
};
- cargoSha256 = "sha256-9342LAChCv61kxTJoeOy7EdafMfR10s8dtkc2pTgXT0=";
+ cargoSha256 = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U=";
meta = with lib; {
description = "A simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts";
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 3c73e7f59944..d20c6125beb2 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -206,7 +206,7 @@ let self = stdenv.mkDerivation rec {
++ optional (!useGtk) "--disable-gtk"
++ optional useFdk "--enable-fdk-aac"
++ optional stdenv.isDarwin "--disable-xcode"
- ++ optional (stdenv.isx86_32 || stdenv.isx86_64) "--harden";
+ ++ optional stdenv.hostPlatform.isx86 "--harden";
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing
NIX_LDFLAGS = [ "-lx265" ];
diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix
index 12864d3b40af..d51b32bbb19c 100644
--- a/pkgs/applications/video/qmplay2/default.nix
+++ b/pkgs/applications/video/qmplay2/default.nix
@@ -22,13 +22,13 @@
}:
stdenv.mkDerivation rec {
pname = "qmplay2";
- version = "22.03.19";
+ version = "22.06.16";
src = fetchFromGitHub {
owner = "zaps166";
repo = "QMPlay2";
rev = version;
- sha256 = "sha256-+EIv74dMm0zxZcCfa5wR6FJNJl5Xaes+/dCRQEBqFeo=";
+ sha256 = "sha256-nSlmbBCfN+yZlCcgTujBSkZc1uOO0wYpMPUwgLudJEY=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix
new file mode 100644
index 000000000000..219010eeb393
--- /dev/null
+++ b/pkgs/applications/video/showmethekey/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, glib
+, meson
+, ninja
+, libevdev
+, json-glib
+, cairo
+, pango
+, libinput
+, gtk4
+, wrapGAppsHook
+, libxkbcommon
+, pkg-config
+}:
+stdenv.mkDerivation rec {
+ pname = "showmethekey";
+ version = "1.7.3";
+
+ src = fetchFromGitHub {
+ owner = "AlynxZhou";
+ repo = "showmethekey";
+ rev = "v${version}";
+ sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA=";
+ };
+
+ nativeBuildInputs = [
+ glib
+ meson
+ ninja
+ cairo
+ pango
+ json-glib
+ pkg-config
+ libevdev
+ libinput
+ libxkbcommon
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk4
+ ];
+
+ meta = with lib; {
+ homepage = "https://showmethekey.alynx.one/";
+ description = "Show keys you typed on screen";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ ocfox ];
+ };
+}
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 770fe2cea3ee..e870b8572d8d 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -31,6 +31,7 @@
, libkate
, libmad
, libmatroska
+, libmodplug
, libmtp
, liboggz
, libopus
@@ -79,7 +80,6 @@
let
inherit (lib) optionalString optional optionals;
- hostIsAarch = stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64;
in
stdenv.mkDerivation rec {
pname = "${optionalString onlyLibVLC "lib"}vlc";
@@ -122,6 +122,7 @@ stdenv.mkDerivation rec {
libmad
libmatroska
libmtp
+ libmodplug
liboggz
libopus
libplacebo
@@ -157,7 +158,7 @@ stdenv.mkDerivation rec {
xcbutilkeysyms
xlibsWrapper
])
- ++ optional (!hostIsAarch && !onlyLibVLC) live555
+ ++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555
++ optional jackSupport libjack2
++ optionals chromecastSupport [ libmicrodns protobuf ]
++ optionals skins2Support (with xorg; [
@@ -182,7 +183,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- LIVE555_PREFIX = if hostIsAarch then null else live555;
+ LIVE555_PREFIX = if stdenv.hostPlatform.isAarch then null else live555;
# vlc depends on a c11-gcc wrapper script which we don't have so we need to
# set the path to the compiler
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index f95568f918f1..6858b8bb6dc9 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "docker-compose";
- version = "2.7.0";
+ version = "2.8.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
- sha256 = "sha256-cx2Qn5NHQgs2iJ1SDyTdptHSyPUhx4SpCTfvjUwldfI=";
+ sha256 = "sha256-EayVmFBlUrBr9xJKebJ+lBdiylub/upzd34ecBPkO8Q=";
};
- vendorSha256 = "sha256-8CvtqnXSKoK/SA0tc/0Duv3pmYT69/3a/HFvAr4KNJo=";
+ vendorSha256 = "sha256-7sJIzY1fXwMe8cowv7bThOOUd/7cLYPed6RFal2XKHk=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index af2c4a0070ad..83c48536b307 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -3,7 +3,6 @@
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
-, fetchpatch
# If open-watcom-bin is not passed, VirtualBox will fall back to use
# the shipped alternative sources (assembly).
, open-watcom-bin
@@ -24,14 +23,14 @@ let
buildType = "release";
# Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
- version = "6.1.34";
+ version = "6.1.36";
in stdenv.mkDerivation {
pname = "virtualbox";
inherit version;
src = fetchurl {
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
- sha256 = "9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49";
+ sha256 = "e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047";
};
outputs = [ "out" "modsrc" ];
@@ -98,15 +97,6 @@ in stdenv.mkDerivation {
./qtx11extras.patch
# https://github.com/NixOS/nixpkgs/issues/123851
./fix-audio-driver-loading.patch
- # NOTE: both patches below should be removed when updating to 6.1.35
- # https://www.virtualbox.org/ticket/20914#comment:15
- (fetchpatch {
- url = "https://www.virtualbox.org/raw-attachment/ticket/20914/vbox-linux-5.19.patch";
- hash = "sha512-NNiMf8kUuM/PimrQCOacYLkrf7UFPh6ZdPsXKyLlsqWfWQXkG92Fv3qZXvg8weE1Z/SBsFTuHICEI4b4l1wZFw==";
- extraPrefix = "/";
- })
- # https://www.virtualbox.org/ticket/20904#comment:22
- ./ffreestanding.patch
];
postPatch = ''
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 24e66ef7c753..83861e648cea 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -1,4 +1,4 @@
-{fetchurl, lib, virtualbox}:
+{ fetchurl, lib, virtualbox }:
with lib;
@@ -12,7 +12,7 @@ fetchurl rec {
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
- let value = "d7856f0688b6d2ed1e8bff0b367efa952068b03fa5a3a29b46db08cfd5d9a810";
+ let value = "3c84f0177a47a1969aff7c98e01ddceedd50348f56cc52d63f4c2dd38ad2ca75";
in assert (builtins.stringLength value) == 64; value;
meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/ffreestanding.patch b/pkgs/applications/virtualization/virtualbox/ffreestanding.patch
deleted file mode 100644
index 0e22aa60cde4..000000000000
--- a/pkgs/applications/virtualization/virtualbox/ffreestanding.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Config.kmk b/Config.kmk
-index 3df197404..4c6bd76bb 100644
---- a/Config.kmk
-+++ b/Config.kmk
-@@ -4503,11 +4504,14 @@ ifeq ($(VBOX_LDR_FMT),elf)
- TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
- TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
- $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
-- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
-+ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
- TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
- $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
- -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
-+ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++.
-+TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding
-+ endif
- TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
- TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
- TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 538ebfa78cf8..75684cb3b99c 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "88f86fa0e6970b6a7c80d714b7a91a8c425ff8ef53a3e73fc80781191a87257b";
+ sha256 = "c987cdc8c08c579f56d921c85269aeeac3faf636babd01d9461ce579c9362cdd";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
@@ -148,6 +148,6 @@ in stdenv.mkDerivation rec {
license = "GPL";
maintainers = [ lib.maintainers.sander ];
platforms = [ "i686-linux" "x86_64-linux" ];
- broken = kernel.kernelAtLeast (if stdenv.hostPlatform.is32bit then "5.10" else "5.17");
+ broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10");
};
}
diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix
index bfc360e81bbd..95170b79326d 100644
--- a/pkgs/applications/window-managers/dwl/default.nix
+++ b/pkgs/applications/window-managers/dwl/default.nix
@@ -21,13 +21,13 @@ in
stdenv.mkDerivation rec {
pname = "dwl";
- version = "0.2.2";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "djpohly";
repo = pname;
rev = "v${version}";
- hash = "sha256-T2GqDehBNO8eublqZUmA5WADjnwElzT+bp9Dp1bqSgg=";
+ hash = "sha256-VHxBjjnzJNmtJxrm3ywJzvt2bNHGk/Cx8TICw6SaoiQ=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 75cb96f27f4a..da97958fb346 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "icewm";
- version = "2.9.6";
+ version = "2.9.8";
src = fetchFromGitHub {
owner = "ice-wm";
repo = pname;
rev = version;
- hash = "sha256-qC8gEVJ/cmsEbF8jMzv7zyvVcjlbXhgHU3ixe7RLcnA=";
+ hash = "sha256-SjLXPlwL3tMBD7RCJkL60lqcld/ZXIxgjeNrAn8A6KU=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix
index f58b71ef03ad..ba145b85286f 100644
--- a/pkgs/applications/window-managers/labwc/default.nix
+++ b/pkgs/applications/window-managers/labwc/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "labwc";
- version = "0.5.0";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "labwc";
repo = pname;
rev = version;
- hash = "sha256-G0EQuXSHftl4JLXKIro+tmhbApwAhlzcjPEL7DP6LHk=";
+ hash = "sha256-YD2bGxa7uss6KRvOGM0kn8dM+277ubaYeOB7ugRZCcY=";
};
nativeBuildInputs = [
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index b5adae03df2d..07e79d077dbb 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -70,6 +70,7 @@ let
dynamicLinker =
/**/ if sharedLibraryLoader == null then null
else if targetPlatform.libc == "musl" then "${sharedLibraryLoader}/lib/ld-musl-*"
+ else if targetPlatform.libc == "uclibc" then "${sharedLibraryLoader}/lib/ld*-uClibc.so.1"
else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker"
else if (targetPlatform.libc == "bionic" && targetPlatform.is64bit) then "/system/bin/linker64"
else if targetPlatform.libc == "nblibc" then "${sharedLibraryLoader}/libexec/ld.elf_so"
diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix
index baf49c80e1c7..3a9b91deb28f 100644
--- a/pkgs/data/fonts/openmoji/default.nix
+++ b/pkgs/data/fonts/openmoji/default.nix
@@ -47,13 +47,13 @@ let
in stdenv.mkDerivation rec {
pname = "openmoji";
- version = "13.1.0";
+ version = "14.0.0";
src = fetchFromGitHub {
owner = "hfg-gmuend";
repo = pname;
rev = version;
- sha256 = "sha256-7G6a+LFq79njyPhnDhhSJ98Smw5fWlfcsFj6nWBPsSk=";
+ sha256 = "sha256-XnSRSlWXOMeSaO6dKaOloRg3+sWS4BSaro4bPqOyKmE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix
index d76a5cc733c9..e2fd7567f11e 100644
--- a/pkgs/development/compilers/4th/default.nix
+++ b/pkgs/development/compilers/4th/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "4th";
- version = "3.64.0";
+ version = "3.64.1";
src = fetchurl {
url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz";
- hash = "sha256-wJBekjFsFRIkhY/P/yHBQ8he+k+fGyrePGTP2Yjgpqg=";
+ hash = "sha256-+W6nTNsqrf3Dvr+NbSz3uJdrXVbBI3OHR5v/rs7en+M=";
};
patches = [
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 61f5fc83c152..408a807df9d9 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "closure-compiler";
- version = "20220601";
+ version = "20220719";
src = fetchurl {
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
- sha256 = "sha256-S061TQcvLRP1tw+i0XGcpU1cpA6mhISnCjAFV/Y+lLg=";
+ sha256 = "sha256-eEWNhMUjp+iBB9uzVB430kAfkojtKx2DTUGwpxMc+Us=";
};
dontUnpack = true;
diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix
index 6badaa3b4c8a..b371ae02c8df 100644
--- a/pkgs/development/compilers/graalvm/community-edition/default.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/default.nix
@@ -15,8 +15,8 @@ let
Don't change these values! They will be updated by the update script, see ./update.nix.
*/
- graalvm11-ce-release-version = "22.1.0";
- graalvm17-ce-release-version = "22.1.0";
+ graalvm11-ce-release-version = "22.2.0";
+ graalvm17-ce-release-version = "22.2.0";
products = [
"graalvm-ce"
diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json
index 38f4a4eda9ad..bb1e2b40dd78 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json
@@ -1,42 +1,42 @@
{
"darwin-aarch64": {
- "graalvm-ce|java11|22.1.0": {
- "sha256": "06bc19a0b1e93aa3df5e15c08e97f8cef624cb6070eeae40a69a51ec7fd41152",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-darwin-aarch64-22.1.0.tar.gz"
+ "graalvm-ce|java11|22.2.0": {
+ "sha256": "ee513cec2ef7b34ae6fbb8a3015c227ab2a24bfb2771c16152f15a1846df01f4",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-darwin-aarch64-22.2.0.tar.gz"
},
- "native-image-installable-svm|java11|22.1.0": {
- "sha256": "21f84ccf7b979dccc9091032fe76b5737b38e0092f282107cef75143dadb3bdb",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-darwin-aarch64-22.1.0.jar"
+ "native-image-installable-svm|java11|22.2.0": {
+ "sha256": "aba76d671017f93cdaae5102607d0bc7a1398adc5de8a4b1e308fa366d5983f9",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-darwin-aarch64-22.2.0.jar"
}
},
"darwin-amd64": {
- "graalvm-ce|java11|22.1.0": {
- "sha256": "c4c9df94ca47b83b582758b87d39042732ba0193fc63f1ab93f6818005a1fe6b",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-darwin-amd64-22.1.0.tar.gz"
+ "graalvm-ce|java11|22.2.0": {
+ "sha256": "3c6aca6faefa9e1f73de45fc56cc07d6f7864f63ce0b95148002dadb8f78cd86",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-darwin-amd64-22.2.0.tar.gz"
},
- "native-image-installable-svm|java11|22.1.0": {
- "sha256": "e0758687f4bd46f15fcee9b0a5bdd65d702ec81c41d465ee7229d3f4465bcf13",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-darwin-amd64-22.1.0.jar"
+ "native-image-installable-svm|java11|22.2.0": {
+ "sha256": "de9bf830d000a54934a01149691a9a8d4ef6e33414776abd14f95c65b149c908",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-darwin-amd64-22.2.0.jar"
}
},
"linux-aarch64": {
- "graalvm-ce|java11|22.1.0": {
- "sha256": "050a4d471247d91935f7f485e92d678f0163e1d6209e26e8fe75d7c924f73e71",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-linux-aarch64-22.1.0.tar.gz"
+ "graalvm-ce|java11|22.2.0": {
+ "sha256": "1ab64b35ed2478160bc6725d13ff5a2b9e31676b59ea3aaa9aca7a3a3db47132",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-aarch64-22.2.0.tar.gz"
},
- "native-image-installable-svm|java11|22.1.0": {
- "sha256": "12715793b223ce1db7ec7d0a339f0b578a0c9fb6dcc6607044e5af4fd33b25a7",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-linux-aarch64-22.1.0.jar"
+ "native-image-installable-svm|java11|22.2.0": {
+ "sha256": "0454b699ad969791984f4d1200c1834decb33c1f1e15e95b35f8f484b18c7783",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-aarch64-22.2.0.jar"
}
},
"linux-amd64": {
- "graalvm-ce|java11|22.1.0": {
- "sha256": "78c628707007bb97b09562932ee16f50beb1c3fa4a36e4311a0465a4a718e683",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-linux-amd64-22.1.0.tar.gz"
+ "graalvm-ce|java11|22.2.0": {
+ "sha256": "882363c75d1b1782a48bbf7dd8b155ab231b0957fd5885941376d90b69f21b9e",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz"
},
- "native-image-installable-svm|java11|22.1.0": {
- "sha256": "36e4a2a9a73a19b03883f9e783bc8bde7c214bb0fa4b617379cb81798de425bf",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-linux-amd64-22.1.0.jar"
+ "native-image-installable-svm|java11|22.2.0": {
+ "sha256": "84e5fb2391272e69f3e08f385b178d314b9b096d7837277a67fcdc597a4e1ca3",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-amd64-22.2.0.jar"
}
}
}
diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
index dba9d9c9da04..7685e35ebe5d 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
@@ -1,42 +1,42 @@
{
"darwin-aarch64": {
- "graalvm-ce|java17|22.1.0": {
- "sha256": "06075cd390bd261721392cd6fd967b1d28c0500d1b5625272ea906038e5cd533",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-darwin-aarch64-22.1.0.tar.gz"
+ "graalvm-ce|java17|22.2.0": {
+ "sha256": "cfbeb38cd707a330048ab2140cb185176201c5cb654df752fcb4bd95e899b4ec",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
},
- "native-image-installable-svm|java17|22.1.0": {
- "sha256": "beabecdd5b87e7536772d4dfe70abf4c5dd9847e87615464cf309138d21c39af",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-darwin-aarch64-22.1.0.jar"
+ "native-image-installable-svm|java17|22.2.0": {
+ "sha256": "c6584429fe443f5415a7ec0545072b069f2e10bef1dbd6e7cb7fdec6ddb89b62",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-darwin-aarch64-22.2.0.jar"
}
},
"darwin-amd64": {
- "graalvm-ce|java17|22.1.0": {
- "sha256": "b9327fa73531a822d9a27d25980396353869eefbd73fdcef89b4fceb9f529c75",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-darwin-amd64-22.1.0.tar.gz"
+ "graalvm-ce|java17|22.2.0": {
+ "sha256": "b92b6f5f7f11282f20c8f8b94ea1c16d776cbadd7b254119836a7ace9f513b0d",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-amd64-22.2.0.tar.gz"
},
- "native-image-installable-svm|java17|22.1.0": {
- "sha256": "e6bfe208bb28cd1d98da55e00fa705890a7f69286b919947b07d18cc9bb9c270",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-darwin-amd64-22.1.0.jar"
+ "native-image-installable-svm|java17|22.2.0": {
+ "sha256": "a751d0c0dcdc7e06dd0166d731a482a6937f36a1b69ef62f9e9f443922e85861",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-darwin-amd64-22.2.0.jar"
}
},
"linux-aarch64": {
- "graalvm-ce|java17|22.1.0": {
- "sha256": "05128e361ed44beebc89495faaa504b0b975bf93aa5e512e217b3cf5e42dfada",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-linux-aarch64-22.1.0.tar.gz"
+ "graalvm-ce|java17|22.2.0": {
+ "sha256": "3025cc887bdaa088c89601b42931abc61dfd108aaad386abee8c1e08c913504d",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-linux-aarch64-22.2.0.tar.gz"
},
- "native-image-installable-svm|java17|22.1.0": {
- "sha256": "6e10f6953ec8b9509c7a7d0194d57f265cf2a05dcb8f3272a6a8e847bda49cda",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-linux-aarch64-22.1.0.jar"
+ "native-image-installable-svm|java17|22.2.0": {
+ "sha256": "eeac78046e059e77542eec1fac7c0423bf5fa73eb6fb01b25100d8a6f81eecc0",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-linux-aarch64-22.2.0.jar"
}
},
"linux-amd64": {
- "graalvm-ce|java17|22.1.0": {
- "sha256": "f11d46098efbf78465a875c502028767e3de410a31e45d92a9c5cf5046f42aa2",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-linux-amd64-22.1.0.tar.gz"
+ "graalvm-ce|java17|22.2.0": {
+ "sha256": "cd903566d030bf44a8c5c0f50914fc9c9d89cb2954e1f90512b137a0bfedc3ca",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-linux-amd64-22.2.0.tar.gz"
},
- "native-image-installable-svm|java17|22.1.0": {
- "sha256": "d81eecea15ebbf4f24850860c14104eaf6f8ae74574330e22afac533b8f96738",
- "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-linux-amd64-22.1.0.jar"
+ "native-image-installable-svm|java17|22.2.0": {
+ "sha256": "74656070429f8b24dd6770c2d274f272542116e3963291de74abed74c38ed08a",
+ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-linux-amd64-22.2.0.jar"
}
}
}
diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix
index b2e298fa65bc..ebc5cad5f933 100644
--- a/pkgs/development/compilers/jwasm/default.nix
+++ b/pkgs/development/compilers/jwasm/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "jwasm";
- version = "2.14";
+ version = "2.15";
src = fetchFromGitHub {
owner = "Baron-von-Riedesel";
repo = "JWasm";
rev = "v${version}";
- hash = "sha256-BUSsF73Q2vq6tF/YHMUyAmmFE/WWVQLRFJZkOD8T7f8=";
+ hash = "sha256-ef4uEtEpnqYGhFmxuefJ40zyOuHsiPOLpH/52i7a7KI=";
};
outputs = [ "out" "doc" ];
diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix
index 56661c1dbcc9..7d83624e8415 100644
--- a/pkgs/development/compilers/xa/dxa.nix
+++ b/pkgs/development/compilers/xa/dxa.nix
@@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
pname = "dxa";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchurl {
urls = [
"https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"
"https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz"
];
- hash = "sha256-C0rgwK51Ij9EZCm9GeiVnWIkEkse0d60ok8G9hm2a5U=";
+ hash = "sha256-jkDtd4FlgfmtlaysLtaaL7KseFDkM9Gc1oQZOkWCZ5k=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix
index 5256cf5cf135..5653774eed00 100644
--- a/pkgs/development/embedded/fpga/openfpgaloader/default.nix
+++ b/pkgs/development/embedded/fpga/openfpgaloader/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "openfpgaloader";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "trabucayre";
repo = "openFPGALoader";
rev = "v${version}";
- sha256 = "sha256-8AP4EJ+msOf1lstahyOyalI5dtS2ri7djN4zdN36Kfg=";
+ sha256 = "sha256-GPPycZTijEMXWgxxtPEhiDJk7FelQcwIGFbbrOHna+w=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix
index 2da11c87f81a..9b7811417d9f 100644
--- a/pkgs/development/haskell-modules/configuration-arm.nix
+++ b/pkgs/development/haskell-modules/configuration-arm.nix
@@ -1,8 +1,8 @@
# ARM-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS
#
-# This extension is applied to all haskell package sets in nixpkgs
-# if `stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64`
-# to apply arm specific workarounds or fixes.
+# This extension is applied to all haskell package sets in nixpkgs if
+# `stdenv.hostPlatform.isAarch` to apply arm specific workarounds or
+# fixes.
#
# The file is split into three parts:
#
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8392e751da2d..7bc1fa0f7e83 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -21,8 +21,7 @@ let
inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes;
};
- isArm = with stdenv.hostPlatform; isAarch64 || isAarch32;
- platformConfigurations = lib.optionals isArm [
+ platformConfigurations = lib.optionals stdenv.hostPlatform.isAarch [
(configurationArm { inherit pkgs haskellLib; })
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
(configurationDarwin { inherit pkgs haskellLib; })
diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index 6d59caab8e2b..89294e5e8279 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
- version = "0.8.157";
+ version = "0.9.160";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
- sha256 = "sha256-OxmBRtYH6MNlaFruvT7O1sPHSuUOUrivtPXtTwnFuz4=";
+ sha256 = "sha256-mLP9Jg18iNj4FMDAoa9n3jf5A3G+JekywDJBHM4HEwc=";
};
executable = "bb";
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 7f35dcfc6359..5e67986ac105 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
# emulating build_all.sh configuration variables
jplatform =
if stdenv.isDarwin then "darwin"
- else if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry"
+ else if stdenv.hostPlatform.isAarch then "raspberry"
else if stdenv.isLinux then "linux"
else "unsupported";
diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix
new file mode 100644
index 000000000000..09d07064527a
--- /dev/null
+++ b/pkgs/development/libraries/crossguid/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchFromGitHub, cmake, libuuid }:
+
+stdenv.mkDerivation rec {
+ pname = "crossguid";
+ version = "unstable-2019-05-29";
+
+ src = fetchFromGitHub {
+ owner = "graeme-hill";
+ repo = pname;
+ rev = "ca1bf4b810e2d188d04cb6286f957008ee1b7681";
+ hash = "sha256-37tKPDo4lukl/aaDWWSQYfsBNEnDjE7t6OnEZjBhcvQ=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = lib.optional stdenv.isLinux libuuid;
+
+ meta = with lib; {
+ description = "Lightweight cross platform C++ GUID/UUID library";
+ license = licenses.mit;
+ homepage = "https://github.com/graeme-hill/crossguid";
+ maintainers = with maintainers; [ lilyinstarlight ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 7a79e597beb5..54f42ae8db7b 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
patchShebangs ../test/
mkdir ../test/tmp
- ${lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) ''
+ ${lib.optionalString stdenv.hostPlatform.isAarch ''
# Fix tests on arm
# https://github.com/Exiv2/exiv2/issues/933
rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py
diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix
new file mode 100644
index 000000000000..b79c83cbf155
--- /dev/null
+++ b/pkgs/development/libraries/gl3w/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU }:
+
+stdenv.mkDerivation rec {
+ pname = "gl3w";
+ version = "unstable-2022-03-24";
+
+ src = fetchFromGitHub {
+ owner = "skaslev";
+ repo = pname;
+ rev = "5f8d7fd191ba22ff2b60c1106d7135bb9a335533";
+ hash = "sha256-qV/PZmaP5iCHhIzTA2bE4d1RMB6LzRbTsB5gWVvi9bU=";
+ };
+
+ nativeBuildInputs = [ python3 cmake ];
+ # gl3w installs a CMake config that when included expects to be able to
+ # build and link against both of these libraries
+ # (the gl3w generated C file gets compiled into the downstream target)
+ propagatedBuildInputs = [ libglvnd libGLU ];
+
+ dontUseCmakeBuildDir = true;
+
+ # These files must be copied rather than linked since they are considered
+ # outputs for the custom command, and CMake expects to be able to touch them
+ preConfigure = ''
+ mkdir -p include/{GL,KHR}
+ cp ${libglvnd.dev}/include/GL/glcorearb.h include/GL/glcorearb.h
+ cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h
+ '';
+
+ meta = with lib; {
+ description = "Simple OpenGL core profile loading";
+ homepage = "https://github.com/skaslev/gl3w";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ lilyinstarlight ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 0ed2dea0c4c0..c1dd608f8052 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
# tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
- buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
+ buildInputs = lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isAarch) libunwind;
# Disable general dynamic TLS on AArch to support dlopen()'ing the library:
# https://bugzilla.redhat.com/show_bug.cgi?id=1483558
- configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
+ configureFlags = lib.optional stdenv.hostPlatform.isAarch
"--disable-general-dynamic-tls";
prePatch = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 9ba791e073ca..006e4602fde9 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "grpc";
- version = "1.47.0"; # N.B: if you change this, please update:
+ version = "1.48.0"; # N.B: if you change this, please update:
# pythonPackages.grpcio-tools
# pythonPackages.grpcio-status
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
- sha256 = "sha256-fMYAos0gQelFMPkpR0DdKr4wPX+nhZSSqeaU4URqgto=";
+ hash = "sha256-cR+K3po/9XpYWe+sRXGwzvNAPChrWzYu5D4ygBTKKIQ=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 9f7f5fcb1d8f..ec12f1031cf5 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"-Dnm-path=${stdenv.cc.targetPrefix}nm"
"-Dinstall-test-programs=true"
"-Domap=true"
- ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [
+ ] ++ lib.optionals stdenv.hostPlatform.isAarch [
"-Dtegra=true"
"-Detnaviv=true"
];
diff --git a/pkgs/development/libraries/okapi/default.nix b/pkgs/development/libraries/okapi/default.nix
index c8981c54c114..b7a75ad6d1b9 100644
--- a/pkgs/development/libraries/okapi/default.nix
+++ b/pkgs/development/libraries/okapi/default.nix
@@ -2,11 +2,11 @@
rustPlatform.buildRustPackage rec {
pname = "okapi";
- version = "1.4.0";
+ version = "1.6.0";
src = fetchurl {
url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz";
- sha256 = "sha256-wNruDPjYHDJtpzQIly4da9rQg1ftdCVxRNNLkFsbKXs=";
+ sha256 = "sha256-wszpCzh1VhqBlox7ywWi6WKUmxQUTsf5N5IiJumlEbM=";
};
cargoVendorDir = "vendor";
diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix
index c83b4c2f19b2..51f86ef38604 100644
--- a/pkgs/development/libraries/openxr-loader/default.nix
+++ b/pkgs/development/libraries/openxr-loader/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openxr-loader";
- version = "1.0.22";
+ version = "1.0.24";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenXR-SDK-Source";
rev = "release-${version}";
- sha256 = "sha256-YaK7scnfXkxhRe/PKZukqHD9X70X0/QUDL0znTPbIBE=";
+ sha256 = "sha256-levPWBSwfw1N2tcBqQXtXznA7dzQRqVf/Rp2owGUamE=";
};
nativeBuildInputs = [ cmake python3 pkg-config ];
diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix
new file mode 100644
index 000000000000..8ed0c7a744be
--- /dev/null
+++ b/pkgs/development/libraries/platform-folders/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "platform-folders";
+ version = "4.2.0";
+
+ src = fetchFromGitHub {
+ owner = "sago007";
+ repo = "PlatformFolders";
+ rev = version;
+ hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
+ ];
+
+ meta = with lib; {
+ description = "A C++ library to look for standard platform directories so that you do not need to write platform-specific code";
+ homepage = "https://github.com/sago007/PlatformFolders";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lilyinstarlight ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix
index 36b6c5b9bae4..e21ff01018db 100644
--- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix
+++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rapidfuzz-cpp";
- version = "1.0.4";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "rapidfuzz-cpp";
rev = "v${version}";
- hash = "sha256-ocR88dgRo7dF7scATv8kPYmcK3R6a8DcoJfNHq1hZnM=";
+ hash = "sha256-ltxOn8thAiYgi5rG6xYFSnPl20Uyf4mWs1Rcv3lP++E=";
};
patches = [
diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/development/libraries/redis-plus-plus/default.nix
index a39a9b185dca..7d3d7d486714 100644
--- a/pkgs/development/libraries/redis-plus-plus/default.nix
+++ b/pkgs/development/libraries/redis-plus-plus/default.nix
@@ -8,13 +8,13 @@ assert enableShared || enableStatic;
stdenv.mkDerivation rec {
pname = "redis-plus-plus";
- version = "1.3.3";
+ version = "1.3.5";
src = fetchFromGitHub {
owner = "sewenew";
repo = "redis-plus-plus";
rev = version;
- sha256 = "sha256-k4q5YbbbKKHXcL0nndzJPshzXS20ARz4Tdy5cBg7kMc=";
+ sha256 = "sha256-5tjadh3Ku7lrJn4tbi8TjTH6N0+QB2ER9xuO51cK/LU=";
};
nativeBuildInputs = [ cmake ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/sewenew/redis-plus-plus";
description = "Redis client written in C++";
license = licenses.asl20;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ wheelsandmetal ];
};
}
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 19f755ca0533..0de5fdf1b7af 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
- version = "7.3.1";
+ version = "7.4.4";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5fh8hH6f0Mv9XQAoHYIiY019qkC5PuLS2qlE+ladWWM=";
+ sha256 = "sha256-34pAAqUhHQiH0YuRl6a0zdn8p6hSAIJnZXIErm3SYFE=";
};
nativeBuildInputs = [ cmake ninja ];
diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix
index 3bef58cf212e..d8934a1ebf53 100644
--- a/pkgs/development/libraries/simdjson/default.nix
+++ b/pkgs/development/libraries/simdjson/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
- version = "2.2.0";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
- sha256 = "sha256-n+W5xvWC3sPSX0SF5x1ArUtWZayoyQRThgWWhRG4Fac=";
+ sha256 = "sha256-PU6yTA2FXHcuSwr6oIU+cP7uYxkgggnj3FV2LbkS69w=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index 9573afda0b30..a5a2c8846fe0 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "simpleitk";
- version = "2.1.1";
+ version = "2.1.1.1";
outputs = [ "out" "dev" ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "SimpleITK";
repo = "SimpleITK";
rev = "v${version}";
- sha256 = "0ShUo9UVkliROIIR5bJtqlzESByfq9SQ1+Hy/40vJ50=";
+ sha256 = "sha256-W53TbrgIwY9jj0GXz1LIrsBO9YL4VkH6531UYV0IqbE=";
};
nativeBuildInputs = [ cmake swig4 ];
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index db5db61c6e99..7a647084f9cd 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchurl
, acl
, cyrus_sasl
@@ -33,7 +34,7 @@
, vala
, wayland-protocols
, zlib
-, withPolkit ? true
+, withPolkit ? stdenv.isLinux
}:
# If this package is built with polkit support (withPolkit=true),
@@ -59,13 +60,13 @@
stdenv.mkDerivation rec {
pname = "spice-gtk";
- version = "0.40";
+ version = "0.41";
outputs = [ "out" "dev" "devdoc" "man" ];
src = fetchurl {
url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz";
- sha256 = "sha256-I/X/f6gLdWR85zzaXq+LMi80Mtu7f286g5Y0YYrbztM=";
+ sha256 = "sha256-2Pi1y+qRhHAu64zCdqZ9cqzbbjbnxzNJ+4RF5byglp8=";
};
postPatch = ''
@@ -95,7 +96,8 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
- gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
];
buildInputs = [
@@ -104,8 +106,6 @@ stdenv.mkDerivation rec {
gtk3
json-glib
libcacard
- libcap_ng
- libdrm
libjpeg_turbo
libopus
libusb1
@@ -115,9 +115,15 @@ stdenv.mkDerivation rec {
pixman
spice-protocol
usbredir
- wayland-protocols
zlib
- ] ++ lib.optionals withPolkit [ polkit acl ] ;
+ ] ++ lib.optionals withPolkit [
+ polkit
+ acl
+ ] ++ lib.optionals stdenv.isLinux [
+ libcap_ng
+ libdrm
+ wayland-protocols
+ ];
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
@@ -126,6 +132,8 @@ stdenv.mkDerivation rec {
"-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids"
] ++ lib.optionals (!withPolkit) [
"-Dpolkit=disabled"
+ ] ++ lib.optionals (!stdenv.isLinux) [
+ "-Dlibcap-ng=disabled"
];
meta = with lib; {
@@ -140,6 +148,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.spice-space.org/";
license = licenses.lgpl21;
maintainers = [ maintainers.xeji ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index 60f532b9779a..797c32cb6d2d 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.spice-space.org/usbredir.html";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ offline ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index dc2b1c40c6cb..df248f6b4d43 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686) ''
# `AS' is set to the binutils assembler, but we need nasm
unset AS
- '' + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) ''
+ '' + lib.optionalString stdenv.hostPlatform.isAarch ''
export AS=$CC
'';
diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
index 2ca94a2085a4..29593503252a 100644
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@@ -85,7 +85,7 @@ buildPythonPackage rec {
"test_filename_without_dir"
"test_overwrite"
"test_options"
- ] ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) [
+ ] ++ lib.optionals (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isRiscV) [
# unknown reason so far
# https://github.com/adobe-type-tools/afdko/issues/1425
"test_spec"
diff --git a/pkgs/development/python-modules/ci-info/default.nix b/pkgs/development/python-modules/ci-info/default.nix
index d27f7cf0a82a..275f4cd5c858 100644
--- a/pkgs/development/python-modules/ci-info/default.nix
+++ b/pkgs/development/python-modules/ci-info/default.nix
@@ -1,14 +1,14 @@
{ lib, buildPythonPackage, isPy27, fetchPypi, pytest, pytestCheckHook }:
buildPythonPackage rec {
- version = "0.2.0";
+ version = "0.3.0";
pname = "ci-info";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "05j6pamk8sd51qmvpkl3f7sxajmncrqm0cz6n6bqgsvzjwn66w6x";
+ sha256 = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A=";
};
checkInputs = [ pytest pytestCheckHook ];
diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix
index 3af74be85b27..b81e5b0927ae 100644
--- a/pkgs/development/python-modules/django_silk/default.nix
+++ b/pkgs/development/python-modules/django_silk/default.nix
@@ -26,23 +26,16 @@
buildPythonPackage rec {
pname = "django-silk";
- version = "4.1.0";
+ version = "5.0.1";
# pypi tarball doesn't include test project
src = fetchFromGitHub {
owner = "jazzband";
repo = "django-silk";
rev = version;
- sha256 = "1km3hmx1sir0c5gqr2p1h2938slhxp2hzf10cb80q98mas8spjkn";
+ hash = "sha256-U2lj0B85cf2xu0o7enuLJB5YKaIt6gMvn+TgxleLslk=";
};
- patches = lib.optional (pythonAtLeast "3.9") (fetchpatch {
- # should be able to remove after 4.1.1
- name = "python-3.9-support.patch";
- url = "https://github.com/jazzband/django-silk/commit/134089e4cad7bd3b76fb0f70c423082cb7d2b34a.patch";
- sha256 = "09c1xd9y33h3ibiv5w9af9d79c909rgc1g5sxpd4y232h5id3c8r";
- });
-
# "test_time_taken" tests aren't suitable for reproducible execution, but django's
# test runner doesn't have an easy way to ignore tests - so instead prevent it from picking
# them up as tests
@@ -62,8 +55,13 @@ buildPythonPackage rec {
checkInputs = [ freezegun contextlib2 networkx pydot factory_boy ];
checkPhase = ''
- cd project
- DB=sqlite3 DB_NAME=db.sqlite3 ${python.interpreter} manage.py test
+ runHook preCheck
+
+ pushd project
+ DB_ENGINE=sqlite3 DB_NAME=':memory:' ${python.interpreter} manage.py test
+ popd # project
+
+ runHook postCheck
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix
index dfbfe9b183de..249f71c67dca 100644
--- a/pkgs/development/python-modules/duecredit/default.nix
+++ b/pkgs/development/python-modules/duecredit/default.nix
@@ -26,7 +26,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ citeproc-py requests setuptools six ];
checkInputs = [ contextlib2 pytest pytestCheckHook vcrpy ];
- disabledTests = [ "test_io" ];
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ pythonImportsCheck = [ "duecredit" ];
meta = with lib; {
homepage = "https://github.com/duecredit/duecredit";
diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix
index 779949b38fd7..5fd8115152f5 100644
--- a/pkgs/development/python-modules/fastnumbers/default.nix
+++ b/pkgs/development/python-modules/fastnumbers/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
# Tests fail due to numeric precision differences on ARM
# See https://github.com/SethMMorton/fastnumbers/issues/28
- doCheck = !(stdenv.isAarch64 || stdenv.isAarch32);
+ doCheck = !stdenv.hostPlatform.isAarch;
checkInputs = [
hypothesis
diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index 52a95fd8b65f..37f3617ecf39 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "grpcio-status";
- version = "1.47.0";
+ version = "1.48.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "c9ce3213e84c6fd8801c31aca3ea4a6b3453eaa40b93a6c0a23ea8999808fa00";
+ sha256 = "afac961fc3713889d3c48c11461aba49842ca62a54dfe8f346442046036e9856";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 73a98008739b..4797772086ad 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
- version = "1.47.0";
+ version = "1.48.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f64b5378484be1d6ce59311f86174be29c8ff98d8d90f589e1c56d5acae67d3c";
+ sha256 = "dd7f757608e7dfae4ab2e7fc1e8951e6eb9526ebdc7ce90597329bc4c408c9a1";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix
index 4892d72aae91..73e7d308ec4a 100644
--- a/pkgs/development/python-modules/jsonlines/default.nix
+++ b/pkgs/development/python-modules/jsonlines/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to simplify working with jsonlines and ndjson data";
homepage = "https://github.com/wbolster/jsonlines";
- maintainers = with maintainers; [ sondr3 ];
+ maintainers = with maintainers; [ ];
license = licenses.bsd3;
};
}
diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix
new file mode 100644
index 000000000000..2cf5a6d4678d
--- /dev/null
+++ b/pkgs/development/python-modules/mediapy/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, ipython
+, matplotlib
+, numpy
+, pillow
+}:
+
+buildPythonPackage rec {
+ pname = "mediapy";
+ version = "1.0.3";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-cM8u27XSN4VzXONk+tQElZgT5XdShWXq0UtDg5JbF9o=";
+ };
+
+ propagatedBuildInputs = [ ipython matplotlib numpy pillow ];
+
+ pythonImportsCheck = [ "mediapy" ];
+
+ meta = with lib; {
+ description = "Read/write/show images and videos in an IPython notebook";
+ homepage = "https://github.com/google/mediapy";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ mcwitt ];
+ };
+}
diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix
index 07991a0fac7e..7b2be6ab778c 100644
--- a/pkgs/development/python-modules/oscpy/default.nix
+++ b/pkgs/development/python-modules/oscpy/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pytestCheckHook }:
buildPythonPackage rec {
pname = "oscpy";
@@ -11,6 +11,15 @@ buildPythonPackage rec {
hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA=";
};
+ patches = [
+ # Fix flaky tests with kivy/oscpy#67 - https://github.com/kivy/oscpy/pull/67
+ (fetchpatch {
+ name = "improve-reliability-of-test_intercept_errors.patch";
+ url = "https://github.com/kivy/oscpy/commit/2bc114a97692aef28f8b84d52d0d5a41554a7d93.patch";
+ hash = "sha256-iT7cB3ChWD1o0Zx7//Czkk8TaU1oTU1pRQWvPeIpeWY=";
+ })
+ ];
+
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "oscpy" ];
diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix
index b63baa80b397..f27b0130a700 100644
--- a/pkgs/development/python-modules/packet-python/default.nix
+++ b/pkgs/development/python-modules/packet-python/default.nix
@@ -12,10 +12,10 @@
buildPythonPackage rec {
pname = "packet-python";
- version = "1.44.2";
+ version = "1.44.3";
src = fetchPypi {
inherit pname version;
- sha256 = "4ce0827bc41d5bf5558284c18048344343f7c4c6e280b64bbe53fb51ab454892";
+ sha256 = "sha256-WVfMELOoml7Hx78jy6TAwlFRLuSQu9dtsb6Khs6/cgI=";
};
nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
index 579a1570da7f..c86ffd5bde5f 100644
--- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
+++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
@@ -14,7 +14,9 @@
, ncurses
, networkmanager
, pkgs-systemd
+, python
, xdg-utils
+, makeWrapper
}:
buildPythonPackage rec {
@@ -25,7 +27,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = pname;
- rev = "refs/tags/${version}";
+ rev = version;
sha256 = "sha256-kfOLhM0/jzHj+KlDrnCe571Bcmv8TvuAbXMpt3uR2L0=";
};
@@ -51,6 +53,17 @@ buildPythonPackage rec {
})
];
+ postPatch = ''
+ substituteInPlace protonvpn_nm_lib/core/dbus/dbus_reconnect.py \
+ --replace "exec_start = python_interpreter_path + \" \" + python_service_path" "exec_start = \"$out/bin/protonvpn_reconnector.py\""
+ '';
+
+ postInstall = ''
+ makeWrapper ${python.interpreter} $out/bin/protonvpn_reconnector.py \
+ --add-flags $out/${python.sitePackages}/protonvpn_nm_lib/daemon/dbus_daemon_reconnector.py \
+ --prefix PYTHONPATH : "$PYTHONPATH"
+ '';
+
# Checks cannot be run in the sandbox
# "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory"
doCheck = false;
diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix
index fc9cc3f172d9..8d7277823a7b 100644
--- a/pkgs/development/python-modules/rx/default.nix
+++ b/pkgs/development/python-modules/rx/default.nix
@@ -1,32 +1,18 @@
-{ lib, fetchFromGitHub, buildPythonPackage
-, pythonOlder
-, poetry-core
-, nose
-, typing-extensions
-}:
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, nose }:
buildPythonPackage rec {
pname = "rx";
- version = "4.0.4";
+ version = "3.2.0";
disabled = pythonOlder "3.6";
- format = "pyproject";
- # There are no tests on the pypi source
- src = fetchFromGitHub {
- owner = "ReactiveX";
- repo = "rxpy";
- rev = "refs/tags/v${version}";
- sha256 = "sha256-W1qYNbYV6Roz1GJtP/vpoPD6KigWaaQOWe1R5DZHlUw=";
+ # Use fetchPypi to avoid the updater script to migrate it to `reactivex` which
+ # is being developed in the same repository
+ src = fetchPypi {
+ inherit version;
+ pname = "Rx";
+ sha256 = "b657ca2b45aa485da2f7dcfd09fac2e554f7ac51ff3c2f8f2ff962ecd963d91c";
};
- nativeBuildInputs = [
- poetry-core
- ];
-
- propagatedBuildInputs = [
- typing-extensions
- ];
-
checkInputs = [ nose ];
# Some tests are nondeterministic. (`grep sleep -r tests`)
@@ -34,6 +20,8 @@ buildPythonPackage rec {
# test_new_thread_scheduler_timeout: https://hydra.nixos.org/build/74949851
doCheck = false;
+ pythonImportsCheck = [ "rx" ];
+
meta = {
homepage = "https://github.com/ReactiveX/RxPY";
description = "Reactive Extensions for Python";
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 477dc540cf8d..91b0fb6b72a9 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -46,7 +46,7 @@
buildPythonPackage rec {
pname = "sentry-sdk";
- version = "1.8.0";
+ version = "1.9.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = "getsentry";
repo = "sentry-python";
rev = version;
- hash = "sha256-PtGQJUZ6/u2exmg6P5VV2RoBKyuV3G2YuAWgA06oQKo=";
+ hash = "sha256-sZpM9wgybyt/5Rw3X05whLvQNMC55o+s7eYA4QJdj6c=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
new file mode 100644
index 000000000000..9a8c65377b3d
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, docutils
+, sphinx
+, requests
+, jinja2
+}:
+
+buildPythonPackage rec {
+ pname = "sphinxcontrib-confluencebuilder";
+ version = "1.8.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-u+sjhj/2fu8fLGRb2zgnNI+y7wIIUYTMJhRekrdtMeU=";
+ };
+
+ propagatedBuildInputs = [
+ docutils
+ sphinx
+ requests
+ jinja2
+ ];
+
+ # Tests are disabled due to a circular dependency on Sphinx
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "sphinxcontrib.confluencebuilder"
+ ];
+
+ meta = with lib; {
+ description = "Confluence builder for sphinx";
+ homepage = "https://github.com/sphinx-contrib/confluencebuilder";
+ license = licenses.bsd1;
+ maintainers = with maintainers; [ graysonhead ];
+ };
+}
diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index ac21b4c62ed7..50e93eeac9b6 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -58,13 +58,6 @@ buildPythonPackage rec {
--replace 'cattrs = "^1.1"' 'cattrs = ">= 1.1"'
'';
- disabledTests = [
- # cattrs.errors.IterableValidationError: While structuring typing.List[statmake.classes.Axis]
- # https://github.com/daltonmaag/statmake/issues/42
- "test_load_stylespace_broken_range"
- "test_load_stylespace_broken_multilingual_no_en"
- ];
-
pythonImportsCheck = [
"statmake"
];
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index c3b637da0670..3e877ea1a8e0 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
# Depend on pyopenssl
"--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown"
"--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation"
- ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [
+ ] ++ lib.optionals stdenv.hostPlatform.isAarch [
# test gets stuck in epoll_pwait on hydras aarch64 builders
# https://github.com/MagicStack/uvloop/issues/412
"--deselect tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data"
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 37241a953403..2a59d95ab636 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.176.3";
+ version = "0.183.1";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
- sha256 = "sha256-ZjWIaZ4XT7v66ozjQu+ld0Tz2gVjQFUD6JoL1nW/DmE=";
+ sha256 = "sha256-RaME+vbmF/hDjwB/ZdvL+/ZgLtWeETMpi/xBlK1EvA0=";
};
makeFlags = [ "FLOW_RELEASE=1" ];
diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix
index 4866eb03ebd7..85031b3aad70 100644
--- a/pkgs/development/tools/database/sqlc/default.nix
+++ b/pkgs/development/tools/database/sqlc/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub }:
let
- version = "1.13.0";
+ version = "1.14.0";
in
buildGoModule {
pname = "sqlc";
@@ -11,11 +11,11 @@ buildGoModule {
owner = "kyleconroy";
repo = "sqlc";
rev = "v${version}";
- sha256 = "sha256-HPCt47tctVV8Oz9/7AoVMezIAv6wEsaB7B4rgo9/fNU=";
+ sha256 = "sha256-+JkNuN5Hv1g1+UpJEBZpf7QV/3A85IVzMa5cfeRSQRo=";
};
proxyVendor = true;
- vendorSha256 = "sha256-miyNIF6RNOuvNEA9Hf+hOyRJG+5IcXU4Vo4Fzn+nIb4=";
+ vendorSha256 = "sha256-QG/pIsK8krBaO5IDgln10jpCnlw3XC8sIYyzuwYjTs0=";
subPackages = [ "cmd/sqlc" ];
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 5caab59579f8..a8a5327d9ae7 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
stdenv.mkDerivation rec{
pname = "flyway";
- version = "9.0.2";
+ version = "9.0.4";
src = fetchurl {
url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
- sha256 = "sha256-tio76LolcD7dk3cNyNOH9mjq7h59mRynflCIbwkAcZ0=";
+ sha256 = "sha256-eLHj8a64q+wxJaNfGS2phtuI2o4xmTWtXRVvjO80NyU=";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix
index 450c03e7435e..48ed8b337760 100644
--- a/pkgs/development/tools/grpc-gateway/default.nix
+++ b/pkgs/development/tools/grpc-gateway/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grpc-gateway";
- version = "2.11.0";
+ version = "2.11.1";
src = fetchFromGitHub {
owner = "grpc-ecosystem";
repo = "grpc-gateway";
rev = "v${version}";
- sha256 = "sha256-Z3eZFd53c4cZG7CL3FrXQLi2n9A5TfUnZiB9KoA6sF4=";
+ sha256 = "sha256-bxGJvvm9gGkjUA+JCpX2V0Bj35a5WJ1M/JPxa1/2gbk=";
};
- vendorSha256 = "sha256-PKeqjr5MZWK6ILizwRJ7oy6eUj3cH9ju/55cbS5LT8M=";
+ vendorSha256 = "sha256-DVVAbtfwndwc37iqxCB9Tsscinr8A8Kl//s9X+EFPcw=";
meta = with lib; {
description =
diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/development/tools/kaf/default.nix
index feb76c2a0b25..5c0f2116b840 100644
--- a/pkgs/development/tools/kaf/default.nix
+++ b/pkgs/development/tools/kaf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kaf";
- version = "0.1.44";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "birdayz";
repo = "kaf";
rev = "v${version}";
- sha256 = "sha256-gKg/iESUXS6l3v5ovdvvrfpvaUzahPtqh0/DH5OpXoY=";
+ sha256 = "sha256-5wSxaryaQ8jXwpzSltMmFRVrvaA9JMSrh8VBCnquLXE=";
};
- vendorSha256 = "sha256-5WzREsQdcp9lelKUEXw+nHeemHBDsKrvRcG9v+qln/E=";
+ vendorSha256 = "sha256-Jpv02h+EeRhVdi/raStTEfHitz0A71dHpWdF/zcVJVU=";
# Many tests require a running Kafka instance
doCheck = false;
diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix
index 41eb9567150c..af4ed6977b19 100644
--- a/pkgs/development/tools/misc/nimlsp/default.nix
+++ b/pkgs/development/tools/misc/nimlsp/default.nix
@@ -2,14 +2,14 @@
nimPackages.buildNimPackage rec {
pname = "nimlsp";
- version = "0.4.0";
+ version = "0.4.1";
nimBinOnly = true;
src = fetchFromGitHub {
owner = "PMunch";
repo = "nimlsp";
rev = "v${version}";
- sha256 = "sha256-eih8JmofLFXkidanRocjtA6wv84HkA1bi0M4dxkiDr4=";
+ sha256 = "sha256-LAtUGhYEcOwvZzexQ2y3/HPgOge2EsScCbujJ/hz5Ec=";
};
buildInputs = with nimPackages; [ jsonschema ];
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index a8f7f63d0222..378e941c8974 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -1,17 +1,17 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
- version = "0.2.15";
+ version = "0.3.0";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = "v${version}";
- sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb";
+ sha256 = "sha256-z4pLtSx1mg53AHPhT8P7BOEMCWHsieoS3rI0kEyJBcY=";
};
- cargoSha256 = "1f42cqaqnjwi9k4ihqil6z2dqh5dnf76x54gk7mndzkrfg3rl573";
+ cargoSha256 = "sha256-4YF1fqthnWY6eu6J4SMwFG655KXdFCXmA9wxLyOOAw4=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix
index 1e9ae945200c..50ce018d041f 100644
--- a/pkgs/development/tools/okteto/default.nix
+++ b/pkgs/development/tools/okteto/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "okteto";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
- sha256 = "sha256-jcGnkLut8MlMqdWQxj/M6vQgIf3e7qFv8dJ1j6bEqj8=";
+ sha256 = "sha256-wplNIh6NBXGiH9r3VL+CRSLZnY80JAhJNuDJNgu+Hy0=";
};
vendorSha256 = "sha256-W1/QBMnMdZWokWSFmHhPqmOu827bpGXS8+GFp5Iu9Ig=";
diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix
index e51d5fda3649..71fb31f13162 100644
--- a/pkgs/development/tools/open-policy-agent/default.nix
+++ b/pkgs/development/tools/open-policy-agent/default.nix
@@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
buildGoModule rec {
pname = "open-policy-agent";
- version = "0.42.0";
+ version = "0.43.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
- sha256 = "sha256-Sn0vtC6skQE/IxXj3cjrq5iXYjM1wi17d4eavPKhk+g=";
+ sha256 = "sha256-ZxMeYWrUnNoCUgYrg/f3C19kGeN81boTfJRSpZZ/GL4=";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix
index d92b805082a2..77e872a68b13 100644
--- a/pkgs/development/tools/protoc-gen-entgrpc/default.nix
+++ b/pkgs/development/tools/protoc-gen-entgrpc/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protoc-gen-entgrpc";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "ent";
repo = "contrib";
rev = "v${version}";
- sha256 = "sha256-cpk8yRDBsupI277NWYFaLCvi3ltQDLgCrcpJ/FUVi9o=";
+ sha256 = "sha256-hK4I2LVvw7hkbUKRuDoaRuNX3nwlwipYucnXwzOCcXs=";
};
- vendorSha256 = "sha256-RwwGFBiasxMmtKMLSyAqvkozqoyzzYuslMq+HnzZUhw=";
+ vendorSha256 = "sha256-bAM+NxD7mNd2fFxRDHCAzJTD7PVfT/9XHF88v9RHKwE=";
subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];
diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix
index c375869603f6..126c7d4398fb 100644
--- a/pkgs/development/tools/pscale/default.nix
+++ b/pkgs/development/tools/pscale/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pscale";
- version = "0.90.0";
+ version = "0.112.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-uOKx367fFJQvoqakY5PmesOk2l9eYsnECf6AdO2NsuI=";
+ sha256 = "sha256-Q2qZI5Y+qyt71orPh9zNfEylBeJw4o9SA3BnlI/h5yg=";
};
- vendorSha256 = "sha256-IUntyI3EeYsf2tesvm0H+bNCtpnNfQV7WURLFvJXMac=";
+ vendorSha256 = "sha256-MZUd8muhso8a6Houv1Mf/6+SC0hD4UnjIFssB9wscaQ=";
ldflags = [
"-s" "-w"
diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix
index e93cf7b57dc6..12824caee239 100644
--- a/pkgs/development/tools/railway/default.nix
+++ b/pkgs/development/tools/railway/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "railway";
- version = "1.8.3";
+ version = "1.8.4";
src = fetchFromGitHub {
owner = "railwayapp";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-PAKg/8Ljcrz92M4sdKXZBe9Qa0NYwWnghzjxsCO8nhU=";
+ sha256 = "sha256-7hYbTDY+ECaOKuK54hPA9oeOSnBWYUvxWJ7GElZKoWE=";
};
ldflags = [ "-s" "-w" ];
diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix
index d602afecdc43..771849168aa9 100644
--- a/pkgs/development/tools/relic/default.nix
+++ b/pkgs/development/tools/relic/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "relic";
- version = "7.3.0";
+ version = "7.4.0";
src = fetchFromGitHub {
owner = "sassoftware";
repo = pname;
rev = "v${version}";
- sha256 = "sha256:0lmxgr9ld6rvqk990c60qh4gb8lr8s77f8i2p4jmp6cf434sc6y0";
+ sha256 = "sha256-3YzZUwS2rU+OROMXuIbVeLDQMIpEmZz+PNnI4dbQs+Y=";
};
- vendorSha256 = "sha256:1l6xxr54rzjfvwmfvpavwzjnscsp532hjqhmdv0l1vx1psdk2aci";
+ vendorSha256 = "sha256-aguirMJgh/uAGl0l3wKBMH2QEIH2N8pq7Dl9Ngfkc90=";
meta = with lib; {
homepage = "https://github.com/sassoftware/relic";
diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix
index 131a6463a6dd..6e3d6904eb00 100644
--- a/pkgs/development/tools/rust/cargo-edit/default.nix
+++ b/pkgs/development/tools/rust/cargo-edit/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-edit";
- version = "0.10.3";
+ version = "0.10.4";
src = fetchFromGitHub {
owner = "killercup";
repo = pname;
rev = "v${version}";
- hash = "sha256-JVKAUbMD9oZSVdsNOWIVKi0LhVOwSg1zgsD8D2eMvcw=";
+ hash = "sha256-U3B/Tb7q61R5jmBni1QKqqul2JJgjtmh3st04apu0xE=";
};
- cargoSha256 = "sha256-Sz1/El2ZoxS3I8gEbMdYmOQMRSsGOptrp7wiBggMcWA=";
+ cargoSha256 = "sha256-e8ICBRI6kNfItu3CxxbIY+56/2ho0Rnn1B3w/WJX+KM=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix
index 2013f15d1e1a..8103229bb66a 100644
--- a/pkgs/development/tools/rust/cargo-outdated/default.nix
+++ b/pkgs/development/tools/rust/cargo-outdated/default.nix
@@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/kbknapp/cargo-outdated";
changelog = "https://github.com/kbknapp/cargo-outdated/blob/${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ];
- maintainers = with maintainers; [ sondr3 ivan ];
+ maintainers = with maintainers; [ ivan ];
};
}
diff --git a/pkgs/development/tools/taplo-cli/default.nix b/pkgs/development/tools/taplo/default.nix
similarity index 54%
rename from pkgs/development/tools/taplo-cli/default.nix
rename to pkgs/development/tools/taplo/default.nix
index 0c584a36a526..64437bb32529 100644
--- a/pkgs/development/tools/taplo-cli/default.nix
+++ b/pkgs/development/tools/taplo/default.nix
@@ -1,26 +1,35 @@
-{ lib, rustPlatform, fetchCrate, stdenv, pkg-config, openssl, Security }:
+{ lib
+, rustPlatform
+, fetchCrate
+, openssl
+, stdenv
+, Security
+, withLsp ? true
+}:
rustPlatform.buildRustPackage rec {
- pname = "taplo-cli";
- version = "0.6.2";
+ pname = "taplo";
+ version = "0.6.9";
src = fetchCrate {
- inherit pname version;
- sha256 = "sha256-vz3ClC2PI0ti+cItuVdJgP8KLmR2C+uGUzl3DfVuTrY=";
+ inherit version;
+ pname = "taplo-cli";
+ sha256 = "sha256-gf58V/KIsbM+mCT3SvjZ772cuikS2L81eRb7uy8OPys=";
};
- cargoSha256 = "sha256-m6wsca/muGPs58myQH7ZLPPM+eGP+GL2sC5suu+vWU0=";
+ cargoSha256 = "sha256-f+jefc3qw4rljmikvrmvZfCCadBKicBs7SMh/mJ4WSs=";
OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
buildInputs = lib.optional stdenv.isDarwin Security;
+ buildFeatures = lib.optional withLsp "lsp";
+
meta = with lib; {
description = "A TOML toolkit written in Rust";
homepage = "https://taplo.tamasfe.dev";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
- mainProgram = "taplo";
};
}
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index ba822cdd6c59..88acc5e1c154 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
- version = "0.0.362";
+ version = "0.0.363";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
- sha256 = "sha256-MpMMsA7fY5apKh7+9H3ZItzPIRJ08Mw6E26h+0DDoj4=";
+ sha256 = "sha256-Cyc5Kah62a7HJo55lgsplbnG87ttXkkWj/qo9EdSads=";
};
- vendorSha256 = "sha256-SbbBXkb/+N6uF3HHbGSi/tIA6s6YYkKhZfuNWWvuqHA=";
+ vendorSha256 = "sha256-NVLZEv5ySV3xwgTL8w3I4CZvrriADKKugt3q3IJKRf4=";
subPackages = [ "." ];
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index 947957bc3af6..b29eed160cde 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -18,7 +18,7 @@
let
# the GLES backend on rpi is untested as I don't have the hardware
backend =
- if (stdenv.isx86_32 || stdenv.isx86_64) then "OpenGL" else "GLES";
+ if stdenv.hostPlatform.isx86 then "OpenGL" else "GLES";
withVLC = stdenv.isDarwin;
diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix
index a56b39688130..64e39319b2f2 100644
--- a/pkgs/misc/fastly/default.nix
+++ b/pkgs/misc/fastly/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fastly";
- version = "3.2.1";
+ version = "3.2.4";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-OK1xhsn30JE/IeKnOLE+0AmulEAeFM0Z7TyRqd6hTGY=";
+ sha256 = "sha256-eIqdDBU4NWNMyRs+h30ufg4QwEEGid+wCjATZYXDGm8=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,
diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix
index 07194380d4a7..5da634203dc6 100644
--- a/pkgs/misc/logging/pacemaker/default.nix
+++ b/pkgs/misc/logging/pacemaker/default.nix
@@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "pacemaker";
- version = "2.1.2";
+ version = "2.1.4";
src = fetchFromGitHub {
owner = "ClusterLabs";
repo = pname;
rev = "Pacemaker-${version}";
- sha256 = "1w7vq3lmgcz38pfww9vccm142vjsjqz3qc9nnk09ynkx4agqhxdg";
+ sha256 = "sha256-b3ljxAuawhqTnURBJMqy4Zzzfi8PCFwie/zC1yeErhQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/misc/screensavers/pipes-rs/default.nix
index d89ac88684db..a14977d964f0 100644
--- a/pkgs/misc/screensavers/pipes-rs/default.nix
+++ b/pkgs/misc/screensavers/pipes-rs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "pipes-rs";
- version = "1.4.7";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "lhvy";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-egjmvvbPmIjccg44F2/TiGrn5HRN5hp8XL0yd0/ctv0=";
+ sha256 = "sha256-UwRXErlGtneEtc3UAiREwILQPTRQn1AgxiWDzSCZv/M=";
};
- cargoSha256 = "sha256-i9aR0dGNRF37Hhs9vq0wpdZGIVkX7M1SzbpASR5ve+g=";
+ cargoSha256 = "sha256-Qyuvg13SnTN1dvxn4Gu4tizmjk4zrEi/iuXTV28fZbQ=";
doInstallCheck = true;
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index fcec51506a51..836714fb919a 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
];
# "marbling" has NEON code that mixes signed and unsigned vector types
- NIX_CFLAGS_COMPILE = lib.optional (with stdenv.hostPlatform; isAarch64 || isAarch32) "-flax-vector-conversions";
+ NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch "-flax-vector-conversions";
postInstall = ''
for bin in $out/bin/*; do
diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
index 7192fbac4785..b15f4c4949de 100644
--- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
@@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sof-firmware";
- version = "2.1.1";
+ version = "2.2";
src = fetchFromGitHub {
owner = "thesofproject";
repo = "sof-bin";
rev = "v${version}";
- sha256 = "sha256-/OYYfIJWMT+rBBhSCtHaSWvwRMlReEQ5y4FuMfk5zUg=";
+ sha256 = "sha256-/gjGTDOXJ0vz/MH2hlistS3X3Euqf8T6TLnD1A2SBYo=";
};
dontFixup = true; # binaries must not be stripped or patchelfed
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index c1639d09a77d..23a9c6b1ae9e 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
- version = "5.18.14"; #zen
+ version = "5.18.15"; #zen
suffix = "zen1"; #zen
- sha256 = "019v1ryzg5fq6xwvb8anmfxh0zpy8wd0qfiszfqxkqw7cnqc6wf1"; #zen
+ sha256 = "0pn62l2ajas427ddbx92q5ad0rkqz6vvg6mc6dirs32a4j6nzajx"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
- version = "5.18.14"; #lqx
- suffix = "lqx2"; #lqx
- sha256 = "0g45y0rhbwpz12cbrh486vqxpzwdm0w5j7h3nxr0dr2ij8qzrr5p"; #lqx
+ version = "5.18.15"; #lqx
+ suffix = "lqx1"; #lqx
+ sha256 = "0p6kh5ax70nd34mzw6xhlzlfyz7bng92qjk57k8nhj5yw9z9vih3"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix
index 9372018f5b70..41c16f9f394c 100644
--- a/pkgs/os-specific/linux/nmon/default.nix
+++ b/pkgs/os-specific/linux/nmon/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
dontUnpack = true;
buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${
with stdenv.targetPlatform;
- if isx86_32 || isx86_64 then "X86"
- else if isAarch32 || isAarch64 then "ARM"
+ if isx86 then "X86"
+ else if isAarch then "ARM"
else if isPower then "POWER"
else "UNKNOWN"
}";
diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix
index c1032473db10..a755404e6e5d 100644
--- a/pkgs/os-specific/linux/rtl8189es/default.nix
+++ b/pkgs/os-specific/linux/rtl8189es/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
makeFlags = kernel.makeFlags ++ [
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n"))
- ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))
+ ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))
];
preInstall = ''
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index b385b9a27da0..30f04c1eb8b3 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"ARCH=${stdenv.hostPlatform.linuxArch}"
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))
- ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))
+ ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix
index 3f4a440746ce..754ab57c1c2c 100644
--- a/pkgs/servers/gemini/gmid/default.nix
+++ b/pkgs/servers/gemini/gmid/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gmid";
- version = "1.8.3";
+ version = "1.8.4";
src = fetchFromGitHub {
owner = "omar-polo";
repo = pname;
rev = version;
- hash = "sha256-vghoPsyGspPn22Kl61qiaALS2R243JSuS80uKFBHc9k=";
+ hash = "sha256-WI3EJEhhd0UwtbOhRpt+8XEHuG6YrKAcT4mO1caZ+hE=";
};
nativeBuildInputs = [ bison ];
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 227b4212e0ab..ba84963a763c 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
- version = "1.23.0";
- sha256 = "sha256-ggrKo1uScr6ennL23vpKXykhgkcJ+KpHcseKsx7ZTNE=";
+ version = "1.23.1";
+ sha256 = "sha256-Xu4b0cI+O5R3pFUy8fNq5heLQ9VxqWB+aVPO8m1d8eI=";
}
diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix
index ec7982adf704..3d151a9f3500 100644
--- a/pkgs/servers/http/nginx/quic.nix
+++ b/pkgs/servers/http/nginx/quic.nix
@@ -6,8 +6,8 @@
callPackage ./generic.nix args {
src = fetchhg {
url = "https://hg.nginx.org/nginx-quic";
- rev = "8d0753760546"; # branch=quic
- sha256 = "sha256-HcYkjbm3qfTU34ahseHCZhHYWNm1phfVph6oJBARMI8=";
+ rev = "3550b00d9dc8"; # branch=quic
+ sha256 = "sha256-JtE5FO4FHlDuqXd4UTXXPIFAdyyhQbOSMTT0NXh2iH4=";
};
preConfigure = ''
@@ -19,5 +19,5 @@ callPackage ./generic.nix args {
"--with-stream_quic_module"
];
- version = "1.23.0-quic";
+ version = "1.23.1-quic";
}
diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix
index 823f3125cbe5..420e10f52db5 100644
--- a/pkgs/servers/kubemq-community/default.nix
+++ b/pkgs/servers/kubemq-community/default.nix
@@ -2,12 +2,12 @@
buildGoModule rec {
pname = "kubemq-community";
- version = "2.2.12";
+ version = "2.2.13";
src = fetchFromGitHub {
owner = "kubemq-io";
repo = pname;
rev = "v${version}";
- sha256 = "06n3avcqknqzf9y03xqcsg36pwcha29j2psp9xsnir7hrx66zww8";
+ sha256 = "sha256-YeFSea6aCNH+v3AKqiG8BY4u7/enmOPlEybkz6RwU8w=";
};
CGO_ENABLED=0;
@@ -16,7 +16,7 @@ buildGoModule rec {
doCheck = false; # grpc tests are flaky
- vendorSha256 = "1sh0dzz8z065964k2gzkzw9p3db3rcf6mv901zym0wqm4p71045w";
+ vendorSha256 = "sha256-pRbYNR3z4KdA9pdthX8a3FZ0LNyvoT+PR+6OinDGF2g=";
meta = {
homepage = "https://github.com/kubemq-io/kubemq-community";
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index b4f876b30578..6459e5a56096 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -15,16 +15,16 @@ let
in
buildGoModule rec {
pname = "minio";
- version = "2022-07-17T15-43-14Z";
+ version = "2022-07-26T00-53-03Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "sha256-hQ52fL4Z3RHthHaJXCkKpbebWpq8MxHo4BziokTuJA4=";
+ sha256 = "sha256-/2oCivEZttYo4f06KvTked4jR7DIV4cGgejMzElYVaY=";
};
- vendorSha256 = "sha256-u36oHqIxMD3HRio9A3tUt6FO1DtAcQDiC/O54ByeNyg=";
+ vendorSha256 = "sha256-eohF8pfW9wiUvSbukpy1zAnaB/grN0RzvtDwJ/JV07E=";
doCheck = false;
diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index 758e71d24406..b8e1c9e1ebfc 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "check_ssl_cert";
- version = "2.35.0";
+ version = "2.36.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "v${version}";
- hash = "sha256-xJBXINIPJm48LinPAlVHGxO82Jh2Kx/0OqHr87w63yo=";
+ hash = "sha256-J+sjJEZlkNWGAt66iwNmlIgqzRgp3nKO62FzSXN4cGE=";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix
index 7f9ce7d5b568..6e7672e39f7d 100644
--- a/pkgs/servers/oauth2-proxy/default.nix
+++ b/pkgs/servers/oauth2-proxy/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "oauth2-proxy";
- version = "7.2.1";
+ version = "7.3.0";
src = fetchFromGitHub {
repo = pname;
owner = "oauth2-proxy";
- sha256 = "sha256-8hYsyHq0iyWzY/HHE4JWBtlaRcSTyM6BdAPcByThme8=";
+ sha256 = "sha256-GeJRB57CR719Vo1SWk1HYmTR1WEqokMZsUqGO2r0j0Q=";
rev = "v${version}";
};
- vendorSha256 = "sha256-+5/j2lZJpyo67uRRSn4Fd8S2K0gfAGMe69OoEEdWijc=";
+ vendorSha256 = "sha256-sFb3hrjG/Msa29LVicaaAS7LYjDfBsq2DhUwyFQRrSs=";
# Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile
ldflags = [ "-X main.VERSION=${version}" ];
diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix
index 8885179de4db..c889edb886ad 100644
--- a/pkgs/servers/piping-server-rust/default.nix
+++ b/pkgs/servers/piping-server-rust/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "piping-server-rust";
- version = "0.12.1";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "nwtgck";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-L15ofIM5a/qoJHGXmkuTsmQLLmERG/PxAJ4+z1nn7w4=";
+ sha256 = "sha256-ON3/GaDwQ9DtApRZuYClZWzFhmiLi988jIBvl0DgYSM=";
};
- cargoSha256 = "sha256-CcIM7T7P4LbPxPK1ZqoJRP0IsLMEwMZg9DcuRu0aJHM=";
+ cargoSha256 = "sha256-rc3VTJllDu4oIFcswCNUJejJHzC2PoJJV9EU5fOC7fQ=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/servers/rmfakecloud/default.nix
index b3055cf566c0..acb55b8bb834 100644
--- a/pkgs/servers/rmfakecloud/default.nix
+++ b/pkgs/servers/rmfakecloud/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "rmfakecloud";
- version = "0.0.7";
+ version = "0.0.8";
src = fetchFromGitHub {
owner = "ddvk";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Ax+eozbAIE3425ndT4z4fVBMwzLN7iR5fTz8rz60zWg=";
+ sha256 = "sha256-Q9zymQW8XWApy5ssfMtojN4AhteqrQzZyMeAkOsJDyw=";
};
vendorSha256 = "sha256-NwDaPpjkQogXE37RGS3zEALlp3NuXP9RW//vbwM6y0A=";
diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix
index b9ad0a3b5188..80cdf08ab906 100644
--- a/pkgs/servers/rtsp-simple-server/default.nix
+++ b/pkgs/servers/rtsp-simple-server/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "rtsp-simple-server";
- version = "0.17.17";
+ version = "0.19.3";
src = fetchFromGitHub {
owner = "aler9";
repo = pname;
rev = "v${version}";
- hash = "sha256-JHqD9/meOOqR5Uds03/YbhfTVm3QApM64oydB0VqTxM=";
+ hash = "sha256-nIxh6mbpkM5vX0S2ze8ylfEP1B07/DaqjoF8jDirJb8=";
};
- vendorSha256 = "sha256-8ULyCg36yVSM2En82ZiB+CLak1vQPykgs/i2mNhgebg=";
+ vendorSha256 = "sha256-zz2RLmljfOw5DtQuFkfS47yHq/bWMJzmmJf+PBlPJJQ=";
# Tests need docker
doCheck = false;
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 7c1ed8b6b375..83bdcec73970 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -4,14 +4,13 @@ let
# dependencies
{ stdenv, lib, fetchurl, makeWrapper
, glibc, zlib, readline, openssl, icu, lz4, systemd, libossp_uuid
- , pkg-config, libxml2, tzdata
+ , pkg-config, libxml2, tzdata, libkrb5
# This is important to obtain a version of `libpq` that does not depend on systemd.
- , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin)
- , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, libkrb5
+ , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin && !stdenv.hostPlatform.isStatic)
+ , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
-
- # for postgreql.pkgs
+ # for postgresql.pkgs
, this, self, newScope, buildEnv
# source specification
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix
index 75ded461ea63..d73afa7e2a97 100644
--- a/pkgs/shells/bash/bash-completion/default.nix
+++ b/pkgs/shells/bash/bash-completion/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
# - ignore test_screen because it assumes vt terminals exist
checkPhase = ''
pytest . \
- ${lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \
+ ${lib.optionalString stdenv.hostPlatform.isAarch "--ignore=test/t/test_gcc.py"} \
--ignore=test/t/test_chsh.py \
--ignore=test/t/test_ether_wake.py \
--ignore=test/t/test_ifdown.py \
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix
index 7dfbb14eec65..e5187658eeb9 100644
--- a/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/pkgs/shells/zsh/spaceship-prompt/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "spaceship-prompt";
- version = "3.16.4";
+ version = "3.16.7";
src = fetchFromGitHub {
owner = "denysdovhan";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4G1+K6ENLwChtivR7Ura0vl6Ph9Wae3SOXCW1pNbgHI=";
+ sha256 = "sha256-dMP7mDzb0xLCP2l9j4SOP47bcpuBNSoXsDecVOvZaL8=";
};
strictDeps = true;
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 871aed59e35e..73030e7d941e 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -178,7 +178,7 @@ let
# Except when:
# - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries.
# - static armv7l, where compilation fails.
- !((stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) && stdenv.hostPlatform.isStatic)
+ !(stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isStatic)
then supportedHardeningFlags
else lib.remove "pie" supportedHardeningFlags;
enabledHardeningOptions =
diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix
index 85f196b460ea..ea8e5b389e48 100644
--- a/pkgs/tools/X11/caffeine-ng/default.nix
+++ b/pkgs/tools/X11/caffeine-ng/default.nix
@@ -1,53 +1,85 @@
-{ gdk-pixbuf, glib, gobject-introspection, gtk3, lib, libnotify,
- procps, xset, xautolock, xscreensaver, python3Packages, wrapGAppsHook
+{ buildPythonApplication
+, fetchPypi
+, gobject-introspection
+, gtk3
+, lib
+, libappindicator-gtk3
+, libnotify
+, click
+, dbus-python
+, ewmh
+, pulsectl
+, pygobject3
+, pyxdg
+, setproctitle
+, python3
+, procps
+, xset
+, xautolock
+, xscreensaver
+, xfce
+, glib
+, setuptools-scm
+, wrapGAppsHook
}:
-python3Packages.buildPythonApplication rec {
+let
+ click_7 = click.overridePythonAttrs (old: rec {
+ version = "7.1.2";
+ src = old.src.override {
+ inherit version;
+ sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
+ };
+ });
+in buildPythonApplication rec {
pname = "caffeine-ng";
- version = "3.5.1";
+ version = "4.0.2";
- src = python3Packages.fetchPypi{
+ src = fetchPypi {
inherit pname version;
- sha256="0akzldqvxnqngpj1s6y2phgj7ch8wfm02j6z2drqvsbvaadw0jbm";
+ sha256 = "sha256-umIjXJ0et6Pi5Ejj96Q+ZhiKS+yj7bsgb4uQW6Ym6rU=";
};
- nativeBuildInputs = [ wrapGAppsHook glib ];
+ nativeBuildInputs = [ wrapGAppsHook glib setuptools-scm ];
+
buildInputs = [
- gdk-pixbuf gobject-introspection libnotify gtk3
- python3Packages.setuptools-scm
+ libappindicator-gtk3
+ libnotify
+ gobject-introspection
+ gtk3
];
- pythonPath = with python3Packages; [
- dbus-python docopt ewmh pygobject3 pyxdg
- setproctitle pulsectl
+
+ pythonPath = [
+ click_7
+ dbus-python
+ ewmh
+ pulsectl
+ pygobject3
+ pyxdg
+ setproctitle
];
doCheck = false; # There are no tests.
- postPatch = ''
- substituteInPlace caffeine/inhibitors.py \
- --replace 'os.system("xset' 'os.system("${xset}/bin/xset' \
- --replace 'os.system("xautolock' 'os.system("${xautolock}/bin/xautolock' \
- --replace 'os.system("pgrep' 'os.system("${procps}/bin/pgrep' \
- --replace 'os.system("xscreensaver-command' 'os.system("${xscreensaver}/bin/xscreensaver-command'
- '';
-
postInstall = ''
- mkdir -p $out/share
cp -r share $out/
- cp -r caffeine/assets/icons $out/share/icons
+ cp -r caffeine/assets/icons $out/share/
+
# autostart file
- cp -r $out/lib/python*/site-packages/etc $out/etc/
+ ln -s $out/${python3.sitePackages}/etc $out/etc
+
glib-compile-schemas --strict $out/share/glib-2.0/schemas
- for i in $(find $out -name "*.desktop"); do
- substituteInPlace $i --replace /usr $out
- done
+
+ gappsWrapperArgs+=(
+ --prefix PATH : ${lib.makeBinPath [ procps xautolock xscreensaver xfce.xfconf xset ]}
+ )
'';
meta = with lib; {
mainProgram = "caffeine";
maintainers = with maintainers; [ marzipankaiser ];
description = "Status bar application to temporarily inhibit screensaver and sleep mode";
- homepage = "https://github.com/caffeine-ng/caffeine-ng";
+ homepage = "https://codeberg.org/WhyNotHugo/caffeine-ng";
license = licenses.gpl3;
platforms = platforms.linux;
};
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index 4813cd843647..9d7fa718a4f3 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -110,17 +110,7 @@ pythonPackages.buildPythonApplication rec {
patchShebangs .
# relax dependencies
- substituteInPlace requirements.txt \
- --replace "eventlet==0.33.0" "eventlet>=0.33.0" \
- --replace "psycopg2==2.9.*" "psycopg2>=2.9" \
- --replace "cryptography==3.*" "cryptography>=3.0" \
- --replace "requests==2.25.*" "requests>=2.25.0" \
- --replace "boto3==1.20.*" "boto3>=1.20" \
- --replace "botocore==1.23.*" "botocore>=1.23" \
- --replace "pytz==2021.*" "pytz" \
- --replace "Werkzeug==2.0.3" "werkzeug>=2.*" \
- --replace "azure-identity==1.9.0" "azure-identity==1.*" \
- --replace "azure-mgmt-resource==21.0.0" "azure-mgmt-resource==21.*"
+ sed 's|==|>=|g' -i requirements.txt
# don't use Server Mode (can be overridden later)
substituteInPlace pkg/pip/setup_pip.py \
--replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \
diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index cecb05b06fdc..49f7ee8835ee 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -1,60 +1,60 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
- version = "3.35.2";
+ version = "3.37.2";
pulumiPkgs = {
x86_64-linux = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-linux-x64.tar.gz";
- sha256 = "0139r4l80i9mww7bjqk2j04lll0hl9xkc0irqq4ly65py6g3hh60";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-linux-x64.tar.gz";
+ sha256 = "0zdln1zw92brg17dbcwms3ak3sigj1s3x52vk41maqikxcjza1k5";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-linux-amd64.tar.gz";
- sha256 = "0slbk34mx8bkvadlddi32j7pml3576gx0y8rjrsbgpy6xd6a4v5j";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-linux-amd64.tar.gz";
+ sha256 = "1zyd967mgk2bk7kazj6ds4yqmnpc3nh3j40a4zlrjpj03njjmv9i";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-linux-amd64.tar.gz";
- sha256 = "1xsrskiw91izjvj1xqfhaf4728vl28wcq4dsinh232g7gfm862r3";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-linux-amd64.tar.gz";
+ sha256 = "0anmkwqwwnk44069d01crrj3y73nrwa5hknxc8fh3x1vwc2jzvfc";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-linux-amd64.tar.gz";
- sha256 = "0vxcc3hh3vqhfn6gx8fwarxiyah3yk86hza88p04qhymwfay0fry";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-linux-amd64.tar.gz";
+ sha256 = "1by8qg9yrm2l0i7hkmgan26hhcjjvbyifyhfcq69d32n20i32ksv";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-linux-amd64.tar.gz";
- sha256 = "05a9vf1g9nnvwmsm6y5rn0b0asjb253b7mph137g08m12ajm2fxv";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-linux-amd64.tar.gz";
+ sha256 = "1wjk0033xh1nhq2b76nsxb43jfraf1jm257m3z1gqzyqpjnpc2cp";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.9.0-linux-amd64.tar.gz";
- sha256 = "01sgghfnd6wgvx2h4i69asbjshscbw9g4yl15ar5w178dp17p44n";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-linux-amd64.tar.gz";
+ sha256 = "18ds6znrr96qhg01c3ldk5l5a16d6f09gn1h2ln3lhxygxjjjzda";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-linux-amd64.tar.gz";
- sha256 = "0zwqyhhkhblg1bf7ywsy0r6z85wf07vsdw4za19x7pwgjyairg2w";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-linux-amd64.tar.gz";
+ sha256 = "1fcvi8ms400qlmgzcniw5pvj46si2rk4jzn57vr5a96qyy1qrpsy";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-linux-amd64.tar.gz";
- sha256 = "1zjkgdx03zf55w9akw7ddscvk3agzhdsdjpkiq0irhjyf8ycf43q";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-linux-amd64.tar.gz";
+ sha256 = "0ail3jy9msc8ximkm1i47zca36vrrw99p9qsnp37gp9y6nr2z65y";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-amd64.tar.gz";
- sha256 = "1z8f287mm2mqfa76021fp5a1bj9045iwxcy8xs1ygh48b1890j49";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-linux-amd64.tar.gz";
+ sha256 = "01i43wi9h5693px5mvg55xim6hbf85nzi1maz0p7ys5sicglzng4";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-linux-amd64.tar.gz";
- sha256 = "0lz9nv12a3ppazs9hlvn4pfpbh4lhbrq81wmghx12brd6pv5l22g";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-amd64.tar.gz";
+ sha256 = "12sxvvjzf9761cag1kah7sdvjg98mi05jrfy0g06xf7lghlyxpcr";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.8.0-linux-amd64.tar.gz";
- sha256 = "1pvczhjhwabfr00nab0x7liyciwbgg7lgb90z9jf3g2pxrlnf6z0";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-linux-amd64.tar.gz";
+ sha256 = "0fhbp72nr3pjzkw3iq495h1p7lp6h02rw8hbnm0jqlz32i68z07b";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-amd64.tar.gz";
sha256 = "0a5nav53dg3j4rrx7747a7bk90krfg9fxj0kw0wahcnjijbv1255";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.9.0-linux-amd64.tar.gz";
- sha256 = "1gypzjjdadw4cpzxz77h06l2fjq9arddh22m1ibp9bwy8ql9k0kq";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.10.0-linux-amd64.tar.gz";
+ sha256 = "1y9kpr1kafjp8hvrvpx0mp6i23sf2m5f229kw5hr1h718pnkymwc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-linux-amd64.tar.gz";
@@ -69,32 +69,32 @@
sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.4-linux-amd64.tar.gz";
- sha256 = "0qi0gz3dylmcm4wj5ld79ris9lvq00fx54vds36q8wwikawyil00";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.0.0-linux-amd64.tar.gz";
+ sha256 = "1f2ivpqd6vhwq6pz1gh69fdzh7qh4sicnlwmmqspvw5wl1zxi42p";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-linux-amd64.tar.gz";
- sha256 = "18zljx3fhkaai04h49j10vyczgl1wpzjai7qs6xk3vx1zpmmddlm";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-linux-amd64.tar.gz";
+ sha256 = "0y07fifkgnxdl9fqvx9y5mm19fkkp7gfv9z7mspn7s9qf1c9bjzz";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-linux-amd64.tar.gz";
- sha256 = "0iy324r7l1xca8mpidbhbsqlpxfsl50hmbxxs3bbbf8k3xxcamlm";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-linux-amd64.tar.gz";
+ sha256 = "0ckwvnidp6n7rvccs36966fab0mg6rk5y0ip7l806r7bx7w61aaj";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-linux-amd64.tar.gz";
- sha256 = "17v460kbghvrvhxgckzg2bq556amy5hwmks4m1idkcz8akh6vlni";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-linux-amd64.tar.gz";
+ sha256 = "0fhwi0d136zmppcq1mbf8hnsk9l28vk1qs30fs2p045qdadbzjg9";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.20.0-linux-amd64.tar.gz";
- sha256 = "0lbda2cdbn5jhivydxh8fgwxjnmdr8hskdh3hm1ss095kq56b8i9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-linux-amd64.tar.gz";
+ sha256 = "17lr9cf0fgw063y9zx87m54h8fzq0iiagm8b90264csdk2gppqdq";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-linux-amd64.tar.gz";
- sha256 = "1gfiiwgb51ylwns3mqgnbgm2knrdzvy9r9v23yx0z03ba189d3m9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-linux-amd64.tar.gz";
+ sha256 = "1af284q58vvrzny91f0x3cmam5nwipvcpn6m4sxvyb8a35h08w4d";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-linux-amd64.tar.gz";
- sha256 = "1d355rsp56npfgdkyzmpr8702lgdnc92f2k7r2ajfqp26ga1hmhk";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-linux-amd64.tar.gz";
+ sha256 = "192f1nn5xyfld26llcg11708bgc1dfq0nsl90cgywy05fx65p1py";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-linux-amd64.tar.gz";
@@ -117,24 +117,24 @@
sha256 = "08wyx9j5q9pn1jya849wg35v2d7kagzj77h8qr94j8w7agf6ds2a";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.0-linux-amd64.tar.gz";
- sha256 = "0h3a9nywj0a3ib425274nf19xb9bmk012w1kjv240hnhcnrgg1kp";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-linux-amd64.tar.gz";
+ sha256 = "1jk6kjqkm1x1jmx3bfsskirk6if97c5pg0b0jxn0v36j09x6k3as";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-linux-amd64.tar.gz";
- sha256 = "1i32f640iwzmqmvwyzb9grbdypcgi4m7jj23w8yb4m0cyryf221q";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-linux-amd64.tar.gz";
+ sha256 = "0n1chk9dnr8yrbfgcvhgfd6cl7yqh8cvwflwrcr5k7lym6hnd06b";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-linux-amd64.tar.gz";
- sha256 = "1q7dqly6cz4vdsjlq522i2dgyb4nl1321jrx5jqxpcrsix5m83wz";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-amd64.tar.gz";
+ sha256 = "0rdvz6ibk41dhyfsqblfj56ib5hrr6vsx0z9kgzz5qamyjd1580h";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-linux-amd64.tar.gz";
sha256 = "0p1vh1hp90niqdr3scmh4pwb177lv6d3nqp6apcjabsg5w5nmim9";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-linux-amd64.tar.gz";
- sha256 = "1bmvxcwqgc2861zkrkfdasxr03ppbh7ffavh1agw53c8vy0f2shk";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-linux-amd64.tar.gz";
+ sha256 = "1xmndvg43gqbml5m5a8ky7ymkpkwbif4gxq2af3vvdi9gpn38biq";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-linux-amd64.tar.gz";
@@ -163,56 +163,56 @@
];
x86_64-darwin = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-darwin-x64.tar.gz";
- sha256 = "1qcqc0lsb1wdgn203kj4z86blqwkcxfx7wijznfvvpjd4rg4k0wx";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-darwin-x64.tar.gz";
+ sha256 = "1z0s2wnspfgcn5qhfi40mrjlw59cv1kq5a86nrf4lg42rr04kk43";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-darwin-amd64.tar.gz";
- sha256 = "1dhbqwy991h5h6w5zj3m0wbf99gvk8q4ykzc7ws0cbfk6szy052w";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-darwin-amd64.tar.gz";
+ sha256 = "0pd34fs95vml7a87zvdb2ap476bd8mh0qgy0p0ppcv50yv3jwp79";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-darwin-amd64.tar.gz";
- sha256 = "0xnlj48lgjhb3cf0yp958j7js5akxygd6034r4fa26kzhqq6rnl6";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-darwin-amd64.tar.gz";
+ sha256 = "156qwg2isv1dflij4y1w3kb31wkn3g0q0ajcy753d7vn8dmwycxr";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-darwin-amd64.tar.gz";
- sha256 = "1dnr6b8md6chip5smhzx3i8b3av3n1qlvv8jdas2yxlsynj3vf3s";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-darwin-amd64.tar.gz";
+ sha256 = "0yp1akw598c6p3997d0j7c7a1qc1qczjd0r5lr2krkqdak4vzfzn";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-darwin-amd64.tar.gz";
- sha256 = "1clh35pm87bbad49m8gb7ycbzxvncjpdqy8rsjm7kg99dywwm4yd";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-darwin-amd64.tar.gz";
+ sha256 = "0cmnwx65s345775zwkmnkl8wr9cjc9iwmylsmjxn4jyqvy22jhj5";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.9.0-darwin-amd64.tar.gz";
- sha256 = "0fxr55qdll5bxx5hz80na2zhcfds231kycbpd7ahsxf3yfvwppm9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-darwin-amd64.tar.gz";
+ sha256 = "1vxmvfdybi6pp3czqwkhcvr63n5pym4x44sbzhhs4i8mj3m5sfrr";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-darwin-amd64.tar.gz";
- sha256 = "1m2nyxq0cvj7rzy46nd9arg6rj0p7palpg6yj0730p73cpszmpwm";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-darwin-amd64.tar.gz";
+ sha256 = "1vmvqr07k865wizw4z9zcrs40s3rfa46nk0imisg51hyajp7gf9b";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-darwin-amd64.tar.gz";
- sha256 = "1np3hq3hmdxgbz86mp2cihyyp2b1ax8d9wv994q1ahvkv74bapdz";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-darwin-amd64.tar.gz";
+ sha256 = "14j2xn6kaw5rm3fcxb6v29b78sgfq7drqi2clnag6b3iggq4spji";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-amd64.tar.gz";
- sha256 = "1shc7m4xlsmcjnrlbi2jyvmnvf9bg1cs6knfkl82jfs65ya5iidf";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-darwin-amd64.tar.gz";
+ sha256 = "0575vcgz00i72ip45y98ikrvqlry8rchwypdiynd0bagfpj297jz";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-darwin-amd64.tar.gz";
- sha256 = "1r71n40wif8rb4gzfy2k7bzafpsfl9vabfvj4s08d0k1pqbv9pz9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-amd64.tar.gz";
+ sha256 = "026i7hxa80b7mipw792anv1wplmz2w23irfy26bsh77an36hk46y";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.8.0-darwin-amd64.tar.gz";
- sha256 = "19mj3bfiadlmfd606pa98n4wk02816n0l5klp08hdl7nzhq4s46z";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-darwin-amd64.tar.gz";
+ sha256 = "0ipfaq8bv4z63krrbday20nv5968k3gs8srkj9vfaw8nmzf6p4n5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-amd64.tar.gz";
sha256 = "0pvq5mwl8scsyvkqgy32v1qs4060w0m12z0f1cw0aw34wd3zs67a";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.9.0-darwin-amd64.tar.gz";
- sha256 = "00gnqfbmqa731n0g6qzvhkq240x7pbfqh6hppprrzxcxr4i25qkh";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.10.0-darwin-amd64.tar.gz";
+ sha256 = "097357wf3bcywyy46y6prl2q4dcfdhm299hhfjvn3vv610a04c3d";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-darwin-amd64.tar.gz";
@@ -227,32 +227,32 @@
sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.4-darwin-amd64.tar.gz";
- sha256 = "0zjap38frc6d5r2y7a4k5arvdc9fhh4bnr0swzqm5k9vxza3vfq8";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.0.0-darwin-amd64.tar.gz";
+ sha256 = "0mq9xak9m6qw6wzd33b20dapqandi23hid79ysry179p8hjg0dgy";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-darwin-amd64.tar.gz";
- sha256 = "0aq09v80rbha7qzrl0kh7wmqf8g8pfvgy4id28gbd9ln40xs6dnv";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-darwin-amd64.tar.gz";
+ sha256 = "00hcah3rjd4x7xi2alpxd1f1bx380ipcmqdwvig81cr6bq3mpfr3";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-darwin-amd64.tar.gz";
- sha256 = "057q1cxcs0iwrmxps8x87zvjbp2ms56pwmfjl0kz12gr2rzzavab";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-darwin-amd64.tar.gz";
+ sha256 = "0nfa7ygc39g7ayl1gl3kazmhdxmjq8g41ql8vxqcxv6zp5d6b32l";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-darwin-amd64.tar.gz";
- sha256 = "08b6p6gliay66bd7687kjc9n3n7xdgbrrcnbjbqi7a3am14mf5p6";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-darwin-amd64.tar.gz";
+ sha256 = "1s8mk8v5x3z6szdqn9c74cpgfqx46whj2nm78mjbqbs7rh9vgw1f";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.20.0-darwin-amd64.tar.gz";
- sha256 = "0vsgjl6hzznh12dwbwqgdb2wdpa4nhhj0kfa1y49553mk8zsymgh";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-darwin-amd64.tar.gz";
+ sha256 = "084qvn4lwn7ss84sb9c7bxpxal4x65d6y3vgn4hbnvvarsmvn6zs";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-darwin-amd64.tar.gz";
- sha256 = "11r73jfqkc0wgdf66zp6pmgq5packlm4dkjp12a00z6l2s4f0w4h";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-darwin-amd64.tar.gz";
+ sha256 = "0gswf93qapcwc3dv617gjdyhn9w5hhzdcs3w31sqrlzfa2sb790p";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-darwin-amd64.tar.gz";
- sha256 = "16rd9v0raxskv6hk5dn9lr3b2vcy9k6f87dda0vsbwx4ssc018yd";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-darwin-amd64.tar.gz";
+ sha256 = "1ii5sjilczp6bdrz050prg5chbpd49znk1hjzzp2kbsxcf319rsq";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-darwin-amd64.tar.gz";
@@ -275,24 +275,24 @@
sha256 = "0d1w1zak2ma701w26va74ahi3lmsjywsk2x84ds4l4mj8ckpl2va";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.0-darwin-amd64.tar.gz";
- sha256 = "043zi2khq6bdp19njw7nz1rkx5ddxx5w51qac7lym7pdfx1pvd4i";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-darwin-amd64.tar.gz";
+ sha256 = "0s4jpy4csjvqk9l7xjypbnpbnlx53p1sm6pyw5drddah8aaj47vx";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-darwin-amd64.tar.gz";
- sha256 = "0zk63fijhkafwhm5qrwn6n3qq0jvz9vqxg0zy8dq96kp141inp0v";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-darwin-amd64.tar.gz";
+ sha256 = "0nfpqp6yyhyckhz38z4g07g4znj3c738rgd1daprmdyl6yifvi72";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-darwin-amd64.tar.gz";
- sha256 = "0izydcxyk30qrxnbvfqs2y6znyxz64njfalkghqwv8j7fzc5pv5s";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-amd64.tar.gz";
+ sha256 = "1p27dsar8jl7krqz2vrzics45g8s85l4xx3216207x2hq7qbdfb5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-darwin-amd64.tar.gz";
sha256 = "0y1lcafl477ja9kib00zprz7gamfx821mdj5nyiyjkggwylp0lwl";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-darwin-amd64.tar.gz";
- sha256 = "1f2danvjdfqdivw6kjj2jj3qgx5jfjxwc21ziqy8kyzgvqfykxvj";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-darwin-amd64.tar.gz";
+ sha256 = "0h7jnrflm4p17jgan2i8g3clkrl5arkw7rd1wml80azhi6626qh1";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-darwin-amd64.tar.gz";
@@ -321,56 +321,56 @@
];
aarch64-linux = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-linux-arm64.tar.gz";
- sha256 = "19pc892kkgccsddnlq4n1cgvfsqciqnba05ypkn4gvxr8rm2xia0";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-linux-arm64.tar.gz";
+ sha256 = "10ll8axayljsjkq9lzr34dgii5fjckvdm7pp0wmwdhx2xfh9kmcg";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-linux-arm64.tar.gz";
- sha256 = "0y5p6bgs8ngz1fh9695rnz3rciqixkaivqh5j9j0fcklfmr6i6dc";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-linux-arm64.tar.gz";
+ sha256 = "0ps22ngimrbgh24gm66h0jgs1bfafbizknxbpxrwavyrc26nhgy9";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-linux-arm64.tar.gz";
- sha256 = "0vn6rdqfl79p666v2h72dsqgwqfag5k3hh4abb7hdz2kzqrl7l9k";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-linux-arm64.tar.gz";
+ sha256 = "16jkz0qrp2pvz60388n97bf59idmfv5j0hg0dzp78j1dhpy1aqnn";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-linux-arm64.tar.gz";
- sha256 = "0a4daij35nwpqqkn7nr8993x02awas36jrazfqjc5pnir3nwdp3b";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-linux-arm64.tar.gz";
+ sha256 = "1bnsfbqq6gcdkxfz83x7chhi4z760zslvqw1a9nikcsdl54qk5bc";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-linux-arm64.tar.gz";
- sha256 = "1i1qnpg722cjj5z208yx2r0yswrir2bqy8fzdgmlwl0ffm8v3f47";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-linux-arm64.tar.gz";
+ sha256 = "062f4f6n7x83gi4hzd0ixnqm7yar93hhg53lw4wkmad8c9cq93kv";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.9.0-linux-arm64.tar.gz";
- sha256 = "126hqi44avcw21q8niyagb86p191ci78089sfig56irzkykc7gsy";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-linux-arm64.tar.gz";
+ sha256 = "1vmf5fdv3n6cgwhb4i2mgv445bk4zhzcwxgivpgdnddc5dfy3ixj";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-linux-arm64.tar.gz";
- sha256 = "0dag8fnzd0bzc1jakqxr3r3mdhj7196hxmh39wyfkh2wnpxcschd";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-linux-arm64.tar.gz";
+ sha256 = "0ar7kbxsfn64bx5n8hf11vx3779jklc75c4fy39c2j552k03444m";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-linux-arm64.tar.gz";
- sha256 = "1isysrvqc6lh5ikmp3snvny0jldykp0ir7yd5fr7vwn5lmk7a8cw";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-linux-arm64.tar.gz";
+ sha256 = "01x3milrkkfa8yrbzbh0pild7qn73q6ayr0i4908b9na8ia247dz";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-arm64.tar.gz";
- sha256 = "0w55pk3ham08lrg3vq0hg3p23qipz21ln01g61xd0cpl79aysbq4";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-linux-arm64.tar.gz";
+ sha256 = "1cxnwqkzz725i03pdmxqhlfasja1z5hjf9cxkbwyyhli8zpy3grb";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-linux-arm64.tar.gz";
- sha256 = "11v3zggzkpvs8iscd45ng3s0x3959i00rlpfn17sxpvdmcjhs6nr";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-arm64.tar.gz";
+ sha256 = "1bxrh89hkw9b0g20d4apwhswl1dxb4v4nn5rkkkjd91ykin5idp2";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.8.0-linux-arm64.tar.gz";
- sha256 = "0xnz9mvvm44msk33zqwxzybgglqnn4gggxcfclg4dqr9vgb6wk7v";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-linux-arm64.tar.gz";
+ sha256 = "0ikjbbhfb84b2zwm3wi6ffav5dfhgdkr9ks58i3xicrbc3swarfc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-arm64.tar.gz";
sha256 = "085flnzp062p6ankfl77p1y7n8ijrhmknnb4r46x6b3lrw891pgd";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.9.0-linux-arm64.tar.gz";
- sha256 = "01hf8ycb6w3ny3ccfimxj1l96m0jzjp7f1r0xm9an8i59d3wslx8";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.10.0-linux-arm64.tar.gz";
+ sha256 = "0ykrfa4r7xhjbpbm8mnc2ry58a3h7zynbn8gxnspg0493znx1lva";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-linux-arm64.tar.gz";
@@ -385,32 +385,32 @@
sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.4-linux-arm64.tar.gz";
- sha256 = "1w03vj5an0mkb9cawkz94xxj9d2yp2zvr67nnwvmdgaj6kwb9by8";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.0.0-linux-arm64.tar.gz";
+ sha256 = "0i32s062nmayj5dxl4ridblkz8h7rrvxdid16880m8x992apdrrs";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-linux-arm64.tar.gz";
- sha256 = "1if44ng79r16j906hpniwh007ngixm3j7li318xdpshm28hkjiqx";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-linux-arm64.tar.gz";
+ sha256 = "1cw37b2kwjvnjmaxdn0k0i8dqhl1kksm1nhp3k70349mz3lvrksc";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-linux-arm64.tar.gz";
- sha256 = "0sg8wfvh91144h8k4k97zfb63xadvj44qvp4lq823kcr8c37f0bj";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-linux-arm64.tar.gz";
+ sha256 = "0z94s45rbm42x89dp7a70p2l646sqwvm5wkhaz19mggd8p5d4p01";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-linux-arm64.tar.gz";
- sha256 = "0i6qxrdijf653nj6yqhdikbj3spzzwr5rbgngkc0v7yxkphlzlnj";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-linux-arm64.tar.gz";
+ sha256 = "1ih70j8qsq8wamj9zdf1fvqj7laadpl2i79gr74k5f3xsf2rgsim";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.20.0-linux-arm64.tar.gz";
- sha256 = "1rnz5cli8q59wwdvadd08kf51nl5rmrlkch9szc3yk92i79kl6wg";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-linux-arm64.tar.gz";
+ sha256 = "18kkxjgm0ivrbgypk34jajlidslbf1bvlnhlcgjxjwbgl7f48krs";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-linux-arm64.tar.gz";
- sha256 = "1vrz3pm14i5zdmk3yibny2sghxk8kzwb2qi77mjbiyfhbvciy97q";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-linux-arm64.tar.gz";
+ sha256 = "02hmd5kdg34xrvmximxza5n9bb7i14c2d19pr0gf4gx6f6hg8yw2";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-linux-arm64.tar.gz";
- sha256 = "1kqyvzd6h8ymwv3j08lcirv9dpnvyj1l7vfxgmxd2yny50jh7vfp";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-linux-arm64.tar.gz";
+ sha256 = "07gssf982y6plabw951cycwyfi42swkpv8h5044j8avg764fnmpy";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-linux-arm64.tar.gz";
@@ -433,24 +433,24 @@
sha256 = "0lky1gchcmjn6nxlasjqviq89hi2k9fi8lx7ac7hy6x6b7wl40sf";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.0-linux-arm64.tar.gz";
- sha256 = "13i481a9xj9aw1mi8j3sw4m69kfcaqdl1cj9w4silqwyqk4gzmyd";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-linux-arm64.tar.gz";
+ sha256 = "0v5kqps6p6b9j8sv9f01i1dx8hsv8mshn45y1km8vm4i6vkcanqc";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-linux-arm64.tar.gz";
- sha256 = "0pbjmj6hbwgfcjlc9pvhljvwm5cs2a24gmp4rl30wg7lxrcjgyl3";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-linux-arm64.tar.gz";
+ sha256 = "0vkik9dghpk8jn07w57023vgfllw9zszl6j5szjfbxd15idq4ihs";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-linux-arm64.tar.gz";
- sha256 = "1y99pryvp2jg26s7zivmmpkpw88lxc2r905yv7ffhzb6mfq79zvr";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-arm64.tar.gz";
+ sha256 = "0nn7xj38injiwla8vss4nj25r53ddj0p0mplwqrk1r92l2vcihix";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-linux-arm64.tar.gz";
sha256 = "1fdg6sl2rchmzcsxyfbml33cq34slpf6bbr4s2cx7k2bwfvc8wwl";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-linux-arm64.tar.gz";
- sha256 = "170k5xchwm53r7k3483rmv0hbf4nxk31yq7fxz6qfp05yk05d74a";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-linux-arm64.tar.gz";
+ sha256 = "14mhn1497gnbywk0z5ism303q3d8vd784i28fsf9xbzyhw58ci09";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-linux-arm64.tar.gz";
@@ -479,56 +479,56 @@
];
aarch64-darwin = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-darwin-arm64.tar.gz";
- sha256 = "1y4irj8jijm1wpynzihpg4sg6qwiznb4j89cmcfcw8prfzhsxcmh";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-darwin-arm64.tar.gz";
+ sha256 = "1727qhjcpjjbdi9bz1ja3npzkmwrgvl2gpzfky158ywzhjdk7a1b";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-darwin-arm64.tar.gz";
- sha256 = "1g4m9hrdgzczikrzz6b2irx9945k97ckwmg1m5b4ikgi6hxaycx1";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-darwin-arm64.tar.gz";
+ sha256 = "0pk2ql1pcnypl3w6ypiq1pz5rxbc8b1h1gsgq0rkz7hf2y4k40m0";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-darwin-arm64.tar.gz";
- sha256 = "14qf3y7nz4dd6qf9fq49f90415dn5hcjymm86rmcgyw1w1dkjpqi";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-darwin-arm64.tar.gz";
+ sha256 = "050p3lizllnszdf9w55wq9dsn8acbvfn5gh0qpyw7kknf67xjz77";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-darwin-arm64.tar.gz";
- sha256 = "1xiiavc4c6lbgrabfypw1yhmksq0azfwl699yd0pn6vs3daav0n7";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-darwin-arm64.tar.gz";
+ sha256 = "0dc6iwzkvlpr64qbmhym477pwrq6zqg8bh9ln4z17vyx6x3apg7n";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-darwin-arm64.tar.gz";
- sha256 = "028h8yqj9xb048hy9j5j2jdgqipfcra5rrwdaa76k0vxhdk7514v";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-darwin-arm64.tar.gz";
+ sha256 = "1w62rxxjy2f9c7kjqmnlhmahji31ikg8rd89qyfxz07bc55r1cq5";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.9.0-darwin-arm64.tar.gz";
- sha256 = "12dx70f5fiy2qvd4cmkxk2ph2dq19sc2a9rxhfxqn1bjjs8ifh2j";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-darwin-arm64.tar.gz";
+ sha256 = "11xzhm0qpm3xm5qja2vpzn4q782bcc31lqs2jl48rwrh9nhs0crz";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-darwin-arm64.tar.gz";
- sha256 = "0wa2w12xaxpmnbf6gc01kj0dnwdc5bhg9295yskfvwq701g77n3k";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-darwin-arm64.tar.gz";
+ sha256 = "0m3m5z3ldnxf44lz0ywjrhkf22hq0bxldrdhm4gpr8kfc2dy354a";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-darwin-arm64.tar.gz";
- sha256 = "12nbwv4y44w8phf2nf30fhn0mgcq8vyw7gj8riaq1ris794mns95";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-darwin-arm64.tar.gz";
+ sha256 = "1jgffcn8cpz9zvzqgylqkj7m5rybxcn9njp440iag403i8hmb34x";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-arm64.tar.gz";
- sha256 = "0ivwpfhknhyidpafm2347g1pair7vk055ajhhyg631vizx53hrr9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-darwin-arm64.tar.gz";
+ sha256 = "0ib3a6y3c4hlyicv4v2vg5cs88bb34w58yxjffw00ljyxb66csy2";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-darwin-arm64.tar.gz";
- sha256 = "1hacxf3w4jlddvgqxgqi72dj4qwh00xx6kl073kjnyxhvnx9qpnd";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-arm64.tar.gz";
+ sha256 = "030fyfj5yd4p0f7ffwdsqvkjwxihz96vgy2qqibhyyv3p6ymdpym";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.8.0-darwin-arm64.tar.gz";
- sha256 = "0vhc7ww2phca0b2bn79xjqddp217c38zir6vdhgsg41nxxs081a5";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-darwin-arm64.tar.gz";
+ sha256 = "0z1c0di0p35hn30di2vv93rzdfzqrswy4gg35ngqq4h1bwn7lszi";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-arm64.tar.gz";
sha256 = "11b8dr2ycn3p4k06y2f4pj19hy7zpq0glh8npqixmvn66flp3wa7";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.9.0-darwin-arm64.tar.gz";
- sha256 = "0p1zvwi53gxsl13cw3n7iiy9ndcd5v0w8y7i4kshlnjrsxc10x42";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.10.0-darwin-arm64.tar.gz";
+ sha256 = "1vgck2nwargd7rrmfgxd2j9qahhalas5fsad8szwj83anxi6r1jn";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-darwin-arm64.tar.gz";
@@ -543,32 +543,32 @@
sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.4-darwin-arm64.tar.gz";
- sha256 = "06m4cn4v6hcqlk7pq50zd8dg5bg4zjh28r3466k532d3jvl99vr9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.0.0-darwin-arm64.tar.gz";
+ sha256 = "11frjymm7k2lgrdiwjsa5hcak1z3mdjjfmzdz6a0sv84bqlxjj0j";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-darwin-arm64.tar.gz";
- sha256 = "08gna75da1pz7da6kkq9mwm2w549sxini4102fwabyq5ky2kjwnb";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-darwin-arm64.tar.gz";
+ sha256 = "0mzw1vgl5c9f1m03j813n68ffmy95hzc27kxslb51cghxgld1pbj";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-darwin-arm64.tar.gz";
- sha256 = "0y37z57bfjw2kkv4m6az3kf6pbsppgha4hskklhhcgfxac7ymc9m";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-darwin-arm64.tar.gz";
+ sha256 = "1g6zdcdwzpg2xwa275j9alj3vhip2s4sznr79yswgl0hzfmv8xsr";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-darwin-arm64.tar.gz";
- sha256 = "1gvzjf5mp3iy43srvx3blxfwcg20gqbqvycysnl2p8g8sg3scx5f";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-darwin-arm64.tar.gz";
+ sha256 = "0nz0frfnrpancc2vd9i263ck0h29p5fs04gjp4lfxcb7hwij8idg";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.20.0-darwin-arm64.tar.gz";
- sha256 = "0m8aafbpvg6gkz660b2qa5f3ax4r3aql8j6r8s10d5aga657dqp3";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-darwin-arm64.tar.gz";
+ sha256 = "0wbpz9yljwsj4bhi6n39klrpkmirdixi04yhr58m7crmj0if9bki";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-darwin-arm64.tar.gz";
- sha256 = "058f1j40ar4xh860c3qrm0qaagm69fdmbw14avvrhsmw245cyyzc";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-darwin-arm64.tar.gz";
+ sha256 = "0zsr560dc4wz4vhc8nbkd9171l0n926rv80gicg2x54bab1kmd9g";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-darwin-arm64.tar.gz";
- sha256 = "17g9y1riss0ibyxwcxk89q3hi5wszaizwarg77cqajycz9887g37";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-darwin-arm64.tar.gz";
+ sha256 = "03yw4lkb818nanjrjd9k0n12fgrx8nj0cqjr6c0sw0xkv1lbfcgb";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-darwin-arm64.tar.gz";
@@ -591,24 +591,24 @@
sha256 = "0im3ydgkm4vjia17c03szv1i77jq7abczq0a023k0kw8r3dgd8xc";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.0-darwin-arm64.tar.gz";
- sha256 = "1hgqybvag1mlj3hikjgx9pn2hr4r3bag0lv3l9qnjdzkmdcy248j";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-darwin-arm64.tar.gz";
+ sha256 = "0gc9zjf41l44d33jj1y4py1m7l6rgs21w1v0a8kjamdxvfabyzv3";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-darwin-arm64.tar.gz";
- sha256 = "05ng5n0lqkc2f8i9vnlm20d2m6hw8in2r3nshmg58hscfzx70iiq";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-darwin-arm64.tar.gz";
+ sha256 = "1jmc5d4arkh6x6nc4j0qkms9p9l4vawz1ajwil51xshaj82k2vwg";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-darwin-arm64.tar.gz";
- sha256 = "08cf7265rh8h9qcgdh1agqxqx78fw59kz6081rl81iv4p9bjw1yy";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-arm64.tar.gz";
+ sha256 = "149isdz4fs052z1r7jfhx1mq18j8s4wrfgvbabil3wchfkgcqr8f";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-darwin-arm64.tar.gz";
sha256 = "1k52qh6z068s2np1gcg7wp8vvw5rig8c877m8x9qq5xy72w3mzgg";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-darwin-arm64.tar.gz";
- sha256 = "1fwhq1rv5a79zcbkzbgkwn5f2vdqn8fx344j7v03znx0n36qpnl6";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-darwin-arm64.tar.gz";
+ sha256 = "19qpzjrdhjqwz0zr0yj4f34fgwwa7r8fm548ymdfx9a6x3k9a1yb";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-darwin-arm64.tar.gz";
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index 02e1bb29c01b..71c61d7a0543 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper }:
+{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper, installShellFiles }:
with lib;
@@ -15,13 +15,17 @@ in stdenv.mkDerivation {
srcs = map (x: fetchurl x) data.pulumiPkgs.${stdenv.hostPlatform.system};
installPhase = ''
- mkdir -p $out/bin
- cp * $out/bin/
+ install -D -t $out/bin/ *
'' + optionalString stdenv.isLinux ''
wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib"
+ '' + ''
+ installShellCompletion --cmd pulumi \
+ --bash <($out/bin/pulumi completion bash) \
+ --fish <($out/bin/pulumi completion fish) \
+ --zsh <($out/bin/pulumi completion zsh)
'';
- nativeBuildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ];
+ nativeBuildInputs = [ installShellFiles ] ++ optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ];
meta = {
homepage = "https://pulumi.io/";
diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh
index 8de0f40c1e14..a0e315d4e5da 100755
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/pkgs/tools/admin/pulumi/update.sh
@@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
-VERSION="3.35.2"
+VERSION="3.37.2"
# An array of plugin names. The respective repository inside Pulumi's
# Github organization is called pulumi-$name by convention.
diff --git a/pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch b/pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch
new file mode 100644
index 000000000000..bfccf45b6dcf
--- /dev/null
+++ b/pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch
@@ -0,0 +1,12 @@
+diff --git c/Cargo.lock i/Cargo.lock
+index 9b8929c..8e1e923 100644
+--- c/Cargo.lock
++++ i/Cargo.lock
+@@ -303,6 +303,7 @@ dependencies = [
+ "lodepng",
+ "loop9",
+ "natord",
++ "num-traits",
+ "pbr",
+ "quick-error",
+ "resize",
diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index bf3cbf420b14..ffd60b5b7783 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -2,21 +2,25 @@
rustPlatform.buildRustPackage rec {
pname = "gifski";
- version = "1.6.4";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "ImageOptim";
repo = "gifski";
rev = version;
- sha256 = "sha256-TD6MSZfvJ8fLJxvDh4fc4Dij5t4WSH2/i9Jz7eBmlME=";
+ sha256 = "sha256-cycgrQ1f0x1tPziQCRyqWinG8v0SVYW3LpFsxhZpQhE=";
};
- cargoSha256 = "sha256-kG0svhytDzm2dc//8WTFm1sI3WS0Ny9yhYTSMoXnt8I=";
+ cargoPatches = [ ./cargo.lock-fix-missing-dependency.patch ];
- nativeBuildInputs = [ pkg-config ];
+ cargoSha256 = "sha256-qJ+awu+Ga3fdxaDKdSzCcdyyuKCheb87qT7tX1dL1zo=";
+
+ nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
+
+ # error: the crate `gifski` is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind`
+ doCheck = !stdenv.isDarwin;
meta = with lib; {
- broken = stdenv.isDarwin;
description = "GIF encoder based on libimagequant (pngquant)";
homepage = "https://gif.ski/";
license = licenses.agpl3;
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index e9476b3d84a0..fef8750085ef 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "2.19.0";
+ version = "2.20.0";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "sha256-0MZw0sETo8wMqSNInyy1NE+M06Wo9o1NZJGEBZZN9Jk=";
+ sha256 = "sha256-02YPLWuwMBvjIrkkZWlOmoASJ0El0YcQhVnt8wfpMaY=";
};
- vendorSha256 = "sha256-J10C8YbTeQMF815k+IbpdX8BEsCwNB/4VwQWliHQQto=";
+ vendorSha256 = "sha256-CJZiItzpk5vQBeKvarfHFsW2ek2yn7z6+CAlDPXdNyI=";
doCheck = false;
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index d12b6ecf6606..72a72b34373c 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles
-, abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
+, abootimg, acl, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
, e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R
, radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd
@@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
#
# Still missing these tools: docx2txt lipo otool r2pipe
pythonPath = [
- binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
+ binutils-unwrapped-all-targets bzip2 colordiff coreutils cpio db diffutils
e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
xz zip zstd
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index 7ba3de825f7b..94a32cbb79eb 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "goreleaser";
- version = "1.10.2";
+ version = "1.10.3";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-v9/zy7wHqZexaIn3iVDvr3RQNGncnNqqcl88kNDBAfQ=";
+ sha256 = "sha256-+xrjIef8ToN07sfgZt/R5ZfCJ68v9293dSfaOwh1kmI=";
};
vendorSha256 = "sha256-sJHq2ZSeCpUXhcF5HZQxIE0Jkutnc/m86NcaDNs7a7A=";
diff --git a/pkgs/tools/misc/ksnip/default.nix b/pkgs/tools/misc/ksnip/default.nix
index 788f4b75b4aa..a106869233cc 100644
--- a/pkgs/tools/misc/ksnip/default.nix
+++ b/pkgs/tools/misc/ksnip/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ksnip";
- version = "1.9.2";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "ksnip";
repo = "ksnip";
rev = "v${version}";
- sha256 = "sha256-4EIb1cHmScnFN7IralBR5hnvPBCHNQRcTWEWYezoOcQ=";
+ sha256 = "sha256-a5mS2mrbs0CyZ83hwwFdherq6kMS93ItQIDKu1AjnN4=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix
index 4c9d5a6da8a2..1273e8c63e38 100644
--- a/pkgs/tools/misc/massren/default.nix
+++ b/pkgs/tools/misc/massren/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "massren";
- version = "1.5.4";
+ version = "1.5.6";
src = fetchFromGitHub {
owner = "laurent22";
repo = "massren";
rev = "v${version}";
- sha256 = "1bn6qy30kpxi3rkr3bplsc80xnhj0hgfl0qaczbg3zmykfmsl3bl";
+ sha256 = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
};
goPackagePath = "github.com/laurent22/massren";
diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix
index 2040d18e5f69..4a648e23107f 100644
--- a/pkgs/tools/misc/mmctl/default.nix
+++ b/pkgs/tools/misc/mmctl/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "mmctl";
- version = "7.0.1";
+ version = "7.1.2";
src = fetchFromGitHub {
owner = "mattermost";
repo = "mmctl";
rev = "v${version}";
- sha256 = "sha256-xNj8aM3hpcvxwXCdFCfkXDBagIdCjcjWLGNp43KsV10=";
+ sha256 = "sha256-wqX6HVcI8PTE0gFYh03oxWRQ1Tzs/Z9V2cG9qu1MsLA=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix
index 41e6694267fc..99b5231f82be 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pgmetrics";
- version = "1.13.0";
+ version = "1.13.1";
src = fetchFromGitHub {
owner = "rapidloop";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-VDobaU+zY1ubVBrb/pdKKfSWCYTRDz1ssqZ0Fsv0KBc=";
+ sha256 = "sha256-Cvx3Lc4FH6RX9UrjX7L3FSt+CcAWieBRTFT1CsLkdFg=";
};
vendorSha256 = "sha256-aE/TZ0QlGYvuMVZDntXmYkUKos5NTI/ncRPp9A4CScY=";
diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix
index 0c09368277b3..ed6c4c957a01 100644
--- a/pkgs/tools/misc/pmbootstrap/default.nix
+++ b/pkgs/tools/misc/pmbootstrap/default.nix
@@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "pmbootstrap";
- version = "1.43.0";
+ version = "1.45.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-4bPxWmzlyVZrkq9qs/5t+ZOsVDkAAwYc6Mc4een4Qnw=";
+ sha256 = "sha256-75ZFzhRsczkwhiUl1upKjSvmqN0RkXaM8cKr4zLgi4w=";
};
repo = fetchFromGitLab {
@@ -15,7 +15,7 @@ buildPythonApplication rec {
owner = "postmarketOS";
repo = pname;
rev = version;
- sha256 = "sha256-jbTzPGrRVisLG7f4NspkDVB8NYSyyInHkhSUPO3dgU0=";
+ sha256 = "sha256-tG1+vUJW9JIdYpcRn8J0fCIZh29hYo8wSlBKwTUxyMU=";
};
pmb_test = "${repo}/test";
diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix
index e6e91443b848..3a711a1be317 100644
--- a/pkgs/tools/misc/qflipper/default.nix
+++ b/pkgs/tools/misc/qflipper/default.nix
@@ -23,8 +23,8 @@
}:
let
pname = "qFlipper";
- version = "1.1.0";
- sha256 = "sha256-tZ+GXBv+LB1CYhO4hRtZFP25xUAVZaZJoee7Q7RJLp8=";
+ version = "1.1.1";
+ sha256 = "sha256-X29iurCloH//7soHd+trPTjhOe9S6ixFts5KldATlwA=";
timestamp = "99999999999";
commit = "nix-${version}";
diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix
index 6eea6fe7beba..bd03b591b17c 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/pkgs/tools/misc/rcm/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "rcm";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchurl {
url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz";
- sha256 = "sha256-mxGuN0Sc9NI07G0TSEeb/tMlPauhH36ed0BZhltmwko=";
+ sha256 = "sha256-JHQefybxagSTJLqoavcARDxCgeLN4JlynXTE1LKevi0=";
};
patches = [ ./fix-rcmlib-path.patch ];
diff --git a/pkgs/tools/misc/sfz/default.nix b/pkgs/tools/misc/sfz/default.nix
new file mode 100644
index 000000000000..11b209a7cdab
--- /dev/null
+++ b/pkgs/tools/misc/sfz/default.nix
@@ -0,0 +1,25 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "sfz";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "weihanglo";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-XY1xsQgXzmX8jmDDLIivXeW9MsNA/pVtYapcBkBhldE=";
+ };
+
+ cargoSha256 = "sha256-w3HKnCAPSVgx4mqNB7Q0sMCDC4U+4fdIUUwJFz19XdI=";
+
+ # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Simple static file serving command-line tool written in Rust";
+ homepage = "https://github.com/weihanglo/sfz";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ dit7ya ];
+ };
+}
diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix
index 1451e85c391b..e94d593c62a7 100644
--- a/pkgs/tools/networking/godns/default.nix
+++ b/pkgs/tools/networking/godns/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "godns";
- version = "2.8.5";
+ version = "2.8.6";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "v${version}";
- sha256 = "sha256-RqJ3AfnHKA6qJhio7SMvJlcKBec7/fDz5s2ucqOkQWE=";
+ sha256 = "sha256-nWM3EQvh5maIobphHbknBOxZyugNcLjG4Nf4tfo3KWY=";
};
vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE=";
diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix
index 5e788638e6e9..085cde3e75eb 100644
--- a/pkgs/tools/networking/lychee/default.nix
+++ b/pkgs/tools/networking/lychee/default.nix
@@ -1,8 +1,10 @@
{ lib
+, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
+, Security
}:
rustPlatform.buildRustPackage rec {
@@ -20,7 +22,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openssl ];
+ buildInputs = [ openssl ]
+ ++ lib.optionals stdenv.isDarwin [ Security ];
# Disabled because they currently fail
doCheck = false;
@@ -30,6 +33,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/lycheeverse/lychee";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ tuxinaut ];
- platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 9ca4dfa27b3b..c8710b4a82e7 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
- version = "2022-05-09T04-08-26Z";
+ version = "2022-07-24T02-25-13Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
- sha256 = "sha256-a7zpvumsMijMmJthg4EZgOUymDC4GrbDjAwN4sXxE6g=";
+ sha256 = "sha256-wBAZD2qX/EoAgUVPdBJrPJe4Na6yPgjoJeKGBqwYJzs=";
};
- vendorSha256 = "sha256-OkcQxTDKhuFCjNs5TNBBMde+M6vCfPSR5IuVbCaqWJg=";
+ vendorSha256 = "sha256-F/BNi8DA2NbAE0lUn63DzNeFDXY9hBeIgSv6XBb4cCc=";
subPackages = [ "." ];
diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix
index 91cb5489f029..62b3cc2aac93 100644
--- a/pkgs/tools/networking/pathvector/default.nix
+++ b/pkgs/tools/networking/pathvector/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pathvector";
- version = "5.12.0";
+ version = "6.0.1";
src = fetchFromGitHub {
owner = "natesales";
repo = "pathvector";
rev = "v${version}";
- sha256 = "sha256-RdUZkkALEdyq+YKtgGE/P8eTX2v3fdYHF1wpZEyfkgY=";
+ sha256 = "sha256-2fCkQVpIcZjKA7URvZyt0DdMyUndLFv1BhsANThghKs=";
};
- vendorSha256 = "sha256-oxLMfmHLaOQwpRYwnHRQY0mIV5/fZ65RDgKVs0Kzd2Q=";
+ vendorSha256 = "sha256-bqfYILEGgbnla7EUrzjIO2mMAuL6e4WI2OHUwOr6i+g=";
CGO_ENABLED = 0;
diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix
index 9b1c3d005b97..284159dfc9ab 100644
--- a/pkgs/tools/networking/phodav/default.nix
+++ b/pkgs/tools/networking/phodav/default.nix
@@ -1,9 +1,17 @@
-{ lib, stdenv, fetchurl
-, pkg-config, libsoup, meson, ninja }:
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, pkg-config
+, libsoup
+, meson
+, ninja
+}:
let
version = "2.5";
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
pname = "phodav";
inherit version;
@@ -12,6 +20,17 @@ in stdenv.mkDerivation rec {
sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i";
};
+ patches = [
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/ae9ac98c1b3db26070111661aba02594c62d2cef.patch";
+ sha256 = "sha256-jIHG6aRqG00Q6aIQsn4tyQdy/b6juW6QiUPXLmIc3TE=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/560ab5ca4f836d82bddbbe66ea0f7c6b4cab6b3b.patch";
+ sha256 = "sha256-2gP579qhEkp7fQ8DBGYbZcjb2Tr+WpJs30Z7lsQaz2g=";
+ })
+ ];
+
mesonFlags = [
"-Davahi=disabled"
"-Dsystemd=disabled"
@@ -19,6 +38,8 @@ in stdenv.mkDerivation rec {
"-Dudev=disabled"
];
+ NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl";
+
nativeBuildInputs = [ libsoup pkg-config meson ninja ];
outputs = [ "out" "dev" "lib" ];
@@ -27,7 +48,7 @@ in stdenv.mkDerivation rec {
description = "WebDav server implementation and library using libsoup";
homepage = "https://wiki.gnome.org/phodav";
license = licenses.lgpl21;
- maintainers = with maintainers; [ ];
- platforms = platforms.linux;
+ maintainers = with maintainers; [ wegank ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/networking/s5cmd/default.nix b/pkgs/tools/networking/s5cmd/default.nix
index f7847f324cb0..c1f411bac465 100644
--- a/pkgs/tools/networking/s5cmd/default.nix
+++ b/pkgs/tools/networking/s5cmd/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "s5cmd";
- version = "1.4.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "peak";
repo = "s5cmd";
rev = "v${version}";
- sha256 = "sha256-12bKMZ6SMPsqLqaBTVxCxvs7PZ0CKimI9wlqvWZ/bgY=";
+ sha256 = "sha256-9G0GSMNLYeIrbq7zctM3OCRcEZF1giEt+u5g3lTX96M=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 52fa43340b63..f9c33298fc31 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "stunnel";
- version = "5.64";
+ version = "5.65";
src = fetchurl {
url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
- sha256 = "sha256-7r5T7RFrpDsueGdisMK5FRHnt0hXrUdlgk5xmeb6+IM=";
- # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
+ sha256 = "60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc";
+ # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256",
# not the output of `nix-prefetch-url`
};
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index e0fdbdff0b3a..99fc6565b1ce 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,8 +1,9 @@
{ lib, stdenv, fetchurl, gettext, pkg-config, perlPackages
, libidn2, zlib, pcre, libuuid, libiconv, libintl
, python3, lzip
-, libpsl ? null
-, openssl ? null }:
+, withLibpsl ? false, libpsl
+, withOpenssl ? true, openssl
+}:
stdenv.mkDerivation rec {
pname = "wget";
@@ -31,12 +32,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl ];
buildInputs = [ libidn2 zlib pcre libuuid ]
++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ]
- ++ lib.optional (openssl != null) openssl
- ++ lib.optional (libpsl != null) libpsl
+ ++ lib.optional withOpenssl openssl
+ ++ lib.optional withLibpsl libpsl
++ lib.optional stdenv.isDarwin perlPackages.perl;
configureFlags = [
- (lib.withFeatureAs (openssl != null) "ssl" "openssl")
+ (lib.withFeatureAs withOpenssl "ssl" "openssl")
] ++ lib.optionals stdenv.isDarwin [
# https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html
"--without-included-regex"
@@ -46,18 +47,14 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tool for retrieving files using HTTP, HTTPS, and FTP";
-
longDescription =
'' GNU Wget is a free software package for retrieving files using HTTP,
HTTPS and FTP, the most widely-used Internet protocols. It is a
non-interactive commandline tool, so it may easily be called from
scripts, cron jobs, terminals without X-Windows support, etc.
'';
-
license = licenses.gpl3Plus;
-
homepage = "https://www.gnu.org/software/wget/";
-
maintainers = with maintainers; [ fpletz ];
platforms = platforms.all;
};
diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix
index 7176d7f608e9..6ef5467d9e9d 100644
--- a/pkgs/tools/package-management/libdnf/default.nix
+++ b/pkgs/tools/package-management/libdnf/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libdnf";
- version = "0.66.0";
+ version = "0.67.0";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = pname;
rev = version;
- sha256 = "sha256-fQyNm51roz6wn9QAE8/ZIrutyWP45xiKVHzn8n0LcwE=";
+ sha256 = "sha256-ajYrR4MBHjGWaQwFmLSmZkazY93b05Ur4/E+mb/By9E=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index 1a9013b456d6..60620c9ba225 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nfpm";
- version = "2.15.1";
+ version = "2.17.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-D/1psEpOoDiA/dpnUc9sUaOq8Dk5QEImIWEp08FyV7o=";
+ sha256 = "sha256-+X68HW5pfJtMWmUoOgI1yHn5rfOVMKQaGL0/MQtMDQM=";
};
- vendorSha256 = "sha256-guJgLjmB29sOLIzs2+gKNp0WTWC3zS9Sb5DD5IistKY=";
+ vendorSha256 = "sha256-KR1DgF41fjrCX4bn82kZ49xImQQitIyMSjlBPuNkF8c=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
diff --git a/pkgs/tools/package-management/wapm/cli/default.nix b/pkgs/tools/package-management/wapm/cli/default.nix
new file mode 100644
index 000000000000..b71bb166ea8b
--- /dev/null
+++ b/pkgs/tools/package-management/wapm/cli/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, fetchFromGitHub
+, libiconv
+, openssl
+, rustPlatform
+, Security
+, stdenv
+, SystemConfiguration
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "wapm-cli";
+ version = "0.5.5";
+
+ src = fetchFromGitHub {
+ owner = "wasmerio";
+ repo = "wapm-cli";
+ rev = "v${version}";
+ sha256 = "sha256-BKBd1tJwV4VOjRnAx/spQy3LIXzujrO2SS5eA1uybNA=";
+ };
+
+ cargoSha256 = "sha256-dv04AXOnzizjq/qx3qy524ylQHgE4gIBgeYI+2IRTug=";
+
+ buildInputs = [ libiconv openssl ]
+ ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A package manager for WebAssembly modules";
+ homepage = "https://docs.wasmer.io/ecosystem/wapm";
+ license = with licenses; [ mit ];
+ maintainers = [ maintainers.lucperkins ];
+ };
+}
diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix
index 7342c34ee367..d6a26dc957f5 100644
--- a/pkgs/tools/security/ssh-to-age/default.nix
+++ b/pkgs/tools/security/ssh-to-age/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ssh-to-age";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "Mic92";
repo = "ssh-to-age";
rev = version;
- sha256 = "sha256-ccwCHu6RlWqMnt5nBy54bVEzfE9/3PEL4C5LnYTtnwU=";
+ sha256 = "sha256-sjiOmIoFyl1Kr4RKg1TqXJNIq2/HF91oxDLtRDa+eWw=";
};
- vendorSha256 = "sha256-jiFPcdWnAk54RJv4mHB3A+5tqKzqitfsiRXYZLa3Gu0=";
+ vendorSha256 = "sha256-Xi5aJAYgbtrDq7KBAfZR1LT5/jbslwEa70qaFqW4vcQ=";
checkPhase = ''
runHook preCheck
diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix
index 2f69f6a0ef6a..0061a3d7c88a 100644
--- a/pkgs/tools/system/jump/default.nix
+++ b/pkgs/tools/system/jump/default.nix
@@ -36,6 +36,6 @@ buildGoModule rec {
'';
homepage = "https://github.com/gsamokovarov/jump";
license = licenses.mit;
- maintainers = with maintainers; [ sondr3 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/tools/system/openseachest/default.nix
index 7b7909fbe002..b2b6516ba78a 100644
--- a/pkgs/tools/system/openseachest/default.nix
+++ b/pkgs/tools/system/openseachest/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "openseachest";
- version = "21.06.21";
+ version = "22.07";
src = fetchFromGitHub {
owner = "Seagate";
repo = "openSeaChest";
rev = "v${version}";
- sha256 = "09xay3frk0yh48ww650dsjp0rx0w1m3ab3rpz5k1jizppv4kk9fi";
+ sha256 = "sha256-YZOQfABDr5DGkL08TYn908XdCSCJCg+9nlWXRBjYBOU=";
fetchSubmodules = true;
};
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index d11cd8382c9e..1d5e950e4e61 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -1,20 +1,19 @@
{ lib, stdenv, fetchFromGitHub
, talloc
, pkg-config
-, libarchive
, git
, ncurses
, docutils, swig, python3, coreutils, enablePython ? true }:
stdenv.mkDerivation rec {
pname = "proot";
- version = "5.3.0";
+ version = "5.3.1";
src = fetchFromGitHub {
repo = "proot";
owner = "proot-me";
rev = "v${version}";
- sha256 = "sha256-89d1a5QBusra0vd3Ph0lQalXrblBwogi6bNgvvpQL+Q=";
+ sha256 = "sha256-uN31wDJjuQmDWeHaZHHQpmXQeQ/TYeS9HNYWEC0shaA=";
};
postPatch = ''
@@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
sed -i /CROSS_COMPILE/d src/GNUmakefile
'';
- buildInputs = [ ncurses libarchive talloc ] ++ lib.optional enablePython python3;
+ buildInputs = [ ncurses talloc ] ++ lib.optional enablePython python3;
nativeBuildInputs = [ pkg-config docutils ] ++ lib.optional enablePython swig;
enableParallelBuilding = true;
diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/tools/text/tidy-viewer/default.nix
index 43b38d06b928..187bde3958ee 100644
--- a/pkgs/tools/text/tidy-viewer/default.nix
+++ b/pkgs/tools/text/tidy-viewer/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tidy-viewer";
- version = "1.4.3";
+ version = "1.4.6";
src = fetchFromGitHub {
owner = "alexhallam";
repo = "tv";
rev = version;
- sha256 = "sha256-onLu4XNe3sLfZ273Hq9IvgZEV9ir8oEXX7tQG75K2Hw=";
+ sha256 = "sha256-aCso4+EdHKeYVFyOrVwE967//9VkfNHvvnumtkORVmw=";
};
- cargoSha256 = "sha256-CYiRi6ny0wzTddpjdnnMHGqcWRM9wVjF34RmETgLH5A=";
+ cargoSha256 = "sha256-bEwfdjvBbvlMyuqdH0xprCVrOV5Wm2E1uwDsg2M66dY=";
# this test parses command line arguments
# error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index aa86ec511f6b..1c3bdf690dde 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1365,6 +1365,8 @@ mapAliases ({
tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22
tangogps = foxtrotgps; # Added 2020-01-26
+ taplo-cli = taplo; # Added 2022-07-30
+ taplo-lsp = taplo; # Added 2022-07-30
tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead";
teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05
telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21f2c8de6da7..fd4c6f2f5b4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1464,9 +1464,7 @@ with pkgs;
oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { };
- openmsx = callPackage ../applications/emulators/openmsx {
- python = python3;
- };
+ openmsx = callPackage ../applications/emulators/openmsx { };
packwiz = callPackage ../tools/games/minecraft/packwiz { };
@@ -4474,6 +4472,8 @@ with pkgs;
s2png = callPackage ../tools/graphics/s2png { };
+ sfz = callPackage ../tools/misc/sfz { };
+
shab = callPackage ../tools/text/shab { };
sheldon = callPackage ../tools/misc/sheldon { };
@@ -5710,7 +5710,9 @@ with pkgs;
kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };
- lychee = callPackage ../tools/networking/lychee { };
+ lychee = callPackage ../tools/networking/lychee {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { };
@@ -10603,6 +10605,8 @@ with pkgs;
shout = nodePackages.shout;
+ showmethekey = callPackage ../applications/video/showmethekey { };
+
shrikhand = callPackage ../data/fonts/shrikhand { };
shunit2 = callPackage ../tools/misc/shunit2 { };
@@ -11458,9 +11462,7 @@ with pkgs;
ttylog = callPackage ../tools/misc/ttylog { };
- txtpbfmt = callPackage ../development/tools/txtpbfmt {
- buildGoModule = buildGo118Module;
- };
+ txtpbfmt = callPackage ../development/tools/txtpbfmt { };
ipbt = callPackage ../tools/misc/ipbt { };
@@ -12077,9 +12079,7 @@ with pkgs;
webalizer = callPackage ../tools/networking/webalizer { };
- wget = callPackage ../tools/networking/wget {
- libpsl = null;
- };
+ wget = callPackage ../tools/networking/wget { };
wget2 = callPackage ../tools/networking/wget2 {
# update breaks grub2
@@ -15109,6 +15109,10 @@ with pkgs;
trealla = callPackage ../development/interpreters/trealla { };
+ wapm-cli = callPackage ../tools/package-management/wapm/cli {
+ inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
+ };
+
wasm = ocamlPackages.wasm;
wasm3 = callPackage ../development/interpreters/wasm3 { };
@@ -15944,7 +15948,6 @@ with pkgs;
flow = callPackage ../development/tools/analysis/flow {
inherit (darwin.apple_sdk.frameworks) CoreServices;
- ocamlPackages = ocaml-ng.ocamlPackages_4_12;
};
fly = callPackage ../development/tools/continuous-integration/fly { };
@@ -16775,11 +16778,7 @@ with pkgs;
szyszka = callPackage ../tools/misc/szyszka { };
- taplo-cli = callPackage ../development/tools/taplo-cli {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
-
- taplo-lsp = callPackage ../development/tools/taplo-lsp {
+ taplo = callPackage ../development/tools/taplo {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -17409,6 +17408,8 @@ with pkgs;
croaring = callPackage ../development/libraries/croaring { };
+ crossguid = callPackage ../development/libraries/crossguid { };
+
cryptopp = callPackage ../development/libraries/crypto++ { };
cryptominisat = callPackage ../applications/science/logic/cryptominisat { };
@@ -18040,6 +18041,8 @@ with pkgs;
# A GMP fork
mpir = callPackage ../development/libraries/mpir {};
+ gl3w = callPackage ../development/libraries/gl3w { };
+
gnatcoll-core = callPackage ../development/libraries/ada/gnatcoll/core.nix { };
# gnatcoll-bindings repository
@@ -20582,6 +20585,8 @@ with pkgs;
place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at;
+ platform-folders = callPackage ../development/libraries/platform-folders { };
+
plib = callPackage ../development/libraries/plib { };
poco = callPackage ../development/libraries/poco { };
@@ -20861,6 +20866,9 @@ with pkgs;
rtrlib = callPackage ../development/libraries/rtrlib { };
kissfft = callPackage ../development/libraries/kissfft { };
+ kissfftFloat = kissfft.override {
+ datatype = "float";
+ };
lambdabot = callPackage ../development/tools/haskell/lambdabot {
haskellLib = haskell.lib.compose;
@@ -29744,6 +29752,8 @@ with pkgs;
purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
+ purple-signald = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-signald { };
+
purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { };
purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { };
@@ -34348,7 +34358,7 @@ with pkgs;
caffeWithCuda = caffe.override { cudaSupport = true; };
- caffeine-ng = callPackage ../tools/X11/caffeine-ng {};
+ caffeine-ng = python3Packages.callPackage ../tools/X11/caffeine-ng {};
cntk = callPackage ../applications/science/math/cntk {
stdenv = gcc7Stdenv;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d6edb1531471..744ddcb879e6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -108,7 +108,7 @@ in {
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
# the oldest ghc with aarch64-darwin support is 8.10.5
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
- if stdenv.isAarch64 || stdenv.isAarch32 then
+ if stdenv.hostPlatform.isAarch then
packages.ghc8107BinaryMinimal
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
# to my (@a-m-joseph) knowledge there are no newer official binaries for this platform
@@ -127,7 +127,7 @@ in {
bootPkgs =
# aarch64 ghc8107Binary exceeds max output size on hydra
# the oldest ghc with aarch64-darwin support is 8.10.5
- if stdenv.isAarch64 || stdenv.isAarch32 then
+ if stdenv.hostPlatform.isAarch then
packages.ghc8107BinaryMinimal
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
packages.ghc8107
@@ -141,7 +141,7 @@ in {
ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix {
bootPkgs =
# aarch64 ghc8107Binary exceeds max output size on hydra
- if stdenv.isAarch64 || stdenv.isAarch32 then
+ if stdenv.hostPlatform.isAarch then
packages.ghc8107BinaryMinimal
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
packages.ghc8107
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 902d3b9be6fa..5122f35a058e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5386,6 +5386,8 @@ in {
mediafile = callPackage ../development/python-modules/mediafile { };
+ mediapy = callPackage ../development/python-modules/mediapy { };
+
meilisearch = callPackage ../development/python-modules/meilisearch { };
meinheld = callPackage ../development/python-modules/meinheld { };
@@ -10068,6 +10070,8 @@ in {
sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { };
+ sphinxcontrib-confluencebuilder = callPackage ../development/python-modules/sphinxcontrib-confluencebuilder { };
+
sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { };
sphinxcontrib-excel-table = callPackage ../development/python-modules/sphinxcontrib-excel-table { };