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

Merge #8363: pure-darwin stdenv

Browse Source
This commit is contained in:
Vladimír Čunát 2015-06-18 22:23:55 +02:00
commit 61596bf405
119 changed files with 11653 additions and 3864 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -44,7 +44,7 @@
* _If you don't want to install pkg in you profile_.
* `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
* If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
* nixos and it's modules
* nixos and its modules
* You can add new module to you `nixos-configuration file` (usually it's `/etc/nixos/configuration.nix`.
And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`
* If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`.
@ -56,7 +56,7 @@
* Create pull request.
* Write the title in format `(pkg-name | service): improvement`
* If you update the pkg, write versions `from -> to`
* Write in comment if you have tested your patch. Do not rely much on `TravisCL`.
* Write in comment if you have tested your patch. Do not rely much on `TravisCI`.
* If you make an improvement, write why is it good.
* Notify maintainers of the package. For example add to the message: `cc @jagajaga @domenkozar`

9
doc/coding-conventions.xml
View File

@ -451,12 +451,17 @@ splitting up an existing category.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>If it’s a <emphasis>desktop environment</emphasis>
(including <emphasis>window managers</emphasis>):</term>
<term>If it’s a <emphasis>desktop environment</emphasis>:</term>
<listitem>
<para><filename>desktops</filename> (e.g. <filename>kde</filename>, <filename>gnome</filename>, <filename>enlightenment</filename>)</para>
</listitem>
</varlistentry>
<varlistentry>
<term>If it’s a <emphasis>window manager</emphasis>:</term>
<listitem>
<para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>compiz</filename>, <filename>stumpwm</filename>)</para>
</listitem>
</varlistentry>
<varlistentry>
<term>If it’s an <emphasis>application</emphasis>:</term>
<listitem>

2
lib/maintainers.nix
View File

@ -22,6 +22,7 @@
AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
antono = "Antono Vasiljev <self@antono.info>";
ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
aristid = "Aristid Breitkreuz <aristidb@gmail.com>";
@ -133,6 +134,7 @@
lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
linquize = "Linquize <linquize@yahoo.com.hk>";
linus = "Linus Arver <linusarver@gmail.com>";
lnl7 = "Daiderd Jordan <daiderd@gmail.com>";
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
ludo = "Ludovic Courtès <ludo@gnu.org>";
madjar = "Georges Dubus <georges.dubus@compiletoi.net>";

2
nixos/modules/misc/ids.nix
View File

@ -220,6 +220,7 @@
grafana = 196;
skydns = 197;
ripple-rest = 198;
nix-serve = 199;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -418,6 +419,7 @@
#grafana = 196; #unused
#skydns = 197; #unused
#ripple-rest = 198; #unused
#nix-serve = 199; #unused
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal

16
nixos/modules/services/networking/nix-serve.nix
View File

@ -26,6 +26,14 @@ in
'';
};
secretKeyFile = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
The path to the file used for signing derivation data.
'';
};
extraParams = mkOption {
type = types.string;
default = "";
@ -44,13 +52,19 @@ in
path = [ config.nix.package pkgs.bzip2 ];
environment.NIX_REMOTE = "daemon";
environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
serviceConfig = {
ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
"--port ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
User = "nobody";
User = "nix-serve";
Group = "nogroup";
};
};
users.extraUsers.nix-serve = {
description = "Nix-serve user";
uid = config.ids.uids.nix-serve;
};
};
}

65
pkgs/applications/audio/groovebasin/default.nix Normal file
View File

@ -0,0 +1,65 @@
{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux }:
with stdenv.lib;
let
nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
neededNatives = [ libgroove python utillinux ];
self = nodePackages;
generated = ./package.nix;
};
in nodePackages.buildNodePackage rec {
version = "1.5.1";
name = "groovebasin-${version}";
src = fetchFromGitHub {
owner = "andrewrk";
repo = "groovebasin";
rev = "${version}";
sha256 = "1g7v0qhvgzpb050hf45pibp68qd67hnnry5npw58f4dvaxdd8yhd";
};
deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
buildInputs = [ makeWrapper ];
postInstall = ''
mkdir -p "$out/lib/node_modules/groovebasin/public"
stylus -o "$out/lib/node_modules/groovebasin/public/" -c --include-css "$out/lib/node_modules/groovebasin/src/client/styles"
browserify-lite "$out/lib/node_modules/groovebasin/src/client/app.js" --outfile "$out/lib/node_modules/groovebasin/public/app.js"
wrapProgram "$out/bin/groovebasin" --set NODE_PATH "$out/lib/node_modules/groovebasin/node_modules/"
'';
passthru.names = ["groovebasin"];
meta = {
description = "Music player server with a web-based user interface";
homepage = http://groovebasin.com/;
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.andrewrk ];
longDescription = ''
Groove Basin runs on a server optionally connected to speakers. Guests can
control the music player by connecting with a laptop, tablet, or smart phone.
Further, users can stream their music libraries remotely.
Groove Basin comes with a fast, responsive web interface that supports keyboard
shortcuts and drag drop. It also provides the ability to upload songs,
download songs, and import songs by URL, including YouTube URLs.
Groove Basin supports Dynamic Mode which automatically queues random songs,
favoring songs that have not been queued recently.
Groove Basin automatically performs ReplayGain scanning on every song using
the EBU R128 loudness standard, and automatically switches between track
and album mode.
Groove Basin supports the MPD protocol, which means it is compatible with MPD
clients. There is also a more powerful Groove Basin protocol which you can
use if the MPD protocol does not meet your needs.
Groove Basin supports Last.fm scrobbling.
'';
};
}

4396
pkgs/applications/audio/groovebasin/package.nix Normal file
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/audio/setbfree/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "setbfree-${version}";
version = "0.7.5";
version = "0.8.0";
src = fetchurl {
url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz";
sha256 = "1chlmgwricc6l4kyg35vc9v8f1n8psr28iihn4a9q2prj1ihqcbc";
sha256 = "1lfylai4gyk512dknj16w2aq9ka8hvqca46nmq5b4rfjmi6dkxf6";
};
patchPhase = ''

11
pkgs/applications/editors/neovim/default.nix
View File

@ -27,7 +27,8 @@ let
owner = "neovim";
};
buildInputs = [ libtool perl ];
buildInputs = [ perl ];
nativeBuildInputs = [ libtool ];
makeFlags = [ "PREFIX=$(out)" ]
++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
@ -66,8 +67,6 @@ let
enableParallelBuilding = true;
buildInputs = [
makeWrapper
cmake
glib
libtermkey
libuv
@ -79,12 +78,14 @@ let
libmsgpack
ncurses
neovimLibvterm
pkgconfig
unibilium
] ++ optional withJemalloc jemalloc;
nativeBuildInputs = [
cmake
gettext
makeWrapper
pkgconfig
];
LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
@ -136,7 +137,7 @@ let
in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec {
name = "neovim-${version}-configured";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p $out/bin
for item in ${neovim}/bin/*; do

3
pkgs/applications/graphics/apitrace/default.nix
View File

@ -11,7 +11,8 @@ stdenv.mkDerivation {
owner = "apitrace";
};
buildInputs = [ cmake python libX11 qt4 ];
buildInputs = [ python libX11 qt4 ];
nativeBuildInputs = [ cmake ];
buildPhase = ''
cmake

4
pkgs/applications/graphics/darktable/default.nix
View File

@ -9,12 +9,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.6.6";
version = "1.6.7";
name = "darktable-${version}";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
sha256 = "1991zm0ly2j69vq9jsijfrjw0vnchh3il7m4ylsblzk73614nppq";
sha256 = "162c9kdj71az0ipaw4kiqcxhig0hcbmzw936d390r8zhkns76l57";
};
buildInputs =

5
pkgs/applications/graphics/simple-scan/default.nix
View File

@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2 makeWrapper
pkgconfig saneBackends systemd vala ];
buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2
saneBackends systemd vala ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
enableParallelBuilding = true;

5
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -95,6 +95,11 @@ stdenv.mkDerivation rec {
# Remove SDK cruft. FIXME: move to a separate output?
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
'' + lib.optionalString enableGTK3
''
wrapProgram "$out/bin/firefox" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
'';
meta = {

29
pkgs/applications/networking/drive/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, goPackages, fetchFromGitHub }:
with goPackages;
buildGoPackage rec {
rev = "4530cf8d59e1047cb1c005a6bd5b14ecb98b9e68";
name = "drive-${lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/odeke-em/drive";
src = fetchFromGitHub {
inherit rev;
owner = "odeke-em";
repo = "drive";
sha256 = "1y4qlzvgg84mh8l6bhaazzy6bv6dwjcbpm0rxvvc5aknvvh581ps";
};
subPackages = [ "cmd/drive" ];
buildInputs = [ pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client cli-spinner oauth2 text net ];
dontInstallSrc = true;
meta = with lib; {
description = "A tiny program to pull or push Google Drive files";
homepage = https://github.com/odeke-em/drive;
license = licenses.asl20;
maintainers = with maintainers; [ bobvanderlinden ];
platforms = platforms.linux;
};
}

22
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View File

@ -19,7 +19,10 @@
, kerberos
, libX11
, libXScrnSaver
, libXcomposite
, libXdamage
, libXext
, libXfixes
, libXinerama
, libXrender
, libXt
@ -88,7 +91,10 @@ stdenv.mkDerivation {
kerberos
libX11
libXScrnSaver
libXcomposite
libXdamage
libXext
libXfixes
libXinerama
libXrender
libXt
@ -112,25 +118,15 @@ stdenv.mkDerivation {
ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
for executable in \
thunderbird mozilla-xremote-client thunderbird-bin plugin-container \
updater
thunderbird crashreporter thunderbird-bin plugin-container updater
do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
"$out/usr/lib/thunderbird-bin-${version}/$executable"
done
for executable in \
thunderbird mozilla-xremote-client thunderbird-bin plugin-container \
updater \
components/libdbusservice.so components/libmozgnome.so \
libnssdbm3.so libsmime3.so libxul.so libprldap60.so libnss3.so \
libplc4.so libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so \
libssl3.so libldif60.so libsoftokn3.so libldap60.so libnssutil3.so \
libnssckbi.so libplds4.so
do
find . -executable -type f -exec \
patchelf --set-rpath "$libPath" \
"$out/usr/lib/thunderbird-bin-${version}/$executable"
done
"$out/usr/lib/thunderbird-bin-${version}/{}" \;
# Create a desktop item.
mkdir -p $out/share/applications

228
pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
View File

@ -4,117 +4,123 @@
# ruby generate_source.rb > source.nix
{
version = "31.7.0";
version = "38.0.1";
sources = [
{ locale = "ar"; arch = "linux-i686"; sha1 = "8d5dd6af05d9a285097db7f96372464e2c48a7fe"; }
{ locale = "ar"; arch = "linux-x86_64"; sha1 = "07866e3716bc3bd370e4aa4711ee2882be8380b9"; }
{ locale = "ast"; arch = "linux-i686"; sha1 = "f9c353e03792ade2c3df9842bad6707c50b59395"; }
{ locale = "ast"; arch = "linux-x86_64"; sha1 = "ecbfaa883c2dda597213ca739e92c30ec9c2eac1"; }
{ locale = "be"; arch = "linux-i686"; sha1 = "ac1abca375cfbc2e45b7eb0f66b9cef73924ae4e"; }
{ locale = "be"; arch = "linux-x86_64"; sha1 = "5f296643c42890a200416678a6ed8240ee219d9f"; }
{ locale = "bg"; arch = "linux-i686"; sha1 = "4b59b171b67641097da95fd76113efe1019fd2aa"; }
{ locale = "bg"; arch = "linux-x86_64"; sha1 = "13d5124fd8925de174f83a8075fb711aa14438b7"; }
{ locale = "bn-BD"; arch = "linux-i686"; sha1 = "833c826ee2be3c8664060d4ad24c508b5c122a5e"; }
{ locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b29fb50d9eb83e98802655236a6c1ccb56bf6be3"; }
{ locale = "br"; arch = "linux-i686"; sha1 = "5985c09eab409db0c62e525e9cd3d7469b82f0e1"; }
{ locale = "br"; arch = "linux-x86_64"; sha1 = "2e4e3efe1d89b8cf329a64894807b69555e505e2"; }
{ locale = "ca"; arch = "linux-i686"; sha1 = "1a81aabe1ded11bde92349e8b9f5ae499aaebdfa"; }
{ locale = "ca"; arch = "linux-x86_64"; sha1 = "406212f107939a627f2166d8fc6a72a0dcff56a4"; }
{ locale = "cs"; arch = "linux-i686"; sha1 = "6cc272e25d45e54c6008da968884de039eba9db9"; }
{ locale = "cs"; arch = "linux-x86_64"; sha1 = "6f7e54ff4fe7d8bfa477475aaad371fc8b2f85d4"; }
{ locale = "da"; arch = "linux-i686"; sha1 = "8f944829ef98bfdb46eadfd10fafe75a353c1a4a"; }
{ locale = "da"; arch = "linux-x86_64"; sha1 = "f22e4293a3462effa0a928be3ae1ddbd8273450f"; }
{ locale = "de"; arch = "linux-i686"; sha1 = "c115ea9356b457b25526c8469ebcf7a8e1c6241a"; }
{ locale = "de"; arch = "linux-x86_64"; sha1 = "04ac40b3e10f96e17db70c9541040970cbe2e480"; }
{ locale = "el"; arch = "linux-i686"; sha1 = "b0ccb81db2b8cb505ade10a0fc1eaf4322f7de0d"; }
{ locale = "el"; arch = "linux-x86_64"; sha1 = "410da87c432e3d4e4ddfbe4912bc00c8fcfb8dfd"; }
{ locale = "en-GB"; arch = "linux-i686"; sha1 = "b91bea9a1813f1772a85873fb712c9857234864f"; }
{ locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f6a08558fb3b6ebd79fdf9b359286b7ba58f2a9c"; }
{ locale = "en-US"; arch = "linux-i686"; sha1 = "b433601ffdf83cc2a90224f683f627f562d8e3e3"; }
{ locale = "en-US"; arch = "linux-x86_64"; sha1 = "68624fead16c459f87cbdeefd75326bcabccd805"; }
{ locale = "es-AR"; arch = "linux-i686"; sha1 = "14c4a6abb6269dea926efccfdae41d2eeab9031a"; }
{ locale = "es-AR"; arch = "linux-x86_64"; sha1 = "ffd800950b8a768d4e7ec4c8666fc2e7a390a080"; }
{ locale = "es-ES"; arch = "linux-i686"; sha1 = "61889cee58be7c5da0f3424faae5192f07d31651"; }
{ locale = "es-ES"; arch = "linux-x86_64"; sha1 = "360335d5c3a1eccaba29095f88d9b50dc04fbc6d"; }
{ locale = "et"; arch = "linux-i686"; sha1 = "ba1e1dbcb1c0c87ba1c916b1053cf876e42d76bf"; }
{ locale = "et"; arch = "linux-x86_64"; sha1 = "c40a2e0c70d3c3af5e0c34045864a7279f95b2fa"; }
{ locale = "eu"; arch = "linux-i686"; sha1 = "45c6270bb1350799df089620cdae4919833d5a54"; }
{ locale = "eu"; arch = "linux-x86_64"; sha1 = "ee8cacf035658fda1605f3a2968c56fa03cd73d4"; }
{ locale = "fi"; arch = "linux-i686"; sha1 = "45329cd3222d74cefaa0e96e18b71b6ddc844e77"; }
{ locale = "fi"; arch = "linux-x86_64"; sha1 = "47c1ec1e67829a86111a76f6ea6cb40c9f178066"; }
{ locale = "fr"; arch = "linux-i686"; sha1 = "1f2e1edbb49f141c1ac63f20e47bc4bcbe0361f4"; }
{ locale = "fr"; arch = "linux-x86_64"; sha1 = "cf70711b4fb6130b31d3286ad1b2a102d5cb8fc5"; }
{ locale = "fy-NL"; arch = "linux-i686"; sha1 = "938ee57e657b3b2f0a228bc1dc7a9bc2eebee1cc"; }
{ locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "5c807541fa4e232b6b5119cbc482a79dd9e4f54e"; }
{ locale = "ga-IE"; arch = "linux-i686"; sha1 = "6f2ef03c505f4936f6263b643bbfd6e0befd54f4"; }
{ locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "7246ed88b0c3f504ca0043f3f20c5cc86eea8ac6"; }
{ locale = "gd"; arch = "linux-i686"; sha1 = "130f7ae3c0127d00e24946e9ec2558161fd3fcf1"; }
{ locale = "gd"; arch = "linux-x86_64"; sha1 = "aed0e1e7e699c6df4538663dc6a0556a106cb35f"; }
{ locale = "gl"; arch = "linux-i686"; sha1 = "69fca12c63c023f689463de709db731073a3c812"; }
{ locale = "gl"; arch = "linux-x86_64"; sha1 = "45ab4866e3f6989e4a08920564292622abea7f97"; }
{ locale = "he"; arch = "linux-i686"; sha1 = "2898eed89af21c6a4122937bf596b97828cb9271"; }
{ locale = "he"; arch = "linux-x86_64"; sha1 = "a3fb3b8564fcbe8cad29d430665d3f369d765369"; }
{ locale = "hr"; arch = "linux-i686"; sha1 = "143d8dcbccd3ad219330d7389e93597cb98d20f8"; }
{ locale = "hr"; arch = "linux-x86_64"; sha1 = "3fdc0095646678c2885e374e277ab50c4a4ffe53"; }
{ locale = "hu"; arch = "linux-i686"; sha1 = "4c135cfaa8644fab4558d53eb7f5f0ae53ed3704"; }
{ locale = "hu"; arch = "linux-x86_64"; sha1 = "a4faeb5aa6dc7f6a16d436a56ef9f954c80271fd"; }
{ locale = "hy-AM"; arch = "linux-i686"; sha1 = "f3e60e515fa20c4092ecf4df64970bc750c849e5"; }
{ locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2d6ea4a41a33db4e2aeb67d7bcd38f32f427f757"; }
{ locale = "id"; arch = "linux-i686"; sha1 = "cd97780c5f70dca5e9c2a61e9af11f38f79b014b"; }
{ locale = "id"; arch = "linux-x86_64"; sha1 = "da2ae751b6b0dd2caf5c54fcd30560a57c6746cb"; }
{ locale = "is"; arch = "linux-i686"; sha1 = "f6f3b56e8b134e93e30ecfcf706e9ddbb9b181cc"; }
{ locale = "is"; arch = "linux-x86_64"; sha1 = "a922a569b293005e5efc797bf51e0c33e87cea7f"; }
{ locale = "it"; arch = "linux-i686"; sha1 = "2643526d774e44fc41b0b7b6872ba683b01a9c77"; }
{ locale = "it"; arch = "linux-x86_64"; sha1 = "e91689f635060087f8c8c9806ac1607a59e26776"; }
{ locale = "ja"; arch = "linux-i686"; sha1 = "dafca3f2c34ae417b5bd3065026af4a075c9bee7"; }
{ locale = "ja"; arch = "linux-x86_64"; sha1 = "6a1d03062d599ea35af8479dea3e6cfc45840ba1"; }
{ locale = "ko"; arch = "linux-i686"; sha1 = "9b92baecd3906b35499513723685cd791e1aab9e"; }
{ locale = "ko"; arch = "linux-x86_64"; sha1 = "116c8b02f8be6c739595cc88888a19e225ed865d"; }
{ locale = "lt"; arch = "linux-i686"; sha1 = "85f44f77cc27deb9cf95487a9a3673918f102bd9"; }
{ locale = "lt"; arch = "linux-x86_64"; sha1 = "0bd82afbe4c27318ce8882eff62e53fda13d3590"; }
{ locale = "nb-NO"; arch = "linux-i686"; sha1 = "07cd4e46a5811096759c565bb533adf1ee9cb0d9"; }
{ locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "ece8a8b69aef74f9c22db1660a14ae5205aa7ff7"; }
{ locale = "nl"; arch = "linux-i686"; sha1 = "1f1e30f5aef29bf96d0e2b8609acb03d1b6ec0aa"; }
{ locale = "nl"; arch = "linux-x86_64"; sha1 = "5a0ffeb38b183b835966568c1b3fc719c0908fea"; }
{ locale = "nn-NO"; arch = "linux-i686"; sha1 = "9bbb5e61eecf09d059cfb17bd75fd0e64c455d78"; }
{ locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "e1115c4451ede51833387ef8c592ce7342d508d3"; }
{ locale = "pa-IN"; arch = "linux-i686"; sha1 = "65dcef7d9bfcdbd35a09ff6a9e436261b79e4d90"; }
{ locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "cd64fb45459e699e0c8c2269a52bb0512e592db0"; }
{ locale = "pl"; arch = "linux-i686"; sha1 = "ea2650cb700a42dc96fb56ad1860061e87626bc9"; }
{ locale = "pl"; arch = "linux-x86_64"; sha1 = "976a52d128e8d912363fadb7e14adec0a7c9d973"; }
{ locale = "pt-BR"; arch = "linux-i686"; sha1 = "323b876b6c11c4881c280cdb64d2867076970abf"; }
{ locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "952d5b82b0d3d47d5494f2d9667fc2a5b88408df"; }
{ locale = "pt-PT"; arch = "linux-i686"; sha1 = "5ce1feb2446c6dba96c3b3a0e9afd6a00655b738"; }
{ locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "83115d2fdc8494451b79cc67d581c77b64c27af4"; }
{ locale = "rm"; arch = "linux-i686"; sha1 = "a26678482d8c425f3291116e99e0196952d0cb09"; }
{ locale = "rm"; arch = "linux-x86_64"; sha1 = "327391e44d43d58b4d3fee97904a336f5c52648e"; }
{ locale = "ro"; arch = "linux-i686"; sha1 = "8b67f03c053f89af7d50331eec056402cfbd5bf4"; }
{ locale = "ro"; arch = "linux-x86_64"; sha1 = "15ec5c6fa7e6aa843910bc6c6479bf308393b52f"; }
{ locale = "ru"; arch = "linux-i686"; sha1 = "09127b5202cf63c7b9715813061ca79bc27c2f37"; }
{ locale = "ru"; arch = "linux-x86_64"; sha1 = "8b409350741edcd33b3eeaf7928a133eb1c2a399"; }
{ locale = "si"; arch = "linux-i686"; sha1 = "733d049ffd66d5007ef68c761f2d84ab579bd400"; }
{ locale = "si"; arch = "linux-x86_64"; sha1 = "dc5460e82bdf613e9d778687d11533dc97b77ffb"; }
{ locale = "sk"; arch = "linux-i686"; sha1 = "b4b9b10b53c48adf224507faf77a04c19c750d58"; }
{ locale = "sk"; arch = "linux-x86_64"; sha1 = "81aeb1d95fd2b220c17f388ba882127fc6d290de"; }
{ locale = "sl"; arch = "linux-i686"; sha1 = "a621f04b7e5accf05f946ce775391667579679e6"; }
{ locale = "sl"; arch = "linux-x86_64"; sha1 = "f9086f1ce56d84e3b732f22d086fcce43d2373a7"; }
{ locale = "sq"; arch = "linux-i686"; sha1 = "1b2b11fd04b7d1979f88268db37510ef231c158b"; }
{ locale = "sq"; arch = "linux-x86_64"; sha1 = "f06ad4d533c7144695fbe2eb3ba700bb1d5151b7"; }
{ locale = "sr"; arch = "linux-i686"; sha1 = "92d4cd9bbc5f24045295bda6c75420708d593aac"; }
{ locale = "sr"; arch = "linux-x86_64"; sha1 = "53e661b5c485fae7c27770d2a2701d6d21e481c9"; }
{ locale = "sv-SE"; arch = "linux-i686"; sha1 = "e4614597ef42eaa6ede065b4c3b9f11de491dd5b"; }
{ locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e3c8af45ab65e7977a350ae617cd55afa685e8d0"; }
{ locale = "ta-LK"; arch = "linux-i686"; sha1 = "17b3d419fe769a02a360b96042c78c497063b9e8"; }
{ locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "cbc34ab650bfc95926b98e63c474f1997a1256fa"; }
{ locale = "tr"; arch = "linux-i686"; sha1 = "ba63efda6864a6984d492cda30d4fca6157e26a8"; }
{ locale = "tr"; arch = "linux-x86_64"; sha1 = "9b8cb45aab578b3dbfeace90f44dad26eda6e798"; }
{ locale = "uk"; arch = "linux-i686"; sha1 = "36a9867155fa0e6924ed62d7dbc350a2425178e1"; }
{ locale = "uk"; arch = "linux-x86_64"; sha1 = "abbc155c34c5d404b3143ccc63a1bb5c99c3d395"; }
{ locale = "vi"; arch = "linux-i686"; sha1 = "850ac8190adef8d227166b9b4478ea8c88c90287"; }
{ locale = "vi"; arch = "linux-x86_64"; sha1 = "afba1f0043ba96a89bc8ab23fe6b6e19af4f826b"; }
{ locale = "zh-CN"; arch = "linux-i686"; sha1 = "acda86b5c48b751eb06719754921e7604a1c222e"; }
{ locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "a88745a4a8f85d5d2861e40ba8d72b0af73bb055"; }
{ locale = "zh-TW"; arch = "linux-i686"; sha1 = "c03e6e4fae7fec1ae0b30e5cb600a4cf28151cc7"; }
{ locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c5788c6672b230681cfb3ee2fe97763ef81d34b1"; }
{ locale = "ar"; arch = "linux-i686"; sha1 = "b61125483c46602e64ab7c4b56ff2f9612453ad3"; }
{ locale = "ar"; arch = "linux-x86_64"; sha1 = "4ac5de506c61fc769e6805f599cb7131b243812c"; }
{ locale = "ast"; arch = "linux-i686"; sha1 = "07ea0b98e651e650d2f11322b5c8ce55bb083217"; }
{ locale = "ast"; arch = "linux-x86_64"; sha1 = "b0b37462e0bb5443f408724b62421e59ae68389b"; }
{ locale = "be"; arch = "linux-i686"; sha1 = "61feae6377bcca63225ba945b7067dad8eb5a0fa"; }
{ locale = "be"; arch = "linux-x86_64"; sha1 = "b58385f605b7a08f17e06faa922899c42a2076c0"; }
{ locale = "bg"; arch = "linux-i686"; sha1 = "ddbb0681076511828c91373354aa9a3861ee3943"; }
{ locale = "bg"; arch = "linux-x86_64"; sha1 = "734acaa1870773d9ccf687e65d553797b3d00bca"; }
{ locale = "bn-BD"; arch = "linux-i686"; sha1 = "32ad3307c919ec10bcbb9f99f8d37bb5daec5903"; }
{ locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4e87b8ff753b1680b0b9b5149fc75238bff91c6d"; }
{ locale = "br"; arch = "linux-i686"; sha1 = "b319d6f853311b103c439a482ee12652d751e22f"; }
{ locale = "br"; arch = "linux-x86_64"; sha1 = "0254d1edcc2b1fbc8cec01c96482c381d34be88b"; }
{ locale = "ca"; arch = "linux-i686"; sha1 = "deb0caf34895379b2e7dd01871c510f92ba96561"; }
{ locale = "ca"; arch = "linux-x86_64"; sha1 = "f580f9044bb115b3077ba012fe1b3be289853911"; }
{ locale = "cs"; arch = "linux-i686"; sha1 = "045f3d7adade1133325e6607971ec70cad85c91a"; }
{ locale = "cs"; arch = "linux-x86_64"; sha1 = "9fc2fa5a44886db96bcdb4d23d69593954a84ca2"; }
{ locale = "cy"; arch = "linux-i686"; sha1 = "6fb9ca5be336db1b149e4ac6e53e51fd32fbd84e"; }
{ locale = "cy"; arch = "linux-x86_64"; sha1 = "517dfd262c4f23fba743299381f51f7863cd32d7"; }
{ locale = "da"; arch = "linux-i686"; sha1 = "bdd5d63545fb09540a5ff8ada7d421deb865dc61"; }
{ locale = "da"; arch = "linux-x86_64"; sha1 = "fa4f26001b4281f4bd9b741a897e1a420c40b604"; }
{ locale = "de"; arch = "linux-i686"; sha1 = "566603c44ba6df21d7504bfb49ea235f5cb64e00"; }
{ locale = "de"; arch = "linux-x86_64"; sha1 = "60675d5905838ac54c0c2a961d88d021c446ec50"; }
{ locale = "dsb"; arch = "linux-i686"; sha1 = "74feac72b6ad05b00a6c4495f751f106b77b3997"; }
{ locale = "dsb"; arch = "linux-x86_64"; sha1 = "fbb936459a2287117e5638ef78ba1d647f4be41f"; }
{ locale = "el"; arch = "linux-i686"; sha1 = "eedbcc1df60912b2f5be83dc2459cd06914b91f5"; }
{ locale = "el"; arch = "linux-x86_64"; sha1 = "ead82b60f2b07a63ff84ed6f35f9527c1b030c24"; }
{ locale = "en-GB"; arch = "linux-i686"; sha1 = "17ed78e8f063f39a7c73795e9a251f187dc2a04c"; }
{ locale = "en-GB"; arch = "linux-x86_64"; sha1 = "42f427fe628cbc182459f66a7d87d78845d50e57"; }
{ locale = "en-US"; arch = "linux-i686"; sha1 = "9f264dbd88d96149a92601e33dbed497189b281d"; }
{ locale = "en-US"; arch = "linux-x86_64"; sha1 = "a8df74c9655501ee9e4c876b05e14b9a2605a591"; }
{ locale = "es-AR"; arch = "linux-i686"; sha1 = "4e467b8e662345bba07ec768055899175823764b"; }
{ locale = "es-AR"; arch = "linux-x86_64"; sha1 = "96994e1c9b6e8d27d1b7bf91a2d0d47b25d67bcb"; }
{ locale = "es-ES"; arch = "linux-i686"; sha1 = "db1574237be55846c386138b55beacf247cdf8b8"; }
{ locale = "es-ES"; arch = "linux-x86_64"; sha1 = "1e474e7001a14bfba44e933cca875b10032b22fc"; }
{ locale = "et"; arch = "linux-i686"; sha1 = "3385f3aa8432a66b4f400158ba079808a0982c6b"; }
{ locale = "et"; arch = "linux-x86_64"; sha1 = "aad77f411f5c3a6161bbb6b80566d9065e15c8a0"; }
{ locale = "eu"; arch = "linux-i686"; sha1 = "98820960354c89dc9e7178b3c783df733597ef27"; }
{ locale = "eu"; arch = "linux-x86_64"; sha1 = "77c3946d778ccea30f22a08f38d5336110d87d43"; }
{ locale = "fi"; arch = "linux-i686"; sha1 = "63c7a82cbfc8d5c52424244ccab51868aa498416"; }
{ locale = "fi"; arch = "linux-x86_64"; sha1 = "a590ff89b5616463ce32091c09c0b74d6f6a8773"; }
{ locale = "fr"; arch = "linux-i686"; sha1 = "4e7902977f83139926131db13731632a9c4e105c"; }
{ locale = "fr"; arch = "linux-x86_64"; sha1 = "2d7a1e725ae2aad6dfcc2e9d891999a40a242fe9"; }
{ locale = "fy-NL"; arch = "linux-i686"; sha1 = "fad0d47e75d9191d85d5d1e6bf2f9f4f5ec08fb2"; }
{ locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ab42e792567affd3007848822eb26afc2bea0e94"; }
{ locale = "ga-IE"; arch = "linux-i686"; sha1 = "3faa798e14f9acd36a120b9f4e9c961c27df825c"; }
{ locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "afe90e25771a101286365d37470f00c52a8f2392"; }
{ locale = "gd"; arch = "linux-i686"; sha1 = "aed0d96aa093a9f168c702d4e1c39d5c6077df3b"; }
{ locale = "gd"; arch = "linux-x86_64"; sha1 = "e3faf40265be42ca2c0412a97b4ac689c9d5d6a4"; }
{ locale = "gl"; arch = "linux-i686"; sha1 = "1ef2f1f69c042a2aeb340df9faf9019df19dbf35"; }
{ locale = "gl"; arch = "linux-x86_64"; sha1 = "bc026a910ea03aa795d59d81836ec5dd6efb1370"; }
{ locale = "he"; arch = "linux-i686"; sha1 = "87a2923688d5a9eb63b8a41200ba5afc6c00d954"; }
{ locale = "he"; arch = "linux-x86_64"; sha1 = "5067560a1a56d6cbbb163d2b73bce68451956413"; }
{ locale = "hr"; arch = "linux-i686"; sha1 = "74605669d56d0cc6e93fecce04d52771680f39f6"; }
{ locale = "hr"; arch = "linux-x86_64"; sha1 = "d749c4ad35a02c01e50358d11a1d7034ad402bce"; }
{ locale = "hsb"; arch = "linux-i686"; sha1 = "1e0a75dfa4627afa34e2348c71c64501b6ebac12"; }
{ locale = "hsb"; arch = "linux-x86_64"; sha1 = "43f703566076db2e3b08703d6e3faac336ffff88"; }
{ locale = "hu"; arch = "linux-i686"; sha1 = "b1bc08f9fd116d022c9c2710a9e25d176a1ee2a7"; }
{ locale = "hu"; arch = "linux-x86_64"; sha1 = "8fe7b6923d46f30ffbac5a97fe9bde7625a9bc26"; }
{ locale = "hy-AM"; arch = "linux-i686"; sha1 = "93f2e69df2c32eb2c33d9a6bf91c00224f5de9e8"; }
{ locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "52341cf14ddb124bd591f161eb2c3c566307e6c0"; }
{ locale = "id"; arch = "linux-i686"; sha1 = "733d6833cb71d5bd6727991c76f7907b4efeb1c9"; }
{ locale = "id"; arch = "linux-x86_64"; sha1 = "2a5fe37753a3399ea8626615493fe3cac4b79586"; }
{ locale = "is"; arch = "linux-i686"; sha1 = "0d1bf6bf337598d6e72762716264cb2662ab542c"; }
{ locale = "is"; arch = "linux-x86_64"; sha1 = "5dbe72779e2c58cb0d0224e08582cfb1358fc47b"; }
{ locale = "it"; arch = "linux-i686"; sha1 = "7bf51283965c48dad5aac2bffbd8223e83bc5c6f"; }
{ locale = "it"; arch = "linux-x86_64"; sha1 = "2634b404ca6a9f6a3a194c911ca514311646461f"; }
{ locale = "ja"; arch = "linux-i686"; sha1 = "82ed3c27de426361f2cb73c9a34197d2548546d5"; }
{ locale = "ja"; arch = "linux-x86_64"; sha1 = "9e9a0eda6fd9354a06071b580686a5387ad291ec"; }
{ locale = "ko"; arch = "linux-i686"; sha1 = "e1416907d5748d10a5b0e74c4687787e7343db57"; }
{ locale = "ko"; arch = "linux-x86_64"; sha1 = "629ad488888ad62e60bd340e17d565af76b48337"; }
{ locale = "lt"; arch = "linux-i686"; sha1 = "d58c886482404929c18fe25cf3aece121eb6a8e7"; }
{ locale = "lt"; arch = "linux-x86_64"; sha1 = "e0cfc0a747aae13cf5cf54db6b72e72a5780372f"; }
{ locale = "nb-NO"; arch = "linux-i686"; sha1 = "a2e5612b0007a11f74cb3fe330e2234d84f5d35c"; }
{ locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eba10f9d0de6b9937f297ec742e05df53460bfec"; }
{ locale = "nl"; arch = "linux-i686"; sha1 = "a1ce06ca18bf93ff87c91fd8677dbe06eadf1159"; }
{ locale = "nl"; arch = "linux-x86_64"; sha1 = "180b531bf58f08d89c668b578a3c7c5380900f9f"; }
{ locale = "nn-NO"; arch = "linux-i686"; sha1 = "484546422728623005a2d20470c7f6d06870ce96"; }
{ locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "f4526c827dcf1d0a11d38bd834807eb4b7f2923f"; }
{ locale = "pa-IN"; arch = "linux-i686"; sha1 = "c75275e6a8a19213ea5eb063c8988634bbbe13cc"; }
{ locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "0fce05e81e0bb2bf6f7ce051cdee10ceaaaee4cb"; }
{ locale = "pl"; arch = "linux-i686"; sha1 = "6d8657b489008122b0a3dabc3b9bb5112529ae16"; }
{ locale = "pl"; arch = "linux-x86_64"; sha1 = "b5eff0843c96947d5aa7f7f74ec899630cb9e039"; }
{ locale = "pt-BR"; arch = "linux-i686"; sha1 = "f2359b80b8afad50aab695d3cc14e461c21e46e3"; }
{ locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "b946a90928e0c7a389dbcf5728c08e7fc5042025"; }
{ locale = "pt-PT"; arch = "linux-i686"; sha1 = "dbc60c45551b8db4be970efed6a397bf81d108e6"; }
{ locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "77c53b3a401dbfc930f2c5d94ebe6f1a090954e7"; }
{ locale = "rm"; arch = "linux-i686"; sha1 = "290f420ba933251168dce7c8e588541cdec886da"; }
{ locale = "rm"; arch = "linux-x86_64"; sha1 = "7c40435683e29fd3c7b541cd3ed2a69e39a14245"; }
{ locale = "ro"; arch = "linux-i686"; sha1 = "93d016bd3dfbd8b7ad4d8eceb94a638f6e66e751"; }
{ locale = "ro"; arch = "linux-x86_64"; sha1 = "2d05ef4da4eac47ee2b37d9d207a20b875ab6c3f"; }
{ locale = "ru"; arch = "linux-i686"; sha1 = "4c80bf8509b725c861ee744676e5f8229edd9acd"; }
{ locale = "ru"; arch = "linux-x86_64"; sha1 = "60406c09cef691b892dfffffe05d06182a0f5b03"; }
{ locale = "si"; arch = "linux-i686"; sha1 = "f7f98b929f290a757dcd67d2f0abc09272e1524f"; }
{ locale = "si"; arch = "linux-x86_64"; sha1 = "f73185d1c4d78247154ff4133092f12bcace0189"; }
{ locale = "sk"; arch = "linux-i686"; sha1 = "bc78cf179d1145771bc3d76808f47c3074aa848f"; }
{ locale = "sk"; arch = "linux-x86_64"; sha1 = "b6cd85fe49e367d36f75c89596cc6826de936c03"; }
{ locale = "sl"; arch = "linux-i686"; sha1 = "cc7468c85efaae4ad8f3c4dd629c07420095d6b7"; }
{ locale = "sl"; arch = "linux-x86_64"; sha1 = "51236372848448ad80210d340ba5f03b851b1434"; }
{ locale = "sq"; arch = "linux-i686"; sha1 = "1cd44cdb36f17d922b04e6f1f31721495b30d9a8"; }
{ locale = "sq"; arch = "linux-x86_64"; sha1 = "604de9669330503ea07e24d6f65c2586c6748730"; }
{ locale = "sr"; arch = "linux-i686"; sha1 = "ea9f909fd9b7c9125fc109db81ed313bad19ca26"; }
{ locale = "sr"; arch = "linux-x86_64"; sha1 = "d71c0b6d31940f24562a74b30349ecd4645b0ee9"; }
{ locale = "sv-SE"; arch = "linux-i686"; sha1 = "0c4193b4dc6eae8b5f9515ca8a534f127ee083d8"; }
{ locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cd254aabf8c7cf63c83bec1005ef0e9f540eed7c"; }
{ locale = "ta-LK"; arch = "linux-i686"; sha1 = "9944dd6c0cb20bcd8f513c0cdabe62245b0212dc"; }
{ locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "7452f16a96293f871ac9ac99b37f7b855b8e2acf"; }
{ locale = "tr"; arch = "linux-i686"; sha1 = "2036043c9edcaf3e85c2c9b33ae4166d339c3185"; }
{ locale = "tr"; arch = "linux-x86_64"; sha1 = "6b4018c8c4f6f6161f51b1fd629fa5c0ddf452d2"; }
{ locale = "uk"; arch = "linux-i686"; sha1 = "af09c61146d407ab2e6baa3f71ce859a246cb559"; }
{ locale = "uk"; arch = "linux-x86_64"; sha1 = "8b41790e1c6941c1b46c1e06b21c6254fee49c51"; }
{ locale = "vi"; arch = "linux-i686"; sha1 = "fbaee422c7746c10e2537fbc8fdf86d322e49a6c"; }
{ locale = "vi"; arch = "linux-x86_64"; sha1 = "65d5ce60fc3848c46b88c5e7229e25f412e1d5bf"; }
{ locale = "zh-CN"; arch = "linux-i686"; sha1 = "b865c22c6c60d21ba00a60a54a9d03a5c34254cf"; }
{ locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "648dec573c9d0f680be469bad8b38fe6d3550899"; }
{ locale = "zh-TW"; arch = "linux-i686"; sha1 = "b3f58a6053079be6231f843f05daf481c39edf6d"; }
{ locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "bab9d483870909d705fa77bcfb9d8c08966bae50"; }
];
}

3
pkgs/applications/networking/remote/x2goclient/default.nix
View File

@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ cups libssh libXpm nxproxy openldap makeWrapper qt4 ];
buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
substituteInPlace Makefile \

4
pkgs/applications/networking/syncthing/default.nix
View File

@ -4,12 +4,12 @@ with goPackages;
buildGoPackage rec {
name = "syncthing-${version}";
version = "0.11.8";
version = "0.11.9";
goPackagePath = "github.com/syncthing/syncthing";
src = fetchgit {
url = "git://github.com/syncthing/syncthing.git";
rev = "refs/tags/v${version}";
sha256 = "fed98ac47fd84aecee7770dd59e5e68c5bc429d50b361f13b9ea2e28c3be62cf";
sha256 = "353528e152bbfd5075c4f85a54bce507ab3d8855f702a1399a48196bc19d226b";
};
subPackages = [ "cmd/syncthing" ];

61
pkgs/applications/science/logic/saw-tools/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ stdenv, fetchurl, gmp4, ncurses, zlib, makeWrapper, clang_35 }:
let
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.libc
stdenv.cc.cc
gmp4
ncurses
zlib
] + ":${stdenv.cc.cc}/lib64";
url = "https://github.com/GaloisInc/saw-script/releases/download";
saw-bin =
if stdenv.system == "i686-linux"
then fetchurl {
url = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-32.tar.gz";
sha256 = "0hfb3a749fvwn33jnj1bgpk7v4pbvjjjffhafck6s8yz2sknnq4w";
}
else fetchurl {
url = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-64.tar.gz";
sha256 = "1yz56kr8s0jcrfk1i87x63ngxip2i1s123arydnqq8myjyfz8id9";
};
in
stdenv.mkDerivation rec {
name = "saw-tools-${version}";
version = "0.1-20150609";
src = saw-bin;
installPhase = ''
mkdir -p $out/lib $out/share
mv bin $out/bin
mv doc $out/share
# Hack around lack of libtinfo in NixOS
ln -s ${ncurses}/lib/libncursesw.so.5 $out/lib/libtinfo.so.5
ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0
# Add a clang symlink for easy building with a suitable compiler.
ln -s ${clang_35}/bin/clang $out/bin/saw-clang
'';
fixupPhase = ''
for x in bin/bcdump bin/extcore-info bin/jss bin/llvm-disasm bin/lss bin/saw; do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/lib:${libPath}" $out/$x;
done
'';
phases = "unpackPhase installPhase fixupPhase";
meta = {
description = "Tools for software verification and analysis";
homepage = "https://saw.galois.com";
license = stdenv.lib.licenses.unfreeRedistributable;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

4
pkgs/applications/science/math/R/default.nix
View File

@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
name = "R-3.2.0";
name = "R-3.2.1";
src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
sha256 = "0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm";
sha256 = "d59dbc3f04f4604a5cf0fb210b8ea703ef2438b3ee65fd5ab536ec5234f4c982";
};
buildInputs = [ bzip2 gfortran libX11 libXmu libXt

69
pkgs/applications/video/dvd-slideshow/default.nix Normal file
View File

@ -0,0 +1,69 @@
{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbisTools }:
let
wrapper = writeScript "dvd-slideshow.sh" ''
#!/bin/bash
# wrapper script for dvd-slideshow programs
export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbisTools}/bin:$PATH
dir=`dirname "$0"`
exe=`basename "$0"`
case "$exe" in
dvd-slideshow)
# use mpeg2enc by default as ffmpeg is known to crash.
# run dvd-slideshow.ffmpeg to force ffmpeg.
"$dir/dvd-slideshow.real" -mpeg2enc $@
;;
dvd-slideshow.ffmpeg)
"$dir/dvd-slideshow.real" $@
;;
*)
"$dir/$exe.real" $@
;;
esac
'';
in stdenv.mkDerivation rec {
name = "dvd-slideshow";
version = "0.8.4-2";
src = fetchurl {
url = "mirror://sourceforge/dvd-slideshow/files/${name}-${version}.tar.gz";
sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5";
};
patchPhase = ''
# fix upstream typos
substituteInPlace dvd-slideshow \
--replace "version='0.8.4-1'" "version='0.8.4-2'" \
--replace "mymyecho" "myecho"
'';
installPhase = ''
mkdir -p "$out/bin"
cp dvd-slideshow "$out/bin/dvd-slideshow.real"
cp dvd-menu "$out/bin/dvd-menu.real"
cp dir2slideshow "$out/bin/dir2slideshow.real"
cp gallery1-to-slideshow "$out/bin/gallery1-to-slideshow.real"
cp jigl2slideshow "$out/bin/jigl2slideshow.real"
cp ${wrapper} "$out/bin/dvd-slideshow.sh"
ln -s dvd-slideshow.sh "$out/bin/dvd-slideshow"
ln -s dvd-slideshow.sh "$out/bin/dvd-slideshow.ffmpeg"
ln -s dvd-slideshow.sh "$out/bin/dvd-menu"
ln -s dvd-slideshow.sh "$out/bin/dir2slideshow"
ln -s dvd-slideshow.sh "$out/bin/gallery1-to-slideshow"
ln -s dvd-slideshow.sh "$out/bin/jigl2slideshow"
cp -a man "$out/"
'';
meta = {
description = "Suite of command line programs that creates a slideshow-style video from groups of pictures";
homepage = http://dvd-slideshow.sourceforge.net/wiki/Main_Page;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.robbinch ];
};
}

15
pkgs/build-support/fetchurl/mirrors.nix
View File

@ -289,6 +289,21 @@ rec {
ftp://ftp.xemacs.org/sites/metalab.unc.edu/
];
# Bioconductor mirrors (from http://bioconductor.org/about/mirrors)
# The commented-out ones don't seem to allow direct package downloads;
# they serve error messages that result in hash mismatches instead.
bioc = [
# http://bioc.ism.ac.jp/3.2/bioc/
# http://bioc.openanalytics.eu/3.2/bioc/
# http://bioconductor.fmrp.usp.br/3.2/bioc/
# http://mirror.aarnet.edu.au/pub/bioconductor/3.2/bioc/
# http://watson.nci.nih.gov/bioc_mirror/3.2/bioc/
http://bioconductor.jp/packages/3.2/bioc/
http://bioconductor.statistik.tu-dortmund.de/packages/3.2/bioc/
http://mirrors.ebi.ac.uk/bioconductor/packages/3.2/bioc/
http://mirrors.ustc.edu.cn/bioc/3.2/bioc/
];
# CRAN mirrors (from http://cran.r-project.org/mirrors.html)
cran = [
http://cran.r-project.org/

2
pkgs/build-support/make-desktopitem/default.nix
View File

@ -9,7 +9,6 @@
, genericName
, mimeType ? ""
, categories ? "Application;Other;"
, encoding ? "UTF-8"
}:
stdenv.mkDerivation {
@ -27,7 +26,6 @@ stdenv.mkDerivation {
GenericName=${genericName}
MimeType=${mimeType}
Categories=${categories}
Encoding=${encoding}
EOF
'';
}

4
pkgs/desktops/e19/efl.nix
View File

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
version = "1.14.0";
version = "1.14.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
sha256 = "0sb2104b2rayr2ag0n3g8zqds9nxd53mlyvq7650c3cy8hws5a1h";
sha256 = "16rj4qnpw1ya0bsp9a69w6zjmmhzni7vnc0z4wg819jg5k2njzjf";
};
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa

4
pkgs/desktops/e19/elementary.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }:
stdenv.mkDerivation rec {
name = "elementary-${version}";
version = "1.14.0";
version = "1.14.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
sha256 = "03h9sv5c3473wxf7hcimdf80d2phxl81yv0kzngx4g1b6cdwl1ma";
sha256 = "100bfzw6q57dnzcqg4zm0rqpvkk7zykfklnn6kcymv80j43xg0p1";
};
buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];

2
pkgs/development/compilers/llvm/3.6/default.nix
View File

@ -1,6 +1,6 @@
{ pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
let
callPackage = newScope (self // { inherit isl version fetch; });
callPackage = newScope (self // { inherit stdenv isl version fetch; });
version = "3.6.1";

5
pkgs/development/compilers/squeak/default.nix
View File

@ -28,8 +28,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs
pango pkgconfig libpulseaudio which ];
buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs
pango libpulseaudio which ];
nativeBuildInputs = [ cmake pkgconfig ];
postPatch = ''
for i in squeak.in squeak.sh.in; do

7
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -7,8 +7,8 @@ self: super: {
# Some packages need a non-core version of Cabal.
Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0;
cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; });
Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; });
cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
# Break infinite recursions.
@ -132,7 +132,7 @@ self: super: {
sed -i bindings-levmar.cabal \
-e 's,extra-libraries: lapack blas,extra-libraries: openblas,'
'';
extraLibraries = [ pkgs.openblas ];
extraLibraries = [ pkgs.openblasCompat ];
});
# The Haddock phase fails for one reason or another.
@ -303,6 +303,7 @@ self: super: {
users-postgresql-simple = dontCheck super.users-postgresql-simple;
wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1
xkbcommon = dontCheck super.xkbcommon;
xmlgen = dontCheck super.xmlgen;
# These packages try to access the network.

2
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
View File

@ -41,7 +41,7 @@ self: super: {
transformers = self.transformers_0_4_3_0;
# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; };
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; };
# Newer versions don't compile.
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;

2
pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
View File

@ -38,7 +38,7 @@ self: super: {
transformers = self.transformers_0_4_3_0;
# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; };
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; };
# Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });

2
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
View File

@ -40,7 +40,7 @@ self: super: {
xhtml = self.xhtml_3000_2_1;
# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; };
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; };
# Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });

468
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -2144,7 +2144,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"Cabal_1_22_3_0" = callPackage
"Cabal_1_22_4_0" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, directory, extensible-exceptions, filepath, HUnit
, old-time, pretty, process, QuickCheck, regex-posix
@ -2153,8 +2153,8 @@ self: {
}:
mkDerivation {
pname = "Cabal";
version = "1.22.3.0";
sha256 = "15y78hym5yfrchg0lpix80hf41l3c75rda5w1ni8irm593y7il6l";
version = "1.22.4.0";
sha256 = "19nwapy5rvsrk8jc75ql5klp8hikzrwd3c5x07nisl73d2r8ssmr";
buildDepends = [
array base binary bytestring containers deepseq directory filepath
pretty process time unix
@ -5481,6 +5481,18 @@ self: {
license = "GPL";
}) {};
"GiveYouAHead" = callPackage
({ mkDerivation, base, directory, extra, old-time, process }:
mkDerivation {
pname = "GiveYouAHead";
version = "0.2.2.0";
sha256 = "0qq2kiv9rbch4ps9hsxic9ip0c8z92i0v7hq6vc49hmizdj136ch";
buildDepends = [ base directory extra old-time process ];
homepage = "https://github.com/Qinka/GiveYouAHead/";
description = "to auto-do somethings";
license = stdenv.lib.licenses.mit;
}) {};
"Glob" = callPackage
({ mkDerivation, base, containers, directory, dlist, filepath
, transformers
@ -18018,11 +18030,11 @@ self: {
({ mkDerivation, base, c2hs, mtl, openal }:
mkDerivation {
pname = "al";
version = "0.1.3.1";
sha256 = "1p6l64p52d0sznzkig1jczwfqs8wfx22ic40kfpai8icqx357v08";
version = "0.1.3.2";
sha256 = "0hjxcgblzcx4nfckyr7p0lfxr5csx5d96gcrbrmh0fbdddz1nqpc";
buildDepends = [ base mtl ];
buildTools = [ c2hs ];
extraLibraries = [ openal ];
pkgconfigDepends = [ openal ];
homepage = "http://github.com/phaazon/al";
description = "OpenAL 1.1 raw API.";
license = stdenv.lib.licenses.bsd3;
@ -22229,16 +22241,16 @@ self: {
"aws-dynamodb-conduit" = callPackage
({ mkDerivation, aeson, attoparsec-trans, aws, base, bytestring
, conduit, http-conduit, http-types, json-togo, resourcet, text
, transformers
, conduit, containers, http-conduit, http-types, json-togo
, resourcet, text, transformers
}:
mkDerivation {
pname = "aws-dynamodb-conduit";
version = "0.1.0.2";
sha256 = "02q49anmairvjwzvgn8kqx27965n71xbyi86wwlmrs4w0dkbsd41";
version = "0.1.0.5";
sha256 = "1s1dxk0489vnb0v6kr0b74265cc0ih84pm80ajg8111blabx8kgf";
buildDepends = [
aeson attoparsec-trans aws base bytestring conduit http-conduit
http-types json-togo resourcet text transformers
aeson attoparsec-trans aws base bytestring conduit containers
http-conduit http-types json-togo resourcet text transformers
];
homepage = "https://github.com/srijs/haskell-aws-dynamodb-query";
description = "Conduit-based interface for AWS DynamoDB";
@ -25133,8 +25145,8 @@ self: {
}:
mkDerivation {
pname = "bindings-saga-cmd";
version = "0.1.1.0";
sha256 = "1vv3cx3g3zvrg6xb355b98qxxxf621scqbzaaq45dvfzq9kvclwi";
version = "0.1.1.1";
sha256 = "11k56zsz1fg0hb0pqamq2hh3gczzqgj105qss5xrk0cgmsphhbmy";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -25900,13 +25912,14 @@ self: {
}:
mkDerivation {
pname = "bitx-bitcoin";
version = "0.2.0.0";
sha256 = "1n0hp16rpddm74q2rfldga7vpvvsqfn099qdp8qd5pqh8swkmwq8";
version = "0.2.0.1";
sha256 = "0lg6zmyf299gh8921qxm2xxqv8hsz4p2rpslfcsic5k4bqm2nswg";
buildDepends = [
aeson base bytestring http-conduit network record scientific split
text time
];
testDepends = [ aeson base bytestring hspec record time ];
jailbreak = true;
homepage = "https://github.com/tebello-thejane/bitx-haskell";
description = "A Haskell library for working with the BitX bitcoin exchange";
license = stdenv.lib.licenses.publicDomain;
@ -28368,8 +28381,8 @@ self: {
}:
mkDerivation {
pname = "cabal-install";
version = "1.22.4.0";
sha256 = "0qwgs01jd6k03zk67gbydhqkdgsb4wzqylxywz4samkmdilagiw0";
version = "1.22.6.0";
sha256 = "1d5h7h2wjwc2s3dvsvzjgmmfrfl2312ym2h6kyjgm9wnaqw9w8wx";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -30690,14 +30703,13 @@ self: {
({ mkDerivation, array, base, bytestring, cereal, containers
, deepseq, directory, filepath, fullstop, HUnit, mbox, MonadRandom
, parsec, QuickCheck, quickcheck-instances, random-shuffle
, regex-tdfa, regex-tdfa-text, test-framework, test-framework-hunit
, test-framework-quickcheck2, test-framework-skip, text, tokenize
, transformers, zlib
, regex-tdfa, regex-tdfa-text, tasty, tasty-ant-xml, tasty-hunit
, tasty-quickcheck, text, tokenize, transformers, zlib
}:
mkDerivation {
pname = "chatter";
version = "0.5.0.2";
sha256 = "1nbdc4np4hmvnsh1rfpldi2j1wm1klmfm9szi2kz9fa8g8n3kxxl";
version = "0.5.1.0";
sha256 = "014palhzpphwq3q1c211xajl30afr4ac6mjcpvyzqwxdr9ia74c8";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -30708,8 +30720,8 @@ self: {
];
testDepends = [
base cereal containers filepath HUnit parsec QuickCheck
quickcheck-instances test-framework test-framework-hunit
test-framework-quickcheck2 test-framework-skip text tokenize
quickcheck-instances tasty tasty-ant-xml tasty-hunit
tasty-quickcheck text tokenize
];
homepage = "http://github.com/creswick/chatter";
description = "A library of simple NLP algorithms";
@ -32845,8 +32857,8 @@ self: {
}:
mkDerivation {
pname = "codex";
version = "0.3.0.6";
sha256 = "1slgh54kvf01y991pqi51kj6lfq05l5gp8dkhwcya1l9gilfazr4";
version = "0.3.0.8";
sha256 = "1jlrap3qhgnsgdmp0nb2hf3bbjlajp6p4z2q2rl70l93v0v9xi02";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -32855,7 +32867,6 @@ self: {
MissingH monad-loops network process tar text transformers wreq
yaml zlib
];
jailbreak = true;
homepage = "http://github.com/aloiscochard/codex";
description = "A ctags file generator for cabal project dependencies";
license = stdenv.lib.licenses.asl20;
@ -38533,18 +38544,18 @@ self: {
}) {};
"data-easy" = callPackage
({ mkDerivation, base, containers, directory, either, errors
({ mkDerivation, base, containers, directory, errors
, haskell-src-exts, hlint, hspec, HUnit, QuickCheck, safe, text
, transformers, unix
}:
mkDerivation {
pname = "data-easy";
version = "0.5";
sha256 = "1rrq20v1nzkmak1m7x3gpcn262h26y4mcx058g8dp413gvdniypq";
version = "0.6";
sha256 = "1gqc7833lz3n1mqah4mall1m32slz79hifp8381p1qdj2hkirypc";
buildDepends = [ base containers safe ];
testDepends = [
base containers directory either errors haskell-src-exts hlint
hspec HUnit QuickCheck safe text transformers unix
base containers directory errors haskell-src-exts hlint hspec HUnit
QuickCheck safe text transformers unix
];
jailbreak = true;
homepage = "https://github.com/jcristovao/easy-data";
@ -38611,6 +38622,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"data-fin-simple" = callPackage
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "data-fin-simple";
version = "0.1.0.0";
sha256 = "17qj3b3lkrakdk3vbs9nqc2pvqr81n43qxphcznfbkv91k1ygrp6";
buildDepends = [ base ];
testDepends = [ base doctest ];
homepage = "https://github.com/seagull-kamome/data-fin-simple";
description = "Simple integral finite set";
license = stdenv.lib.licenses.bsd3;
}) {};
"data-fix" = callPackage
({ mkDerivation, base }:
mkDerivation {
@ -42203,18 +42227,17 @@ self: {
"distributed-process" = callPackage
({ mkDerivation, base, binary, bytestring, containers
, data-accessor, deepseq, distributed-static, ghc-prim, hashable
, mtl, network-transport, old-locale, random, rank1dynamic, stm
, syb, template-haskell, time, transformers
, mtl, network-transport, random, rank1dynamic, stm, syb
, template-haskell, time, transformers
}:
mkDerivation {
pname = "distributed-process";
version = "0.5.4";
sha256 = "1yx2vspnpa478bn7n82ii6m6x0z43xwbr5995l3mm64sd0nmxp2s";
version = "0.5.5";
sha256 = "0w3jwnfc8ca0sx9mshgbxr61pfbnp82ihy3ca5v1pkwz34dqd3f5";
buildDepends = [
base binary bytestring containers data-accessor deepseq
distributed-static ghc-prim hashable mtl network-transport
old-locale random rank1dynamic stm syb template-haskell time
transformers
distributed-static ghc-prim hashable mtl network-transport random
rank1dynamic stm syb template-haskell time transformers
];
jailbreak = true;
homepage = "http://haskell-distributed.github.com/";
@ -42491,8 +42514,8 @@ self: {
}:
mkDerivation {
pname = "distributed-process-simplelocalnet";
version = "0.2.2.0";
sha256 = "024m5jycz257i34m2x97x3qyg76j1128ww61pql3fqy4mhvp3791";
version = "0.2.3.0";
sha256 = "01871r4cj5zwcv63m95i622h0xxfjnflj33wvpxv1ii5z265rkjy";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -42630,13 +42653,16 @@ self: {
}) {};
"distributed-static" = callPackage
({ mkDerivation, base, binary, bytestring, containers, rank1dynamic
({ mkDerivation, base, binary, bytestring, containers, deepseq
, rank1dynamic
}:
mkDerivation {
pname = "distributed-static";
version = "0.3.1.0";
sha256 = "190b6vjcipgrvnfl72c0ssw8crza02gfw9kwyvwg043jcznihj08";
buildDepends = [ base binary bytestring containers rank1dynamic ];
version = "0.3.2.0";
sha256 = "1zz18lgf39i8anw17qxacb6cicm1kq0yayx9a4inxpnch5xfvg4m";
buildDepends = [
base binary bytestring containers deepseq rank1dynamic
];
homepage = "http://haskell-distributed.github.com";
description = "Compositional, type-safe, polymorphic static values and closures";
license = stdenv.lib.licenses.bsd3;
@ -45705,14 +45731,13 @@ self: {
}:
mkDerivation {
pname = "engine-io";
version = "1.2.6";
sha256 = "1vxbpfldnqrw42vm8c0rqy4b56yig38mca5b83pl79f2z722l3v4";
version = "1.2.7";
sha256 = "0giqsx1wknhp5a1dg72wl48j56h38jzc3pw6w8pfhngpc0spl3gf";
buildDepends = [
aeson async attoparsec base base64-bytestring bytestring either
free monad-loops mwc-random stm stm-delay text transformers
unordered-containers vector websockets
];
jailbreak = true;
homepage = "http://github.com/ocharles/engine.io";
description = "A Haskell implementation of Engine.IO";
license = stdenv.lib.licenses.bsd3;
@ -46309,6 +46334,18 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
"error-list" = callPackage
({ mkDerivation, base, mtl, text, text-render }:
mkDerivation {
pname = "error-list";
version = "0.1.0.2";
sha256 = "1g50wwgs9xxwc03mhch89rcfnj62mpisl8ihw8yy5c3pp0kag2mm";
buildDepends = [ base mtl text text-render ];
homepage = "http://github.com/thinkpad20/error-list";
description = "A useful type for collecting error messages";
license = stdenv.lib.licenses.mit;
}) {};
"error-loc" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@ -52976,8 +53013,8 @@ self: {
({ mkDerivation, base, ghc, ghc-paths }:
mkDerivation {
pname = "ghc-simple";
version = "0.1.2.0";
sha256 = "0cwirw9j52khkl8fsgw22136nb3nwlbiahvfcds8hryvr64x9vql";
version = "0.1.2.1";
sha256 = "0hk3sii5d6mjry28gaipl45c6si82rhdsd43cq130fk9m0xzl9hf";
buildDepends = [ base ghc ghc-paths ];
homepage = "https://github.com/valderman/ghc-simple";
description = "Simplified interface to the GHC API";
@ -53417,23 +53454,23 @@ self: {
, clientsession, conduit, conduit-extra, containers, crypto-api
, cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
, edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
, git, gnupg, gnutls, hamlet, hinotify, hslogger, http-client
, http-conduit, http-types, IfElse, json, lsof, MissingH
, monad-control, monad-logger, mtl, network, network-info
, network-multicast, network-protocol-xmpp, network-uri, openssh
, optparse-applicative, path-pieces, perl, persistent
, persistent-sqlite, persistent-template, process, QuickCheck
, random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
, securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
, tasty-rerun, template-haskell, text, time, torrent, transformers
, unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp
, warp-tls, wget, which, xml-types, yesod, yesod-core
, yesod-default, yesod-form, yesod-static
, git, gnupg, gnutls, hinotify, hslogger, http-client, http-conduit
, http-types, IfElse, json, lsof, MissingH, monad-control
, monad-logger, mtl, network, network-info, network-multicast
, network-protocol-xmpp, network-uri, openssh, optparse-applicative
, path-pieces, perl, persistent, persistent-sqlite
, persistent-template, process, QuickCheck, random, regex-tdfa
, resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
, stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
, template-haskell, text, time, torrent, transformers, unix
, unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls
, wget, which, xml-types, yesod, yesod-core, yesod-default
, yesod-form, yesod-static
}:
mkDerivation {
pname = "git-annex";
version = "5.20150528";
sha256 = "1d7760c3wq0zq9q1zs1y9hjlzjjqcdg88wfi0k5hsmwgiysn2pr2";
version = "5.20150617";
sha256 = "0m4dbzjmjyjpxbplykil1k64mj2lq5xf2yz7dy406248cscc8drd";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -53441,8 +53478,8 @@ self: {
case-insensitive clientsession conduit conduit-extra containers
crypto-api cryptohash data-default DAV dbus directory dlist dns
edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
hamlet hinotify hslogger http-client http-conduit http-types IfElse
json MissingH monad-control monad-logger mtl network network-info
hinotify hslogger http-client http-conduit http-types IfElse json
MissingH monad-control monad-logger mtl network network-info
network-multicast network-protocol-xmpp network-uri
optparse-applicative path-pieces persistent persistent-sqlite
persistent-template process QuickCheck random regex-tdfa resourcet
@ -53758,8 +53795,8 @@ self: {
}:
mkDerivation {
pname = "github-backup";
version = "1.20150106";
sha256 = "0y68ml1pp7w6kpfvr0p0sl8q0qmlfyijmw6pd33m301b3ys3p62p";
version = "1.20150617";
sha256 = "1qg0mksvbnlfpi9dykg5595d6plgxlcbzrbm4al4cm5m6w0d2a73";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -53771,7 +53808,7 @@ self: {
buildTools = [ git ];
homepage = "https://github.com/joeyh/github-backup";
description = "backs up everything github knows about a repository, to the repository";
license = "GPL";
license = stdenv.lib.licenses.gpl3;
}) { inherit (pkgs) git;};
"github-post-receive" = callPackage
@ -56554,6 +56591,19 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
"gyah-bin" = callPackage
({ mkDerivation, base, extra, GiveYouAHead }:
mkDerivation {
pname = "gyah-bin";
version = "0.2.2.0";
sha256 = "16yzkrn5q21nal07jlvzn84maxx94fyrn1lyljd7hazj2lkpcxvw";
isLibrary = false;
isExecutable = true;
buildDepends = [ base extra GiveYouAHead ];
description = "A binary version of GiveYouAHead";
license = stdenv.lib.licenses.mit;
}) {};
"h-booru" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, http-conduit, hxt, mtl, stm, template-haskell, transformers
@ -57662,14 +57712,13 @@ self: {
}:
mkDerivation {
pname = "hackernews";
version = "0.4.0.0";
sha256 = "1avznjavz5f3rrmcy6xbi3nh2knarrjnxlrh7sk82zv5aashvp2h";
version = "0.5.0.0";
sha256 = "1yj8wip52dagmdpziyyjs9hp7k1gdvwl6ynk5hr8c8wxapcj28bs";
buildDepends = [
aeson attoparsec base bytestring either HsOpenSSL http-streams
io-streams text time transformers
];
testDepends = [ base hspec transformers ];
jailbreak = true;
description = "API for Hacker News";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@ -73614,15 +73663,14 @@ self: {
}:
mkDerivation {
pname = "iCalendar";
version = "0.4.0.2";
sha256 = "0a6kj6ih8dpzvld7hjvjp6gcf4f2y81x6bx17z6wgzwdj9fv7jry";
version = "0.4.0.3";
sha256 = "0dbs9s68fpx67ngjnd1p8c9n421bzn6a034dr6i3bhg2cn0s01mw";
buildDepends = [
base base64-bytestring bytestring case-insensitive containers
data-default mime mtl network network-uri old-locale parsec text
time
];
jailbreak = true;
homepage = "http://github.com/tingtun/iCalendar";
homepage = "http://github.com/chrra/iCalendar";
description = "iCalendar data types, parser, and printer";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@ -77827,13 +77875,12 @@ self: {
}:
mkDerivation {
pname = "json-togo";
version = "0.1.0.1";
sha256 = "05g8k8qsxjwqrdwqf24g90hx5jlrwjpa4vsjf0ddrw0whnva3gbz";
version = "0.1.0.3";
sha256 = "0fl71ij0v4gjjvm5d4624x5fm0si75d9baz07c5ck6da24xgbg0l";
buildDepends = [
aeson attoparsec attoparsec-trans base bytestring scientific text
transformers unordered-containers vector
];
jailbreak = true;
homepage = "https://github.com/srijs/haskell-json-togo";
description = "Effectful parsing of JSON documents";
license = stdenv.lib.licenses.mit;
@ -81366,14 +81413,14 @@ self: {
"lens-simple" = callPackage
({ mkDerivation, base, lens-family, lens-family-core
, lens-family-th, transformers
, lens-family-th, mtl, transformers
}:
mkDerivation {
pname = "lens-simple";
version = "0.1.0.5";
sha256 = "1hn2g9xswfn94m5hxi39jpmdaxm51l231cvqn2a62pr8j6b34839";
version = "0.1.0.6";
sha256 = "097zxi3g9ziadiwg4sk96gfjv0jrv4sd3kkpv1hdwjqw1x1dknd3";
buildDepends = [
base lens-family lens-family-core lens-family-th transformers
base lens-family lens-family-core lens-family-th mtl transformers
];
homepage = "https://github.com/michaelt/lens-simple";
description = "simplified import of elementary lens-family combinators";
@ -83985,8 +84032,8 @@ self: {
}:
mkDerivation {
pname = "log";
version = "0.2.1";
sha256 = "0jply63w04pnkfv3s8lpnwvjf43sfhf3mk72p3wva4p28c6mql31";
version = "0.2.2";
sha256 = "05izcd3qwwfwj5kl2k2pzjs8fk14hq10qls3a8m057gg4pd6nw1n";
buildDepends = [
aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
monad-control monad-time mtl old-locale split stm text time
@ -92956,13 +93003,16 @@ self: {
}) {};
"network-transport" = callPackage
({ mkDerivation, base, binary, bytestring, hashable, transformers
({ mkDerivation, base, binary, bytestring, deepseq, hashable
, transformers
}:
mkDerivation {
pname = "network-transport";
version = "0.4.1.0";
sha256 = "0xn879ngrbnm71i1wsbxxiih22sdb6csy6aip6fgqyafqlpc1c93";
buildDepends = [ base binary bytestring hashable transformers ];
version = "0.4.2.0";
sha256 = "0arwy5csrm33217rmnip6b0x61b6am1db6mj5phfysj0pz30viqf";
buildDepends = [
base binary bytestring deepseq hashable transformers
];
homepage = "http://haskell-distributed.github.com";
description = "Network abstraction layer";
license = stdenv.lib.licenses.bsd3;
@ -92998,8 +93048,8 @@ self: {
}:
mkDerivation {
pname = "network-transport-tcp";
version = "0.4.1";
sha256 = "11fj0f2yrvdqn3sivfb4p0chs74bx26a0yc49fh160kkcmk42yaf";
version = "0.4.2";
sha256 = "0wh3d37cfmqbxa0x9c56miki7m9mpg0xv5rrn8fh562lfvcn89ls";
buildDepends = [
base bytestring containers data-accessor network network-transport
];
@ -93415,6 +93465,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"nixfromnpm" = callPackage
({ mkDerivation, aeson, base, bytestring, classy-prelude
, data-default, directory, error-list, filepath, github, hspec
, hspec-expectations, http-client-streams, io-streams, MissingH
, mtl, network-uri, parsec, shelly, simple-nix, system-filepath
, text, text-render, unordered-containers
}:
mkDerivation {
pname = "nixfromnpm";
version = "0.1.0.0";
sha256 = "16m7rish1n8292virv0dgzvxwjhy73blmdpcfwdkmb2qvkvvv93j";
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson base bytestring classy-prelude data-default directory
error-list filepath MissingH mtl network-uri parsec shelly
simple-nix system-filepath text text-render unordered-containers
];
testDepends = [
aeson base bytestring classy-prelude data-default directory
error-list filepath github hspec hspec-expectations
http-client-streams io-streams MissingH mtl network-uri parsec
shelly simple-nix system-filepath text text-render
unordered-containers
];
description = "Generate nix expressions from npm packages";
license = stdenv.lib.licenses.mit;
}) {};
"nixos-types" = callPackage
({ mkDerivation }:
mkDerivation {
@ -93813,8 +93892,8 @@ self: {
}:
mkDerivation {
pname = "notzero";
version = "0.0.1";
sha256 = "1sk7hq3qpfrimgpg4r22lzl749yazv1hka3si4921gg61w4bdx8l";
version = "0.0.7";
sha256 = "1247jhaqlmw720x5j2h6mj677jrg392f4i38zign05ral11xh4xf";
buildDepends = [
base bifunctors lens mtl semigroupoids semigroups transformers
];
@ -97078,8 +97157,8 @@ self: {
}:
mkDerivation {
pname = "path";
version = "0.5.0";
sha256 = "1fk1fpyrmdxym2qnjmlhkgn2kyn5j728hiqw94i8kg47c1xnihkk";
version = "0.5.1";
sha256 = "181dq5r4nslh37yy3hs1k20vd2w9yyp8ccjvxcmq12czfzgzz8bi";
buildDepends = [ base exceptions filepath template-haskell ];
testDepends = [ base hspec HUnit mtl ];
description = "Path";
@ -97210,8 +97289,8 @@ self: {
}:
mkDerivation {
pname = "paypal-adaptive-hoops";
version = "0.11.0.1";
sha256 = "061vzsncyl0is2d3p8sh3a1wb46g2v6vqgdh390b8d41max1wabg";
version = "0.11.0.2";
sha256 = "0z71j79wqxnixadpy47n30nrwhqya6qaadlwvrk9q60vrqvd21rm";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -97222,7 +97301,6 @@ self: {
aeson base bytestring HUnit test-framework test-framework-hunit
text unordered-containers
];
jailbreak = true;
homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
description = "Client for a limited part of PayPal's Adaptive Payments API";
license = stdenv.lib.licenses.mit;
@ -97371,12 +97449,14 @@ self: {
}) {};
"pcg-random" = callPackage
({ mkDerivation, base, doctest, primitive, random, time }:
({ mkDerivation, base, bytestring, doctest, entropy, primitive
, random, time
}:
mkDerivation {
pname = "pcg-random";
version = "0.1.2.0";
sha256 = "1h2ry2p1nnvh3prrl6xz18p3npccrb0p9qzq41lcn10sizfsgpzx";
buildDepends = [ base primitive random time ];
version = "0.1.3.1";
sha256 = "02sx8l51dks316n0df7h75igynb56ms8gs8siczbl5zrlrgycywi";
buildDepends = [ base bytestring entropy primitive random time ];
testDepends = [ base doctest ];
homepage = "http://github.com/cchalmers/pcg-random";
description = "Haskell bindings to the PCG random number generator";
@ -104563,18 +104643,15 @@ self: {
}) {};
"rank1dynamic" = callPackage
({ mkDerivation, base, binary, constraints, ghc-prim, HUnit
, test-framework, test-framework-hunit
({ mkDerivation, base, binary, ghc-prim, HUnit, test-framework
, test-framework-hunit
}:
mkDerivation {
pname = "rank1dynamic";
version = "0.2.0.1";
sha256 = "1np3ghp7wdn0clsyslk5j6fhs4c5cd6y0xlvdg2jj6ydaglzcchl";
version = "0.3.1.0";
sha256 = "0klfwglssp782p1brbfgjm30d2s3lpgd75iv7jq1pih598kkjsd5";
buildDepends = [ base binary ghc-prim ];
testDepends = [
base constraints HUnit test-framework test-framework-hunit
];
jailbreak = true;
testDepends = [ base HUnit test-framework test-framework-hunit ];
homepage = "http://haskell-distributed.github.com";
description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
license = stdenv.lib.licenses.bsd3;
@ -107423,8 +107500,8 @@ self: {
}:
mkDerivation {
pname = "rest-gen";
version = "0.17.0.5";
sha256 = "1pwn1ws6dcwa00y8dblaj7wnr51mv9hjrc05fiv7mzvl0j0v0iz7";
version = "0.17.0.6";
sha256 = "0pkqpycvsdbz2kk6lsq226rkgfrbwh49jky1wcik36yh3s9hfxdq";
buildDepends = [
aeson base blaze-html Cabal code-builder directory fclabels
filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@ -109075,12 +109152,11 @@ self: {
}:
mkDerivation {
pname = "s3-signer";
version = "0.2.0.0";
sha256 = "08n2ip8ba3apgc5x8pq1b0rs9j0ng1d7hkw2jrd307q4q85gngy0";
version = "0.3.0.0";
sha256 = "15647fs38blg37s0407ybxlmzwdhmxz3sk914p21g90i2bw5gsc9";
buildDepends = [
base base64-bytestring cryptohash http-types time utf8-string
];
jailbreak = true;
homepage = "https://github.com/dmjio/s3-signer";
description = "Pre-signed Amazon S3 URLs";
license = stdenv.lib.licenses.bsd3;
@ -111880,8 +111956,8 @@ self: {
}:
mkDerivation {
pname = "serversession";
version = "1.0";
sha256 = "0g56lqcrfhl9mrzqcd0sckyc98friqlfjxl1ws1j2zsc1z153x1a";
version = "1.0.1";
sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz";
buildDepends = [
aeson base base64-bytestring bytestring data-default hashable nonce
path-pieces text time transformers unordered-containers
@ -111902,8 +111978,8 @@ self: {
}:
mkDerivation {
pname = "serversession-backend-acid-state";
version = "1.0";
sha256 = "122mp6vcc89f44vijlncywmbsim76hhhlzw38snnsmsfn0q96ln1";
version = "1.0.1";
sha256 = "1hc5vpy82pxd0wlzabw3md4gvhxbnvs8wsa0wammni2a1pf123a7";
buildDepends = [
acid-state base containers mtl safecopy serversession
unordered-containers
@ -113509,6 +113585,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"simple-nix" = callPackage
({ mkDerivation, base, classy-prelude, error-list, MissingH, mtl
, parsec, system-filepath, text, text-render, unordered-containers
}:
mkDerivation {
pname = "simple-nix";
version = "0.1.0.0";
sha256 = "18bvqc3gkbczgvipsv6rn71vmw8ybbgvyxccm6q5fgniv1knzh0i";
buildDepends = [
base classy-prelude error-list MissingH mtl parsec system-filepath
text text-render unordered-containers
];
homepage = "https://github.com/adnelson/simple-nix";
description = "Simple parsing/pretty printing for Nix expressions";
license = stdenv.lib.licenses.mit;
}) {};
"simple-observer" = callPackage
({ mkDerivation, base }:
mkDerivation {
@ -114568,8 +114661,8 @@ self: {
({ mkDerivation, base, linear, vector }:
mkDerivation {
pname = "smoothie";
version = "0.1.3";
sha256 = "1326hqinlfipbxcynqfsskh4bq5136b48z3kjic8qnddkgkhgg1s";
version = "0.2.1";
sha256 = "07n0qhxhy800nyahfja8qdzk5ygvj4d2l7i2nwh3f3mqy5bp5jyz";
buildDepends = [ base linear vector ];
homepage = "https://github.com/phaazon/smoothie";
description = "Smooth curves via several splines and polynomials";
@ -116091,8 +116184,8 @@ self: {
({ mkDerivation, async, base, bytestring }:
mkDerivation {
pname = "socket";
version = "0.3.0.1";
sha256 = "01fz3lng41i9q4r2wh6nsyx27yc7jbhglzb10lg06d2ll7gxakx0";
version = "0.4.0.1";
sha256 = "0xb5mdx8mxyy1h0kccgkj8qc3qkpi1rn1l0z52rid716yw1lia42";
buildDepends = [ base bytestring ];
testDepends = [ async base bytestring ];
homepage = "https://github.com/lpeterse/haskell-socket";
@ -116734,8 +116827,8 @@ self: {
}:
mkDerivation {
pname = "species";
version = "0.3.4";
sha256 = "1j1bf1l5hg67kagbzwyjw8fnli2axi6ny4zb8fdd1m8zqqrajxr4";
version = "0.3.4.1";
sha256 = "0nn8s43d6r297my3y3m83qv082j2if32c7pyy14c5ll893v16nvw";
buildDepends = [
base containers multiset-comb np-extras numeric-prelude
template-haskell
@ -123470,6 +123563,18 @@ test/package-dump/ghc-7.10.txt";
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"text-render" = callPackage
({ mkDerivation, base, mtl, parsec, text }:
mkDerivation {
pname = "text-render";
version = "0.1.0.1";
sha256 = "1viy7amiy6pz2mcay70r952jham9mnkmf70icfzd25cjzqx1h8wn";
buildDepends = [ base mtl parsec text ];
homepage = "http://github.com/thinkpad20/text-render";
description = "A type class for rendering objects as text, pretty-printing, etc";
license = stdenv.lib.licenses.mit;
}) {};
"text-show" = callPackage
({ mkDerivation, array, base, base-compat, base-orphans, bytestring
, bytestring-builder, ghc-prim, hspec, integer-gmp, nats
@ -125302,26 +125407,25 @@ test/package-dump/ghc-7.10.txt";
}) {};
"tkyprof" = callPackage
({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
, blaze-builder, bytestring, cmdargs, conduit, containers
, data-default, directory, filepath, hamlet, http-types, mtl
, resourcet, rosezipper, shakespeare-css, shakespeare-js, stm
, template-haskell, text, time, transformers, unordered-containers
, vector, wai, wai-extra, warp, web-routes, yesod, yesod-core
, yesod-form, yesod-static
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
, cmdargs, conduit, conduit-extra, containers, data-default
, directory, exceptions, filepath, http-types, mtl, resourcet
, rosezipper, shakespeare, stm, template-haskell, text, time
, transformers, unordered-containers, vector, wai, wai-extra, warp
, web-routes, yesod, yesod-core, yesod-form, yesod-static
}:
mkDerivation {
pname = "tkyprof";
version = "0.2.2";
sha256 = "0c3sdpjs22fqg5nkwig6smggf6snx1y5dg11y3s5cgm1ihy27h75";
version = "0.2.2.2";
sha256 = "1xyy1aagbjyjs9d52jmf7xch0831v7hvsb0mfrxpahvqsdac6h7a";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson attoparsec attoparsec-conduit base blaze-builder bytestring
cmdargs conduit containers data-default directory filepath hamlet
http-types mtl resourcet rosezipper shakespeare-css shakespeare-js
stm template-haskell text time transformers unordered-containers
vector wai wai-extra warp web-routes yesod yesod-core yesod-form
aeson attoparsec base blaze-builder bytestring cmdargs conduit
conduit-extra containers data-default directory exceptions filepath
http-types mtl resourcet rosezipper shakespeare stm
template-haskell text time transformers unordered-containers vector
wai wai-extra warp web-routes yesod yesod-core yesod-form
yesod-static
];
jailbreak = true;
@ -126399,18 +126503,18 @@ test/package-dump/ghc-7.10.txt";
"trurl" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filemanip
, hastache, http-conduit, MissingH, scientific, tar, tasty
, hastache, http-conduit, MissingH, safe, scientific, tar, tasty
, tasty-hunit, text, unordered-containers
}:
mkDerivation {
pname = "trurl";
version = "0.2.2.0";
sha256 = "139c97c63fhgq9lisic5wyfn872j120xsj3i72fs5s0aa9m59w81";
version = "0.3.0.4";
sha256 = "1ync81dhac7m62fq15ciipy2lbrqph2riq1af1z70ah30vyzr415";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson base bytestring directory filemanip hastache http-conduit
MissingH scientific tar text unordered-containers
MissingH safe scientific tar text unordered-containers
];
testDepends = [ base hastache tasty tasty-hunit ];
homepage = "http://github.com/dbushenko/trurl";
@ -129754,16 +129858,19 @@ test/package-dump/ghc-7.10.txt";
"utc" = callPackage
({ mkDerivation, attoparsec, base, bytestring, Cabal, clock
, QuickCheck, test-framework, test-framework-quickcheck2, text
, exceptions, QuickCheck, test-framework
, test-framework-quickcheck2, text
}:
mkDerivation {
pname = "utc";
version = "0.1.0.1";
sha256 = "0fqqnb6rcbkdxz7wf1r6475k7lv6c8hkvak8nydcl0d10j0hqkil";
buildDepends = [ attoparsec base bytestring clock text ];
version = "0.2.0.1";
sha256 = "0vnydjjvv0kh1mww9vb9l90crl9ddd5n63dwpjjs8ln56b5yvv5h";
buildDepends = [
attoparsec base bytestring clock exceptions text
];
testDepends = [
attoparsec base bytestring Cabal clock QuickCheck test-framework
test-framework-quickcheck2 text
attoparsec base bytestring Cabal clock exceptions QuickCheck
test-framework test-framework-quickcheck2 text
];
homepage = "https://github.com/lpeterse/haskell-utc";
description = "A pragmatic time and date library";
@ -133985,6 +134092,24 @@ test/package-dump/ghc-7.10.txt";
license = stdenv.lib.licenses.bsd3;
}) {};
"wlc-hs" = callPackage
({ mkDerivation, base, c2hs, containers, data-default, lens, pretty
, process, transformers, wlc, xkbcommon
}:
mkDerivation {
pname = "wlc-hs";
version = "0.1.0.0";
sha256 = "0z553h86dznsf2wagbfhh8p27aa20jm3wmxkklr51al35xralvv9";
buildDepends = [
base containers data-default lens pretty process transformers
xkbcommon
];
buildTools = [ c2hs ];
extraLibraries = [ wlc ];
description = "Haskell bindings for the wlc library";
license = stdenv.lib.licenses.isc;
}) { wlc = null;};
"wobsurv" = callPackage
({ mkDerivation, aeson, attoparsec, base-prelude, bytestring
, hastache, HTF, http-client, http-types, HUnit, lifted-async
@ -134053,20 +134178,21 @@ test/package-dump/ghc-7.10.txt";
({ mkDerivation, aeson, amazonka, amazonka-s3, amazonka-swf, base
, bytestring, conduit, conduit-extra, cryptohash, exceptions
, fast-logger, http-conduit, lens, monad-control, monad-logger, mtl
, optparse-applicative, safe, shelly, text, transformers
, transformers-base, unordered-containers, uuid, yaml
, mtl-compat, optparse-applicative, safe, shelly, text
, transformers, transformers-base, unordered-containers, uuid, yaml
}:
mkDerivation {
pname = "wolf";
version = "0.1.0";
sha256 = "1b51gb7waxv0i7l3phz0h24n5jpir51b7zycs75kb1wn8qmm8ia3";
version = "0.1.1";
sha256 = "1g98xjl8qpayj8ynz0391cqhfagaxa03hxqaz2wvyppalqdp44k9";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson amazonka amazonka-s3 amazonka-swf base bytestring conduit
conduit-extra cryptohash exceptions fast-logger http-conduit lens
monad-control monad-logger mtl optparse-applicative safe shelly
text transformers transformers-base unordered-containers uuid yaml
monad-control monad-logger mtl mtl-compat optparse-applicative safe
shelly text transformers transformers-base unordered-containers
uuid yaml
];
jailbreak = true;
homepage = "https://github.com/swift-nav/wolf";
@ -135168,8 +135294,8 @@ test/package-dump/ghc-7.10.txt";
"xkbcommon" = callPackage
({ mkDerivation, base, bytestring, cpphs, data-flags, filepath
, process, storable-record, template-haskell, text, transformers
, unix, xkbcommon
, libxkbcommon, process, storable-record, template-haskell, text
, transformers, unix
}:
mkDerivation {
pname = "xkbcommon";
@ -135180,11 +135306,10 @@ test/package-dump/ghc-7.10.txt";
template-haskell text transformers
];
testDepends = [ base unix ];
extraLibraries = [ xkbcommon ];
extraLibraries = [ libxkbcommon ];
description = "Haskell bindings for libxkbcommon";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) { xkbcommon = null;};
}) { inherit (pkgs) libxkbcommon;};
"xkcd" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, HTTP
@ -136015,6 +136140,23 @@ test/package-dump/ghc-7.10.txt";
license = stdenv.lib.licenses.bsd3;
}) {};
"xmonad-windownames" = callPackage
({ mkDerivation, base, containers, utf8-string, xmonad
, xmonad-contrib
}:
mkDerivation {
pname = "xmonad-windownames";
version = "0.1.0.0";
sha256 = "1w1f0v81dnbxkmavk5d3hbnanx24yzrqacg4m8j4w36k041w7zn9";
buildDepends = [
base containers utf8-string xmonad xmonad-contrib
];
jailbreak = true;
homepage = "https://github.com/plindbe2/xmonad-windownames";
description = "A library to automatically put named windows into the DynamicLog";
license = stdenv.lib.licenses.bsd3;
}) {};
"xmpipe" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, handle-like
, monads-tf, sasl, simple-pipe, uuid, xml-pipe
@ -138075,8 +138217,8 @@ test/package-dump/ghc-7.10.txt";
}:
mkDerivation {
pname = "yesod-table";
version = "0.1.2";
sha256 = "1415y7q45s65cklqyrvcgsqi6v07p698024d5wfghcjnv9qylwmi";
version = "0.1.3";
sha256 = "1phbjcry1drl98ivv7yjqvwcray134zh9xqj37p1p7ki1850id3p";
buildDepends = [ base containers contravariant text yesod-core ];
homepage = "https://github.com/andrewthad/yesod-table";
description = "HTML tables for Yesod";

20
pkgs/development/interpreters/erlang/R17.nix
View File

@ -1,11 +1,15 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper
, odbcSupport ? false, unixODBC ? null
, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null
, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null
, javacSupport ? false, openjdk ? null
, enableHipe ? true}:
, enableHipe ? true
}:
assert wxSupport -> (if stdenv.isDarwin
then wxmac != null
else mesa != null && wxGTK != null && xlibs != null);
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk != null;
@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ perl gnum4 ncurses openssl makeWrapper
] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]
] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ])
++ optional odbcSupport [ unixODBC ]
++ optional javacSupport [ openjdk ];
@ -34,7 +38,13 @@ stdenv.mkDerivation rec {
sed -e s@/bin/pwd@pwd@g -i otp_build
'';
configureFlags= "--with-ssl=${openssl} ${optionalString enableHipe "--enable-hipe"} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"} ${optionalString javacSupport "--with-javac"}";
configureFlags= [
"--with-ssl=${openssl}"
] ++ optional enableHipe "--enable-hipe"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"
++ optional javacSupport "--with-javac"
++ optional stdenv.isDarwin "--enable-darwin-64bit";
postInstall = let
manpages = fetchurl {

11
pkgs/development/interpreters/perl/5.16/default.nix
View File

@ -24,6 +24,17 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.isSunOS ./ld-shared.patch
++ lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
# There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
# in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
# while at the same time erasing the PATH environment variable so it unconditionally
# fails. The code in question is guarded by a check for Mac OS, but the patch below
# doesn't have any runtime effect on other platforms.
postPatch = ''
pwd="$(type -P pwd)"
substituteInPlace dist/Cwd/Cwd.pm \
--replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"
'';
# Build a thread-safe Perl with a dynamic libperls.o. We need the
# "installstyle" option to ensure that modules are put under
# $out/lib/perl5 - this is the general default, but because $out

11
pkgs/development/interpreters/perl/5.20/default.nix
View File

@ -37,6 +37,17 @@ stdenv.mkDerivation rec {
++ optional stdenv.isSunOS ./ld-shared.patch
++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
# There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
# in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
# while at the same time erasing the PATH environment variable so it unconditionally
# fails. The code in question is guarded by a check for Mac OS, but the patch below
# doesn't have any runtime effect on other platforms.
postPatch = ''
pwd="$(type -P pwd)"
substituteInPlace dist/PathTools/Cwd.pm \
--replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"
'';
# Build a thread-safe Perl with a dynamic libperls.o. We need the
# "installstyle" option to ensure that modules are put under
# $out/lib/perl5 - this is the general default, but because $out

4
pkgs/development/interpreters/python/2.7/default.nix
View File

@ -64,6 +64,8 @@ let
for i in Lib/plat-*/regen; do
substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
done
'' + optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
'';
configureFlags = [
@ -74,6 +76,8 @@ let
"--with-system-ffi"
"--with-system-expat"
"ac_cv_func_bind_textdomain_codeset=yes"
] ++ optionals stdenv.isDarwin [
"--disable-toolbox-glue"
];
postConfigure = if stdenv.isCygwin then ''

4
pkgs/development/libraries/bobcat/default.nix
View File

@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ gcc49 icmake libmilter libX11 openssl readline utillinux
yodl ];
buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ];
nativeBuildInputs = [ icmake yodl ];
postPatch = ''
substituteInPlace INSTALL.im --replace /usr $out

50
pkgs/development/libraries/fmod/4.24.16.nix Normal file
View File

@ -0,0 +1,50 @@
{ stdenv, fetchurl }:
assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
let
bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc}/lib64";
patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
src =
(if (bits == "64") then
fetchurl {
url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux64.tar.gz";
sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y";
}
else
fetchurl {
url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux.tar.gz";
sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5";
}
);
in
stdenv.mkDerivation rec {
inherit src;
name = "fmod-${version}";
version = "4.24.16";
dontStrip = true;
buildPhase = "true";
installPhase = ''
mkdir -p $out/lib $out/include/fmodex
cd api/inc && cp * $out/include/fmodex && cd ../lib
cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so
cp libfmodex${bits}L-${version}.so $out/lib/libfmodexL.so
${patchLib "$out/lib/libfmodex.so"}
${patchLib "$out/lib/libfmodexL.so"}
'';
meta = {
description = "Programming library and toolkit for the creation and playback of interactive audio";
homepage = "http://www.fmod.org/";
license = stdenv.lib.licenses.unfreeRedistributable;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.lassulus ];
};
}

7
pkgs/development/libraries/gettext/default.nix
View File

@ -19,7 +19,12 @@ stdenv.mkDerivation (rec {
"--with-included-gettext"
"--with-included-glib"
"--with-included-libcroco"
]);
])
# avoid retaining reference to CF during stdenv bootstrap
++ (stdenv.lib.optionals stdenv.isDarwin [
"gt_cv_func_CFPreferencesCopyAppValue=no"
"gt_cv_func_CFLocaleCopyCurrent=no"
]);
# On cross building, gettext supposes that the wchar.h from libc
# does not fulfill gettext needs, so it tries to work with its

4
pkgs/development/libraries/gnutls/3.4.nix
View File

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.4.1";
version = "3.4.2";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
sha256 = "06wiwsydfpy5fn86ip4x2s507483l4y847kr1p2chgjw0wqc8vjy";
sha256 = "1wzasbrs4ncq4yisqyvifl7mzlyyg1pb0idr4fhjmcfpi13sxlaw";
};
})

5
pkgs/development/libraries/icu/default.nix
View File

@ -32,6 +32,11 @@ stdenv.mkDerivation {
configureFlags = "--disable-debug" +
stdenv.lib.optionalString stdenv.isDarwin " --enable-rpath";
# remove dependency on bootstrap-tools in early stdenv build
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {

1
pkgs/development/libraries/libebur128/default.nix
View File

@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
description = "Implementation of the EBU R128 loudness standard";
homepage = https://github.com/jiixyj/libebur128;
license = licenses.mit;
maintainers = [ maintainers.andrewrk ];
};
}

2
pkgs/development/libraries/libedit/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
] else null;
postInstall = ''
sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
'';
configureFlags = [ "--enable-widec" ];

1
pkgs/development/libraries/libgroove/default.nix
View File

@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/andrewrk/libgroove;
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.andrewrk ];
};
}

3
pkgs/development/libraries/libnetfilter_conntrack/default.nix
View File

@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r";
};
buildInputs = [ pkgconfig libmnl ];
buildInputs = [ libmnl ];
propagatedBuildInputs = [ libnfnetlink ];
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {
description = "Userspace library providing an API to the in-kernel connection tracking state table";

3
pkgs/development/libraries/libpsl/default.nix
View File

@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ autoreconfHook icu libxslt pkgconfig ];
buildInputs = [ icu libxslt ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
configureFlags = "--disable-static --enable-man";

2
pkgs/development/libraries/libuv/default.nix
View File

@ -105,5 +105,5 @@ in
//
mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
v1_5_0 = "1j0871mxw97680ghlqy0dpyfmr26kqa0lk26a2bgcqf4ghqap24x";
v1_6_1 = "10w9pjbmqcv03v04rnjd8mdh886j7v4y0svdsdklz69zskgdvvqg";
}

3
pkgs/development/libraries/libxcomp/default.nix
View File

@ -17,7 +17,8 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ];
buildInputs = [ libjpeg libpng12 libX11 zlib ];
nativeBuildInputs = [ autoreconfHook ];
preAutoreconf = ''
cd nxcomp/

11
pkgs/development/libraries/openldap/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, openssl, cyrus_sasl, db, groff}:
{ stdenv, fetchurl, autoconf, openssl, cyrus_sasl, db, groff }:
stdenv.mkDerivation rec {
name = "openldap-2.4.40";
@ -8,8 +8,17 @@ stdenv.mkDerivation rec {
sha256 = "1nyslrgwxwilgv5sixc37svls5rbvhsv9drb7hlrjr2vqaji29ni";
};
# Last tested for openldap 2.4.40
patches = [ ./fix-libdb-detection-gcc5.patch ];
nativeBuildInputs = [ autoconf ];
buildInputs = [ openssl cyrus_sasl db groff ];
# NOTE: Only needed for the gcc5 patch
preConfigure = ''
autoconf
'';
configureFlags =
[ "--enable-overlays"
"--disable-dependency-tracking" # speeds up one-time build

43
pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch Normal file
View File

@ -0,0 +1,43 @@
From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Wed, 11 Feb 2015 10:32:28 +0100
Subject: [PATCH] fix libdb detection with gcc 5
The old cpp version generated:
__db_version 5
The new output:
__db_version
5
Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
Behavior with older versions of gcc is not changed.
---
build/openldap.m4 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/openldap.m4 b/build/openldap.m4
index caf8fc2..bdcb4d6 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
#endif
__db_version DB_VERSION_MAJOR
])
- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
ol_cv_bdb_major=${3}
])
case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
#endif
__db_version DB_VERSION_MINOR
])
- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
ol_cv_bdb_minor=${3}
])
case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
--
2.1.0

16
pkgs/development/libraries/proj/default.nix
View File

@ -1,26 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "proj-4.8.0";
name = "proj-4.9.1";
src = fetchurl {
url = http://download.osgeo.org/proj/proj-4.8.0.tar.gz;
sha256 = "1dfim63ks298204lv2z0v16njz6fs7bf0m4icy09i3ffzvqdpcid";
url = http://download.osgeo.org/proj/proj-4.9.1.tar.gz;
sha256 = "06f36s7yi6yky92g235kj9wkcckm04qgzxnj0fla3icb7y7ki87w";
};
postConfigure = ''
patch src/Makefile <<EOF
272c272
< include_HEADERS = proj_api.h org_proj4_Projections.h
---
> include_HEADERS = proj_api.h org_proj4_Projections.h projects.h
EOF
'';
meta = with stdenv.lib; {
description = "Cartographic Projections Library";
homepage = http://trac.osgeo.org/proj/;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ vbgl ];
};
}

33
pkgs/development/libraries/sqlite-amalgamation/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation {
name = "sqlite-amalgamation-201505302257";
src = fetchurl {
url = "https://www.sqlite.org/snapshot/sqlite-amalgamation-201505302257.zip";
sha256 = "0488wjrpnxd61g7pcka6fckx0q8yl1k26i6q5hrmkm92qcpml76h";
};
phases = [ "unpackPhase" "buildPhase" ];
buildInputs = [ unzip ];
unpackPhase = ''
unzip $src
'';
buildPhase = ''
mkdir -p $out
cp sqlite3.c $out/
cp sqlite3.h $out/
cp sqlite3ext.h $out/
cp shell.c $out/
'';
meta = {
homepage = http://www.sqlite.org/;
description = "A single C code file, named sqlite3.c, that contains all C code for the core SQLite library and the FTS3 and RTREE extensions";
platforms = stdenv.lib.platforms.unix;
maintainers = [ lib.maintainers.lassulus ];
};
}

55
pkgs/development/libraries/wxmac/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ stdenv, fetchurl, setfile, rez, derez,
expat, libiconv, libjpeg, libpng, libtiff, zlib
}:
with stdenv.lib;
stdenv.mkDerivation rec {
version = "3.0.2";
name = "wxmac-${version}";
src = fetchurl {
url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d";
};
patches = [ ./wx.patch ];
buildInputs = [ setfile rez derez expat libiconv libjpeg libpng libtiff zlib ];
configureFlags = [
"--enable-unicode"
"--with-osx_cocoa"
"--enable-std_string"
"--enable-display"
"--with-opengl"
"--with-libjpeg"
"--with-libtiff"
"--without-liblzma"
"--with-libpng"
"--with-zlib"
"--enable-dnd"
"--enable-clipboard"
"--enable-webkit"
"--enable-svg"
"--enable-graphics_ctx"
"--enable-controls"
"--enable-dataviewctrl"
"--with-expat"
"--disable-precomp-headers"
"--disable-mediactrl"
];
checkPhase = ''
./wx-config --libs
'';
doCheck = true;
enableParallelBuilding = true;
meta = {
platforms = platforms.darwin;
maintainers = [ maintainers.lnl7 ];
};
}

59
pkgs/development/libraries/wxmac/wx.patch Normal file
View File

@ -0,0 +1,59 @@
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 397ddd7..d128083 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -3169,12 +3169,20 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
+DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
typedef WX_UIWindow WXWindow;
typedef WX_UIView WXWidget;
typedef WX_EAGLContext WXGLContext;
typedef WX_NSString* WXGLPixelFormat;
+typedef WX_UIWebView OSXWebViewPtr;
+
+#endif
+
+#if wxOSX_USE_COCOA_OR_CARBON
+DECLARE_WXCOCOA_OBJC_CLASS(WebView);
+typedef WX_WebView OSXWebViewPtr;
#endif
#endif /* __WXMAC__ */
diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 8700367..f805099 100644
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -18,7 +18,6 @@
#endif
#include "wx/control.h"
-DECLARE_WXCOCOA_OBJC_CLASS(WebView);
// ----------------------------------------------------------------------------
// Web Kit Control
@@ -107,7 +106,7 @@ private:
wxString m_currentURL;
wxString m_pageTitle;
- WX_WebView m_webView;
+ OSXWebViewPtr m_webView;
// we may use this later to setup our own mouse events,
// so leave it in for now.
diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 803f8b0..438e532 100644
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -158,7 +158,7 @@ private:
wxWindowID m_windowID;
wxString m_pageTitle;
- wxObjCID m_webView;
+ OSXWebViewPtr m_webView;
// we may use this later to setup our own mouse events,
// so leave it in for now.

7
pkgs/development/libraries/zlib/default.nix
View File

@ -13,6 +13,13 @@ stdenv.mkDerivation (rec {
sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n";
};
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure \
--replace '/usr/bin/libtool' 'ar' \
--replace 'AR="libtool"' 'AR="ar"' \
--replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
'';
configureFlags = if static then "" else "--shared";
preConfigure = ''

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

@ -5,11 +5,11 @@ let
in
stdenv.mkDerivation {
name = "menhir-20130116";
name = "menhir-20140422";
src = fetchurl {
url = http://pauillac.inria.fr/~fpottier/menhir/menhir-20130116.tar.gz;
sha256 = "65cd9e4f813c62697c60c344963ca11bd461169f574ba3a866c2691541cb4682";
url = http://pauillac.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz;
sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d";
};
buildInputs = [ocaml findlib];

1043
pkgs/development/r-modules/bioc-packages.nix Normal file
View File

File diff suppressed because it is too large Load Diff

5148
pkgs/development/r-modules/cran-packages.nix
View File

File diff suppressed because it is too large Load Diff

1720
pkgs/development/r-modules/default.nix
View File

File diff suppressed because it is too large Load Diff

50
pkgs/development/r-modules/generate-cran-packages.R
View File

@ -1,50 +0,0 @@
#!/usr/bin/env Rscript
library(data.table)
library(parallel)
cl <- makeCluster(10)
options(repos=structure(c(CRAN="http://cran.rstudio.com/")))
readFormatted <- as.data.table(read.table(skip=6, sep='"', text=head(readLines('cran-packages.nix'), -1)))
nixPrefetch <- function(name, version) {
prevV <- readFormatted$V2 == name & readFormatted$V4 == version
if (sum(prevV) == 1) as.character(readFormatted$V6[ prevV ]) else
system(paste0("nix-prefetch-url --type sha256 http://cran.rstudio.com/src/contrib/", name, "_", version, ".tar.gz"), intern=TRUE)
# system(paste0("nix-hash --flat --base32 --type sha256 /nix/store/*", name, "_", version, ".tar.gz", "| head -n 1"), intern=TRUE)
}
formatPackage <- function(name, version, sha256, depends, imports, linkingTo, knownPackages) {
attr <- gsub(".", "_", name, fixed=TRUE)
if (is.na(depends)) depends <- "";
depends <- unlist(strsplit(depends, split="[ \t\n]*,[ \t\n]*", fixed=FALSE))
depends <- c(depends, unlist(strsplit(imports, split="[ \t\n]*,[ \t\n]*", fixed=FALSE)))
depends <- c(depends, unlist(strsplit(linkingTo, split="[ \t\n]*,[ \t\n]*", fixed=FALSE)))
depends <- sapply(depends, gsub, pattern="([^ \t\n(]+).*", replacement="\\1")
depends <- depends[depends %in% knownPackages]
depends <- sapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE)
depends <- paste(depends, collapse=" ")
paste0(attr, " = derive { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };")
}
clusterExport(cl, c("nixPrefetch","readFormatted"))
pkgs <- as.data.table(available.packages(filters=c("R_version", "OS_type", "CRAN", "duplicates")))
pkgs <- subset(pkgs, Repository=="http://cran.rstudio.com/src/contrib")
pkgs <- pkgs[order(Package)]
pkgs$sha256 <- parApply(cl, pkgs, 1, function(p) nixPrefetch(p[1], p[2]))
knownPackages <- unique(pkgs$Package)
nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], p[6], knownPackages))
cat("# This file is generated from generate-cran-packages.R. DO NOT EDIT.\n")
cat("# Execute the following command to update the file.\n")
cat("#\n")
cat("# Rscript generate-cran-packages.R > cran-packages.nix\n")
cat("\n")
cat("{ self, derive }: with self; {\n")
cat(paste(nix, collapse="\n"), "\n")
cat("}\n")
stopCluster(cl)

61
pkgs/development/r-modules/generate-r-packages.R Executable file
View File

@ -0,0 +1,61 @@
#!/usr/bin/env Rscript
library(data.table)
library(parallel)
cl <- makeCluster(10)
mirrorType <- commandArgs(trailingOnly=TRUE)[1]
stopifnot(mirrorType %in% c("bioc","cran"))
packagesFile <- paste(mirrorType, 'packages.nix', sep='-')
readFormatted <- as.data.table(read.table(skip=6, sep='"', text=head(readLines(packagesFile), -1)))
mirrorUrls <- list( bioc="http://bioconductor.statistik.tu-dortmund.de/packages/3.2/bioc/src/contrib/"
, cran="http://cran.r-project.org/src/contrib/"
)
mirrorUrl <- mirrorUrls[mirrorType][[1]]
knownPackages <- lapply(mirrorUrls, function(url) as.data.table(available.packages(url, filters=c("R_version", "OS_type", "duplicates"))))
pkgs <- knownPackages[mirrorType][[1]]
setkey(pkgs, Package)
knownPackages <- c(unique(do.call("rbind", knownPackages)$Package))
knownPackages <- sapply(knownPackages, gsub, pattern=".", replacement="_", fixed=TRUE)
nixPrefetch <- function(name, version) {
prevV <- readFormatted$V2 == name & readFormatted$V4 == version
if (sum(prevV) == 1) as.character(readFormatted$V6[ prevV ]) else
system(paste0("nix-prefetch-url --type sha256 ", mirrorUrl, name, "_", version, ".tar.gz"), intern=TRUE)
}
formatPackage <- function(name, version, sha256, depends, imports, linkingTo) {
attr <- gsub(".", "_", name, fixed=TRUE)
depends <- paste( if (is.na(depends)) "" else gsub("[ \t\n]+", "", depends)
, if (is.na(imports)) "" else gsub("[ \t\n]+", "", imports)
, if (is.na(linkingTo)) "" else gsub("[ \t\n]+", "", linkingTo)
, sep=","
)
depends <- unlist(strsplit(depends, split=",", fixed=TRUE))
depends <- sapply(depends, gsub, pattern="([^ \t\n(]+).*", replacement="\\1")
depends <- sapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE)
depends <- depends[depends %in% knownPackages]
depends <- paste(sort(unique(depends)), collapse=" ")
paste0(attr, " = derive { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };")
}
clusterExport(cl, c("nixPrefetch","readFormatted", "mirrorUrl", "knownPackages"))
pkgs <- as.data.table(available.packages(mirrorUrl, filters=c("R_version", "OS_type", "duplicates")))
pkgs <- pkgs[order(Package)]
pkgs$sha256 <- parApply(cl, pkgs, 1, function(p) nixPrefetch(p[1], p[2]))
nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], p[6]))
cat("# This file is generated from generate-r-packages.R. DO NOT EDIT.\n")
cat("# Execute the following command to update the file.\n")
cat("#\n")
cat(paste("# Rscript generate-r-packages.R", mirrorType, ">new && mv new", packagesFile))
cat("\n\n")
cat("{ self, derive }: with self; {\n")
cat(paste(nix, collapse="\n"), "\n")
cat("}\n")
stopCluster(cl)

21
pkgs/development/r-modules/test-evaluation.nix Normal file
View File

@ -0,0 +1,21 @@
# Run
#
# nix-build test-evaluation.nix --dry-run
#
# to test whether the R package set evaluates properly.
let
config = {
allowBroken = true;
allowUnfree = true;
};
inherit (import ../../.. { inherit config; }) pkgs;
rWrapper = pkgs.rWrapper.override {
packages = pkgs.lib.filter pkgs.lib.isDerivation (pkgs.lib.attrValues pkgs.rPackages);
};
in
rWrapper

2
pkgs/development/tools/analysis/coan/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
};
buildInputs = [ perl ];
nativeBuildInputs = [ perl ];
enableParallelBuilding = true;

2
pkgs/development/tools/analysis/frama-c/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
sha256 = "0wackacnnpxnh3612ld68bal8b1dm9cdsi180lw42bsyks03h5mn";
sha256 = "0zask160vj8bxgc07dzxj5hqbdp6gz5g00j6za5397961imxhxaq";
};
why2 = fetchurl {

33
pkgs/development/tools/analysis/infer/default.nix
View File

@ -1,33 +0,0 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
name = "infer-${version}";
version = "0.1.0";
src = fetchurl {
url = "https://github.com/facebook/infer/releases/download/v${version}/infer-linux64-v${version}.tar.xz";
sha256 = "1kppiayzqwmm13aq8x1jxd3j4jywh3h37jxrgyipz8li1ddpdq3m";
};
buildInputs = [ python ];
buildPhase = "true";
installPhase = ''
mkdir -p $out/libexec $out/bin;
cp -R facebook-clang-plugin $out/libexec
cp -R infer $out/libexec
for x in `ls $out/libexec/infer/infer/bin`; do
ln -s $out/libexec/infer/infer/bin/$x $out/bin/$x;
done
'';
fixupPhase = ''
patchShebangs $out
'';
meta = {
description = "Scalable static analyzer for Java, C and Objective-C";
homepage = http://fbinfer.com;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/development/tools/misc/binutils/default.nix
View File

@ -2,8 +2,6 @@
, cross ? null, gold ? true, bison ? null
}:
assert !stdenv.isDarwin;
let basename = "binutils-2.23.1"; in
with { inherit (stdenv.lib) optional optionals optionalString; };
@ -56,7 +54,9 @@ stdenv.mkDerivation rec {
# As binutils takes part in the stdenv building, we don't want references
# to the bootstrap-tools libgcc (as uses to happen on arm/mips)
NIX_CFLAGS_COMPILE = "-static-libgcc";
NIX_CFLAGS_COMPILE = if stdenv.isDarwin
then "-Wno-string-plus-int -Wno-deprecated-declarations"
else "-static-libgcc";
configureFlags =
[ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]

3
pkgs/development/tools/parsing/flexc++/default.nix
View File

@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ bobcat gcc49 icmake yodl ];
buildInputs = [ bobcat gcc49 ];
nativeBuildInputs = [ icmake yodl ];
postPatch = ''
substituteInPlace INSTALL.im --replace /usr $out

3
pkgs/games/eduke32/default.nix
View File

@ -13,8 +13,9 @@ in stdenv.mkDerivation rec {
sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v";
};
buildInputs = [ flac gtk libvorbis libvpx mesa pkgconfig SDL2 SDL2_mixer ]
buildInputs = [ flac gtk libvorbis libvpx mesa SDL2 SDL2_mixer ]
++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
nativeBuildInputs = [ pkgconfig ];
postPatch = ''
substituteInPlace build/src/glbuild.c \

82
pkgs/games/zandronum/bin.nix Normal file
View File

@ -0,0 +1,82 @@
{ stdenv
, atk
, bzip2
, cairo
, fetchurl
, fontconfig
, freetype
, gdk_pixbuf
, glib
, gtk
, libjpeg_turbo
, mesa_glu
, mesa_noglu
, openssl
, pango
, SDL
, zlib
}:
stdenv.mkDerivation rec {
name = "zandronum-2.0";
src = fetchurl {
url = "http://zandronum.com/downloads/zandronum2.0-linux-x86_64.tar.bz2";
sha256 = "1k49az7x0ig40r2xisscpyhfcx9zzivx8w1l1ispj58g6qivicgc";
};
libPath = stdenv.lib.makeLibraryPath [
atk
bzip2
cairo
fontconfig
freetype
gdk_pixbuf
glib
gtk
libjpeg_turbo
mesa_glu
mesa_noglu
openssl
pango
SDL
stdenv.cc.cc
zlib
];
phases = [ "unpackPhase" "installPhase" ];
unpackPhase = ''
tar xf $src
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share
cp * $out/share
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/share/zandronum
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/share/zandronum-server
cat > $out/bin/zandronum << EOF
#!/bin/sh
LD_LIBRARY_PATH=$libPath:$out/share $out/share/zandronum "\$@"
EOF
cat > $out/bin/zandronum-server << EOF
#!/bin/sh
LD_LIBRARY_PATH=$libPath:$out/share $out/share/zandronum-server "\$@"
EOF
chmod +x "$out/bin/zandronum"
chmod +x "$out/bin/zandronum-server"
'';
meta = {
homepage = http://zandronum.com/;
description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play.";
maintainer = [ stdenv.lib.maintainers.lassulus ];
};
}

43
pkgs/games/zandronum/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchhg, cmake, SDL, mesa, fmod42416, openssl, sqlite, sqlite-amalgamation }:
stdenv.mkDerivation {
name = "zandronum-2.0";
src = fetchhg {
url = "https://bitbucket.org/Torr_Samaho/zandronum";
rev = "2fc02c0";
sha256 = "1syzy0iphm6jj5wag3xyr2fx7vyg2cjcmijhvgw2rc67rww85pv2";
};
phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
buildInputs = [ cmake SDL mesa fmod42416 openssl sqlite sqlite-amalgamation ];
preConfigure = ''
cp ${sqlite-amalgamation}/* sqlite/
'';
cmakeFlags = [
"-DFMOD_LIBRARY=${fmod42416}/lib/libfmodex.so"
];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share
cp zandronum zandronum.pk3 skulltag_actors.pk3 liboutput_sdl.so $out/share
cat > $out/bin/zandronum << EOF
#!/bin/sh
LD_LIBRARY_PATH=$out/share $out/share/zandronum "\$@"
EOF
chmod +x "$out/bin/zandronum"
'';
meta = {
homepage = http://zandronum.com/;
description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software.";
maintainer = [ stdenv.lib.maintainers.lassulus ];
};
}

44
pkgs/games/zandronum/server.nix Normal file
View File

@ -0,0 +1,44 @@
{ stdenv, fetchhg, cmake, openssl, sqlite, sqlite-amalgamation, SDL }:
stdenv.mkDerivation {
name = "zandronum-server-2.0";
src = fetchhg {
url = "https://bitbucket.org/Torr_Samaho/zandronum";
rev = "2fc02c0";
sha256 = "1syzy0iphm6jj5wag3xyr2fx7vyg2cjcmijhvgw2rc67rww85pv2";
};
phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
buildInputs = [ cmake openssl sqlite sqlite-amalgamation SDL ];
preConfigure = ''
cp ${sqlite-amalgamation}/* sqlite/
'';
cmakeFlags = [
"-DSERVERONLY=ON"
];
installPhase = ''
find
mkdir -p $out/bin
mkdir -p $out/share
cp zandronum-server zandronum.pk3 skulltag_actors.pk3 $out/share
cat > $out/bin/zandronum-server << EOF
#!/bin/sh
LD_LIBRARY_PATH=$out/share $out/share/zandronum-server "\$@"
EOF
chmod +x "$out/bin/zandronum-server"
'';
meta = {
homepage = http://zandronum.com/;
description = "Server of the multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
maintainer = [ stdenv.lib.maintainers.lassulus ];
};
}

4
pkgs/misc/drivers/hplip/default.nix
View File

@ -139,9 +139,11 @@ stdenv.mkDerivation {
pythonPackages.wrapPython
saneBackends
dbus
pkgconfig
net_snmp
] ++ stdenv.lib.optional qtSupport qt4;
nativeBuildInputs = [
pkgconfig
];
pythonPath = with pythonPackages; [
dbus

59
pkgs/misc/emulators/vbam/default.nix Normal file
View File

@ -0,0 +1,59 @@
{ stdenv
, cairo
, cmake
, fetchsvn
, ffmpeg
, gettext
, libpng
, libpthreadstubs
, libXdmcp
, libxshmfence
, mesa
, openal
, pkgconfig
, SDL
, wxGTK
, zip
, zlib
}:
stdenv.mkDerivation {
name = "VBAM-1507";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/vbam/code/trunk";
rev = 1507;
sha256 = "0fqvgi5s0sacqr9yi7kv1klqlvfzr13sjq5ikipirz0jv50kjxa7";
};
buildInputs = [
cairo
cmake
ffmpeg
gettext
libpng
libpthreadstubs
libXdmcp
libxshmfence
mesa
openal
pkgconfig
SDL
wxGTK
zip
zlib
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE='Release'"
"-DENABLE_FFMPEG='true'"
#"-DENABLE_LINK='true'" currently broken :/
"-DSYSCONFDIR='$out/etc'"
];
meta = {
description = "A merge of the original Visual Boy Advance forks";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.lassulus ];
homepage = http://vba-m.com/;
};
}

35
pkgs/os-specific/darwin/adv_cmds/ps.nix
View File

@ -1,35 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "ps-${version}";
version = "153";
src = fetchurl {
url = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-${version}.tar.gz";
sha256 = "174v6a4zkcm2pafzgdm6kvs48z5f911zl7k49hv7kjq6gm58w99v";
};
buildPhase = ''
cd ps
cc -Os -Wall -I. -c -o fmt.o fmt.c
cc -Os -Wall -I. -c -o keyword.o keyword.c
cc -Os -Wall -I. -c -o nlist.o nlist.c
cc -Os -Wall -I. -c -o print.o print.c
cc -Os -Wall -I. -c -o ps.o ps.c
cc -Os -Wall -I. -c -o tasks.o tasks.c
cc -o ps fmt.o keyword.o nlist.o print.o ps.o tasks.o
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp ps $out/bin/ps
cp ps.1 $out/share/man/man1
'';
meta = {
platforms = stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
};
}

15
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
View File

@ -2,10 +2,8 @@
appleDerivation {
# Will override the name until we provide all of adv_cmds
name = "ps-${version}";
buildPhase = ''
cd ps
pushd ps
cc -Os -Wall -I. -c -o fmt.o fmt.c
cc -Os -Wall -I. -c -o keyword.o keyword.c
cc -Os -Wall -I. -c -o nlist.o nlist.c
@ -13,13 +11,20 @@ appleDerivation {
cc -Os -Wall -I. -c -o ps.o ps.c
cc -Os -Wall -I. -c -o tasks.o tasks.c
cc -o ps fmt.o keyword.o nlist.o print.o ps.o tasks.o
popd
pushd locale
c++ -o locale locale.cc
popd
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp ps $out/bin/ps
cp ps.1 $out/share/man/man1
cp ps/ps $out/bin/ps
cp ps/ps.1 $out/share/man/man1
cp locale/locale $out/bin/locale
cp locale/locale.1 $out/share/man/man1
'';

39
pkgs/os-specific/darwin/binutils/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ stdenv, binutils-raw, cctools }:
stdenv.mkDerivation {
name = "cctools-binutils-darwin";
buildCommand = ''
mkdir -p $out/bin $out/include
ln -s ${binutils-raw}/bin/c++filt $out/bin/c++filt
# We specifically need:
# - ld: binutils doesn't provide it on darwin
# - as: as above
# - ar: the binutils one prodices .a files that the cctools ld doesn't like
# - ranlib: for compatibility with ar
# - dsymutil: soon going away once it goes into LLVM (this one is fake anyway)
# - otool: we use it for some of our name mangling
# - install_name_tool: we use it to rewrite stuff in our bootstrap tools
# - strip: the binutils one seems to break mach-o files
# - lipo: gcc build assumes it exists
# - nm: the gnu one doesn't understand many new load commands
for i in ar ranlib as dsymutil install_name_tool ld strip otool lipo nm strings size; do
ln -sf "${cctools}/bin/$i" "$out/bin/$i"
done
for i in ${binutils-raw}/include/*.h; do
ln -s "$i" "$out/include/$(basename $i)"
done
for i in ${cctools}/include/*; do
ln -s "$i" "$out/include/$(basename $i)"
done
# FIXME: this will give us incorrect man pages for bits of cctools
ln -s ${binutils-raw}/share $out/share
ln -s ${binutils-raw}/lib $out/lib
ln -s ${cctools}/libexec $out/libexec
'';
}

34
pkgs/os-specific/darwin/derez/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv }:
# this tool only exists on darwin
assert stdenv.isDarwin;
stdenv.mkDerivation {
name = "derez";
src = "/usr/bin/DeRez";
unpackPhase = "true";
configurePhase = "true";
buildPhase = "true";
installPhase = ''
mkdir -p "$out/bin"
ln -s $src "$out/bin"
'';
meta = with stdenv.lib; {
description = "Decompiles resources";
homepage = "https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/DeRez.1.html";
maintainers = [ maintainers.lnl7 ];
platforms = platforms.darwin;
longDescription = ''
The DeRez tool decompiles the resource fork of resourceFile according to the type declarations
supplied by the type declaration files. The resource description produced by this decompilation
contains the resource definitions (resource and data statements) associated with these type
declarations. If for some reason it cannot reproduce the appropriate resource statements, DeRez
generates hexadecimal data statements instead.
'';
};
}

33
pkgs/os-specific/darwin/rez/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv }:
# this tool only exists on darwin
assert stdenv.isDarwin;
stdenv.mkDerivation {
name = "rez";
src = "/usr/bin/Rez";
unpackPhase = "true";
configurePhase = "true";
buildPhase = "true";
installPhase = ''
mkdir -p "$out/bin"
ln -s $src "$out/bin"
'';
meta = with stdenv.lib; {
description = "Compiles resources";
homepage = "https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/Rez.1.html";
maintainers = [ maintainers.lnl7 ];
platforms = platforms.darwin;
longDescription = ''
The Rez tool compiles the resource fork of a file according to the textual description contained in
the resource description files. These resource description files must contain both the type
declarations and the resource definitions needed to compile the resources. This data can come
directly from the resource description files.
'';
};
}

3
pkgs/os-specific/linux/radeontop/default.nix
View File

@ -11,7 +11,8 @@ stdenv.mkDerivation {
owner = "clbr";
};
buildInputs = [ pkgconfig gettext ncurses libdrm libpciaccess ];
buildInputs = [ ncurses libdrm libpciaccess ];
nativeBuildInputs = [ pkgconfig gettext ];
enableParallelBuilding = true;

20
pkgs/os-specific/linux/wpa_supplicant/default.nix
View File

@ -84,6 +84,26 @@ stdenv.mkDerivation rec {
url = "http://w1.fi/cgit/hostap/patch/?id=8a78e227df1ead19be8e12a4108e448887e64d6f";
sha256 = "1k2mcq1jv8xzi8061ixcz6j56n4i8wbq0vxcvml204q1syy2ika0";
})
(fetchpatch {
url = http://w1.fi/security/2015-4/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch;
sha256 = "1cg4r638s4m9ar9lmzm534y657ppcm8bl1h363kjnng1zbzh8rfb";
})
(fetchpatch {
url = http://w1.fi/security/2015-4/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch;
sha256 = "0ky850rg1k9lwd1p4wzyvl2dpi5g7k1mwx1ndjclp4x7bshb6w79";
})
(fetchpatch {
url = http://w1.fi/security/2015-4/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch;
sha256 = "0hicw3vk1khk849xil75ckrg1xzbwcva7g01kp0lvab34dwhryy7";
})
(fetchpatch {
url = http://w1.fi/security/2015-4/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch;
sha256 = "18d5r3zbwz96n4zzj9r27cv4kvc09zkj9x0p6qji68h8k2pcazxd";
})
(fetchpatch {
url = http://w1.fi/security/2015-4/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch;
sha256 = "1ndzyfpnxpvryiqal4kdic02kg9dgznh65kaqydaqqfj3rbjdqip";
})
];
postInstall = ''

4
pkgs/servers/dns/nsd/default.nix
View File

@ -13,11 +13,11 @@
}:
stdenv.mkDerivation rec {
name = "nsd-4.1.1";
name = "nsd-4.1.2";
src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
sha256 = "b0c3fab40ac7a8b5ffca642bc9e1b424aa72aebd03adf13a1f24ab4874734640";
sha256 = "0kb4jcckf4di9c88c09vb8ngbq19yh8njrp16yk2cic8p1dvf545";
};
buildInputs = [ libevent openssl ];

2
pkgs/servers/nosql/cassandra/2.0.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir $out

2
pkgs/servers/nosql/cassandra/2.1.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir $out

6
pkgs/stdenv/default.nix
View File

@ -39,6 +39,12 @@ rec {
# Darwin standard environment.
stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stdenvDarwin;
# Pure Darwin standard environment. Allows building with the sandbox enabled. To use,
# you can add this to your nixpkgs config:
#
# replaceStdenv = {pkgs}: pkgs.allStdenvs.stdenvDarwinPure
stdenvDarwinPure = (import ./pure-darwin { inherit system allPackages platform config;}).stage5;
# Select the appropriate stdenv for the platform `system'.
stdenv =
if system == "i686-linux" then stdenvLinux else

