Update rust dependencies

This commit is contained in:
Andreas Rammhold 2021-05-16 18:44:18 +02:00 committed by Cole Helbling
parent 986be3ceb7
commit 179f1fc018
6 changed files with 1931 additions and 1903 deletions

1508
Cargo.lock generated

File diff suppressed because it is too large Load diff

1999
Cargo.nix

File diff suppressed because it is too large Load diff

View file

@ -7,19 +7,8 @@
} }
}: }:
with ofborgCrates.workspaceMembers;
let let
stripDeps = pkg: pkgs.runCommand "${pkg.name}-deps-stripped" {} inherit (ofborgCrates.workspaceMembers) ofborg-simple-build ofborg;
''
cp -r ${pkg} $out
chmod -R a+w $out
rm -rf $out/lib
find $out/bin -name '*.d' -delete
chmod -R a-w $out
'';
src = stripDeps ofborg.build;
in in
{ {
@ -27,7 +16,7 @@ in
ofborg.simple-build = ofborg-simple-build.build; ofborg.simple-build = ofborg-simple-build.build;
ofborg.rs = pkgs.runCommand "ofborg-rs-symlink-compat" { inherit src; } '' ofborg.rs = pkgs.runCommand "ofborg-rs-symlink-compat" { src = ofborg.build; } ''
mkdir -p $out/bin mkdir -p $out/bin
for f in $(find $src -type f); do for f in $(find $src -type f); do
bn=$(basename "$f") bn=$(basename "$f")

View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i bash -E "with import ./nix {}; mkShell { nativeBuildInputs = [ cacert cargo (import (builtins.fetchTarball https://github.com/kolloch/crate2nix/archive/0.8.0.tar.gz) {}) ]; }" #!nix-shell -i bash -E "with import ./nix {}; mkShell { nativeBuildInputs = [ cacert cargo (import (builtins.fetchTarball https://github.com/kolloch/crate2nix/archive/0.9.0.tar.gz) {}) ]; }"
set -e set -e
cargo fetch --locked cargo fetch --locked

View file

@ -54,6 +54,7 @@ fn main() -> Result<(), Box<dyn Error>> {
redelivered: false, redelivered: false,
properties: BasicProperties::default(), properties: BasicProperties::default(),
data: vec![], data: vec![],
acker: Default::default(),
}; };
let mut recv = easylapin::ChannelNotificationReceiver::new(&mut chan, &deliver); let mut recv = easylapin::ChannelNotificationReceiver::new(&mut chan, &deliver);

View file

@ -31,6 +31,7 @@ fn main() -> Result<(), Box<dyn Error>> {
redelivered: false, redelivered: false,
properties: BasicProperties::default(), properties: BasicProperties::default(),
data: vec![], data: vec![],
acker: Default::default(),
}; };
let mut receiver = easylapin::ChannelNotificationReceiver::new(&mut chan, &deliver); let mut receiver = easylapin::ChannelNotificationReceiver::new(&mut chan, &deliver);
let job = buildjob::BuildJob { let job = buildjob::BuildJob {