From d09ed00e2ded5fe545402d347669baee47da7e70 Mon Sep 17 00:00:00 2001 From: Richard Lupton Date: Wed, 22 Mar 2017 22:44:19 +0000 Subject: [PATCH 1/2] cde: init at 0.1 --- pkgs/tools/package-management/cde/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/package-management/cde/default.nix diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix new file mode 100644 index 000000000000..8261cc9e4cfa --- /dev/null +++ b/pkgs/tools/package-management/cde/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "cde-0.1"; + src = fetchgit { + url = "https://github.com/pgbovine/CDE.git"; + sha256 = ""; + rev = "551e54d95eb3f8eefc698891f1b873fc4f02f360"; + }; + + # The build is small, so there should be no problem + # running this locally. There is also a use case for + # older systems, where modern binaries might not be + # useful. + preferLocalBuild = true; + + patchBuild = '' + sed '/install/d' $src/Makefile > $src/Makefile + ''; + + installPhase = '' + mkdir -p $out/bin + cp cde $out/bin + cp cde-exec $out/bin + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/pgbovine/CDE"; + description = "A packaging tool for building portable packages"; + license = licenses.gpl3; + maintainers = [ maintainers.rlupton20 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e086fd0b153e..489eddb0a151 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -736,6 +736,8 @@ with pkgs; catclock = callPackage ../applications/misc/catclock { }; + cde = callPackage ../tools/package-management/cde { }; + cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; From 16d2799af22320334332dd8049071d2a62a8711c Mon Sep 17 00:00:00 2001 From: ndowens Date: Thu, 23 Mar 2017 18:04:36 -0500 Subject: [PATCH 2/2] Changed fetchgit to fetchFromGitHub --- pkgs/tools/package-management/cde/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index 8261cc9e4cfa..17150c75466e 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "cde-0.1"; - src = fetchgit { - url = "https://github.com/pgbovine/CDE.git"; - sha256 = ""; - rev = "551e54d95eb3f8eefc698891f1b873fc4f02f360"; +stdenv.mkDerivation rec { + name = "cde-${version}"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "pgbovine"; + repo = "CDE"; + sha256 = "0raiz7pczkbnzxpg7g59v7gdp1ipkwgms2vh3431snw1va1gjzmk"; + rev = "v${version}"; }; # The build is small, so there should be no problem @@ -25,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "https://github.com/pgbovine/CDE"; + homepage = https://github.com/pgbovine/CDE; description = "A packaging tool for building portable packages"; license = licenses.gpl3; maintainers = [ maintainers.rlupton20 ];