35
pkgs/stdenv/generic/default.nix
View File

@ -10,6 +10,8 @@ let lib = import ../../../lib; in lib.makeOverridable (
, setupScript ? ./setup.sh
, extraBuildInputs ? []
, __stdenvImpureHostDeps ? []
, __extraImpureHostDeps ? []
}:
let
@ -19,6 +21,8 @@ let
whitelist = config.whitelistedLicenses or [];
blacklist = config.blacklistedLicenses or [];
ifDarwin = attrs: if system == "x86_64-darwin" then attrs else {};
onlyLicenses = list:
lib.lists.all (license:
let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
@ -130,8 +134,22 @@ let
assert licenseAllowed attrs;
lib.addPassthru (derivation (
(removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos"])
//
(removeAttrs attrs
["meta" "passthru" "crossAttrs" "pos"
"__impureHostDeps" "__propagatedImpureHostDeps"])
// (let
buildInputs = attrs.buildInputs or [];
nativeBuildInputs = attrs.nativeBuildInputs or [];
propagatedBuildInputs = attrs.propagatedBuildInputs or [];
propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [];
crossConfig = attrs.crossConfig or null;
__impureHostDeps = attrs.__impureHostDeps or [];
__propagatedImpureHostDeps = attrs.__propagatedImpureHostDeps or [];
computedImpureHostDeps = lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs);
computedPropagatedImpureHostDeps = lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs);
in
{
builder = attrs.realBuilder or shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
@ -147,7 +165,15 @@ let
nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs else []);
propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
(if crossConfig == null then propagatedBuildInputs else []);
})) (
} // ifDarwin {
__impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [
"/dev/zero"
"/dev/random"
"/dev/urandom"
"/bin/sh"
];
__propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
}))) (
{
# The meta attribute is passed in the resulting attribute set,
# but it's not part of the actual derivation, i.e., it's not
@ -179,6 +205,9 @@ let
setup = setupScript;
inherit preHook initialPath shell defaultNativeBuildInputs;
}
// ifDarwin {
__impureHostDeps = __stdenvImpureHostDeps;
})
// rec {

