From b7ad6ed4bf7dd617eefc90e62232fae8fec1a3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 8 Aug 2021 11:13:52 +0100 Subject: [PATCH] scanner fix landed on unstable --- flake.lock | 17 ----------------- flake.nix | 11 ++--------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 2ae0964e..15a7de42 100644 --- a/flake.lock +++ b/flake.lock @@ -153,22 +153,6 @@ "type": "github" } }, - "nixpkgs-scanner-fix": { - "locked": { - "lastModified": 1626998298, - "narHash": "sha256-JEf6Mp6YpuqXXLW8tY3eN6WIAe7gdsjgfSJYb/75GIE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "de3a208b73248a1f0478695b22fe51d2c25baa7f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "de3a208b73248a1f0478695b22fe51d2c25baa7f", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1628186972, @@ -225,7 +209,6 @@ "neuron": "neuron", "nixos-hardware": "nixos-hardware", "nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable", - "nixpkgs-scanner-fix": "nixpkgs-scanner-fix", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur" } diff --git a/flake.nix b/flake.nix index 8fae0d69..3748f14f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { description = "NixOS configuration with flakes"; - outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron, nixpkgs-scanner-fix } @ inputs: + outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron } @ inputs: let mkServer = pkgs: system: hostname: @@ -42,7 +42,7 @@ }; foureighty = mkWorkstation nixpkgs-stable "x86_64-linux" "foureighty"; skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv"; - brix = mkServer nixpkgs-scanner-fix "x86_64-linux" "brix"; + brix = mkServer nixpkgs-nixos-unstable "x86_64-linux" "brix"; vultr1 = mkServer nixpkgs-stable "x86_64-linux" "vultr1"; }; }; @@ -61,13 +61,6 @@ ref = "nixos-21.05"; }; - nixpkgs-scanner-fix = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "de3a208b73248a1f0478695b22fe51d2c25baa7f"; - }; - nixos-hardware = { type = "github"; owner = "NixOS";