From 936bc73caaba88e3166d2cc92a5ec27209b452a9 Mon Sep 17 00:00:00 2001 From: Nishimara Date: Thu, 1 Aug 2024 15:42:18 +0300 Subject: [PATCH 1/3] zapret: create blank config --- pkgs/by-name/za/zapret/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 4bbc3e080523..ef272bc67f24 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -47,7 +47,8 @@ stdenv.mkDerivation { substituteInPlace $out/usr/share/zapret/init.d/sysv/functions \ --replace "ZAPRET_BASE=\$(readlink -f \"\$EXEDIR/../..\")" "ZAPRET_BASE=$out/usr/share/zapret" \ - --replace ". \"\$ZAPRET_BASE/config\"" "" + + touch $out/usr/share/zapret/config cp -r $src/docs/* $out/usr/share/docs From 798d1d109b6fca313327d4f0d27013a66b18f7d4 Mon Sep 17 00:00:00 2001 From: Nishimara Date: Thu, 1 Aug 2024 15:49:08 +0300 Subject: [PATCH 2/3] zapret: 0-unstable-2024-07-16 -> 0-unstable-2024-08-01 --- pkgs/by-name/za/zapret/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index ef272bc67f24..a3b32c82c5c3 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation { pname = "zapret"; - version = "0-unstable-2024-07-16"; + version = "0-unstable-2024-08-01"; src = fetchFromGitHub { owner = "bol-van"; repo = "zapret"; - rev = "9fcd8f830ebde2491719a5c698e22d1d5210e0fb"; + rev = "9cf72b7c68f6a7c80dfddc6c1cf6d6db32718376"; sha256 = "sha256-8cqKCNYLLkZXlwrybKUPG6fLd7gmf8zV9tjWoTxAwIY="; }; From 3e8fbb37ac19cd2261d6cfbce7f90fe304d0820a Mon Sep 17 00:00:00 2001 From: Nishimara Date: Thu, 1 Aug 2024 15:56:09 +0300 Subject: [PATCH 3/3] typo --- pkgs/by-name/za/zapret/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index a3b32c82c5c3..b0dad91d4cb7 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { cp $src/init.d/sysv/zapret $out/usr/share/zapret/init.d/sysv/init.d substituteInPlace $out/usr/share/zapret/init.d/sysv/functions \ - --replace "ZAPRET_BASE=\$(readlink -f \"\$EXEDIR/../..\")" "ZAPRET_BASE=$out/usr/share/zapret" \ + --replace "ZAPRET_BASE=\$(readlink -f \"\$EXEDIR/../..\")" "ZAPRET_BASE=$out/usr/share/zapret" touch $out/usr/share/zapret/config