297
pkgs/stdenv/pure-darwin/default.nix Normal file
View File

@ -0,0 +1,297 @@
{ system ? builtins.currentSystem
, allPackages ? import ../../top-level/all-packages.nix
, platform ? null
, config ? {}
}:
let
fetch = { file, sha256 }: import <nix/fetchurl.nix> {
url = "https://dl.dropboxusercontent.com/u/2857322/${file}";
inherit sha256;
executable = true;
};
bootstrapFiles = {
sh = fetch { file = "sh"; sha256 = "1qakpg37vl61jnkplz13m3g1csqr85cg8ybp6jwiv6apmg26isnm"; };
bzip2 = fetch { file = "bzip2"; sha256 = "1gxa67255q9v00j1vn1mzyrnbwys2g1102cx02vpcyvvrl4vqxr0"; };
mkdir = fetch { file = "mkdir"; sha256 = "1yfl8w65ksji7fggrbvqxw8lp0gm02qilk11n9axj2jxay53ngvg"; };
cpio = fetch { file = "cpio"; sha256 = "0nssyg19smgcblwq1mfcw4djbd85md84d2f093qcqkbigdjg484b"; };
};
tarball = fetch { file = "bootstrap-tools.9.cpio.bz2"; sha256 = "0fd79k7gy3z3sba5w4f4lnrcpiwff31vw02480x1pdry8bbgbf2j"; };
in rec {
allPackages = import ../../top-level/all-packages.nix;
commonPreHook = ''
export NIX_ENFORCE_PURITY=1
export NIX_IGNORE_LD_THROUGH_GCC=1
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
export MACOSX_DEPLOYMENT_TARGET=10.7
export SDKROOT=
export CMAKE_OSX_ARCHITECTURES=x86_64
'';
# libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land
libSystemClosure = [
"/usr/lib/libSystem.dylib"
"/usr/lib/libSystem.B.dylib"
"/usr/lib/libobjc.A.dylib"
"/usr/lib/libobjc.dylib"
"/usr/lib/libauto.dylib"
"/usr/lib/libc++abi.dylib"
"/usr/lib/libc++.1.dylib"
"/usr/lib/libDiagnosticMessagesClient.dylib"
"/usr/lib/system"
];
# The one dependency of /bin/sh :(
binShClosure = [ "/usr/lib/libncurses.5.4.dylib" ];
bootstrapTools = derivation rec {
inherit system tarball;
name = "bootstrap-tools";
builder = bootstrapFiles.sh; # Not a filename! Attribute 'sh' on bootstrapFiles
args = [ ./unpack-bootstrap-tools.sh ];
inherit (bootstrapFiles) mkdir bzip2 cpio;
__impureHostDeps = binShClosure ++ libSystemClosure;
};
stageFun = step: last: {shell ? "${bootstrapTools}/bin/sh",
overrides ? (pkgs: {}),
extraPreHook ? "",
extraBuildInputs ? with last.pkgs; [ xz darwin.CF libcxx ],
extraInitialPath ? [],
allowedRequisites ? null}:
let
thisStdenv = import ../generic {
inherit system config shell extraBuildInputs allowedRequisites;
name = "stdenv-darwin-boot-${toString step}";
cc = if isNull last then "/no-such-path" else import ../../build-support/cc-wrapper {
inherit shell;
inherit (last) stdenv;
inherit (last.pkgs.darwin) dyld;
nativeTools = true;
nativePrefix = bootstrapTools;
nativeLibc = false;
libc = last.pkgs.darwin.Libsystem;
cc = { name = "clang-9.9.9"; outPath = bootstrapTools; };
};
preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/sh") ''
# Don't patch #!/interpreter because it leads to retained
# dependencies on the bootstrapTools in the final stdenv.
dontPatchShebangs=1
'' + ''
${commonPreHook}
${extraPreHook}
'';
initialPath = extraInitialPath ++ [ bootstrapTools ];
fetchurlBoot = import ../../build-support/fetchurl {
stdenv = stage0.stdenv;
curl = bootstrapTools;
};
# The stdenvs themselves don't use mkDerivation, so I need to specify this here
__stdenvImpureHostDeps = binShClosure ++ libSystemClosure;
__extraImpureHostDeps = binShClosure ++ libSystemClosure;
extraAttrs = { inherit platform; };
overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
};
thisPkgs = allPackages {
inherit system platform;
bootStdenv = thisStdenv;
};
in { stdenv = thisStdenv; pkgs = thisPkgs; };
stage0 = stageFun 0 null {
overrides = orig: with stage0; rec {
darwin = orig.darwin // {
Libsystem = stdenv.mkDerivation {
name = "bootstrap-Libsystem";
buildCommand = ''
mkdir -p $out
ln -s ${bootstrapTools}/lib $out/lib
ln -s ${bootstrapTools}/include-Libsystem $out/include
'';
};
dyld = bootstrapTools;
};
libcxx = stdenv.mkDerivation {
name = "bootstrap-libcxx";
phases = [ "installPhase" "fixupPhase" ];
installPhase = ''
mkdir -p $out/lib $out/include
ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
ln -s ${bootstrapTools}/include/c++ $out/include/c++
'';
setupHook = ../../development/compilers/llvm/3.5/libc++/setup-hook.sh;
};
libcxxabi = stdenv.mkDerivation {
name = "bootstrap-libcxxabi";
buildCommand = ''
mkdir -p $out/lib
ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
'';
};
};
extraBuildInputs = [];
};
persistent0 = _: {};
stage1 = with stage0; stageFun 1 stage0 {
extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
extraBuildInputs = [ pkgs.libcxx ];
allowedRequisites =
[ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ];
overrides = persistent0;
};
persistent1 = orig: with stage1.pkgs; {
inherit
zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python
libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
darwin = orig.darwin // {
inherit (darwin)
dyld Libsystem xnu configd libdispatch libclosure launchd;
};
};
stage2 = with stage1; stageFun 2 stage1 {
allowedRequisites =
[ bootstrapTools ] ++
(with pkgs; [ xz libcxx libcxxabi icu ]) ++
(with pkgs.darwin; [ dyld Libsystem CF ]);
overrides = persistent1;
};
persistent2 = orig: with stage2.pkgs; {
inherit
patchutils m4 scons flex perl bison unifdef unzip openssl python
gettext sharutils libarchive pkg-config groff bash subversion
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
findfreetype libssh curl cmake autoconf automake libtool cpio
libcxx libcxxabi;
darwin = orig.darwin // {
inherit (darwin)
dyld Libsystem xnu configd libdispatch libclosure launchd libiconv;
};
};
stage3 = with stage2; stageFun 3 stage2 {
shell = "${pkgs.bash}/bin/bash";
# We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun
# enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
# and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
# patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
extraInitialPath = [ pkgs.bash ];
allowedRequisites =
[ bootstrapTools ] ++
(with pkgs; [ icu bash libcxx libcxxabi ]) ++
(with pkgs.darwin; [ dyld Libsystem ]);
overrides = persistent2;
};
persistent3 = orig: with stage3.pkgs; {
inherit
gnumake gzip gnused bzip2 gawk ed xz patch bash
libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
coreutils findutils diffutils patchutils;
llvmPackages = orig.llvmPackages // {
inherit (llvmPackages) llvm clang-unwrapped;
};
darwin = orig.darwin // {
inherit (darwin) dyld Libsystem libiconv;
};
};
stage4 = with stage3; stageFun 4 stage3 {
shell = "${pkgs.bash}/bin/bash";
extraInitialPath = [ pkgs.bash ];
overrides = persistent3;
};
persistent4 = orig: with stage4.pkgs; {
inherit
gnumake gzip gnused bzip2 gawk ed xz patch bash
libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
coreutils findutils diffutils patchutils binutils binutils-raw;
llvmPackages = orig.llvmPackages // {
inherit (llvmPackages) llvm clang-unwrapped;
};
darwin = orig.darwin // {
inherit (darwin) dyld Libsystem cctools CF libiconv;
};
};
stage5 = with stage4; import ../generic rec {
inherit system config;
inherit (stdenv) fetchurlBoot;
name = "stdenv-darwin";
preHook = commonPreHook;
__stdenvImpureHostDeps = binShClosure ++ libSystemClosure;
__extraImpureHostDeps = binShClosure ++ libSystemClosure;
initialPath = import ../common-path.nix { inherit pkgs; };
shell = "${pkgs.bash}/bin/bash";
cc = import ../../build-support/cc-wrapper {
inherit stdenv shell;
nativeTools = false;
nativeLibc = false;
inherit (pkgs) coreutils binutils;
inherit (pkgs.darwin) dyld;
cc = pkgs.llvmPackages.clang-unwrapped;
libc = pkgs.darwin.Libsystem;
};
extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
extraAttrs = {
inherit platform bootstrapTools;
libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash;
};
allowedRequisites = (with pkgs; [
xz libcxx libcxxabi icu gmp gnumake findutils bzip2 llvm zlib libffi
coreutils ed diffutils gnutar gzip ncurses gnused bash gawk
gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext
]) ++ (with pkgs.darwin; [
dyld Libsystem CF cctools libiconv
]);
overrides = orig: persistent4 orig // {
clang = cc;
inherit cc;
};
};
}

