[Nix-commits] SVN commit: nix - r28558 - in nixpkgs/trunk/pkgs: applications/window-managers/trayer top-level
Author: shlevy
Date: Sun Aug 14 05:03:54 2011
New Revision: 28558
URL: https://svn.nixos.org/websvn/nix/?rev=28558&sc=1
Log:
Add trayer
Added:
nixpkgs/trunk/pkgs/applications/window-managers/trayer/
nixpkgs/trunk/pkgs/applications/window-managers/trayer/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/window-managers/trayer/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/window-managers/trayer/default.nix Sun Aug
14 05:03:54 2011(r28558)
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, gdk_pixbuf, gtk, libXmu }:
+
+stdenv.mkDerivation rec {
+ name = "trayer-1.1.3";
+
+ buildInputs = [ pkgconfig gdk_pixbuf gtk libXmu ];
+
+ src = fetchurl {
+ url = "https://github.com/sargon/trayer-srg/tarball/${name}";;
+ name = "${name}.tar.gz";
+ sha256 =
"03be5ea47278ecdb6ffb1d3b5115a855a6eccd6aa6702b84e89ee047ddd76558";
+};
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = {
+homepage = http://github.com/sargon/trayer-srg;
+
+license = "bsd";
+
+description = "A lightweight GTK2-based systray for UNIX desktop";
+
+maintainers = [ stdenv.lib.maintainers.shlevy ];
+
+platforms = stdenv.lib.platforms.linux;
+ };
+}
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 13 23:39:01
2011(r28557)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Aug 14 05:03:54
2011(r28558)
@@ -7244,6 +7244,10 @@
transmission = callPackage ../applications/networking/p2p/transmission { };
+ trayer = callPackage ../applications/window-managers/trayer {
+inherit (gtkLibs) gdk_pixbuf;
+ };
+
tree = callPackage ../tools/system/tree { };
tribler = callPackage ../applications/networking/p2p/tribler { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28557 - nixpkgs/trunk/pkgs/development/tools/haskell/hlint
Author: simons
Date: Sat Aug 13 23:39:01 2011
New Revision: 28557
URL: https://svn.nixos.org/websvn/nix/?rev=28557&sc=1
Log:
haskell-hlint: updated to version 1.8.15
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Sat Aug
13 23:38:52 2011(r28556)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Sat Aug
13 23:39:01 2011(r28557)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
- version = "1.8.14";
- sha256 = "16gjn404ar6i9cn1fyj6yqdr4qbpswwa6w2k06bbjqcnca8l9gin";
+ version = "1.8.15";
+ sha256 = "1hi2qapi8lb7cawjzvpknp8qvsnfw3glxyyd5m2lbp3rvkx0d6kr";
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28556 - nixpkgs/trunk/pkgs/development/libraries/haskell/terminfo
Author: simons
Date: Sat Aug 13 23:38:52 2011
New Revision: 28556
URL: https://svn.nixos.org/websvn/nix/?rev=28556&sc=1
Log:
haskell-terminfo: updated to version 0.3.2.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/terminfo/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/terminfo/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/terminfo/default.nix
Sat Aug 13 23:38:48 2011(r28555)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/terminfo/default.nix
Sat Aug 13 23:38:52 2011(r28556)
@@ -1,13 +1,14 @@
-{cabal, extensibleExceptions, ncurses}:
+{ cabal, extensibleExceptions, ncurses }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "terminfo";
- version = "0.3.2";
- sha256 = "0sfb6p6gj29wahp45plai7bygyyhhcaw6ld5xf90clkxy5pcsw1a";
- propagatedBuildInputs = [extensibleExceptions ncurses];
+ version = "0.3.2.2";
+ sha256 = "1370vxvv32aarmk64yvwb8rav523xk7fg5h65cgxvn4ppjqv0f51";
+ buildDepends = [ extensibleExceptions ];
+ extraLibraries = [ ncurses ];
meta = {
homepage = "http://code.haskell.org/terminfo";;
-description = "Haskell bindings to the terminfo library.";
+description = "Haskell bindings to the terminfo library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28555 - nixpkgs/trunk/pkgs/development/compilers/idris
Author: simons
Date: Sat Aug 13 23:38:48 2011
New Revision: 28555
URL: https://svn.nixos.org/websvn/nix/?rev=28555&sc=1
Log:
haskell-idris: updated to version 0.1.7.1
Modified:
nixpkgs/trunk/pkgs/development/compilers/idris/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/idris/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/idris/default.nix Sat Aug 13
23:38:44 2011(r28554)
+++ nixpkgs/trunk/pkgs/development/compilers/idris/default.nix Sat Aug 13
23:38:48 2011(r28555)
@@ -1,15 +1,22 @@
-{cabal, mtl, parsec, readline, ivor, epic, happy}:
+{ cabal, binary, epic, ivor, mtl, parsec, readline, happy }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "idris";
- name = self.fname;
- version = "0.1.5";
- sha256 = "8acdfc22ba2e68b6c1832c2d5fcf11405df9416ba2c193f564b6f98710e9813e";
- propagatedBuildInputs = [mtl parsec readline ivor epic];
- extraBuildInputs = [happy];
+ version = "0.1.7.1";
+ sha256 = "1449fy7ld2p6ksn43bvhpa5z7j8vx4wc2szwq85wzpwfaw10d8wb";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ binary epic ivor mtl parsec readline ];
+ buildTools = [ happy ];
+ noHaddock = true;
meta = {
-description = "An experimental language with full dependent types";
-license = "BSD";
-maintainers = [self.stdenv.lib.maintainers.andres];
+homepage = "http://www.cs.st-andrews.ac.uk/~eb/Idris/";;
+description = "Dependently Typed Functional Programming Language";
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
};
})
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28554 - nixpkgs/trunk/pkgs/applications/misc/xmobar
Author: simons
Date: Sat Aug 13 23:38:44 2011
New Revision: 28554
URL: https://svn.nixos.org/websvn/nix/?rev=28554&sc=1
Log:
haskell-xmobar: updated to version 0.13
Modified:
nixpkgs/trunk/pkgs/applications/misc/xmobar/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/xmobar/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/xmobar/default.nix Sat Aug 13
23:38:40 2011(r28553)
+++ nixpkgs/trunk/pkgs/applications/misc/xmobar/default.nix Sat Aug 13
23:38:44 2011(r28554)
@@ -1,13 +1,19 @@
-{cabal, X11, mtl, parsec, stm, utf8String, X11Xft}:
+{ cabal, X11, mtl, parsec, stm, time, utf8String }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "xmobar";
- name = "${self.fname}";
- version = "0.12";
- sha256 = "633b7985dbaebd58864f591ea7ff8b44f5a69b4e3d0a592df01daf8fe11a5d31";
- extraBuildInputs = [X11 mtl parsec stm utf8String X11Xft];
- configureFlags = "--flags=with_xft";
+ version = "0.13";
+ sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ X11 mtl parsec stm time utf8String ];
meta = {
-description = "xmobar is a minimalistic text based status bar";
+homepage = "http://projects.haskell.org/xmobar/";;
+description = "A Minimalistic Text Based Status Bar";
+license = self.stdenv.lib.licenses.bsd3;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
};
})
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28553 - nixpkgs/trunk/pkgs/development/tools/haskell/threadscope
Author: simons
Date: Sat Aug 13 23:38:40 2011
New Revision: 28553
URL: https://svn.nixos.org/websvn/nix/?rev=28553&sc=1
Log:
haskell-threadscope: updated to version 0.1.3
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/threadscope/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/threadscope/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/threadscope/default.nix
Sat Aug 13 23:38:36 2011(r28552)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/threadscope/default.nix
Sat Aug 13 23:38:40 2011(r28553)
@@ -1,18 +1,20 @@
-{cabal, binary, cairo, ghcEvents, glade, gtk, mtl}:
+{ cabal, binary, cairo, ghcEvents, glade, gtk, mtl }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "threadscope";
- version = "0.1.2";
- sha256 = "ce1116016f6b2d38e6063ba3dd147f38147a9c4399160f37aba9c50c96d00a90";
- propagatedBuildInputs = [binary cairo ghcEvents glade gtk mtl];
- preConfigure = ''
-sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal
- '';
+ version = "0.1.3";
+ sha256 = "1vak3624vrnkfvwxzfw5hkc0552v213jb874f6q536g5vhjjxpih";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ binary cairo ghcEvents glade gtk mtl ];
configureFlags = "--ghc-options=-rtsopts";
meta = {
description = "A graphical thread profiler";
-license = "BSD";
-maintainers = [self.stdenv.lib.maintainers.andres];
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
};
-})
-
+})
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28552 - in nixpkgs/trunk/pkgs: development/libraries/haskell/scion top-level
Author: simons
Date: Sat Aug 13 23:38:36 2011
New Revision: 28552
URL: https://svn.nixos.org/websvn/nix/?rev=28552&sc=1
Log:
Deleted haskell-scion. The package doesn't compile with any of our
supported compilers because it depends on ancient versions of half a
dozen libraries.
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/scion/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 23:38:30
2011(r28551)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 23:38:36
2011(r28552)
@@ -1046,9 +1046,6 @@
parsec = self.parsec2;
};
- # known not to work with anything above ghc-6.10.*
- scion = callPackage ../development/libraries/haskell/scion {};
-
sendfile = callPackage ../development/libraries/haskell/sendfile {};
semigroups = callPackage ../development/libraries/haskell/semigroups {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28551 - in nixpkgs/trunk/pkgs: development/tools/parsing/alex top-level
Author: simons
Date: Sat Aug 13 23:38:30 2011
New Revision: 28551
URL: https://svn.nixos.org/websvn/nix/?rev=28551&sc=1
Log:
haskell-alex: updated to version 3.0.1
Added:
nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix
Deleted:
nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix Sat Aug 13
23:38:30 2011(r28551)
@@ -0,0 +1,16 @@
+{ cabal, QuickCheck, perl }:
+
+cabal.mkDerivation (self: {
+ pname = "alex";
+ version = "3.0.1";
+ sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ QuickCheck ];
+ buildTools = [ perl ];
+ meta = {
+homepage = "http://www.haskell.org/alex/";;
+description = "Alex is a tool for generating lexical analysers in Haskell";
+license = self.stdenv.lib.licenses.bsd3;
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 23:38:23
2011(r28550)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 23:38:30
2011(r28551)
@@ -148,7 +148,7 @@
mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok
random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok
cabalInstall = self.cabalInstall_0_10_2; # 7.2 fails, 7.3 fails
-alex = self.alex_3_0; # 7.2 ok, 7.3 ok
+alex = self.alex_3_0_1; # 7.2 ok, 7.3 ok
happy= self.happy_1_18_6; # 7.2 ok, 7.3 ok
haddock = self.haddock_2_9_2; # 7.2 fails, 7.3 fails
};
@@ -1365,7 +1365,7 @@
alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {};
alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {};
alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {};
- alex_3_0 = callPackage ../development/tools/parsing/alex/3.0.nix {};
+ alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {};
alex = self.alex_2_3_1;
alexMeta = callPackage ../development/tools/haskell/alex-meta {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28550 - nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell
Author: simons
Date: Sat Aug 13 23:38:23 2011
New Revision: 28550
URL: https://svn.nixos.org/websvn/nix/?rev=28550&sc=1
Log:
Regenerated haskell-wx and haskell-wxdirect expressions; no functional change.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wx.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wx.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wx.nix Sat Aug
13 22:06:18 2011(r28549)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wx.nix Sat Aug
13 23:38:23 2011(r28550)
@@ -1,13 +1,18 @@
-{cabal, stm, wxcore} :
+{ cabal, stm, wxcore }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "wx";
version = "0.12.1.6";
sha256 = "1p0gn46gk1abin095va22n9bycxhm2cq1vyvwiypcdq7jq541lhk";
- propagatedBuildInputs = [ stm wxcore ];
+ buildDepends = [ stm wxcore ];
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";;
description = "wxHaskell";
license = "LGPL";
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
};
})
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Sat Aug 13 22:06:18 2011(r28549)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Sat Aug 13 23:38:23 2011(r28550)
@@ -1,15 +1,20 @@
-{cabal, parsec} :
+{ cabal, parsec, time }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "wxdirect";
version = "0.12.1.4";
sha256 = "0v1blh3l02h58cvsngfax5knmg51lil1kj6pr5iqrbcrivp2nh7f";
- propagatedBuildInputs = [ parsec ];
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ parsec time ];
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";;
description = "helper tool for building wxHaskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
-maintainers = [ self.stdenv.lib.maintainers.simons ];
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
};
})
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28549 - nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline
Author: simons
Date: Sat Aug 13 22:06:18 2011
New Revision: 28549
URL: https://svn.nixos.org/websvn/nix/?rev=28549&sc=1
Log:
haskell-haskeline: updated to version 0.6.4.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline/default.nix
Sat Aug 13 20:41:49 2011(r28548)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline/default.nix
Sat Aug 13 22:06:18 2011(r28549)
@@ -2,10 +2,9 @@
cabal.mkDerivation (self: {
pname = "haskeline";
- version = "0.6.4.0";
- sha256 = "0p2qbckvdhzid6zrcgjwr8b5h8vxd7wdswsm2qp3hiyg48v4y5hd";
+ version = "0.6.4.2";
+ sha256 = "0za3n0kyfnya9lc6p07702rn393ghhsb3b08i1lpxz6587fbdzjb";
buildDepends = [ extensibleExceptions mtl terminfo utf8String ];
- patchPhase = "sed -i -e 's|base >=4.1 && < 4.4|base >=4.1 \\&\\& < 5|g' -e
's|unix>=2.0 && < 2.5|unix>=2.0 \\&\\& < 3|g' haskeline.cabal";
meta = {
homepage = "http://trac.haskell.org/haskeline";;
description = "A command-line interface for user input, written in
Haskell";
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28548 - nixpkgs/trunk/pkgs/misc/busybox
Author: shlevy
Date: Sat Aug 13 20:41:49 2011
New Revision: 28548
URL: https://svn.nixos.org/websvn/nix/?rev=28548&sc=1
Log:
busybox: Bump to 1.19.0
Modified:
nixpkgs/trunk/pkgs/misc/busybox/default.nix
Modified: nixpkgs/trunk/pkgs/misc/busybox/default.nix
==
--- nixpkgs/trunk/pkgs/misc/busybox/default.nix Sat Aug 13 20:41:40 2011
(r28547)
+++ nixpkgs/trunk/pkgs/misc/busybox/default.nix Sat Aug 13 20:41:49 2011
(r28548)
@@ -39,11 +39,11 @@
in
stdenv.mkDerivation rec {
- name = "busybox-1.18.0";
+ name = "busybox-1.19.0";
src = fetchurl {
url = "http://busybox.net/downloads/${name}.tar.bz2";;
-sha256 = "007bc8k6sc62iyjmyv3di2c8xdxvdhvqg68c7pn40m0455lmx79s";
+sha256 = "0332yxvlfv2hbix9n70dyp4xlm2hrk248qqdg006hyfpjsh49kqr";
};
configurePhase = ''
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28547 - nixpkgs/trunk/pkgs/misc/busybox
Author: shlevy
Date: Sat Aug 13 20:41:40 2011
New Revision: 28547
URL: https://svn.nixos.org/websvn/nix/?rev=28547&sc=1
Log:
busybox: Move $out/usr/{s,}bin to $out/{s,}bin
Modified:
nixpkgs/trunk/pkgs/misc/busybox/default.nix
Modified: nixpkgs/trunk/pkgs/misc/busybox/default.nix
==
--- nixpkgs/trunk/pkgs/misc/busybox/default.nix Sat Aug 13 15:09:04 2011
(r28546)
+++ nixpkgs/trunk/pkgs/misc/busybox/default.nix Sat Aug 13 20:41:40 2011
(r28547)
@@ -58,6 +58,12 @@
make oldconfig
'';
+ postInstall = ''
+mv -v $out/usr/bin/* $out/bin
+mv -v $out/usr/sbin/* $out/sbin
+rm -fRv $out/usr/
+ '';
+
crossAttrs = {
extraCrossConfig = ''
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-"
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28546 - nixpkgs/trunk/pkgs/applications/misc/ikiwiki
Author: simons
Date: Sat Aug 13 15:09:04 2011
New Revision: 28546
URL: https://svn.nixos.org/websvn/nix/?rev=28546&sc=1
Log:
ikiwiki: updated to version 3.20110715
Modified:
nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nixSat Aug 13
14:04:37 2011(r28545)
+++ nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nixSat Aug 13
15:09:04 2011(r28546)
@@ -13,14 +13,14 @@
let
name = "ikiwiki";
- version = "3.20110707";
+ version = "3.20110715";
in
stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchurl {
url =
"http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";;
-sha256 =
"b51fa7452a900212ab1c8c879227b83a688c10f770552aee61944695f8c6f1bf";
+sha256 =
"ef9cbe5ddf484e6b75de05cc6a5b51dfdff1f5920b1c4c66309b1409266df9c7";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
@@ -29,7 +29,6 @@
++ stdenv.lib.optionals gitSupport [git]
++ stdenv.lib.optionals monotoneSupport [monotone];
-
patchPhase = ''
sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28545 - nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels
Author: simons
Date: Sat Aug 13 14:04:37 2011
New Revision: 28545
URL: https://svn.nixos.org/websvn/nix/?rev=28545&sc=1
Log:
haskell-fclabels: updated to version 1.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels/default.nix
Sat Aug 13 13:58:07 2011(r28544)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/fclabels/default.nix
Sat Aug 13 14:04:37 2011(r28545)
@@ -1,12 +1,12 @@
-{ cabal, mtl }:
+{ cabal, mtl, transformers }:
cabal.mkDerivation (self: {
pname = "fclabels";
- version = "0.11.2";
- sha256 = "0ish0gy2f3q65c9f4ix0nhcid9kpr7faijxkmwcy9bymjfg441kf";
- buildDepends = [ mtl ];
+ version = "1.0";
+ sha256 = "0mc5lbpgyf8m1rpfszj61yhjddxbgk28rx71321jrfqsrzynf4h5";
+ buildDepends = [ mtl transformers ];
meta = {
-description = "First class accessor labels implemented as lenses";
+description = "First class accessor labels";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28544 - in nixpkgs/trunk/pkgs: development/libraries/haskell/regex-compat development/libraries/haskell/regex-posix top-level
Author: simons
Date: Sat Aug 13 13:58:07 2011
New Revision: 28544
URL: https://svn.nixos.org/websvn/nix/?rev=28544&sc=1
Log:
haskell-regex-{posix,compat}: added version 0.95.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
Sat Aug 13 13:58:07 2011(r28544)
@@ -0,0 +1,18 @@
+{ cabal, regexBase, regexPosix }:
+
+cabal.mkDerivation (self: {
+ pname = "regex-compat";
+ version = "0.95.1";
+ sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
+ buildDepends = [ regexBase regexPosix ];
+ meta = {
+homepage = "http://sourceforge.net/projects/lazy-regex";;
+description = "Replaces/Enhances Text.Regex";
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
Sat Aug 13 13:58:07 2011(r28544)
@@ -0,0 +1,18 @@
+{ cabal, regexBase }:
+
+cabal.mkDerivation (self: {
+ pname = "regex-posix";
+ version = "0.95.1";
+ sha256 = "02pgxwbgz738kpdmsg18xs6kmq6my5hqd9cl4rm7cg2v39di9vbl";
+ buildDepends = [ regexBase ];
+ meta = {
+homepage = "http://sourceforge.net/projects/lazy-regex";;
+description = "Replaces/Enhances Text.Regex";
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:58:02
2011(r28543)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:58:07
2011(r28544)
@@ -1002,12 +1002,16 @@
regexCompat_0_71_0_1 = callPackage
../development/libraries/haskell/regex-compat/0.71.0.1.nix {};
regexCompat_0_92 = callPackage
../development/libraries/haskell/regex-compat/0.92.nix {};
regexCompat_0_93_1 = callPackage
../development/libraries/haskell/regex-compat/0.93.1.nix {};
+ regexCompat_0_95_1 = callPackage
../development/libraries/haskell/regex-compat/0.95.1.nix {
+regexPosix = self.regexPosix_0_95_1;
+ };
regexCompat = self.regexCompat_0_71_0_1;
regexPosix_0_72_0_3 = callPackage
../development/libraries/haskell/regex-posix/0.72.0.3.nix {};
regexPosix_0_94_1 = callPackage
../development/libraries/haskell/regex-posix/0.94.1.nix {};
regexPosix_0_94_2 = callPackage
../development/libraries/haskell/regex-posix/0.94.2.nix {};
regexPosix_0_94_4 = callPackage
../development/libraries/haskell/regex-posix/0.94.4.nix {};
+ regexPosix_0_95_1 = callPackage
../development/libraries/haskell/regex-posix/0.95.1.nix {};
regexPosix = self.regexPosix_0_72_0_3;
regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28543 - in nixpkgs/trunk/pkgs: development/libraries/haskell/time top-level
Author: simons
Date: Sat Aug 13 13:58:02 2011
New Revision: 28543
URL: https://svn.nixos.org/websvn/nix/?rev=28543&sc=1
Log:
haskell-time: added version 1.3
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/time/1.3.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/time/1.3.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/time/1.3.nix Sat Aug
13 13:58:02 2011(r28543)
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "time";
+ version = "1.3";
+ sha256 = "0pkd77qz6lpalj166g91f8nz3mzcpxlzcw83yf8sl5yy4wskhmwz";
+ meta = {
+homepage = "http://semantic.org/TimeLib/";;
+description = "A time library";
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:54
2011(r28542)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:58:02
2011(r28543)
@@ -1170,6 +1170,7 @@
time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix
{};
time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix
{};
time_1_2_0_5 = callPackage ../development/libraries/haskell/time/1.2.0.5.nix
{};
+ time_1_3 = callPackage ../development/libraries/haskell/time/1.3.nix {};
# time is in the core package set. It should only be necessary to
# pass it explicitly in rare circumstances.
time = null;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28542 - in nixpkgs/trunk/pkgs: development/libraries/haskell/snap top-level
Author: simons
Date: Sat Aug 13 13:57:54 2011
New Revision: 28542
URL: https://svn.nixos.org/websvn/nix/?rev=28542&sc=1
Log:
haskell-snap: updated to version 0.5.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix Sat Aug
13 13:57:49 2011(r28541)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix Sat Aug
13 13:57:54 2011(r28542)
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "snap-core";
- version = "0.5.2";
- sha256 = "1wjjgghq21mw4sw6xyfsf2hazk78wgnphhaw3qz9jpkff2s39lhl";
+ version = "0.5.3";
+ sha256 = "0326l4wiv5pn8yc1xz1pr5738aglm5lpni6wxni7dkjwb53744dm";
buildDepends = [
MonadCatchIOTransformers attoparsec attoparsecEnumerator
blazeBuilder bytestringMmap bytestringNums caseInsensitive deepseq
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nixSat Aug
13 13:57:49 2011(r28541)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nixSat Aug
13 13:57:54 2011(r28542)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "snap-server";
- version = "0.5.2";
- sha256 = "0hmi39bjhmq57skp5jsjm8gyw0y0j6vgwrh69y7z268ddpgvy1if";
+ version = "0.5.3";
+ sha256 = "123q7361rvwcwydiyjkqxiclvsvzcbgvg1wxvw8rv13nbmc67ph5";
buildDepends = [
MonadCatchIOTransformers PSQueue attoparsec attoparsecEnumerator
binary blazeBuilder blazeBuilderEnumerator bytestringNums
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:49
2011(r28541)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:54
2011(r28542)
@@ -1054,10 +1054,12 @@
smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
snapCore = callPackage ../development/libraries/haskell/snap/core.nix {
-caseInsensitive = self.caseInsensitive_0_2_0_2;
+caseInsensitive = self.caseInsensitive_0_3;
};
+
snapServer = callPackage ../development/libraries/haskell/snap/server.nix {
vectorAlgorithms = self.vectorAlgorithms_0_4;
+caseInsensitive = self.caseInsensitive_0_3;
};
stateref = callPackage ../development/libraries/haskell/stateref {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28541 - in nixpkgs/trunk/pkgs: development/libraries/haskell/QuickCheck top-level
Author: simons
Date: Sat Aug 13 13:57:49 2011
New Revision: 28541
URL: https://svn.nixos.org/websvn/nix/?rev=28541&sc=1
Log:
haskell-QuickCheck: added version 2.4.1.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
Sat Aug 13 13:57:49 2011(r28541)
@@ -0,0 +1,18 @@
+{ cabal, extensibleExceptions, random }:
+
+cabal.mkDerivation (self: {
+ pname = "QuickCheck";
+ version = "2.4.1.1";
+ sha256 = "06vrn0j26ai2jfl32yd3kx8by4pimcinjf23b0dyc35z2gb139wj";
+ buildDepends = [ extensibleExceptions random ];
+ meta = {
+homepage = "http://code.haskell.org/QuickCheck";;
+description = "Automatic testing of Haskell programs";
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:43
2011(r28540)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:49
2011(r28541)
@@ -964,8 +964,9 @@
QuickCheck_2_1_0_3 = callPackage
../development/libraries/haskell/QuickCheck/2.1.0.3.nix {};
QuickCheck_2_1_1_1 = callPackage
../development/libraries/haskell/QuickCheck/2.1.1.1.nix {};
QuickCheck_2_4_0_1 = callPackage
../development/libraries/haskell/QuickCheck/2.4.0.1.nix {};
+ QuickCheck_2_4_1_1 = callPackage
../development/libraries/haskell/QuickCheck/2.4.1.1.nix {};
QuickCheck1 = self.QuickCheck_1_2_0_1;
- QuickCheck2 = self.QuickCheck_2_4_0_1;
+ QuickCheck2 = self.QuickCheck_2_4_1_1;
QuickCheck = self.QuickCheck2;
RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28540 - in nixpkgs/trunk/pkgs: development/libraries/haskell/multirec top-level
Author: simons
Date: Sat Aug 13 13:57:43 2011
New Revision: 28540
URL: https://svn.nixos.org/websvn/nix/?rev=28540&sc=1
Log:
haskell-multirec: added version 0.6
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/0.5.1.nix
- copied, changed from r28539,
nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/0.6.nix
- copied, changed from r28539,
nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/0.5.1.nix (from
r28539, nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix)
==
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/0.6.nix (from r28539,
nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/default.nix
Sat Aug 13 13:57:39 2011(r28539, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/multirec/0.6.nix Sat Aug
13 13:57:43 2011(r28540)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "multirec";
- version = "0.5.1";
- sha256 = "0y62gb2ml0799a3f1ny5ydjc4rjwj1dgs48f5fj6hf2fpl4hk02l";
+ version = "0.6";
+ sha256 = "1k0icyz9i4hc5vfpwrv42l3q4lrnsb1bswhyyv63d9azffn5flys";
noHaddock = true;
meta = {
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:39
2011(r28539)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:43
2011(r28540)
@@ -855,7 +855,9 @@
multiplate = callPackage ../development/libraries/haskell/multiplate {};
- multirec = callPackage ../development/libraries/haskell/multirec {};
+ multirec_0_5_1 = callPackage
../development/libraries/haskell/multirec/0.5.1.nix {};
+ multirec_0_6 = callPackage ../development/libraries/haskell/multirec/0.6.nix
{};
+ multirec = self.multirec_0_6;
multiset = callPackage ../development/libraries/haskell/multiset {};
@@ -1305,7 +1307,9 @@
zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
- zipper = callPackage ../development/libraries/haskell/zipper {};
+ zipper = callPackage ../development/libraries/haskell/zipper {
+multirec = self.multirec_0_5_1;
+ };
zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix
{
inherit (pkgs) zlib;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28539 - nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta
Author: simons
Date: Sat Aug 13 13:57:39 2011
New Revision: 28539
URL: https://svn.nixos.org/websvn/nix/?rev=28539&sc=1
Log:
haskell-haskell-src-meta: updated to version 0.4.0.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
Sat Aug 13 13:57:34 2011(r28538)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
Sat Aug 13 13:57:39 2011(r28539)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskell-src-meta";
- version = "0.4.0.1";
- sha256 = "10g74sax8x45lphy133717y9xb43d8a684mm9qv0arjwn5v4np7s";
+ version = "0.4.0.2";
+ sha256 = "1i3lhik0sa34x6rnkfa9scai9cdgx05h6mrbhwsfc7p2jlsixk92";
buildDepends = [ haskellSrcExts syb thLift ];
meta = {
description = "Parse source to template-haskell abstract syntax";
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28538 - nixpkgs/trunk/pkgs/development/libraries/haskell/th-lift
Author: simons
Date: Sat Aug 13 13:57:34 2011
New Revision: 28538
URL: https://svn.nixos.org/websvn/nix/?rev=28538&sc=1
Log:
haskell-th-lift: updated to version 0.5.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/th-lift/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/th-lift/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/th-lift/default.nix
Sat Aug 13 13:57:30 2011(r28537)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/th-lift/default.nix
Sat Aug 13 13:57:34 2011(r28538)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "th-lift";
- version = "0.5.3";
- sha256 = "15jynhl1ly0zhk2g9rm8vxas9p76w1lfxqhjw5rfb8s5k1w73fil";
+ version = "0.5.4";
+ sha256 = "1ax5rniainbw4lynfng0wv8a6x2cfv7k69n5nv1pwpb4s76am1hi";
meta = {
description = "Derive Template Haskell's Lift class for datatypes";
license = "unknown";
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28537 - nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline-class
Author: simons
Date: Sat Aug 13 13:57:30 2011
New Revision: 28537
URL: https://svn.nixos.org/websvn/nix/?rev=28537&sc=1
Log:
haskell-haskeline-class: updated to version 0.6.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline-class/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline-class/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline-class/default.nix
Sat Aug 13 13:57:26 2011(r28536)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskeline-class/default.nix
Sat Aug 13 13:57:30 2011(r28537)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskeline-class";
- version = "0.6.1";
- sha256 = "da954acea7ae215865a647fff776df9621ee5c5133a5f95c16b1ac5646ef0b31";
+ version = "0.6.2";
+ sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl";
buildDepends = [ haskeline mtl ];
meta = {
homepage = "http://community.haskell.org/~aslatter/code/haskeline-class";;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28536 - nixpkgs/trunk/pkgs/development/libraries/haskell/data-accessor
Author: simons
Date: Sat Aug 13 13:57:26 2011
New Revision: 28536
URL: https://svn.nixos.org/websvn/nix/?rev=28536&sc=1
Log:
haskell-data-accessor-template: updated to version 0.2.1.8
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
Sat Aug 13 13:57:22 2011(r28535)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
Sat Aug 13 13:57:26 2011(r28536)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-accessor-template";
- version = "0.2.1.7";
- sha256 = "08658axzznqxp4p4d6h0y0sp7rzj84ma6hrb4zvsxa3614vydgi4";
+ version = "0.2.1.8";
+ sha256 = "0bx0w4vkigq20pa31sdygj4idi3iywkpclbllrw38ma1j19033zk";
buildDepends = [ dataAccessor utilityHt ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Record_access";;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28535 - nixpkgs/trunk/pkgs/development/libraries/haskell/cmdargs
Author: simons
Date: Sat Aug 13 13:57:22 2011
New Revision: 28535
URL: https://svn.nixos.org/websvn/nix/?rev=28535&sc=1
Log:
haskell-cmdargs: updated to version 0.8
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/cmdargs/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/cmdargs/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cmdargs/default.nix
Sat Aug 13 13:57:19 2011(r28534)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cmdargs/default.nix
Sat Aug 13 13:57:22 2011(r28535)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cmdargs";
- version = "0.7";
- sha256 = "0qijfdc66f0r2k272sl41nxfymmsk7naw5is3b4zyxsgm147c0vq";
+ version = "0.8";
+ sha256 = "0yhjg6rck1aj8gq07i9dcfxyjffxlr4lxnir2brkyahpfx5iyw9k";
isLibrary = true;
isExecutable = true;
buildDepends = [ transformers ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28534 - in nixpkgs/trunk/pkgs: development/libraries/haskell/HaXml top-level
Author: simons
Date: Sat Aug 13 13:57:19 2011
New Revision: 28534
URL: https://svn.nixos.org/websvn/nix/?rev=28534&sc=1
Log:
haskell-HaXml: updated to version 1.22.5
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.22.5.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.22.5.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.22.5.nix Sat Aug
13 13:57:19 2011(r28534)
@@ -0,0 +1,20 @@
+{ cabal, polyparse, random }:
+
+cabal.mkDerivation (self: {
+ pname = "HaXml";
+ version = "1.22.5";
+ sha256 = "1ckmi8iwyaid4mcnh8117s9kq45f8r7sidh6dbhzbj0dl29rrkbz";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ polyparse random ];
+ meta = {
+homepage = "http://www.cs.york.ac.uk/fp/HaXml/";;
+description = "Utilities for manipulating XML documents";
+license = "LGPL";
+platforms = self.ghc.meta.platforms;
+maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:13
2011(r28533)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:19
2011(r28534)
@@ -679,16 +679,16 @@
HTTP = self.HTTP_4000_0_6;
haxr = callPackage ../development/libraries/haskell/haxr {
-HaXml = self.HaXml_1_22_3;
+HaXml = self.HaXml_1_22_5;
};
haxr_th = callPackage ../development/libraries/haskell/haxr-th {};
HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix
{};
HaXml_1_20_2 = callPackage ../development/libraries/haskell/HaXml/1.20.2.nix
{};
- HaXml_1_22_3 = callPackage ../development/libraries/haskell/HaXml/1.22.3.nix
{};
+ HaXml_1_22_5 = callPackage ../development/libraries/haskell/HaXml/1.22.5.nix
{};
HaXml113 = self.HaXml_1_13_3;
HaXml120 = self.HaXml_1_20_2;
- HaXml123 = self.HaXml_1_22_3;
+ HaXml123 = self.HaXml_1_22_5;
HaXml= self.HaXml120;
HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28533 - in nixpkgs/trunk/pkgs: development/libraries/haskell/case-insensitive top-level
Author: simons
Date: Sat Aug 13 13:57:13 2011
New Revision: 28533
URL: https://svn.nixos.org/websvn/nix/?rev=28533&sc=1
Log:
haskell-case-insensitive: added version 0.3.0.1 (and dropped obsolete 0.2.0.2)
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix
- copied, changed from r28531,
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.2.0.2.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.2.0.2.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix
(from r28531,
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.2.0.2.nix)
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.2.0.2.nix
Sat Aug 13 12:20:49 2011(r28531, copy source)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix
Sat Aug 13 13:57:13 2011(r28533)
@@ -1,10 +1,10 @@
-{ cabal, text }:
+{ cabal, hashable, text }:
cabal.mkDerivation (self: {
pname = "case-insensitive";
- version = "0.2.0.2";
- sha256 = "0qn2scaxxbqi4770nwvcmb1ldj0ipa2ljxcavcn0kv48xzs519l7";
- buildDepends = [ text ];
+ version = "0.3.0.1";
+ sha256 = "0aaj7avg3rd2bvjjcny7wjdif60ikk7q49896g12jnczi5ba97ml";
+ buildDepends = [ hashable text ];
meta = {
description = "Case insensitive string comparison";
license = self.stdenv.lib.licenses.bsd3;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:27:07
2011(r28532)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 13 13:57:13
2011(r28533)
@@ -426,9 +426,9 @@
inherit (pkgs) cairo zlib;
};
- caseInsensitive_0_2_0_2 = callPackage
../development/libraries/haskell/case-insensitive/0.2.0.2.nix {};
caseInsensitive_0_3 = callPackage
../development/libraries/haskell/case-insensitive/0.3.nix {};
- caseInsensitive = self.caseInsensitive_0_3;
+ caseInsensitive_0_3_0_1 = callPackage
../development/libraries/haskell/case-insensitive/0.3.0.1.nix {};
+ caseInsensitive = self.caseInsensitive_0_3_0_1;
cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] Hydra job nixpkgs:trunk:tarball build 1249924: Success
Hi, This is to let you know that Hydra build 1249924 of job nixpkgs:trunk:tarball has changed from 'Failed with non-zero exit code' to 'Success'. Complete build information can be found on this page: http://hydra.nixos.org/build/1249924 A summary of the build information follows: Build ID: | 1249924 Nix name: | nixpkgs-tarball-0pre28532 Short description: | Build of a source distribution from a checkout Maintainer(s): | Nix Committers System:| x86_64-linux Derivation store path: | /nix/store/vry7hx861jvby694a2h680ckar5vfvjl-nixpkgs-tarball-0pre28532.drv Output store path: | /nix/store/7yssfcihi546idcgyrlbvsw541xv6j8m-nixpkgs-tarball-0pre28532 Time added:| 2011-08-13 15:40:39 Build started: | 2011-08-13 15:38:46 Build finished:| 2011-08-13 15:40:39 Duration: | 113s The build inputs were: Name| Type| Value +-+ nixpkgs | svn | https://svn.nixos.org/repos/nix/nixpkgs/trunk:28532 officialRelease | boolean | false Regards, The Hydra build daemon. ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28532 - nixpkgs/trunk/pkgs/top-level
Author: raskin
Date: Sat Aug 13 13:27:07 2011
New Revision: 28532
URL: https://svn.nixos.org/websvn/nix/?rev=28532&sc=1
Log:
Firefox 4.0 was removed
Modified:
nixpkgs/trunk/pkgs/top-level/release.nix
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==
--- nixpkgs/trunk/pkgs/top-level/release.nixSat Aug 13 12:20:49 2011
(r28531)
+++ nixpkgs/trunk/pkgs/top-level/release.nixSat Aug 13 13:27:07 2011
(r28532)
@@ -386,7 +386,6 @@
};
firefox36Pkgs.firefox = linux;
- firefox40Pkgs.firefox = linux;
firefox50Pkgs.firefox = linux;
gnome = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] Hydra job nixpkgs:trunk:tarball build 1249857: Failed with non-zero exit code
Hi, This is to let you know that Hydra build 1249857 of job nixpkgs:trunk:tarball has changed from 'Success' to 'Failed with non-zero exit code'. Complete build information can be found on this page: http://hydra.nixos.org/build/1249857 The last 50 lines of the build log are shown at the bottom of this email. A summary of the build information follows: Build ID: | 1249857 Nix name: | nixpkgs-tarball-0pre28531 Short description: | Build of a source distribution from a checkout Maintainer(s): | Nix Committers System:| x86_64-linux Derivation store path: | /nix/store/flxqpyj8x3zjmzn4dk8yqkv44p2jmiwb-nixpkgs-tarball-0pre28531.drv Output store path: | /nix/store/v9mi2l5sp9x5aqlvigz4n47jlic7nhm5-nixpkgs-tarball-0pre28531 Time added:| 2011-08-13 14:25:33 Build started: | 2011-08-13 14:24:34 Build finished:| 2011-08-13 14:25:33 Duration: | 59s The build inputs were: Name| Type| Value +-+ nixpkgs | svn | https://svn.nixos.org/repos/nix/nixpkgs/trunk:28531 officialRelease | boolean | false Regards, The Hydra build daemon. --- trace: bbdb trace: cedet trace: ecb trace: emacsw3m trace: emms trace: nxml trace: emacs23 trace: emacs23Packages trace: bbdb trace: cedet trace: ecb trace: emacsw3m trace: emms trace: jdee trace: nxml trace: emacsSnapshot trace: enscript trace: epdfview trace: eprover trace: eql trace: esniper trace: euca2ools trace: eukleides trace: evince trace: evolution_data_server trace: evopedia trace: exiv2 trace: expect trace: exult trace: fakeroot trace: fbpanel trace: fbterm trace: fdisk trace: fdm trace: feh trace: fetchmail trace: file trace: filelight trace: fileschanged trace: findutils trace: firebird trace: firefox36Pkgs trace: firefox trace: firefox40Pkgs trace: firefox error: evaluation aborted with the following error message: `cannot find attribute `firefox40Pkgs.firefox'' (use `--show-trace' to show detailed location information) build time elapsed: 0m0.027s 0m0.013s 0m43.239s 0m6.981s builder for `/nix/store/flxqpyj8x3zjmzn4dk8yqkv44p2jmiwb-nixpkgs-tarball-0pre28531.drv' failed with exit code 1 error: build of `/nix/store/flxqpyj8x3zjmzn4dk8yqkv44p2jmiwb-nixpkgs-tarball-0pre28531.drv' failed ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28531 - in nixpkgs/trunk/pkgs: applications/networking/browsers/firefox top-level
Author: eelco
Date: Sat Aug 13 12:20:49 2011
New Revision: 28531
URL: https://svn.nixos.org/websvn/nix/?rev=28531&sc=1
Log:
* Removed Firefox 4 (obsolete).
Deleted:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 13 11:49:23
2011(r28530)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 13 12:20:49
2011(r28531)
@@ -6458,13 +6458,6 @@
firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
- firefox40Pkgs = callPackage
../applications/networking/browsers/firefox/4.0.nix {
-inherit (gtkLibs) gtk pango;
-inherit (gnome) libIDL;
- };
-
- firefox40Wrapper = wrapFirefox firefox40Pkgs.firefox "firefox" "";
-
firefox50Pkgs = callPackage
../applications/networking/browsers/firefox/5.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28530 - in nixpkgs/trunk/pkgs: tools/networking/s3cmd top-level
Author: eelco
Date: Sat Aug 13 11:49:23 2011
New Revision: 28530
URL: https://svn.nixos.org/websvn/nix/?rev=28530&sc=1
Log:
* Added s3cmd.
Added:
nixpkgs/trunk/pkgs/tools/networking/s3cmd/
nixpkgs/trunk/pkgs/tools/networking/s3cmd/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/tools/networking/s3cmd/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/s3cmd/default.nix Sat Aug 13
11:49:23 2011(r28530)
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+stdenv.mkDerivation rec {
+ name = "s3cmd-1.0.1";
+
+ src = fetchurl {
+url = "mirror://sourceforge/s3tools/${name}.tar.gz";
+sha256 = "1kmxhilwix5plv3qb49as6jknll3pq5abw948h28jisskkm2cs6p";
+ };
+
+ buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
+
+ pythonPath = [ pythonPackages.ssl ];
+
+ installPhase =
+''
+ python setup.py install --prefix=$out
+ wrapPythonPrograms
+'';
+
+ meta = {
+homepage = http://s3tools.org/;
+description = "A command-line tool to manipulate Amazon S3 buckets";
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 13 08:59:00
2011(r28529)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 13 11:49:23
2011(r28530)
@@ -1267,6 +1267,8 @@
s3backer = callPackage ../tools/filesystems/s3backer { };
+ s3cmd = callPackage ../tools/networking/s3cmd { };
+
s3sync = callPackage ../tools/networking/s3sync { };
sablotron = callPackage ../tools/text/xml/sablotron { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r28529 - in nixpkgs/trunk/pkgs: os-specific/linux/v4l-utils top-level
Author: raskin
Date: Sat Aug 13 08:59:00 2011
New Revision: 28529
URL: https://svn.nixos.org/websvn/nix/?rev=28529&sc=1
Log:
Adding v4l-utils
Added:
nixpkgs/trunk/pkgs/os-specific/linux/v4l-utils/
nixpkgs/trunk/pkgs/os-specific/linux/v4l-utils/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/os-specific/linux/v4l-utils/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/v4l-utils/default.nix Sat Aug 13
08:59:00 2011(r28529)
@@ -0,0 +1,50 @@
+x@{builderDefsPackage
+ , libv4l, libjpeg, qt4
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+[];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+baseName="v4l-utils";
+version="0.8.5";
+name="${baseName}-${version}";
+url="http://www.linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";;
+hash="0k2rkra8lyimj6bwm8khq6xrhjdy67d09blxa6brnj7kpa7q81f2";
+ };
+in
+rec {
+ src = a.fetchurl {
+url = sourceInfo.url;
+sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doUnpack" "doMakeInstall"];
+
+ makeFlags = [''PREFIX="" DESTDIR="$out"''];
+
+ meta = {
+description = "Video-4-Linux utilities";
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux;
+license = a.lib.licenses.gpl2;
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = "http://www.linuxtv.org/downloads/v4l-utils/";;
+};
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 12 18:43:28
2011(r28528)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 13 08:59:00
2011(r28529)
@@ -5873,6 +5873,8 @@
inherit ncurses perl;
};
+ v4l_utils = callPackage ../os-specific/linux/v4l-utils {};
+
windows = rec {
w32api = callPackage ../os-specific/windows/w32api {
gccCross = gccCrossStageStatic;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
