[Nix-commits] SVN commit: nix - r30805 - nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git
Author: simons
Date: Fri Dec 9 11:44:42 2011
New Revision: 30805
URL: https://nixos.org/websvn/nix/?rev=30805sc=1
Log:
git: updated to version 1.7.8
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
==
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Fri Dec 9 11:14:02 2011(r30804)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Fri Dec 9 11:44:42 2011(r30805)
@@ -8,7 +8,7 @@
}:
let
- version = 1.7.7.3;
+ version = 1.7.8;
svn = subversionClient.override { perlBindings = true; };
in
stdenv.mkDerivation {
@@ -16,7 +16,7 @@
src = fetchurl {
url = http://git-core.googlecode.com/files/git-${version}.tar.gz;;
-sha256 =
dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100;
+sha256 =
ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713;
};
patches = [ ./docbook2texi.patch ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30806 - nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder
Author: simons
Date: Fri Dec 9 11:51:16 2011
New Revision: 30806
URL: https://nixos.org/websvn/nix/?rev=30806sc=1
Log:
haskell-blaze-builder: updated to version 0.3.0.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder/default.nix
Fri Dec 9 11:44:42 2011(r30805)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder/default.nix
Fri Dec 9 11:51:16 2011(r30806)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = blaze-builder;
- version = 0.3.0.1;
- sha256 = 1p3xlifcr7v987zx8l2sppn9yydph332mn1xxk0yfi78a6386nfb;
+ version = 0.3.0.2;
+ sha256 = 009njfm9g0fs7kg6q9c7qqfl69msw9q3d07xh3xg7layh09khsdb;
buildDepends = [ text ];
meta = {
homepage = http://github.com/meiersi/blaze-builder;;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30811 - nixpkgs/trunk/pkgs/development/libraries/haskell/yaml
Author: simons
Date: Fri Dec 9 11:51:26 2011
New Revision: 30811
URL: https://nixos.org/websvn/nix/?rev=30811sc=1
Log:
haskell-yaml: updated to version 0.4.1.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yaml/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/yaml/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yaml/default.nix Fri Dec
9 11:51:24 2011(r30810)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yaml/default.nix Fri Dec
9 11:51:26 2011(r30811)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = yaml;
- version = 0.4.1.1;
- sha256 = 0qm7kfvi99m80m2lsmn98ssr2sfsw1rbbmzyjlg7bmvbaxsyw0b9;
+ version = 0.4.1.2;
+ sha256 = 1c7ffs5gkwk0l0vg7amsflra1j8ifd9cvvbqx9jzkqsay8hbr4vb;
isLibrary = true;
isExecutable = true;
buildDepends = [ enumerator transformers ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30812 - configurations/trunk/tud
Author: eelco
Date: Fri Dec 9 13:30:48 2011
New Revision: 30812
URL: https://nixos.org/websvn/nix/?rev=30812sc=1
Log:
* Oops, nixos-rebuild accidentally caused MTurk HITs to be created...
Modified:
configurations/trunk/tud/wendy.nix
Modified: configurations/trunk/tud/wendy.nix
==
--- configurations/trunk/tud/wendy.nix Fri Dec 9 11:51:26 2011(r30811)
+++ configurations/trunk/tud/wendy.nix Fri Dec 9 13:30:48 2011(r30812)
@@ -16,7 +16,7 @@
{ name = mturk-webserver-production;
startOn = started network-interfaces;
exec = ''
-${pkgs.su}/bin/su - mturk -c 'MTURK_STATE=/home/mturk/state-production
WEBINTERFACE_HOME=/home/mturk/icse-2012/src/WebInterface
WEBINTERFACE_CONFIG=/home/mturk/icse-2012/src/WebInterface/webinterface-production.conf
exec /home/mturk/icse-2012/src/WebInterface/script/webinterface_server.pl
/home/mturk/state-production/webserver.log 21'
+${pkgs.su}/bin/su - mturk -c 'MTURK_STATE=/home/mturk/state-production
WEBINTERFACE_HOME=/home/mturk/icse-2012/src/WebInterface
WEBINTERFACE_CONFIG=/home/mturk/icse-2012/src/WebInterface/webinterface-production.conf
exec /home/mturk/icse-2012/src/WebInterface/script/webinterface_server.pl -f
-k /home/mturk/state-production/webserver.log 21'
'';
};
@@ -24,7 +24,7 @@
{ name = mturk-webserver-sandbox;
startOn = started network-interfaces;
exec = ''
-${pkgs.su}/bin/su - mturk -c
'WEBINTERFACE_HOME=/home/mturk/icse-2012/src/WebInterface
WEBINTERFACE_CONFIG=/home/mturk/icse-2012/src/WebInterface/webinterface-sandbox.conf
exec /home/mturk/icse-2012/src/WebInterface/script/webinterface_server.pl -p
3001 /home/mturk/state-sandbox/webserver.log 21'
+${pkgs.su}/bin/su - mturk -c
'WEBINTERFACE_HOME=/home/mturk/icse-2012/src/WebInterface
WEBINTERFACE_CONFIG=/home/mturk/icse-2012/src/WebInterface/webinterface-sandbox.conf
exec /home/mturk/icse-2012/src/WebInterface/script/webinterface_server.pl -p
3001 -f -k /home/mturk/state-sandbox/webserver.log 21'
'';
};
@@ -44,12 +44,14 @@
'';
};
+ /*
jobs.mturk_hydra_bridge_production =
{ name = mturk-hydra-bridge-production;
exec = ''
${pkgs.su}/bin/su - mturk -c 'MTURK_STATE=/home/mturk/state-production
exec create-hits-from-hydra.pl /home/mturk/state-production/hydra-bridge.log
21'
'';
};
+ */
jobs.mturk_vm_cleanup_production =
{ name = mturk-vm-cleanup-production;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30814 - nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework
Author: simons
Date: Fri Dec 9 18:07:33 2011
New Revision: 30814
URL: https://nixos.org/websvn/nix/?rev=30814sc=1
Log:
haskell-test-framework: updated to version 0.4.2.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
Fri Dec 9 18:07:29 2011(r30813)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
Fri Dec 9 18:07:33 2011(r30814)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = test-framework;
- version = 0.4.1.1;
- sha256 = 1ig4v2y8xba2rg6pc8yjf0j20cwa3czknnfqn1sgpqhmip2961pc;
+ version = 0.4.2.0;
+ sha256 = 0a74ajlmwsajrj06k22zqwnyxqfrpbd9xplf4b1swafp7y952ind;
isLibrary = true;
isExecutable = true;
buildDepends = [
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30816 - nixpkgs/trunk/pkgs/top-level
Author: viric
Date: Fri Dec 9 21:18:09 2011
New Revision: 30816
URL: https://nixos.org/websvn/nix/?rev=30816sc=1
Log:
Alphabet, and its order...
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 Fri Dec 9 21:15:41
2011(r30815)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Dec 9 21:18:09
2011(r30816)
@@ -464,12 +464,12 @@
bsdiff = callPackage ../tools/compression/bsdiff { };
+ btar = callPackage ../tools/backup/btar { };
+
bup = callPackage ../tools/backup/bup { };
bzip2 = callPackage ../tools/compression/bzip2 { };
- btar = callPackage ../tools/backup/btar { };
-
cabextract = callPackage ../tools/archivers/cabextract { };
ccid = callPackage ../tools/security/ccid { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r30817 - nixpkgs/trunk/pkgs/misc/sane-backends
Author: raskin
Date: Sat Dec 10 05:05:15 2011
New Revision: 30817
URL: https://nixos.org/websvn/nix/?rev=30817sc=1
Log:
Rebuild-checked: does not break boot
Modified:
nixpkgs/trunk/pkgs/misc/sane-backends/default.nix
Modified: nixpkgs/trunk/pkgs/misc/sane-backends/default.nix
==
--- nixpkgs/trunk/pkgs/misc/sane-backends/default.nix Fri Dec 9 21:18:09
2011(r30816)
+++ nixpkgs/trunk/pkgs/misc/sane-backends/default.nix Sat Dec 10 05:05:15
2011(r30817)
@@ -3,7 +3,7 @@
let
firmware = gt68xxFirmware {inherit fetchurl;};
in
-assert hotplugSupport - stdenv.system == i686-linux;
+assert hotplugSupport - (stdenv.system == i686-linux || stdenv.system ==
x86_64-linux);
stdenv.mkDerivation {
name = sane-backends-1.0.21;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
