From 9eed726b4fecdd6ea9a19260b8237e441bf4850b Mon Sep 17 00:00:00 2001 From: neeasade Date: Sat, 18 Mar 2017 20:59:09 -0500 Subject: [PATCH 1/2] colort: init at unstable-2017-03-13 --- pkgs/applications/misc/colort/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/misc/colort/default.nix diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix new file mode 100644 index 00000000000..1c2da306902 --- /dev/null +++ b/pkgs/applications/misc/colort/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "colort-unstable-2017-03-12"; + + src = fetchFromGitHub { + owner = "neeasade"; + repo = "colort"; + rev = "8470190706f358dc807b4c26ec3453db7f0306b6"; + sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw"; + }; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = { + description = "A program for 'tinting' color values"; + homepage = https://github.com/neeasade/colort; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 648a232d010..5b3ff985a80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17693,6 +17693,8 @@ with pkgs; crashplan = callPackage ../applications/backup/crashplan { }; + colort = callPackage ../applications/misc/colort { }; + e17gtk = callPackage ../misc/themes/e17gtk { }; epson-escpr = callPackage ../misc/drivers/epson-escpr { }; From 14d676dfcf74c7057350d94dc1841125a8043d83 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sun, 19 Mar 2017 03:39:40 -0400 Subject: [PATCH 2/2] colort: PR tweaks --- pkgs/applications/misc/colort/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix index 1c2da306902..a9e7e57fc8d 100644 --- a/pkgs/applications/misc/colort/default.nix +++ b/pkgs/applications/misc/colort/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "colort-unstable-2017-03-12"; src = fetchFromGitHub { @@ -10,14 +10,12 @@ stdenv.mkDerivation rec { sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw"; }; - installPhase = '' - make install PREFIX=$out - ''; + makeFlags = ["PREFIX=$(out)"]; - meta = { + meta = with stdenv.lib; { description = "A program for 'tinting' color values"; homepage = https://github.com/neeasade/colort; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + platforms = platforms.all; }; }