From cc4a29d84b22889a27d875df42eb35fb8d0123eb Mon Sep 17 00:00:00 2001 From: aktaboot Date: Fri, 6 Sep 2024 21:47:47 +0200 Subject: [PATCH 1/3] monolith: 2.8.1 -> 2.8.3 --- pkgs/tools/backup/monolith/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 307ca6251ca4..df6bbe839475 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -10,16 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.8.1"; + version = "2.8.3"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qMB4Tok0tYAqj8r9LEkjhBV5ko+hwagFS7MsL8AYJnc="; + hash = "sha256-t4FdTFXbKs7Xfw8dKoME7WDn+Fpe/uHPXyr5Wj+AXSA="; }; - cargoHash = "sha256-FeD0+s79orFDUVsb205W0pdXgDI+p1UrH3GIfKwUqDQ="; + cargoHash = "sha256-lBGcS1+CBYeVIG546aHSBVJ9y96rB3IDDVJPqCFUDZQ="; + + OPENSSL_NO_VENDOR = true; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] From 90abf6e0dbe4f59eca9cfc2c7b539ca643d68ccc Mon Sep 17 00:00:00 2001 From: aktaboot Date: Sun, 20 Oct 2024 20:00:14 +0200 Subject: [PATCH 2/3] monolith: mark darwin as broken and fix license --- pkgs/tools/backup/monolith/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index df6bbe839475..c1c9842fbf19 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -33,7 +33,9 @@ rustPlatform.buildRustPackage rec { description = "Bundle any web page into a single HTML file"; mainProgram = "monolith"; homepage = "https://github.com/Y2Z/monolith"; - license = licenses.unlicense; + license = licenses.cc0; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ Br1ght0ne ]; }; } From 1fe651e76ca98dee8fb10f715cb2c9312d8f4714 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Mon, 4 Nov 2024 13:44:59 +0100 Subject: [PATCH 3/3] monolith: add nix update script --- pkgs/tools/backup/monolith/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index c1c9842fbf19..454fed104ec1 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -6,6 +6,7 @@ , libiconv , Security , SystemConfiguration +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -29,6 +30,8 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=tests::cli" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Bundle any web page into a single HTML file"; mainProgram = "monolith";