From b5ae9ad3fb304bc1625f504e247c39b85bf1f3a1 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Wed, 18 May 2016 17:29:33 +0200 Subject: [PATCH 1/2] dust: use fetchFromGitHub (sha was broken) --- pkgs/development/interpreters/pixie/dust.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index 2478ecf53cb2..cc4f8f619e3a 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -1,11 +1,12 @@ -{ stdenv, pixie, fetchgit }: +{ stdenv, pixie, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "dust-0-91"; - src = fetchgit { - url = "https://github.com/pixie-lang/dust.git"; + src = fetchFromGitHub { + owner = "pixie-lang"; + repo = "dust"; rev = "efe469661e749a71e86858fd006f61464810575a"; - sha256 = "0krh7ynald3gqv9f17a4kfx7sx8i31l6j1fhd5k8b6m8cid7f9c1"; + sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc"; }; buildInputs = [ pixie ]; patches = [ ./make-paths-configurable.patch ]; From 3e39cfe860353a7c7f60de84a4a73560c686c348 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Wed, 18 May 2016 17:29:46 +0200 Subject: [PATCH 2/2] dust: add meta field --- pkgs/development/interpreters/pixie/dust.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index cc4f8f619e3a..877430239101 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -25,4 +25,10 @@ stdenv.mkDerivation rec { cp -a src/ run.pxi $out/share/dust mv dust $out/bin/dust ''; + + meta = { + description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; + homepage = src.meta.homepage; + license = stdenv.lib.licenses.lgpl3; + }; }