danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

move carnix files to workspace

Browse source
This commit is contained in:
Daiderd Jordan 2020-04-25 13:34:26 +02:00
parent b4afb127df
commit 0139cd5621
No known key found for this signature in database
GPG key ID: D02435D05B810C96
6 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ofborg/Cargo.nix → Cargo.nix
View file

@ -112,7 +112,8 @@ rec {
version = "0.1.8"; version = "0.1.8";
authors = [ "Graham Christensen <graham@grahamc.com>" ]; authors = [ "Graham Christensen <graham@grahamc.com>" ];
edition = "2018"; edition = "2018";
src = include [ "Cargo.toml" "Cargo.lock" "src" "test-srcs" "build.rs" ] ./.; src = include [ "Cargo.toml" "src" "test-srcs" "build.rs" ] ./.;
workspace_member = "ofborg";
build = "build.rs"; build = "build.rs";
dependencies = mapFeatures features ([ dependencies = mapFeatures features ([
(crates."amqp"."${deps."ofborg"."0.1.8"."amqp"}" deps) (crates."amqp"."${deps."ofborg"."0.1.8"."amqp"}" deps)
@ -183,12 +184,38 @@ rec {
]; ];
# end
# ofborg-simple-build-0.1.0
crates.ofborg_simple_build."0.1.0" = deps: { features?(features_.ofborg_simple_build."0.1.0" deps {}) }: buildRustCrate {
crateName = "ofborg-simple-build";
version = "0.1.0";
authors = [ "Daiderd Jordan <daiderd@gmail.com>" ];
edition = "2018";
src = include [ "Cargo.toml" " ofborg-simple-build" ] ./.;
workspace_member = "ofborg-simple-build";
dependencies = mapFeatures features ([
(cratesIO.crates."log"."${deps."ofborg_simple_build"."0.1.0"."log"}" deps)
(crates."ofborg"."${deps."ofborg_simple_build"."0.1.0"."ofborg"}" deps)
]);
};
features_.ofborg_simple_build."0.1.0" = deps: f: updateFeatures f (rec {
log."${deps.ofborg_simple_build."0.1.0".log}".default = true;
ofborg."${deps.ofborg_simple_build."0.1.0".ofborg}".default = true;
ofborg_simple_build."0.1.0".default = (f.ofborg_simple_build."0.1.0".default or true);
}) [
(cratesIO.features_.log."${deps."ofborg_simple_build"."0.1.0"."log"}" deps)
(features_.ofborg."${deps."ofborg_simple_build"."0.1.0"."ofborg"}" deps)
];
# end # end
}; };
ofborg = crates.crates.ofborg."0.1.8" deps; ofborg = crates.crates.ofborg."0.1.8" deps;
__all = [ (ofborg {}) ]; ofborg_simple_build = crates.crates.ofborg_simple_build."0.1.0" deps;
__all = [ (ofborg {}) (ofborg_simple_build {}) ];
deps.aho_corasick."0.5.3" = { deps.aho_corasick."0.5.3" = {
memchr = "0.1.11"; memchr = "0.1.11";
}; };
@ -389,6 +416,10 @@ rec {
tempfile = "2.2.0"; tempfile = "2.2.0";
uuid = "0.4.0"; uuid = "0.4.0";
}; };
deps.ofborg_simple_build."0.1.0" = {
log = "0.3.8";
ofborg = "0.1.8";
};
deps.openssl."0.9.24" = { deps.openssl."0.9.24" = {
bitflags = "0.9.1"; bitflags = "0.9.1";
foreign_types = "0.3.2"; foreign_types = "0.3.2";

0
ofborg/crates-io.list → crates-io.list
View file

0
ofborg/crates-io.nix → crates-io.nix
View file

4
default.nix
View file

@ -10,8 +10,8 @@ let
}; };
}; };
drv = ((pkgs.callPackage ./ofborg/Cargo.nix { drv = ((pkgs.callPackage ./Cargo.nix {
cratesIO = pkgs.callPackage ./ofborg/crates-io.nix {}; cratesIO = pkgs.callPackage ./crates-io.nix {};
}).ofborg {}).override { release = false; }; }).ofborg {}).override { release = false; };
src = stripDeps (drv.override ofborgOverrides); src = stripDeps (drv.override ofborgOverrides);

2
nix/update-carnix.sh
View file

@ -2,7 +2,5 @@
set -eu set -eu
cd ofborg
cargo build cargo build
carnix generate-nix --src . carnix generate-nix --src .

2
ofborg/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "ofborg" name = "ofborg"
version = "0.1.8" version = "0.1.8"
authors = ["Graham Christensen <graham@grahamc.com>"] authors = ["Graham Christensen <graham@grahamc.com>"]
include = ["Cargo.toml", "Cargo.lock", "src", "test-srcs", "build.rs"] include = ["Cargo.toml", "src", "test-srcs", "build.rs"]
build = "build.rs" build = "build.rs"
edition = "2018" edition = "2018"