From fa467de0902ff9efa9b4b084a77e7f3752f7eac0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Feb 2020 18:59:29 +0100 Subject: [PATCH] Update flake.lock --- flake.lock | 30 +++++++++++++++++++++--------- flake.nix | 3 +-- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 46e6c9dc5..13e10e611 100644 --- a/flake.lock +++ b/flake.lock @@ -1,11 +1,23 @@ { - "inputs": { - "nixpkgs": { - "inputs": {}, - "narHash": "sha256-V4jz8Hbt+mZkXhH+3KmUQcRGETOFd8mVPhgQlS4Lu5E=", - "originalUrl": "flake:nixpkgs/release-19.09", - "url": "github:edolstra/nixpkgs/dd45a16733f4469a0dded6ad0bf9a662ea39bdea" - } - }, - "version": 3 + "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" + } + } + }, + "version": 4 } diff --git a/flake.nix b/flake.nix index 66b9098a3..af531b50d 100644 --- a/flake.nix +++ b/flake.nix @@ -213,8 +213,7 @@ name = "nix-tarball"; version = builtins.readFile ./.version; versionSuffix = if officialRelease then "" else - "pre${builtins.substring 0 8 self.lastModified}" + - (if self ? shortRev then "_${self.shortRev}" else ""); + "pre${builtins.substring 0 8 self.lastModified}_${self.shortRev or "dirty"}"; src = self; inherit officialRelease;