Hello Four month ago, I finally gave Nixos a second try on my work laptop. Since then, I'm learning Nix and I'm really happy with it.
Now I feel comfortable with the Nix syntax and more confident to share some of my patches on top of nixpkgs. I'll be happy to contribute and share all of my pending patches (~20 package updates). Any feedbacks are welcome -- Cordialement, David
>From 9df55bbe460aeab48bcd64eb4b1285c5756ad822 Mon Sep 17 00:00:00 2001 From: David Guibert <[email protected]> Date: Fri, 5 Feb 2010 10:32:04 +0100 Subject: [PATCH 07/25] git-subtree: added the version 0.3. --- .../version-management/git-and-tools/default.nix | 21 ++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 00931aa..699007b 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -107,4 +107,25 @@ rec { git2cl = import ./git2cl { inherit fetchgit stdenv perl; }; + + gitSubtree = stdenv.mkDerivation { + name = "git-subtree-0.3"; + src = fetchurl { + url = "http://github.com/apenwarr/git-subtree/tarball/v0.3";; +# sha256 = "0y57lpbcc2142jgrr4lflyb9xgzs9x33r7g4b919ncn3alb95vdr"; + sha256 = "f2ccac1e9cff4c35d989dc2a5581133c96b72d96c6a5ed89e51b6446dadac03f"; + }; + unpackCmd = "gzip -d < $curSrc | tar xvf -"; + buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; + configurePhase = "export prefix=$out"; + buildPhase = "true"; + installPhase = '' + make install prefix=$out gitdir=$out/bin #work around to deal with a wrong makefile + ''; + meta= { + description = "An experimental alternative to the git-submodule command"; + homepage = http://github.com/apenwarr/git-subtree; + license = "GPLv2"; + }; + }; } -- 1.7.1
>From df79e40b47944528575afe0ac91083bd0bae6b78 Mon Sep 17 00:00:00 2001 From: David Guibert <[email protected]> Date: Sun, 21 Feb 2010 17:20:26 +0100 Subject: [PATCH 08/25] gmime 2.4.15 --- pkgs/development/libraries/gmime/default.nix | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 22facd2..078d7e5 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, glib, zlib}: stdenv.mkDerivation { - name = "gmime-2.2.1"; + name = "gmime-2.4.15"; src = fetchurl { - url = http://spruce.sourceforge.net/gmime/sources/v2.2/gmime-2.2.1.tar.gz; - md5 = "b05e4d6344c8465fb74386e5f1fed45c"; + url = http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.4/gmime-2.4.15.tar.bz2; + sha256 = "a0a6c9413b057ab5d8a2a2902cbaa5b3a17871af3f94dc8431978c9e0e5f53e1"; }; buildInputs = [pkgconfig glib zlib]; } -- 1.7.1
>From 6b4e0bf65fa41b467a8bffb437d17f05ab4a2a17 Mon Sep 17 00:00:00 2001 From: David Guibert <[email protected]> Date: Fri, 5 Mar 2010 18:15:07 +0100 Subject: [PATCH 10/25] libgnomeprintui derivation --- pkgs/desktops/gnome-2.28/default.nix | 7 ++++++- .../platform/libgnomeprintui/default.nix | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) create mode 100644 pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 7a1e66a..a382ee4 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -11,7 +11,6 @@ rec { gnomeicontheme = gnome_icon_theme; # !!! Missing! Need to add these. - libgnomeprintui = throw "libgnomeprintui not implemented"; gnomepanel = throw "gnomepanel not implemented"; gtksourceview_24 = gtksourceview; @@ -53,6 +52,12 @@ rec { inherit (pkgs.gtkLibs) gtk; }; + libgnomeprintui = import ./platform/libgnomeprintui { + inherit intltool libgnomecanvas libgnomeprint gnomeicontheme; + inherit (pkgs) stdenv fetchurl pkgconfig gettext; + inherit (pkgs.gtkLibs) gtk; + }; + libgnomecups = import ./platform/libgnomecups { inherit intltool libart_lgpl; inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix new file mode 100644 index 0000000..76dc310 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}: + +stdenv.mkDerivation { + name = "libgnomeprintui-2.11.1"; + + src = fetchurl { + url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2; + sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490"; + }; + + buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; +} -- 1.7.1
>From 720df54baf58910ddc5bc5820bffad2c960bf940 Mon Sep 17 00:00:00 2001 From: David Guibert <[email protected]> Date: Tue, 23 Mar 2010 15:11:22 +0100 Subject: [PATCH 12/25] gnuplot: updated to version 4.4.0 --- pkgs/tools/graphics/gnuplot/default.nix | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 303bc38..c10777f 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,6 @@ { stdenv, fetchurl, zlib, gd, texinfo +, texLive ? null +, lua ? null , emacs ? null , libX11 ? null , libXt ? null @@ -19,15 +21,15 @@ assert x11Support -> ((libX11 != null) && assert (wxGTK != null) -> x11Support; stdenv.mkDerivation { - name = "gnuplot-4.2.6"; + name = "gnuplot-4.4.0"; src = fetchurl { - url = "mirror://sourceforge/gnuplot/gnuplot-4.2.6.tar.gz"; - sha256 = "10lfmbib3wrzfhvjqk7ffc29fb2aw6m84p4cx6znmgbpc3mw5yw1"; + url = "mirror://sourceforge/gnuplot/gnuplot-4.4.0.tar.gz"; + sha256 = "0akb2lzxa3b0j4nr6anr0mhsk10b1fcnixk8vk9aa82rl1a2rph0"; }; configureFlags = if x11Support then ["--with-x"] else ["--without-x"]; - buildInputs = [zlib gd texinfo readline emacs] ++ + buildInputs = [zlib gd texinfo readline emacs lua texLive] ++ (if x11Support then [libX11 libXt libXpm libXaw] else []) ++ (if wxGTK != null then [wxGTK pango cairo pkgconfig] else []); } -- 1.7.1
_______________________________________________ nix-dev mailing list [email protected] https://mail.cs.uu.nl/mailman/listinfo/nix-dev
