JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-08 14:11:16 -07:00
commit 7cda24c01e
47 changed files with 852 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -354,7 +354,7 @@ EOF
if ($status != 0 || join("", @msg) =~ /ERROR:/) {
die "Failed to retrieve subvolume info for $mountPoint\n";
}
my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
if ($#ids > 0) {
die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
} elsif ($#ids == 0) {

2
nixos/modules/module-list.nix
View File

@ -219,6 +219,7 @@
./services/misc/rogue.nix
./services/misc/siproxd.nix
./services/misc/subsonic.nix
./services/misc/sundtek.nix
./services/misc/svnserve.nix
./services/misc/synergy.nix
./services/misc/uhub.nix
@ -346,6 +347,7 @@
./services/networking/wicd.nix
./services/networking/wpa_supplicant.nix
./services/networking/xinetd.nix
./services/networking/zerotierone.nix
./services/networking/znc.nix
./services/printing/cupsd.nix
./services/scheduling/atd.nix

15
nixos/modules/services/cluster/kubernetes.nix
View File

@ -224,7 +224,7 @@ in {
machines = mkOption {
description = "Kubernetes controller list of machines to schedule to schedule onto";
default = [config.networking.hostName];
default = [];
type = types.listOf types.str;
};
@ -242,6 +242,12 @@ in {
type = types.bool;
};
registerNode = mkOption {
description = "Whether to auto register kubelet with API server.";
default = true;
type = types.bool;
};
address = mkOption {
description = "Kubernetes kubelet info server listening address.";
default = "0.0.0.0";
@ -274,7 +280,7 @@ in {
cadvisorPort = mkOption {
description = "Kubernetes kubelet local cadvisor port.";
default = config.services.cadvisor.port;
default = 4194;
type = types.int;
};
@ -324,7 +330,7 @@ in {
};
kube2sky = {
enable = mkEnableOption "kube2sky dns service";
enable = mkEnableOption "Whether to enable kube2sky dns service.";
domain = mkOption {
description = "Kuberntes kube2sky domain under which all DNS names will be hosted.";
@ -445,6 +451,7 @@ in {
export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH"
exec ${cfg.package}/bin/kubelet \
--api-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \
--register-node=${if cfg.kubelet.registerNode then "true" else "false"} \
--address=${cfg.kubelet.address} \
--port=${toString cfg.kubelet.port} \
--hostname-override=${cfg.kubelet.hostname} \
@ -511,8 +518,6 @@ in {
(mkIf (any (el: el == "node") cfg.roles) {
virtualisation.docker.enable = mkDefault true;
services.cadvisor.enable = mkDefault true;
services.cadvisor.port = mkDefault 4194;
services.kubernetes.kubelet.enable = mkDefault true;
services.kubernetes.proxy.enable = mkDefault true;
})

2
nixos/modules/services/misc/nix-daemon.nix
View File

@ -143,7 +143,7 @@ in
default = 0;
description = ''
Nix daemon process priority. This priority propagates to build processes.
0 is the default Unix process priority, 20 is the lowest.
0 is the default Unix process priority, 19 is the lowest.
'';
};

33
nixos/modules/services/misc/sundtek.nix Normal file
View File

@ -0,0 +1,33 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.sundtek;
in
{
options.services.sundtek = {
enable = mkEnableOption "Sundtek driver";
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.sundtek ];
systemd.services.sundtek = {
description = "Sundtek driver";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
ExecStart = ''
${pkgs.sundtek}/bin/mediasrv -d -v -p ${pkgs.sundtek}/bin ;\
${pkgs.sundtek}/bin/mediaclient --start=5 --wait-for-devices
'';
ExecStop = "${pkgs.sundtek}/bin/mediaclient --shutdown";
RemainAfterExit = true;
};
};
};
}

32
nixos/modules/services/networking/bitlbee.nix
View File

@ -17,10 +17,12 @@ let
[settings]
RunMode = Daemon
User = bitlbee
ConfigDir = /var/lib/bitlbee
ConfigDir = ${cfg.configDir}
DaemonInterface = ${cfg.interface}
DaemonPort = ${toString cfg.portNumber}
AuthMode = ${cfg.authMode}
${lib.optionalStringv (cfg.hostName != "") "HostName = ${cfg.hostName}"}
${lib.optionalString (cfg.protocols != "") "Protocols = ${cfg.protocols}"}
${cfg.extraSettings}
[defaults]
@ -73,6 +75,34 @@ in
'';
};
hostName = mkOption {
default = "";
type = types.str;
description = ''
Normally, BitlBee gets a hostname using getsockname(). If you have a nicer
alias for your BitlBee daemon, you can set it here and BitlBee will identify
itself with that name instead.
'';
};
configDir = mkOption {
default = "/var/lib/bitlbee";
type = types.path;
description = ''
Specify an alternative directory to store all the per-user configuration
files.
'';
};
protocols = mkOption {
default = "";
type = types.str;
description = ''
This option allows to remove the support of protocol, even if compiled
in. If nothing is given, there are no restrictions.
'';
};
extraSettings = mkOption {
default = "";
description = ''

32
nixos/modules/services/networking/zerotierone.nix Normal file
View File

@ -0,0 +1,32 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.zerotierone;
in
{
options.services.zerotierone.enable = mkEnableOption "ZeroTierOne";
config = mkIf cfg.enable {
systemd.services.zerotierone = {
description = "ZeroTierOne";
path = [ pkgs.zerotierone ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart =
''
mkdir -p /var/lib/zerotier-one
chmod 700 /var/lib/zerotier-one
chown -R root:root /var/lib/zerotier-one
'';
serviceConfig = {
Type = "forking";
User = "root";
PIDFile = "/var/lib/zerotier-one/zerotier-one.pid";
ExecStart = "${pkgs.zerotierone}/bin/zerotier-one -d";
};
};
environment.systemPackages = [ pkgs.zerotierone ];
};
}

3
nixos/modules/services/web-servers/apache-httpd/default.nix
View File

@ -187,9 +187,6 @@ let
<IfModule mod_mime_magic.c>
MIMEMagicFile ${httpd}/conf/magic
</IfModule>
AddEncoding x-compress Z
AddEncoding x-gzip gz tgz
'';

2
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -186,7 +186,7 @@ sub GrubFs {
if ($status != 0) {
die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
}
my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
if ($#ids > 0) {
die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
} elsif ($#ids == 0) {

1
nixos/release-combined.nix
View File

@ -56,6 +56,7 @@ in rec {
(all nixos.tests.installer.lvm)
(all nixos.tests.installer.luksroot)
(all nixos.tests.installer.separateBoot)
(all nixos.tests.installer.separateBootFat)
(all nixos.tests.installer.simple)
(all nixos.tests.installer.simpleLabels)
(all nixos.tests.installer.simpleProvided)

1
nixos/release.nix
View File

@ -229,6 +229,7 @@ in rec {
tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test);
tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test);
tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test);
tests.installer.separateBootFat = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBootFat.test);
tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test);
tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test);
tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test);

21
nixos/tests/installer.nix
View File

@ -254,6 +254,27 @@ in {
'';
};
# Same as the previous, but with fat32 /boot.
separateBootFat = makeInstallerTest "separateBootFat"
{ createPartitions =
''
$machine->succeed(
"parted /dev/vda mklabel msdos",
"parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
"parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
"parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
"mkfs.ext3 -L nixos /dev/vda3",
"mount LABEL=nixos /mnt",
"mkfs.vfat -n BOOT /dev/vda1",
"mkdir -p /mnt/boot",
"mount LABEL=BOOT /mnt/boot",
);
'';
};
# Create two physical LVM partitions combined into one volume group
# that contains the logical swap and root partitions.
lvm = makeInstallerTest "lvm"

53
pkgs/applications/misc/diffpdf/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ stdenv, fetchurl, qt4, poppler_qt4 }:
stdenv.mkDerivation rec {
version = "2.1.3";
name = "diffpdf-${version}";
src = fetchurl {
url = "http://www.qtrac.eu/${name}.tar.gz";
sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566";
};
patches = [ ./fix_path_poppler_qt4.patch ];
buildInputs = [ qt4 poppler_qt4 ];
preBuild = ''
substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4}
[ -e "*.qm" ] && make clean
lrelease diffpdf.pro
qmake -makefile PREFIX=\$out
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
install -Dpm755 -D diffpdf $out/bin/diffpdf
install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1
install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/pixmaps $out/share/applications
install -Dpm644 CHANGES README help.html $out/share/doc/${name}/
install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/
install -Dpm644 images/icon.png $out/share/pixmaps/${name}.png
cat > $out/share/applications/diffpdf.desktop <<EOF
[Desktop Entry]
Type=Application
Version=1.0
Name=diffpdf
Comment=PDF diffing tool
Exec=$out/bin/diffpdf
Terminal=false
EOF
'';
meta = {
homepage = http://www.qtrac.eu/diffpdfc.html;
description = "Tool for diffing pdf files visually or textually";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ tstrobel ];
platforms = with stdenv.lib.platforms; linux;
inherit version;
};
}