286
pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix Normal file
View File

@ -0,0 +1,286 @@
{system ? builtins.currentSystem}:
with import ../../top-level/all-packages.nix {inherit system;};
rec {
# We want coreutils without ACL support.
coreutils_ = coreutils.override (orig: {
aclSupport = false;
});
build = stdenv.mkDerivation {
name = "build";
buildInputs = [nukeReferences cpio];
buildCommand = ''
mkdir -p $out/bin $out/lib
# Our (fake) loader
cp -d ${darwin.dyld}/lib/dyld $out/lib/
# C standard library stuff
cp -d ${darwin.Libsystem}/lib/*.o $out/lib/
cp -d ${darwin.Libsystem}/lib/*.dylib $out/lib/
cp -d ${darwin.Libsystem}/lib/system/*.dylib $out/lib/
# Resolv is actually a link to another package, so let's copy it properly
rm $out/lib/libresolv.9.dylib
cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib
cp -rL ${darwin.Libsystem}/include $out
chmod -R u+w $out/include
cp -rL ${icu}/include* $out/include
cp -rL ${libiconv}/include/* $out/include
cp -rL ${gnugrep.pcre}/include/* $out/include
mv $out/include $out/include-Libsystem
# Copy coreutils, bash, etc.
cp ${coreutils_}/bin/* $out/bin
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
cp ${bash}/bin/bash $out/bin
cp ${findutils}/bin/find $out/bin
cp ${findutils}/bin/xargs $out/bin
cp -d ${diffutils}/bin/* $out/bin
cp -d ${gnused}/bin/* $out/bin
cp -d ${gnugrep}/bin/grep $out/bin
cp ${gawk}/bin/gawk $out/bin
cp -d ${gawk}/bin/awk $out/bin
cp ${gnutar}/bin/tar $out/bin
cp ${gzip}/bin/gzip $out/bin
cp ${bzip2}/bin/bzip2 $out/bin
cp -d ${gnumake}/bin/* $out/bin
cp -d ${patch}/bin/* $out/bin
cp -d ${xz}/bin/xz $out/bin
# This used to be in-nixpkgs, but now is in the bundle
# because I can't be bothered to make it partially static
cp ${curl}/bin/curl $out/bin
cp -d ${curl}/lib/libcurl*.dylib $out/lib
cp -d ${libssh2}/lib/libssh*.dylib $out/lib
cp -d ${openssl}/lib/*.dylib $out/lib
cp -d ${gnugrep.pcre}/lib/libpcre*.dylib $out/lib
cp -d ${libiconv}/lib/libiconv*.dylib $out/lib
cp -d ${gettext}/lib/libintl*.dylib $out/lib
chmod +x $out/lib/libintl*.dylib
# Copy what we need of clang
cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin
cp -d ${llvmPackages.clang-unwrapped}/bin/clang++ $out/bin
cp -d ${llvmPackages.clang-unwrapped}/bin/clang-3.6 $out/bin
cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib
cp -d ${libcxx}/lib/libc++*.dylib $out/lib
cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib
mkdir $out/include
cp -rd ${libcxx}/include/c++ $out/include
cp -d ${icu}/lib/libicu*.dylib $out/lib
cp -d ${zlib}/lib/libz.* $out/lib
cp -d ${gmpxx}/lib/libgmp*.* $out/lib
cp -d ${xz}/lib/liblzma*.* $out/lib
# Copy binutils.
for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do
cp ${darwin.cctools}/bin/$i $out/bin
done
cp -rd ${pkgs.darwin.CF}/Library $out
chmod -R u+w $out
nuke-refs $out/bin/*
rpathify() {
local libs=$(${darwin.cctools}/bin/otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true
for lib in $libs; do
${darwin.cctools}/bin/install_name_tool -change $lib "@rpath/$(basename $lib)" "$1"
done
}
fix_dyld() {
# This is clearly a hack. Once we have an install_name_tool-alike that can patch dyld, this will be nicer.
${perl}/bin/perl -i -0777 -pe 's/\/nix\/store\/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-dyld-239\.4\/lib\/dyld/\/usr\/lib\/dyld\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/sg' "$1"
}
# Strip executables even further
for i in $out/bin/*; do
if test -x $i -a ! -L $i; then
chmod +w $i
fix_dyld $i
strip $i || true
fi
done
for i in $out/bin/* $out/lib/*.dylib $out/lib/clang/3.5.0/lib/darwin/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
if test -x $i -a ! -L $i; then
echo "Adding rpath to $i"
rpathify $i
fi
done
nuke-refs $out/lib/*
nuke-refs $out/lib/clang/3.5.0/lib/darwin/*
nuke-refs $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
mkdir $out/.pack
mv $out/* $out/.pack
mv $out/.pack $out/pack
mkdir $out/on-server
(cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2
mkdir $out/in-nixpkgs
cp ${stdenv.shell} $out/in-nixpkgs/sh
cp ${cpio}/bin/cpio $out/in-nixpkgs
cp ${coreutils_}/bin/mkdir $out/in-nixpkgs
cp ${bzip2}/bin/bzip2 $out/in-nixpkgs
chmod u+w $out/in-nixpkgs/*
strip $out/in-nixpkgs/*
nuke-refs $out/in-nixpkgs/*
for i in $out/in-nixpkgs/*; do
fix_dyld $i
done
'';
allowedReferences = [];
};
host = stdenv.mkDerivation {
name = "host";
buildCommand = ''
mkdir -p $out/nix-support
for i in "${build}/on-server/"*; do
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
done
echo "darwin-bootstrap-tools-$(date +%Y.%m.%d)" >> $out/nix-support/hydra-release-name
'';
allowedReferences = [ build ];
};
unpack = stdenv.mkDerivation {
name = "unpack";
# This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly,
# we can't make any changes to it due to our testing stdenv depending on it. Think of this as the
# unpack-bootstrap-tools.sh for the next round of bootstrap tools.
# TODO: think through alternate designs, such as hosting this script as an output of the process.
buildCommand = ''
# Unpack the bootstrap tools tarball.
echo Unpacking the bootstrap tools...
$mkdir $out
$bzip2 -d < $tarball | (cd $out && $cpio -i)
# Set the ELF interpreter / RPATH in the bootstrap binaries.
echo Patching the tools...
export PATH=$out/bin
for i in $out/bin/*; do
if ! test -L $i; then
echo patching $i
install_name_tool -add_rpath $out/lib $i || true
fi
done
for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
if ! test -L $i; then
echo patching $i
id=$(otool -D "$i" | tail -n 1)
install_name_tool -id "$(dirname $i)/$(basename $id)" $i
libs=$(otool -L "$i" | tail -n +2 | grep -v Libsystem | cat)
if [ -n "$libs" ]; then
install_name_tool -add_rpath $out/lib $i
fi
fi
done
ln -s bash $out/bin/sh
ln -s bzip2 $out/bin/bunzip2
cat >$out/bin/dsymutil << EOF
#!$out/bin/sh
EOF
'';
tarball = "${build}/on-server/bootstrap-tools.cpio.bz2";
mkdir = "${build}/in-nixpkgs/mkdir";
bzip2 = "${build}/in-nixpkgs/bzip2";
cpio = "${build}/in-nixpkgs/cpio";
allowedReferences = [ "out" ];
};
test = stdenv.mkDerivation {
name = "test";
realBuilder = "${unpack}/bin/bash";
buildCommand = ''
export PATH=${unpack}/bin
ls -l
mkdir $out
mkdir $out/bin
sed --version
find --version
diff --version
patch --version
make --version
awk --version
grep --version
clang --version
xz --version
# The grep will return a nonzero exit code if there is no match, and we want to assert that we have
# an SSL-capable curl
curl --version | grep SSL
${build}/in-nixpkgs/sh -c 'echo Hello World'
export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib"
export CPP="clang -E $flags"
export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v"
export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v"
echo '#include <stdio.h>' >> foo.c
echo '#include <float.h>' >> foo.c
echo '#include <limits.h>' >> foo.c
echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c
$CC -o $out/bin/foo foo.c
$out/bin/foo
echo '#include <CoreFoundation/CoreFoundation.h>' >> bar.c
echo 'int main() { CFShow(CFSTR("Hullo")); return 0; }' >> bar.c
$CC -F${unpack}/Library/Frameworks -framework CoreFoundation -o $out/bin/bar bar.c
$out/bin/bar
echo '#include <iostream>' >> bar.cc
echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc
$CXX -v -o $out/bin/bar bar.cc
$out/bin/bar
tar xvf ${hello.src}
cd hello-*
./configure --prefix=$out
make
make install
$out/bin/hello
'';
};
}

66
pkgs/stdenv/pure-darwin/trivial-bootstrap.sh Normal file
View File

@ -0,0 +1,66 @@
# Building bootstrap tools
echo Building the trivial bootstrap environment...
$mkdir -p $out/bin
$ln -s $ln $out/bin/ln
PATH=$out/bin/
cd $out/bin
ln -s $mkdir
ln -s /bin/sh
ln -s /bin/cp
ln -s /bin/mv
ln -s /bin/rm
ln -s /bin/ls
ln -s /bin/ps
ln -s /bin/cat
ln -s /bin/bash
ln -s /bin/echo
ln -s /bin/expr
ln -s /bin/test
ln -s /bin/date
ln -s /bin/chmod
ln -s /bin/rmdir
ln -s /bin/sleep
ln -s /bin/hostname
ln -s /usr/bin/id
ln -s /usr/bin/od
ln -s /usr/bin/tr
ln -s /usr/bin/wc
ln -s /usr/bin/cut
ln -s /usr/bin/cmp
ln -s /usr/bin/sed
ln -s /usr/bin/tar
ln -s /usr/bin/xar
ln -s /usr/bin/awk
ln -s /usr/bin/env
ln -s /usr/bin/tee
ln -s /usr/bin/comm
ln -s /usr/bin/cpio
ln -s /usr/bin/curl
ln -s /usr/bin/find
ln -s /usr/bin/grep
ln -s /usr/bin/gzip
ln -s /usr/bin/head
ln -s /usr/bin/tail
ln -s /usr/bin/sort
ln -s /usr/bin/uniq
ln -s /usr/bin/less
ln -s /usr/bin/true
ln -s /usr/bin/diff
ln -s /usr/bin/egrep
ln -s /usr/bin/fgrep
ln -s /usr/bin/patch
ln -s /usr/bin/uname
ln -s /usr/bin/touch
ln -s /usr/bin/split
ln -s /usr/bin/xargs
ln -s /usr/bin/which
ln -s /usr/bin/install
ln -s /usr/bin/basename
ln -s /usr/bin/dirname
ln -s /usr/bin/readlink

54
pkgs/stdenv/pure-darwin/unpack-bootstrap-tools.sh Normal file
View File

@ -0,0 +1,54 @@
set -e
# Unpack the bootstrap tools tarball.
echo Unpacking the bootstrap tools...
$mkdir $out
$bzip2 -d < $tarball | (cd $out && $cpio -i)
# Set the ELF interpreter / RPATH in the bootstrap binaries.
echo Patching the tools...
export PATH=$out/bin
for i in $out/bin/*; do
if ! test -L $i; then
echo patching $i
install_name_tool -add_rpath $out/lib $i || true
fi
done
for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
if ! test -L $i; then
echo patching $i
id=$(otool -D "$i" | tail -n 1)
install_name_tool -id "$(dirname $i)/$(basename $id)" $i
libs=$(otool -L "$i" | tail -n +2 | grep -v libSystem | cat)
if [ -n "$libs" ]; then
install_name_tool -add_rpath $out/lib $i
fi
fi
done
ln -s bash $out/bin/sh
ln -s bzip2 $out/bin/bunzip2
# Provide a gunzip script.
cat > $out/bin/gunzip <<EOF
#!$out/bin/sh
exec $out/bin/gzip -d "\$@"
EOF
chmod +x $out/bin/gunzip
# Provide fgrep/egrep.
echo "#! $out/bin/sh" > $out/bin/egrep
echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep
echo "#! $out/bin/sh" > $out/bin/fgrep
echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep
cat >$out/bin/dsymutil << EOF
#!$out/bin/sh
EOF
chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil

6
pkgs/tools/X11/xcape/default.nix
View File

@ -3,7 +3,7 @@
let
s = rec {
baseName = "xcape";
version = "git-2013-05-30";
version = "git-2015-03-01";
name = "${baseName}-${version}";
};
buildInputs = [
@ -15,8 +15,8 @@ stdenv.mkDerivation {
inherit buildInputs;
src = fetchgit {
url = https://github.com/alols/xcape;
rev = "39aa08c5da354a8fe495eba8787a01957cfa5fcb";
sha256 = "1yh0vbaj4c5lflxm3d4xrfaric1lp0gfcyzq33bqphpsba439bmg";
rev = "f3802fc086ce9d961d644a5d29ad5b650db56215";
sha256 = "05mm4ap69ncwl4hhzf2dvbazqxjf27477cd3chpfc7qi7srqasvz";
};
preConfigure = ''
makeFlags="$makeFlags PREFIX=$out"

18
pkgs/tools/X11/xdg-utils/default.nix
View File

@ -1,13 +1,12 @@
{ stdenv, fetchzip, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto, w3m }:
let rev = "e8ee3b18d16e41b95148111b920a0c8beed3ac6c"; in
{ stdenv, fetchzip, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
, w3m, which, gnugrep, gnused, coreutils }:
stdenv.mkDerivation rec {
name = "xdg-utils-1.1.0-rc3p7";
src = fetchzip {
name = "xdg-utils-${rev}.tar.gz";
url = "http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/${rev}.tar.gz";
name = "${name}.tar.gz";
url = "http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/e8ee3b18d16e4.tar.gz";
sha256 = "1hz6rv45blcii1a8n1j45rg8vzm98vh4fvlca3zmay1kp57yr4jl";
};
@ -15,7 +14,14 @@ stdenv.mkDerivation rec {
buildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ];
postInstall = ''
substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file
for item in $out/bin/*; do
substituteInPlace $item --replace "cut " "${coreutils}/bin/cut "
substituteInPlace $item --replace "sed " "${gnused}/bin/sed "
substituteInPlace $item --replace "grep " "${gnugrep}/bin/grep "
substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep "
substituteInPlace $item --replace "which " "${which}/bin/which "
substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file"
done
'';
meta = {

67
pkgs/tools/admin/nxproxy/0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch Normal file
View File

@ -0,0 +1,67 @@
commit f982cbc85e9ffff24a6a348c3637b54a7e8cbc34
Author: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Wed May 20 15:47:45 2015 +0200
Fix negotiation in stage 10 error
Problem fixed by adding a select() call to implement a timeout,
and retrying writes if needed.
v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -8073,16 +8073,52 @@ int ReadRemoteData(int fd, char *buffer,
int WriteLocalData(int fd, const char *buffer, int size)
{
int position = 0;
+ int ret = 0;
+ fd_set writeSet;
+ struct timeval selectTs = {30, 0};
while (position < size)
{
+
+ // A write to a non-blocking socket may fail with EAGAIN. The problem is
+ // that cache data is done in several writes, and there's no easy way
+ // to handle failure without rewriting a significant amount of code.
+ //
+ // Bailing out of the outer loop would result in restarting the sending
+ // of the entire cache list, which would confuse the other side.
+
+ FD_ZERO(&writeSet);
+ FD_SET(fd, &writeSet);
+
+ ret = select(fd+1, NULL, &writeSet, NULL, &selectTs);
+
+ #ifdef DEBUG
+ *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of "
+ << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << logofs_flush;
+ #endif
+
+ if ( ret < 0 )
+ {
+ *logofs << "Loop: Error in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
+
+ if ( EGET() == EINTR )
+ continue;
+
+ return -1;
+ }
+ else if ( ret == 0 )
+ {
+ *logofs << "Loop: Timeout expired in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
+ return -1;
+ }
+
int result = write(fd, buffer + position, size - position);
getNewTimestamp();
if (result <= 0)
{
- if (result < 0 && EGET() == EINTR)
+ if (result < 0 && (EGET() == EINTR || EGET() == EAGAIN || EGET() == EWOULDBLOCK))
{
continue;
}

3
pkgs/tools/admin/nxproxy/default.nix
View File

@ -21,7 +21,8 @@ stdenv.mkDerivation {
./0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch
];
buildInputs = [ autoreconfHook libxcomp ];
buildInputs = [ libxcomp ];
nativeBuildInputs = [ autoreconfHook ];
preAutoreconf = ''
cd nxproxy/

6
pkgs/tools/archivers/gnutar/default.nix
View File

@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
patches = stdenv.lib.optional stdenv.isDarwin ./gnutar-1.28-darwin.patch;
# avoid retaining reference to CF during stdenv bootstrap
configureFlags = stdenv.lib.optionals stdenv.isDarwin [
"gt_cv_func_CFPreferencesCopyAppValue=no"
"gt_cv_func_CFLocaleCopyCurrent=no"
];
# gnutar tries to call into gettext between `fork` and `exec`,
# which is not safe on darwin.
# see http://article.gmane.org/gmane.os.macosx.fink.devel/21882

2
pkgs/tools/archivers/sharutils/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
''
# Fix for building on Glibc 2.16. Won't be needed once the
# gnulib in sharutils is updated.
sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
'';
# GNU Gettext is needed on non-GNU platforms.

2
pkgs/tools/compression/xdelta/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "jmacd";
};
buildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook ];
postPatch = ''
cd xdelta3

3
pkgs/tools/filesystems/boxfs/default.nix
View File

@ -34,7 +34,8 @@ in stdenv.mkDerivation {
patches = [ ./work-around-API-borkage.patch ];
buildInputs = [ curl fuse libxml2 pkgconfig ];
buildInputs = [ curl fuse libxml2 ];
nativeBuildInputs = [ pkgconfig ];
buildFlags = "static";

2
pkgs/tools/filesystems/duff/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "elmindreda";
};
buildInputs = [ autoreconfHook gettext ];
nativeBuildInputs = [ autoreconfHook gettext ];
preAutoreconf = ''
# duff is currently badly packaged, requiring us to do extra work here that

3
pkgs/tools/filesystems/encfs/default.nix
View File

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
owner = "vgough";
};
buildInputs = [ autoreconfHook boost fuse openssl perl pkgconfig rlog ];
buildInputs = [ boost fuse openssl rlog ];
nativeBuildInputs = [ autoreconfHook perl pkgconfig ];
configureFlags = [
"--with-boost-serialization=boost_wserialization"

2
pkgs/tools/filesystems/exfat-utils/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ scons ];
nativeBuildInputs = [ scons ];
buildPhase = ''
export CCFLAGS="-std=c99"

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