From 38a9cc1745418694c15ff2db1ef22804367d1a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 14:46:17 +0100 Subject: [PATCH 1/3] smartdeblur: switch to fetchFromGitHub, update meta --- .../graphics/smartdeblur/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index ccde0c0d9ecb..c82e22ae0ca8 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,13 +1,14 @@ -{ fetchurl, lib, stdenv, cmake, qt4, fftw }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4, fftw }: stdenv.mkDerivation rec { pname = "smartdeblur"; version = "unstable-2013-01-09"; - src = fetchurl { - url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/9895036d26"; - name = "smartdeblur-${version}.tar.gz"; - sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4"; + src = fetchFromGitHub { + owner = "Y-Vladimir"; + repo = "SmartDeblur"; + rev = "9895036d26cbb823a9ade28cdcb26fd0ac37258e"; + sha256 = "sha256-+EbqEpOG1fj2OKmlz8NRF/CGfT2OYGwY5/lwJHCHaMw="; }; preConfigure = '' @@ -19,11 +20,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; - meta = { + meta = with lib; { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ]; - platforms = with lib.platforms; linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } From 662abd6a3cb32aef2b15a3d437a9ed2715693951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 14:46:52 +0100 Subject: [PATCH 2/3] helm-docs: remove default platform --- pkgs/applications/networking/cluster/helm-docs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 346284d3eab0..7214530a046d 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -23,7 +23,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/norwoodj/helm-docs"; description = "A tool for automatically generating markdown documentation for Helm charts"; - platforms = platforms.unix; license = licenses.gpl3Only; maintainers = with maintainers; [ sagikazarmark ]; }; From 4759d5e60c30f6619e30dc2eeb18629242f5ec8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 14:47:03 +0100 Subject: [PATCH 3/3] glog: remove extra lib --- pkgs/development/libraries/glog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 38cd40377a5c..72758a1b3e77 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; - maintainers = with lib.maintainers; [ nh2 r-burns ]; + maintainers = with maintainers; [ nh2 r-burns ]; }; }