From 75ef8968f91a549d226715671555432c6e08bbe4 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Mon, 15 Apr 2024 15:28:50 +0200 Subject: [PATCH] Set bscpkgs to custom patch for now Also add nOS-V dependency --- flake.lock | 31 +++++++++++++++++++------------ flake.nix | 2 ++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 303b093..e1896f1 100644 --- a/flake.lock +++ b/flake.lock @@ -26,19 +26,13 @@ }, "bscpkgs": { "inputs": { - "nixpkgs": [ - "jungle", - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1710421994, - "narHash": "sha256-GitTgcFYT6OQvbt+QUSwz4WPGR55D4AVo47yXywH0W8=", - "ref": "refs/heads/master", - "rev": "fce556cb285071e4cb042ad135dcaaaae303c9a7", - "revCount": 934, - "type": "git", - "url": "https://git.sr.ht/~rodarima/bscpkgs" + "lastModified": 1712926972, + "narHash": "sha256-0dKhCH3cPU8QSc8LLpJypj4FYGVbE5i2iRl6NnDhB6s=", + "path": "/home/Computational/rarias/bscpkgs", + "type": "path" }, "original": { "type": "git", @@ -94,7 +88,7 @@ "inputs": { "agenix": "agenix", "bscpkgs": "bscpkgs", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1710869393, @@ -108,6 +102,19 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "path": "/nix/store/k5l01g2zwhysjyl5zjvg5zxnj0lyxpp1-source", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", diff --git a/flake.nix b/flake.nix index 22331b5..a0047f3 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ nixConfig.bash-prompt = "\[nix-develop\]$ "; inputs.jungle.url = "path:/home/Computational/rarias/jungle"; + inputs.jungle.inputs.bscpkgs.url = "path:/home/Computational/rarias/bscpkgs"; outputs = { self, jungle, ... }: let @@ -20,6 +21,7 @@ clangOmpss2 nanos6 nodes + nosv mpi tampi ];