lbailly/infrastructure
1
0
Fork 0
forked from DGNum/infrastructure
Code Pull requests Activity

feat(npins): Remove nixos-unstable

Browse source
This commit is contained in:
Tom Hubrecht 2023-12-12 14:45:01 +01:00
parent 86f53a54e6
commit f8443e00d1
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
machines/compute01/satosa/module.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, sources, ... }: { config, lib, pkgs, ... }:
let let
inherit (lib) mkDefault mkEnableOption mkIf mkOption types; inherit (lib) mkDefault mkEnableOption mkIf mkOption types;
@ -20,11 +20,7 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = let pkgs = import sources.nixos-unstable { }; default = import ./package { inherit pkgs; };
in import ./package {
inherit pkgs;
inherit (pkgs) lib;
};
}; };
port = mkOption { port = mkOption {

4
machines/compute01/satosa/package/default.nix
View file

@ -1,7 +1,7 @@
{ lib, pkgs, ... }: { pkgs }:
let let
callPackage = lib.callPackageWith (pkgs // self); callPackage = pkgs.lib.callPackageWith (pkgs // self);
self = { self = {
satosa = callPackage ./satosa.nix { }; satosa = callPackage ./satosa.nix { };

6
npins/sources.json
View file

@ -120,12 +120,6 @@
"url": "https://github.com/NixOS/nixpkgs/archive/b89d6c95e443b1114034ac65c974b2c91fb33db1.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/b89d6c95e443b1114034ac65c974b2c91fb33db1.tar.gz",
"hash": "106iz6i7b4pppwmhy9xn8ap403vvms0vhbr4z8siz0hffdqildl8" "hash": "106iz6i7b4pppwmhy9xn8ap403vvms0vhbr4z8siz0hffdqildl8"
}, },
"nixos-unstable": {
"type": "Channel",
"name": "nixos-unstable",
"url": "https://releases.nixos.org/nixos/unstable/nixos-24.05pre553283.8cfef6986adf/nixexprs.tar.xz",
"hash": "0wj0nxz9ymz6jglvszvlnwgdahiyvkp7yggr12j9cpxbai72h4dn"
},
"nixpkgs": { "nixpkgs": {
"type": "Channel", "type": "Channel",
"name": "nixpkgs-unstable", "name": "nixpkgs-unstable",