tomasr/nixos
1
0
Fork 0
mirror of https://github.com/tomasriveral/nixos.git synced 2026-08-12 10:30:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

nixpkgs: add master branch in flake.nix

Browse Source
This commit is contained in:
tomasr
2026-06-07 20:12:38 +02:00
parent a63984816d
commit 55ce1b6569
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+3 -1
View File
@@ -5,6 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages
nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes"; nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; # used with precaution as they are untested and not cached
# This one is only used when testing some packaging. You must change the path to the correct nixpkgs clone # This one is only used when testing some packaging. You must change the path to the correct nixpkgs clone
#nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme"; #nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme";
@@ -64,8 +65,9 @@
pkgs-unstable = mkPkgs inputs.nixpkgs-unstable; pkgs-unstable = mkPkgs inputs.nixpkgs-unstable;
pkgs-local = mkPkgs inputs.nixpkgs-unstable; pkgs-local = mkPkgs inputs.nixpkgs-unstable;
#pkgs-local = mkPkgs inputs.nixpkgs-local; #pkgs-local = mkPkgs inputs.nixpkgs-local;
pkgs-master = mkPkgs inputs.nixpkgs-master;
in { in {
inherit pkgs pkgs-unstable pkgs-local; inherit pkgs pkgs-unstable pkgs-local pkgs-master;
}; };
} }
// (inputs.import-tree ./modules)); // (inputs.import-tree ./modules));
modules/hosts/desktop.nix
+1 -1
View File
@@ -7,7 +7,7 @@
flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem {
#system = "x86_64-linux"; #system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit (self) pkgs-unstable; inherit (self) pkgs-unstable pkgs-master;
}; };
modules = with self.nixosModules; [ modules = with self.nixosModules; [
# important do not remove # important do not remove
modules/hosts/laptop.nix
+1 -1
View File
@@ -6,7 +6,7 @@
flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem {
#system = "x86_64-linux"; #system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit (self) pkgs-unstable pkgs-local; inherit (self) pkgs-unstable pkgs-local pkgs-master;
}; };
modules = with self.nixosModules; [ modules = with self.nixosModules; [
# important do not remove # important do not remove