update nixpkgs & piped including deps gradle doesn't fetch

flake.lock

@@ -13,11 +13,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683779844,
-        "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=",
+        "lastModified": 1686747123,
+        "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "c80189917086e43d49eece2bd86f56813500a0eb",
+        "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685721552,
-        "narHash": "sha256-ifvq/zlO7lck8q+YkC5uom/h8/MVdMcQEldOL3cDQW0=",
+        "lastModified": 1686778999,
+        "narHash": "sha256-3qBtOJdznerw33LgwJTSUL6u8/j1Ot83fcc0f6oHKmk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "29519461834c08395b35f840811faf8c23e3b61c",
+        "rev": "e0034971f9def16bbc32124147787bc0f09f0e59",
         "type": "github"
       },
       "original": {
@@ -176,11 +176,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1685655444,
-        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
+        "lastModified": 1686592866,
+        "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
+        "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1685810707,
-        "narHash": "sha256-5PrZFSsCT53aR+4ZjpPvXK9ZXwakuU33BX97q2T3BoY=",
+        "lastModified": 1686807758,
+        "narHash": "sha256-0Kg2VqEZzrwZubTrtj+fu77F/IftkDH6ZESwe4ZXkfw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "7814795910cc42a67ce45588d03e6517c3dc3596",
+        "rev": "53bdfe0d57ba919516d99906d18db3a6f96b53f2",
         "type": "github"
       },
       "original": {

overlay/piped/backend/deps.nix

@@ -1,11 +1,22 @@
 {
+  lib,
   stdenv,
   fetchFromGitHub,
+  fetchurl,
   gradle,
   jdk,
   perl,
 }: let
   meta = builtins.fromJSON (builtins.readFile ../meta.json);
+
+  extraDeps = [
+    {
+      filename = "okio-3.2.0.jar";
+      path = "com/squareup/okio/okio/3.2.0";
+      url = "https://repo1.maven.org/maven2/com/squareup/okio/okio/3.2.0/okio-3.2.0.jar";
+      sha256 = "sha256-3KkyyyAptsniZ3D4fbCLFNSB/+gTGlnzaaI4XBG+Ti0=";
+    }
+  ];
 in
   stdenv.mkDerivation {
     pname = "piped-backend-deps";
@@ -27,15 +38,23 @@ in
     '';
 
     # perl code mavenizes paths (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
-    installPhase = ''
-      find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
-        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
-        | sh
-    '';
+    installPhase =
+      ''
+        find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
+          | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+          | sh
+      ''
+      + lib.concatStringsSep "\n" (lib.forEach extraDeps (dep: ''
+        mkdir -p $out/${dep.path}
+        cp ${fetchurl {
+          url = dep.url;
+          sha256 = dep.sha256;
+        }} $out/${dep.path}/${dep.filename}
+      ''));
 
     dontStrip = true;
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "sha256-vDXDGGoHthQhdIBn4PqwPhUlYtD1mNx86D3LqvUrNXE=";
+    outputHash = "sha256-KhvijeYTkXSRMQm9r4emxhr2oGvsqJ9Fjqnz41qwtFk=";
   }

overlay/piped/meta.json

@@ -1,14 +1,14 @@
 {
   "frontend": {
-    "rev": "3dfdf8806f9f9e6aa41e285778f79ba35daee597",
-    "sha256": "sha256-iVMsW+H068B/W965oPo3YnQGhEMI8CrLVpkG1kSm7rs="
+    "rev": "6f060151f21e087fe5c5aacf6527237fd713362e",
+    "sha256": "sha256-rYy1b+9uOqCVuKaSnt4aV286vvMR9xs4T7uzl49GdL8="
   },
   "backend": {
-    "rev": "5d085ce59235ecaf875ccf8a1d311b85a1ca850a",
-    "sha256": "sha256-NZwvnRcaQnjtfWvZQfXMCKj7DYEdzZaRcQFuUyfENDM="
+    "rev": "a694e8d9d3344417b4e177f93da54fb9368a83a6",
+    "sha256": "sha256-4FrnGZquD3ufuoP89BK/XqFBS0adiQLM4gB5n1Wruv0="
   },
   "proxy": {
-    "rev": "ab1f54bf518bd1f75170eeb08e1ab96516587e55",
-    "sha256": "sha256-7pCOs48xAYFyOukXKHls5AQVP05gVZqrpLbvGWchSro="
+    "rev": "8c2797110bf21c641004690499d9cd59bc6a1190",
+    "sha256": "sha256-VkG5sHcKzIudY8LQpBKXYLj+6v8r6Lj01tlVw8u0sTk="
   }
 }