summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-05-26 15:21:47 +0300
committerGitHub <noreply@github.com>2023-05-26 15:21:47 +0300
commit5140520c46a352dc885e7eb3dfced6cdf6d18a16 (patch)
tree987ba20ae121fa4d02f35cf53a225699250a697a /pkgs
parentef5edfaa02e60c004a197083e99765dcc7d41bb0 (diff)
parent9b4265a561c73c420475de187b08d0021ca2e24f (diff)
Merge pull request #234171 from NixOS/backport-233974-to-release-23.05
[Backport release-23.05] nc4nix: add patch to fix unstable package updates
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/nc4nix/default.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/tools/nc4nix/default.nix b/pkgs/development/tools/nc4nix/default.nix
index dcec26ab5fc38..56bad18129384 100644
--- a/pkgs/development/tools/nc4nix/default.nix
+++ b/pkgs/development/tools/nc4nix/default.nix
@@ -8,28 +8,37 @@
 
 buildGoModule rec {
   pname = "nc4nix";
-  version = "unstable-2022-12-07";
+  version = "unstable-2023-05-25";
 
   src = fetchFromGitHub {
     owner = "helsinki-systems";
     repo = "nc4nix";
-    rev = "c556a596b1d40ff69b71adab257ec5ae51ba4df1";
-    sha256 = "sha256-EIPCMiVTf0ryXRMRGhepORaOlimt3/funvUdORRbVa8=";
+    rev = "14cab9b2f8628ae6668c1d01519f558069f7f675";
+    sha256 = "sha256-iy9jJMRu0SkfrDufO6WAObqdiusvwhyv+GGHVrD3CV4=";
   };
 
   patches = [
     # Switch hash calculation method
+    # https://github.com/helsinki-systems/nc4nix/pull/3
     (fetchpatch {
       url = "https://github.com/helsinki-systems/nc4nix/commit/88c182fbdddef148e086fa86438dcd72208efd75.patch";
       sha256 = "sha256-zAF0+t9wHrKhhyD0+/d58BiaavLHfxO8X5J6vNlEWx0=";
       name = "switch_hash_calculation_method.patch";
     })
      # Add package selection command line argument
+     # https://github.com/helsinki-systems/nc4nix/pull/2
     (fetchpatch {
       url = "https://github.com/helsinki-systems/nc4nix/pull/2/commits/449eec89538df4e92106d06046831202eb84a1db.patch";
       sha256 = "sha256-qAAbR1G748+2vwwfAhpe8luVEIKNGifqXqTV9QqaUFc=";
       name = "add_package_selection_command_line_arg.patch";
     })
+    # Only consider (new) stable releases of NC apps
+    # https://github.com/helsinki-systems/nc4nix/issues/4
+    (fetchpatch {
+      url = "https://github.com/helsinki-systems/nc4nix/pull/5/commits/076a188bf30203ddea0217d83f2e3b16f3b9392b.patch";
+      sha256 = "sha256-N7X9j0tWD8ZAWjXXCXGITl/EBbrIbKbHJHyskT1rVTs=";
+      name = "only_consider_stable_releases.patch";
+    })
   ];
 
   vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M=";