From c8c6d91b22ac9e7ade783662d41111c0e55147d2 Mon Sep 17 00:00:00 2001 From: David Wood Date: Mon, 16 Sep 2019 16:19:42 +0100 Subject: [PATCH 1/2] maintainers: Add `davidtwco` --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 058561eb624..6ba7937211d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1480,6 +1480,16 @@ github = "davidrusu"; name = "David Rusu"; }; + davidtwco = { + email = "nix@david.davidtw.co"; + github = "davidtwco"; + githubId = 1295100; + name = "David Wood"; + keys = [{ + longkeyid = "rsa4096/0x01760B4F9F53F154"; + fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; + }]; + }; davorb = { email = "davor@davor.se"; github = "davorb"; From 80ddf729869fe65236a18056c1a751d55efc6013 Mon Sep 17 00:00:00 2001 From: David Wood Date: Mon, 16 Sep 2019 16:20:05 +0100 Subject: [PATCH 2/2] pastel: init at 0.5.3 --- pkgs/applications/misc/pastel/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/pastel/default.nix diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix new file mode 100644 index 00000000000..eac6d131b35 --- /dev/null +++ b/pkgs/applications/misc/pastel/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "pastel"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "0f54p3pzfp7xrwlqn61l7j41vmgcfph3bhq2khxh5apfwwdx9nng"; + }; + + cargoSha256 = "05yvlm7z3zfn8qd8nb9zpch9xsfzidrpyrgg2vij3h3q095mdm66"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "A command-line tool to generate, analyze, convert and manipulate colors"; + homepage = https://github.com/sharkdp/pastel; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7668880edbf..6327f792219 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1872,6 +1872,10 @@ in optar = callPackage ../tools/graphics/optar {}; + pastel = callPackage ../applications/misc/pastel { + inherit (darwin.apple_sdk.frameworks) Security; + }; + patdiff = callPackage ../tools/misc/patdiff { }; pbpst = callPackage ../applications/misc/pbpst { };