[Nix-commits] SVN commit: nix - r30485 - nixpkgs/trunk/pkgs/applications/window-managers/xmonad
Author: simons
Date: Sun Nov 20 10:13:34 2011
New Revision: 30485
URL: https://nixos.org/websvn/nix/?rev=30485sc=1
Log:
haskell-xmonad: updated to version 0.10
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix
Modified: nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix
==
--- nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix Sat Nov
19 20:37:44 2011(r30484)
+++ nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix Sun Nov
20 10:13:34 2011(r30485)
@@ -1,12 +1,13 @@
-{cabal, X11, mtl, xmessage, syb}:
+{ cabal, extensibleExceptions, mtl, utf8String, X11 }:
cabal.mkDerivation (self: {
pname = xmonad;
- name = ${self.fname};
- version = 0.9.2;
- sha256 = 07w5k3pqmybjn0zh2nr1glp69685xg2fhj3z9zxb37x5nzss7kdd;
+ version = 0.10;
+ sha256 = 19z5y36pybsm93x6hlj5hzyys9r4ag7hkdib5spsnryk2mv72xj6;
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ extensibleExceptions mtl utf8String X11 ];
noHaddock = true;
- propagatedBuildInputs = [X11 mtl syb];
meta = {
homepage = http://xmonad.org;;
description = A tiling window manager;
@@ -17,9 +18,4 @@
self.stdenv.lib.maintainers.simons
];
};
-
- preConfigure = ''
-substituteInPlace XMonad/Core.hs --replace \
- 'xmessage' '${xmessage}/bin/xmessage'
- '';
})
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30486 - nixpkgs/trunk/pkgs/applications/window-managers/xmonad
Author: simons
Date: Sun Nov 20 10:13:43 2011
New Revision: 30486
URL: https://nixos.org/websvn/nix/?rev=30486sc=1
Log:
haskell-xmonad-contrib: updated to version 0.10
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
==
--- nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
Sun Nov 20 10:13:34 2011(r30485)
+++ nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
Sun Nov 20 10:13:43 2011(r30486)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = xmonad-contrib;
- version = 0.9.2;
- sha256 = 06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p;
+ version = 0.10;
+ sha256 = 0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq;
buildDepends = [
extensibleExceptions mtl random utf8String X11 X11Xft xmonad
];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30487 - nixpkgs/trunk/pkgs/development/libraries/haskell/smallcheck
Author: simons
Date: Sun Nov 20 10:13:48 2011
New Revision: 30487
URL: https://nixos.org/websvn/nix/?rev=30487sc=1
Log:
haskell-smallcheck: updated to version 0.5
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/smallcheck/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/smallcheck/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/smallcheck/default.nix
Sun Nov 20 10:13:43 2011(r30486)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/smallcheck/default.nix
Sun Nov 20 10:13:48 2011(r30487)
@@ -2,9 +2,10 @@
cabal.mkDerivation (self: {
pname = smallcheck;
- version = 0.4;
- sha256 = 0nq13jm3akrmgk6n2clisip16v0jf1xkm0hm678v63s87hxqb1ma;
+ version = 0.5;
+ sha256 = 10bmaifpkd5h3fp76cgbbc21q6nd0v8b3f80fjnb1ggg5zqs10dv;
meta = {
+homepage = https://github.com/feuerbach/smallcheck;;
description = Another lightweight testing library in Haskell;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30488 - nixpkgs/trunk/pkgs/applications/window-managers/xmonad
Author: simons
Date: Sun Nov 20 10:21:38 2011
New Revision: 30488
URL: https://nixos.org/websvn/nix/?rev=30488sc=1
Log:
xmonad: patch source code to refer to xmessage(1) using its complete path
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix
Modified: nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix
==
--- nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix Sun Nov
20 10:13:48 2011(r30487)
+++ nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix Sun Nov
20 10:21:38 2011(r30488)
@@ -1,4 +1,4 @@
-{ cabal, extensibleExceptions, mtl, utf8String, X11 }:
+{ cabal, extensibleExceptions, mtl, utf8String, X11, xmessage }:
cabal.mkDerivation (self: {
pname = xmonad;
@@ -18,4 +18,9 @@
self.stdenv.lib.maintainers.simons
];
};
+
+ preConfigure = ''
+substituteInPlace XMonad/Core.hs --replace \
+ 'xmessage' '${xmessage}/bin/xmessage'
+ '';
})
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30489 - in nixos/trunk/modules: . programs
Author: simons
Date: Sun Nov 20 10:38:26 2011
New Revision: 30489
URL: https://nixos.org/websvn/nix/?rev=30489sc=1
Log:
modules/programs/wvdial.nix: added support for configuring wvdial
For example, I use the following settings to configure T-Mobile Internet
access on my laptop, which is connected to the cell phone by USB:
| environment.wvdial.dialerDefaults = ''
| Init1 = AT+CGDCONT=1,IP,internet.t-mobile
| Modem Type = USB Modem
| Phone = *99#
| ISDN = 0
| Username = tm
| Password = tm
| Modem = /dev/ttyACM0
| Baud = 460800
| '';
Added:
nixos/trunk/modules/programs/wvdial.nix
Modified:
nixos/trunk/modules/module-list.nix
Modified: nixos/trunk/modules/module-list.nix
==
--- nixos/trunk/modules/module-list.nix Sun Nov 20 10:21:38 2011(r30488)
+++ nixos/trunk/modules/module-list.nix Sun Nov 20 10:38:26 2011(r30489)
@@ -38,6 +38,7 @@
./programs/shadow.nix
./programs/ssh.nix
./programs/ssmtp.nix
+ ./programs/wvdial.nix
./rename.nix
./security/ca.nix
./security/consolekit.nix
Added: nixos/trunk/modules/programs/wvdial.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/programs/wvdial.nix Sun Nov 20 10:38:26 2011
(r30489)
@@ -0,0 +1,73 @@
+# Global configuration for wvdial.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+ configFile = ''
+[Dialer Defaults]
+PPPD PATH = ${pkgs.ppp}/sbin/pppd
+${config.environment.wvdial.dialerDefaults}
+ '';
+
+ cfg = config.environment.wvdial;
+
+in
+{
+ ## interface
+
+ options = {
+
+environment.wvdial = {
+
+ dialerDefaults = mkOption {
+default = ;
+type = types.string;
+example = ''Init1 = AT+CGDCONT=1,IP,internet.t-mobile'';
+description = ''
+ Contents of the Dialer Defaults section of
+ filename/etc/wvdial.conf/filename.
+'';
+ };
+
+ pppDefaults = mkOption {
+default = ''
+ noipdefault
+ usepeerdns
+ defaultroute
+ persist
+ noauth
+'';
+type = types.string;
+description = Default ppp settings for wvdial.;
+ };
+
+};
+
+ };
+
+ ## implementation
+
+ config = mkIf (cfg.dialerDefaults != ) {
+
+environment = {
+
+ etc =
+ [
+{ source = pkgs.writeText wvdial.conf configFile;
+ target = wvdial.conf;
+}
+{ source = pkgs.writeText wvdial cfg.pppDefaults;
+ target = ppp/peers/wvdial;
+}
+ ];
+
+ systemPackages = [ pkgs.wvdial ];
+
+};
+
+ };
+
+}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] [RFC] Merging of multiple-outputs-sandbox into trunk
Hi Eelco, On 11/6/11 2:26 AM, Shea Levy wrote: On 11/6/11 2:18 AM, Shea Levy wrote: Author: shlevy Date: Sun Nov 6 07:18:19 2011 New Revision: 30258 URL: https://nixos.org/websvn/nix/?rev=30258sc=1 Hi all (especially Eelco), With this commit, I believe the multiple-outputs-sandbox branch is ready for consideration to be merged into nix trunk. Have you had a chance to take a look at this yet? Cheers, Shea ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30491 - nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch
Author: chaoflow
Date: Sun Nov 20 19:22:53 2011
New Revision: 30491
URL: https://nixos.org/websvn/nix/?rev=30491sc=1
Log:
notmuch-0.9
Modified:
nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
Sun Nov 20 17:10:54 2011(r30490)
+++ nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
Sun Nov 20 19:22:53 2011(r30491)
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig,
talloc, xapian }:
stdenv.mkDerivation rec {
- name = notmuch-0.8;
+ name = notmuch-0.9;
src = fetchurl {
url = http://notmuchmail.org/releases/${name}.tar.gz;;
-sha256 =
f40bcdc6447cae9f76d5b4e70ab70d87e4a813cd123b524c1dc3155a3371a949;
+sha256 =
e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4;
};
buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian
];
@@ -13,6 +13,7 @@
patchPhase = ''
(cd test for prg in \
aggregate-results.sh \
+atomicity \
author-order \
basic \
crypto \
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30492 - nix/trunk
Author: eelco Date: Sun Nov 20 19:23:50 2011 New Revision: 30492 URL: https://nixos.org/websvn/nix/?rev=30492sc=1 Log: * sed on FreeBSD doesn't know the + operator. Modified: nix/trunk/configure.ac Modified: nix/trunk/configure.ac == --- nix/trunk/configure.ac Sun Nov 20 19:22:53 2011(r30491) +++ nix/trunk/configure.ac Sun Nov 20 19:23:50 2011(r30492) @@ -27,13 +27,10 @@ linux-gnu*) # For backward compatibility, strip the `-gnu' part. system=$machine_name-linux;; - freebsd*) - # Strip the version number (e.g. freebsd8.2). - system=$machine_name-freebsd;; *) # Strip the version number from names such as `gnu0.3', # `darwin10.2.0', etc. - system=$machine_name-`echo $host_os | $SED -e's/[0-9.]\+$//g'`;; + system=$machine_name-`echo $host_os | $SED -e's/[0-9.]*$//g'`;; esac]) AC_MSG_RESULT($system) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30493 - nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html
Author: simons
Date: Sun Nov 20 19:25:13 2011
New Revision: 30493
URL: https://nixos.org/websvn/nix/?rev=30493sc=1
Log:
haskell-blaze-html: updated to version 0.4.2.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix
Sun Nov 20 19:23:50 2011(r30492)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix
Sun Nov 20 19:25:13 2011(r30493)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = blaze-html;
- version = 0.4.2.1;
- sha256 = 0hm2jnz9n68njdrrq73a558qxl2jwcvxmy62mvf2v9q96wyp07yj;
+ version = 0.4.2.2;
+ sha256 = 1fg0qgqml7ar3m0as9sk9zc260j2jvdsf5cdfrsify5l62ip060f;
buildDepends = [ blazeBuilder text ];
meta = {
homepage = http://jaspervdj.be/blaze;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] [Nix-commits] SVN commit: nix - r30466 - nix/trunk
On 11/19/2011 11:36 PM, Ludovic Courtès wrote: Out of curiosity, where did you get “amd64”? GNU config.guess always returns “x86_64”: http://git.savannah.gnu.org/cgit/config.git/tree/config.sub#n466. Apparently not on FreeBSD: [nix@beastie ~/nix-1.0pre30457]$ ./config/config.guess amd64-unknown-freebsd8.2 @@ -25,6 +27,9 @@ linux-gnu*) # For backward compatibility, strip the `-gnu' part. system=$machine_name-linux;; + freebsd*) +# Strip the version number (e.g. freebsd8.2). +system=$machine_name-freebsd;; *) # Strip the version number from names such as `gnu0.3', # `darwin10.2.0', etc. The FreeBSD case is handled right below, isn’t it? Thanks, I didn't see that. The default case didn't work because FreeBSD's sed doesn't support the + operator. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r30494 - nixpkgs/trunk/pkgs/stdenv
Author: ludo
Date: Sun Nov 20 20:42:05 2011
New Revision: 30494
URL: https://nixos.org/websvn/nix/?rev=30494sc=1
Log:
stdenv adapters: Use `toString' instead of `exprToString'.
Modified:
nixpkgs/trunk/pkgs/stdenv/adapters.nix
Modified: nixpkgs/trunk/pkgs/stdenv/adapters.nix
==
--- nixpkgs/trunk/pkgs/stdenv/adapters.nix Sun Nov 20 19:25:13 2011
(r30493)
+++ nixpkgs/trunk/pkgs/stdenv/adapters.nix Sun Nov 20 20:42:05 2011
(r30494)
@@ -302,7 +302,7 @@
else
null;
in
-builtins.trace @:drv:${toString drvPath}:${builtins.exprToString
license}:@
+builtins.trace @:drv:${toString drvPath}:${builtins.toString
license}:@
val;
in pkg // {
outPath = printDrvPath pkg.outPath;
@@ -338,12 +338,10 @@
validate = arg:
if licensePred license then arg
-else abort
- Error while building ${builtins.unsafeDiscardStringContext
pkg.drvPath}:
- The license predicate is not verified.
-
- bad license: ${builtins.exprToString license}
-;
+else abort ''
+ while building ${builtins.unsafeDiscardStringContext
pkg.drvPath}:
+ license `${builtins.toString license}' does not pass the
predicate.
+'';
in pkg // {
outPath = validate pkg.outPath;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30495 - nixpkgs/trunk/pkgs/applications/misc/adobe-reader
Author: ludo
Date: Sun Nov 20 20:42:24 2011
New Revision: 30495
URL: https://nixos.org/websvn/nix/?rev=30495sc=1
Log:
Adobe Reader: Set `meta.license'.
Modified:
nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix Sun Nov
20 20:42:05 2011(r30494)
+++ nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix Sun Nov
20 20:42:24 2011(r30495)
@@ -28,5 +28,6 @@
meta = {
description = Adobe Reader, a viewer for PDF documents;
homepage = http://www.adobe.com/products/reader;
+license = unfree;
};
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30496 - nixpkgs/trunk/pkgs/stdenv
Author: ludo
Date: Sun Nov 20 20:53:15 2011
New Revision: 30496
URL: https://nixos.org/websvn/nix/?rev=30496sc=1
Log:
validateLicenses: Warn about derivations lacking licensing information.
Modified:
nixpkgs/trunk/pkgs/stdenv/adapters.nix
Modified: nixpkgs/trunk/pkgs/stdenv/adapters.nix
==
--- nixpkgs/trunk/pkgs/stdenv/adapters.nix Sun Nov 20 20:42:24 2011
(r30495)
+++ nixpkgs/trunk/pkgs/stdenv/adapters.nix Sun Nov 20 20:53:15 2011
(r30496)
@@ -330,16 +330,22 @@
{ mkDerivation = args:
let
pkg = stdenv.mkDerivation args;
+ drv = builtins.unsafeDiscardStringContext pkg.drvPath;
license =
if pkg ? meta pkg.meta ? license then
pkg.meta.license
+else if pkg ? outputHash then
+ # Fixed-output derivations such as source tarballs usually
+ # don't have licensing information, but that's OK.
+ null
else
- null;
+ builtins.trace
+warning: ${drv} lacks licensing information null;
validate = arg:
if licensePred license then arg
else abort ''
- while building ${builtins.unsafeDiscardStringContext
pkg.drvPath}:
+ while building ${drv}:
license `${builtins.toString license}' does not pass the
predicate.
'';
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30497 - in nixpkgs/trunk/pkgs: tools/misc/dtach top-level
Author: chaoflow
Date: Sun Nov 20 21:48:56 2011
New Revision: 30497
URL: https://nixos.org/websvn/nix/?rev=30497sc=1
Log:
add dtach-0.8
Added:
nixpkgs/trunk/pkgs/tools/misc/dtach/
nixpkgs/trunk/pkgs/tools/misc/dtach/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/misc/dtach/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/misc/dtach/default.nix Sun Nov 20 21:48:56
2011(r30497)
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = dtach-0.8;
+
+ src = fetchurl {
+url = mirror://sourceforge/project/dtach/dtach/0.8/dtach-0.8.tar.gz;
+sha256 =
16614ebddf8ab2811d3dc0e7f329c7de88929ac6a9632d4cb4aef7fe11b8f2a9;
+ };
+
+ installPhase = ''
+ensureDir $out/bin
+cp dtach $out/bin/dtach
+ '';
+
+ meta = {
+homepage = http://dtach.sourceforge.net/;
+description = A program that emulates the detach feature of screen;
+
+longDescription = ''dtach is a tiny program that emulates the
+ detach feature of screen, allowing you to run a program in an
+ environment that is protected from the controlling terminal and
+ attach to it later. dtach does not keep track of the contents of
+ the screen, and thus works best with programs that know how to
+ redraw themselves.'';
+
+license = stdenv.lib.licenses.gpl2Plus;
+
+platforms = stdenv.lib.platforms.unix;
+maintainers = [ stdenv.lib.maintainers.chaoflow ];
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Nov 20 20:53:15
2011(r30496)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Nov 20 21:48:56
2011(r30497)
@@ -603,6 +603,8 @@
zlib = zlibStatic;
};
+ dtach = callPackage ../tools/misc/dtach { };
+
duplicity = callPackage ../tools/backup/duplicity {
inherit (pythonPackages) boto;
gnupg = gnupg1;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30498 - nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch
Author: chaoflow
Date: Sun Nov 20 21:49:06 2011
New Revision: 30498
URL: https://nixos.org/websvn/nix/?rev=30498sc=1
Log:
notmuch use license path instead of string
Modified:
nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
==
--- nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
Sun Nov 20 21:48:56 2011(r30497)
+++ nixpkgs/trunk/pkgs/applications/networking/mailreaders/notmuch/default.nix
Sun Nov 20 21:49:06 2011(r30498)
@@ -53,11 +53,8 @@
meta = {
description = Notmuch -- The mail indexer;
-
longDescription = ;
-
-license = GPLv3;
-
+license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.chaoflow ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30499 - in nixpkgs/trunk/pkgs/development/libraries/xapian: . bindings
Author: chaoflow
Date: Sun Nov 20 21:49:13 2011
New Revision: 30499
URL: https://nixos.org/websvn/nix/?rev=30499sc=1
Log:
xapian(-bindings) use license path instead of string
Modified:
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
Sun Nov 20 21:49:06 2011(r30498)
+++ nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
Sun Nov 20 21:49:13 2011(r30499)
@@ -68,7 +68,7 @@
meta = {
description = Bindings for the Xapian library;
homepage = xapian.meta.homepage;
-license = GPLv2+;
+license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.chaoflow ];
};
}
Modified: nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix Sun Nov 20
21:49:06 2011(r30498)
+++ nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix Sun Nov 20
21:49:13 2011(r30499)
@@ -13,7 +13,7 @@
meta = {
description = Xapian Probabilistic Information Retrieval library;
homepage = http://xapian.org;;
-license = GPLv2+;
+license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.chaoflow ];
};
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30500 - in nixpkgs/trunk/pkgs/development/libraries/xapian: . bindings
Author: chaoflow
Date: Sun Nov 20 21:49:20 2011
New Revision: 30500
URL: https://nixos.org/websvn/nix/?rev=30500sc=1
Log:
xapian(-bindings)-1.2.7
Modified:
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
Sun Nov 20 21:49:13 2011(r30499)
+++ nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
Sun Nov 20 21:49:20 2011(r30500)
@@ -5,11 +5,11 @@
composableDerivation.composableDerivation {} rec {
- name = xapian-bindings-1.2.5;
+ name = xapian-bindings-1.2.7;
src = fetchurl {
-url = http://oligarchy.co.uk/xapian/1.2.5/${name}.tar.gz;;
-sha256 =
0d723af62b8d633cd49fdf92058a4985061659454b390c0c08db05fa4f7fb09c;
+url = http://oligarchy.co.uk/xapian/1.2.7/${name}.tar.gz;;
+sha256 =
c9f63ad7a032c260f0617e029327d7b05dd986d91af401032268a9f7b2eabde8;
};
buildInputs = [ xapian pkgconfig zlib ];
Modified: nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix Sun Nov 20
21:49:13 2011(r30499)
+++ nixpkgs/trunk/pkgs/development/libraries/xapian/default.nix Sun Nov 20
21:49:20 2011(r30500)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libuuid, zlib }:
stdenv.mkDerivation {
- name = xapian-1.2.5;
+ name = xapian-1.2.7;
src = fetchurl {
-url = http://oligarchy.co.uk/xapian/1.2.5/xapian-core-1.2.5.tar.gz;
-sha256 =
392ccfccb4372725be24509e5ee95a7422f07c3d47d0cbdbb8545e789cc936f7;
+url = http://oligarchy.co.uk/xapian/1.2.7/xapian-core-1.2.7.tar.gz;
+sha256 =
6ce8cb3502f35245ec0cb0dcf579ce4f65c015a2f2e8d1b4c388c95f58278c89;
};
buildInputs = [ libuuid zlib ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30501 - nixpkgs/trunk/pkgs/development/libraries/libidn
Author: shlevy
Date: Sun Nov 20 21:51:17 2011
New Revision: 30501
URL: https://nixos.org/websvn/nix/?rev=30501sc=1
Log:
libidn: Don't run tests on darwin, something is wrong with the testing script
Modified:
nixpkgs/trunk/pkgs/development/libraries/libidn/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libidn/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/libidn/default.nix Sun Nov 20
21:49:20 2011(r30500)
+++ nixpkgs/trunk/pkgs/development/libraries/libidn/default.nix Sun Nov 20
21:51:17 2011(r30501)
@@ -8,7 +8,7 @@
sha256 = 1vc8yni7sg5iq1ijg9l558pa4v6c1v5l57zc024lgxcmhy35wxig;
};
- doCheck = true;
+ doCheck = ! stdenv.isDarwin;
meta = {
homepage = http://www.gnu.org/software/libidn/;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
