Compare commits

..

2 Commits
debVM ... 0.3.0

Author SHA1 Message Date
4bac5142cc chore: update flake.lock 2021-12-11 11:43:25 +01:00
0c9d001bd0 flake.lock: Update
Flake input changes:

* Updated 'naersk': 'github:nmattia/naersk/6e149bfd726a8ebefa415f2d713ba6d942435abd' -> 'github:nmattia/naersk/df71f5e4babda41cd919a8684b72218e2e809fa9'
* Updated 'nixpkgs': 'github:NixOS/nixpkgs/2118cf551b9944cfdb929b8ea03556f097dd0381' -> 'github:NixOS/nixpkgs/01ee7961039dabf15caca202c3416451e5290ff4'
* Updated 'utils': 'github:numtide/flake-utils/3982c9903e93927c2164caa727cd3f6a0e6d14cc' -> 'github:numtide/flake-utils/997f7efcb746a9c140ce1f13c72263189225f482'
2021-09-05 16:11:04 +02:00
2 changed files with 10 additions and 70 deletions

35
flake.lock generated
View File

@@ -1,21 +1,5 @@
{
"nodes": {
"cargo-deb": {
"flake": false,
"locked": {
"lastModified": 1627137192,
"narHash": "sha256-zDAwiETJquiViEvBKMuI9WWgSGhVDscL/m1ufKJENBw=",
"owner": "mmstick",
"repo": "cargo-deb",
"rev": "f603d105b4641e00640e46b189c6ee0c8f084de2",
"type": "github"
},
"original": {
"owner": "mmstick",
"repo": "cargo-deb",
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": [
@@ -23,11 +7,11 @@
]
},
"locked": {
"lastModified": 1623927034,
"narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
"lastModified": 1639051343,
"narHash": "sha256-62qARP+5Q0GmudcpuQHJP3/yXIgmUVoHR4orD/+FAC4=",
"owner": "nmattia",
"repo": "naersk",
"rev": "e09c320446c5c2516d430803f7b19f5833781337",
"rev": "ebde51ec0eec82dc71eaca03bc24cf8eb44a3d74",
"type": "github"
},
"original": {
@@ -38,11 +22,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1627245147,
"narHash": "sha256-CQzH/4Mbhcx1HD+dtD7pZ0dHUZvX4eKN9b8Ifzz4gC4=",
"lastModified": 1638109994,
"narHash": "sha256-OpA37PTiPMIqoRJbufbl5rOLII7HeeGcA0yl7FoyCIE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "23098f20376cd1c874af476e5d8ef9169105b020",
"rev": "a284564b7f75ac4db73607db02076e8da9d42c9d",
"type": "github"
},
"original": {
@@ -52,7 +36,6 @@
},
"root": {
"inputs": {
"cargo-deb": "cargo-deb",
"naersk": "naersk",
"nixpkgs": "nixpkgs",
"utils": "utils"
@@ -60,11 +43,11 @@
},
"utils": {
"locked": {
"lastModified": 1623875721,
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {

View File

@@ -3,17 +3,13 @@
inputs = {
utils.url = "github:numtide/flake-utils";
cargo-deb = {
flake = false;
url = "github:mmstick/cargo-deb";
};
naersk = {
url = "github:nmattia/naersk";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, utils, naersk, cargo-deb }:
outputs = { self, nixpkgs, utils, naersk }:
let
root = ./.;
pname = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.name;
@@ -32,45 +28,6 @@
packages.${pname} = naersk-lib.buildPackage {
inherit pname root buildInputs nativeBuildInputs LIBCLANG_PATH;
};
packages."${pname}-deb" =
let
cargoDeb = naersk-lib.buildPackage {
pname = "cargo-deb";
root = cargo-deb;
};
pkg = packages.${pname};
vm = pkgs.vmTools.diskImageFuns.ubuntu1804x86_64 { extraPackages = [ "cargo" "cryptsetup" "libclang-dev" "libcryptsetup-dev" ]; };
makefile = pkgs.writeText "Makefile" "
.PHONY: install
cargo-deb:
cargo install --debug --path cargo-deb
install: cargo-deb
cargo-deb
mkdir -p debs
cp target/debian/*.deb debs/
";
src = pkgs.runCommandLocal "${pname}-vendored" {} ''
mkdir -p $out/.cargo $out/cargo-deb/.cargo
printf '${pkg.cargoconfig}' > $out/.cargo/config.toml;
printf '${cargoDeb.cargoconfig}' > $out/cargo-deb/.cargo/config.toml;
printf '.PHONY: install\ninstall:\n\tcargo install --debug --path cargo-deb\n\tcargo-deb\n\tmkdir -p debs\n\tcp target/debian/*.deb debs/' > $out/Makefile
cp -r ${pkg.src}/. $out/
cp -r ${cargoDeb.src}/. $out/cargo-deb/
'';
args = {
diskImage = vm;
inherit src;
name = pname;
buildInputs = [ ];
meta.description = "No descr";
};
in
pkgs.releaseTools.debBuild args;
defaultPackage = packages.${pname};
# `nix run`