Hi, On 21/05/2010 11:48, David Guibert wrote: > I have several patches upon the svn trunk of nixpkgs:
I have write access, so I've just commit most of my patches. > - update dmenu to revision 297: -e <winid> feature > - add surf from suckless (revision 202) Does anyone rely on the released version of dmenu? Or may I push these two patches? -- Regards, David
>From 9dfaef0869636f092da657c27a2188f0605a44a7 Mon Sep 17 00:00:00 2001 From: David Guibert <[email protected]> Date: Wed, 14 Apr 2010 14:44:06 +0200 Subject: [PATCH 1/2] add surf from suckless (revision 202) --- pkgs/applications/misc/surf/default.nix | 33 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 pkgs/applications/misc/surf/default.nix diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix new file mode 100644 index 0000000..107b16d --- /dev/null +++ b/pkgs/applications/misc/surf/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchhg, gtk, webkit, pkgconfig, glib, libsoup, patches ? null}: + +let +tag="202"; +version = "0.3-r"+tag; +md5 = "e9b6eca3e22c300dd053c35b33af3f51"; +in +stdenv.mkDerivation rec { + name = "surf-" + version; + + src = fetchhg { + url = "http://hg.suckless.org/surf";; + inherit md5 tag; + }; + + buildInputs = [ gtk webkit pkgconfig glib libsoup ]; + + # Allow users set their own list of patches + inherit patches; + + buildPhase = " make "; + +# `-lX11' to make sure libX11's store path is in the RPATH + NIX_LDFLAGS = "-lX11"; + preConfigure = [ ''sed -i "s...@prefix = /usr/lo...@prefix = $...@g" config.mk'' ]; + + meta = { + description = "surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties."; + homepage = http://surf.suckless.org; + license = "MIT"; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aaae0a..93966d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8584,6 +8584,11 @@ let httpd = pkgsOverriden.apacheHttpd; }; + surf = makeOverridable (import ../applications/misc/surf) { + inherit fetchhg stdenv webkit pkgconfig; + inherit (gtkLibs) gtk glib; + libsoup = gnome28.libsoup; + }; svk = perlPackages.SVK; sylpheed = import ../applications/networking/mailreaders/sylpheed { -- 1.7.1
>From fc62cc176e24063f10c3c75494a011f96080b5a8 Mon Sep 17 00:00:00 2001 From: David Guibert <[email protected]> Date: Wed, 14 Apr 2010 14:47:27 +0200 Subject: [PATCH 2/2] update dmenu to revision 297: -e <winid> feature --- pkgs/applications/misc/dmenu/default.nix | 16 +++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 5ec8c21..46aee9d 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,17 @@ -{stdenv, fetchurl, libX11, libXinerama}: +{stdenv, fetchhg, libX11, libXinerama}: +let +version="0.4-r" + tag; +tag = "297"; +md5="b1d0b75bd30655895fe922432c8f3f90"; + +in stdenv.mkDerivation rec { - name = "dmenu-4.0"; + name = "dmenu-" + version; - src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz";; - sha256 = "0qp8n9hz15lzqp5dnq6lqknxhmlrgv20x2bnbc2zr891bql0hif0"; + src = fetchhg { + url = "http://hg.suckless.org/dmenu";; + inherit md5 tag; }; buildInputs = [ libX11 libXinerama ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93966d9..20e4d98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7500,7 +7500,7 @@ let }; dmenu = import ../applications/misc/dmenu { - inherit fetchurl stdenv; + inherit fetchhg stdenv; inherit (xlibs) libX11 libXinerama; }; -- 1.7.1
_______________________________________________ nix-dev mailing list [email protected] https://mail.cs.uu.nl/mailman/listinfo/nix-dev
