From 23623a001a02db401cf33d512a08a43a6508a3e7 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Wed, 22 Mar 2023 15:38:53 -0400 Subject: [PATCH] switch nix version... again --- flake.lock | 88 ++++++++++++++++++++++++++++++++++++++++++++----- flake.nix | 2 ++ modules/nix.nix | 2 +- 3 files changed, 82 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index febfb66..2623e55 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1679382364, - "narHash": "sha256-rqaVsZ5dFg3V/jJiL1uyI44lnutJlpzCv8BvY91Vzp8=", + "lastModified": 1679457423, + "narHash": "sha256-dMgcy4Yl1PNJam/cXhpSDoMV2aD9fC7nSXrcMVm9lUg=", "owner": "nix-community", "repo": "disko", - "rev": "25c5376b02597fa269eb30ba9cd2cb86e0bb99d8", + "rev": "e29cb84d6d6a7862e0a0480d4db819c0e85a096a", "type": "github" }, "original": { @@ -132,13 +132,29 @@ "type": "github" } }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "master": { "locked": { - "lastModified": 1679449788, - "narHash": "sha256-IoKeV3r+MjY46JyBoOa8+YhHL3Ck+ZEo2DYaYCR92Ek=", + "lastModified": 1679457459, + "narHash": "sha256-2CbdQtEHH6G010dj9Y1C9sxDD9Rjs/Rfpg4WL4hb3TI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b63385ad1fa5ac5116f954cabace316a4f6a5141", + "rev": "c2111b6f27d057ab227e7a1341ea750c0cc76b7f", "type": "github" }, "original": { @@ -195,6 +211,27 @@ "type": "github" } }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1677045134, + "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=", + "owner": "NixOS", + "repo": "nix", + "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "latest-release", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1677373009, @@ -231,6 +268,38 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1670461440, + "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1679163677, @@ -275,6 +344,7 @@ "fetch-rs": "fetch-rs", "flake-utils": "flake-utils_2", "master": "master", + "nix": "nix", "nixos-generators": "nixos-generators", "nvim-flake": "nvim-flake", "sops-nix": "sops-nix", @@ -366,11 +436,11 @@ ] }, "locked": { - "lastModified": 1679448085, - "narHash": "sha256-PCii3nM1JY3ckmzFUx+MVkHNW8YGz1Qc+6UHM7BDIQU=", + "lastModified": 1679458093, + "narHash": "sha256-MdUKglpP0h9OfpMEUVwfXTaWH05qtMrgxLPCC45ZPds=", "owner": "Gerg-L", "repo": "suckless", - "rev": "27f21c949cb78c0330f65bcaa29fd80458343eb6", + "rev": "90e38ace57a93c2cbddb5d85135799e651d08b0b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4b5b8a5..d1ecc26 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,8 @@ master.url = "github:NixOS/nixpkgs"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; stable.url = "github:NixOS/nixpkgs/nixos-22.11"; + #nix + nix.url = "github:NixOS/nix/latest-release"; #utilites --maybe flake-parts soon? flake-utils.url = "github:numtide/flake-utils"; nixos-generators = { diff --git a/modules/nix.nix b/modules/nix.nix index 27b4436..a2f64a9 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -31,7 +31,7 @@ in { #other nix settings nix = { - package = pkgs.nixVersions.unstable; + package = inputs.nix.packages.${pkgs.system}.default; settings = { experimental-features = ["nix-command" "flakes" "repl-flake"]; auto-optimise-store = true;