From 7ec2d943032d5ef4c27b50cef011474dbc8c7b5c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Apr 2020 17:27:29 +0200 Subject: [PATCH] flake.lock: Update Flake input changes: * Updated 'nix': 'github:NixOS/nix/73769b28e376cf1fb3e7248bafaa17c35527925d' -> 'github:NixOS/nix/3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef' * Updated 'nix/nixpkgs': 'github:edolstra/nixpkgs/43e283790fbe330b723ac44b584824cf6d85c1ee' -> 'github:NixOS/nixpkgs/b88ff468e9850410070d4e0ccd68c7011f15b2be' * Updated 'nixpkgs': 'github:edolstra/nixpkgs/54a27fb2fc5fbd8927f9f6dc77fe1de1faa05266' -> 'github:NixOS/nixpkgs/29eddfc36d720dcc4822581175217543b387b1e8' --- flake.lock | 64 +++++++++++++++++++++++++++++------------------------- flake.nix | 2 +- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 0e6304d..702fb24 100644 --- a/flake.lock +++ b/flake.lock @@ -1,34 +1,17 @@ { - "inputs": { + "nodes": { "nix": { "info": { - "lastModified": 1583764121, - "narHash": "sha256-o48N/W0dIqA0h/rdiMxc4XsV3pqfW7B+co4JtvUmgfY=" + "lastModified": 1586440843, + "narHash": "sha256-7YxrpRPmAOoCSl6KtepKCXcae5MUm1Pl+lwDunBFGoo=" }, "inputs": { - "nixpkgs": { - "info": { - "lastModified": 1580555706, - "narHash": "sha256-ly5Gxl9yZgW2w1F3aDU5bvg34Ct+juUaOg8vue+Mkbo=" - }, - "inputs": {}, - "locked": { - "owner": "edolstra", - "repo": "nixpkgs", - "rev": "43e283790fbe330b723ac44b584824cf6d85c1ee", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "release-19.09", - "type": "indirect" - } - } + "nixpkgs": "nixpkgs" }, "locked": { "owner": "NixOS", "repo": "nix", - "rev": "73769b28e376cf1fb3e7248bafaa17c35527925d", + "rev": "3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef", "type": "github" }, "original": { @@ -38,22 +21,45 @@ }, "nixpkgs": { "info": { - "lastModified": 1583402222, - "narHash": "sha256-j7WJlbJD7AO8mhtAMvsqvAFxCprYzg234H8QPaQEWgE=" + "lastModified": 1585405475, + "narHash": "sha256-bESW0n4KgPmZ0luxvwJ+UyATrC6iIltVCsGdLiphVeE=" }, - "inputs": {}, "locked": { - "owner": "edolstra", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "54a27fb2fc5fbd8927f9f6dc77fe1de1faa05266", + "rev": "b88ff468e9850410070d4e0ccd68c7011f15b2be", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "release-19.09", + "ref": "nixos-20.03-small", "type": "indirect" } + }, + "nixpkgs_2": { + "info": { + "lastModified": 1586219474, + "narHash": "sha256-fvfrMnEA2lDnXvH/eInGV5i0sO/EGLVHa4pOek8VG78=" + }, + "locked": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "29eddfc36d720dcc4822581175217543b387b1e8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-20.03", + "type": "indirect" + } + }, + "root": { + "inputs": { + "nix": "nix", + "nixpkgs": "nixpkgs_2" + } } }, - "version": 4 + "root": "root", + "version": 5 } diff --git a/flake.nix b/flake.nix index 45734f9..a5e44a9 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ description = "Script for generating Nixpkgs/NixOS channels"; - inputs.nixpkgs.url = "nixpkgs/release-19.09"; + inputs.nixpkgs.url = "nixpkgs/nixos-20.03"; outputs = { self, nixpkgs, nix }: