From 6a6cd025fccd1b2280ae571b2ef780619a747fbf Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Mon, 7 Jan 2019 19:01:23 +0100
Subject: void: init at 1.1.5

---
 pkgs/tools/misc/void/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/misc/void/default.nix

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
new file mode 100644
index 00000000000..32747ccbf44
--- /dev/null
+++ b/pkgs/tools/misc/void/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "void-${version}";
+  version = "1.1.5";
+
+  src = fetchFromGitHub {
+    owner = "spacejam";
+    repo = "void";
+    rev = "${version}";
+    sha256 = "08vazw4rszqscjz988k89z28skyj3grm81bm5iwknxxagmrb20fz";
+  };
+
+  # The tests are long-running and not that useful
+  checkPhase = null;
+
+  cargoSha256 = "1rq947s82icl7gdkjynjwz426bpmd96dip2dv2y7p8rg7yz29x0m";
+
+  meta = with stdenv.lib; {
+    description = "Terminal-based personal organizer";
+    homepage = https://github.com/spacejam/void;
+    license = licenses.mit;
+    maintainers = with maintainers; [ spacekookie ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ac0b9ce6e1..27a3740f95e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6012,6 +6012,8 @@ in
 
   vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { };
 
+  void = callPackage ../tools/misc/void { };
+
   volume_key = callPackage ../development/libraries/volume-key { };
 
   vorbisgain = callPackage ../tools/misc/vorbisgain { };
-- 
cgit 1.4.1


From 66fe6f10fc79bd431ec38f64c7fe98af96f16944 Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Mon, 7 Jan 2019 21:21:22 +0100
Subject: void: fixing license and changing test setup

---
 pkgs/tools/misc/void/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
index 32747ccbf44..cba89743151 100644
--- a/pkgs/tools/misc/void/default.nix
+++ b/pkgs/tools/misc/void/default.nix
@@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec {
   };
 
   # The tests are long-running and not that useful
-  checkPhase = null;
+  doCheck = false;
 
   cargoSha256 = "1rq947s82icl7gdkjynjwz426bpmd96dip2dv2y7p8rg7yz29x0m";
 
   meta = with stdenv.lib; {
     description = "Terminal-based personal organizer";
     homepage = https://github.com/spacejam/void;
-    license = licenses.mit;
+    license = licenses.gpl3;
     maintainers = with maintainers; [ spacekookie ];
     platforms = platforms.all;
   };
-- 
cgit 1.4.1