Remove bscpkgs input

Reviewed-by: Aleix Boné <abonerib@bsc.es>
This commit is contained in:
Rodrigo Arias 2025-10-07 12:36:33 +02:00
parent b1a37ae1fe
commit 188ba6df0a
3 changed files with 4 additions and 33 deletions

21
flake.lock generated
View File

@ -23,26 +23,6 @@
"type": "github" "type": "github"
} }
}, },
"bscpkgs": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1749650500,
"narHash": "sha256-2MHfVPV6RA7qPSCtXh4+KK0F0UjN+J4z8//+n6NK7Xs=",
"ref": "refs/heads/master",
"rev": "9d1944c658929b6f98b3f3803fead4d1b91c4405",
"revCount": 961,
"type": "git",
"url": "https://git.sr.ht/~rodarima/bscpkgs"
},
"original": {
"type": "git",
"url": "https://git.sr.ht/~rodarima/bscpkgs"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -105,7 +85,6 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"bscpkgs": "bscpkgs",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
}, },

View File

@ -3,15 +3,13 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.nixpkgs.follows = "nixpkgs";
bscpkgs.url = "git+https://git.sr.ht/~rodarima/bscpkgs";
bscpkgs.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, agenix, bscpkgs, ... }: outputs = { self, nixpkgs, agenix, ... }:
let let
mkConf = name: nixpkgs.lib.nixosSystem { mkConf = name: nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit nixpkgs bscpkgs agenix; theFlake = self; }; specialArgs = { inherit nixpkgs agenix; theFlake = self; };
modules = [ "${self.outPath}/m/${name}/configuration.nix" ]; modules = [ "${self.outPath}/m/${name}/configuration.nix" ];
}; };
# For now we only support x86 # For now we only support x86
@ -38,11 +36,6 @@ in
weasel = mkConf "weasel"; weasel = mkConf "weasel";
}; };
#packages.x86_64-linux = self.nixosConfigurations.hut.pkgs // {
# bscpkgs = bscpkgs.packages.x86_64-linux;
# nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
#};
bscOverlay = import ./overlay.nix; bscOverlay = import ./overlay.nix;
overlays.default = self.bscOverlay; overlays.default = self.bscOverlay;

View File

@ -1,9 +1,8 @@
{ pkgs, nixpkgs, bscpkgs, theFlake, ... }: { pkgs, nixpkgs, theFlake, ... }:
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
bscpkgs.bscOverlay (import ../../../overlay.nix)
(import ../../../pkgs/overlay.nix)
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;