From f87ab0f4dd99f50cb81ab1dac25c190fdb733641 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Date: Fri, 10 Oct 2025 12:57:26 +0200 Subject: [PATCH] Switch bscpkgs input to jungle The bscpkgs repository has been merged into jungle. See: https://jungle.bsc.es/git/rarias/jungle/pulls/189 --- flake.lock | 101 ++++++++++++++++++++++++++++++++++++++++++++++++----- flake.nix | 9 ++--- 2 files changed, 98 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index d1c5c6d..8b3c654 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,93 @@ { "nodes": { - "bscpkgs": { + "agenix": { "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": [ + "jungle", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "owner": "ryantm", + "repo": "agenix", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "jungle", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "jungle", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "jungle": { + "inputs": { + "agenix": "agenix", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1757680122, - "narHash": "sha256-V8sN1npm8aE4o0CJROU4B7cUUzkla21wn2jud3F/pPU=", + "lastModified": 1760090908, + "narHash": "sha256-x/a2ONesLmzPk+PTMeljqzWKDKobEZf1UFb94pkvoKk=", "ref": "refs/heads/master", - "rev": "c7b5ec13b8d596a79942e5bd18ea7049472613b9", - "revCount": 984, + "rev": "1fba0a14a8e29b738667f18c1cd8e2e62ed94a52", + "revCount": 1483, "type": "git", - "url": "https://git.sr.ht/~rodarima/bscpkgs" + "url": "https://jungle.bsc.es/git/rarias/jungle" }, "original": { "type": "git", - "url": "https://git.sr.ht/~rodarima/bscpkgs" + "url": "https://jungle.bsc.es/git/rarias/jungle" } }, "nixpkgs": { @@ -37,9 +107,24 @@ }, "root": { "inputs": { - "bscpkgs": "bscpkgs", + "jungle": "jungle", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6fee543..334dc6e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,12 @@ { inputs.nixpkgs.url = "nixpkgs/9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc"; - inputs.bscpkgs.url = "git+https://git.sr.ht/~rodarima/bscpkgs"; - inputs.bscpkgs.inputs.nixpkgs.follows = "nixpkgs"; + inputs.jungle.url = "git+https://jungle.bsc.es/git/rarias/jungle"; + #inputs.jungle.url = "git+https://git.sr.ht/~rodarima/jungle"; # backup + inputs.jungle.inputs.nixpkgs.follows = "nixpkgs"; nixConfig.bash-prompt = "\[nix-develop\]$ "; - outputs = { self, nixpkgs, bscpkgs }: + outputs = { self, nixpkgs, jungle }: let # Set to true to replace all libovni in all runtimes with the current # source. Causes large rebuilds on changes of ovni. @@ -72,7 +73,7 @@ pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ - bscpkgs.bscOverlay + jungle.bscOverlay ovniOverlay ]; };