Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gup: new package #9653

Merged
merged 1 commit into from Sep 8, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/maintainers.nix
Expand Up @@ -104,6 +104,7 @@
garrison = "Jim Garrison <jim@garrison.cc>";
gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
gebner = "Gabriel Ebner <gebner@gebner.org>";
gfxmonk = "Tim Cuthbertson <tim@gfxmonk.net>";
giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
globin = "Robin Gloster <robin@glob.in>";
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
Expand Down
16 changes: 16 additions & 0 deletions pkgs/development/tools/build-managers/gup/build.nix
@@ -0,0 +1,16 @@
# NOTE: this file is copied from the upstream repository for this package.
# Please submit any changes you make here to https://github.com/gfxmonk/gup/

{ stdenv, lib, python, which, pychecker ? null }:
{ src, version, meta ? {} }:
stdenv.mkDerivation {
inherit src meta;
name = "gup-${version}";
buildInputs = lib.remove null [ python which pychecker ];
SKIP_PYCHECKER = pychecker == null;
buildPhase = "make python";
installPhase = ''
mkdir $out
cp -r python/bin $out/bin
'';
}
20 changes: 20 additions & 0 deletions pkgs/development/tools/build-managers/gup/default.nix
@@ -0,0 +1,20 @@
{ stdenv, fetchgit, lib, python, which }:
let
version = "0.5.1";
src = fetchgit {
url = "https://github.com/gfxmonk/gup.git";
rev = "f185052e2177ed5e46720e6c6cfb529b96cd17e2";
sha256 = "c2e27cdba2231017ceb4868f58f5c3b224be0491b81558b4e59bb08a952ad1a5";
};
in
import ./build.nix
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why such strange way of pkg building? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a bit strange because it's separated into local (default.nix) and upstream (build.nix) parts. The build.nix file is copied verbatim from https://github.com/gfxmonk/gup/blob/master/nix/gup-python.nix, because the upstream author (me) uses nix for development as well. This way the same build expression can be used for both development and in nixpkgs (aside from src which will usually differ between the two, and meta which is unnecessary in development).

{ inherit stdenv lib python which; }
{ inherit src version;
meta = {
description = "A better make, inspired by djb's redo";
homepage = https://github.com/gfxmonk/gup;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.gfxmonk ];
platforms = stdenv.lib.platforms.all;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -1805,6 +1805,8 @@ let

gummiboot = callPackage ../tools/misc/gummiboot { };

gup = callPackage ../development/tools/build-managers/gup {};

gupnp = callPackage ../development/libraries/gupnp {
inherit (gnome) libsoup;
};
Expand Down