From c49431f175fa1a06625bf1d33f8d7c0cf72f9286 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 2 Nov 2021 18:06:07 +0100 Subject: [PATCH] pysmart in unstable branch --- flake.lock | 17 ----------------- flake.nix | 5 ++--- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 5352dedf0..909666071 100644 --- a/flake.lock +++ b/flake.lock @@ -34,22 +34,6 @@ "type": "indirect" } }, - "nixpkgs-nyanloutre-pysmart": { - "locked": { - "lastModified": 1634908616, - "narHash": "sha256-JoJyEZKpTOHc6NMH76l8Jg/0QrMSEQsX0PtZXVtnCpA=", - "owner": "nyanloutre", - "repo": "nixpkgs", - "rev": "9b2bd68adc2455180887d952ce204ae69dfd651e", - "type": "github" - }, - "original": { - "owner": "nyanloutre", - "ref": "pysmart-init", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1635792138, @@ -99,7 +83,6 @@ "inputs": { "dogetipbot-telegram": "dogetipbot-telegram", "nixpkgs": "nixpkgs_2", - "nixpkgs-nyanloutre-pysmart": "nixpkgs-nyanloutre-pysmart", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver" } diff --git a/flake.nix b/flake.nix index 62fb6ad39..740953add 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,11 @@ inputs = { nixpkgs.url = "flake:nixpkgs/nixos-21.05"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; - nixpkgs-nyanloutre-pysmart.url = "github:nyanloutre/nixpkgs/pysmart-init"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.05"; dogetipbot-telegram.url = "gitlab:nyanloutre/dogetipbot-telegram/master"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, nixpkgs-nyanloutre-pysmart }: { + outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram }: { nixosConfigurations.loutreos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -27,7 +26,7 @@ wantedBy = ["multi-user.target"]; path = with pkgs;[ ipmitool smartmontools ]; serviceConfig = { - ExecStart = with nixpkgs-nyanloutre-pysmart.legacyPackages.x86_64-linux; + ExecStart = with nixpkgs-unstable.legacyPackages.x86_64-linux; let env = python3Packages.python.buildEnv.override { extraLibs = with python3Packages;[ pysmart ]; ignoreCollisions = true;