summary refs log tree commit diff
path: root/pkgs/data/misc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-06-06 00:13:43 +0000
committerGitHub <noreply@github.com>2023-06-06 00:13:43 +0000
commit989a2b93b79dd0553028e83be5f5db7221476d76 (patch)
treed75169d056ccf62f573a0daba2d21f62a5da190d /pkgs/data/misc
parentdd2d950a06ba0ea647600e021fdae2b4fd644c19 (diff)
parent49e06b934765e92c497896913bfb56e39d407bf7 (diff)
downloadnixpkgs-989a2b93b79dd0553028e83be5f5db7221476d76.tar
nixpkgs-989a2b93b79dd0553028e83be5f5db7221476d76.tar.gz
nixpkgs-989a2b93b79dd0553028e83be5f5db7221476d76.tar.bz2
nixpkgs-989a2b93b79dd0553028e83be5f5db7221476d76.tar.lz
nixpkgs-989a2b93b79dd0553028e83be5f5db7221476d76.tar.xz
nixpkgs-989a2b93b79dd0553028e83be5f5db7221476d76.tar.zst
nixpkgs-989a2b93b79dd0553028e83be5f5db7221476d76.zip
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r--pkgs/data/misc/sing-geoip/default.nix13
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/data/misc/sing-geoip/default.nix b/pkgs/data/misc/sing-geoip/default.nix
index 91c485ce115..b27a61ef020 100644
--- a/pkgs/data/misc/sing-geoip/default.nix
+++ b/pkgs/data/misc/sing-geoip/default.nix
@@ -8,21 +8,16 @@
 let
   generator = buildGoModule rec {
     pname = "sing-geoip";
-    version = "unstable-2022-07-05";
+    version = "20230512";
 
     src = fetchFromGitHub {
       owner = "SagerNet";
       repo = pname;
-      rev = "2ced72c94da4c9259c40353c375319d9d28a78f3";
-      hash = "sha256-z8aP+OfTuzQNwOT3EEnI9uze/vbHTJLEiCPqIrnNUHw=";
+      rev = "refs/tags/${version}";
+      hash = "sha256-Zm+5N/37hoHpH/TLNJrHeaBXI8G1jEpM1jz6Um8edNE=";
     };
 
-    vendorHash = "sha256-lr0XMLFxJmLqIqCuGgmsFh324jmZVj71blmStMn41Rs=";
-
-    postPatch = ''
-      # The codes args should start from the third args
-      substituteInPlace main.go --replace "os.Args[2:]" "os.Args[3:]"
-    '';
+    vendorHash = "sha256-ejXAdsJwXhqet+Ca+pDLWwu0gex79VcIxW6rmhRnbTQ=";
 
     meta = with lib; {
       description = "GeoIP data for sing-box";