From 04cc8be59e3622c825b5255f00319e795d887ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Jul 2025 20:56:20 +0200 Subject: [PATCH 1/6] libhsts: update preload list --- pkgs/by-name/li/libhsts/package.nix | 4 ++-- pkgs/by-name/li/libhsts/update.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libhsts/package.nix b/pkgs/by-name/li/libhsts/package.nix index 7bf3f36b5773..f5fbbb164385 100644 --- a/pkgs/by-name/li/libhsts/package.nix +++ b/pkgs/by-name/li/libhsts/package.nix @@ -9,11 +9,11 @@ python3, }: let - chromium_version = "90.0.4417.1"; + chromium_version = "140.0.7324.1"; hsts_list = fetchurl { url = "https://raw.github.com/chromium/chromium/${chromium_version}/net/http/transport_security_state_static.json"; - sha256 = "09f24n30x5dmqk8zk7k2glcilgr27832a3304wj1yp97158sqsfx"; + hash = "sha256-XV3yZA3Ai4It7S/y4V0h+UtKm8SXm6x1hlITD7jGY9I="; }; in diff --git a/pkgs/by-name/li/libhsts/update.sh b/pkgs/by-name/li/libhsts/update.sh index f80966e08c9a..911f91918332 100755 --- a/pkgs/by-name/li/libhsts/update.sh +++ b/pkgs/by-name/li/libhsts/update.sh @@ -5,9 +5,10 @@ set -euo pipefail -x cd "$(dirname "$0")" -chromium_version=$(curl -s "https://api.github.com/repos/chromium/chromium/tags" | jq -r 'map(select(.prerelease | not)) | .[1].name') +chromium_version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/chromium/chromium/tags" | jq -r 'map(select(.prerelease | not)) | .[1].name') sha256=$(nix-prefetch-url "https://raw.github.com/chromium/chromium/$chromium_version/net/http/transport_security_state_static.json") +hash=$(nix hash convert --to sri "$sha256") sed -e "0,/chromium_version/s/chromium_version = \".*\"/chromium_version = \"$chromium_version\"/" \ - -e "0,/sha256/s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ + -e "0,/hash/s/hash = \".*\"/sha256 = \"$hash\"/" \ --in-place ./default.nix From b260cd9e7cbe132b04cb43c332886058e0de38de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Jul 2025 20:56:33 +0200 Subject: [PATCH 2/6] libhsts: fix build with gettext 0.25.0 --- pkgs/by-name/li/libhsts/gettext-0.25.patch | 20 ++++++++++++++++++++ pkgs/by-name/li/libhsts/package.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/by-name/li/libhsts/gettext-0.25.patch diff --git a/pkgs/by-name/li/libhsts/gettext-0.25.patch b/pkgs/by-name/li/libhsts/gettext-0.25.patch new file mode 100644 index 000000000000..3f99e164624b --- /dev/null +++ b/pkgs/by-name/li/libhsts/gettext-0.25.patch @@ -0,0 +1,20 @@ +diff --git a/configure.ac b/configure.ac +index 4d443c1..42c3568 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,13 +31,8 @@ AC_CONFIG_FILES([include/libhsts.h]) + # + # Gettext + # +-m4_ifdef([AM_GNU_GETTEXT], [ +- AM_GNU_GETTEXT([external],[need-ngettext]) +-]) +-m4_ifdef([AM_GNU_GETTEXT_VERSION], [ +-#do not indent here +-AM_GNU_GETTEXT_VERSION([0.18.2]) +-]) ++AM_GNU_GETTEXT([external],[need-ngettext]) ++AM_GNU_GETTEXT_VERSION([0.19.8]) + + # + # check for doxygen and pandoc diff --git a/pkgs/by-name/li/libhsts/package.nix b/pkgs/by-name/li/libhsts/package.nix index f5fbbb164385..df8fa7c011ce 100644 --- a/pkgs/by-name/li/libhsts/package.nix +++ b/pkgs/by-name/li/libhsts/package.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { sha256 = "0gbchzf0f4xzb6zjc56dk74hqrmdgyirmgxvvsqp9vqn9wb5kkx4"; }; + patches = [ + ./gettext-0.25.patch + ]; + postPatch = '' pushd tests cp ${hsts_list} transport_security_state_static.json From 391e07ae46aac55e15c3ff0840e18302ce14256f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Jul 2025 20:57:50 +0200 Subject: [PATCH 3/6] libhsts: adopt, some general clean up --- pkgs/by-name/li/libhsts/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/li/libhsts/package.nix b/pkgs/by-name/li/libhsts/package.nix index df8fa7c011ce..388e491b8fa1 100644 --- a/pkgs/by-name/li/libhsts/package.nix +++ b/pkgs/by-name/li/libhsts/package.nix @@ -21,11 +21,16 @@ stdenv.mkDerivation rec { pname = "libhsts"; version = "0.1.0"; + outputs = [ + "out" + "dev" + ]; + src = fetchFromGitLab { owner = "rockdaboot"; repo = "libhsts"; - rev = "libhsts-${version}"; - sha256 = "0gbchzf0f4xzb6zjc56dk74hqrmdgyirmgxvvsqp9vqn9wb5kkx4"; + tag = "libhsts-${version}"; + hash = "sha256-pM9ZFk8W73Sx3ru/mqN/rWYMyZnNFCa/Wb8TB9yHbD0="; }; patches = [ @@ -35,6 +40,7 @@ stdenv.mkDerivation rec { postPatch = '' pushd tests cp ${hsts_list} transport_security_state_static.json + # strip comments from json sed 's/^ *\/\/.*$//g' transport_security_state_static.json >hsts.json popd patchShebangs src/hsts-make-dafsa @@ -47,19 +53,14 @@ stdenv.mkDerivation rec { python3 ]; - outputs = [ - "out" - "dev" - ]; - - meta = with lib; { + meta = { description = "Library to easily check a domain against the Chromium HSTS Preload list"; mainProgram = "hsts"; homepage = "https://gitlab.com/rockdaboot/libhsts"; - license = with licenses; [ + license = with lib.licenses; [ mit bsd3 ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; } From 30bf1e245d0124865811fa4a1b0223a9a1160069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Jul 2025 21:07:05 +0200 Subject: [PATCH 4/6] wget2: fix build with gettext 0.25.0 --- pkgs/by-name/wg/wget2/gettext-0.25.patch | 25 ++++++++++++++++++++++++ pkgs/by-name/wg/wget2/package.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/wg/wget2/gettext-0.25.patch diff --git a/pkgs/by-name/wg/wget2/gettext-0.25.patch b/pkgs/by-name/wg/wget2/gettext-0.25.patch new file mode 100644 index 000000000000..b165eba642d9 --- /dev/null +++ b/pkgs/by-name/wg/wget2/gettext-0.25.patch @@ -0,0 +1,25 @@ +diff --git a/configure.ac b/configure.ac +index 7429f614..67b0bf0c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -410,17 +410,11 @@ test "${ENABLE_XATTR}" = "yes" && AC_DEFINE([ENABLE_XATTR], 1, + # + # Gettext + # +-m4_ifdef([AM_GNU_GETTEXT], [ +- AM_GNU_GETTEXT([external],[need-ngettext]) +- AC_CONFIG_FILES([po/Makefile.in]) +- have_po=yes +-], [ +- have_po=no +-]) +-m4_ifdef([AM_GNU_GETTEXT_VERSION], [ ++AM_GNU_GETTEXT([external],[need-ngettext]) ++AC_CONFIG_FILES([po/Makefile.in]) ++have_po=yes + #do not indent here + AM_GNU_GETTEXT_VERSION([0.21]) +-]) + AM_CONDITIONAL([HAVE_PO], [ test "$have_po" = "yes" ]) + + # diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index 09d71cef462b..51d87ab5632b 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { hash = "sha256-0tOoStZHr5opehFmuQdFRPYvOv8IMrDTBNFtoweY3VM="; }; + patches = [ + ./gettext-0.25.patch + ]; + # wget2_noinstall contains forbidden reference to /build/ postPatch = '' substituteInPlace src/Makefile.am \ From 038dbf54bca9218f950b6f07fb365d0b3a740d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 31 Jul 2025 16:09:24 +0200 Subject: [PATCH 5/6] wget2: drop with lib --- pkgs/by-name/wg/wget2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index 51d87ab5632b..b573d532ea4b 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; versionCheckProgramArg = "--version"; - meta = with lib; { + meta = { description = "Successor of GNU Wget, a file and recursive website downloader"; longDescription = '' Designed and written from scratch it wraps around libwget, that provides the basic @@ -115,11 +115,11 @@ stdenv.mkDerivation rec { ''; homepage = "https://gitlab.com/gnuwget/wget2"; # wget2 GPLv3+; libwget LGPLv3+ - license = with licenses; [ + license = with lib.licenses; [ gpl3Plus lgpl3Plus ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "wget2"; }; } From 483a4853a57da8cebdb01524ebc6a31ee376c3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Aug 2025 00:09:49 +0200 Subject: [PATCH 6/6] libhsts: link update script --- pkgs/by-name/li/libhsts/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/li/libhsts/package.nix b/pkgs/by-name/li/libhsts/package.nix index 388e491b8fa1..9546b652d021 100644 --- a/pkgs/by-name/li/libhsts/package.nix +++ b/pkgs/by-name/li/libhsts/package.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { python3 ]; + passthru.updateScript = ./update.sh; + meta = { description = "Library to easily check a domain against the Chromium HSTS Preload list"; mainProgram = "hsts";