Compare commits

...

3 Commits

Author SHA1 Message Date
wucke13
7fcc4d1b66 simplify flake.nix 2023-03-08 21:59:25 +01:00
wucke13
c361e41c18 chore: Release rosenpass version 0.1.2-rc.3 2023-03-02 22:18:06 +01:00
wucke13
f04461307f does darwin support static builds? 2023-03-02 22:17:45 +01:00
3 changed files with 7 additions and 14 deletions

2
Cargo.lock generated
View File

@@ -865,7 +865,7 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
[[package]] [[package]]
name = "rosenpass" name = "rosenpass"
version = "0.1.2-rc.2" version = "0.1.2-rc.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "rosenpass" name = "rosenpass"
version = "0.1.2-rc.2" version = "0.1.2-rc.3"
authors = ["Karolin Varner <karo@cupdev.net>", "wucke13 <wucke13@gmail.com>"] authors = ["Karolin Varner <karo@cupdev.net>", "wucke13 <wucke13@gmail.com>"]
edition = "2021" edition = "2021"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"

View File

@@ -132,19 +132,15 @@
default = rosenpass; default = rosenpass;
rosenpass = rpDerivation pkgs; rosenpass = rpDerivation pkgs;
rosenpass-oci-image = rosenpassOCI "rosenpass"; rosenpass-oci-image = rosenpassOCI "rosenpass";
rosenpass-static = rpDerivation pkgs.pkgsStatic;
rosenpass-static-oci-image = rosenpassOCI "rosenpass-static";
# derivation for the release # derivation for the release
release-package = release-package =
let let
version = cargoToml.package.version; version = cargoToml.package.version;
package = package = packages.rosenpass-static;
if pkgs.hostPlatform.isLinux then oci-image = packages.rosenpass-static-oci-image;
packages.rosenpass-static
else packages.rosenpass;
oci-image =
if pkgs.hostPlatform.isLinux then
packages.rosenpass-static-oci-image
else packages.rosenpass-oci-image;
in in
pkgs.runCommandNoCC "lace-result" { } pkgs.runCommandNoCC "lace-result" { }
'' ''
@@ -155,10 +151,7 @@
cp ${oci-image} \ cp ${oci-image} \
$out/rosenpass-oci-image-${system}-${version}.tar.gz $out/rosenpass-oci-image-${system}-${version}.tar.gz
''; '';
} // (if pkgs.stdenv.isLinux then rec { };
rosenpass-static = rpDerivation pkgs.pkgsStatic;
rosenpass-static-oci-image = rosenpassOCI "rosenpass-static";
} else { });
} }
)) ))