From 9af46a3dca6b57ddc32019e15eaad346e64eecdf Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Thu, 23 Apr 2020 12:03:55 -0600 Subject: [PATCH] flake: update to upstream --- flake.lock | 84 +++++++++++++++++++++++++++++++++++------------ flake.nix | 2 +- hosts/default.nix | 2 -- 3 files changed, 64 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 76c34808..acd3f1fe 100644 --- a/flake.lock +++ b/flake.lock @@ -1,24 +1,66 @@ { - "inputs": { - "home": { - "inputs": { - "nixpkgs": { - "inputs": {}, - "narHash": "sha256-NB+H7zK3BB//zM127FqgbG4iAfY+nS/IOyO+uGWA5Ho=", - "originalUrl": "nixpkgs", - "url": "github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9" - } - }, - "narHash": "sha256-hd2noIXKZHe8bzoVhZUz8fwCnYKxVFLjS3s3UpVE9Hs=", - "originalUrl": "github:nrdxp/home-manager/flakes", - "url": "github:nrdxp/home-manager/4aed75b903140a3e7f5ccc4528f1748391543475" - }, - "nixpkgs": { - "inputs": {}, - "narHash": "sha256-4p9gqMJTVmyH7eSq1euGZWusldWoBfKfi/VwZEPL2Mw=", - "originalUrl": "github:nrdxp/nixpkgs/fork", - "url": "github:nrdxp/nixpkgs/1e232452ed4c57e9968f4342d9ba044d36403928" - } + "nodes": { + "home": { + "info": { + "lastModified": 1581799840, + "narHash": "sha256-FLRpqHPswrY6bU9Uzrpqz2ZfKN8cTusu3JjvWgpQIZ8=" + }, + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "owner": "nrdxp", + "repo": "home-manager", + "rev": "dae62d0baf5e918c3657e3973acfca970f826191", + "type": "github" + }, + "original": { + "owner": "nrdxp", + "ref": "flakes", + "repo": "home-manager", + "type": "github" + } }, - "version": 3 + "nixpkgs": { + "info": { + "lastModified": 1587661952, + "narHash": "sha256-f7DEfMsZh1iZlJazl5/Bflkrx+S8I8goICMwBZvGWYI=" + }, + "locked": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9e58c8363b08aa3533b4e7316e25f6da254cf678", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_2": { + "info": { + "lastModified": 1587644295, + "narHash": "sha256-ExEhf3YY2sfP92bqphrekku/w/vWQWj1nkxM4zy3zos=" + }, + "locked": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "89273a29d3b8062fc3200b51df278d2b80826b72", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "release-20.03", + "type": "indirect" + } + }, + "root": { + "inputs": { + "home": "home", + "nixpkgs": "nixpkgs_2" + } + } + }, + "root": "root", + "version": 5 } diff --git a/flake.nix b/flake.nix index 0df02e34..8a50e026 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ epoch = 201909; - inputs.nixpkgs.url = "github:nrdxp/nixpkgs/fork"; + inputs.nixpkgs.url = "nixpkgs/release-20.03"; inputs.home.url = "github:nrdxp/home-manager/flakes"; outputs = inputs@{ self, home, nixpkgs }: diff --git a/hosts/default.nix b/hosts/default.nix index 03386664..092ae6eb 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -27,8 +27,6 @@ let "nixpkgs-overlays=/etc/nixos/overlays" ]; - system.configurationRevision = self.rev; - nixpkgs = { inherit pkgs; }; };