diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index eb3ac6fe30f2..876323aaab3c 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -140,6 +140,7 @@ buildGoModule rec { checkFlags = [ # Skip time dependent/flaky test "-skip=TestSendStreamDataMessageWithStreamDataSequenceNumberMutexLocked" + "-skip=TestParallelAccessOfQueue" ]; postFixup = '' diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 9fd1bf8a475a..0ed495eada6d 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.69.0-55816"; + version = "1.70.0-56062"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-v9tZE0/Kv90yR1vrflPAZH6n25bdI5AHskUSHz91USU="; + hash = "sha256-x+QHlBsZGkmJm05VeZx43XFxpRJR1crLjEqNIQJwitQ="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 24967eb8eb23..217e963f04a3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,61 +12,61 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.10.229-hardened1.patch", - "sha256": "0bagy0x1kwm05x9mlgisjrlybk9yl91maxw6fai2si5m4xb3xv7n", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.229-hardened1/linux-hardened-v5.10.229-hardened1.patch" + "name": "linux-hardened-v5.10.230-hardened1.patch", + "sha256": "0z18m3q52kayrwgg0aaa46qvg4qnk31cwwdaxikl9sblq32020b2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.230-hardened1/linux-hardened-v5.10.230-hardened1.patch" }, - "sha256": "1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8", - "version": "5.10.229" + "sha256": "0isbb0ixqg4yzlh3lmdvnax4m1ikf2q4wk0b9vgqc63p7gpm066d", + "version": "5.10.230" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.15.171-hardened1.patch", - "sha256": "08fbvra05rj0xcj9a8hd6mhv4lis2mhp57v7x4mw7rxxz2vim4bz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.171-hardened1/linux-hardened-v5.15.171-hardened1.patch" + "name": "linux-hardened-v5.15.173-hardened1.patch", + "sha256": "16pi07p3xgiqhzfw4y2shq70xwyrngyjj8mnzsdkyp88nja5d721", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.173-hardened1/linux-hardened-v5.15.173-hardened1.patch" }, - "sha256": "0fra5zwcixgl6fg9hgdzlfcqng6pg09h2j7xqhi4qg0jv1jf0lr9", - "version": "5.15.171" + "sha256": "1a3x3ld6g7ny0hdfqfvj5j2i5sx5l5p236pdnsr0icn9ri3jljwa", + "version": "5.15.173" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.4.285-hardened1.patch", - "sha256": "1zm846mzvz1x88iskfw8513jkhlphxkd4v2qs86maxlgiz5zcxqp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.285-hardened1/linux-hardened-v5.4.285-hardened1.patch" + "name": "linux-hardened-v5.4.286-hardened1.patch", + "sha256": "0cqfqr5j7g6qq14r9mb5yzdfr71brvyb4xww9ir2sysa5i2qc2j6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.286-hardened1/linux-hardened-v5.4.286-hardened1.patch" }, - "sha256": "1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy", - "version": "5.4.285" + "sha256": "0z48n7vahg318bgkccy8xqgl87vfb8zmn995cqh7z38fvzrm81qq", + "version": "5.4.286" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.1.116-hardened1.patch", - "sha256": "0q597vszhgj6bgq56j11nq01mjjxl0ws8kqcr839fzkcgn1h6xv9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.116-hardened1/linux-hardened-v6.1.116-hardened1.patch" + "name": "linux-hardened-v6.1.118-hardened1.patch", + "sha256": "0jk1ndy7xw6x425v1q945gawyi44bygryq71jxpf33z99xyqbyid", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.118-hardened1/linux-hardened-v6.1.118-hardened1.patch" }, - "sha256": "109vhc1hcfx6sacw4553xmwbj1gqx3zqjq5zg11z7a72dqrnisqp", - "version": "6.1.116" + "sha256": "0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1", + "version": "6.1.118" }, "6.11": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.11.7-hardened1.patch", - "sha256": "1rfvlhgl78ixsb75aah9173h8jp37c8i0hs7b4484vljmqv0khcy", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.7-hardened1/linux-hardened-v6.11.7-hardened1.patch" + "name": "linux-hardened-v6.11.9-hardened1.patch", + "sha256": "1w3c7vni6pwlyav796fanj5cx5k3w7gsdpwihnniskyy9j1pvi4g", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.9-hardened1/linux-hardened-v6.11.9-hardened1.patch" }, - "sha256": "1cpbycx79nl517rz573mja52bgzm249mhqzp424r5mqp91jfrx8b", - "version": "6.11.7" + "sha256": "1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm", + "version": "6.11.9" }, "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.6.60-hardened1.patch", - "sha256": "090bs6nvc9by5higmxfwmzlqjrhbhqs21gsmpxvm18p9l3s08dq3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.60-hardened1/linux-hardened-v6.6.60-hardened1.patch" + "name": "linux-hardened-v6.6.62-hardened1.patch", + "sha256": "1rk6plakzwa4bsi0cibl1l3g13bzry65533wk2khbgsikqnyi9fq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.62-hardened1/linux-hardened-v6.6.62-hardened1.patch" }, - "sha256": "1vsjb7ifmf6ic6zv16fbrxjvffqc1mkndza76hjr9aw2a0ny7yaj", - "version": "6.6.60" + "sha256": "0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2", + "version": "6.6.62" } } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 18c6c35cf6f5..1074e998ec7a 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:1rsglb7zwbn4f6wv4g95jl8ra1wbs03k7xyfdlmwzl3vgzx3bnzv" }, "6.1": { - "version": "6.1.118", - "hash": "sha256:0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1" + "version": "6.1.119", + "hash": "sha256:0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf" }, "5.15": { "version": "5.15.173", @@ -24,15 +24,15 @@ "hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf" }, "6.6": { - "version": "6.6.62", - "hash": "sha256:0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2" + "version": "6.6.63", + "hash": "sha256:0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi" }, "6.11": { - "version": "6.11.9", - "hash": "sha256:1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm" + "version": "6.11.10", + "hash": "sha256:0xzynjyyr16my0wrla4ggpjbh4g7nsqixaimz5hrsqlhaa8q9hab" }, "6.12": { - "version": "6.12", - "hash": "sha256:1sr58vsh39hdwk0z27lg14isqwn4g8m4r7a8z2rsyhkfwlmmd8mi" + "version": "6.12.1", + "hash": "sha256:06f6y37fi7galj001wwrq5pz3vhdl9nryydf3f4yqwnkdpcb34q1" } } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index fa42a1343984..9905c6f302a2 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -28,7 +28,7 @@ let in buildGoModule rec { pname = "grafana"; - version = "10.4.12"; + version = "10.4.13"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -36,7 +36,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-DYuLOBNapNgosJDc5t5gG0NgkjRJ8l78x520JJ0/x4Q="; + hash = "sha256-nJpZSW5eHleBZjPoPScMmXl9BAqUnEGrKUu/UJzHEfI="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -82,7 +82,7 @@ buildGoModule rec { disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-gP/lW6CXQpBv9dPRTOV5+vmaqTcq+91X2jls9gDrnm0="; + vendorHash = "sha256-Md2MgaI7PluJFbz11t9YABLi3S4LVc35/7SIF6hY7ag="; proxyVendor = true; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index f4eb5e9327fe..3e8a2e628578 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchzip # Only used for Linux's x86/x86_64 , uasm @@ -25,33 +25,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "7zz"; - version = "24.05"; + version = "24.08"; - src = fetchurl { + src = fetchzip { url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz"; hash = { - free = "sha256-yYq3IEV2GeDWwW6KrdpgK2/QOsmDcBpIZvbk6VKZETY="; - unfree = "sha256-Y/NBz4C40ofG6UVRmz2g+nVVPIVXKkcbf6bmj5qQt5A="; + free = "sha256-2lv2Z4rrjmawD6aI8TmrACgo62StD720WQWOa0/u7KE="; + unfree = "sha256-f6hibHeTlF6RRnFiC7tOZ/A+IQdjhIrxYq6JrDVhnYI="; }.${if enableUnfree then "unfree" else "free"}; - downloadToTemp = (!enableUnfree); + stripRoot = false; # remove the unRAR related code from the src drv # > the license requires that you agree to these use restrictions, # > or you must remove the software (source and binary) from your hard disks # https://fedoraproject.org/wiki/Licensing:Unrar postFetch = lib.optionalString (!enableUnfree) '' - mkdir tmp - tar xf $downloadedFile -C ./tmp - rm -r ./tmp/CPP/7zip/Compress/Rar* - tar cfJ $out -C ./tmp . \ - --sort=name \ - --mtime="@$SOURCE_DATE_EPOCH" \ - --owner=0 --group=0 --numeric-owner \ - --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime - ''; + rm -r $out/CPP/7zip/Compress/Rar* + ''; }; - sourceRoot = "."; - patches = [ ./fix-cross-mingw-build.patch ]; diff --git a/pkgs/tools/archivers/7zz/update.sh b/pkgs/tools/archivers/7zz/update.sh index bc3179615d35..1128cedd5491 100755 --- a/pkgs/tools/archivers/7zz/update.sh +++ b/pkgs/tools/archivers/7zz/update.sh @@ -1,11 +1,8 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl xq-xml nix-prefetch +#! nix-shell -I nixpkgs=./. -i bash -p curl xq-xml common-updater-scripts set -euo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" -DRV_DIR="$PWD" - -OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +OLD_VERSION="$(nix-instantiate --eval --json --expr 'let pkgs = import ./. {}; in pkgs._7zz.version' | sed 's/"//g')" NEW_VERSION="$(curl -H 'Accept: application/rss+xml' 'https://sourceforge.net/projects/sevenzip/rss?path=/7-Zip' | xq -x "substring((/rss/channel/item[link[contains(., 'src.tar.xz')]])[1]/title, 8, 5)")" echo "comparing versions $OLD_VERSION => $NEW_VERSION" @@ -14,37 +11,5 @@ if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then exit 0 fi -NIXPKGS_ROOT="$(realpath "$DRV_DIR/../../../..")" - -echo "getting free source hash" -OLD_FREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; _7zz.src.drvAttrs.outputHash" | tr -d '"')" -echo "getting unfree source hash" -OLD_UNFREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; (_7zz.override { enableUnfree = true; }).src.drvAttrs.outputHash" | tr -d '"')" - -NEW_VERSION_FORMATTED="$(echo "$NEW_VERSION" | tr -d '.')" -URL="https://7-zip.org/a/7z${NEW_VERSION_FORMATTED}-src.tar.xz" - -# `nix-prefetch` is broken without flakes -# see https://github.com/msteen/nix-prefetch/issues/51 -NEW_FREE_HASH=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "_7zz.src" --url "$URL" --option extra-experimental-features flakes) - -NEW_UNFREE_OUT=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "(_7zz.override { enableUnfree = true; }).src" --url "$URL" --output raw --print-path --option extra-experimental-features flakes) -# first line of raw output is the hash -NEW_UNFREE_HASH="$(echo "$NEW_UNFREE_OUT" | sed -n 1p)" -# second line of raw output is the src path -NEW_UNFREE_SRC="$(echo "$NEW_UNFREE_OUT" | sed -n 2p)" -# make sure to nuke the unfree src from the updater's machine -# > the license requires that you agree to these use restrictions, or you must remove the software (source and binary) from your hard disks -# https://fedoraproject.org/wiki/Licensing:Unrar -nix-store --delete "$NEW_UNFREE_SRC" - - -echo "updating version" -sed -i "s/version = \"$OLD_VERSION\";/version = \"$NEW_VERSION\";/" "$DRV_DIR/default.nix" - -echo "updating free hash" -sed -i "s@free = \"$OLD_FREE_HASH\";@free = \"$NEW_FREE_HASH\";@" "$DRV_DIR/default.nix" -echo "updating unfree hash" -sed -i "s@unfree = \"$OLD_UNFREE_HASH\";@unfree = \"$NEW_UNFREE_HASH\";@" "$DRV_DIR/default.nix" - -echo "done" +update-source-version _7zz "$NEW_VERSION" +update-source-version _7zz-rar "$NEW_VERSION" --ignore-same-version diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f51fa32ce51..1610cafc6031 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1478,6 +1478,7 @@ with pkgs; _6tunnel = callPackage ../tools/networking/6tunnel { }; _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { }; + _7zz-rar = _7zz.override { enableUnfree = true; }; _9pfs = callPackage ../tools/filesystems/9pfs { }; @@ -11511,6 +11512,7 @@ with pkgs; }; p7zip = callPackage ../tools/archivers/p7zip { }; + p7zip-rar = p7zip.override { enableUnfree = true; }; packagekit = callPackage ../tools/package-management/packagekit { };