diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 35fa45dbc014..e37142f05f41 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -421,7 +421,7 @@ let
echo "Usage size: $usage_size"
echo "Image size: $image_size"
truncate --size=$image_size "$out"
- faketime "2000-01-01 00:00:00" mkfs.vfat -i 12345678 -n EFIBOOT "$out"
+ mkfs.vfat --invariant -i 12345678 -n EFIBOOT "$out"
# Force a fixed order in mcopy for better determinism, and avoid file globbing
for d in $(find EFI -type d | sort); do
diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix
index cb2522d86789..ad9b803b1d1e 100644
--- a/nixos/modules/installer/sd-card/sd-image.nix
+++ b/nixos/modules/installer/sd-card/sd-image.nix
@@ -224,14 +224,25 @@ in
# Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img
eval $(partx $img -o START,SECTORS --nr 1 --pairs)
truncate -s $((SECTORS * 512)) firmware_part.img
- faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.firmwarePartitionID} -n ${config.sdImage.firmwarePartitionName} firmware_part.img
+
+ mkfs.vfat --invariant -i ${config.sdImage.firmwarePartitionID} -n ${config.sdImage.firmwarePartitionName} firmware_part.img
# Populate the files intended for /boot/firmware
mkdir firmware
${config.sdImage.populateFirmwareCommands}
+ find firmware -exec touch --date=2000-01-01 {} +
# Copy the populated /boot/firmware into the SD image
- (cd firmware; mcopy -psvm -i ../firmware_part.img ./* ::)
+ cd firmware
+ # Force a fixed order in mcopy for better determinism, and avoid file globbing
+ for d in $(find . -type d -mindepth 1 | sort); do
+ faketime "2000-01-01 00:00:00" mmd -i ../firmware_part.img "::/$d"
+ done
+ for f in $(find . -type f | sort); do
+ mcopy -pvm -i ../firmware_part.img "$f" "::/$f"
+ done
+ cd ..
+
# Verify the FAT partition before copying it.
fsck.vfat -vn firmware_part.img
dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix
index e1456091717d..50213ec252ff 100644
--- a/nixos/modules/services/web-servers/caddy/default.nix
+++ b/nixos/modules/services/web-servers/caddy/default.nix
@@ -290,6 +290,9 @@ in
}
'';
+ # https://github.com/lucas-clemente/quic-go/wiki/UDP-Receive-Buffer-Size
+ boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000;
+
systemd.packages = [ cfg.package ];
systemd.services.caddy = {
wants = map (hostOpts: "acme-finished-${hostOpts.useACMEHost}.target") acmeVHosts;
diff --git a/nixos/modules/system/boot/systemd/nspawn.nix b/nixos/modules/system/boot/systemd/nspawn.nix
index d9e42ad5b26b..cbc89554c9fd 100644
--- a/nixos/modules/system/boot/systemd/nspawn.nix
+++ b/nixos/modules/system/boot/systemd/nspawn.nix
@@ -45,7 +45,9 @@ let
];
instanceOptions = {
- options = sharedOptions // {
+ options =
+ (getAttrs [ "enable" ] sharedOptions)
+ // {
execConfig = mkOption {
default = {};
example = { Parameters = "/bin/sh"; };
diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix
index dd23593bf2fa..88c0ced4a249 100644
--- a/pkgs/applications/emulators/rpcs3/default.nix
+++ b/pkgs/applications/emulators/rpcs3/default.nix
@@ -9,10 +9,10 @@
let
# Keep these separate so the update script can regex them
- rpcs3GitVersion = "14263-0737c788f";
- rpcs3Version = "0.0.24-14263-0737c788f";
- rpcs3Revision = "0737c788fc8b8b33d79c620065c5fc4990dbed80";
- rpcs3Sha256 = "1r7ibbzdmm5ikk0856hy46c8466liz5jsiqzcqvbdr8jbwdcdmg9";
+ rpcs3GitVersion = "14289-0da81d22d";
+ rpcs3Version = "0.0.24-14289-0da81d22d";
+ rpcs3Revision = "0da81d22d340dca1ac098a9de5274641bdc77869";
+ rpcs3Sha256 = "0qblfsdyngj8bb7g49am0q0mq5llwx3g4x4gi6h0jynk0d9j0ir0";
ittapi = fetchFromGitHub {
owner = "intel";
diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix
index 28db974980e8..a46e89ecca6f 100644
--- a/pkgs/applications/networking/cluster/kubeconform/default.nix
+++ b/pkgs/applications/networking/cluster/kubeconform/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeconform";
- version = "0.4.14";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "yannh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-iLZhd1e4i6omyGhOvRJ/VsHehpAPfPHnypXru5Ruv0o=";
+ sha256 = "sha256-YLPF8tR50gtiA608TLctKX54a7qf8LXjbkMr/GPJBSc=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
index b109932fb2de..6d30f4ba8785 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeseal";
- version = "0.19.0";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
- sha256 = "sha256-CQlyAgnEWeAfOn6xXeDFEGuSnaGZpGewg1tYYDCw8qE=";
+ sha256 = "sha256-+WwxYnVW6rdZ+A4L2qLtXXaMWLC4ulEoP+vtdtkLvlE=";
};
vendorSha256 = "sha256-505nUMuFteOfIurGYRGHqo9diTSEa56tmQZ3jIGtULQ=";
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 01b446457acb..0ab6032d2e80 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
- version = "3.3.38";
+ version = "3.3.39";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
- hash = "sha256-mOjI2pN/KEY//+i+2YmLjUqQwv223jYhu+KjPMRPAaw=";
+ hash = "sha256-UJOV/KRJgy4r7iKWdlA8k51OLzMcfMHgFSvII/D5erA=";
};
postPatch = ''
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 7234d92840dc..0739b6f57645 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -36,14 +36,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "3.7";
+ version = "3.7.1";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
- hash = "sha256-n5kvC//h85c4IvkrCVTz+F0DcCC5rdRkvj8W3fUPXI8=";
+ hash = "sha256-ZtJi1NhE1agZWnAv6FCUeO1GDtuQnLTraA5nkwWiCqs=";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 4d5244b3b8c0..02cf46a23ce2 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "rclone";
- version = "1.59.2";
+ version = "1.60.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2/CwqjlVa5g4DAAc2v0KarqbsXCTSrzQKRzCHF72X+I=";
+ sha256 = "sha256-UFA4mPzpHnyx6+tVw0QwhTlALdu8YLNAleWxXuFJczs=";
};
- vendorSha256 = "sha256-MZ5RtB4UGHPlMxyQ0VbX5iPpZw98oUuEhuMBDZcYiw8=";
+ vendorSha256 = "sha256-si5fzyPQUUTKkm/UVt8xfpJGK/4F6GM4HuAg1R0hzqQ=";
subPackages = [ "." ];
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index f98eb7639c1a..3eafadce114a 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "limesuite";
- version = "22.09.0";
+ version = "22.09.1";
src = fetchFromGitHub {
owner = "myriadrf";
repo = "LimeSuite";
rev = "v${version}";
- sha256 = "sha256-HV0ejx7ImJ7GvAyCi0a7OPB0/2UiLQxxhYR2bc2uYCA=";
+ sha256 = "sha256-t3v2lhPZ1L/HRRBwA3k1KfIpih6R4TUmBWaIm8sVGdY=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix
index 51ee824b6ff1..7621c2dfdff7 100644
--- a/pkgs/applications/science/math/readstat/default.nix
+++ b/pkgs/applications/science/math/readstat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }:
stdenv.mkDerivation rec {
name = "readstat";
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ];
+ buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ libiconv ];
+
meta = {
homepage = "https://github.com/WizardMac/ReadStat";
description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files";
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index ab023dc4f02d..412f55402276 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
- version = "2.12.0";
+ version = "2.12.2";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
- sha256 = "sha256-AwoWCaACq2s9rzvvpAx3GZd3oSZZPykLwYLUiUhEYfg=";
+ sha256 = "sha256-QyxWoq3hGFLm27tba5BL3xcnNCOAmY+rbGBtwREZPJA=";
};
postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
- vendorSha256 = "sha256-C7VgcbDB18dF+u422AFAfoICxGmqjREbOpUXrFlgmiM=";
+ vendorSha256 = "sha256-QlzneikTMBUpKJiyVrN+A6CctsVvdoTOOMDjJqIF3a8=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix
index 97f9bd4eb176..79a642c3ccf7 100644
--- a/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/pkgs/applications/virtualization/nixpacks/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
- version = "0.10.3";
+ version = "0.10.5";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-7lr4Ym8E3o8dWyy1GlBQfhLGWoR6uzjiWTWmuSGXmMM=";
+ sha256 = "sha256-Z1xmBoRdOTMB9NHGWKQyweT0/PyjGHiK+yj5uKjZPtE=";
};
- cargoSha256 = "sha256-v2OC69YpVbJ52z9iO98kfzC3A4fpotcGBhpwESjdvU4=";
+ cargoSha256 = "sha256-jLO1UPfu0vN2NCvvGBnUY1UPV1F+0fYlrtsM/AE39tU=";
# skip test due FHS dependency
doCheck = false;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 9262e248e017..a136ca5e4e26 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-network";
- version = "2.4.3";
+ version = "2.4.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-g0EvdYwgs+5l3wFKhQbf9o8iUr6NOvBqv+VM6xYThPA=";
+ sha256 = "sha256-g62+DF84eEI+TvUr1OkeqLnCLz/b7e+xwuTNZS0WJQA=";
};
patches = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 7b9fb8bf6989..eea28916220c 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts";
- version = "6.5.0";
+ version = "6.5.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-Q/vvXKyeedn5o7HnL9F5ixSjJS3OWrvvHbzvx2fW2qY=";
+ sha256 = "sha256-7eKbOf5lD2zwmZc0k9PWGwnqaqXmwgJPmij0WtMT7Qk=";
};
patches = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index f5941f20bfa8..f79a8d82cf60 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
- version = "6.3.0";
+ version = "6.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-xaMoemI87uSlTN6qkxMiC26mdoU7nHTTCRnJgjQFtF4=";
+ sha256 = "sha256-lyqALaPbkAI6MITF353PNVLJT8eGIk8QURR+1mUmrv0=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index 8fbd903002b6..85fa5538a41e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-printers";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-NY52surcvhUtyP+T4RMZ0cd+H7fSwo1V0qEGY//oXGs=";
+ sha256 = "sha256-RJYyCKTcTiHNhwZBrgyMacoKREg5+sfZ0oB4H+lL76Y=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 2a480bb9e257..32f572f55d52 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -2,7 +2,6 @@
, stdenv
, fetchFromGitHub
, nix-update-script
-, fetchpatch
, meson
, ninja
, pkg-config
@@ -15,24 +14,15 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sharing";
- version = "2.1.5";
+ version = "2.1.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "00lqrxq1wz3y2s9jiz8rh9d571va2vza2gdwj6c86z3q4c4hmn17";
+ sha256 = "sha256-izo30JjPkZtR6A/bfvZNmIE4Hq5hofWmxdUwBJYoSm8=";
};
- patches = [
- # Upstream code not respecting our localedir
- # https://github.com/elementary/switchboard-plug-sharing/pull/55
- (fetchpatch {
- url = "https://github.com/elementary/switchboard-plug-sharing/commit/5219839738b79e3c5f039a811d96a40eb2644eab.patch";
- sha256 = "020w746q7gzmic0pdnbxs792sx15wlsqaf2x770r5xwbyfmqr7bs";
- })
- ];
-
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index a68fa7268727..246feae7323a 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
- version = "7.0.0";
+ version = "7.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "onboarding";
rev = version;
- sha256 = "sha256-bxOy9VivpgL4xXJhDF7K/gpq9zcCFIJFfRpG7QC8svE=";
+ sha256 = "sha256-qfkrjIct+Dcf2nep7ixgjC7ILz+gZt4SHGfb1hywwcY=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index 005ae0a461b3..2d4309c0177c 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -11,18 +11,19 @@
, libgee
, desktop-file-utils
, geoclue2
+, granite
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "pantheon-agent-geoclue2";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0hx3sky0vd2vshkscy3w5x3s18gd45cfqh510xhbmvc0sa32q9gd";
+ sha256 = "sha256-DvE0/bR4mVfqCw/c/1h75M8DfCiNPZ2h6Jl6ySk1qxs=";
};
nativeBuildInputs = [
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [
geoclue2
+ granite
gtk3
libgee
];
diff --git a/pkgs/development/compilers/ocaml/5.0.nix b/pkgs/development/compilers/ocaml/5.0.nix
new file mode 100644
index 000000000000..a36b3e31a427
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/5.0.nix
@@ -0,0 +1,9 @@
+import ./generic.nix {
+ major_version = "5";
+ minor_version = "0";
+ patch_version = "0-beta1";
+ src = fetchTarball {
+ url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~beta1.tar.xz";
+ sha256 = "sha256:1kwb53ra5qbwiiyrx5da7l5mqkjf0fr3rqgkrm3wr83l25scimj4";
+ };
+}
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 2c6045c13a62..7db0eca0ee4d 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -73,6 +73,7 @@ stdenv.mkDerivation (args // {
configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ];
# x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"
+ ++ lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow"
++ lib.optionals (args ? hardeningDisable) args.hardeningDisable;
# Older versions have some race:
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index f21eb9b2643c..c222517384ce 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
- version = "1.0.1";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dQ5RAeJYEfU/WcHf9Xz1jjetlEePB1oHDAbKpzqkda4=";
+ sha256 = "sha256-ffmdm+L4QL4NHQp58TgHYC0sGIbCIi4Q9AleG0tSt0s=";
fetchSubmodules = true;
};
- cargoSha256 = "sha256-0xEMlt1d6E+APf6SQ23E+mS/U4f0ziRpn2tTF9nSbx4=";
+ cargoSha256 = "sha256-BkH9gPo61s4m36hjAFU8ZLmtje787mBswF7zUMwEc70=";
cargoBuildFlags = [
"--package wasmtime-cli"
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 76fe58224839..3b6e5f2498d5 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cgal";
- version = "5.5";
+ version = "5.5.1";
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
- sha256 = "sha256-C576lYTQd6mgJPBqFRN3Ty6WYeXcXlDZ5sRtDwOuKSo=";
+ sha256 = "sha256-ISmuxvCLb2ueG3FeBzJ7R+LievfXefG3ZQbyAboIv+A=";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index 00031e66bf50..37eaed3ac650 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -9,23 +9,41 @@
, zlib
, libpng
, boost
-, guile
+, guile_3_0
, stdenv
}:
mkDerivation {
pname = "libfive-unstable";
- version = "2020-02-15";
+ version = "2022-05-19";
src = fetchFromGitHub {
owner = "libfive";
repo = "libfive";
- rev = "5b7717a25064478cd6bdb190683566eaf4c7afdd";
- sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg";
+ rev = "d83cc22709ff1f7c478be07ff2419e30e024834e";
+ sha256 = "lNJg2LCpFcTewSA00s7omUtzhVxycAXvo6wEM/JjrN0=";
};
nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ];
- buildInputs = [ eigen zlib libpng boost guile ];
+ buildInputs = [ eigen zlib libpng boost guile_3_0 ];
+
+ preConfigure = ''
+ substituteInPlace studio/src/guile/interpreter.cpp \
+ --replace "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile\");" \
+ "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile:$out/lib/guile/3.0/ccache\");"
+
+ substituteInPlace libfive/bind/guile/CMakeLists.txt \
+ --replace "LIBFIVE_FRAMEWORK_DIR=$<TARGET_FILE_DIR:libfive>" \
+ "LIBFIVE_FRAMEWORK_DIR=$out/lib" \
+ --replace "LIBFIVE_STDLIB_DIR=$<TARGET_FILE_DIR:libfive-stdlib>" \
+ "LIBFIVE_STDLIB_DIR=$out/lib"
+
+ export XDG_CACHE_HOME=$(mktemp -d)/.cache
+ '';
+
+ cmakeFlags = [
+ "-DGUILE_CCACHE_DIR=${placeholder "out"}/lib/guile/3.0/ccache"
+ ];
postInstall = if stdenv.isDarwin then ''
# No rules to install the mac app, so do it manually.
@@ -47,6 +65,5 @@ mkDerivation {
maintainers = with maintainers; [ hodapp kovirobi ];
license = with licenses; [ mpl20 gpl2Plus ];
platforms = with platforms; linux ++ darwin;
- broken = true;
};
}
diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix
index 83f84d4d4fd3..a4b096cee39b 100644
--- a/pkgs/development/libraries/sentry-native/default.nix
+++ b/pkgs/development/libraries/sentry-native/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sentry-native";
- version = "0.5.0";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-native";
rev = version;
- sha256 = "sha256-whbzoKIYLwj4yoFaT3frghJd/WzfpolSAuZzQRtnP5E=";
+ sha256 = "sha256-zSu6jcls1PtoSZNp6VGnXrXS5ViiY6ZghPYWaVwPVtw=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix
index 99660c98e0a2..1908ca088757 100644
--- a/pkgs/development/misc/brev-cli/default.nix
+++ b/pkgs/development/misc/brev-cli/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "brev-cli";
- version = "0.6.119";
+ version = "0.6.128";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-IYFVju7OcCxdFJKWK6TiXPt4p16oiTuBi51gfpi9tAE=";
+ sha256 = "sha256-/B7sb7uheMomdppnpCCzmDP8WpXFpjXYNwLByN5Jtrw=";
};
- vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw=";
+ vendorSha256 = "sha256-cNwfK1LpguRfM/ORebU6v+JLIxDJdT5y+zM3KmEamEw=";
CGO_ENABLED = 0;
subPackages = [ "." ];
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
index 910616601245..41cf9fd32290 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
@@ -59,6 +59,6 @@ buildDunePackage rec {
description = "Jsonrpc protocol implementation in OCaml";
license = licenses.isc;
platforms = platforms.unix;
- maintainers = with maintainers; [ symphorien marsam ];
+ maintainers = with maintainers; [ marsam ];
};
}
diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix
index 70c509ec22ce..7602d7024524 100644
--- a/pkgs/development/ocaml-modules/pp/default.nix
+++ b/pkgs/development/ocaml-modules/pp/default.nix
@@ -23,6 +23,6 @@ buildDunePackage rec {
description = "A an alternative pretty printing library to the Format module of the OCaml standard library";
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with maintainers; [ symphorien ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index ee4ced91c6a9..6b0ebf926846 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "censys";
- version = "2.1.8";
+ version = "2.1.9";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "censys";
repo = "censys-python";
- rev = "v${version}";
- hash = "sha256-iPCFflibEqA286j+7Vp4ZQaO9e6Bp+o7A/a7DELJcxA=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-BB/pLpPK2qh5902bZp9QM3Wiu/l48pzq7HcjaAtM4D0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
index e41d6ed51dab..8e26e9c6e4ef 100644
--- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "djangorestframework-simplejwt";
- version = "5.2.1";
+ version = "5.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "djangorestframework_simplejwt";
inherit version;
- hash = "sha256-dhOHTDIqP24zDMEY+fAKPblX/qf4477YG6RRhTzR29U=";
+ hash = "sha256-0n1LysLGOU9njeqLTQ1RHG4Yp/Lriq7rin3mAa63fEI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix
index 46d5ee725c75..641956f10be6 100644
--- a/pkgs/development/python-modules/enamlx/default.nix
+++ b/pkgs/development/python-modules/enamlx/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "enamlx";
- version = "0.6.0";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "frmdstryr";
repo = pname;
- rev = "v${version}";
- sha256 = "10sn7wd4fjz8nkzprd8wa5da5dg8w91r0rngqaipwnpq1dz54b5s";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-LHqOZ1uLWFbUeQAGKoMH9GljhRq1K4RTVWzgV/pt3g8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix
index 19a931c2bf48..ec80ad6ba230 100644
--- a/pkgs/development/python-modules/garminconnect/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "garminconnect";
- version = "0.1.45";
+ version = "0.1.48";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "cyberjunky";
repo = "python-garminconnect";
rev = "refs/tags/${version}";
- hash = "sha256-8ORot3ZEh+1cAV/Ec63ghBQFt4LyaH+rRsgzYA6wEdI=";
+ hash = "sha256-3HcwIcuZvHZS7eEIIw2wfley/Tdwt8S9HarrJMVYVVw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 67bc42c03cf3..a98d3354ef2f 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
- version = "1.3.40";
+ version = "1.3.42";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
- hash = "sha256-ft29c9I13gwduigIPERQQWJmQZs/j/e4leA66DbmEOQ=";
+ hash = "sha256-yQjUepoKHYsQg49hY3ABtRGBxAppqm/DODnCM4tBH5A=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index c196ef3f7b6b..cc5abbdd3d2f 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -32,14 +32,14 @@
buildPythonPackage rec {
pname = "mlflow";
- version = "1.29.0";
+ version = "1.30.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-+tUYYA9RW8gcv3cFPVBrdpRBIpEFtqS/hXX+qmOgDak=";
+ hash = "sha256-Ln1R9uLcbMIxbnLc9BNSF8WByPTx+d3hBmqrqeCyLHo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index b6c539150ccd..3f8883b47989 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "openai";
- version = "0.23.1";
+ version = "0.24.0";
format = "setuptools";
disabled = pythonOlder "3.7.1";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
rev = "v${version}";
- hash = "sha256-4RdER6ecvHGXTLZ1GnBNI1hIETI8O/t+kuOXiQhMigs=";
+ hash = "sha256-0bXJoEq8FHRNaFMjncIwDbJROtFz/IJ4gD+LfvmtFUg=";
};
propagatedBuildInputs = [
@@ -72,7 +72,9 @@ buildPythonPackage rec {
disabledTestPaths = [
# Requires a real API key
"openai/tests/test_endpoints.py"
+ # openai: command not found
"openai/tests/test_file_cli.py"
+ "openai/tests/test_long_examples_validator.py"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix
index a719f98e9d1d..9719b918b6eb 100644
--- a/pkgs/development/python-modules/pandas-stubs/default.nix
+++ b/pkgs/development/python-modules/pandas-stubs/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchFromGitHub
, jinja2
@@ -101,6 +102,8 @@ buildPythonPackage rec {
"test_dummies"
"test_from_dummies_args"
"test_rolling_step_method"
+ ] ++ lib.optionals stdenv.isDarwin [
+ "test_plotting" # Fatal Python error: Illegal instruction
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index dccf14a2d4cd..8d361ccb6ec8 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -22,7 +22,7 @@ let
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
in buildPythonPackage rec {
pname = "pyopencl";
- version = "2022.2.3";
+ version = "2022.2.4";
checkInputs = [ pytest ];
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
@@ -40,7 +40,7 @@ in buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-IdpfCKq7wrL9yBRm/6rAfB25Sx9HqVvFf2M7VVkMy6I=";
+ sha256 = "sha256-tXye+L2ObbB+iRBvMJG6I2sk+Vo4/UDfsX0u1/9r5K0=";
};
# py.test is not needed during runtime, so remove it from `install_requires`
diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix
index 4992d260471c..c6197fcd7448 100644
--- a/pkgs/development/python-modules/pyreadstat/default.nix
+++ b/pkgs/development/python-modules/pyreadstat/default.nix
@@ -1,7 +1,9 @@
{ lib
+, stdenv
, buildPythonPackage
, cython
, fetchFromGitHub
+, libiconv
, pandas
, python
, pythonOlder
@@ -29,6 +31,8 @@ buildPythonPackage rec {
buildInputs = [
zlib
+ ] ++ lib.optionals stdenv.isDarwin [
+ libiconv
];
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix
index dff19589dcc4..beb72d887826 100644
--- a/pkgs/development/python-modules/roombapy/default.nix
+++ b/pkgs/development/python-modules/roombapy/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
description = "Python program and library to control Wi-Fi enabled iRobot Roombas";
homepage = "https://github.com/pschmitt/roombapy";
license = licenses.mit;
- maintainers = with maintainers; [ justinas ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix
new file mode 100644
index 000000000000..9747218157a5
--- /dev/null
+++ b/pkgs/development/python-modules/skrl/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+, gym
+, torch
+, tensorboard
+, tqdm
+, packaging
+}:
+
+buildPythonPackage rec {
+ pname = "skrl";
+ version = "0.8.0";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "Toni-SM";
+ repo = pname;
+ rev = version;
+ hash = "sha256-NfKgQyD7PkPOTnkIua3fOfH7tHNGQEOVZ2HtvIg5HzA=";
+ };
+
+ propagatedBuildInputs = [
+ gym
+ torch
+ tensorboard
+ tqdm
+ packaging
+ ];
+
+ checkInputs = [ pytestCheckHook ];
+ doCheck = torch.cudaSupport;
+
+ pythonImportsCheck = [
+ "skrl"
+ "skrl.agents"
+ "skrl.agents.torch"
+ "skrl.envs"
+ "skrl.envs.torch"
+ "skrl.models"
+ "skrl.models.torch"
+ "skrl.resources"
+ "skrl.resources.noises"
+ "skrl.resources.noises.torch"
+ "skrl.resources.schedulers"
+ "skrl.resources.schedulers.torch"
+ "skrl.trainers"
+ "skrl.trainers.torch"
+ "skrl.utils"
+ "skrl.utils.model_instantiators"
+ ];
+
+ meta = with lib; {
+ description = "Reinforcement learning library using PyTorch focusing on readability and simplicity";
+ homepage = "https://skrl.readthedocs.io";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bcdarwin ];
+ };
+}
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 3e66d95af993..0acebc45bd6c 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "transformers";
- version = "4.22.2";
+ version = "4.23.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-7TM06YS/8U1Y7qtrraV+Iw+ASIWUAFi/lcfFGp1nEJ0=";
+ hash = "sha256-Ziye3lop91VICMVEC42ulE7CU6PfHot8Ij8YZxIS3J0=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile
index 6dbc6c662e0d..0a09bba986d7 100644
--- a/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/pkgs/development/ruby-modules/with-packages/Gemfile
@@ -144,6 +144,8 @@ gem 'thrift'
gem 'tilt'
gem 'tiny_tds'
gem 'treetop'
+gem 'tty-command'
+gem 'tty-option'
gem 'typhoeus'
gem 'tzinfo'
gem 'unf_ext'
diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
index 34cd4c5d618a..b03d4f3b3aa1 100644
--- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "cirrus-cli";
- version = "0.87.2";
+ version = "0.88.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xw9eqaToasONmkld2EeiykuuVaMG77eGIsx6YDmXKKM=";
+ sha256 = "sha256-FlkDequdr8dOgbk4fFlLnBSPWvOWz0tTmPJTlXxV6fg=";
};
vendorSha256 = "sha256-HX4seTtO5DWeR1PqXnYKIKq1/wP6/ppTclDpkQSzgbM=";
diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix
index 569ba12d4923..fff37d7f2b87 100644
--- a/pkgs/development/tools/ctlptl/default.nix
+++ b/pkgs/development/tools/ctlptl/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "ctlptl";
@@ -13,12 +13,21 @@ buildGoModule rec {
vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s=";
+ nativeBuildInputs = [ installShellFiles ];
+
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
];
+ postInstall = ''
+ installShellCompletion --cmd ctlptl \
+ --bash <($out/bin/ctlptl completion bash) \
+ --fish <($out/bin/ctlptl completion fish) \
+ --zsh <($out/bin/ctlptl completion zsh)
+ '';
+
meta = with lib; {
description = "CLI for declaratively setting up local Kubernetes clusters";
homepage = "https://github.com/tilt-dev/ctlptl";
diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix
index a4d5910abc32..5054bc511ddd 100644
--- a/pkgs/development/tools/database/clickhouse-backup/default.nix
+++ b/pkgs/development/tools/database/clickhouse-backup/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "clickhouse-backup";
- version = "2.0.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "AlexAkulov";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-PIn90tz/FnUr4MGKZfLcP0hmF3eqKGB+1gKwfgtk/70=";
+ sha256 = "sha256-P1jJQtXxTiobYQJDxPqUImSEf5aR9/hIr/Og0fYa3Vc=";
};
- vendorSha256 = "sha256-aPVzXZ7wjVtxjJXhbDlvBhdzoYsvii6OKUaQryrjaNc=";
+ vendorSha256 = "sha256-kbIztD0g+92gxxBYhWILudgFRFCshagmAUs8bY/Z8yg=";
ldflags = [
"-X main.version=${version}"
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 5bc60c24094f..26d9fb6403ab 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
- version = "1.84.0";
+ version = "1.84.1";
vendorSha256 = null;
@@ -31,7 +31,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
- sha256 = "sha256-ZUvW20PGPO4Ril22VDvvHxYbzuhSTXfRqv2lzOqk9pA=";
+ sha256 = "sha256-F1vavqdBeKVWKWQTrgqT6NIGduAcFc42rl0rG8SEdLs=";
};
meta = with lib; {
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index f0ab9d147a46..89f178e4bb91 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.4.0";
+ version = "9.5.1";
src = fetchurl {
url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
- sha256 = "sha256-hly2yjewKYx11kVfv1DX7Bfi5wFnmegP4rVKtEbkxYQ=";
+ sha256 = "sha256-ieGRP9SGI8w42f3BNcO5mv/DB3E4Hzxe0q1P5EaBxK8=";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix
index bba0cab5a7ac..cbb8b38d80d7 100644
--- a/pkgs/development/tools/konstraint/default.nix
+++ b/pkgs/development/tools/konstraint/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "konstraint";
- version = "0.23.0";
+ version = "0.24.0";
src = fetchFromGitHub {
owner = "plexsystems";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-gnekNEROOpyDDJpV2ZS9+g7oHVUcQKEHj7yPL+8V51s=";
+ sha256 = "sha256-mNritx2YY6x5lwnOWrraHzddRZqEySDOWGOqdmqUyIs=";
};
- vendorSha256 = "sha256-D1QS97yUhCH2BI/HDxNaREf/XI6/iVF9lZRnWQY5so8=";
+ vendorSha256 = "sha256-pqGayeo4JkleZaoZfZW6agbMrK+57tYriKCWXGveoUs=";
# Exclude go within .github folder
excludedPackages = ".github";
diff --git a/pkgs/development/tools/rust/cargo-pgx/default.nix b/pkgs/development/tools/rust/cargo-pgx/default.nix
index e4ff582964fa..5d4e6851f6f8 100644
--- a/pkgs/development/tools/rust/cargo-pgx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgx/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-pgx";
- version = "0.5.0";
+ version = "0.5.3";
src = fetchCrate {
inherit version pname;
- sha256 = "sha256-5UH34l4zmKFZY2uHLDqJ1kW/QRQbII0/zmmGA3DFKB4=";
+ sha256 = "sha256-Glc6MViZeQzfZ+pOcbcJzL5hHEXSoqfksGwVZxOJ6G0=";
};
- cargoSha256 = "sha256-1CU/VrNS3tGycjel5MV6SrZJ7LExds2YhdO+VAHgusM=";
+ cargoSha256 = "sha256-Ag9lj3uR4Cijfcr+NFdCFb9K84b8QhGamLECzVpcN0U=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/spicy/default.nix b/pkgs/development/tools/spicy/default.nix
index 691a105941a9..65385d7fe139 100644
--- a/pkgs/development/tools/spicy/default.nix
+++ b/pkgs/development/tools/spicy/default.nix
@@ -1,19 +1,19 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "spicy";
- version = "unstable-2020-02-21";
-
- goPackagePath = "github.com/trhodeos/spicy";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "trhodeos";
repo = "spicy";
- rev = "47409fb73e0b20b323c46cc06a3858d0a252a817";
- sha256 = "022r8klmr21vaz5qd72ndrzj7pyqpfxc3jljz7nzsa50fjf82c3a";
+ rev = "v${version}";
+ sha256 = "sha256-TodMm4UbnLB+LiyfPVXT7bcVLbyBFbGoOYQSsz3IMfM=";
};
- goDeps = ./deps.nix;
+ vendorSha256 = "sha256-uy33vfsvyLCep1aN8qO0BMmpPylhzTLhosjjD5ghmHE=";
+
+ ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A Nintendo 64 segment assembler";
@@ -23,6 +23,6 @@ buildGoPackage rec {
'';
homepage = "https://github.com/trhodeos/spicy";
license = licenses.mit;
- maintainers = [ maintainers._414owen];
+ maintainers = with maintainers; [ _414owen ];
};
}
diff --git a/pkgs/development/tools/spicy/deps.nix b/pkgs/development/tools/spicy/deps.nix
deleted file mode 100644
index 9532b01decb4..000000000000
--- a/pkgs/development/tools/spicy/deps.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-[
- {
- goPackagePath = "github.com/alecthomas/participle";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/participle.git";
- rev = "fed0e8fbb638b11091014aa838748210dc9ff576";
- sha256 = "0yhhm42lis8ak9m6x6aai280xq0652vcq5v17pibbf74dalxyims";
- };
- }
- {
- goPackagePath = "github.com/sirupsen/logrus";
- fetch = {
- type = "git";
- url = "https://github.com/sirupsen/logrus.git";
- rev = "f104497f2b2129ab888fd274891f3a278756bcde";
- sha256 = "0gr2c7s3ffdaynzn1zplp79zz16qgqpnsq2z9zg79wxksq5mz5l1";
- };
- }
- {
- goPackagePath = "github.com/ogier/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/ogier/pflag.git";
- rev = "73e519546fc0bce0c395610afcf6aa4e5aec88eb";
- sha256 = "114zpgl6l47gsz0sifpq62hi2i6k0ra9hi8wx7d39giablf9i4ii";
- };
- }
- {
- goPackagePath = "github.com/trhodeos/n64rom";
- fetch = {
- type = "git";
- url = "https://github.com/trhodeos/n64rom.git";
- rev = "504dba7b4d4675bd3396c052d64016c5725c2f5e";
- sha256 = "01hybm8nxh1lym0wc9sxrms3wyqhhs0dm1a2nwz6xc60lkjcp8kb";
- };
- }
- {
- goPackagePath = "github.com/trhodeos/ecoff";
- fetch = {
- type = "git";
- url = "https://github.com/trhodeos/ecoff.git";
- rev = "e54570a0fac23c0fa7f605681345611f345ce0f6";
- sha256 = "0pc0yj7hy43m00br0q0f1y5a3bc3a134imcyy2jvzim45g6g12kj";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://github.com/golang/sys";
- rev = "9a76102bfb4322425a1228caa377974426e82c84";
- sha256 = "07qn19yla2w604p3dc8h1c75xj2pxc4fajvg0mf0d4c72d5qiss4";
- };
- }
-]
diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix
index 7eae819a9736..979780e3ca70 100644
--- a/pkgs/os-specific/darwin/utm/default.nix
+++ b/pkgs/os-specific/darwin/utm/default.nix
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "utm";
- version = "3.2.4";
+ version = "4.0.8";
src = fetchurl {
url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
- sha256 = "sha256-ejUfL6UHqMusVfaglGlODKtFfKbNwzZ1LmRkcSzieso=";
+ sha256 = "sha256-a6GQyiW8pqw6fN3WVuTVUfnsl/qPtmzDxUvWNElli5k=";
};
nativeBuildInputs = [ undmg ];
@@ -41,12 +41,14 @@ stdenvNoCC.mkDerivation rec {
- Hardware accelerated virtualization using Hypervisor.framework and
QEMU
- Boot macOS guests with Virtualization.framework on macOS 12+
+
+ See https://docs.getutm.app/ for more information.
'';
homepage = "https://mac.getutm.app/";
changelog = "https://github.com/utmapp/${pname}/releases/tag/v${version}";
mainProgram = "UTM";
license = licenses.apsl20;
- platforms = platforms.darwin;
+ platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4.
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ rrbutani ];
};
diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix
index 4a499e7f878c..e2dd5cc928be 100644
--- a/pkgs/servers/demoit/default.nix
+++ b/pkgs/servers/demoit/default.nix
@@ -5,13 +5,13 @@
buildGoModule {
pname = "demoit";
- version = "unstable-2020-06-11";
+ version = "unstable-2022-09-03";
src = fetchFromGitHub {
owner = "dgageot";
repo = "demoit";
- rev = "5762b169e7f2fc18913874bf52323ffbb906ce84";
- sha256 = "1jcjqr758d29h3y9ajvzhy1xmxfix5mwhylz6jwhy5nmk28bjzx9";
+ rev = "258780987922e46abde8e848247af0a9435e3099";
+ sha256 = "sha256-yRfdnqk93GOTBa0zZrm4K3AkUqxGmlrwlKYcD6CtgRg=";
};
vendorSha256 = null;
subPackages = [ "." ];
diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix
index e28f2372db3d..b9cecd3b3492 100644
--- a/pkgs/servers/krill/default.nix
+++ b/pkgs/servers/krill/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "krill";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
- hash = "sha256-gObwFPpBYhg9Hp+0/gRugZXktw5ob4T6w0uwbHQO7hU=";
+ hash = "sha256-0b8db5WYYHean+Ra2KNrLJcv5p7ofClX7So9qwhz6WQ=";
};
- cargoSha256 = "sha256-xWjx4ngCrsKMQ8PYW2ibXBZZYWLKIXVIAl9p3mKlpwo=";
+ cargoSha256 = "sha256-Ju71IyID6ZcKpU1RGJtwj4niORsnUaRfDfJArptjCF4=";
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkg-config ];
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
Authorisations (ROAs) on your own servers or with a third party.
'';
homepage = "https://github.com/NLnetLabs/krill";
- changelog = "https://github.com/NLnetLabs/krill/blob/v${version}/Changelog.md";
+ changelog = "https://github.com/NLnetLabs/krill/releases/tag/v${version}";
license = licenses.mpl20;
maintainers = with maintainers; [ steamwalker ];
};
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index ecb2108858e4..e6634d031234 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tailscale";
- version = "1.32.0";
+ version = "1.32.1";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- sha256 = "sha256-+pJ7YwJKtlB/UmuvKT4zoWRn1ZBAf75/GcscPbFuA8c=";
+ sha256 = "sha256-gy8C/JA/KoFtPBHZMwNW0EuW8M/+bTIxUcA/Et+P7zs=";
};
vendorSha256 = "sha256-VW6FvbgLcokVGunTCHUXKuH5+O6T55hGIP2g5kFfBsE=";
diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json
index 6cf2c6ee03de..7e71d225f85e 100644
--- a/pkgs/servers/web-apps/wordpress/packages/languages.json
+++ b/pkgs/servers/web-apps/wordpress/packages/languages.json
@@ -1,14 +1,14 @@
{
"de_DE": {
"path": "de_DE",
- "rev": "963451",
- "sha256": "0zp1sz9f5vwz3ywj746la799nlaqxigja34qb83qqrsgkgaliff2",
+ "rev": "970135",
+ "sha256": "1kd05aihdcf8bqrci50wg4i61mqrjhd6z5d5yb05p4ivaiirak6x",
"version": "5.8"
},
"fr_FR": {
"path": "fr_FR",
- "rev": "967096",
- "sha256": "0r40kkmm7an6zdqszqcgr07ffkfif5c9446fjxba20vslhgkj9mg",
+ "rev": "968330",
+ "sha256": "12mzr1i2dl1hh7p93zda6af0xi49mw31v79gg0qgqsnhd5adrlgm",
"version": "5.8"
}
}
diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json
index 7edc6bee73fb..b3cde04eb138 100644
--- a/pkgs/servers/web-apps/wordpress/packages/plugins.json
+++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json
@@ -18,10 +18,10 @@
"version": "2.21.08.31"
},
"breeze": {
- "path": "breeze/tags/2.0.9",
- "rev": "2786857",
- "sha256": "0nn3kalwb50kyd563jiixc134hiygkbzs8zkxgsbgmsi511vfzkz",
- "version": "2.0.9"
+ "path": "breeze/tags/2.0.10",
+ "rev": "2799885",
+ "sha256": "00d36s6ws8bd8qj33nq090lplw2fqj9zz1yzfky4w74lyabih0hw",
+ "version": "2.0.10"
},
"co-authors-plus": {
"path": "co-authors-plus/tags/3.5.2",
@@ -72,10 +72,10 @@
"version": "5.0.18"
},
"mailpoet": {
- "path": "mailpoet/tags/3.100.2",
- "rev": "2797181",
- "sha256": "04vxwxdvpp80hh381xb88g81i9ps1imvvax5nljjx7nywwc5p9ci",
- "version": "3.100.2"
+ "path": "mailpoet/tags/3.101.0",
+ "rev": "2800580",
+ "sha256": "050ip4vd514nlfw69ax9x8acszlcsqzd7zw5bdvy1xk3dlva6fkb",
+ "version": "3.101.0"
},
"opengraph": {
"path": "opengraph/tags/1.11.0",
@@ -101,6 +101,12 @@
"sha256": "1flggxd6hw0ps3b0y32a2aj9g3zfpzbaiwzx1zn2s7zpxn508y1b",
"version": "5.3.1"
},
+ "wordpress-seo": {
+ "path": "wordpress-seo/tags/19.8",
+ "rev": "2796969",
+ "sha256": "0vnj7b37s9rra2m957baz8ki4z6x6acl76wgx8yj2063823q0pl2",
+ "version": "19.8"
+ },
"worker": {
"path": "worker/tags/4.9.14",
"rev": "2739771",
diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json
index c9b47701c11e..85d92ba57d52 100644
--- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json
+++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json
@@ -16,6 +16,7 @@
, "simple-login-captcha"
, "static-mail-sender-configurator"
, "webp-converter-for-media"
+, "wordpress-seo"
, "worker"
, "wp-mail-smtp"
, "wp-gdpr-compliance"
diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix
index 4cb50a0b422d..b1d7acafe359 100644
--- a/pkgs/tools/filesystems/httm/default.nix
+++ b/pkgs/tools/filesystems/httm/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
- version = "0.15.2";
+ version = "0.15.8";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = pname;
rev = version;
- sha256 = "sha256-VCKdGFOjVIrXMIuv0yA7SZU2tYvT7WNYCXKY3Mo4nus=";
+ sha256 = "sha256-CXQjQ+6COHDDYmThpIXIqW+LDsiysdpnyo4TvcsGHpU=";
};
- cargoSha256 = "sha256-wY5ouCel624nlG9OysqHgoWhJ1FHUjF4B6vFfOfCxgk=";
+ cargoSha256 = "sha256-sfxoa3quMPaHc4pPInf1wnIwkWirnuGyCA76Ta7HDMU=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/networking/dnstake/default.nix b/pkgs/tools/networking/dnstake/default.nix
index e1719d19ecfb..b0aab0d6d5b9 100644
--- a/pkgs/tools/networking/dnstake/default.nix
+++ b/pkgs/tools/networking/dnstake/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildGoModule
, fetchFromGitHub
+, fetchpatch
}:
buildGoModule rec {
@@ -14,7 +15,16 @@ buildGoModule rec {
sha256 = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM=";
};
- vendorSha256 = "sha256-l3IKvcO10C+PVDX962tFWny7eMNC48ATIVqiHjpVH/Y=";
+ patches = [
+ # https://github.com/pwnesia/dnstake/pull/36
+ (fetchpatch {
+ name = "update-x-sys-fix-darwin.patch";
+ url = "https://github.com/pwnesia/dnstake/commit/974efbbff4ce26d2f2646ca2ceb1316c131cefbe.patch";
+ sha256 = "sha256-fLOGF8damdLROd8T0fH/FGSVX23dtc+yHhSvVCwVeuY=";
+ })
+ ];
+
+ vendorSha256 = "sha256-lV6dUl+OMUQfhlgNL38k0Re1Mr3VP9b8SI3vTJ8CP18=";
meta = with lib; {
description = "Tool to check missing hosted DNS zones";
diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/tools/networking/sish/default.nix
index 6a7602845d8b..748d6033323e 100644
--- a/pkgs/tools/networking/sish/default.nix
+++ b/pkgs/tools/networking/sish/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "sish";
- version = "2.7.0";
+ version = "2.8.0";
src = fetchFromGitHub {
owner = "antoniomika";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-TiS28bqwcTbKKAj1trTOEs2a4FGADrkutIU3DkaTcjE=";
+ sha256 = "sha256-IWVBIuqqtySfHhe78YKZ3HfZdcmNiVklSCuYg8XjG6I=";
};
vendorSha256 = "sha256-Cky4ggZoNbIZK7w4tL00XqqyDDe0fmYk/+xZvtG/Nmg=";
diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix
index 6c21ff1490e0..68b361cca270 100644
--- a/pkgs/tools/networking/tridactyl-native/default.nix
+++ b/pkgs/tools/networking/tridactyl-native/default.nix
@@ -2,13 +2,13 @@
nimPackages.buildNimPackage rec {
pname = "tridactly-native";
- version = "0.3.6";
+ version = "0.3.7";
src = fetchFromGitHub {
owner = "tridactyl";
repo = "native_messenger";
- rev = "5cc315da79a1caa8fd5b27b192377d8824a311c1";
- sha256 = "sha256-9IyVDJgdZleeNltD1b4PfqxeWAtFsPHtmq1ZC5Z0O9k=";
+ rev = "62f19dba573b924703829847feb1bfee68885514";
+ sha256 = "sha256-YGDVcfFcI9cRCCZ4BrO5xTuI9mrGq1lfbEITB7o3vQQ=";
};
buildInputs = with nimPackages; [ tempfile ];
diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix
index 6cfd46954e32..fc1b583ccc7f 100644
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
- version = "1.13.0";
+ version = "1.13.1";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EZHT6Ut7fI9Sx7U664r4ZvzZCH1hu9acnGvUyn8XgSw=";
+ sha256 = "sha256-R7MhfAnVJJ2NK8zV408xAk8Q6aWn9Gw6DOmFFX26x1Q=";
};
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@@ -16,7 +16,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config installShellFiles ];
- vendorSha256 = "sha256-9XRORuHx4bZn9odMD+prg/dPBkUmVqBNQYjQGCQVqiw=";
+ vendorSha256 = "sha256-DpPEDttQnRGHVNiIpMGj14KvZEGR0Y80sZOffjQ3UHk=";
subPackages = [
"cmd/cosign"
diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix
index 3e7197f543d2..23bc1d216f35 100644
--- a/pkgs/tools/security/ghidra/build.nix
+++ b/pkgs/tools/security/ghidra/build.nix
@@ -84,7 +84,10 @@ HERE
nativeBuildInputs = [ gradle perl ] ++ lib.optional stdenv.isDarwin xcbuild;
buildPhase = ''
- export GRADLE_USER_HOME=$(mktemp -d)
+ export HOME="$NIX_BUILD_TOP/home"
+ mkdir -p "$HOME"
+ export JAVA_TOOL_OPTIONS="-Duser.home='$HOME'"
+ export GRADLE_USER_HOME="$HOME/.gradle"
# First, fetch the static dependencies.
gradle --no-daemon --info -Dorg.gradle.java.home=${openjdk11} -I gradle/support/fetchDependencies.gradle init
@@ -116,21 +119,10 @@ in stdenv.mkDerivation rec {
patches = [ ./0001-Use-protobuf-gradle-plugin.patch ];
postPatch = fixProtoc;
- buildPhase = (lib.optionalString stdenv.isDarwin ''
- export HOME=$(mktemp -d)
-
- # construct a dummy /etc/passwd file - something attempts to determine
- # the user's "real" home using this
- DUMMY_PASSWD=$(realpath ../dummy-passwd)
- cat > $DUMMY_PASSWD <<EOF
- $(whoami)::$(id -u):$(id -g)::$HOME:$SHELL
- EOF
-
- export NIX_REDIRECTS=/etc/passwd=$DUMMY_PASSWD
- export DYLD_INSERT_LIBRARIES=${libredirect}/lib/libredirect.dylib
- '') + ''
-
- export GRADLE_USER_HOME=$(mktemp -d)
+ buildPhase = ''
+ export HOME="$NIX_BUILD_TOP/home"
+ mkdir -p "$HOME"
+ export JAVA_TOOL_OPTIONS="-Duser.home='$HOME'"
ln -s ${deps}/dependencies dependencies
@@ -170,7 +162,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "A software reverse engineering (SRE) suite of tools developed by NSA's Research Directorate in support of the Cybersecurity mission";
homepage = "https://ghidra-sre.org/";
- platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # deps
diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix
index fcad20c651f2..9492475aadb5 100644
--- a/pkgs/tools/security/kube-bench/default.nix
+++ b/pkgs/tools/security/kube-bench/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "kube-bench";
- version = "0.6.9";
+ version = "0.6.10";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-bKgUnkfOWcX3/JdspEjNhFqS2dMlwEcVffIqNfS6FEU=";
+ sha256 = "sha256-0rhs5MZzf9E848FxYuZdXTarYG1BwnfS9HDz9iYR/vo=";
};
- vendorSha256 = "sha256-f/B9E9Ot9njop04PKh0XYG1DnWKBRsVi4XHQNmZeQho=";
+ vendorSha256 = "sha256-uaFEtWI5tdL0egaJPTKh7k66Kyjq+N8YDlUGJDtFRqY=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 7145ef5aeb66..9fcdfa5843f2 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfs";
- version = "2.6.1";
+ version = "2.6.2";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
- sha256 = "sha256-S0UQuG5xOQyVIqP203Rwa3FZTnsMuD6CiuiIc6nCKcM=";
+ sha256 = "sha256-m8Ga0aG+TjWFRo2O2f+NVvdDLGExsPuBGQx6r6mBMXk=";
};
buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl ];
diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix
index 7f77f5767c66..60e7df6372e2 100644
--- a/pkgs/tools/text/mark/default.nix
+++ b/pkgs/tools/text/mark/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mark";
- version = "8.3";
+ version = "8.4";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
- sha256 = "sha256-HU7kPzcRhptMGuqsrHOTT3yZ9ALQGBK/cYZ8KbIO0RU=";
+ sha256 = "sha256-b9oWuIdCVsbPJYaSDsvKI1rOvcH97aoeN748B89XxBQ=";
};
- vendorSha256 = "sha256-Q628lMGV/Ys8BC5zMq3xXgmj74NYHQmP0IrMU5gyyMw=";
+ vendorSha256 = "sha256-t2xiw1Z0BIT7pO4Z16XmsJE72RgL9Hobfy7LakpEYh4=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix
index f53a93fc71a9..32bce2d857e6 100644
--- a/pkgs/tools/virtualization/google-guest-agent/default.nix
+++ b/pkgs/tools/virtualization/google-guest-agent/default.nix
@@ -4,13 +4,13 @@
buildGoModule rec {
pname = "guest-agent";
- version = "20220927.00";
+ version = "20221018.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = pname;
rev = version;
- sha256 = "sha256-rARhBEfiJfDLDSFp6QUS1KqEHNhQKZO2yhgNdXl+Jzc=";
+ sha256 = "sha256-FIyMFf5ZwSo7qjCrRu5ZwA7I0eoozyglVXttaeBMhUY=";
};
vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41f8b1888cbb..159e33aac906 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10770,7 +10770,9 @@ with pkgs;
read-edid = callPackage ../os-specific/linux/read-edid { };
- readstat = callPackage ../applications/science/math/readstat { };
+ readstat = callPackage ../applications/science/math/readstat {
+ inherit (pkgs.darwin) libiconv;
+ };
redir = callPackage ../tools/networking/redir { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d8250fc8aa80..deb76032f6a2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1663,6 +1663,8 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_4_14 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { });
+ ocamlPackages_5_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.0.nix { });
+
ocamlPackages_latest = ocamlPackages_4_14;
ocamlPackages = ocamlPackages_4_14;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2651496753e..8a3f305f1672 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8485,7 +8485,9 @@ in {
pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { };
- pyreadstat = callPackage ../development/python-modules/pyreadstat { };
+ pyreadstat = callPackage ../development/python-modules/pyreadstat {
+ inherit (pkgs.darwin) libiconv;
+ };
pyrealsense2 = toPythonModule (pkgs.librealsense.override {
enablePython = true;
@@ -10325,6 +10327,8 @@ in {
skorch = callPackage ../development/python-modules/skorch { };
+ skrl = callPackage ../development/python-modules/skrl { };
+
skybellpy = callPackage ../development/python-modules/skybellpy { };
skyfield = callPackage ../development/python-modules/skyfield { };
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 6aaf5cdf3794..ec444cce32ff 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -2152,6 +2152,17 @@
};
version = "1.0.3";
};
+ pastel = {
+ dependencies = ["tty-color"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8";
+ type = "gem";
+ };
+ version = "0.8.0";
+ };
pathutil = {
dependencies = ["forwardable-extended"];
groups = ["default"];
@@ -3097,6 +3108,37 @@
};
version = "1.6.11";
};
+ tty-color = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
+ tty-command = {
+ dependencies = ["pastel"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14hi8xiahfrrnydw6g3i30lxvvz90wp4xsrlhx8mabckrcglfv0c";
+ type = "gem";
+ };
+ version = "0.10.1";
+ };
+ tty-option = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xibs7kgbsw401ywfw67wg47fmm7sdcypy85m25af9r2q2hbq7gb";
+ type = "gem";
+ };
+ version = "0.2.0";
+ };
typhoeus = {
dependencies = ["ethon"];
groups = ["default"];