dunkirk.sh
Kieran's opinionated (and probably slightly dumb) nix config
feat: remove the patch for deploy rs as its fixed upstream
+6
-49
+3
-3
flake.lock
+3
-3
flake.lock
···
189
189
"utils": "utils"
190
190
},
191
191
"locked": {
192
-
"lastModified": 1766051518,
193
-
"narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
192
+
"lastModified": 1770019181,
193
+
"narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
194
194
"owner": "serokell",
195
195
"repo": "deploy-rs",
196
-
"rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
196
+
"rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
197
197
"type": "github"
198
198
},
199
199
"original": {
+3
-21
flake.nix
+3
-21
flake.nix
···
278
278
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-tree;
279
279
formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixfmt-tree;
280
280
281
-
# Patched deploy-rs for Nix 2.33 compatibility
282
-
packages.x86_64-linux.deploy-rs =
283
-
deploy-rs.packages.x86_64-linux.deploy-rs.overrideAttrs
284
-
(oldAttrs: {
285
-
patches = (oldAttrs.patches or [ ]) ++ [ ./patches/deploy-rs-nix-2.33.patch ];
286
-
});
287
-
packages.aarch64-linux.deploy-rs =
288
-
deploy-rs.packages.aarch64-linux.deploy-rs.overrideAttrs
289
-
(oldAttrs: {
290
-
patches = (oldAttrs.patches or [ ]) ++ [ ./patches/deploy-rs-nix-2.33.patch ];
291
-
});
292
-
packages.aarch64-darwin.deploy-rs =
293
-
deploy-rs.packages.aarch64-darwin.deploy-rs.overrideAttrs
294
-
(oldAttrs: {
295
-
patches = (oldAttrs.patches or [ ]) ++ [ ./patches/deploy-rs-nix-2.33.patch ];
296
-
});
297
-
298
-
# Dev shells with patched deploy-rs
299
281
devShells.aarch64-darwin.default = nixpkgs.legacyPackages.aarch64-darwin.mkShell {
300
-
packages = [ outputs.packages.aarch64-darwin.deploy-rs ];
282
+
packages = [ deploy-rs.packages.aarch64-darwin.deploy-rs ];
301
283
};
302
284
devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
303
-
packages = [ outputs.packages.x86_64-linux.deploy-rs ];
285
+
packages = [ deploy-rs.packages.x86_64-linux.deploy-rs ];
304
286
};
305
287
devShells.aarch64-linux.default = nixpkgs.legacyPackages.aarch64-linux.mkShell {
306
-
packages = [ outputs.packages.aarch64-linux.deploy-rs ];
288
+
packages = [ deploy-rs.packages.aarch64-linux.deploy-rs ];
307
289
};
308
290
309
291
# Deploy-rs configurations
-25
patches/deploy-rs-nix-2.33.patch
-25
patches/deploy-rs-nix-2.33.patch
···
1
-
diff --git a/src/push.rs b/src/push.rs
2
-
index a206afc..68a421c 100644
3
-
--- a/src/push.rs
4
-
+++ b/src/push.rs
5
-
@@ -221,7 +221,8 @@ pub async fn build_profile(data: PushProfileData<'_>) -> Result<(), PushProfileE
6
-
let mut show_derivation_command = Command::new("nix");
7
-
8
-
show_derivation_command
9
-
- .arg("show-derivation")
10
-
+ .arg("derivation")
11
-
+ .arg("show")
12
-
.arg(&data.deploy_data.profile.profile_settings.path);
13
-
14
-
let show_derivation_output = show_derivation_command
15
-
@@ -241,6 +242,10 @@ pub async fn build_profile(data: PushProfileData<'_>) -> Result<(), PushProfileE
16
-
.map_err(PushProfileError::ShowDerivationParse)?;
17
-
18
-
let deriver_key = derivation_info
19
-
+ .get("derivations")
20
-
+ .ok_or(PushProfileError::ShowDerivationEmpty)?
21
-
+ .as_object()
22
-
+ .ok_or(PushProfileError::ShowDerivationEmpty)?
23
-
.keys()
24
-
.next()
25
-
.ok_or(PushProfileError::ShowDerivationEmpty)?;