slskd: 0.17.8 → 0.18.1

pkgs/servers/web-apps/slskd/default.nix

@@ -10,13 +10,13 @@
 }:
 let
   pname = "slskd";
-  version = "0.17.8";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "slskd";
     repo = "slskd";
     rev = version;
-    sha256 = "sha256-kqkJZNxg044RbgHFsRfvRMyFRBjnIubdHRqUuMjj2D0=";
+    sha256 = "sha256-RfwkMNUUt/iecf8A+OV8kyvF4LKWkYcwQ/KErERNWV4=";
   };
 
   meta = with lib; {
@@ -34,9 +34,8 @@ let
 
     pname = "slskd-web";
     src = "${src}/src/web";
-    patches = [ ./package-lock.patch ];
     npmFlags = [ "--legacy-peer-deps" ];
-    npmDepsHash = "sha256-vURi36ebdJQofhBlElIH5m6T1b8tsVGAzXCiDYUcSww=";
+    npmDepsHash = "sha256-+2g3pCaGFbzQjKwhjmD6viuzVE5pRg+qSOXMrCtLQkI=";
     installPhase = ''
       cp -r build $out
     '';

pkgs/servers/web-apps/slskd/deps.nix

@@ -102,6 +102,7 @@
   (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
   (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; })
+  (fetchNuGet { pname = "OneOf"; version = "3.0.255"; sha256 = "17m7nqiwfvpbmy0c9l1i71hh1n2vnjm7hdmb6ppgwmbq6ypnxy4a"; })
   (fetchNuGet { pname = "prometheus-net"; version = "7.0.0"; sha256 = "13h42444mx4nbafhn0aw7xg8gg5dxjszv3qxfz1dflayzmcwganf"; })
   (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "7.0.0"; sha256 = "0cjdh47qimcg6bmflnwl5xv77vxn4h4hmd1znv8b5a7krg1hrf5k"; })
   (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "7.0.0"; sha256 = "0q9gal3hkd45d78s1p0f3dv0kxr0byq69k0aq6pmmh9h6rpx56dl"; })

pkgs/servers/web-apps/slskd/package-lock.patch

@@ -1,13 +0,0 @@
-diff --git a/package-lock.json b/package-lock.json
-index 5a84fbe7..562051c7 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -12425,7 +12425,7 @@
-     "node_modules/pkg-up/node_modules/path-exists": {
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
--      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-       "dev": true,
-       "engines": {
-         "node": ">=4"