From de499540aeb5d5e9371d5722c6abaa1c3b88530d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 3 Dec 2020 11:15:10 +0100 Subject: [PATCH 1/2] nix-update-source: switch to pname, version --- .../package-management/nix-update-source/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index a2add8f8a78..9b7326db034 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -1,14 +1,16 @@ -{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts -, runtimeShell }: +{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts, runtimeShell }: + python3Packages.buildPythonApplication rec { + pname = "nix-update-source"; version = "0.6.3"; - name = "nix-update-source-${version}"; + src = fetchFromGitHub { owner = "timbertson"; repo = "nix-update-source"; - rev = "version-0.6.3"; + rev = "version-${version}"; sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz"; }; + propagatedBuildInputs = [ nix-prefetch-scripts ]; passthru = { # NOTE: `fetch` should not be used within nixpkgs because it @@ -28,6 +30,7 @@ python3Packages.buildPythonApplication rec { inherit src; overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; }); }; + updateScript = '' #!${runtimeShell} set -e @@ -43,6 +46,7 @@ python3Packages.buildPythonApplication rec { --modify-nix default.nix ''; }; + meta = { description = "Utility to automate updating of nix derivation sources"; maintainers = with lib.maintainers; [ timbertson ]; From 1d63d74e88491497a06ef6c029a198e26093d03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 3 Dec 2020 11:15:21 +0100 Subject: [PATCH 2/2] nix-update-source: Disable tests bceause package does not contain any --- pkgs/tools/package-management/nix-update-source/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index 9b7326db034..ebfd730544e 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -12,6 +12,9 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = [ nix-prefetch-scripts ]; + + doCheck = false; + passthru = { # NOTE: `fetch` should not be used within nixpkgs because it # uses a non-idiomatic structure. It is provided for use by