[Nix-commits] SVN commit: nix - r29199 - configurations/trunk/tud
Author: eelco
Date: Mon Sep 12 09:06:44 2011
New Revision: 29199
URL: https://ssl.nixos.org/websvn/nix/?rev=29199sc=1
Log:
* Run the garbage collector 4 times a day on the build machines.
A Nixpkgs rebuild can easily fill up 100 GB in a day.
Modified:
configurations/trunk/tud/build-machines-common.nix
Modified: configurations/trunk/tud/build-machines-common.nix
==
--- configurations/trunk/tud/build-machines-common.nix Mon Sep 12 03:38:12
2011(r29198)
+++ configurations/trunk/tud/build-machines-common.nix Mon Sep 12 09:06:44
2011(r29199)
@@ -24,7 +24,7 @@
services.cron.systemCronJobs =
[ # Make sure that at least 100 GiB of disk space is available.
- 15 03 * * * root nix-store --gc --max-freed \$((100 * 1024**3 - 1024
* $(df /nix/store | tail -n 1 | awk '{ print $4 }')))\ /var/log/gc.log 21
+ 15 03,09,15,21 * * * root nix-store --gc --max-freed \$((100 *
1024**3 - 1024 * $(df /nix/store | tail -n 1 | awk '{ print $4 }')))\
/var/log/gc.log 21
];
networking.hostName = ; # obtain from DHCP server
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29200 - nix/trunk/src/libstore
Author: eelco
Date: Mon Sep 12 09:07:43 2011
New Revision: 29200
URL: https://ssl.nixos.org/websvn/nix/?rev=29200sc=1
Log:
* Ouch. A store upgrade could cause a substituter to be triggered,
causing a deadlock.
Modified:
nix/trunk/src/libstore/derivations.cc
nix/trunk/src/libstore/local-store.cc
nix/trunk/src/libstore/local-store.hh
Modified: nix/trunk/src/libstore/derivations.cc
==
--- nix/trunk/src/libstore/derivations.cc Mon Sep 12 09:06:44 2011
(r29199)
+++ nix/trunk/src/libstore/derivations.cc Mon Sep 12 09:07:43 2011
(r29200)
@@ -239,7 +239,8 @@
foreach (DerivationInputs::const_iterator, i, drv.inputDrvs) {
Hash h = drvHashes[i-first];
if (h.type == htUnknown) {
-Derivation drv2 = derivationFromPath(store, i-first);
+assert(store.isValidPath(i-first));
+Derivation drv2 = parseDerivation(readFile(i-first));
h = hashDerivationModulo(store, drv2);
drvHashes[i-first] = h;
}
Modified: nix/trunk/src/libstore/local-store.cc
==
--- nix/trunk/src/libstore/local-store.cc Mon Sep 12 09:06:44 2011
(r29199)
+++ nix/trunk/src/libstore/local-store.cc Mon Sep 12 09:07:43 2011
(r29200)
@@ -510,7 +510,7 @@
}
-unsigned long long LocalStore::addValidPath(const ValidPathInfo info)
+unsigned long long LocalStore::addValidPath(const ValidPathInfo info, bool
checkOutputs)
{
SQLiteStmtUse use(stmtRegisterValidPath);
stmtRegisterValidPath.bind(info.path);
@@ -540,7 +540,7 @@
derivations). Note that if this throws an error, then the
DB transaction is rolled back, so the path validity
registration above is undone. */
-checkDerivationOutputs(info.path, drv);
+if (checkOutputs) checkDerivationOutputs(info.path, drv);
foreach (DerivationOutputs::iterator, i, drv.outputs) {
SQLiteStmtUse use(stmtAddDerivationOutput);
@@ -1521,7 +1521,7 @@
SQLiteTxn txn(db);
foreach (PathSet::iterator, i, validPaths) {
-addValidPath(queryPathInfoOld(*i));
+addValidPath(queryPathInfoOld(*i), false);
std::cerr .;
}
Modified: nix/trunk/src/libstore/local-store.hh
==
--- nix/trunk/src/libstore/local-store.hh Mon Sep 12 09:06:44 2011
(r29199)
+++ nix/trunk/src/libstore/local-store.hh Mon Sep 12 09:07:43 2011
(r29200)
@@ -226,7 +226,7 @@
unsigned long long queryValidPathId(const Path path);
-unsigned long long addValidPath(const ValidPathInfo info);
+unsigned long long addValidPath(const ValidPathInfo info, bool
checkOutputs = true);
void addReference(unsigned long long referrer, unsigned long long
reference);
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29201 - configurations/trunk/tud
Author: eelco
Date: Mon Sep 12 09:08:31 2011
New Revision: 29201
URL: https://ssl.nixos.org/websvn/nix/?rev=29201sc=1
Log:
* ‘hydra’ is now an ordinary build machine.
Modified:
configurations/trunk/tud/hydra.nix
Modified: configurations/trunk/tud/hydra.nix
==
--- configurations/trunk/tud/hydra.nix Mon Sep 12 09:07:43 2011(r29200)
+++ configurations/trunk/tud/hydra.nix Mon Sep 12 09:08:31 2011(r29201)
@@ -1,37 +1,5 @@
{ config, pkgs, ... }:
{
- require = [ ./common.nix ];
-
- nixpkgs.system = x86_64-linux;
-
- boot = {
-initrd.kernelModules = [ mptsas ext4 ];
-kernelModules = [ acpi-cpufreq kvm-intel ];
-loader.grub.device = /dev/sda;
-loader.grub.copyKernels = true;
- };
-
- fileSystems =
-[ { mountPoint = /;
-label = nixos;
-options = noatime,barrier=0,data=ordered;
- }
-];
-
- #swapDevices = [ { label = swap ; } ];
-
- nix.maxJobs = 8;
-
- networking = {
-hostName = hydra;
-domain = buildfarm;
- };
-
- services.cron.systemCronJobs =
-[
- # Make sure that at least 200 GiB of disk space is available.
- 15 3 * * * root nix-store --gc --max-freed \$((200 * 1024**3 - 1024 *
$(df /nix/store | tail -n 1 | awk '{ print $4 }')))\ /var/log/gc.log 21
-];
-
+ require = [ ./build-machines-dell-1950.nix ];
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29202 - nixpkgs/branches/syscall-tracing/pkgs/stdenv
Author: eelco
Date: Mon Sep 12 09:11:18 2011
New Revision: 29202
URL: https://ssl.nixos.org/websvn/nix/?rev=29202sc=1
Log:
* rm -rf doesn't work if some directories are read-only.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
09:08:31 2011(r29201)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
09:11:18 2011(r29202)
@@ -364,7 +364,7 @@
exec 4 (${pkgs.bzip2}/bin/bzip2 $out/.trace/log.bz2)
exec 5 (${pkgs.coreutils}/bin/tee /dev/fd/4)
${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 -o /dev/fd/4 ${pkgs.stdenv.shell} -c '(cd $TMPDIR $builder
$realArgs)' 25
- (cd $out ${pkgs.gnutar}/bin/tar c .build | ${pkgs.bzip2}/bin/bzip2
.build.tar.bz2 ${pkgs.coreutils}/bin/rm -rf .build)
+ (cd $out ${pkgs.gnutar}/bin/tar c .build | ${pkgs.bzip2}/bin/bzip2
.build.tar.bz2 ${pkgs.coreutils}/bin/chmod -R u+w .build
${pkgs.coreutils}/bin/rm -rf .build)
'';
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29203 - nixpkgs/trunk/pkgs/tools/package-management/nix
Author: eelco
Date: Mon Sep 12 10:02:03 2011
New Revision: 29203
URL: https://ssl.nixos.org/websvn/nix/?rev=29203sc=1
Log:
* Updated nixUnstable.
Modified:
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
==
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixMon Sep
12 09:11:18 2011(r29202)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nixMon Sep
12 10:02:03 2011(r29203)
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = nix-1.0pre29060;
+ name = nix-1.0pre29200;
src = fetchurl {
-url = http://hydra.nixos.org/build/1301810/download/4/${name}.tar.bz2;;
-sha256 =
f403213b56acfb2e74ae1e6fd136f3726940f098220d2ae8b46fa54c08f1aad0;
+url = http://hydra.nixos.org/build/1320284/download/4/${name}.tar.bz2;;
+sha256 =
a10f65b52bcf72b9ec7bf5610e16de2d49c1cc4c008bf0a93281e8e2233fa1b1;
};
buildNativeInputs = [ perl pkgconfig ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29204 - nixpkgs/trunk/pkgs/desktops/kde-4.7
Author: eelco
Date: Mon Sep 12 12:34:06 2011
New Revision: 29204
URL: https://ssl.nixos.org/websvn/nix/?rev=29204sc=1
Log:
* Update the oxygen-icons output hash.
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/oxygen-icons.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/oxygen-icons.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/oxygen-icons.nixMon Sep 12
10:02:03 2011(r29203)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/oxygen-icons.nixMon Sep 12
12:34:06 2011(r29204)
@@ -3,7 +3,7 @@
kde {
outputHashAlgo = sha256;
outputHashMode = recursive;
- outputHash =
7d7f352f574f5747f16ac517cbe19d0b011adb74e7a0b791705afb3addac1e96;
+ outputHash =
87010a208f6860429d78c0d518a4f70c450b9c199900076d0aa232de8ae6452e;
buildNativeInputs = [ cmake ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29205 - nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package
Author: eelco Date: Mon Sep 12 12:40:58 2011 New Revision: 29205 URL: https://ssl.nixos.org/websvn/nix/?rev=29205sc=1 Log: * Remove obsolete file. Deleted: nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29206 - nixpkgs/trunk/pkgs/desktops/kde-4.7
Author: eelco
Date: Mon Sep 12 12:45:59 2011
New Revision: 29206
URL: https://ssl.nixos.org/websvn/nix/?rev=29206sc=1
Log:
* Remove the kde_baseapps wrapper because
1) It broke the Gwenview build (it ended up depending on the
wrapper).
2) It's confusing to have two identically named packages.
3) If upstream's kde_baseapps doesn't include Konsole and Kate, then
why should ours?
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Sep 12 12:40:58
2011(r29205)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Sep 12 12:45:59
2011(r29206)
@@ -49,11 +49,6 @@
kdebase_workspace = kde.modules.kde_workspace;
- kde_baseapps = kde.modules.kde_baseapps // {
-inherit (kde.individual) kate konsole;
-propagatedUserEnvPackages = [ kde.individual.kate kde.individual.konsole ];
- };
-
inherit release;
full = stdenv.lib.attrValues kde.modules;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29207 - nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk
Author: eelco
Date: Mon Sep 12 13:02:54 2011
New Revision: 29207
URL: https://ssl.nixos.org/websvn/nix/?rev=29207sc=1
Log:
* Better description.
Modified:
nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk/default.nix Mon Sep
12 12:45:59 2011(r29206)
+++ nixpkgs/trunk/pkgs/development/compilers/adobe-flex-sdk/default.nix Mon Sep
12 13:02:54 2011(r29207)
@@ -33,7 +33,7 @@
'';
meta = {
-description = flex sdk flash / action script developement kit;
+description = Flex SDK for Adobe Flash / ActionScript;
homepage =
http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation;;
license = MPLv1.1; # Mozilla Public License Version 1.1
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29208 - in nixpkgs/trunk/pkgs: development/libraries/openssl top-level
Author: eelco
Date: Mon Sep 12 16:09:00 2011
New Revision: 29208
URL: https://ssl.nixos.org/websvn/nix/?rev=29208sc=1
Log:
* Added OpenSSL 1.0.0e (not updating the default yet because a lot
depends on it). Also, install the manpages in $out/share/man rather
than $out/ssl/man.
Added:
nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix
- copied, changed from r29119,
nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix (from r29119,
nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix)
==
--- nixpkgs/trunk/pkgs/development/libraries/openssl/default.nixFri Sep
9 09:03:37 2011(r29119, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix Mon Sep 12
16:09:00 2011(r29208)
@@ -7,11 +7,11 @@
in
stdenv.mkDerivation rec {
- name = openssl-1.0.0d;
+ name = openssl-1.0.0e;
src = fetchurl {
url = http://www.openssl.org/source/${name}.tar.gz;;
-sha256 = 1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj;
+sha256 = 1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3;
};
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
@@ -25,6 +25,8 @@
configureFlags = shared --libdir=lib;
+ makeFlags = MANDIR=$(out)/share/man;
+
postInstall =
''
# If we're building dynamic libraries, then don't install static
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 12 13:02:54
2011(r29207)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 12 16:09:00
2011(r29208)
@@ -4253,6 +4253,8 @@
fetchurl = fetchurlBoot;
};
+ opensslNew = callPackage ../development/libraries/openssl/1.0.0e.nix { };
+
ortp = callPackage ../development/libraries/ortp { };
pangoxsl = callPackage ../development/libraries/pangoxsl {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29209 - in nixpkgs/trunk/pkgs: development/libraries/haskell/snap top-level
Author: simons
Date: Mon Sep 12 16:45:08 2011
New Revision: 29209
URL: https://ssl.nixos.org/websvn/nix/?rev=29209sc=1
Log:
haskell-snap-core: updated to version 0.5.4
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.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 Mon Sep
12 16:09:00 2011(r29208)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix Mon Sep
12 16:45:08 2011(r29209)
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = snap-core;
- version = 0.5.3.1;
- sha256 = 0qwlcak1hi4cqyhnks7qqf4zq0rw2486paf0mlasyzb6ba0pwl6m;
+ version = 0.5.4;
+ sha256 = 0v6lsb60s3w96rqpp9ky8nd660zja8asw02vx1562nvd19k65jbb;
buildDepends = [
attoparsec attoparsecEnumerator blazeBuilder bytestringMmap
bytestringNums caseInsensitive deepseq dlist enumerator
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 12 16:09:00
2011(r29208)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 12 16:45:08
2011(r29209)
@@ -1030,9 +1030,7 @@
smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
- snapCore = callPackage ../development/libraries/haskell/snap/core.nix {
-caseInsensitive = self.caseInsensitive_0_3;
- };
+ snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
snapServer = callPackage ../development/libraries/haskell/snap/server.nix {
vectorAlgorithms = self.vectorAlgorithms_0_4;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29210 - in nixpkgs/trunk/pkgs: development/libraries/haskell/snap top-level
Author: simons
Date: Mon Sep 12 16:45:13 2011
New Revision: 29210
URL: https://ssl.nixos.org/websvn/nix/?rev=29210sc=1
Log:
haskell-snap-server: updated to version 0.5.4
Modified:
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/server.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nixMon Sep
12 16:45:08 2011(r29209)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nixMon Sep
12 16:45:13 2011(r29210)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = snap-server;
- version = 0.5.3.1;
- sha256 = 0rbfklgngrpp2aggkmyamfxn9hpnz3bsxd58lw0fi4ls76bagxvz;
+ version = 0.5.4;
+ sha256 = 1kzhmn8pg2lzpqz6319lcy5lk27jcl7jlxq96x1bhnxss8k0idix;
buildDepends = [
attoparsec attoparsecEnumerator binary blazeBuilder
blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 12 16:45:08
2011(r29209)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 12 16:45:13
2011(r29210)
@@ -1032,10 +1032,7 @@
snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
- snapServer = callPackage ../development/libraries/haskell/snap/server.nix {
-vectorAlgorithms = self.vectorAlgorithms_0_4;
-caseInsensitive = self.caseInsensitive_0_3;
- };
+ snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
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 - r29211 - in nixpkgs/trunk/pkgs: development/libraries/haskell/case-insensitive top-level
Author: simons
Date: Mon Sep 12 16:45:18 2011
New Revision: 29211
URL: https://ssl.nixos.org/websvn/nix/?rev=29211sc=1
Log:
haskell-case-insensitive: dropped obsolete version 0.3
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/default.nix
- copied, changed from r29210,
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.3.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/default.nix
(from r29210,
nixpkgs/trunk/pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix)
==
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 12 16:45:13
2011(r29210)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 12 16:45:18
2011(r29211)
@@ -436,9 +436,7 @@
inherit (pkgs) cairo zlib;
};
- caseInsensitive_0_3 = callPackage
../development/libraries/haskell/case-insensitive/0.3.nix {};
- caseInsensitive_0_3_0_1 = callPackage
../development/libraries/haskell/case-insensitive/0.3.0.1.nix {};
- caseInsensitive = self.caseInsensitive_0_3_0_1;
+ caseInsensitive = callPackage
../development/libraries/haskell/case-insensitive {};
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] SVN commit: nix - r29212 - in nixpkgs/trunk/pkgs: development/libraries/haskell/vector-algorithms top-level
Author: simons
Date: Mon Sep 12 16:45:23 2011
New Revision: 29212
URL: https://ssl.nixos.org/websvn/nix/?rev=29212sc=1
Log:
haskell-vector-algorithms: dropped obsolete version 0.4
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/default.nix
- copied, changed from r29211,
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/0.4.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/default.nix
(from r29211,
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix)
==
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 12 16:45:18
2011(r29211)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 12 16:45:23
2011(r29212)
@@ -1196,9 +1196,7 @@
};
vector = self.vector_0_7_1;
- vectorAlgorithms_0_4 = callPackage
../development/libraries/haskell/vector-algorithms/0.4.nix {};
- vectorAlgorithms_0_5_3 = callPackage
../development/libraries/haskell/vector-algorithms/0.5.3.nix {};
- vectorAlgorithms = self.vectorAlgorithms_0_5_3;
+ vectorAlgorithms = callPackage
../development/libraries/haskell/vector-algorithms {};
vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29213 - nixpkgs/trunk/pkgs/development/compilers/epic
Author: simons
Date: Mon Sep 12 16:45:27 2011
New Revision: 29213
URL: https://ssl.nixos.org/websvn/nix/?rev=29213sc=1
Log:
haskell-epic: updated to version 0.1.13
Modified:
nixpkgs/trunk/pkgs/development/compilers/epic/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/epic/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/epic/default.nix Mon Sep 12
16:45:23 2011(r29212)
+++ nixpkgs/trunk/pkgs/development/compilers/epic/default.nix Mon Sep 12
16:45:27 2011(r29213)
@@ -2,14 +2,13 @@
cabal.mkDerivation (self: {
pname = epic;
- version = 0.1.11;
- sha256 = 12dz1wjaf3n8fqk46vhpnxq9z633wi6wyihcmif7amxmqv3l8zn9;
+ version = 0.1.13;
+ sha256 = 00rdprgndrvssrjlp6jh5jak2rxq6bcd2dknldx6i8h1cq6i69rb;
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl ];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
- noHaddock = true;
meta = {
homepage = http://www.dcs.st-and.ac.uk/~eb/epic.php;;
description = Compiler for a simple functional language;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29214 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod
Author: simons
Date: Mon Sep 12 16:45:31 2011
New Revision: 29214
URL: https://ssl.nixos.org/websvn/nix/?rev=29214sc=1
Log:
haskell-yesod: updated to version 0.9.2.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Mon Sep
12 16:45:27 2011(r29213)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Mon Sep
12 16:45:31 2011(r29214)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = yesod;
- version = 0.9.2;
- sha256 = 1074vbrab8c0nrmkv1fn4rm65fyfw08b3mj498cxala3nm382whd;
+ version = 0.9.2.1;
+ sha256 = 08mnybxdcswhxc1gqgjsy1mx43cp6b78javjcqgbrsfd8f4h9xzq;
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 - r29215 - nixpkgs/trunk/pkgs/development/libraries/haskell/cairo
Author: simons
Date: Mon Sep 12 16:45:35 2011
New Revision: 29215
URL: https://ssl.nixos.org/websvn/nix/?rev=29215sc=1
Log:
haskell-cairo: updated to version 0.12.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix Mon Sep
12 16:45:31 2011(r29214)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix Mon Sep
12 16:45:35 2011(r29215)
@@ -1,15 +1,15 @@
-{ cabal, cairo, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
+{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, zlib }:
cabal.mkDerivation (self: {
pname = cairo;
- version = 0.12.0;
- sha256 = 0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9;
+ version = 0.12.1;
+ sha256 = 0krclr32cn3vq3cmwhmxz7wzams92iliq44p6s4nj9jg4928cgfk;
buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ cairo self.stdenv.gcc.libc pkgconfig zlib ];
+ extraLibraries = [ cairo libc pkgconfig zlib ];
pkgconfigDepends = [ cairo ];
meta = {
-homepage = http://www.haskell.org/gtk2hs/;;
+homepage = http://projects.haskell.org/gtk2hs/;;
description = Binding to the Cairo library;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29216 - nixpkgs/trunk/pkgs/development/libraries/haskell/glade
Author: simons
Date: Mon Sep 12 16:45:39 2011
New Revision: 29216
URL: https://ssl.nixos.org/websvn/nix/?rev=29216sc=1
Log:
haskell-glade: updated to version 0.12.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix Mon Sep
12 16:45:35 2011(r29215)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix Mon Sep
12 16:45:39 2011(r29216)
@@ -1,17 +1,17 @@
-{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, gtkC, libglade
-, mtl, pango, pkgconfig
+{ cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade
+, pkgconfig
}:
cabal.mkDerivation (self: {
pname = glade;
- version = 0.12.0;
- sha256 = 0h7l1kp9y17xqyz16kv0dvwgblph9r70wimyl8aq9gi1r4is5lmq;
- buildDepends = [ cairo glib gtk mtl pango ];
+ version = 0.12.1;
+ sha256 = 114gdjz6bzfzqm71j17yb5mq96wcvjdv7ig3k4x4d9mdp97w8990;
+ buildDepends = [ glib gtk ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ gtkC libglade ];
meta = {
-homepage = http://www.haskell.org/gtk2hs/;;
+homepage = http://projects.haskell.org/gtk2hs/;;
description = Binding to the glade library;
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29217 - nixpkgs/trunk/pkgs/development/libraries/haskell/glib
Author: simons
Date: Mon Sep 12 16:45:47 2011
New Revision: 29217
URL: https://ssl.nixos.org/websvn/nix/?rev=29217sc=1
Log:
haskell-glib: updated to version 0.12.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix Mon Sep
12 16:45:39 2011(r29216)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix Mon Sep
12 16:45:47 2011(r29217)
@@ -1,14 +1,14 @@
-{ cabal, glib, gtk2hsBuildtools, pkgconfig }:
+{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig }:
cabal.mkDerivation (self: {
pname = glib;
- version = 0.12.0;
- sha256 = 1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19;
+ version = 0.12.1;
+ sha256 = 0lsgpbd08w64npc0xsnxg8n4vj2hdnjvs55h4lhgc61p05q9gv52;
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
+ extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib ];
meta = {
-homepage = http://www.haskell.org/gtk2hs/;;
+homepage = http://projects.haskell.org/gtk2hs/;;
description = Binding to the GLIB library for Gtk2Hs;
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29218 - nixpkgs/trunk/pkgs/development/libraries/haskell/gtk
Author: simons
Date: Mon Sep 12 16:45:51 2011
New Revision: 29218
URL: https://ssl.nixos.org/websvn/nix/?rev=29218sc=1
Log:
haskell-gtk: updated to version 0.12.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nixMon Sep
12 16:45:47 2011(r29217)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nixMon Sep
12 16:45:51 2011(r29218)
@@ -1,17 +1,17 @@
-{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango
+{ cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
, pkgconfig
}:
cabal.mkDerivation (self: {
pname = gtk;
- version = 0.12.0;
- sha256 = 1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2;
+ version = 0.12.1;
+ sha256 = 007wxxff2ibfi3848yjxg7hqgpiqpn0zpyivjvjv0zphk1d2j9sv;
buildDepends = [ cairo glib mtl pango ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
+ extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib gtk ];
meta = {
-homepage = http://www.haskell.org/gtk2hs/;;
+homepage = http://projects.haskell.org/gtk2hs/;;
description = Binding to the Gtk+ graphical user interface library;
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29219 - nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools
Author: simons
Date: Mon Sep 12 16:45:57 2011
New Revision: 29219
URL: https://ssl.nixos.org/websvn/nix/?rev=29219sc=1
Log:
haskell-gtk2hs-buildtools: updated to version 0.12.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
Mon Sep 12 16:45:51 2011(r29218)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
Mon Sep 12 16:45:57 2011(r29219)
@@ -1,14 +1,15 @@
-{ cabal, alex, happy }:
+{ cabal, alex, happy, random }:
cabal.mkDerivation (self: {
pname = gtk2hs-buildtools;
- version = 0.12.0;
- sha256 = 1czlmyr9zhzc0h1j0z3chv06ma77cibq2yc6h1slfphb1lkv66a8;
+ version = 0.12.1;
+ sha256 = 003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl;
isLibrary = false;
isExecutable = true;
+ buildDepends = [ random ];
buildTools = [ alex happy ];
meta = {
-homepage = http://www.haskell.org/gtk2hs/;;
+homepage = http://projects.haskell.org/gtk2hs/;;
description = Tools to build the Gtk2Hs suite of User Interface
libraries;
license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29220 - nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2
Author: simons
Date: Mon Sep 12 16:46:02 2011
New Revision: 29220
URL: https://ssl.nixos.org/websvn/nix/?rev=29220sc=1
Log:
haskell-gtksourceview2: updated to version 0.12.3
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
Mon Sep 12 16:45:57 2011(r29219)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
Mon Sep 12 16:46:02 2011(r29220)
@@ -1,17 +1,17 @@
-{ cabal, glib, glibc, gtk, gtk2hsBuildtools, gtksourceview, mtl
+{ cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl
, pkgconfig
}:
cabal.mkDerivation (self: {
pname = gtksourceview2;
- version = 0.12.2;
- sha256 = 0l9y48kmzqzps6k54fgf0dkmmv0ppxx8amggfdswwk86zsf8j81r;
+ version = 0.12.3;
+ sha256 = 0bhwvhwsg3mf4w94fl6z6qkn67i68hh3zwwhzqa59lia0nc233gd;
buildDepends = [ glib gtk mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ gtksourceview ];
meta = {
-homepage = http://www.haskell.org/gtk2hs/;;
+homepage = http://projects.haskell.org/gtk2hs/;;
description = Binding to the GtkSourceView library;
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29222 - nixpkgs/trunk/pkgs/development/libraries/haskell/svgcairo
Author: simons
Date: Mon Sep 12 16:46:10 2011
New Revision: 29222
URL: https://ssl.nixos.org/websvn/nix/?rev=29222sc=1
Log:
haskell-svgcairo: updated to version 0.12.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/svgcairo/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/svgcairo/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/svgcairo/default.nix
Mon Sep 12 16:46:06 2011(r29221)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/svgcairo/default.nix
Mon Sep 12 16:46:10 2011(r29222)
@@ -1,15 +1,15 @@
-{ cabal, cairo, glib, glibc, gtk2hsBuildtools, librsvg, mtl }:
+{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }:
cabal.mkDerivation (self: {
pname = svgcairo;
- version = 0.12.0;
- sha256 = 1zialw59njmq0sfz9f0rx6v50d4bvld2ivmwljkp5bmxii3hcjl3;
+ version = 0.12.1;
+ sha256 = 1nyr849ayk1fyjpxnpam1pychny609d6j2v3is84llh3gsyq99ps;
buildDepends = [ cairo glib mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc ];
- pkgconfigDepends = [ cairo librsvg ];
+ extraLibraries = [ libc ];
+ pkgconfigDepends = [ librsvg ];
meta = {
-homepage = http://www.haskell.org/gtk2hs/;;
+homepage = http://projects.haskell.org/gtk2hs/;;
description = Binding to the libsvg-cairo library;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: SVN commit: nix - r29190 - in nixpkgs/trunk/pkgs: development/libraries/haskell/cairo development/libraries/haskell/glib development/libraries/haskell/gtk development/libraries/haskell/p
Hi Shea,
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
Sun Sep 11 18:28:14 2011(r29189)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
Sun Sep 11 18:48:46 2011(r29190)
@@ -1,4 +1,4 @@
-{ cabal, cairo, glibc, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
+{ cabal, cairo, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
cabal.mkDerivation (self: {
pname = cairo;
@@ -6,7 +6,7 @@
sha256 = 0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9;
buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ cairo glibc pkgconfig zlib ];
+ extraLibraries = [ cairo self.stdenv.gcc.libc pkgconfig zlib ];
pkgconfigDepends = [ cairo ];
meta = {
homepage = http://www.haskell.org/gtk2hs/;;
these expressions are generated automatically from the Cabal file, which
means that patching them directly is not ideal, because the changes are
likely to be overwritten in the next update. I have modified cabal2nix
so that it generates a dependency on 'libc' for those packages, and that
attribute is then overridden in haskell-packages.nix. The effect should
be the same.
Take care,
Peter
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29224 - nixpkgs/trunk/pkgs/development/libraries/openssl
Author: eelco
Date: Mon Sep 12 16:57:34 2011
New Revision: 29224
URL: https://ssl.nixos.org/websvn/nix/?rev=29224sc=1
Log:
* OpenSSL: Allow the location of the X509 certificate file (the CA
bundle) to be set through the environment variable
‘OPENSSL_X509_CERT_FILE’. This is necessary because the default
location ($out/ssl/cert.pem) doesn't exist, and hardcoding something
like /etc/ssl/cert.pem is impure and cannot be overriden
per-process. For security, the environment variable is ignored for
setuid binaries.
Added:
nixpkgs/trunk/pkgs/development/libraries/openssl/cert-file.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix Mon Sep 12
16:46:14 2011(r29223)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/1.0.0e.nix Mon Sep 12
16:57:34 2011(r29224)
@@ -14,7 +14,17 @@
sha256 = 1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3;
};
- patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
+ patches =
+[ # Allow the location of the X509 certificate file (the CA
+ # bundle) to be set through the environment variable
+ # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the
+ # default location ($out/ssl/cert.pem) doesn't exist, and
+ # hardcoding something like /etc/ssl/cert.pem is impure and
+ # cannot be overriden per-process. For security, the
+ # environment variable is ignored for setuid binaries.
+ ./cert-file.patch
+]
+++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
buildNativeInputs = [ perl ];
Added: nixpkgs/trunk/pkgs/development/libraries/openssl/cert-file.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/cert-file.patchMon Sep
12 16:57:34 2011(r29224)
@@ -0,0 +1,35 @@
+diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c
openssl-1.0.0e/crypto/x509/x509_def.c
+--- openssl-1.0.0e-orig/crypto/x509/x509_def.c 1999-09-11 19:54:11.0
+0200
openssl-1.0.0e/crypto/x509/x509_def.c 2011-09-12 18:30:59.386501609
+0200
+@@ -57,6 +57,10 @@
+ */
+
+ #include stdio.h
++#include stdlib.h
++#include limits.h
++#include unistd.h
++#include sys/types.h
+ #include cryptlib.h
+ #include openssl/crypto.h
+ #include openssl/x509.h
+@@ -71,7 +75,19 @@
+ { return(X509_CERT_DIR); }
+
+ const char *X509_get_default_cert_file(void)
+- { return(X509_CERT_FILE); }
++ {
++ static char buf[PATH_MAX] = X509_CERT_FILE;
++ static int init = 0;
++ if (!init) {
++ init = 1;
++ char * s = getenv(OPENSSL_X509_CERT_FILE);
++ if (s getuid() == geteuid()) {
++ strncpy(buf, s, sizeof(buf));
++ buf[sizeof(buf) - 1] = 0;
++ }
++ }
++ return buf;
++ }
+
+ const char *X509_get_default_cert_dir_env(void)
+ { return(X509_CERT_DIR_EVP); }
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29225 - nixos/trunk/modules/security
Author: eelco Date: Mon Sep 12 17:01:43 2011 New Revision: 29225 URL: https://ssl.nixos.org/websvn/nix/?rev=29225sc=1 Log: * Set OPENSSL_X509_CERT_FILE. Modified: nixos/trunk/modules/security/ca.nix Modified: nixos/trunk/modules/security/ca.nix == --- nixos/trunk/modules/security/ca.nix Mon Sep 12 16:57:34 2011(r29224) +++ nixos/trunk/modules/security/ca.nix Mon Sep 12 17:01:43 2011(r29225) @@ -19,6 +19,9 @@ environment.shellInit = '' +export OPENSSL_X509_CERT_FILE=/etc/ssl/certs/ca-bundle.crt + +# !!! Remove the following as soon as OpenSSL 1.0.0e is the default. export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt ''; ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29226 - nixpkgs/trunk/pkgs/shells/bash-completion
Author: simons
Date: Mon Sep 12 17:31:11 2011
New Revision: 29226
URL: https://ssl.nixos.org/websvn/nix/?rev=29226sc=1
Log:
bash-completion: fixed hard-coded reference to /etc
Modified:
nixpkgs/trunk/pkgs/shells/bash-completion/default.nix
Modified: nixpkgs/trunk/pkgs/shells/bash-completion/default.nix
==
--- nixpkgs/trunk/pkgs/shells/bash-completion/default.nix Mon Sep 12
17:01:43 2011(r29225)
+++ nixpkgs/trunk/pkgs/shells/bash-completion/default.nix Mon Sep 12
17:31:11 2011(r29226)
@@ -14,6 +14,7 @@
postInstall = ''
rm $out/etc/profile.d/bash_completion.sh
rmdir $out/etc/profile.d
+sed -i -e s|/etc/bash_completion|$out/etc/bash_completion|g
$out/etc/bash_completion
'';
meta = {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29227 - nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix
Author: simons
Date: Mon Sep 12 17:31:15 2011
New Revision: 29227
URL: https://ssl.nixos.org/websvn/nix/?rev=29227sc=1
Log:
haskell-cabal2nix: updated to version 1.15
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix Mon Sep
12 17:31:11 2011(r29226)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix Mon Sep
12 17:31:15 2011(r29227)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = cabal2nix;
- version = 1.14;
- sha256 = 0sdim1yqxx2wplfz6skz78y5lmh6dknc1k7jszmjnq0n9yc0b4bf;
+ version = 1.15;
+ sha256 = 0v2xnr8fp0bpv4cmd4q01p293zz4zg9kvhd4sr9ar3amj9vjhsk7;
isLibrary = false;
isExecutable = true;
buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] bash-interactive with support for completion
Hi guys,
the following patches changes the interactive version of bash to include
full completion support:
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null,
bison}:
+{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null,
bison, bashCompletion}:
assert interactive - readline != null;
@@ -52,13 +52,18 @@ stdenv.mkDerivation rec {
# Add an `sh' - `bash' symlink.
ln -s bash $out/bin/sh
+ '' + (if interactive then ''
+ensureDir $out/etc
+ln -s ${bashCompletion}/etc/bash_completion $out/etc/
+ln -s ${bashCompletion}/etc/bash_completion.d $out/etc/
+ '' else ''
# Install the completion examples.
ensureDir $out/etc
cp -v examples/complete/bash_completion $out/etc
ensureDir $out/etc/bash_completion.d
cp -v examples/complete/complete.gnu-longopt $out/etc/bash_completion.d
- '';
+ '');
meta = {
homepage = http://www.gnu.org/software/bash/;
The normal bash (a.k.a. stdenv) is not affected. I would like to commit the
patch, but before I do I wonder whether anyone sees a problem with it?
Take care,
Peter
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29228 - nixos/trunk/modules/system/boot
Author: simons Date: Mon Sep 12 18:01:18 2011 New Revision: 29228 URL: https://ssl.nixos.org/websvn/nix/?rev=29228sc=1 Log: modules/system/boot/kernel.nix: disable elevator=cfq boot parameter for the time being This setting causes the init ram disk to hang indefinitely on some systems. Modified: nixos/trunk/modules/system/boot/kernel.nix Modified: nixos/trunk/modules/system/boot/kernel.nix == --- nixos/trunk/modules/system/boot/kernel.nix Mon Sep 12 17:31:15 2011 (r29227) +++ nixos/trunk/modules/system/boot/kernel.nix Mon Sep 12 18:01:18 2011 (r29228) @@ -122,7 +122,7 @@ boot.kernelParams = [ splash=verbose # Force the Completely Fair Scheduler to be used by default. -elevator=cfq +#elevator=cfq ] ++ optional config.boot.vesa vga=0x317; ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] bash-interactive with support for completion
Excerpts from Peter Simons's message of Mon Sep 12 19:49:49 +0200 2011:
The normal bash (a.k.a. stdenv) is not affected. I would like to commit the
patch, but before I do I wonder whether anyone sees a problem with it?
I'm too lazy to look up all details.
Summary:
- some people dislike the completion. Therefore there should be opt-in
- my nix2/multi-shell-support branch supports bash and zsh completion
for several month now incloding opt-out implementation.
Because I already have a more sophisticated solution I'm likely to revert your
patch in my branches.
It was announced here:
http://article.gmane.org/gmane.linux.distributions.nixos/5666/match=bash+completion
There was no feedback that time.
Marc Weber
# /etc/bash-setup-completion.sh:
# can be sourced by user to setup (unoptrusive) completion for bash
# 1) never source a completion script twice so that later profiles don't change
#behaviour of earlier (more important ones)
# 2) allow users to opt-out from individual annoying completion scripts by
#defining key
declare -A NIX_COMPL_SCRIPT_SOURCED
# potential problems (-rev 20179)
# - It doesn't support filenames with spaces.
# - It inserts a space after the filename when tab-completing in an
#svn command.
# - Many people find it annoying that tab-completion on commands like
#tar only matches filenames with the right extension.
# - Lluís reported bash apparently crashing on some tab completions.
# comment: Does this apply to complete.gnu-longopt or also to bash_completion?
NIX_COMPL_SCRIPT_SOURCED[complete.gnu-longopt]=1
nix_add_profile_completion(){
# origin: bash_completion, slightly adopted
# source script only once - allow user to use NIX_COMPL_SCRIPT_SOURCED to
# opt out from bad scripts. If a user wants to reload all he can clear
# NIX_COMPL_SCRIPT_SOURCED
for s in $1/etc/bash_completion.d/*; do
local base=${s/*\//}
[[ ${s##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|.rpm*) ]]
[ \( -f $s -o -h $s \) -a -r $s ]
[ -z ${NIX_COMPL_SCRIPT_SOURCED[$base]} ]
{ . $s; NIX_COMPL_SCRIPT_SOURCED[$base]=1; }
done
}
for p in $NIX_PROFILES; do
nix_add_profile_completion $p
done
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29229 - nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeutils
Author: kkallio
Date: Mon Sep 12 18:46:21 2011
New Revision: 29229
URL: https://ssl.nixos.org/websvn/nix/?rev=29229sc=1
Log:
Fix kremotecontrol build.
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix Mon Sep
12 18:01:18 2011(r29228)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix Mon Sep
12 18:46:21 2011(r29229)
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libXtst }:
+{ kde, kdelibs, kde_workspace, libXtst }:
kde {
- buildInputs = [ kdelibs libXtst ];
+ buildInputs = [ kdelibs kde_workspace libXtst ];
meta = {
description = KDE remote control;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29230 - nixpkgs/trunk/pkgs/misc/tex/disser
Author: raskin
Date: Mon Sep 12 20:50:07 2011
New Revision: 29230
URL: https://ssl.nixos.org/websvn/nix/?rev=29230sc=1
Log:
Fix disser build
Added:
nixpkgs/trunk/pkgs/misc/tex/disser/
nixpkgs/trunk/pkgs/misc/tex/disser/default.nix
Added: nixpkgs/trunk/pkgs/misc/tex/disser/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/misc/tex/disser/default.nix Mon Sep 12 20:50:07
2011(r29230)
@@ -0,0 +1,56 @@
+x@{builderDefsPackage
+ , unzip, texLive, texLiveCMSuper, texLiveAggregationFun
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = [stdenv fetchurl builderDefsPackage] ++
+[texLive texLiveCMSuper texLiveAggregationFun];
+
+ buildInputs = map (n: builtins.getAttr n x)
+(builtins.attrNames (builtins.removeAttrs x helperArgNames))
+++ [(a.texLiveAggregationFun {paths=[a.texLive a.texLiveCMSuper];})];
+ sourceInfo = rec {
+baseName=disser;
+version=1.1.8;
+name=${baseName}-${version};
+project=${baseName};
+
url=mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.zip;
+hash=15509hfcvkk5kfcza149c74qpamwgw88dg0ra749axs8xj8qmlw8;
+ };
+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 = [setVars doMakeInstall];
+
+ setVars = a.noDepEntry ''
+export HOME=$TMPDIR
+ '';
+
+ makeFlags = [DESTDIR=$out/share/texmf-dist];
+
+ meta = {
+description = Russian PhD thesis LaTeX package;
+maintainers = with a.lib.maintainers;
+[
+ raskin
+];
+platforms = with a.lib.platforms;
+ linux; # platform-independent
+license = free; # LaTeX Project Public License
+ };
+ passthru = {
+updateInfo = {
+ downloadPage = http://sourceforge.net/projects/disser/files/disser/;;
+};
+ };
+}) x
+
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29231 - nixpkgs/trunk/pkgs/top-level
Author: raskin
Date: Mon Sep 12 20:50:32 2011
New Revision: 29231
URL: https://ssl.nixos.org/websvn/nix/?rev=29231sc=1
Log:
all-packages.nix entry for disser
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 Mon Sep 12 20:50:07
2011(r29230)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 12 20:50:32
2011(r29231)
@@ -8389,6 +8389,8 @@
texLiveAggregationFun =
(builderDefsPackage (import ../misc/tex/texlive/aggregate.nix));
+ texDisser = callPackage ../misc/tex/disser {};
+
texLiveContext = builderDefsPackage (import ../misc/tex/texlive/context.nix)
{
inherit texLive;
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29232 - in nixpkgs/branches/syscall-tracing/pkgs/stdenv: . linux
Author: eelco
Date: Mon Sep 12 21:30:04 2011
New Revision: 29232
URL: https://ssl.nixos.org/websvn/nix/?rev=29232sc=1
Log:
* keepBuildTree doesn't always work properly.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
20:50:32 2011(r29231)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
21:30:04 2011(r29232)
@@ -357,7 +357,8 @@
#! ${pkgs.bash}/bin/bash
echo tracing: $builder $realArgs
set +o posix
- ${pkgs.coreutils}/bin/mkdir -p $out/.trace
+ ${pkgs.coreutils}/bin/mkdir -p $out/.trace $out/.build
+ cd $out/.build
# Compress the strace output on the fly. The builder's stderr
# also goes to the log so that the trace processor can see stuff
# like Make trace messages.
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix
==
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix Mon Sep
12 20:50:32 2011(r29231)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/linux/default.nix Mon Sep
12 21:30:04 2011(r29232)
@@ -145,14 +145,14 @@
# Create the first real standard environment. This one consists
# of bootstrap tools only, and a minimal Glibc to keep the GCC
# configure script happy.
- stdenvLinuxBoot1 = traceSyscalls (keepBuildTree (stdenvBootFun {
+ stdenvLinuxBoot1 = traceSyscalls (stdenvBootFun {
gcc = wrapGCC {
libc = bootstrapGlibc;
binutils = bootstrapTools;
coreutils = bootstrapTools;
};
inherit fetchurl;
- }));
+ });
# 2) These are the packages that we can build with the first
@@ -168,14 +168,14 @@
# 3) 2nd stdenv that we will use to build only the glibc.
- stdenvLinuxBoot2 = traceSyscalls (keepBuildTree (stdenvBootFun {
+ stdenvLinuxBoot2 = traceSyscalls (stdenvBootFun {
gcc = wrapGCC {
libc = bootstrapGlibc;
binutils = firstBinutils;
coreutils = bootstrapTools;
};
inherit fetchurl;
- }));
+ });
# 4) These are the packages that we can build with the 2nd
@@ -194,7 +194,7 @@
# 6) Construct a third stdenv identical to the 2nd, except that
#this one uses the Glibc built in step 3. It still uses
#the recent binutils and rest of the bootstrap tools, including GCC.
- stdenvLinuxBoot3 = traceSyscalls (keepBuildTree (stdenvBootFun {
+ stdenvLinuxBoot3 = traceSyscalls (stdenvBootFun {
gcc = wrapGCC {
binutils = stdenvLinuxBoot1Pkgs.binutils;
coreutils = bootstrapTools;
@@ -205,7 +205,7 @@
inherit (stdenvLinuxBoot1Pkgs) perl;
};
inherit fetchurl;
- }));
+ });
# 7) The packages that can be built using the third stdenv.
@@ -232,7 +232,7 @@
#this one uses the dynamically linked GCC and Binutils from step
#5. The other tools (e.g. coreutils) are still from the
#bootstrap tools.
- stdenvLinuxBoot4 = traceSyscalls (keepBuildTree (stdenvBootFun {
+ stdenvLinuxBoot4 = traceSyscalls (stdenvBootFun {
gcc = wrapGCC rec {
inherit (stdenvLinuxBoot3Pkgs) binutils;
coreutils = bootstrapTools;
@@ -244,7 +244,7 @@
inherit (stdenvLinuxBoot1Pkgs) perl;
};
inherit fetchurl;
- }));
+ });
# 9) The packages that can be built using the fourth stdenv.
@@ -261,7 +261,7 @@
# When updating stdenvLinux, make sure that the result has no
# dependency (`nix-store -qR') on bootstrapTools or the
# first binutils built.
- stdenvLinux = traceSyscalls (keepBuildTree (import ../generic rec {
+ stdenvLinux = traceSyscalls (import ../generic rec {
name = stdenv-linux;
inherit system;
@@ -298,6 +298,6 @@
gnumake gnused gnutar gnugrep gnupatch patchelf
attr acl;
};
- }));
+ });
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
