From 5697c0a054e6277eb653dfaaa0f7538e39bc13e6 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 16 Oct 2024 23:40:34 +0300 Subject: [PATCH] added unstable branch --- configuration.nix | 3 ++- flake.lock | 19 ++++++++++++++++++- flake.nix | 20 +++++++++++++++----- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 62bf8ad..505b026 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, pkgs, pkgs-unstable, ... }: { imports = @@ -153,6 +153,7 @@ python312Packages.matplotlib ])) # fcitx5-mosc + pkgs-unstable.ani-cli ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/flake.lock b/flake.lock index bbe9299..3757bfe 100644 --- a/flake.lock +++ b/flake.lock @@ -16,9 +16,26 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index 5fb76c8..7e466af 100644 --- a/flake.nix +++ b/flake.nix @@ -3,16 +3,26 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; - outputs = { self, nixpkgs, ... }: - let - lib = nixpkgs.lib; - in { + outputs = inputs@{ + self, + nixpkgs, + nixpkgs-unstable, + ... + }: { nixosConfigurations = { - tartarus = lib.nixosSystem { + tartarus = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = [ ./configuration.nix ]; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + }; # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; };