MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Aycan iRiCAN 2014-08-06 10:21:57 +03:00
commit c35224efb6
107 changed files with 788 additions and 760 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
nixos/modules/services/misc/nix-daemon.nix
View file

@ -22,14 +22,11 @@ let
nixConf =
let
# Tricky: if we're using a chroot for builds, then we need
# /bin/sh in the chroot (our own compromise to purity).
# However, since /bin/sh is a symlink to some path in the
# Nix store, which furthermore has runtime dependencies on
# other paths in the store, we need the closure of /bin/sh
# in `build-chroot-dirs' - otherwise any builder that uses
# /bin/sh won't work.
binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
# If we're using a chroot for builds, then provide /bin/sh in
# the chroot as a bind-mount to bash. This means we also need to
# include the entire closure of bash.
sh = pkgs.stdenv.shell;
binshDeps = pkgs.writeReferencesToFile sh;
in
pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
@ -40,7 +37,7 @@ let
build-users-group = nixbld
build-max-jobs = ${toString (cfg.maxJobs)}
build-use-chroot = ${if cfg.useChroot then "true" else "false"}
build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths)
build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths)
binary-caches = ${toString cfg.binaryCaches}
trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
$extraOptions
@ -253,8 +250,6 @@ in
config = {
nix.chrootDirs = [ "/bin" ];
environment.etc."nix/nix.conf".source = nixConf;
# List of machines for distributed Nix builds in the format

8
nixos/modules/services/web-servers/apache-httpd/default.nix
View file

@ -387,7 +387,7 @@ let
'';
enablePHP = any (svc: svc.enablePHP) allSubservices;
enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices;
# Generate the PHP configuration file. Should probably be factored
@ -531,6 +531,12 @@ in
'';
};
enablePHP = mkOption {
type = types.bool;
default = false;
description = "Whether to enable the PHP module.";
};
phpOptions = mkOption {
type = types.lines;
default = "";

4
nixos/modules/services/web-servers/tomcat.nix
View file

@ -79,8 +79,8 @@ in
jdk = mkOption {
default = pkgs.jdk;
description "Which JDK to use.";
}
description = "Which JDK to use.";
};
axis2 = {

9
nixos/modules/services/x11/hardware/synaptics.nix
View file

@ -41,16 +41,19 @@ in {
};
accelFactor = mkOption {
type = types.nullOr types.string;
default = "0.001";
description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
};
minSpeed = mkOption {
type = types.nullOr types.string;
default = "0.6";
description = "Cursor speed factor for precision finger motion.";
};
maxSpeed = mkOption {
type = types.nullOr types.string;
default = "1.0";
description = "Cursor speed factor for highest-speed finger motion.";
};
@ -120,9 +123,9 @@ in {
MatchIsTouchpad "on"
${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
Driver "synaptics"
Option "MinSpeed" "${cfg.minSpeed}"
Option "MaxSpeed" "${cfg.maxSpeed}"
Option "AccelFactor" "${cfg.accelFactor}"
${optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''}
${optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''}
${optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''}
${optionalString cfg.tapButtons tapConfig}
Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"

3
nixos/modules/system/boot/stage-1-init.sh
View file

@ -194,6 +194,9 @@ checkFS() {
# Don't check ROM filesystems.
if [ "$fsType" = iso9660 -o "$fsType" = udf ]; then return 0; fi
# Don't check resilient COWs as they validate the fs structures at mount time
if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi
# If we couldn't figure out the FS type, then skip fsck.
if [ "$fsType" = auto ]; then
echo 'cannot check filesystem with type "auto"!'

20
nixos/modules/tasks/trackpoint.nix
View file

@ -46,21 +46,15 @@ with lib;
config = mkIf config.hardware.trackpoint.enable {
jobs.trackpoint =
{ description = "Initialize trackpoint";
services.udev.extraRules =
''
ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}"
'';
startOn = "started udev";
task = true;
script = ''
echo -n ${toString config.hardware.trackpoint.sensitivity} \
> /sys/devices/platform/i8042/serio1/sensitivity
echo -n ${toString config.hardware.trackpoint.speed} \
> /sys/devices/platform/i8042/serio1/speed
system.activationScripts.trackpoint =
''
${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint"
'';
};
};
}

15
nixos/modules/virtualisation/ec2-data.nix
View file

@ -22,21 +22,22 @@ with lib;
systemd.services."fetch-ec2-data" =
{ description = "Fetch EC2 Data";
wantedBy = [ "multi-user.target" ];
wantedBy = [ "multi-user.target" "sshd.service" ];
before = [ "sshd.service" ];
after = [ "network.target" ];
wants = [ "ip-up.target" ];
after = [ "ip-up.target" ];
path = [ pkgs.curl pkgs.iproute ];
path = [ pkgs.wget pkgs.iproute ];
script =
''
ip route del blackhole 169.254.169.254/32 || true
curl="curl --retry 3 --retry-delay 0 --fail"
wget="wget -q --retry-connrefused -O -"
echo "setting host name..."
${optionalString (config.networking.hostName == "") ''
${pkgs.nettools}/bin/hostname $($curl http://169.254.169.254/1.0/meta-data/hostname)
${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/1.0/meta-data/hostname)
''}
# Don't download the SSH key if it has already been injected
@ -44,7 +45,7 @@ with lib;
if ! [ -e /root/.ssh/authorized_keys ]; then
echo "obtaining SSH key..."
mkdir -p /root/.ssh
$curl -o /root/key.pub http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
$wget http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key > /root/key.pub
if [ $? -eq 0 -a -e /root/key.pub ]; then
if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
cat /root/key.pub >> /root/.ssh/authorized_keys
@ -58,7 +59,7 @@ with lib;
# Extract the intended SSH host key for this machine from
# the supplied user data, if available. Otherwise sshd will
# generate one normally.
$curl http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
$wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then

24
nixos/modules/virtualisation/virtualbox-image.nix
View file

@ -2,7 +2,26 @@
with lib;
{
let
cfg = config.virtualbox;
in {
options = {
virtualbox = {
baseImageSize = mkOption {
type = types.str;
default = 10G;
description = ''
The size of the VirtualBox base image. The size string should be on
a format the qemu-img command accepts.
'';
};
};
};
config = {
system.build.virtualBoxImage =
pkgs.vmTools.runInLinuxVM (
pkgs.runCommand "virtualbox-image"
@ -11,7 +30,7 @@ with lib;
''
mkdir $out
diskImage=$out/image
${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "10G"
${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "${cfg.baseImageSize}"
mv closure xchg/
'';
postVM =
@ -110,4 +129,5 @@ with lib;
boot.loader.grub.device = "/dev/sda";
services.virtualbox.enable = true;
};
}

4
nixos/release-combined.nix
View file

@ -42,8 +42,8 @@ in rec {
(all nixos.iso_graphical)
(all nixos.ova)
# (all nixos.tests.efi-installer.simple)
(all nixos.tests.containers)
#(all nixos.tests.efi-installer.simple)
#(all nixos.tests.containers)
(all nixos.tests.firefox)
(all nixos.tests.firewall)
(all nixos.tests.gnome3)

4
pkgs/applications/editors/idea/default.nix
View file

@ -8,7 +8,7 @@ let
{ name, version, build, src, description, license }:
stdenv.mkDerivation rec {
inherit name build src license;
inherit name build src;
ideaItem = makeDesktopItem {
name = "IDEA";
exec = "idea";
@ -69,7 +69,7 @@ in {
version = "13.1.3";
build = "IC-135.909";
description = "IntelliJ IDEA 13 Community Edition";
license = stdenv.lib.licenses.asl20.shortName;
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "62ed937ef68df16eef4d32772b6510835527f95020db1c76643f17ed2c067b51";

113
pkgs/applications/editors/idea/pycharm.nix Normal file
View file

@ -0,0 +1,113 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
, coreutils, gnugrep, which, git, python
}:
let
buildPycharm =
{ name, version, build, src, description, license }:
stdenv.mkDerivation rec {
inherit name build src;
desktopItem = makeDesktopItem {
name = "pycharm";
exec = "pycharm";
comment = "Powerful Python and Django IDE";
desktopName = "PyCharm";
genericName = "Powerful Python and Django IDE";
categories = "Application;Development;";
};
buildInputs = [ makeWrapper patchelf p7zip ];
propagatedUserEnvPkgs = [ python ];
patchPhase = ''
interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)"
snappyPath="lib/snappy-java-1.0.5"
7z x -o"$snappyPath" "$snappyPath.jar"
if [ "${stdenv.system}" == "x86_64-linux" ]; then
patchelf --set-interpreter "$interpreter" bin/fsnotifier64
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so"
else
patchelf --set-interpreter "$interpreter" bin/fsnotifier
patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so"
fi
7z a -tzip "$snappyPath.jar" ./"$snappyPath"/*
rm -vr "$snappyPath"
'';
installPhase = ''
mkdir -vp "$out/bin" "$out/$name"
cp -va . "$out/$name"
jdk="${jdk}/lib/openjdk"
makeWrapper "$out/$name/bin/pycharm.sh" "$out/bin/pycharm" \
--prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
--prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \
--prefix JDK_HOME : "$jdk" \
--prefix PYCHARM_JDK : "$jdk"
cp -a "${desktopItem}"/* "$out"
'';
meta = {
homepage = "https://www.jetbrains.com/pycharm/";
inherit description;
inherit license;
maintainers = [ stdenv.lib.maintainers.jgeerds ];
platforms = stdenv.lib.platforms.linux;
};
};
in {
pycharm-community-313 = buildPycharm rec {
name = "pycharm-community-${version}";
version = "3.1.3";
build = "133.1347";
description = "PyCharm 3.1 Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "http://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "f671ee4c99207c179f168b5b98fa23afe90a94c3a3914367b95a46b0c2881b23";
};
};
pycharm-community-341 = buildPycharm rec {
name = "pycharm-community-${version}";
version = "3.4.1";
build = "135.1057";
description = "PyCharm 3.4 Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "http://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64";
};
};
pycharm-professional-313 = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "3.1.3";
build = "133.1347";
description = "PyCharm 3.1 Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "http://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "e0c2db8f18cb825a95de6ddc4b0b9f93c5643bf34cca9f1b3c2fa37fd7c14f11";
};
};
pycharm-professional-341 = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "3.4.1";
build = "135.1057";
description = "PyCharm 3.4 Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "http://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "e4f85f3248e8985ac9f8c326543f979b47ba1d7ac6b128a2cf2b3eb8ec545d2b";
};
};
}

6
pkgs/applications/misc/synergy/default.nix
View file

@ -6,11 +6,11 @@ assert stdenv.isLinux -> cryptopp != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "synergy-1.4.17";
name = "synergy-1.5.0";
src = fetchurl {
url = "http://fossfiles.com/synergy/${name}-r2055-Source.tar.gz";
sha256 = "1mwaapvq9vsm0rdpq99fyzcw6wbp83rg6cylcqcgjjd21c6y9iwm";
url = "http://synergy-project.org/files/packages/synergy-1.5.0-r2278-Source.tar.gz";
sha256 = "097hk9v01lwzs7ly6ynadxmjh7ad68l5si7w4qmjn6z7l8b61gv6";
};
patches = optional stdenv.isLinux ./cryptopp.patch;

7
pkgs/applications/misc/zathura/core/default.nix
View file

@ -11,13 +11,6 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
# Bug in zathura build system: we should remove empty manfiles in order them
# to be compiled properly
preBuild = ''
rm zathura.1
rm zathurarc.5
'';
makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
postInstall = ''

347
pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch
View file

@ -1,347 +0,0 @@
commit 9c4b24a52e0ff478aa170d33e26c44acd8c68be3
Author: Jamie Madill <jmadill@chromium.org>
Date: Thu Jun 12 13:41:17 2014 -0400
Use commit_id.py on Windows, and handle missing git.
This allows us to delete the Windows batch file.
Changes the commit_id script to take the working directory so that it
can be called from a different working directory than the angle
repository is in.
Renames the generated commit header to angle_commit.h. This is being
written to the shared generated code directory for the entire build,
and "commit.h" is insufficiently unique.
BUG=angle:669
Change-Id: I35e80411a7e8ba1e02ce3f6a4fc54ed4dbc918f3
Reviewed-on: https://chromium-review.googlesource.com/202048
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
[Removed and/or fixed up Windows specific hunks]
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
diff --git a/generate_projects b/generate_projects
index 6743254..8175277 100644
--- a/generate_projects
+++ b/generate_projects
@@ -34,6 +34,7 @@ if __name__ == '__main__':
gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0')
gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0')
gyp_cmd += ' -D release_symbols=' + ('true' if release_symbols else 'false')
+ gyp_cmd += ' -D angle_use_commit_id=0'
gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp')
print 'Generating projects to ' + generation_dir + ' from gyp files...'
diff --git a/projects/build/all.sln b/projects/build/all.sln
index 1aa0796..5862edd 100644
--- a/projects/build/all.sln
+++ b/projects/build/all.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}"
ProjectSection(ProjectDependencies) = postProject
{63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
- {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
{276D20F5-2943-414C-0FF6-21F4723A5CF6} = {276D20F5-2943-414C-0FF6-21F4723A5CF6}
{C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679}
{19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5}
+ {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
{22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81}
{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
{FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061}
@@ -30,9 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}"
- ProjectSection(ProjectDependencies) = postProject
- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}"
ProjectSection(ProjectDependencies) = postProject
@@ -68,7 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx
ProjectSection(ProjectDependencies) = postProject
{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}"
diff --git a/projects/samples/samples.sln b/projects/samples/samples.sln
index 53cec34..b927860 100644
--- a/projects/samples/samples.sln
+++ b/projects/samples/samples.sln
@@ -1,9 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}"
- ProjectSection(ProjectDependencies) = postProject
- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}"
ProjectSection(ProjectDependencies) = postProject
@@ -39,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx
ProjectSection(ProjectDependencies) = postProject
{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}"
diff --git a/projects/src/angle.sln b/projects/src/angle.sln
index 0d6ec65..cdf9f53 100644
--- a/projects/src/angle.sln
+++ b/projects/src/angle.sln
@@ -1,9 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}"
- ProjectSection(ProjectDependencies) = postProject
- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}"
ProjectSection(ProjectDependencies) = postProject
@@ -16,7 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj",
ProjectSection(ProjectDependencies) = postProject
{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}"
diff --git a/src/angle.gypi b/src/angle.gypi
index 5339369..ef16749 100644
--- a/src/angle.gypi
+++ b/src/angle.gypi
@@ -7,6 +7,12 @@
{
'angle_code': 1,
'angle_post_build_script%': 0,
+ 'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle',
+ 'angle_id_script_base': 'commit_id.py',
+ 'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)',
+ 'angle_id_header_base': 'commit.h',
+ 'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)',
+ 'angle_use_commit_id%': '<!(python <(angle_id_script_base) check ..)',
},
'includes':
[
@@ -23,57 +29,71 @@
'copies':
[
{
- 'destination': '<(SHARED_INTERMEDIATE_DIR)',
- 'files': [ 'commit_id.bat', 'copy_compiler_dll.bat', 'commit_id.py' ],
+ 'destination': '<(angle_gen_path)',
+ 'files': [ 'copy_compiler_dll.bat', '<(angle_id_script_base)' ],
},
],
},
-
+ ],
+ 'conditions':
+ [
+ ['angle_use_commit_id!=0',
{
- 'target_name': 'commit_id',
- 'type': 'none',
- 'includes': [ '../build/common_defines.gypi', ],
- 'dependencies': [ 'copy_scripts', ],
- 'conditions':
+ 'targets':
[
- ['OS=="win"',
{
+ 'target_name': 'commit_id',
+ 'type': 'none',
+ 'includes': [ '../build/common_defines.gypi', ],
+ 'dependencies': [ 'copy_scripts', ],
'actions':
[
{
- 'action_name': 'Generate Commit ID Header',
- 'message': 'Generating commit ID header...',
+ 'action_name': 'Generate ANGLE Commit ID Header',
+ 'message': 'Generating ANGLE Commit ID',
+ # reference the git index as an input, so we rebuild on changes to the index
+ 'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
+ 'outputs': [ '<(angle_id_header)' ],
'msvs_cygwin_shell': 0,
- 'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.bat', '<(angle_path)/.git/index' ],
- 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit.h' ],
- 'action': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.bat', '<(SHARED_INTERMEDIATE_DIR)' ],
+ 'action':
+ [
+ 'python', '<(angle_id_script)', 'gen', '<(angle_path)', '<(angle_id_header)'
+ ],
},
],
- },
- { # OS != win
- 'actions':
+ 'direct_dependent_settings':
+ {
+ 'include_dirs':
+ [
+ '<(angle_gen_path)',
+ ],
+ },
+ }
+ ]
+ },
+ { # angle_use_commit_id==0
+ 'targets':
+ [
+ {
+ 'target_name': 'commit_id',
+ 'type': 'none',
+ 'copies':
[
{
- 'action_name': 'Generate Commit ID Header',
- 'message': 'Generating commit ID header...',
- 'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(angle_path)/.git/index' ],
- 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit.h' ],
- 'action': [ 'python', '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(SHARED_INTERMEDIATE_DIR)/commit.h' ],
- },
+ 'destination': '<(angle_gen_path)/id',
+ 'files': [ '<(angle_id_header_base)' ]
+ }
],
- }],
- ],
- 'direct_dependent_settings':
- {
- 'include_dirs':
- [
- '<(SHARED_INTERMEDIATE_DIR)',
- ],
- },
- },
- ],
- 'conditions':
- [
+ 'direct_dependent_settings':
+ {
+ 'include_dirs':
+ [
+ '<(angle_gen_path)',
+ ],
+ },
+ }
+ ]
+ }],
['OS=="win"',
{
'targets':
@@ -93,7 +113,7 @@
'outputs': [ '<(PRODUCT_DIR)/D3DCompiler_46.dll' ],
'action':
[
- "<(SHARED_INTERMEDIATE_DIR)/copy_compiler_dll.bat",
+ "<(angle_gen_path)/copy_compiler_dll.bat",
"$(PlatformName)",
"<(windows_sdk_path)",
"<(PRODUCT_DIR)"
diff --git a/src/commit.h b/src/commit.h
new file mode 100644
index 0000000..4c89a65
--- /dev/null
+++ b/src/commit.h
@@ -0,0 +1,14 @@
+//
+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// commit.h:
+// This is a default commit hash header, when git is not available.
+//
+
+#define ANGLE_COMMIT_HASH "unknown hash"
+#define ANGLE_COMMIT_HASH_SIZE 12
+#define ANGLE_COMMIT_DATE "unknown date"
+
+#define ANGLE_DISABLE_PROGRAM_BINARY_LOAD
diff --git a/src/commit_id.py b/src/commit_id.py
index 6339cca..7f711e7 100644
--- a/src/commit_id.py
+++ b/src/commit_id.py
@@ -1,19 +1,35 @@
import subprocess as sp
import sys
+import os
-def grab_output(*command):
- return sp.Popen(command, stdout=sp.PIPE).communicate()[0].strip()
+# Usage: commit_id.py check <angle_dir> (checks if git is present)
+# Usage: commit_id.py gen <angle_dir> <file_to_write> (generates commit id)
+def grab_output(command, cwd):
+ return sp.Popen(command, stdout=sp.PIPE, shell=True, cwd=cwd).communicate()[0].strip()
+
+operation = sys.argv[1]
+cwd = sys.argv[2]
+
+if operation == 'check':
+ index_path = os.path.join(cwd, '.git', 'index')
+ if os.path.exists(index_path):
+ print("1")
+ else:
+ print("0")
+ sys.exit(0)
+
+output_file = sys.argv[3]
commit_id_size = 12
try:
- commit_id = grab_output('git', 'rev-parse', '--short=%d' % commit_id_size, 'HEAD')
- commit_date = grab_output('git', 'show', '-s', '--format=%ci', 'HEAD')
+ commit_id = grab_output('git rev-parse --short=%d HEAD' % commit_id_size, cwd)
+ commit_date = grab_output('git show -s --format=%ci HEAD', cwd)
except:
commit_id = 'invalid-hash'
commit_date = 'invalid-date'
-hfile = open(sys.argv[1], 'w')
+hfile = open(output_file, 'w')
hfile.write('#define ANGLE_COMMIT_HASH "%s"\n' % commit_id)
hfile.write('#define ANGLE_COMMIT_HASH_SIZE %d\n' % commit_id_size)
diff --git a/src/common/version.h b/src/common/version.h
index b9781d7..d9148d1 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,4 +1,4 @@
-#include "commit.h"
+#include "id/commit.h"
#define ANGLE_MAJOR_VERSION 2
#define ANGLE_MINOR_VERSION 1
diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index 8525ffb..e3ffa47 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -1018,6 +1018,9 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, FragmentShader *fragmentShade
bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length)
{
+#ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD
+ return false;
+#else
BinaryInputStream stream(binary, length);
int format = stream.readInt<int>();
@@ -1260,6 +1263,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length)
initializeUniformStorage();
return true;
+#endif // #ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD
}
bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length)

6
pkgs/applications/networking/browsers/chromium/source/default.nix
View file

@ -30,14 +30,12 @@ stdenv.mkDerivation {
-e 's|/bin/echo|echo|' \
-e "/python_arch/s/: *'[^']*'/: '""'/" \
build/common.gypi chrome/chrome_tests.gypi
'' + optionalString (versionOlder version "38.0.0.0") (''
'' + optionalString (versionOlder version "38.0.0.0") ''
sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium
sed -i -e 's|/usr/bin/gcc|gcc|' \
third_party/WebKit/Source/build/scripts/scripts.gypi \
third_party/WebKit/Source/build/scripts/preprocessor.pm
'' + optionalString (!versionOlder version "37.0.0.0") ''
patch -p1 -d third_party/angle < "${./angle_build_37.patch}"
'') + optionalString useOpenSSL ''
'' + optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'';

16
pkgs/applications/networking/browsers/chromium/source/sources.nix
View file

@ -1,16 +1,16 @@
# This file is autogenerated from update.sh in the parent directory.
{
dev = {
version = "38.0.2101.0";
sha256 = "01lmnw6kf7qahifybpcf7275ilbsdz1mg10lckh9jhbqk4mxy4c4";
sha256bin32 = "06grj03bvkgfmr5gfhv5gqn9vrz0r37svp5wr0l7d2iav7vk7g9g";
sha256bin64 = "0d856xkjpx1pcwrkfqa40kwy3s1nvc2qksvrvvdfb84fg3gc4j42";
version = "38.0.2107.3";
sha256 = "0zb1mj3xgvvs5ijix4b52vj9dlymqkipn8srfzvhwl7g4hx5ss3v";
sha256bin32 = "12lvvmg3bqacb0qw72bwlxm2m57s39mz2810agngdgzv0hd835cv";
sha256bin64 = "1vw36s8nlvdsl8pjbh4gny00kvcizn1i2lznzqzysicz2rz7ncrh";
};
beta = {
version = "37.0.2062.44";
sha256 = "0pvwdrwygn236bg8wdambwkw9iglq0a3lm8sr7k3q02ng5v0l111";
sha256bin32 = "1j326kgng245b1lf5dlg0ipwbrm7miiz5byhisqls30v1q3njka9";
sha256bin64 = "1w86salg04z42c518v6nn40003zhabk33plrz5zh9nfjdxn6nxig";
version = "37.0.2062.58";
sha256 = "0jck4s6nrizj9wmifsjviin9ifnviihs21fi05wzljyfnbgc4byl";
sha256bin32 = "1cm1r8bqy66gvdhbrgn9pdc11i72dca96ab5j3m3349p6728jbgk";
sha256bin64 = "0cpb189pn5jiplldkgy8lfbcwvfik66kjjf6y2i708xa5ggfpwfi";
};
stable = {
version = "36.0.1985.125";

2
pkgs/applications/networking/remote/freerdp/unstable.nix
View file

@ -70,6 +70,8 @@ stdenv.mkDerivation rec {
homepage = http://www.freerdp.com/;
license = "free-non-copyleft";
broken = true; # fails to build
};
}

4
pkgs/applications/version-management/subversion/default.nix
View file

@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
stdenv.mkDerivation rec {
version = "1.8.8";
version = "1.8.9";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion/${name}.tar.bz2";
sha256 = "1cqxwydjidyf59y4lgkxl7bra1sy28abqm2mi5971qjsv0f96s8m";
sha1 = "424ee12708f39a126efd905886666083dcc4eeaf";
};
buildInputs = [ zlib apr aprutil sqlite ]

8
pkgs/applications/window-managers/compiz/default.nix
View file

@ -15,11 +15,11 @@ let
s = # Generated upstream information
rec {
baseName="compiz";
version="0.9.10.0";
version="0.9.11.2";
name="${baseName}-${version}";
hash="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax";
url="https://launchpad.net/compiz/0.9.10/0.9.10.0/+download/compiz-0.9.10.0.tar.bz2";
sha256="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax";
hash="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy";
url="https://launchpad.net/compiz/0.9.11/0.9.11.2/+download/compiz-0.9.11.2.tar.bz2";
sha256="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy";
};
buildInputs = [cmake pkgconfig
libXrender renderproto gtk libwnck pango cairo

4
pkgs/data/misc/cacert/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "cacert-20140704";
name = "cacert-20140715";
src = fetchurl {
url = "http://tarballs.nixos.org/${name}.pem.bz2";
sha256 = "05ymb7lrxavscbpx5xywlbya9q66r26fbngfif6zrvfpf3qskiza";
sha256 = "1l4j7z6ysnllx99isjzlc8zc34rbbgj4kzlg1y5sy9bgphc8cssl";
};
unpackPhase = "true";

9
pkgs/development/compilers/sbcl/default.nix
View file

@ -5,11 +5,14 @@ stdenv.mkDerivation rec {
version = "1.2.0";
src = fetchurl {
url = mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2;
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
};
buildInputs = [ sbclBootstrap ] ++ stdenv.lib.optional stdenv.isLinux clisp;
buildInputs = [ ]
++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
++ (stdenv.lib.optional stdenv.isLinux clisp)
;
patchPhase = ''
echo '"${version}.nixos"' > version.lisp-expr
@ -70,5 +73,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd3;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.all;
inherit version;
updateWalker = true;
};
}

9
pkgs/development/compilers/sbcl/default.upstream
View file

@ -1,9 +0,0 @@
name sbcl
target default.nix
url http://sf.net/projects/sbcl/files/sbcl/
version_link '/sbcl/[0-9.]+/$'
link "source.tar.bz2"
version '.*/sbcl-([0-9.]+)-source.*' '\1'
redirect
process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/'
process '[?].*' ''

4
pkgs/development/interpreters/angelscript/default.nix
View file

@ -11,10 +11,10 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="angelscript";
version = "2.29.0";
version = "2.29.1";
name="${baseName}-${version}";
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "1g0bi8dx832s3911rr3jymnffaz3q7cnbzl53nmi6hwsr2kpc6mx";
sha256 = "081a0wnn1hl0hjgrg0nz63ff7k7dgrwsgszka5i7623ny407fkl5";
};
in
rec {

4
pkgs/development/interpreters/php/5.4.nix
View file

@ -9,7 +9,7 @@ in
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
version = "5.4.30";
version = "5.4.31";
name = "php-${version}";
@ -243,7 +243,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
src = fetchurl {
url = "http://www.php.net/distributions/php-${version}.tar.bz2";
sha256 = "1rkc977b4k0y6qg5nf8729g5zpica31h1isyds6khmrdwi23df1j";
sha256 = "0kci0yir923fc7dv7j9qrc10pj05v82jnxjxjbgrj7gx64a4k3jy";
};
meta = {

21
pkgs/development/libraries/haskell/ad/default.nix Normal file
View file

@ -0,0 +1,21 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, comonad, dataReify, doctest, erf, filepath, free, mtl
, nats, reflection, tagged, transformers
}:
cabal.mkDerivation (self: {
pname = "ad";
version = "4.2.0.1";
sha256 = "06vjllcrnr4dv5h3xkcy5zhnhyamp6b6jahpnh2y0i6mp2bdw0pz";
buildDepends = [
comonad dataReify erf free mtl nats reflection tagged transformers
];
testDepends = [ doctest filepath mtl ];
meta = {
homepage = "http://github.com/ekmett/ad";
description = "Automatic Differentiation";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/amqp/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "amqp";
version = "0.9";
sha256 = "10yacflzvf7y21yi6frs88gdbhf5g4j99ag8mwv6jrwfzwqszs5j";
version = "0.10";
sha256 = "0606grl2149phzqf0aww8264f9xaw4486ps5jw47ar57mcnxsml6";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/authenticate/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "authenticate";
version = "1.3.2.8";
sha256 = "1ylijkj32li9nm4x16d66h6a74q07m4v3n2dqm67by548wfyh1j9";
version = "1.3.2.9";
sha256 = "09vg7m2sh3566q7jgi85djc5jrq2y06swlbj1fbym6yf4cmk8gdr";
buildDepends = [
aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
httpTypes monadControl network resourcet tagstreamConduit text

16
pkgs/development/libraries/haskell/auto-update/default.nix Normal file
View file

@ -0,0 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, hspec }:
cabal.mkDerivation (self: {
pname = "auto-update";
version = "0.1.0.0";
sha256 = "000aaccwpi373fnnmnq08d3128ncgv3w6pj25px25c2kp56z4c0l";
testDepends = [ hspec ];
meta = {
homepage = "https://github.com/yesodweb/wai";
description = "Efficiently run periodic, on-demand actions";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

8
pkgs/development/libraries/haskell/aws/default.nix
View file

@ -3,20 +3,20 @@
{ cabal, aeson, base16Bytestring, base64Bytestring, blazeBuilder
, byteable, caseInsensitive, cereal, conduit, conduitExtra
, cryptohash, dataDefault, filepath, httpConduit, httpTypes
, liftedBase, monadControl, mtl, resourcet, text, time
, liftedBase, monadControl, mtl, network, resourcet, text, time
, transformers, unorderedContainers, utf8String, vector, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "aws";
version = "0.9.1";
sha256 = "1fp18j8my9v7d6z0d28bc1hjzrs9znf3c986950pfpv2bsiw7m6d";
version = "0.9.2";
sha256 = "1jmvf1x3vamcjb89mk52l1iikdchab8pm23iw9y1d4zm4636czxm";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson base16Bytestring base64Bytestring blazeBuilder byteable
caseInsensitive cereal conduit conduitExtra cryptohash dataDefault
filepath httpConduit httpTypes liftedBase monadControl mtl
filepath httpConduit httpTypes liftedBase monadControl mtl network
resourcet text time transformers unorderedContainers utf8String
vector xmlConduit
];

2
pkgs/development/libraries/haskell/bencoding/default.nix
View file

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, deepseq, hspec, mtl, QuickCheck, text }:
cabal.mkDerivation (self: {

10
pkgs/development/libraries/haskell/cairo/default.nix
View file

@ -1,14 +1,14 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String
, zlib
{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, text
, utf8String, zlib
}:
cabal.mkDerivation (self: {
pname = "cairo";
version = "0.12.5.3";
sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7";
buildDepends = [ mtl utf8String ];
version = "0.13.0.0";
sha256 = "1sw1f50kmqln1mkvrr6g85b46dn0ipwnvyl13kxzhq5g581rra92";
buildDepends = [ mtl text utf8String ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ cairo libc pkgconfig zlib ];
pkgconfigDepends = [ cairo ];

13
pkgs/development/libraries/haskell/cookie/default.nix
View file

@ -1,12 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, blazeBuilder, dataDefault, deepseq, text, time }:
{ cabal, blazeBuilder, dataDefault, deepseq, HUnit, QuickCheck
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
, time
}:
cabal.mkDerivation (self: {
pname = "cookie";
version = "0.4.1.1";
sha256 = "1w1nh7h4kc9pr9kpi8fkrqiih37mp3gcnxf42r01nciq4sh4yi3m";
version = "0.4.1.2";
sha256 = "1dxga56m4mza3annhb48ryb31kf0kxr3w99c4mwh9w9l77xhcq3i";
buildDepends = [ blazeBuilder dataDefault deepseq text time ];
testDepends = [
blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text time
];
meta = {
homepage = "http://github.com/snoyberg/cookie";
description = "HTTP cookie parsing and rendering";

4
pkgs/development/libraries/haskell/cuda/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cuda";
version = "0.6.0.0";
sha256 = "0zvyvk5yhwz7nl613yvfl32xnv9kgfdwbb0whyd6nrm663xa352y";
version = "0.6.0.1";
sha256 = "03wnkqgdvy6h2dqcmj0xlag3am3s3rjzhx0kqaq362mq365n9y51";
buildTools = [ c2hs ];
extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
doCheck = false;

22
pkgs/development/libraries/haskell/data-fin/default.nix Normal file
View file

@ -0,0 +1,22 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, lazysmallcheck, preludeSafeenum, QuickCheck, reflection
, smallcheck, tagged
}:
cabal.mkDerivation (self: {
pname = "data-fin";
version = "0.1.1.2";
sha256 = "13qgqx3b01a8bm7jw7fkv7nyyzg2jkgg27zv2wp57g0nd5aw5hpn";
buildDepends = [
lazysmallcheck preludeSafeenum QuickCheck reflection smallcheck
tagged
];
jailbreak = true;
meta = {
homepage = "http://code.haskell.org/~wren/";
description = "Finite totally ordered sets";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

24
pkgs/development/libraries/haskell/dom-selector/default.nix Normal file
View file

@ -0,0 +1,24 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, blazeHtml, htmlConduit, parsec, QuickCheck, text, thLift
, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "dom-selector";
version = "0.2.0.1";
sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22";
buildDepends = [
blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
];
testDepends = [
blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
];
doCheck = false;
meta = {
homepage = "https://github.com/nebuta/";
description = "DOM traversal by CSS selectors for xml-conduit package";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

8
pkgs/development/libraries/haskell/fast-logger/default.nix
View file

@ -1,12 +1,12 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, blazeBuilder, filepath, hspec, text }:
{ cabal, autoUpdate, blazeBuilder, filepath, hspec, text }:
cabal.mkDerivation (self: {
pname = "fast-logger";
version = "2.1.5";
sha256 = "12f7yad2f6q846rw2ji5fsx3d7qd8jdrnnzsbji5bpv00mvvsiza";
buildDepends = [ blazeBuilder filepath text ];
version = "2.2.0";
sha256 = "02gc5f7vgwfdlhfawki4xxrl33lbdl05wh64qm3mb3h2dv1gnwrr";
buildDepends = [ autoUpdate blazeBuilder filepath text ];
testDepends = [ hspec ];
meta = {
description = "A fast logging system";

4
pkgs/development/libraries/haskell/fb/default.nix
View file

@ -10,8 +10,8 @@
cabal.mkDerivation (self: {
pname = "fb";
version = "1.0.2";
sha256 = "1xgldk690dpbmhzmjlngpbalmbs0xrc7265zc7frphpsbbw3cnqc";
version = "1.0.4";
sha256 = "1sp0x5p9l02i2ynvynazhgs5lqqwih997c2fyfp0xi24qsc7ilr2";
buildDepends = [
aeson attoparsec base16Bytestring base64Bytestring cereal conduit
conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault

14
pkgs/development/libraries/haskell/generics-sop/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, tagged }:
cabal.mkDerivation (self: {
pname = "generics-sop";
version = "0.1.0.2";
sha256 = "01s3v3a29wdsps9vas8in2ks5p4d2arqp3qvmzqa7v2sz786xjra";
buildDepends = [ tagged ];
meta = {
description = "Generic Programming using True Sums of Products";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

4
pkgs/development/libraries/haskell/ghc-mod/default.nix
View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "4.1.5";
sha256 = "192v0h9nhi7xgvidyisn3rpr6kjpkibrm2b859b6a92gp0h37nnn";
version = "4.1.6";
sha256 = "093wafaizr2xf7vmzj6f3vs8ch0vpcmwlrja6af6hshgaj2d80qs";
isLibrary = true;
isExecutable = true;
buildDepends = [

8
pkgs/development/libraries/haskell/ghcjs-dom/default.nix
View file

@ -1,12 +1,12 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ghcjsBase, mtl }:
{ cabal, ghcjsBase, mtl, text }:
cabal.mkDerivation (self: {
pname = "ghcjs-dom";
version = "0.0.10";
sha256 = "0xffr197m6qam4q7ckgcwl0v9kwrxa5fm894c9vyxdmlcjyn38rm";
buildDepends = [ ghcjsBase mtl ];
version = "0.1.0.0";
sha256 = "0qm43bd4m7w14p6ag643h09pll4fp09j1mzjyqvp0dhal03dc723";
buildDepends = [ ghcjsBase mtl text ];
meta = {
description = "DOM library that supports both GHCJS and WebKitGTK";
license = self.stdenv.lib.licenses.mit;

4
pkgs/development/libraries/haskell/gio/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "gio";
version = "0.12.5.3";
sha256 = "1n9sima0m30w1bmfk0wb4fawrg76vgpvlzki0kwdh6f0sfczxywc";
version = "0.13.0.0";
sha256 = "05mycm6nrwwpjflcmm3w33b5nmm6fgyzwzrx1piqazvd1magwcyj";
buildDepends = [ glib mtl ];
buildTools = [ gtk2hsBuildtools ];
pkgconfigDepends = [ glib ];

4
pkgs/development/libraries/haskell/github/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "github";
version = "0.8";
sha256 = "0lzz7q2gjiq4z8yi1sb981m220qnwjizk9hqv09yfj5a4grqfchf";
version = "0.9";
sha256 = "19ff9srvm03n9iz7mf6wadydfw0xs0j9ayvr86dmmp9blmjkqc0d";
buildDepends = [
aeson attoparsec caseInsensitive conduit dataDefault failure
hashable HTTP httpConduit httpTypes network text time

1
pkgs/development/libraries/haskell/glade/default.nix
View file

@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ gtkC libglade ];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the glade library";

9
pkgs/development/libraries/haskell/glib/default.nix
View file

@ -1,12 +1,13 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, utf8String }:
{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, text, utf8String
}:
cabal.mkDerivation (self: {
pname = "glib";
version = "0.12.5.4";
sha256 = "1jbqfcsmsghq67lwnk6yifs34lxvh6xfbzxzfryalifb4zglccz6";
buildDepends = [ utf8String ];
version = "0.13.0.0";
sha256 = "0l3mkbwm90zfgn6qrblnp642pr4m9lqpi4pg3kfpqlqp5vziszy9";
buildDepends = [ text utf8String ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib ];

4
pkgs/development/libraries/haskell/graph-wrapper/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "graph-wrapper";
version = "0.2.4.2";
sha256 = "0cf70xvmzn4w5pg1bxizajqgcbjwwk6jrd7hnb3kfqy1v3apifyf";
version = "0.2.4.3";
sha256 = "1wfazkczc9m1r0snzv5b4ax315g93qgrnqc2wnrqqnzhcfy1symg";
meta = {
homepage = "http://www.github.com/batterseapower/graph-wrapper";
description = "A wrapper around the standard Data.Graph with a less awkward interface";

8
pkgs/development/libraries/haskell/gtk/default.nix
View file

@ -1,14 +1,14 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
, pkgconfig
, pkgconfig, text
}:
cabal.mkDerivation (self: {
pname = "gtk";
version = "0.12.5.7";
sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w";
buildDepends = [ cairo gio glib mtl pango ];
version = "0.13.0.0";
sha256 = "04xi1415i3qaiif9ha5wnmyzxxw8ix17zpvvfjn61nrxlk6p973m";
buildDepends = [ cairo gio glib mtl pango text ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib gtk ];

4
pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "gtk2hs-buildtools";
version = "0.13.0.0";
sha256 = "075f6jjkk56h0nda0gbdr775d72c0b3d2z483cff2bnnjf8aqwa6";
version = "0.13.0.1";
sha256 = "0ngdg44hxpyga9kwm70340c8jhsh9wl5rja3wx9mfx194idivaxa";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath hashtables random ];

8
pkgs/development/libraries/haskell/gtksourceview2/default.nix
View file

@ -1,14 +1,14 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl
, pkgconfig
, pkgconfig, text
}:
cabal.mkDerivation (self: {
pname = "gtksourceview2";
version = "0.12.5.0";
sha256 = "125psfr58na60nz5ax3va08fq1aa4knzjccj8ghwk8x9fkzddfs9";
buildDepends = [ glib gtk mtl ];
version = "0.13.0.0";
sha256 = "0md4dwg68cgq5qj80rjvsrckwn2ap9d1xp0hy8w1iiyii8dfqcnn";
buildDepends = [ glib gtk mtl text ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ gtksourceview ];

12
pkgs/development/libraries/haskell/hsimport/default.nix
View file

@ -1,19 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, cmdargs, filepath, haskellSrcExts, lens, mtl
, split, tasty, tastyGolden, text
{ cabal, attoparsec, cmdargs, dyre, filepath, haskellSrcExts, lens
, mtl, split, tasty, tastyGolden, text
}:
cabal.mkDerivation (self: {
pname = "hsimport";
version = "0.4";
sha256 = "1pkj6cfdfyrcrm6gr4a43y6s4qhwpli6zgnlx4ycmhs3yh5kay60";
version = "0.5";
sha256 = "18rhldw6vbkjcpx373m784sppadccm2b3xx3zzr0l45dwmsh6rb4";
isLibrary = true;
isExecutable = true;
buildDepends = [
attoparsec cmdargs haskellSrcExts lens mtl split text
attoparsec cmdargs dyre haskellSrcExts lens mtl split text
];
testDepends = [ filepath tasty tastyGolden ];
testDepends = [ filepath haskellSrcExts tasty tastyGolden ];
doCheck = false;
meta = {
description = "A command line program for extending the import list of a Haskell source file";

4
pkgs/development/libraries/haskell/http-client/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-client";
version = "0.3.6";
sha256 = "0zav8arj6swhrzfyxf6py2yfpphjd0bllz7rm1540vb5lrhg4znm";
version = "0.3.6.1";
sha256 = "0mamndx2fyvshchcwv8ic910b90hp8rgbjhgqww0zpg8p1rr0v9h";
buildDepends = [
base64Bytestring blazeBuilder caseInsensitive cookie
dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

4
pkgs/development/libraries/haskell/iproute/default.nix
View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "iproute";
version = "1.3.0";
sha256 = "1n9lcm1f2rlqkvg90zikf2h4badzh9r24zqb27648l48254m6q5p";
version = "1.3.1";
sha256 = "1l3asv8q1jiwsvpq6kkigrzpm3pjbm03gpc4rbhn6kpi6z9h8cdp";
buildDepends = [ appar byteorder network ];
testDepends = [
appar byteorder doctest hspec network QuickCheck safe

4
pkgs/development/libraries/haskell/monad-extras/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "monad-extras";
version = "0.5.8";
sha256 = "1h7gjdmbdjw2k49xlflca88bxiid7gxl8l9gzmywybllff376npl";
version = "0.5.9";
sha256 = "1y24yz635brllfygia1mbln4d8xiwb0pq0izh5pil7511gijhs0s";
buildDepends = [
mmorph monadControl stm transformers transformersBase
];

4
pkgs/development/libraries/haskell/monad-logger/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "monad-logger";
version = "0.3.7";
sha256 = "03fzp8cvx8qapyjgnm6gywj8b1pcd43y3fb4vg1wgxa55lsg6y58";
version = "0.3.7.1";
sha256 = "0imr1bgcpfm19a91r4i6lii7gycx77ysfrdri030zr2jjrvggh9i";
buildDepends = [
blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
monadControl monadLoops mtl resourcet stm stmChans text

7
pkgs/development/libraries/haskell/pango/default.nix
View file

@ -1,13 +1,14 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig
, text
}:
cabal.mkDerivation (self: {
pname = "pango";
version = "0.12.5.3";
sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a";
buildDepends = [ cairo glib mtl ];
version = "0.13.0.0";
sha256 = "0qrsivr6z8pp4ibg1vyzyg2fw0jzrshn6h6g6vff93awxzqq9rlw";
buildDepends = [ cairo glib mtl text ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ cairo pango ];

4
pkgs/development/libraries/haskell/pathtype/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "pathtype";
version = "0.5.3";
sha256 = "11plb7xw4j8vjziw1q0ymx33p6185cxd2hqrxw2hgsfzf2b9dvqg";
version = "0.5.4";
sha256 = "1ns5q3nrkl99xp4mrmk8wpvb9qzyvnw5cyjwh5rh76ykm2d5dbg7";
buildDepends = [ QuickCheck time ];
meta = {
homepage = "http://code.haskell.org/pathtype";

4
pkgs/development/libraries/haskell/persistent/default.nix
View file

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.3.1.1";
sha256 = "0na1mci7m8hzv40d5qc75dqdkw2kbw8i6xpjlpwgd1flznmqkdvx";
version = "1.3.3";
sha256 = "1pz3xdbk46qprcyb0sll5zzr2vp6x08w7pd5glz2jf2242k7cdrd";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
exceptions liftedBase monadControl monadLogger pathPieces

4
pkgs/development/libraries/haskell/pipes-aeson/default.nix
View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "pipes-aeson";
version = "0.4.1.1";
sha256 = "1z520c9l2wqjcv5lb997n3zfks7p0z7dlwgqm74dcwnnfy3mfp9j";
version = "0.4.1.2";
sha256 = "0wacib0wf40bkm6rp2qcsrahc43g89l3icclbrshk8r54dhbazl7";
buildDepends = [
aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
transformers

15
pkgs/development/libraries/haskell/prelude-safeenum/default.nix Normal file
View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal }:
cabal.mkDerivation (self: {
pname = "prelude-safeenum";
version = "0.1.1.1";
sha256 = "0cff77nbhy3dsamrwm2wxhbi1mf2bzkdd1pdzqv3klpbzjwkdszv";
meta = {
homepage = "http://code.haskell.org/~wren/";
description = "A redefinition of the Prelude's Enum class in order to render it safe";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

16
pkgs/development/libraries/haskell/probability/default.nix Normal file
View file

@ -0,0 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, random, transformers, utilityHt }:
cabal.mkDerivation (self: {
pname = "probability";
version = "0.2.4.1";
sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc";
buildDepends = [ random transformers utilityHt ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming";
description = "Probabilistic Functional Programming";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/purescript/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "purescript";
version = "0.5.3";
sha256 = "05vhz3j4gx9paxmvimy154730078bl148819shwml6l6vq02723i";
version = "0.5.4";
sha256 = "02mxg9bsyzhr7xclf7jdsjjwcc6d05ibji64n9783rc1i9clc2gg";
isLibrary = true;
isExecutable = true;
buildDepends = [

14
pkgs/development/libraries/haskell/retry/default.nix
View file

@ -1,12 +1,18 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, dataDefault, exceptions, transformers }:
{ cabal, dataDefaultClass, exceptions, hspec, HUnit, QuickCheck
, time, transformers
}:
cabal.mkDerivation (self: {
pname = "retry";
version = "0.4";
sha256 = "16njq924b5n7jyfc059dbypp529gqlc9qnzd7wjk4m7dpm5bww67";
buildDepends = [ dataDefault exceptions transformers ];
version = "0.5";
sha256 = "1qp949w8pisgki06j5qgaxw1761q3gfccc7bqnhqpchazl4p6p6n";
buildDepends = [ dataDefaultClass exceptions transformers ];
testDepends = [
dataDefaultClass exceptions hspec HUnit QuickCheck time
transformers
];
jailbreak = true;
meta = {
homepage = "http://github.com/Soostone/retry";

4
pkgs/development/libraries/haskell/simple-conduit/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "simple-conduit";
version = "0.5.0";
sha256 = "0fbm1nv9190p1b038p6zxmw042cgm5jgkfbhscw1fslgzja90iyz";
version = "0.5.1";
sha256 = "1jy70cdw2h6fd2618dczajml5k82kkjmd2n0mgbby2mr6r3sk5zr";
buildDepends = [
bifunctors chunkedData either exceptions filepath free liftedAsync
liftedBase mmorph monadControl monoTraversable mtl mwcRandom

4
pkgs/development/libraries/haskell/statistics/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "statistics";
version = "0.13.1.1";
sha256 = "1ghb2snbacbfzxqcrvdiihvw2iip1m8rq9y62x1ayg6k13agm7r5";
version = "0.13.2.0";
sha256 = "0xxi0w7jxgj31zgwppvjx1iw80plrq2fxz6vaa9mr9ijqqi36xad";
buildDepends = [
aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive
vector vectorAlgorithms vectorBinaryInstances

8
pkgs/development/libraries/haskell/svgcairo/default.nix
View file

@ -1,12 +1,12 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }:
{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl, text }:
cabal.mkDerivation (self: {
pname = "svgcairo";
version = "0.12.5.2";
sha256 = "0l3903fzd5pk9wmxjdmx6vyym2r90b33hs6p2sfdks2lx352i94l";
buildDepends = [ cairo glib mtl ];
version = "0.13.0.0";
sha256 = "1i93dhg2fpnk38lgbfpsl97xpfgifrl7xs5nny5vj4hi8ln76ih0";
buildDepends = [ cairo glib mtl text ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc ];
pkgconfigDepends = [ librsvg ];

4
pkgs/development/libraries/haskell/twitter-types/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "twitter-types";
version = "0.3.20140620";
sha256 = "02mwdgz1l1z5k5k78bjnnbabcr27xixli1gqk6rmqrarcylybvll";
version = "0.3.20140801";
sha256 = "1ryvbshafgnfvn6697lb5qj9y61bm9371lzaz5v4xjf0jklm2z5n";
buildDepends = [ aeson httpTypes text unorderedContainers ];
testDepends = [
aeson attoparsec httpTypes HUnit shakespeare testFramework

4
pkgs/development/libraries/haskell/unbounded-delays/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "unbounded-delays";
version = "0.1.0.7";
sha256 = "1nv50i90hgvcl51w7s8x1c1ylpzyrbvs2mz5zfn68lr1ix2lk879";
version = "0.1.0.8";
sha256 = "1jdlpg82kndz6g97bw8fb6sjyyvylrcrg982xnhgi36717f0pv40";
meta = {
homepage = "https://github.com/basvandijk/unbounded-delays";
description = "Unbounded thread delays and timeouts";

4
pkgs/development/libraries/haskell/unix-time/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "unix-time";
version = "0.3.2";
sha256 = "0bbzrm4hprqsljwscpfmnw3ipj809q7570alzn1qampijsbb4cds";
version = "0.3.3";
sha256 = "018wpr5d2kjv8syj97664sqh1v7ws1780qmlfxvrakj86z9k5i8x";
buildDepends = [ binary ];
testDepends = [ doctest hspec QuickCheck time ];
meta = {

4
pkgs/development/libraries/haskell/wai-extra/default.nix
View file

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "3.0.1.1";
sha256 = "099pxahczai6ychsm04bwcvvd9m6lan5nqg159ny4jakpyk67zs8";
version = "3.0.1.2";
sha256 = "15v3mk7kbinvynsfxb95lwvg52wkpm3q9k5an8ak936ll3j2s14z";
buildDepends = [
ansiTerminal base64Bytestring blazeBuilder caseInsensitive
dataDefaultClass deepseq fastLogger httpTypes liftedBase network

12
pkgs/development/libraries/haskell/wai-logger/default.nix
View file

@ -1,18 +1,18 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, blazeBuilder, byteorder, caseInsensitive, doctest
, easyFile, fastLogger, httpTypes, network, unixTime, wai, waiTest
{ cabal, autoUpdate, blazeBuilder, byteorder, caseInsensitive
, doctest, fastLogger, httpTypes, network, unixTime, wai
}:
cabal.mkDerivation (self: {
pname = "wai-logger";
version = "2.1.2";
sha256 = "0rfgcq433k5jpdgwyzrzgiy5h66bb38xfqzb63gmqabysr8wa9kl";
version = "2.2.0";
sha256 = "0dl4c9b1yl22df421p6yw405bv1skvh6dk5rgybxz1sspvb94gvy";
buildDepends = [
blazeBuilder byteorder caseInsensitive easyFile fastLogger
autoUpdate blazeBuilder byteorder caseInsensitive fastLogger
httpTypes network unixTime wai
];
testDepends = [ doctest waiTest ];
testDepends = [ doctest ];
doCheck = false;
meta = {
description = "A logging system for WAI";

4
pkgs/development/libraries/haskell/wai-websockets/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "wai-websockets";
version = "3.0.0";
sha256 = "0bpzkh9a5j0a282z4dj9dqnjsgd0g8gyvvp0xm0a53582zfhfi5s";
version = "3.0.0.1";
sha256 = "01rbwyx2ks6hdaw5qw7dibidyw4bh85s2gzqy4rhmxpdcnmxxmnz";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/wai/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai";
version = "3.0.1";
sha256 = "1889l6fbgvxn13yaskcvjrq07vs62ayvq8q5rn9cpq0yqyc6llcw";
version = "3.0.1.1";
sha256 = "04dka0mgqckzhvmz8m9gqvk5qq79g23q8wx40v42fwhkwwy7f8i0";
buildDepends = [ blazeBuilder httpTypes network text vault ];
testDepends = [ blazeBuilder hspec ];
meta = {

4
pkgs/development/libraries/haskell/warp/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "3.0.0.4";
sha256 = "119yw4k11v2gq3z4gjr51i8z551cbbgwhkfnl9jr4ira06m6si2v";
version = "3.0.0.5";
sha256 = "1in9gnxb15np4vj47q6c07hr9iq2apbx0a1brkaqcmfq3c9wq9d5";
buildDepends = [
blazeBuilder caseInsensitive hashable httpDate httpTypes network
simpleSendfile streamingCommons text unixCompat void wai

4
pkgs/development/libraries/haskell/websockets-snap/default.nix
View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "websockets-snap";
version = "0.8.2.1";
sha256 = "13q1vrrcka91w9yad3jw1w68hp59n851hkn9a3hylw0cqs7008az";
version = "0.8.2.2";
sha256 = "1r5y5czpxrc06i7w3y3fa4dlqmxdypcc8yplg28cv4k3mkfa1hf4";
buildDepends = [
blazeBuilder enumerator ioStreams mtl snapCore snapServer
websockets

4
pkgs/development/libraries/haskell/yesod-auth/default.nix
View file

@ -12,8 +12,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.3.3";
sha256 = "05kzsrb49r11yhsrn9j7vx90831qd1jni1h8wdj26qn85anxr10z";
version = "1.3.4";
sha256 = "138wnrs9bf6wl9r4mc1fhshxky7bc6anhgqnwljx4gzvzsd0vq0y";
buildDepends = [
aeson attoparsecConduit authenticate base16Bytestring
base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable

4
pkgs/development/libraries/haskell/yesod-bin/default.nix
View file

@ -12,8 +12,8 @@
cabal.mkDerivation (self: {
pname = "yesod-bin";
version = "1.2.12";
sha256 = "0ksl78k27sshp9l6x7blv5csswv6vb8k632ggj9whnp8akzn37x1";
version = "1.2.12.1";
sha256 = "03vnxpapcg1z1xk0m077wn5rly9h2j7548zd8drlb455lv7np7mj";
isLibrary = false;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/yesod-test/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-test";
version = "1.2.3.1";
sha256 = "0q4w7q22d8hvsg939w686fb295v8cznnhqlfd1bh0v2lp9dih4ms";
version = "1.2.3.2";
sha256 = "05h7m0v92b8js71kgkvqc9nzpwa8hhxp052pknbvcfv3yn3spsx9";
buildDepends = [
attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
cookie hspec htmlConduit httpTypes HUnit monadControl network

24
pkgs/development/libraries/libid3tag/default.nix
View file

@ -14,24 +14,12 @@ stdenv.mkDerivation rec {
patches = [ ./debian-patches.patch ];
postInstall = let pkgconfigFile = writeText "id3tag.pc" ''
prefix=@out@
exec_prefix=''${prefix}
libdir=''${exec_prefix}/lib
includedir=''${exec_prefix}/include
Name: libid3tag
Description: ID3 tag manipulation library
Version: ${version}
Libs: -L''${libdir} -lid3tag
Cflags: -I''${includedir}
'';
in ''
ensureDir $out/share/pkgconfig
cp ${pkgconfigFile} $out/share/pkgconfig/id3tag.pc
substituteInPlace $out/share/pkgconfig/id3tag.pc \
--subst-var-by out $out
postInstall = ''
mkdir -p $out/lib/pkgconfig
cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc
substituteInPlace $out/lib/pkgconfig/id3tag.pc \
--subst-var-by out $out \
--subst-var-by version "${version}"
'';
meta = with stdenv.lib; {

11
pkgs/development/libraries/libid3tag/id3tag.pc Normal file
View file

@ -0,0 +1,11 @@
prefix=@out@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include
Name: libid3tag
Description: ID3 tag manipulation library
Version: @version@
Libs: -L${libdir} -lid3tag
Cflags: -I${includedir}

8
pkgs/development/libraries/libxkbcommon/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config }:
{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }:
stdenv.mkDerivation rec {
name = "libxkbcommon-0.3.1";
name = "libxkbcommon-0.4.2";
src = fetchurl {
url = "http://xkbcommon.org/download/${name}.tar.xz";
sha256 = "13mk335r4dhi9qglzbp46ina1wz4qgcp8r7s06iq7j50pf0kb5ww";
sha256 = "0mw9ljc5fbqbhnm884w7ns5pf6f2rqj9ww5xcaps9nzdgsq73z50";
};
buildInputs = [ pkgconfig yacc flex xkeyboard_config ];
buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
configureFlags = ''
--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb

4
pkgs/development/libraries/mlt/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate
{ stdenv, fetchurl, SDL, ffmpeg, frei0r, jack2, libdv, libsamplerate
, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2
SDL ffmpeg frei0r jack2 libdv libsamplerate libvorbis libxml2
makeWrapper movit pkgconfig qt sox
];

29
pkgs/development/libraries/serf/default.nix
View file

@ -1,25 +1,15 @@
{stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig}:
let
s = # Generated upstream information
rec {
baseName="serf";
version="1.3.3";
name="${baseName}-${version}";
hash="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2";
url="https://serf.googlecode.com/files/serf-1.3.3.tar.bz2";
sha256="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2";
};
buildInputs = [
apr scons openssl aprutil zlib krb5 pkgconfig
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }:
stdenv.mkDerivation rec {
name = "serf-1.3.6";
src = fetchurl {
inherit (s) url sha256;
url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2";
sha256 = "1wk3cplazs8jznjc9ylpd63rrk9k2y05xa7zqx7psycr0gmpnqya";
};
buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ];
configurePhase = ''
sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct
@ -36,7 +26,6 @@ stdenv.mkDerivation {
'';
meta = {
inherit (s) version;
description = "HTTP client library based on APR";
license = stdenv.lib.licenses.asl20 ;
maintainers = [stdenv.lib.maintainers.raskin];

3
pkgs/development/libraries/serf/default.upstream
View file

@ -1,3 +0,0 @@
url https://code.google.com/p/serf/downloads/list
version_link '[.]tar[.][a-z0-9]+$'
process 'code[.]google[.]com//' ''

8
pkgs/development/libraries/sodium/default.nix
View file

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="sodium";
version="0.5.0";
version="0.6.1";
name="${baseName}-${version}";
hash="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w";
url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.5.0.tar.gz";
sha256="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w";
hash="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04";
url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.6.1.tar.gz";
sha256="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04";
};
buildInputs = [
];

11
pkgs/development/mobile/titaniumenv/build-app.nix
View file

@ -2,10 +2,12 @@
{ name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null
, enableWirelessDistribution ? false, installURL ? null
}:
assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null;
assert enableWirelessDistribution -> installURL != null;
let
androidsdkComposition = androidsdk {
@ -132,6 +134,15 @@ stdenv.mkDerivation {
cp -av build/iphone/build/* $out
mkdir -p $out/nix-support
echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
${stdenv.lib.optionalString enableWirelessDistribution ''
appname=$(basename $out/Release-iphoneos/*.ipa .ipa)
bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > $out/$appname.html
echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
''}
''
else if target == "iphone" then ""
else throw "Target: ${target} is not supported!"}

2
pkgs/development/mobile/titaniumenv/examples/default.nix
View file

@ -5,6 +5,7 @@
, rename ? false
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
, allowUnfree ? false
, enableWirelessDistribution ? false, installURL ? null
}:
let
@ -90,6 +91,7 @@ rec {
release = true;
rename = true;
inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword;
inherit enableWirelessDistribution installURL;
};
}

2
pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
View file

@ -1,5 +1,6 @@
{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false
, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null
, enableWirelessDistribution ? false, installURL ? null
}:
assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioningProfile != null && iosCertificate != null && iosCertificateName != null && iosCertificatePassword != null);
@ -37,4 +38,5 @@ titaniumenv.buildApp {
androidKeyStorePassword = "mykeystore";
inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword;
inherit enableWirelessDistribution installURL;
}

2
pkgs/development/mobile/xcodeenv/build-app.nix
View file

@ -94,7 +94,7 @@ stdenv.mkDerivation {
${stdenv.lib.optionalString enableWirelessDistribution ''
appname=$(basename $out/*.ipa .ipa)
sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&amp;version=${version}\&amp;title=$appname|" ${./install.html.template} > $out/$appname.html
echo "doc install $out/$appname.html" >> $out/nix-support/hydra-build-products
echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
''}
''}

4
pkgs/development/tools/build-managers/scons/default.nix
View file

@ -2,7 +2,7 @@
let
name = "scons";
version = "2.3.1";
version = "2.3.2";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
sha256 = "00822ax62cfi2fvz9zhw80hl1273524d97xfycq4q276z1lb86h9";
sha256 = "1m29lhwz7p6k4f8wc8qjpwa89058lzq3vrycgxbfc5cmbq6354zr";
};
buildInputs = [python makeWrapper];

3
pkgs/games/LambdaHack/default.nix
View file

@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
unorderedContainers vector vectorBinaryInstances zlib
];
doCheck = false;
patchPhase = ''
sed -i -e 's|gtk >=.*|gtk|' LambdaHack.cabal
'';
meta = {
homepage = "http://github.com/LambdaHack/LambdaHack";
description = "A roguelike game engine in early development";

4
pkgs/games/anki/default.nix
View file

@ -6,13 +6,13 @@
let
py = pythonPackages;
version = "2.0.26";
version = "2.0.28";
in
stdenv.mkDerivation rec {
name = "anki-${version}";
src = fetchurl {
url = "http://ankisrs.net/download/mirror/${name}.tgz";
sha256 = "0w1dn2v6mbyq4dfyjskx51qwfqy6jpskpg4v5pzrv30big274p4q";
sha256 = "0dj33mlc23y982kcl4h0aganb4fy70rl28mpj2mbcfphykzkv05s";
};
pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]

8
pkgs/games/gnuchess/default.nix
View file

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="gnuchess";
version="6.1.1";
version="6.1.2";
name="${baseName}-${version}";
hash="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn";
url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.1.tar.gz";
sha256="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn";
hash="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l";
url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.2.tar.gz";
sha256="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l";
};
buildInputs = [
flex

16
pkgs/misc/emulators/wine/unstable.nix
View file

@ -7,27 +7,27 @@ assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
let
version = "1.7.20";
version = "1.7.23";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "05azpxrl7364ckvkwy7aa2p0vb4qhbc6wcn2l8khqb92jq5inhww";
sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v";
};
gecko = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi";
sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
url = "mirror://sourceforge/wine/wine_gecko-2.24-x86.msi";
sha256 = "0b10f55q3sldlcywscdlw3kd7vl9izlazw7jx30y4rpahypaqf3f";
};
gecko64 = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi";
sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
url = "mirror://sourceforge/wine/wine_gecko-2.24-x86_64.msi";
sha256 = "1j4wdlhzvjrabzr9igcnx0ivm5mcb8kp7bwkpfpfsanbifk7sma7";
};
mono = fetchurl {
url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi";
sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
url = "mirror://sourceforge/wine/wine-mono-4.5.2.msi";
sha256 = "1bgasysf3qacxgh5rlk7qlw47ar5zgd1k9gb22pihi5s87dlw4nr";
};
in stdenv.mkDerivation rec {

18
pkgs/os-specific/linux/kernel/linux-3.16.nix Normal file
View file

@ -0,0 +1,18 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.16";
modDirVersion = "3.16.0";
extraMeta.branch = "3.16";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "183p3pz2rfprbp5i4kwk90kjn90v40banwx8759jxnd74xwss4s8";
};
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

5
pkgs/os-specific/linux/sysdig/default.nix
View file

@ -3,10 +3,10 @@ let
inherit (stdenv.lib) optional optionalString;
s = rec {
baseName="sysdig";
version="0.1.83";
version = "0.1.86";
name="${baseName}-${version}";
url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
sha256="0d4fw6vba78hqy8plhcq8lkdcxy1fizrr5aiszdsap7cvd0gls6r";
sha256 = "1bb5whzxmbzr21fxirymhznkgdx01rsqzxd2dlnqvhbf8x2dpzw3";
};
buildInputs = [
cmake zlib luajit
@ -38,5 +38,6 @@ stdenv.mkDerivation {
license = licenses.gpl2;
maintainers = [maintainers.raskin];
platforms = platforms.linux ++ platforms.darwin;
downloadPage = "https://github.com/draios/sysdig/releases";
};
}

5
pkgs/os-specific/linux/sysdig/default.upstream
View file

@ -1,3 +1,8 @@
url https://github.com/draios/sysdig/releases
ensure_choice
version '.*/([0-9.]+)[.]tar[.].*' '\1'
do_overwrite () {
ensure_hash
set_var_value sha256 $CURRENT_HASH
set_var_value version $CURRENT_VERSION
}

2
pkgs/servers/dns/bind/default.nix
View file

@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [viric simons];
platforms = with stdenv.lib.platforms; linux;
platforms = with stdenv.lib.platforms; unix;
};
}

8
pkgs/tools/archivers/zpaq/default.nix
View file

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="zpaq";
version="652";
version="655";
name="${baseName}-${version}";
hash="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky";
url="http://mattmahoney.net/dc/zpaq652.zip";
sha256="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky";
hash="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c";
url="http://mattmahoney.net/dc/zpaq655.zip";
sha256="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c";
};
buildInputs = [
unzip

7
pkgs/tools/filesystems/glusterfs/default.nix
View file

@ -4,10 +4,11 @@ let
s = # Generated upstream information
rec {
baseName="glusterfs";
version="3.5.0";
version="3.5.2";
name="${baseName}-${version}";
url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz";
sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir";
hash="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g";
url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.2/glusterfs-3.5.2.tar.gz";
sha256="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g";
};
buildInputs = [
fuse bison flex_2_5_35 openssl python ncurses readline

4
pkgs/tools/graphics/pngcrush/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
name = "pngcrush-1.7.73";
name = "pngcrush-1.7.76";
src = fetchurl {
url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
sha256 = "073y19af0sw36nw7draqw9zfd6n7q7b84kscy26s76fhj5x2gb0l";
sha256 = "0jbv3ijc0nfhy6pkhv4dwbk2v488rwixd8rv1c7lfs59wblb44hv";
};
configurePhase = ''

38
pkgs/tools/graphics/povray/default.nix
View file

@ -1,21 +1,39 @@
{stdenv, fetchurl}:
{stdenv, fetchgit, autoconf, automake, boost149, zlib, libpng, libjpeg, libtiff}:
let boost = boost149; in
stdenv.mkDerivation {
name = "povray-3.6";
name = "povray-3.7";
src = fetchurl {
url = http://www.povray.org/ftp/pub/povray/Old-Versions/Official-3.62/Unix/povray-3.6.tar.bz2;
sha256 = "4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73";
src = fetchgit {
url = "https://github.com/POV-Ray/povray.git";
rev = "39ce8a24e50651904010dda15872d63be15d7c37";
sha256 = "0d56631d9daacb8967ed359025f56acf0bd505d1d9e752859e8ff8656ae72d20";
};
buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff ];
# the installPhase wants to put files into $HOME. I let it put the files
# to $TMPDIR, so they don't get into the $out
patchPhase = ''
sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in};
postPatch = '' cd unix
./prebuild.sh
cd ..
sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in}
sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in}
sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in}
sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in}
'';
configureFlags = "COMPILED_BY='nix' --with-boost-libdir=${boost}/lib --with-boost-includedir=${boost}/include";
preInstall = ''
mkdir "$TMP/bin"
for i in chown chgrp; do
echo '#!/bin/sh' >> "$TMP/bin/$i"
chmod +x "$TMP/bin/$i"
PATH="$TMP/bin:$PATH"
done
'';
# I didn't use configureFlags because I couldn't pass the quotes properly
# for the COMPILED_BY.
configurePhase = "./configure --prefix=$out COMPILED_BY=\"nix\"";
meta = {
homepage = http://www.povray.org/;

Some files were not shown because too many files have changed in this diff Show more