diff --git a/nix/drun.nix b/nix/drun.nix index 2a0b84b25f8..d7251fe21bc 100644 --- a/nix/drun.nix +++ b/nix/drun.nix @@ -21,6 +21,8 @@ pkgs: "build-info-0.0.27" = "sha256-SkwWwDNrTsntkNiCv6rsyTFGazhpRDnKtVzPpYLKF9U="; "cloudflare-0.12.0" = "sha256-FxCAK7gUKp/63fdvzI5Ufsy4aur74fO4R/K3YFiUw0Y="; "icrc1-test-env-0.1.1" = "sha256-2PB7e64Owin/Eji3k8UoeWs+pfDfOOTaAyXjvjOZ/4g="; + "ic-bn-lib-0.1.0" = "sha256-wqWfF70B+YQWg63yiEvIxOq+LN1AasrNXcyPkDM4/jw="; + "ic-canister-sig-creation-1.1.0" = "sha256-c47Fh4kZbmezWCYVHMci2BMXJfESaOGsyNlWh8YR6oU="; "jsonrpc-0.12.1" = "sha256-3FtdZlt2PqVDkE5iKWYIp1eiIELsaYlUPRSP2Xp8ejM="; "lmdb-rkv-0.14.99" = "sha256-5WcUzapkrc/s3wCBNCuUDhtbp17n67rTbm2rx0qtITg="; }; @@ -42,19 +44,6 @@ pkgs: EOF cd - - # static linking of libunwind fails under nix Linux - patch rs/monitoring/backtrace/build.rs << EOF -@@ -1,8 +1,2 @@ - fn main() { -- if std::env::var("TARGET").unwrap() == "x86_64-unknown-linux-gnu" { -- println!("cargo:rustc-link-lib=static=unwind"); -- println!("cargo:rustc-link-lib=static=unwind-ptrace"); -- println!("cargo:rustc-link-lib=static=unwind-x86_64"); -- println!("cargo:rustc-link-lib=dylib=lzma"); -- } - } -EOF - mkdir -p .cargo cat > .cargo/config.toml << EOF [target.x86_64-apple-darwin] diff --git a/nix/sources.json b/nix/sources.json index bef8be1fa0a..b3961ffedb1 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -21,15 +21,15 @@ "version": "3.2.25" }, "ic": { - "branch": "luc/adjust-drun", + "branch": "luc/lower-case-persistence-modes", "description": "Internet Computer blockchain source: the client/replica software run by nodes", "homepage": "", "owner": "luc-blaeser", "repo": "ic", - "rev": "bebe89514a6abd26e940b295323823169911a965", - "sha256": "1g68fyi5acbcgs2kjribk97fj8ki5g6pd99nwl5azz1rw1b0xycx", + "rev": "48ba595fb1a6bc828e7e9dae976db42b5526a5b6", + "sha256": "0136hxidak4qsk0nhjdy2nmciwb0lprm07vs117xdw3cp4m6py2z", "type": "tarball", - "url": "https://github.com/luc-blaeser/ic/archive/bebe89514a6abd26e940b295323823169911a965.tar.gz", + "url": "https://github.com/luc-blaeser/ic/archive/48ba595fb1a6bc828e7e9dae976db42b5526a5b6.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "ic-hs": {