16
pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch Normal file
View File

@ -0,0 +1,16 @@
diff -uNr diffpdf-2.1.3/diffpdf.pro diffpdf-2.1.3-new/diffpdf.pro
--- diffpdf-2.1.3/diffpdf.pro 2013-10-15 09:01:22.000000000 +0200
+++ diffpdf-2.1.3-new/diffpdf.pro 2015-07-07 23:13:36.445572148 +0200
@@ -47,9 +47,9 @@
INCLUDEPATH += /c/poppler_lib/include/poppler/qt4
LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
} else {
- exists(/usr/include/poppler/qt4) {
- INCLUDEPATH += /usr/include/poppler/cpp
- INCLUDEPATH += /usr/include/poppler/qt4
+ exists(@@NIX_POPPLER_QT4@@/include/poppler/qt4) {
+ INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/cpp
+ INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/qt4
} else {
INCLUDEPATH += /usr/local/include/poppler/cpp
INCLUDEPATH += /usr/local/include/poppler/qt4

41
pkgs/applications/misc/pdfdiff/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ stdenv, pythonPackages, fetchurl, xpdf }:
let
py = pythonPackages;
in
py.buildPythonPackage rec {
name = "pdfdiff-${version}";
version = "0.92";
src = fetchurl {
url = "http://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py";
sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836";
};
buildInputs = [ pythonPackages.wrapPython ];
doCheck = false;
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
unpackPhase = "cp $src pdfdiff.py";
postPatch = ''
sed -i -r 's|pdftotextProgram = "pdftotext"|pdftotextProgram = "${xpdf}/bin/pdftotext"|' pdfdiff.py
sed -i -r 's|progName = "pdfdiff.py"|progName = "pdfdiff"|' pdfdiff.py
'';
installPhase = ''
mkdir -p $out/bin
cp pdfdiff.py $out/bin/pdfdiff
chmod +x $out/bin/pdfdiff
substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${pythonPackages.python.interpreter}"
'';
meta = with stdenv.lib; {
homepage = http://www.cs.ox.ac.uk/people/cas.cremers/misc/pdfdiff.html;
description = "Tool to view the difference between two PDF or PS files";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

4
pkgs/applications/misc/st/default.nix
View File

@ -4,11 +4,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "st-0.5";
name = "st-0.6";
src = fetchurl {
url = "http://dl.suckless.org/st/${name}.tar.gz";
sha256 = "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f";
sha256 = "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5";
};
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);

15
pkgs/applications/networking/browsers/dwb/default.nix
View File

@ -1,16 +1,17 @@
{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk2, gtk2, gnutls, json_c,
m4, glib_networking, gsettings_desktop_schemas, dconf }:
{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk2, gtk2, gnutls
, json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }:
stdenv.mkDerivation {
name = "dwb-2014-12-15";
name = "dwb-2015-07-07";
src = fetchgit {
url = "https://bitbucket.org/0mark/dwb_collect";
rev = "b94785470b11a0b6b52eecfc3bae276796b83a0d";
sha256 = "09xbifj223mflj62rfhi6q7cvnkpkzkwyyqhkm8w067pdscdhyvs";
rev = "9a50dcc7134015c6cb1d26afb77840cf69f7c782";
sha256 = "03nyr3c0x5b1jqax0zh407vvi4j47zkj1i52lqs35j2d2sci3lkb";
};
buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkitgtk2 gtk2 gnutls json_c m4 ];
buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup
webkitgtk2 gtk2 gnutls json_c m4 ];
# There are Xlib and gtk warnings therefore I have set Wno-error
makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"'';
@ -27,7 +28,7 @@ stdenv.mkDerivation {
homepage = http://portix.bitbucket.org/dwb/;
description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit";
platforms = platforms.mesaPlatforms;
maintainers = with maintainers;[ pSub ];
maintainers = with maintainers; [ pSub ];
license = licenses.gpl3;
};
}

31
pkgs/applications/networking/cluster/openshift/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchgit, go, git, which }:
stdenv.mkDerivation rec {
name = "openshift-origin-${version}";
version = "1.0.1";
src = fetchgit {
url = https://github.com/openshift/origin.git;
rev = "1b601951daa44964c9bc7e4a2264d65489e3a58c";
sha256 = "0nwyj3cgajmbd356w0362zxkd3p3pply58an2bmi3d3bswp3k89g";
leaveDotGit = true;
deepClone = true;
};
buildInputs = [ go git which ];
buildPhase = "hack/build-go.sh";
installPhase = ''
mkdir -p "$out/bin"
cp _output/local/go/bin/* "$out/bin/"
'';
meta = with stdenv.lib; {
description = "Build, deploy, and manage your applications with Docker and Kubernetes";
license = licenses.asl20;
homepage = http://www.openshift.org;
maintainers = with maintainers; [offline];
platforms = [ "x86_64-linux" ];
};
}

70
pkgs/applications/science/math/caffe/default.nix Normal file
View File

@ -0,0 +1,70 @@
{ stdenv
, openblas
, boost
, cudaSupport ? true
, cudnnSupport ? false
, cudnn ? null
, cudatoolkit7
, fetchFromGitHub
, google-gflags
, glog
, hdf5
, leveldb
, lmdb
, opencv
, protobuf
, snappy
}:
let optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
# Use git revision because latest "release" is really old
name = "caffe-git-2015-07-02";
src = fetchFromGitHub {
owner = "BVLC";
repo = "caffe";
rev = "77d66dfc907dd875d69bb9fc12dd950b531e464f";
sha256 = "0vd4qrc49dhsawj298xpkd5mvi35sh56kdswx3yp8ya4fjajwakx";
};
preConfigure = "mv Makefile.config.example Makefile.config";
makeFlags = "BLAS=open " +
(if !cudaSupport then "CPU_ONLY=1 " else "CUDA_DIR=${cudatoolkit7} ") +
(if cudnnSupport then "USE_CUDNN=1 " else "");
# too many issues with tests to run them for now
doCheck = false;
checkPhase = "make runtest ${makeFlags}";
buildInputs = [ openblas boost google-gflags glog hdf5 leveldb lmdb opencv
protobuf snappy ]
++ optional cudaSupport cudatoolkit7
++ optional cudnnSupport cudnn;
installPhase = ''
mkdir -p $out/{bin,share,lib}
for bin in $(find build/tools -executable -type f -name '*.bin');
do
cp $bin $out/bin/$(basename $bin .bin)
done
cp -r build/examples $out/share
cp -r build/lib $out
'';
meta = with stdenv.lib; {
description = "Deep learning framework";
longDescription = ''
Caffe is a deep learning framework made with expression, speed, and
modularity in mind. It is developed by the Berkeley Vision and Learning
Center (BVLC) and by community contributors.
'';
homepage = http://caffe.berkeleyvision.org/;
maintainers = with maintainers; [ jb55 ];
license = licenses.bsd2;
platforms = platforms.linux;
};
}

49
pkgs/applications/video/popcorntime/default.nix
View File

@ -1,24 +1,41 @@
{ stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9
{ lib, stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9,
fromCi ? true,
build ? "652",
version ? if fromCi then "0.3.7-2-0ac62b848" else "0.3.7.2"
}:
let
version = "0.3.7.2";
config =
if stdenv.system == "x86_64-linux" then
{sys = "Linux32";
sha256 =
if fromCi then "06av40b68xy2mv2fp9qg8npqmnvkl00p2jvbm2fdfnpc9jj746iy"
else "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
}
else if stdenv.system == "i686-linux" then
{sys = "Linux64";
sha256 =
if fromCi then "1nr2zaixdr5vqynga7jig3fw9dckcnzcbdmbr8haq4a486x2nq0f"
else "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
}
else throw "Unsupported system ${stdenv.system}";
fetchurlConf =
let
ciBase = "https://ci.popcorntime.io/job/Popcorn-Experimental/652/artifact/build/releases/Popcorn-Time";
relBase = "https://get.popcorntime.io/build";
in {
url =
if fromCi then "${ciBase}/${lib.toLower config.sys}/Popcorn-Time-${version}-${config.sys}.tar.xz"
else "${relBase}/Popcorn-Time-${version}-Linux64.tar.xz";
sha256 = config.sha256;
};
popcorntimePackage = stdenv.mkDerivation rec {
name = "popcorntime-package-${version}";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux32.tar.xz";
sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
}
else
throw "Unsupported system ${stdenv.system}";
name =
if fromCi then "popcorntime-git-2015-07-07"
else "popcorntime-${version}";
src = fetchurl fetchurlConf;
sourceRoot = ".";
installPhase = ''
mkdir -p $out

8
pkgs/build-support/build-maven.nix
View File

@ -1,4 +1,4 @@
{ stdenv, maven, runCommand, writeText, fetchurl, lib }:
{ stdenv, maven, runCommand, writeText, fetchurl, lib, requireFile }:
/* Takes an info file generated by mvn2nix
* (https://github.com/NixOS/mvn2nix-maven-plugin) and builds the maven
* project with it.
@ -15,9 +15,11 @@ infoFile: let
script = writeText "build-maven-repository.sh" ''
${lib.concatStrings (map (dep: let
inherit (dep) url sha1 groupId artifactId version;
inherit (dep) url sha1 groupId artifactId version authenticated;
fetch = fetchurl { inherit url sha1; };
fetch = (if authenticated then requireFile else fetchurl) {
inherit url sha1;
};
in ''
dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${version}
mkdir -p $dir

24
pkgs/build-support/trivial-builders.nix
View File

@ -88,23 +88,33 @@ rec {
(lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries));
# Require file
requireFile = {name, sha256, url ? null, message ? null} :
requireFile = { name ? null
, sha256 ? null
, sha1 ? null
, url ? null
, message ? null
} :
assert (message != null) || (url != null);
assert (sha256 != null) || (sha1 != null);
assert (name != null) || (url != null);
let msg =
if message != null then message
else ''
Unfortunately, we may not download file ${name} automatically.
Unfortunately, we may not download file ${name_} automatically.
Please, go to ${url}, download it yourself, and add it to the Nix store
using either
nix-store --add-fixed sha256 ${name}
nix-store --add-fixed ${hashAlgo} ${name_}
or
nix-prefetch-url file://path/to/${name}
nix-prefetch-url --type ${hashAlgo} file://path/to/${name_}
'';
hashAlgo = if sha256 != null then "sha256" else "sha1";
hash = if sha256 != null then sha256 else sha1;
name_ = if name == null then baseNameOf (toString url) else name;
in
stdenv.mkDerivation {
inherit name;
outputHashAlgo = "sha256";
outputHash = sha256;
name = name_;
outputHashAlgo = hashAlgo;
outputHash = hash;
builder = writeScript "restrict-message" ''
source ${stdenv}/setup
cat <<_EOF_

6
pkgs/data/misc/geolite-legacy/default.nix
View File

@ -8,17 +8,17 @@ let
# Annoyingly, these files are updated without a change in URL. This means that
# builds will start failing every month or so, until the hashes are updated.
version = "2015-06-15";
version = "2015-07-08";
in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
"1cd25xsw214bdmc657q3a1dcivjnh6ravdsgia2w7q8bq8g61yfp";
"0c6jcmlgkybsqiwqwa21igjazf95dj38mn516cqqqfdg7ciaj1d5";
srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
"1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3";
srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
"1z87ng2a2zmqnvxhcmapnarc9w2ycb18vpivvzx893y7fh39h34s";
"0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";
srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
"0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9";
srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"

43
pkgs/development/interpreters/ruby/ruby-1.9.3.nix
View File

@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
owner = "ruby";
repo = "ruby";
rev = "v1_9_3_${passthru.patchLevel}";
sha256 = "040x67snfjrql5j7blizpm9j58jhwvh00v8h1h59aq90h52lkj68";
sha256 = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s";
} else fetchurl {
url = "http://cache.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2";
sha256 = "0k7g0ahicjnd4sij2pml1p1dcb95ms3k3j1k3169n02kzz9qwn7g";
sha256 = "07kpvv2z7g6shflls7fyfga8giifahwlnl30l49qdm9i6izf7idh";
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@ -54,24 +54,25 @@ stdenv.mkDerivation rec {
./ruby19-parallel-install.patch
./bitperfect-rdoc.patch
] ++ ops useRailsExpress [
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/01-fix-make-clean.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/02-railsbench-gc.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/03-display-more-detailed-stack-trace.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/04-fork-support-for-gc-logging.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/05-track-live-dataset-size.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/06-webrick_204_304_keep_alive_fix.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/07-export-a-few-more-symbols-for-ruby-prof.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/08-thread-variables.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/09-faster-loading.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/10-falcon-st-opt.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/11-falcon-sparse-array.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/12-falcon-array-queue.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/13-railsbench-gc-fixes.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/14-show-full-backtrace-on-stack-overflow.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/15-configurable-fiber-stack-sizes.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/16-backport-psych-20.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/17-fix-missing-c-return-event.patch"
"${patchSet}/patches/ruby/1.9.3/p547/railsexpress/18-fix-process-daemon-call.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/01-fix-make-clean.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/02-zero-broken-tests.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/03-railsbench-gc.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/04-display-more-detailed-stack-trace.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/05-fork-support-for-gc-logging.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/06-track-live-dataset-size.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/07-webrick_204_304_keep_alive_fix.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/09-thread-variables.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/10-faster-loading.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/11-falcon-st-opt.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/12-falcon-sparse-array.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/13-falcon-array-queue.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/14-railsbench-gc-fixes.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/15-show-full-backtrace-on-stack-overflow.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/16-configurable-fiber-stack-sizes.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/17-backport-psych-20.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/18-fix-missing-c-return-event.patch"
"${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/19-fix-process-daemon-call.patch"
];
configureFlags = [ "--enable-shared" "--enable-pthread" ]
@ -115,7 +116,7 @@ stdenv.mkDerivation rec {
majorVersion = "1";
minorVersion = "9";
teenyVersion = "3";
patchLevel = "547";
patchLevel = "551";
rubyEngine = "ruby";
libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";

17
pkgs/development/interpreters/ruby/ruby-2.0.0.nix
View File

@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
owner = "ruby";
repo = "ruby";
rev = "v2_0_0_${passthru.patchLevel}";
sha256 = "07ccnxgiqxn5ycmq2wl7j3aqmndm4n358y35kzaivb488ayjg3pj";
sha256 = "14bnas1iif2shyaz4ylb0832x96y2mda52x0v0aglkvqmcz1cfxb";
} else fetchurl {
url = "http://cache.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2";
sha256 = "1qnqccyfhx0fykxqbzlxq0yvyvq6q9v32givyfyr303dx7bxlqh7";
url = "https://cache.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2";
sha256 = "1sc36qxqhziqbrvp99z4qdx9j0f8r1xhcbb6scb3m4nb02cwzk9d";
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@ -51,11 +51,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
patches = ops useRailsExpress [
"${patchSet}/patches/ruby/2.0.0/p481/railsexpress/01-zero-broken-tests.patch"
"${patchSet}/patches/ruby/2.0.0/p481/railsexpress/02-railsexpress-gc.patch"
"${patchSet}/patches/ruby/2.0.0/p481/railsexpress/03-display-more-detailed-stack-trace.patch"
"${patchSet}/patches/ruby/2.0.0/p481/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
"${patchSet}/patches/ruby/2.0.0/p481/railsexpress/05-fix-missing-c-return-event.patch"
"${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/01-zero-broken-tests.patch"
"${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/02-railsexpress-gc.patch"
"${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
"${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
];
configureFlags = ["--enable-shared" ]
@ -96,7 +95,7 @@ stdenv.mkDerivation rec {
majorVersion = "2";
minorVersion = "0";
teenyVersion = "0";
patchLevel = "481";
patchLevel = "645";
rubyEngine = "ruby";
libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";

5
pkgs/development/interpreters/ruby/ruby-2.2.0.nix
View File

@ -59,9 +59,8 @@ stdenv.mkDerivation rec {
"${patchSet}/patches/ruby/2.2.0/railsexpress/05-fix-packed-bitfield-compat-warning-for-older-gccs.patch"
];
# Ruby >= 2.1.0 tries to download config.{guess,sub}
postPatch = ''
rm tool/config_files.rb
postPatch = ops useRailsExpress ''
sed -i configure.in -e '/config.guess/d'
cp ${config}/config.guess tool/
cp ${config}/config.sub tool/
'';

110
pkgs/development/interpreters/ruby/ruby-2.2.2.nix Normal file
View File

@ -0,0 +1,110 @@
{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
, ncurses, readline, cursesSupport ? true
, groff, docSupport ? false
, libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true
, ruby_2_2_2, autoreconfHook, bison, useRailsExpress ? true
}:
let
op = stdenv.lib.optional;
ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit;
baseruby = ruby_2_2_2.override { useRailsExpress = false; };
in
stdenv.mkDerivation rec {
version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
name = "ruby-${version}";
src = if useRailsExpress then fetchFromGitHub {
owner = "ruby";
repo = "ruby";
rev = "v2_2_2";
sha256 = "08mw1ql2ghy483cp8xzzm78q17simn4l6phgm2gah7kjh9y3vbrn";
} else fetchurl {
url = "http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.2.tar.gz";
sha256 = "0i4v7l8pnam0by2cza12zldlhrffqchwb2m9shlnp7j2gqqhzz2z";
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff";
buildInputs = ops useRailsExpress [ autoreconfHook bison ]
++ (op fiddleSupport libffi)
++ (ops cursesSupport [ ncurses readline ])
++ (op docSupport groff)
++ (op zlibSupport zlib)
++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml)
# Looks like ruby fails to build on darwin without readline even if curses
# support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're
# running on darwin
++ (op (!cursesSupport && stdenv.isDarwin) readline);
enableParallelBuilding = true;
patches = ops useRailsExpress [
"${patchSet}/patches/ruby/2.2.2/railsexpress/01-zero-broken-tests.patch"
"${patchSet}/patches/ruby/2.2.2/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch"
"${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch"
];
postPatch = ops useRailsExpress ''
sed -i configure.in -e '/config.guess/d'
cp ${config}/config.guess tool/
cp ${config}/config.sub tool/
'';
configureFlags = ["--enable-shared" ]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
# on darwin, we have /usr/include/tk.h -- so the configure script detects
# that tk is installed
++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory
postInstall = ''
# Bundler tries to create this directory
mkdir -pv $out/${passthru.gemPath}
mkdir -p $out/nix-support
cat > $out/nix-support/setup-hook <<EOF
addGemPath() {
addToSearchPath GEM_PATH \$1/${passthru.gemPath}
}
envHooks+=(addGemPath)
EOF
'' + lib.optionalString useRailsExpress ''
rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
# Prevent the baseruby from being included in the closure.
sed -i '/^ CONFIG\["BASERUBY"\]/d' $rbConfig
sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
'';
meta = {
license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
platforms = stdenv.lib.platforms.all;
};
passthru = rec {
majorVersion = "2";
minorVersion = "2";
teenyVersion = "0";
patchLevel = "0";
rubyEngine = "ruby";
libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
};
}

6
pkgs/development/ocaml-modules/ocaml-text/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}:
stdenv.mkDerivation {
name = "ocaml-text-0.6";
name = "ocaml-text-0.7.1";
src = fetchurl {
url = https://forge.ocamlcore.org/frs/download.php/937/ocaml-text-0.6.tar.gz;
sha256 = "0j8gaak0ajnlmn8knvfygqwwzs7awjv5rfn5cbj6qxqbxhjd5m6g";
url = "https://github.com/vbmithr/ocaml-text/archive/0.7.1.tar.gz";
sha256 = "0dn096q9gjfj7ibj237mb7lq0742a760zawka6i064qns727qwrg";
};
buildInputs = [ocaml findlib ncurses libiconv];

3
pkgs/development/python-modules/generic/wrap.sh
View File

@ -37,6 +37,9 @@ wrapPythonProgramsIn() {
# dont wrap EGG-INFO scripts since they are called from python
if echo "$f" | grep -qv EGG-INFO/scripts; then
echo "wrapping \`$f'..."
# The magicalSedExpression will invoke a "$(basename "$f")", so
# if you change $f to something else, be sure to also change it
# in pkgs/top-level/python-packages.nix!
sed -i "$f" -re '@magicalSedExpression@'
# wrapProgram creates the executable shell script described
# above. The script will set PYTHONPATH and PATH variables.!

3
pkgs/development/tools/compass/Gemfile Normal file
View File

@ -0,0 +1,3 @@
source "https://rubygems.org"
gem 'compass'

28
pkgs/development/tools/compass/Gemfile.lock Normal file
View File

@ -0,0 +1,28 @@
GEM
remote: https://rubygems.org/
specs:
chunky_png (1.3.4)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
ffi (1.9.8)
multi_json (1.11.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
sass (3.4.13)
PLATFORMS
ruby
DEPENDENCIES
compass

18
pkgs/development/tools/compass/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, lib, bundlerEnv, ruby }:
bundlerEnv {
name = "compass-1.0.3";
inherit ruby;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
meta = with lib; {
description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain.";
homepage = https://github.com/Compass/compass;
license = with licenses; mit;
maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
};
}

83
pkgs/development/tools/compass/gemset.nix Normal file
View File

@ -0,0 +1,83 @@
{
"chunky_png" = {
version = "1.3.4";
source = {
type = "gem";
sha256 = "0n5xhkj3vffihl3h9s8yjzazqaqcm4p1nyxa1w2dk3fkpzvb0wfw";
};
};
"compass" = {
version = "1.0.3";
source = {
type = "gem";
sha256 = "0lfi83w8z75czr0pf0rmj9hda22082h3cmvczl8r1ma9agf88y2c";
};
dependencies = [
"chunky_png"
"compass-core"
"compass-import-once"
"rb-fsevent"
"rb-inotify"
"sass"
];
};
"compass-core" = {
version = "1.0.3";
source = {
type = "gem";
sha256 = "0yaspqwdmzwdcqviclbs3blq7an16pysrfzylz8q1gxmmd6bpj3a";
};
dependencies = [
"multi_json"
"sass"
];
};
"compass-import-once" = {
version = "1.0.5";
source = {
type = "gem";
sha256 = "0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq";
};
dependencies = [
"sass"
];
};
"ffi" = {
version = "1.9.8";
source = {
type = "gem";
sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
};
};
"multi_json" = {
version = "1.11.0";
source = {
type = "gem";
sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
};
};
"rb-fsevent" = {
version = "0.9.4";
source = {
type = "gem";
sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7";
};
};
"rb-inotify" = {
version = "0.9.5";
source = {
type = "gem";
sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
};
dependencies = [
"ffi"
];
};
"sass" = {
version = "3.4.13";
source = {
type = "gem";
sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig";
};
};
}

10
pkgs/development/tools/misc/arcanist/default.nix
View File

@ -3,18 +3,18 @@
let
libphutil = fetchgit {
url = "git://github.com/phacility/libphutil.git";
rev = "672c0f7d5da9be6cda619428a9da3b91a670ea2f";
sha256 = "830c7abce7244afa188255a6f288c345004cc4be1c8bbe93afa2aa2f1768f025";
rev = "3753a09dfc7e7ee2626946735e420e5b50480f89";
sha256 = "86c2613fed23edff58452ceb9fa98ceb559c7e41abdb6752f87ebcf0f50a1a66";
};
arcanist = fetchgit {
url = "git://github.com/phacility/arcanist.git";
rev = "64d03ff68bf2ff4ef99186472704df8aface9ef3";
sha256 = "e9c5f9a9dcb1be0b7fd6f5fbda865e14277ddb0c1cedd256c459b3540ec6ded7";
rev = "4d6d3feb7fc1fb63789554dddee8e489999c1201";
sha256 = "e3a9314544c4430ac6e67ba2ae180a96b009b3ab848ba8712fc2b308cf880372";
};
in
stdenv.mkDerivation rec {
name = "arcanist-${version}";
version = "20150525";
version = "20150707";
src = [ arcanist libphutil ];
buildInputs = [ php makeWrapper flex ];

4
pkgs/development/web/nodejs/default.nix
View File

@ -7,7 +7,7 @@
assert stdenv.system != "armv5tel-linux";
let
version = "0.12.0";
version = "0.12.6";
deps = {
inherit openssl zlib libuv;
@ -31,7 +31,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p";
sha256 = "1llsl7zl3080zd7jfhhy4d5s9pnhr15niw6vivp9sflpa71mlfvs";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

48
pkgs/misc/drivers/sundtek/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ fetchurl, stdenv }:
with stdenv.lib;
let
version = "30-06-2015";
rpath = makeLibraryPath [ "$out/lib" "$out/bin" ];
platform = with stdenv;
if isx86_64 then "64bit"
else
if isi686 then "32bit"
else abort "${system} not considered in build derivation. Might still be supported.";
in
stdenv.mkDerivation {
src = fetchurl {
url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz";
sha256 = "304d2785b5e9046c78fc092341721fdc404074105e63dd635e838559d42313c3";
};
name = "sundtek-${version}";
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
sourceRoot = ".";
installPhase = ''
cp -r opt $out
# add and fix pkg-config file
mkdir -p $out/lib/pkgconfig
substitute $out/doc/libmedia.pc $out/lib/pkgconfig/libmedia.pc \
--replace /opt $out
'';
postFixup = ''
find $out -type f -exec \
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \
patchelf --set-rpath ${rpath} {} \;
'';
meta = {
description = "Sundtek MediaTV driver";
maintainers = [ maintainers.simonvandel ];
platforms = platforms.unix;
license = licenses.unfree;
homepage = "http://support.sundtek.com/index.php/topic,1573.0.html";
};
}

18
pkgs/misc/vim-plugins/default.nix
View File

@ -80,6 +80,7 @@ rec {
vimshell = vimshell-vim;
watchdogs = vim-watchdogs;
webapi-vim = WebAPI;
wombat256 = wombat256-vim; # backwards compat, added 2015-7-8
yankring = YankRing;
CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@ -1315,18 +1316,15 @@ rec {
};
wombat256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "wombat256";
src = fetchurl {
url = "http://www.vim.org/scripts/download_script.php?src_id=13400";
name = "wombat256mod.vim";
sha256 = "1san0jg9sfm6chhnr1wc5nhczlp11ibca0v7i4gf68h9ick9mysn";
wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "wombat256-vim-2010-10-17";
src = fetchgit {
url = "git://github.com/vim-scripts/wombat256.vim";
rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
};
buildInputs = [ unzip ];
dependencies = [];
meta = {
url = "http://www.vim.org/scripts/script.php?script_id=2465";
};
};
}

2
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -57,6 +57,7 @@
"github:vim-scripts/a.vim"
"github:vim-scripts/align"
"github:vim-scripts/tabmerge"
"github:vim-scripts/wombat256.vim"
"github:wakatime/vim-wakatime"
"github:wincent/command-t"
"matchit.zip"
@ -97,4 +98,3 @@
"vim-snippets"
"vim2hs"
"vundle"
"wombat256"

28
pkgs/servers/shairport-sync/default.nix
View File

@ -1,36 +1,40 @@
{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, libpulseaudio }:
{ stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib
, libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
stdenv.mkDerivation rec {
version = "2.3.0";
version = "2.3.6.5";
name = "shairport-sync-${version}";
src = fetchurl {
url = "https://github.com/mikebrady/shairport-sync/archive/${version}.zip";
sha256 = "1kslif2ifrn0frvi39d44wpn53sjahwq0xjc0hd98ycf3xbcgndg";
src = fetchFromGitHub {
sha256 = "1337y62pnch27s2gr47miip3na1am24xprlc5a27lbr764nr85s3";
rev = version;
repo = "shairport-sync";
owner = "mikebrady";
};
buildInputs = [
autoreconfHook
openssl
avahi
alsaLib
libdaemon
autoconf
automake
pkgconfig
libtool
popt
unzip
libconfig
libpulseaudio
soxr
];
enableParallelBuilding = true;
preConfigure = "autoreconf -vfi";
configureFlags = "--with-alsa --with-avahi --with-ssl=openssl --without-initscript --with-pulseaudio";
configureFlags = ''
--with-alsa --with-pipe --with-pulseaudio --with-stdout
--with-avahi --with-ssl=openssl --with-soxr
--without-configfiles --without-initscript
'';
meta = with stdenv.lib; {
homepage = https://github.com/mikebrady/shairport-sync;
inherit (src.meta) homepage;
description = "Airtunes server and emulator with multi-room capabilities";
license = licenses.mit;
platforms = platforms.unix;

4
pkgs/tools/cd-dvd/xorriso/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }:
stdenv.mkDerivation rec {
name = "xorriso-1.3.8";
name = "xorriso-1.4.0";
src = fetchurl {
url = "mirror://gnu/xorriso/${name}.tar.gz";
sha256 = "0zhhj9lr9z7hnb2alac54mc28w1l0mbanphhpmy3ylsi8rih84lh";
sha256 = "0mhfxn2idkrw1i65a5y4gnb1fig85zpnszb9ax7w4a2v062y1l8b";
};
doCheck = true;

16
pkgs/tools/networking/i2pd/default.nix
View File

@ -1,14 +1,16 @@
{ stdenv, fetchurl, boost, cryptopp }:
{ stdenv, fetchFromGitHub, boost, cryptopp }:
stdenv.mkDerivation rec {
name = "i2pd-${version}";
version = "0.9.0";
name = pname + "-" + version;
pname = "i2pd";
version = "0.10.0";
src = fetchurl {
name = "i2pd-src-${version}.tar.gz";
url = "https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz";
sha256 = "1rcf4wc34g2alva9jzj6bz0f88g2f5v1w4418b6lp6chvqi7fhc7";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
sha256 = "11w62rc326rhj2xh06307ngx0fai30qny8ml6n5lrx2y1dzjfxd1";
};
buildInputs = [ boost cryptopp ];

6
pkgs/tools/package-management/disnix/DisnixWebService/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
stdenv.mkDerivation {
name = "DisnixWebService-0.3";
name = "DisnixWebService-0.4";
src = fetchurl {
url = http://hydra.nixos.org/build/20419315/download/4/DisnixWebService-0.3.tar.bz2;
sha256 = "03vm84h7div200jr5z28hiwk0fq7i45j0ki18c2h4pmbsd89479i";
url = http://hydra.nixos.org/build/23484798/download/4/DisnixWebService-0.4.tar.bz2;
sha256 = "1rfzmh4rxip8nq25fvi6vw51xb7h0nch4l06s0xgwwv4gw8p0lhm";
};
buildInputs = [ apacheAnt jdk ];
PREFIX = ''''${env.out}'';

6
pkgs/tools/package-management/disnix/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
stdenv.mkDerivation {
name = "disnix-0.3";
name = "disnix-0.4";
src = fetchurl {
url = http://hydra.nixos.org/build/20419300/download/4/disnix-0.3.tar.gz;
sha256 = "11yh270r8mgnkz98ax3p4rlc5dh88sxykvsmcpvgaqnqjh1rwd3j";
url = http://hydra.nixos.org/build/23484781/download/4/disnix-0.4.tar.gz;
sha256 = "1hvjy19br4x7cvgn0rslysrp3w7jfh30s7piq6v9j2b6k6wmh2hk";
};
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];

6
pkgs/tools/package-management/disnix/disnixos/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
stdenv.mkDerivation {
name = "disnixos-0.2";
name = "disnixos-0.3";
src = fetchurl {
url = http://hydra.nixos.org/build/20419306/download/3/disnixos-0.2.tar.gz;
sha256 = "1xysklly0gvh0np0h3f30sfs5lx6qnwj59l8caynwn46qy596gnx";
url = http://hydra.nixos.org/build/23484787/download/3/disnixos-0.3.tar.gz;
sha256 = "08v9vbg3727mv4iyzwfnf5x3la2xjj1agbbzm8aaa09q7alqasvw";
};
buildInputs = [ socat pkgconfig disnix getopt ];

6
pkgs/tools/package-management/disnix/dysnomia/default.nix
View File

@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null;
assert enableMongoDatabase -> mongodb != null;
stdenv.mkDerivation {
name = "dysnomia-0.3";
name = "dysnomia-0.4";
src = fetchurl {
url = http://hydra.nixos.org/build/20419293/download/1/dysnomia-0.3.tar.gz;
sha256 = "09z9ad72wzxjvbc3hynbj9n1y4rrxw1by1wxacjmdqyp46h4b746";
url = http://hydra.nixos.org/build/23484767/download/1/dysnomia-0.4.tar.gz;
sha256 = "1xyd1gzsy4nlbv2l2lrrs964vvb74yhmb8snr4chf7hcyaybb6cq";
};
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";

39
pkgs/top-level/all-packages.nix
View File

@ -1154,6 +1154,8 @@ let
cloogppl = callPackage ../development/libraries/cloog-ppl { };
compass = callPackage ../development/tools/compass { };
convmv = callPackage ../tools/misc/convmv { };
cool-retro-term = callPackage ../applications/misc/cool-retro-term { };
@ -2981,6 +2983,8 @@ let
suidChroot = callPackage ../tools/system/suid-chroot { };
sundtek = callPackage ../misc/drivers/sundtek { };
super = callPackage ../tools/security/super { };
ssdeep = callPackage ../tools/security/ssdeep { };
@ -4195,7 +4199,7 @@ let
bitstring_2_0_4 = callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { };
bitstring_git = callPackage ../development/ocaml-modules/bitstring { };
bitstring =
if lib.versionOlder "4.02" ocaml_version
then bitstring_git
@ -5024,24 +5028,23 @@ let
bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix {
inherit (darwin) libobjc;
};
ruby_2_0_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { });
ruby_2_1_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { });
ruby_2_1_1 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { });
ruby_2_1_2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { });
ruby_2_1_3 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { });
ruby_2_1_6 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { });
ruby_2_2_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { });
ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { };
ruby_2_0_0 = callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { };
ruby_2_1_0 = callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { };
ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { };
ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { };
ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { };
ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { };
ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { };
ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix { };
# Ruby aliases
ruby = ruby_2_1;
ruby = ruby_2_2;
ruby_1_8 = ruby_1_8_7;
ruby_1_9 = ruby_1_9_3;
ruby_2_0 = ruby_2_0_0;
ruby_2_1 = ruby_2_1_6;
ruby_2_2 = ruby_2_2_0;
ruby_2_2 = ruby_2_2_2;
rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
inherit ruby makeWrapper;
@ -12028,6 +12031,8 @@ let
mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { };
openshift = callPackage ../applications/networking/cluster/openshift { };
panamax_api = callPackage ../applications/networking/cluster/panamax/api {
ruby = ruby_2_1;
};
@ -12069,10 +12074,14 @@ let
maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
pdfdiff = callPackage ../applications/misc/pdfdiff { };
mupdf = callPackage ../applications/misc/mupdf {
openjpeg = openjpeg_2_0;
};
diffpdf = callPackage ../applications/misc/diffpdf { };
mypaint = callPackage ../applications/graphics/mypaint { };
mythtv = callPackage ../applications/video/mythtv { };
@ -14334,6 +14343,10 @@ let
### SCIENCE / MATH
caffe = callPackage ../applications/science/math/caffe {
cudaSupport = config.caffe.cudaSupport or config.cudaSupport or true;
};
ecm = callPackage ../applications/science/math/ecm { };
eukleides = callPackage ../applications/science/math/eukleides {

38
pkgs/top-level/python-packages.nix
View File

@ -68,7 +68,7 @@ let
/\\$/{N;br}
/__future__|^ *(#.*)?$/{n;br}
${concatImapStrings mkStringSkipper quoteVariants}
/^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"'
/^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$f")'"'
}
'';
}
@ -1710,6 +1710,29 @@ let
};
};
cassandraDriver = buildPythonPackage rec {
name = "cassandra-driver-2.6.0c2";
src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/c/cassandra-driver/${name}.tar.gz";
sha256 = "00cc2rkvkxaxn7sf2qzy29s6h394fla73rbdh9krxbswp5nvp27r";
};
propagatedBuildInputs = with self; [
futures
nose
six
sure
pytz
pyyaml
];
meta = {
homepage = http://datastax.github.io/python-driver/;
description = "A Python client driver for Apache Cassandra";
};
};
celery = buildPythonPackage rec {
name = "celery-${version}";
@ -8822,22 +8845,21 @@ let
pgcli = buildPythonPackage rec {
name = "pgcli-${version}";
version = "0.17.0";
version = "0.18.0";
src = pkgs.fetchFromGitHub {
sha256 = "0fnzhsir1m7a2rlh3iqinrz5i38ssfg9p7s60bkyy55614l146yg";
sha256 = "1ydi1725ryz9by770kyx06cwrvyvixbg3502brkf5hvbjd8ddzrl";
rev = "v${version}";
repo = "pgcli";
owner = "amjith";
};
propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ];
postPatch = ''
substituteInPlace setup.py --replace "==" ">="
'';
propagatedBuildInputs = with self; [
click configobj prompt_toolkit psycopg2 pygments sqlparse
];
meta = {
inherit version;
description = "Command-line interface for PostgreSQL";
longDescription = ''
Rich command-line interface for PostgreSQL with auto-completion and