From f318ff5ac774eda97298e94bcf5352d98b8b6c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 17 May 2023 11:16:05 +0200 Subject: [PATCH] chore: update, enable unstable --- configs/packages.nix | 4 +++- flake.lock | 50 +++++++++++++++++++++++++++++++------------- flake.nix | 38 ++++++++++++++------------------- 3 files changed, 54 insertions(+), 38 deletions(-) diff --git a/configs/packages.nix b/configs/packages.nix index 15f811b..bc16abc 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -4,6 +4,7 @@ lib, inputs, niveumPackages, + unstablePackages, ... }: let worldradio = pkgs.callPackage ../packages/worldradio.nix {}; @@ -259,8 +260,9 @@ in { libreoffice # gnumeric dia - pandoc + unstablePackages.pandoc niveumPackages.man-pandoc + unstablePackages.typst # proselint asciidoctor wordnet diff --git a/flake.lock b/flake.lock index e987b05..a2cdfd6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,19 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", + "lastModified": 1683866323, + "narHash": "sha256-M2bEuh2jr0Ec13GnP5f8unD8q0AcPt2fHSUynOZJ8No=", "owner": "ryantm", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "92197270a1eedd142a4aff853e4cc6d1e838c22f", "type": "github" }, "original": { @@ -175,11 +178,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683383741, - "narHash": "sha256-rAQSBnFGNKNomUUyVl+7v0tnp45677t4Ovlh9f57k6Q=", + "lastModified": 1683928319, + "narHash": "sha256-maz0DRKixJVcNRMiAMWlJniiF8IuQ+WbfmlJJ8D+jfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adc7c6f1bbaa73cda26be2323353b63a05b42f61", + "rev": "9656e85a15a0fe67847ee8cdb99a20d8df499962", "type": "github" }, "original": { @@ -205,13 +208,29 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1684052570, + "narHash": "sha256-0Wy9E5Fnj7J9SSuR0iB+QGCYllpWGAWroHZIfArkH7E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d5be467efe20bd71fb178f9fcbc032a2a52a55ea", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { - "lastModified": 1683477974, - "narHash": "sha256-MmRFD5qCZ9xJy27F79pzmm0x/nLQAZwnvgc0U+oS/pM=", + "lastModified": 1684042604, + "narHash": "sha256-kKaNKeDtMLOcsTf8XnOT0/rYvvcqTQNGiIr5rO9PcgQ=", "owner": "nix-community", "repo": "NUR", - "rev": "07670d5e996df305e79cb7e9becc24b91b1b4d9f", + "rev": "f3b31a6e1a397412d4c3afe5b508674cbfce2cee", "type": "github" }, "original": { @@ -269,6 +288,7 @@ "nixinate": "nixinate", "nixpkgs": "nixpkgs", "nixpkgs-old": "nixpkgs-old", + "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "recht": "recht", "retiolum": "retiolum", @@ -290,11 +310,11 @@ ] }, "locked": { - "lastModified": 1683426137, - "narHash": "sha256-iqLjaJDMppvK1ae1eL55b2r7EX+rbUuEnssFOe9eOm8=", + "lastModified": 1684030847, + "narHash": "sha256-z4tOxaN9Cl8C80u6wyZBpPt9A9MbL21fZ3zdB/vG+AU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "546a8209ce0965475495dd422e4ab3c6de7a268c", + "rev": "aa1480f16bec7dda3c62b8cdb184c7e823331ba2", "type": "github" }, "original": { @@ -419,11 +439,11 @@ "voidrice": { "flake": false, "locked": { - "lastModified": 1683056996, - "narHash": "sha256-6UFIyA4x+undpOg8IexqpNeTVh7Zs9E35JFdswQBa9Q=", + "lastModified": 1683813608, + "narHash": "sha256-Ji8e4Kt3uh2S0bGZ82aL90kxYoGKLG9zBHfDZjkWRPo=", "owner": "Lukesmithxyz", "repo": "voidrice", - "rev": "b2833f8a67c421d1d5ba3327c8594a445b8aa386", + "rev": "991b052a558c11182c279612f3db42d187304132", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bf329a5..91d5c84 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ nixinate.url = "github:matthewcroughan/nixinate"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/master"; nur.url = "github:nix-community/NUR"; recht.url = "github:kmein/recht"; scripts.url = "github:kmein/scripts"; @@ -21,6 +22,7 @@ voidrice.url = "github:Lukesmithxyz/voidrice"; agenix.inputs.nixpkgs.follows = "nixpkgs"; + agenix.inputs.home-manager.follows = "home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.utils.follows = "flake-utils"; menstruation-backend.inputs.flake-utils.follows = "flake-utils"; @@ -50,6 +52,7 @@ outputs = inputs @ { self, nixpkgs, + nixpkgs-unstable, nur, home-manager, nixinate, @@ -94,14 +97,17 @@ panoptikon = import lib/panoptikon.nix; }; - nixosConfigurations = { + nixosConfigurations = let + niveumSpecialArgs = system: { + unstablePackages = nixpkgs-unstable.legacyPackages.${system}; + niveumPackages = inputs.self.packages.${system}; + niveumLib = inputs.self.lib; + inherit inputs; + }; + in { ful = nixpkgs.lib.nixosSystem rec { system = "aarch64-linux"; - specialArgs = { - niveumPackages = inputs.self.packages.${system}; - niveumLib = inputs.self.lib; - inherit inputs; - }; + specialArgs = niveumSpecialArgs system; modules = [ { _module.args.nixinate = { @@ -122,10 +128,7 @@ }; zaatar = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - specialArgs = { - niveumPackages = inputs.self.packages.${system}; - inherit inputs; - }; + specialArgs = niveumSpecialArgs system; modules = [ { _module.args.nixinate = { @@ -145,10 +148,7 @@ makanek = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; # for using inputs in other config files - specialArgs = { - niveumPackages = inputs.self.packages.${system}; - inherit inputs; - }; + specialArgs = niveumSpecialArgs system; modules = [ { _module.args.nixinate = { @@ -186,10 +186,7 @@ }; manakish = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - specialArgs = { - niveumPackages = inputs.self.packages.${system}; - inherit inputs; - }; + specialArgs = niveumSpecialArgs system; modules = [ { _module.args.nixinate = { @@ -209,10 +206,7 @@ }; kabsa = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - specialArgs = { - niveumPackages = inputs.self.packages.${system}; - inherit inputs; - }; + specialArgs = niveumSpecialArgs system; modules = [ { _module.args.nixinate = {