Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III 2015-08-19 13:54:48 -07:00
commit 901482ad99
64 changed files with 1164 additions and 1497 deletions

View File

@ -45,6 +45,7 @@ let
pkgs.strace
pkgs.su
pkgs.time
pkgs.texinfoInteractive
pkgs.utillinux
extraManpages
];
@ -105,12 +106,14 @@ in
"/lib"
"/man"
"/sbin"
"/share/doc"
"/share/emacs"
"/share/vim-plugins"
"/share/org"
"/share/info"
"/share/terminfo"
"/share/man"
"/share/nano"
"/share/org"
"/share/terminfo"
"/share/vim-plugins"
];
system.path = pkgs.buildEnv {
@ -136,6 +139,13 @@ in
if [ -x $out/bin/update-desktop-database -a -w $out/share/applications ]; then
$out/bin/update-desktop-database $out/share/applications
fi
if [ -x $out/bin/install-info -a -w $out/share/info ]; then
shopt -s nullglob
for i in $out/share/info/*.info $out/share/info/*.info.gz; do
$out/bin/install-info $i $out/share/info/dir
done
fi
'';
};

View File

@ -61,7 +61,6 @@
./programs/command-not-found/command-not-found.nix
./programs/dconf.nix
./programs/environment.nix
./programs/info.nix
./programs/ibus.nix
./programs/kbdlight.nix
./programs/light.nix
@ -75,6 +74,7 @@
./programs/venus.nix
./programs/wvdial.nix
./programs/freetds.nix
./programs/xfs_quota.nix
./programs/zsh/zsh.nix
./rename.nix
./security/apparmor.nix

View File

@ -1,38 +0,0 @@
{config, pkgs, ...}:
let
texinfo = pkgs.texinfoInteractive;
# Quick hack to make the `info' command work properly. `info' needs
# a "dir" file containing all the installed Info files, which we
# don't have (it would be impure to have a package installation
# update some global "dir" file). So this wrapper script around
# "info" builds a temporary "dir" file on the fly. This is a bit
# slow (on a cold cache) but not unacceptably so.
infoWrapper = pkgs.writeScriptBin "info"
''
#! ${pkgs.stdenv.shell}
dir=$(mktemp --tmpdir -d "info.dir.XXXXXX")
if test -z "$dir"; then exit 1; fi
trap 'rm -rf "$dir"' EXIT
shopt -s nullglob
for i in $(IFS=:; echo $INFOPATH); do
for j in $i/*.info; do
${texinfo}/bin/install-info --quiet $j $dir/dir
done
done
INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@"
''; # */
in
{
environment.systemPackages = [ infoWrapper texinfo ];
}

View File

@ -0,0 +1,110 @@
# Configuration for the xfs_quota command
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.xfs_quota;
limitOptions = opts: concatStringsSep " " [
(optionalString (opts.sizeSoftLimit != null) "bsoft=${opts.sizeSoftLimit}")
(optionalString (opts.sizeHardLimit != null) "bhard=${opts.sizeHardLimit}")
];
in
{
###### interface
options = {
programs.xfs_quota = {
projects = mkOption {
default = {};
type = types.attrsOf (types.submodule {
options = {
id = mkOption {
type = types.int;
description = "Project ID.";
};
fileSystem = mkOption {
type = types.string;
description = "XFS filesystem hosting the xfs_quota project.";
default = "/";
};
path = mkOption {
type = types.string;
description = "Project directory.";
};
sizeSoftLimit = mkOption {
type = types.nullOr types.string;
default = null;
example = "30g";
description = "Soft limit of the project size";
};
sizeHardLimit = mkOption {
type = types.nullOr types.string;
default = null;
example = "50g";
description = "Hard limit of the project size.";
};
};
});
description = "Setup of xfs_quota projects. Make sure the filesystem is mounted with the pquota option.";
example = {
"projname" = {
id = 50;
path = "/xfsprojects/projname";
sizeHardLimit = "50g";
};
};
};
};
};
###### implementation
config = mkIf (cfg.projects != {}) {
environment.etc.projects.source = pkgs.writeText "etc-project"
(concatStringsSep "\n" (mapAttrsToList
(name: opts: "${toString opts.id}:${opts.path}") cfg.projects));
environment.etc.projid.source = pkgs.writeText "etc-projid"
(concatStringsSep "\n" (mapAttrsToList
(name: opts: "${name}:${toString opts.id}") cfg.projects));
systemd.services = mapAttrs' (name: opts:
nameValuePair "xfs_quota-${name}" {
description = "Setup xfs_quota for project ${name}";
script = ''
${pkgs.xfsprogs}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem}
${pkgs.xfsprogs}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem}
'';
wantedBy = [ "multi-user.target" ];
after = [ ((replaceChars [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ];
restartTriggers = [ config.environment.etc.projects.source ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
}
) cfg.projects;
};
}

View File

@ -251,9 +251,9 @@ let
${optionalString (!(config.security.pam.enableEcryptfs || cfg.pamMount)) "auth required pam_deny.so"}
# Password management.
password requisite pam_unix.so nullok sha512
${optionalString config.security.pam.enableEcryptfs
"password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
password requisite pam_unix.so nullok sha512
${optionalString cfg.pamMount
"password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
${optionalString config.users.ldap.enable

View File

@ -15,11 +15,7 @@ let
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
# Version to build.
tag = "4.1";
# Version info that is built into the binary. Keep in sync with 'tag'. The
# last 8 digits is a (fake) commit id.
revision = "4.1-fe672c8";
tag = "4.2";
in
@ -42,7 +38,7 @@ stdenv.mkDerivation rec {
];
patchPhase = ''
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
patchShebangs ./tools/
'';

View File

@ -0,0 +1,24 @@
{ stdenv, pkgs, fetchFromGitHub,
automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile
}:
stdenv.mkDerivation rec {
repo = "rkrlv2";
name = "${repo}-b1.0";
src = fetchFromGitHub {
owner = "ssj71";
inherit repo;
rev = "a315f5aefe63be7e34663596b8b050410a9b7e72";
sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
};
buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
meta = {
description = "Rakarrak effects ported to LV2";
homepage = https://github.com/ssj71/rkrlv2;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.joelmo ];
};
}

View File

@ -3,7 +3,7 @@
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib, fftw
, jackaudioSupport ? false, libjack2
, cudaSupport ? false, cudatoolkit65
, cudaSupport ? false, cudatoolkit
, colladaSupport ? true, opencollada
}:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
]
++ optional jackaudioSupport libjack2
++ optional cudaSupport cudatoolkit65
++ optional cudaSupport cudatoolkit
++ optional colladaSupport opencollada;
postUnpack =

View File

@ -129,19 +129,9 @@ stdenv.mkDerivation {
"$out/usr/lib/firefox-bin-${version}/$executable"
done
for executable in \
firefox firefox-bin plugin-container \
updater crashreporter webapprt-stub \
components/libdbusservice.so components/libmozgnome.so \
gmp-clearkey/0.1/libclearkey.so \
browser/components/libbrowsercomps.so \
libnssdbm3.so libsmime3.so libxul.so libnss3.so libplc4.so \
libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so libssl3.so \
libsoftokn3.so libnssutil3.so libnssckbi.so libplds4.so
do
find . -executable -type f -exec \
patchelf --set-rpath "$libPath" \
"$out/usr/lib/firefox-bin-${version}/$executable"
done
"$out/usr/lib/firefox-bin-${version}/{}" \;
# Create a desktop item.
mkdir -p $out/share/applications

View File

@ -8,7 +8,7 @@ version = if ARGV.empty?
ARGV[0]
end
base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases"
base_path = "http://archive.mozilla.org/pub/firefox/releases"
Source = Struct.new(:hash, :arch, :locale, :filename)

View File

@ -4,185 +4,185 @@
# ruby generate_source.rb > source.nix
{
version = "39.0.3";
version = "40.0.2";
sources = [
{ locale = "ach"; arch = "linux-i686"; sha1 = "4b732557876ff3e4d02ad480b7c73bd7abd6782d"; }
{ locale = "ach"; arch = "linux-x86_64"; sha1 = "0a63b048b33638ade924bcf7ae435423c9da906c"; }
{ locale = "af"; arch = "linux-i686"; sha1 = "87349773cdb5e07aaa1387e75e08d03786df700d"; }
{ locale = "af"; arch = "linux-x86_64"; sha1 = "137d3558eb674036d43e5764ca691a66f9a07782"; }
{ locale = "an"; arch = "linux-i686"; sha1 = "db99f86de92b0d1782611926b3053b25ad302e8b"; }
{ locale = "an"; arch = "linux-x86_64"; sha1 = "d000f9e8a983be0fa7d05176fb6cc0954bb06ad7"; }
{ locale = "ar"; arch = "linux-i686"; sha1 = "b794a584da47ee9197666ab6976863f23ff1972c"; }
{ locale = "ar"; arch = "linux-x86_64"; sha1 = "0319aec1942cd8311b236aef5772850897b36f64"; }
{ locale = "as"; arch = "linux-i686"; sha1 = "83b83af48caf75bcdc39efb9c8a09333d6ae97b7"; }
{ locale = "as"; arch = "linux-x86_64"; sha1 = "827463330470ab2abd4a71a92e15fea451957fb5"; }
{ locale = "ast"; arch = "linux-i686"; sha1 = "9f994c9374c53afa094271907fc6aecbf5a93eb4"; }
{ locale = "ast"; arch = "linux-x86_64"; sha1 = "611835134f1008fcff72f3ab264ce9448a6a0948"; }
{ locale = "az"; arch = "linux-i686"; sha1 = "67339f5005bf8c805b6c8ed24fbed597865f5dd0"; }
{ locale = "az"; arch = "linux-x86_64"; sha1 = "ecdd763f7d40bcb1ff6004fd0a3f511f5cbb9d9b"; }
{ locale = "be"; arch = "linux-i686"; sha1 = "d6a7d84744c0ac6e4cb7f0a1f0025bbee053cdc2"; }
{ locale = "be"; arch = "linux-x86_64"; sha1 = "051646e7d213099433bc198c74f85d99aeb6e846"; }
{ locale = "bg"; arch = "linux-i686"; sha1 = "28e48822cc2977037db1493ddc06ef106a11e8bf"; }
{ locale = "bg"; arch = "linux-x86_64"; sha1 = "7b59deab0fd2b35d2ec087947f5c5a85bd70cf4a"; }
{ locale = "bn-BD"; arch = "linux-i686"; sha1 = "4c5bff7f6b3f664138a881479701cfea81ff60b8"; }
{ locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "3a659a5335d4b215ac2a0452264a61c702420c60"; }
{ locale = "bn-IN"; arch = "linux-i686"; sha1 = "a641b87769d90db720fc5294ab06f6dae2a597d3"; }
{ locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "1c1e47f4012c765ce96e4d2581e47f9b61344370"; }
{ locale = "br"; arch = "linux-i686"; sha1 = "0491cf87e0815079eba8f57ae8c6f392d2e5251f"; }
{ locale = "br"; arch = "linux-x86_64"; sha1 = "abe34c6d4998ac2f4e2d1f2d4655f8ace9f0a857"; }
{ locale = "bs"; arch = "linux-i686"; sha1 = "40f2eb7fd72f4a05ee47cb136c73e75f139e9ed1"; }
{ locale = "bs"; arch = "linux-x86_64"; sha1 = "3a737c33921af68621d906702fb1298f5bf161f9"; }
{ locale = "ca"; arch = "linux-i686"; sha1 = "46cf625eea24a819d93741f2d11bc315a21361cc"; }
{ locale = "ca"; arch = "linux-x86_64"; sha1 = "be84a0a6e32fbbb977b654f195064add8881a853"; }
{ locale = "cs"; arch = "linux-i686"; sha1 = "ce507b8801646f3156bb38776c17dd7955ba9678"; }
{ locale = "cs"; arch = "linux-x86_64"; sha1 = "5b1599282512c66a8619202b494042dbe959adc0"; }
{ locale = "cy"; arch = "linux-i686"; sha1 = "9eb6a71214122e02e7e94b526b4ff1e0bad71680"; }
{ locale = "cy"; arch = "linux-x86_64"; sha1 = "4f21da86ab876bf916157fe7e1fd84502e8fb923"; }
{ locale = "da"; arch = "linux-i686"; sha1 = "d175b55ebf05905531f28a74f9a075c4dd4467d1"; }
{ locale = "da"; arch = "linux-x86_64"; sha1 = "62039edbacf4d5ed9b32f5ef2d993c0b6fc7a0cc"; }
{ locale = "de"; arch = "linux-i686"; sha1 = "933cc29a7902f4de25fc593ffbaf6e62ccceb2fc"; }
{ locale = "de"; arch = "linux-x86_64"; sha1 = "eb69a42286f7d4a7106ddd24ec0c1f1356101956"; }
{ locale = "dsb"; arch = "linux-i686"; sha1 = "6683f985caece486b068a3ddd85e732903b1f738"; }
{ locale = "dsb"; arch = "linux-x86_64"; sha1 = "fd92cd5ab674762fce35fddc54b7dcdfa4829dcf"; }
{ locale = "el"; arch = "linux-i686"; sha1 = "91416a56f0221772a0f9691ad418602327d193e2"; }
{ locale = "el"; arch = "linux-x86_64"; sha1 = "ce89cdb9c8c88d7c4dcd089eef006b98171f5d04"; }
{ locale = "en-GB"; arch = "linux-i686"; sha1 = "8322cad2eacba0c064eb9ef2f5cd1d426411c648"; }
{ locale = "en-GB"; arch = "linux-x86_64"; sha1 = "c4102cc705610d7ad5b0cc530c600b2170f55419"; }
{ locale = "en-US"; arch = "linux-i686"; sha1 = "571067007e0dff64095b8eeb760aec7f78f367fd"; }
{ locale = "en-US"; arch = "linux-x86_64"; sha1 = "64a0422e42cf1d19e558377d5ecee6536917b414"; }
{ locale = "en-ZA"; arch = "linux-i686"; sha1 = "9f5611cd3043b1c267724b198ab04c16078b7818"; }
{ locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "3a22150e16a12d8fba9d21cef0c8e7ac434edf35"; }
{ locale = "eo"; arch = "linux-i686"; sha1 = "6502874b051c281e565cd0e0953698b88b69e5f5"; }
{ locale = "eo"; arch = "linux-x86_64"; sha1 = "3bdbcf6d324c43fbf7f3c71243df10a760f7fec2"; }
{ locale = "es-AR"; arch = "linux-i686"; sha1 = "83edce65b276d9989e66d11bfd4e9c1c87955364"; }
{ locale = "es-AR"; arch = "linux-x86_64"; sha1 = "6281d1d560fb7dd1a8bc1af0be046491a4ee4382"; }
{ locale = "es-CL"; arch = "linux-i686"; sha1 = "d394d731f7cde2b17bafd9d9d4cb6819fdbcbfd5"; }
{ locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b969107e5e840e1701672b3d5ba81ae3e53889be"; }
{ locale = "es-ES"; arch = "linux-i686"; sha1 = "a9c801142df7a932b2eba4d8f540b2579d0fabeb"; }
{ locale = "es-ES"; arch = "linux-x86_64"; sha1 = "96cb7bb0bd079d683304168b2b14255a1217fa92"; }
{ locale = "es-MX"; arch = "linux-i686"; sha1 = "c233e4da88f3fcc5eb5f2c45766c9197b5910dfc"; }
{ locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e04973316a340325888f0f2e06590773f81a7cf0"; }
{ locale = "et"; arch = "linux-i686"; sha1 = "22c59e40b39aefe356e8b5305ce720d4a2cdd0b7"; }
{ locale = "et"; arch = "linux-x86_64"; sha1 = "74256cbb8a76d835887727aa01f6e6a22936a43e"; }
{ locale = "eu"; arch = "linux-i686"; sha1 = "fa14a31fe15106f224df47a62c3e5ec16da1cb95"; }
{ locale = "eu"; arch = "linux-x86_64"; sha1 = "c8b6216d448f6f192e584ceb81fb22e5ac79a280"; }
{ locale = "fa"; arch = "linux-i686"; sha1 = "a1c67f4bec3f46de3cf6297e8a711d55f8189e3b"; }
{ locale = "fa"; arch = "linux-x86_64"; sha1 = "70d3b99652e8c690bbd05af7af9c65eeb780d455"; }
{ locale = "ff"; arch = "linux-i686"; sha1 = "1f42b51648eb296dfc339982c331e7d63bfbbd96"; }
{ locale = "ff"; arch = "linux-x86_64"; sha1 = "bd176a2bda1246e15dbbfb1b068f6b196a0ce266"; }
{ locale = "fi"; arch = "linux-i686"; sha1 = "2cd7757360efeca608b8a9b4b56c04f9aca89a79"; }
{ locale = "fi"; arch = "linux-x86_64"; sha1 = "dc130d8ab31c739e4406f8cc72dc32d3795db208"; }
{ locale = "fr"; arch = "linux-i686"; sha1 = "6dccfb2944006379271c308fa31d8f6a4bd6bb3d"; }
{ locale = "fr"; arch = "linux-x86_64"; sha1 = "aca6deabd521e29611fccbdeca3bf036a2239c1d"; }
{ locale = "fy-NL"; arch = "linux-i686"; sha1 = "4ffb659a341308a097ad26f1873ae243e581bba9"; }
{ locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "340caff2afeb8f9f01c84f780b6aef079ab257e6"; }
{ locale = "ga-IE"; arch = "linux-i686"; sha1 = "7adb1a44e0367b570437fdeae9f04c6f94f6702f"; }
{ locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "d427e6ca8287d97b27949ccb412207ef48d0cebe"; }
{ locale = "gd"; arch = "linux-i686"; sha1 = "2741c8bdcfad1edc36968bfac70c71b1a2837df4"; }
{ locale = "gd"; arch = "linux-x86_64"; sha1 = "430817ee768fd76dd29e76ae00488d6397f7b6f1"; }
{ locale = "gl"; arch = "linux-i686"; sha1 = "725c194c1e08293b44cbeb2a6791f4340a773b81"; }
{ locale = "gl"; arch = "linux-x86_64"; sha1 = "611e5f92796707379a9fd60ade840896eac4eabd"; }
{ locale = "gu-IN"; arch = "linux-i686"; sha1 = "720ee20fa7a74dc321ab7fa8a95732ff2e9e5250"; }
{ locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "778496274c362d9d854b1cc6ac9b1806ce8e708c"; }
{ locale = "he"; arch = "linux-i686"; sha1 = "f31729cecde50073e49d1387356c13060cf50c61"; }
{ locale = "he"; arch = "linux-x86_64"; sha1 = "72e9c8c602c403d16e4d60fbeb1bf5a415aabf25"; }
{ locale = "hi-IN"; arch = "linux-i686"; sha1 = "f2498d503005d0a1d7432bbc5a981be350421cfa"; }
{ locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "b003f7d484ec995fe4f10808d1141e20c6ed9bfc"; }
{ locale = "hr"; arch = "linux-i686"; sha1 = "de191039fb5acb5ca9ab556ef4ef6b6211b5b697"; }
{ locale = "hr"; arch = "linux-x86_64"; sha1 = "d5cd94ddd0b301dc0edf2f64bafa678864aa4595"; }
{ locale = "hsb"; arch = "linux-i686"; sha1 = "cf66178d0a18fcabcde897d4ba869da8d82fe999"; }
{ locale = "hsb"; arch = "linux-x86_64"; sha1 = "b83bbf3fb4d3aabdc961b9ef669dd2aa9f05ee52"; }
{ locale = "hu"; arch = "linux-i686"; sha1 = "0550d016ad044fdac193beee822171a0d891a34d"; }
{ locale = "hu"; arch = "linux-x86_64"; sha1 = "4f5916dac9d8efb333e2ad21370bd8a3d961b68f"; }
{ locale = "hy-AM"; arch = "linux-i686"; sha1 = "b72515f5e194a4c543c8a6487c858abe07e24db0"; }
{ locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "aef7fdc2f59edbde165c4e98de10f7e20e203f9d"; }
{ locale = "id"; arch = "linux-i686"; sha1 = "1db4444dbc9479cad1122925a9af73e358e09cbf"; }
{ locale = "id"; arch = "linux-x86_64"; sha1 = "a826b23b1783fff4d51451284301610cd26b578f"; }
{ locale = "is"; arch = "linux-i686"; sha1 = "2943bbe86e052280d610cbf3adceb89e949615b3"; }
{ locale = "is"; arch = "linux-x86_64"; sha1 = "c1b0bb2f22c11974e5e3a2d9b221601da07a858d"; }
{ locale = "it"; arch = "linux-i686"; sha1 = "2e3568872301c3897e83ee5692638a76fbef15fc"; }
{ locale = "it"; arch = "linux-x86_64"; sha1 = "5af762e2487171f6b41a6c1654b672c86e6964f8"; }
{ locale = "ja"; arch = "linux-i686"; sha1 = "40c042713ee07d4d375327515c7425d6733b926f"; }
{ locale = "ja"; arch = "linux-x86_64"; sha1 = "0dd2808378e870f553e02066f5ee78b11543e420"; }
{ locale = "kk"; arch = "linux-i686"; sha1 = "294eb8f7345f6baffc183605988bd1a57bbdd880"; }
{ locale = "kk"; arch = "linux-x86_64"; sha1 = "fbd9524ac8c1286e4c4bcf77efa8c9bf86d03948"; }
{ locale = "km"; arch = "linux-i686"; sha1 = "09b63d181398b1ff6a83849aa209952c0c5ce9b0"; }
{ locale = "km"; arch = "linux-x86_64"; sha1 = "d7478ba2f1b59ef83b1447789034bbdca78fab77"; }
{ locale = "kn"; arch = "linux-i686"; sha1 = "72e1e6e225790e4438da20cd2f69dce6e455fe53"; }
{ locale = "kn"; arch = "linux-x86_64"; sha1 = "3ef27144bb335d7a3f168bbadc0592a5fd554d78"; }
{ locale = "ko"; arch = "linux-i686"; sha1 = "5ef7f628aeb20d20ffa01316c234afafc2a6e2c7"; }
{ locale = "ko"; arch = "linux-x86_64"; sha1 = "cbf6a8d123e98ef1b99221083c743e962ccec58c"; }
{ locale = "lij"; arch = "linux-i686"; sha1 = "46f34520fc023f9d20781c9d5f13c683bc7f86bd"; }
{ locale = "lij"; arch = "linux-x86_64"; sha1 = "c07c7ca26034e53d29e868315201605b95d83e65"; }
{ locale = "lt"; arch = "linux-i686"; sha1 = "8ab47bda33eeec6d135049f775f06478480394b2"; }
{ locale = "lt"; arch = "linux-x86_64"; sha1 = "82b0c898ebf2e3714763640f2cabd00dd14c9078"; }
{ locale = "lv"; arch = "linux-i686"; sha1 = "1dba01bbf772b38c67b90d5e68f7e1a5c20f0b02"; }
{ locale = "lv"; arch = "linux-x86_64"; sha1 = "ade71dce8572628f99bf59132e8c0efd01a77016"; }
{ locale = "mai"; arch = "linux-i686"; sha1 = "486411e211d5505ca696a936db64682e04d43392"; }
{ locale = "mai"; arch = "linux-x86_64"; sha1 = "0239e14c627499220518d1f9a3f643315c1846c6"; }
{ locale = "mk"; arch = "linux-i686"; sha1 = "d7f314a0caec40e367faa29e071a81da2e50d802"; }
{ locale = "mk"; arch = "linux-x86_64"; sha1 = "4ad6c120360f90dea82282a6891419f17d0b5068"; }
{ locale = "ml"; arch = "linux-i686"; sha1 = "14a6534cba54ff08695b4322f6566a375f9cb713"; }
{ locale = "ml"; arch = "linux-x86_64"; sha1 = "badad6dfe2d794d508c4f8b061ef2a91209a8c32"; }
{ locale = "mr"; arch = "linux-i686"; sha1 = "1602ac0a3ac5c8c49a370a64d450aa06b490c8b5"; }
{ locale = "mr"; arch = "linux-x86_64"; sha1 = "a8108ecee8557be024c35818a99c30dfd811da83"; }
{ locale = "ms"; arch = "linux-i686"; sha1 = "02952ca95545f83231b36e9c05adc51ab955f9e5"; }
{ locale = "ms"; arch = "linux-x86_64"; sha1 = "164c31da7ad4272500b8906ee5d29c69ac285618"; }
{ locale = "nb-NO"; arch = "linux-i686"; sha1 = "c09a24b8f00409c7c93686586b091bfc33f22e52"; }
{ locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "9124e6b86f947dd4a7d2d7c9b8860dd28647d2f4"; }
{ locale = "nl"; arch = "linux-i686"; sha1 = "fb2dbbda6817d8fbcf9870a3233396051ce7c67f"; }
{ locale = "nl"; arch = "linux-x86_64"; sha1 = "bbf1e039a02556df8c68d6d49aa30f821bfdfae9"; }
{ locale = "nn-NO"; arch = "linux-i686"; sha1 = "9ff1ae86d0989f81ae3324e9ccbda2d2069281be"; }
{ locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "2be8ac327c7aa90abb38ee6ccfb0181194d5592e"; }
{ locale = "or"; arch = "linux-i686"; sha1 = "a6ff7bf9c96b1baa2d22e897d1083c9907300de5"; }
{ locale = "or"; arch = "linux-x86_64"; sha1 = "4ab6eff3bf8c99f3404a313f54ea3e0d48842d9f"; }
{ locale = "pa-IN"; arch = "linux-i686"; sha1 = "7ed256e6b3a5aec16eb0c5d3cab8c4cd5bf07999"; }
{ locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "da6511f215e206df0fe450225f2b2e4d8d541838"; }
{ locale = "pl"; arch = "linux-i686"; sha1 = "d3df1cc8647d6dc8576fcfd0c6a1e28a28c0ce8a"; }
{ locale = "pl"; arch = "linux-x86_64"; sha1 = "af999c2bcb0d865d38e336eaad5d6766fed291cc"; }
{ locale = "pt-BR"; arch = "linux-i686"; sha1 = "7369a73558f6df1218dac14c3259e08cfa80ac52"; }
{ locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "bd21ac0aca091de913201d2df5f914b9eeb83c8d"; }
{ locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b9a5cf1259a824edb54d4db9aa7db3637ab041a"; }
{ locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "f8004907aac63d8e9e4196424aa94db4fa1ff8c0"; }
{ locale = "rm"; arch = "linux-i686"; sha1 = "3403690013738c55f87c56d52ed8f9923a496b42"; }
{ locale = "rm"; arch = "linux-x86_64"; sha1 = "3b00a49b87fa900ecea9fdedce1b49d2560a81dd"; }
{ locale = "ro"; arch = "linux-i686"; sha1 = "6e5f1e0460792c080aa9ac82d3be69c047862203"; }
{ locale = "ro"; arch = "linux-x86_64"; sha1 = "2f09d74e5e39f9016ab5594f95f61b369cd6467c"; }
{ locale = "ru"; arch = "linux-i686"; sha1 = "df7b6c0806b27ade147dc6d42d181d599cc2c28b"; }
{ locale = "ru"; arch = "linux-x86_64"; sha1 = "1dedbe2a377cee5b32ca4aa0ec54eb24261238b0"; }
{ locale = "si"; arch = "linux-i686"; sha1 = "0309c2c97affcfa4c0d155eec2f9f4f586c940eb"; }
{ locale = "si"; arch = "linux-x86_64"; sha1 = "890a17e8f1d771e12d3e9c03ee0c8069654dae66"; }
{ locale = "sk"; arch = "linux-i686"; sha1 = "73fbaabb4644ae3726681bd6c49f6efa25a74a1a"; }
{ locale = "sk"; arch = "linux-x86_64"; sha1 = "573ba7d8526147e47f49fedb5f8c2e3bf0aaee82"; }
{ locale = "sl"; arch = "linux-i686"; sha1 = "abacb4f8ad9ed7eb42d5bbf3ebdce4136557bff5"; }
{ locale = "sl"; arch = "linux-x86_64"; sha1 = "cd1dc2a385e1911b5eaf69bc0cab13f257d8f68d"; }
{ locale = "son"; arch = "linux-i686"; sha1 = "5c1aff5bbf858e1e7f6fa2c2d996a396b8710124"; }
{ locale = "son"; arch = "linux-x86_64"; sha1 = "a6d7e023615936b0d61e956a4dadb6431febaa0c"; }
{ locale = "sq"; arch = "linux-i686"; sha1 = "19a7147c4a7de505ef0106b121640f5f651d6dbd"; }
{ locale = "sq"; arch = "linux-x86_64"; sha1 = "f1120ddacc1d5a124512c405855a4014fc910034"; }
{ locale = "sr"; arch = "linux-i686"; sha1 = "d21616842495521d3b71877ff2b694e019a4c2c2"; }
{ locale = "sr"; arch = "linux-x86_64"; sha1 = "43b9236a33a803fc0b0dd41cef93a5bf9fd91472"; }
{ locale = "sv-SE"; arch = "linux-i686"; sha1 = "17e06ab17369c234bef72b1a284bef39d5810671"; }
{ locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "8f8e2cb6acd475d7d75116c6494ab237b9531364"; }
{ locale = "ta"; arch = "linux-i686"; sha1 = "77fb9f32965af6a70275fbca308caf5bf88c3c8e"; }
{ locale = "ta"; arch = "linux-x86_64"; sha1 = "4a65de127708cbee44cc7238d14b9c0942d2673b"; }
{ locale = "te"; arch = "linux-i686"; sha1 = "37a556dafc73e5de983cb62fdd545d01f32f698d"; }
{ locale = "te"; arch = "linux-x86_64"; sha1 = "2f4549d5ef998449b553a5d6f62d01d0313c6c95"; }
{ locale = "th"; arch = "linux-i686"; sha1 = "f6a10236fe0fcc9d11c3c5aee3bd84365bb06013"; }
{ locale = "th"; arch = "linux-x86_64"; sha1 = "c2694589cc28b938fd7a079378e5fa99cdd7c98b"; }
{ locale = "tr"; arch = "linux-i686"; sha1 = "e7888b70a1a90613fd7d38a5a7735857385ae683"; }
{ locale = "tr"; arch = "linux-x86_64"; sha1 = "6ebef5649484bfda154c44232a9e3aae239c0990"; }
{ locale = "uk"; arch = "linux-i686"; sha1 = "fe5ffb931bd7e5bb403f6aef6b879c2c9446721e"; }
{ locale = "uk"; arch = "linux-x86_64"; sha1 = "4b53989b554929b085b120788e1e30d5232dedb4"; }
{ locale = "uz"; arch = "linux-i686"; sha1 = "bed269a3a7e3fc82d2fb1931632be9b04fe6b6da"; }
{ locale = "uz"; arch = "linux-x86_64"; sha1 = "786d51639cd7e952f4c73e9d91b50f6da0ba9242"; }
{ locale = "vi"; arch = "linux-i686"; sha1 = "db04c29c9038c856c67e99c77c0628c377bcd8f7"; }
{ locale = "vi"; arch = "linux-x86_64"; sha1 = "d9525ad0b0069ae05cad173ab567198b67fc13dc"; }
{ locale = "xh"; arch = "linux-i686"; sha1 = "2a8bbe15f2b2b242e9787704e542a6c0a9ed93bc"; }
{ locale = "xh"; arch = "linux-x86_64"; sha1 = "532e224a166addee7b6068bbcee7e6c0b1c3f6df"; }
{ locale = "zh-CN"; arch = "linux-i686"; sha1 = "514bc01fe7055a050898a01f0c1ed4773fb33b7e"; }
{ locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "0d5154d3d5062c7e1ff33112ad0a1399ba548b29"; }
{ locale = "zh-TW"; arch = "linux-i686"; sha1 = "291ee73bc5540f8089f6b7bbdf8160c931cc4dd7"; }
{ locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "16df041eeaf6a3885d52569db1781635e519fd3f"; }
{ locale = "ach"; arch = "linux-i686"; sha1 = "4cd453a4439460164e15ac767483335f0ab153ba"; }
{ locale = "ach"; arch = "linux-x86_64"; sha1 = "2915386e271a710daf63b5fa6e4e6450cd339a23"; }
{ locale = "af"; arch = "linux-i686"; sha1 = "2c64d95f8f7a82931906bb8ae6fcd6f2c976aa54"; }
{ locale = "af"; arch = "linux-x86_64"; sha1 = "b9ca1f6a18283eb9eebd39173c33d7d0bbc5afe2"; }
{ locale = "an"; arch = "linux-i686"; sha1 = "0a6c228d7f46bad34b431bb49d6bdc60c2778008"; }
{ locale = "an"; arch = "linux-x86_64"; sha1 = "a509951f13eaab7661676f833dd9a83125309c82"; }
{ locale = "ar"; arch = "linux-i686"; sha1 = "372dffb81f1be1966e95bba114f982497a2caee0"; }
{ locale = "ar"; arch = "linux-x86_64"; sha1 = "82dd88dd2e4ded3c25f7ffd6b21dd51a0b693d43"; }
{ locale = "as"; arch = "linux-i686"; sha1 = "52dbcef7858b57652ebd18e8b24af0c656f659e2"; }
{ locale = "as"; arch = "linux-x86_64"; sha1 = "aafa712986beb5d28c51f07678f9e1f80489e199"; }
{ locale = "ast"; arch = "linux-i686"; sha1 = "0f206582c5f934a490f68d5226d1829397cc45a7"; }
{ locale = "ast"; arch = "linux-x86_64"; sha1 = "af49662ae762693ae916fcf491d331ad86acbf66"; }
{ locale = "az"; arch = "linux-i686"; sha1 = "c9bbf9024acffabe1651d1ca9d0c13ce574d021b"; }
{ locale = "az"; arch = "linux-x86_64"; sha1 = "a946941ad0fa094c54b76f0f31501cdd24582402"; }
{ locale = "be"; arch = "linux-i686"; sha1 = "de19ed80796ba4423347654bbab170d72aea24b5"; }
{ locale = "be"; arch = "linux-x86_64"; sha1 = "d566f37f8f908d621a51278c40e971be4a277749"; }
{ locale = "bg"; arch = "linux-i686"; sha1 = "bb7c41fd32b4b97ae25c1d7b3aee187810800387"; }
{ locale = "bg"; arch = "linux-x86_64"; sha1 = "b6063f82ce73e5070c983aa69d9c34dab74bc460"; }
{ locale = "bn-BD"; arch = "linux-i686"; sha1 = "41b8d113a8d09d8fd28f4808ea630fcf732bee26"; }
{ locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4c255a14338a602e9b8827f55c8c3f705a76f421"; }
{ locale = "bn-IN"; arch = "linux-i686"; sha1 = "c24df5f5dc5493d912b34e526617ed22075f3bb1"; }
{ locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b1be6518bc16874245e5a532d03a2bd7dc4fdc23"; }
{ locale = "br"; arch = "linux-i686"; sha1 = "cfea274abe713d3c5df63b21489ba23766c97dad"; }
{ locale = "br"; arch = "linux-x86_64"; sha1 = "10e5d0f6435a487b3331b76ac0eee51a2edb3485"; }
{ locale = "bs"; arch = "linux-i686"; sha1 = "66462c0af5e9a7f9052db2d9616a44ca08d51713"; }
{ locale = "bs"; arch = "linux-x86_64"; sha1 = "3a78840fe663d7876ea00cd6ecb0530f16146adf"; }
{ locale = "ca"; arch = "linux-i686"; sha1 = "8321046f8cbba3d3cdea7381f2ec4323b2ba7cfb"; }
{ locale = "ca"; arch = "linux-x86_64"; sha1 = "599c81a054ad7ef7c27f3be1da2289ed3404255b"; }
{ locale = "cs"; arch = "linux-i686"; sha1 = "89480e776bc5add4c9270f8f92e56d1a0207e629"; }
{ locale = "cs"; arch = "linux-x86_64"; sha1 = "7d7d40a7e74670eaaacb66d6a3706710d2d1cd4c"; }
{ locale = "cy"; arch = "linux-i686"; sha1 = "087b794e0988484dfd7d67488c3ac197e5529c42"; }
{ locale = "cy"; arch = "linux-x86_64"; sha1 = "3fd60bd6b42497d0968095294c94dcc11bdbbeda"; }
{ locale = "da"; arch = "linux-i686"; sha1 = "2e22d7ff7c0a7a2f8bbf2c43f5da24c3eaf4ba8c"; }
{ locale = "da"; arch = "linux-x86_64"; sha1 = "dc852f942018f08f2c3f56b3315dd039f0dd4159"; }
{ locale = "de"; arch = "linux-i686"; sha1 = "a78fb79f0640fc018e4d7807bea41c6239bbdf2e"; }
{ locale = "de"; arch = "linux-x86_64"; sha1 = "53a7c3e38d81df588db042bd8ee524aa67713f76"; }
{ locale = "dsb"; arch = "linux-i686"; sha1 = "3721ac332975aa52f692bce9467f3919be16b4cb"; }
{ locale = "dsb"; arch = "linux-x86_64"; sha1 = "602bee9867cead4ac79c05d8cb99d022de1169c6"; }
{ locale = "el"; arch = "linux-i686"; sha1 = "f3809bd2b456b9548cf8415d4f15e08bf64f2561"; }
{ locale = "el"; arch = "linux-x86_64"; sha1 = "6ed7be3d3f90ff01f3a8505ea61c69f1dc3f34af"; }
{ locale = "en-GB"; arch = "linux-i686"; sha1 = "3bff3a0f76e6744cb1e1ab78a5c24bd9183db1d5"; }
{ locale = "en-GB"; arch = "linux-x86_64"; sha1 = "87033acbf2d3277e699b1b54552a88bd33590f75"; }
{ locale = "en-US"; arch = "linux-i686"; sha1 = "65a852e9774f9f61764d01e4025b64027f10d270"; }
{ locale = "en-US"; arch = "linux-x86_64"; sha1 = "99e40bfcbc4146111059cbec1557fbe3a7295285"; }
{ locale = "en-ZA"; arch = "linux-i686"; sha1 = "476b5ac7062932584ef634b9bd536495fef974d6"; }
{ locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51334ee2ee6bdfd7e0b02ed44d95b9d0e86a73af"; }
{ locale = "eo"; arch = "linux-i686"; sha1 = "e2973dc7e1decebb24a4a90e8a4a4307ccd7d151"; }
{ locale = "eo"; arch = "linux-x86_64"; sha1 = "4bb52d9197c854ceca4a9d8fed6cec016c823ea7"; }
{ locale = "es-AR"; arch = "linux-i686"; sha1 = "2335e0f3bbae6eefdd1aa7ba58530f0ee9bd3534"; }
{ locale = "es-AR"; arch = "linux-x86_64"; sha1 = "8fdfc2defee83edeabc5648dcf4e4630862424b2"; }
{ locale = "es-CL"; arch = "linux-i686"; sha1 = "34201da70923a68566856aaf5f33e33f80c3943a"; }
{ locale = "es-CL"; arch = "linux-x86_64"; sha1 = "03ddd10a75a6a779bc0ff1f06f2ac0f4189c21db"; }
{ locale = "es-ES"; arch = "linux-i686"; sha1 = "b6456b85055178db737c3b2dbebec14ca7c373ec"; }
{ locale = "es-ES"; arch = "linux-x86_64"; sha1 = "165c5abc403322964de6fbda189c766c1490f57d"; }
{ locale = "es-MX"; arch = "linux-i686"; sha1 = "defd933884c5f97c63e8f07dbd42162d7365b5a6"; }
{ locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e0588631c0886ca5785f713c2fd4d52e53c901f6"; }
{ locale = "et"; arch = "linux-i686"; sha1 = "732b79384c69659d674a849dfc0a4cc0905af5c0"; }
{ locale = "et"; arch = "linux-x86_64"; sha1 = "30ea22676bf24205595fe3cef17f17e5fa7224c0"; }
{ locale = "eu"; arch = "linux-i686"; sha1 = "a0dd6bc63af523f12f77da3d93f842434dd45fbe"; }
{ locale = "eu"; arch = "linux-x86_64"; sha1 = "02e8d43be34bdd57d999ff34e93289d721fd5e18"; }
{ locale = "fa"; arch = "linux-i686"; sha1 = "13cb0fc5c3f2faf5907c71a88d9fb6dcf295534f"; }
{ locale = "fa"; arch = "linux-x86_64"; sha1 = "3688cb2d85620d03d8ae90535758384e0eca0b79"; }
{ locale = "ff"; arch = "linux-i686"; sha1 = "de4bfeaf65c5db67029f7800d3818f60a15e0a2f"; }
{ locale = "ff"; arch = "linux-x86_64"; sha1 = "3b87f8e2cbafc70264da1afabc9d4a365acdf445"; }
{ locale = "fi"; arch = "linux-i686"; sha1 = "e0d1d40ae201852a7afb5c5c3995d1eaac461880"; }
{ locale = "fi"; arch = "linux-x86_64"; sha1 = "d519fa72ae3acd5c5e9590242a1569e2559e7099"; }
{ locale = "fr"; arch = "linux-i686"; sha1 = "4c35aade33675ee9e6ee0ba3d2826da06509f048"; }
{ locale = "fr"; arch = "linux-x86_64"; sha1 = "a7f2c8c24766d4ad12a0144007eac93b99ffbc83"; }
{ locale = "fy-NL"; arch = "linux-i686"; sha1 = "c809f3baf308c5cd7d9edc1a53f0b7cdb876a97c"; }
{ locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "182c27021f7192c50be9973850a848b138e60d0a"; }
{ locale = "ga-IE"; arch = "linux-i686"; sha1 = "8bfa83a569409ae579aaf27f6878f90c9789128b"; }
{ locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "a68688038d975428a232f721da7f638f08fc0157"; }
{ locale = "gd"; arch = "linux-i686"; sha1 = "be223957dfcf41db552e4e63ec879e4c21eb40f4"; }
{ locale = "gd"; arch = "linux-x86_64"; sha1 = "d226c4ea4f987a9a8f01a8e6365e2c93ae748988"; }
{ locale = "gl"; arch = "linux-i686"; sha1 = "482a19d31d1543d2645ba290d6ab2404f200b81d"; }
{ locale = "gl"; arch = "linux-x86_64"; sha1 = "3bdac94346710be5c2c160153321f5bd9118c291"; }
{ locale = "gu-IN"; arch = "linux-i686"; sha1 = "aafc01904d22edf7e6c4db94b3154875736de3be"; }
{ locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "3309dc84bf4d0b4f9aafce95f5af3ee3a01acd79"; }
{ locale = "he"; arch = "linux-i686"; sha1 = "aa0f6c2f4d8f4cbd974d39cd0ef85ce7795bb00a"; }
{ locale = "he"; arch = "linux-x86_64"; sha1 = "17cabcb46375f04a32ac4e156a30b97022406a46"; }
{ locale = "hi-IN"; arch = "linux-i686"; sha1 = "51d3c83ff1584c315a18916100a9b2481d8b5ab8"; }
{ locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "0e725242eada7456e15c91acd63d37018167df71"; }
{ locale = "hr"; arch = "linux-i686"; sha1 = "3f68ab7a61fd8b6731aaf3089907d9e436a2e5e1"; }
{ locale = "hr"; arch = "linux-x86_64"; sha1 = "5934536499a2ded279a802110d8d8f0e802cc8c9"; }
{ locale = "hsb"; arch = "linux-i686"; sha1 = "c212eaaa6329f9872e8545d634551d083e0f2db1"; }
{ locale = "hsb"; arch = "linux-x86_64"; sha1 = "b6edd09144919be6932baa037f7f09ed26d5c102"; }
{ locale = "hu"; arch = "linux-i686"; sha1 = "63eeba0d15763340d802802008cce554a8bbb07d"; }
{ locale = "hu"; arch = "linux-x86_64"; sha1 = "c593a84cfb69ef7ee5d2a8affb15189147d0c2e1"; }
{ locale = "hy-AM"; arch = "linux-i686"; sha1 = "b2b63b30ebb9a220b610c0b1696b5da55d641710"; }
{ locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1c6dcf9b30383a5566448ab4e92ef0a90613e505"; }
{ locale = "id"; arch = "linux-i686"; sha1 = "fdaacae2217fe365eb54b977562ed8c889c95de9"; }
{ locale = "id"; arch = "linux-x86_64"; sha1 = "9def4f5554110b6af64bc91f4ad0f03a6444dfae"; }
{ locale = "is"; arch = "linux-i686"; sha1 = "7b9183a80a87febfd7e8cd57b93e2edabea763a8"; }
{ locale = "is"; arch = "linux-x86_64"; sha1 = "a3ab726b981b8763dbddd74a61d85c4576597fe6"; }
{ locale = "it"; arch = "linux-i686"; sha1 = "eced59fb6ddd04967917142301435ea121671f62"; }
{ locale = "it"; arch = "linux-x86_64"; sha1 = "e80d94b8b8868e357c571710046af3155e558a5f"; }
{ locale = "ja"; arch = "linux-i686"; sha1 = "1c3cd61ba760650c7d44d98b8db66b4c7801efad"; }
{ locale = "ja"; arch = "linux-x86_64"; sha1 = "e0c4b3f510eb73d06c68b5b91c707ce5c508b05e"; }
{ locale = "kk"; arch = "linux-i686"; sha1 = "20ca59199a6a30bd64dcb943c2a1135885a535b4"; }
{ locale = "kk"; arch = "linux-x86_64"; sha1 = "87703e39a0ea9c402cc535fb4cc04dca5b9025d4"; }
{ locale = "km"; arch = "linux-i686"; sha1 = "17cd8d702482cbc1c4bb377b29e0f278cdfc8e15"; }
{ locale = "km"; arch = "linux-x86_64"; sha1 = "e7372fc31e6cd893fc0ea52e2fc4105c249310d3"; }
{ locale = "kn"; arch = "linux-i686"; sha1 = "947b986d5cb5454677d7b9bbcebaf437f0bcd16d"; }
{ locale = "kn"; arch = "linux-x86_64"; sha1 = "7f99697ebc560e2705e4aae628ad56a132af7eb6"; }
{ locale = "ko"; arch = "linux-i686"; sha1 = "b3a76512be4f2b86cad800d46d3f6c9ff9c883db"; }
{ locale = "ko"; arch = "linux-x86_64"; sha1 = "3e5c4860e15651ede1ffe569062e23f474b44994"; }
{ locale = "lij"; arch = "linux-i686"; sha1 = "36e66cb829024c631f91a9a05e4d4c10c5862c45"; }
{ locale = "lij"; arch = "linux-x86_64"; sha1 = "216d0066b5289335c12339dd109d8f11dc4fa937"; }
{ locale = "lt"; arch = "linux-i686"; sha1 = "a784ca15952a69965aa377a2dd6a0232ece0f8a4"; }
{ locale = "lt"; arch = "linux-x86_64"; sha1 = "f172acd6474891177446b61bd538af09cfb30351"; }
{ locale = "lv"; arch = "linux-i686"; sha1 = "161f527142c8d8551509e6132871c4901b2d64e7"; }
{ locale = "lv"; arch = "linux-x86_64"; sha1 = "d0428e31ef283749f1691d787ad6983ed0677a50"; }
{ locale = "mai"; arch = "linux-i686"; sha1 = "4bd535fdaf01bf8d001bc1147f0ad9e26f0bf39f"; }
{ locale = "mai"; arch = "linux-x86_64"; sha1 = "fc2de8c24f0271f56b3af97e8e4bf14179d6122d"; }
{ locale = "mk"; arch = "linux-i686"; sha1 = "9aacbee890a7bc3d714d85d16ab2d278dabd8e1b"; }
{ locale = "mk"; arch = "linux-x86_64"; sha1 = "75c23b833812a9d0b66727b3ed28a0e494bbacb1"; }
{ locale = "ml"; arch = "linux-i686"; sha1 = "cf29131fbf6d768e79ef5228cf066355a46b4466"; }
{ locale = "ml"; arch = "linux-x86_64"; sha1 = "df4b6ba0c457f15eee2dcade4882b720c1e39506"; }
{ locale = "mr"; arch = "linux-i686"; sha1 = "ab0cc9339d486d576e7004fd35d685421f7853f1"; }
{ locale = "mr"; arch = "linux-x86_64"; sha1 = "4b10dd376a6599f60ac85d41d465f136c4d4ebdc"; }
{ locale = "ms"; arch = "linux-i686"; sha1 = "3244858bd6405dc507eb4044be6b8ebaf7100e1f"; }
{ locale = "ms"; arch = "linux-x86_64"; sha1 = "9db094658b9e6d4849c1ede8438427400704c80c"; }
{ locale = "nb-NO"; arch = "linux-i686"; sha1 = "9a907fec062b94a8f8dd7e981ea2ab4f36bcd944"; }
{ locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eafc796f1597464abe3ffd9353e7d098b528525a"; }
{ locale = "nl"; arch = "linux-i686"; sha1 = "fd19ace880cfd29a4612b2543e2eab1fbbabe4a4"; }
{ locale = "nl"; arch = "linux-x86_64"; sha1 = "3d8bb5f293a6f18c3f171dcfb52b737a7946aa95"; }
{ locale = "nn-NO"; arch = "linux-i686"; sha1 = "0a893fef8363fa980bc2393a2e23241f0c07956c"; }
{ locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "3e066a7834e998422f00e10b65e58ecf9dfc7519"; }
{ locale = "or"; arch = "linux-i686"; sha1 = "2448c7e794e926894208abb4d25ea3b4c5db0cbb"; }
{ locale = "or"; arch = "linux-x86_64"; sha1 = "a096f8152416d6af72a28fe25a849feb22ab835e"; }
{ locale = "pa-IN"; arch = "linux-i686"; sha1 = "d974227fe54d7db75fc3b2fd773cf69ff71d647b"; }
{ locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b318ede019b019ee108d79e4f355311518a05963"; }
{ locale = "pl"; arch = "linux-i686"; sha1 = "c9aa90d984c2112f3e0e629f95b694b6281fe1df"; }
{ locale = "pl"; arch = "linux-x86_64"; sha1 = "8b3c1d3ebf013cf1c7bb448131b51920e1475240"; }
{ locale = "pt-BR"; arch = "linux-i686"; sha1 = "47318f7ea3655b6fa876d77eea22a499d458b445"; }
{ locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a1d42692baf6602f69fa436ed5eb6d21c60f3786"; }
{ locale = "pt-PT"; arch = "linux-i686"; sha1 = "c97407ba107843f8f1f78ef70028b60bbc94ea87"; }
{ locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "68d1e7771a74e238ce54cff60e7279c672e4fbcd"; }
{ locale = "rm"; arch = "linux-i686"; sha1 = "cecb38e05ff1c5e6c0d79781efcf2973db6f68f0"; }
{ locale = "rm"; arch = "linux-x86_64"; sha1 = "5f576fdbbc9626fa9ef3986c2611285ea7fb34e3"; }
{ locale = "ro"; arch = "linux-i686"; sha1 = "b97dab8ea7387a69f499c6ab9827bc81b0ffd1ad"; }
{ locale = "ro"; arch = "linux-x86_64"; sha1 = "6d816a79fc954a186f9a3e9d8a909a392e0c8cb0"; }
{ locale = "ru"; arch = "linux-i686"; sha1 = "3f3a3b51d488a4940211951d698c59c33199a0a0"; }
{ locale = "ru"; arch = "linux-x86_64"; sha1 = "6d07bd223fd7848c4f92170f299df7091feda8dc"; }
{ locale = "si"; arch = "linux-i686"; sha1 = "7b4cf9716f6c4333b143b61ce0ae7f7bf8832839"; }
{ locale = "si"; arch = "linux-x86_64"; sha1 = "3887efcc6f8a87bdee12aeaeb1e4ad9666e1fba0"; }
{ locale = "sk"; arch = "linux-i686"; sha1 = "5d5f9db2a454e40c20db7728140b1e7b71e0f316"; }
{ locale = "sk"; arch = "linux-x86_64"; sha1 = "d8a0e81544d9055f39d0b8e425499e5da7ae2cde"; }
{ locale = "sl"; arch = "linux-i686"; sha1 = "f67d1c091a83a129e0f9da21c40a21e54192dfab"; }
{ locale = "sl"; arch = "linux-x86_64"; sha1 = "cf404307b7a5c1346c84f12272526ccc34509794"; }
{ locale = "son"; arch = "linux-i686"; sha1 = "72d178beda4c3141ccccb0fd75d1a96e72b8f522"; }
{ locale = "son"; arch = "linux-x86_64"; sha1 = "aad4b807fcbf460eb0fa0234d36092e0ca75e286"; }
{ locale = "sq"; arch = "linux-i686"; sha1 = "72f0b6ff9321bf171e7991853d37416e79db2598"; }
{ locale = "sq"; arch = "linux-x86_64"; sha1 = "c25dd452bd1a76d7aff4542caf4fd02f7cdcf751"; }
{ locale = "sr"; arch = "linux-i686"; sha1 = "ab0f31e1f704d125d3deb73dae6b5513f4f66cec"; }
{ locale = "sr"; arch = "linux-x86_64"; sha1 = "680edf9cb98b47ef92e3a9fbaa1bb66fc927003a"; }
{ locale = "sv-SE"; arch = "linux-i686"; sha1 = "10e1fbc3cc3f2284fd28ce06c3af22d7010fa664"; }
{ locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "1317fc854581a50a4291bb38ff6954fe37d25efa"; }
{ locale = "ta"; arch = "linux-i686"; sha1 = "81188a3e20db29040202b24f99b073daef759f05"; }
{ locale = "ta"; arch = "linux-x86_64"; sha1 = "230488965e68f9170ca7b6623a599e4ec592012d"; }
{ locale = "te"; arch = "linux-i686"; sha1 = "ff6048c8c949ef3b4fa821bedd95c046e3a7a7e4"; }
{ locale = "te"; arch = "linux-x86_64"; sha1 = "02954fbabaf0688e1588652d5be08cb3784ff2aa"; }
{ locale = "th"; arch = "linux-i686"; sha1 = "77759d296e5c85741aad42124e51913005215b71"; }
{ locale = "th"; arch = "linux-x86_64"; sha1 = "8572f88439049bff5e32f4e9929f07c23dcde569"; }
{ locale = "tr"; arch = "linux-i686"; sha1 = "07101c61d8a1a7a153c9993f29c2ae7bd46c6ae2"; }
{ locale = "tr"; arch = "linux-x86_64"; sha1 = "dbd64d165bc9bb01545b6d31acdd4fb874f250a9"; }
{ locale = "uk"; arch = "linux-i686"; sha1 = "0e00df0f77fd8c7adb1a7822285a8410df92dd48"; }
{ locale = "uk"; arch = "linux-x86_64"; sha1 = "064760c31c2b78fd155a548f18be6bd82746aa7d"; }
{ locale = "uz"; arch = "linux-i686"; sha1 = "39e185b485b6808619f4fb0853e161d31dfc07f4"; }
{ locale = "uz"; arch = "linux-x86_64"; sha1 = "8842689c5894ea116f637691627f8513e22e00fb"; }
{ locale = "vi"; arch = "linux-i686"; sha1 = "db96505385175ae4267ae6774c6f6375db8f7dca"; }
{ locale = "vi"; arch = "linux-x86_64"; sha1 = "8a9e2e5b17619857a0a2c795ffd7c04d1a767559"; }
{ locale = "xh"; arch = "linux-i686"; sha1 = "2e3e0aeff9143b74e464d532eb4c94dc72165303"; }
{ locale = "xh"; arch = "linux-x86_64"; sha1 = "e24a2d824ffb5fe5f1f8678b8567fb58e925f3d4"; }
{ locale = "zh-CN"; arch = "linux-i686"; sha1 = "6dbc06e58b5bf2b3b8f109c2ff1840ecfb1fdfd3"; }
{ locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ae7868f33c6e4b15af3f6f6fcc18814a726d9c9f"; }
{ locale = "zh-TW"; arch = "linux-i686"; sha1 = "4a46a545fbd4236b0eff0ade9ce57dc53458ad67"; }
{ locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "acec465483c0a2c445e9a3c9c5166c21308b9697"; }
];
}

View File

@ -3,7 +3,7 @@
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx
, cairo, gst_all_1, icu, libpng, jemalloc
, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
, enableGTK3 ? false
, debugBuild ? false
, # If you want the resulting program to call itself "Firefox" instead
@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx cairo
gst_all_1.gstreamer gst_all_1.gst-plugins-base icu libpng
jemalloc
gstreamer gst_plugins_base icu libpng jemalloc
libpulseaudio # only headers are needed
]
++ lib.optional enableGTK3 gtk3;
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
"--enable-system-pixman"
"--enable-system-sqlite"
"--enable-system-cairo"
"--enable-gstreamer=1.0"
"--enable-gstreamer"
"--enable-startup-notification"
"--enable-content-sandbox" # available since 26.0, but not much info available
"--disable-content-sandbox-reporter" # keeping disabled for now
@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer"
"--disable-updater"
"--disable-pulseaudio"
"--enable-jemalloc"
]
++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"

View File

@ -41,7 +41,7 @@ stdenv.mkDerivation {
--suffix-each LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
--set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)"

View File

@ -6,7 +6,7 @@ version = if ARGV.empty?
ARGV[0]
end
base_path = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases"
base_path = "http://archive.mozilla.org/pub/thunderbird/releases"
Source = Struct.new(:hash, :arch, :locale, :filename)

View File

@ -4,123 +4,123 @@
# ruby generate_source.rb > source.nix
{
version = "38.1.0";
version = "38.2.0";
sources = [
{ locale = "ar"; arch = "linux-i686"; sha1 = "0b5babaeec839aedb879b98dc540a3c44e1c0a39"; }
{ locale = "ar"; arch = "linux-x86_64"; sha1 = "c70e123c8e04a8366e2a96a948006caf3b084d2f"; }
{ locale = "ast"; arch = "linux-i686"; sha1 = "a17ad952ce2ec1dfe6dc797b4377ae694930578c"; }
{ locale = "ast"; arch = "linux-x86_64"; sha1 = "dbf6b871e6ac7a5701a5e8ce1aa1c974e43c62db"; }
{ locale = "be"; arch = "linux-i686"; sha1 = "e7f9d73339eb55d374a172445c11da33ecff8f8f"; }
{ locale = "be"; arch = "linux-x86_64"; sha1 = "b619fc248f8cd704eebbf92bd999949e0a0d2935"; }
{ locale = "bg"; arch = "linux-i686"; sha1 = "09cb9ee2b5a9d25430467961657a4d60610437d2"; }
{ locale = "bg"; arch = "linux-x86_64"; sha1 = "c8b63f07ee7ac0d2f4e18f6e401d012c8bfcceae"; }
{ locale = "bn-BD"; arch = "linux-i686"; sha1 = "d20033996503ad6f690e8fe8f8201bf02c453c98"; }
{ locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f8b45a57a2ed4ce232d20224afdc6c4e0338743a"; }
{ locale = "br"; arch = "linux-i686"; sha1 = "567ac67210f34a267e53f74f31cc91131f07eaa7"; }
{ locale = "br"; arch = "linux-x86_64"; sha1 = "9cef9f6a5fbca4e1d0bc912dddf07200f1f8f8a4"; }
{ locale = "ca"; arch = "linux-i686"; sha1 = "346d439ea1092f3c9a7d7077bb2fe3910d672935"; }
{ locale = "ca"; arch = "linux-x86_64"; sha1 = "b099cc648318d7826949110d75851108f8dd2669"; }
{ locale = "cs"; arch = "linux-i686"; sha1 = "3b72f45ccd22beb2fdfbc92014b4a3ccfa80e76b"; }
{ locale = "cs"; arch = "linux-x86_64"; sha1 = "e38710c2d1f90202813d95b2fde32fdde4d4091e"; }
{ locale = "cy"; arch = "linux-i686"; sha1 = "12a179f42fb8c3a11fc5985667e4f604e14ba8c5"; }
{ locale = "cy"; arch = "linux-x86_64"; sha1 = "6407a7b3cd5b4dcb306823a4085c85f960c292f9"; }
{ locale = "da"; arch = "linux-i686"; sha1 = "9c49871f3ff4ecfe33077c6ebf05e166d19651a0"; }
{ locale = "da"; arch = "linux-x86_64"; sha1 = "8d6299fe5998113da4c623083957a204296affd5"; }
{ locale = "de"; arch = "linux-i686"; sha1 = "06a6c73f4a640060ae7b8aa02011558d2767acb2"; }
{ locale = "de"; arch = "linux-x86_64"; sha1 = "8fffb7568b982c1202de754cb2a2e8fcb16910f5"; }
{ locale = "dsb"; arch = "linux-i686"; sha1 = "31a8674c191829fa4abeb403053b8266f23b983c"; }
{ locale = "dsb"; arch = "linux-x86_64"; sha1 = "bb86a2aafcf5d6d358eeda8e572956b90ca1e275"; }
{ locale = "el"; arch = "linux-i686"; sha1 = "3db0fafa71f7e1fe0cc9036c343d12aa35988e04"; }
{ locale = "el"; arch = "linux-x86_64"; sha1 = "4ddd0c373b00621fa271a1301e75930f5acc6657"; }
{ locale = "en-GB"; arch = "linux-i686"; sha1 = "6e240781d53a1853ee5be2eee18cdcb17949a228"; }
{ locale = "en-GB"; arch = "linux-x86_64"; sha1 = "d203791c4ce8da5d2e68a3485f3bed8933f929d3"; }
{ locale = "en-US"; arch = "linux-i686"; sha1 = "0e4097922c16620c04bb68cd3474f813cf8c60e0"; }
{ locale = "en-US"; arch = "linux-x86_64"; sha1 = "39bfc23dd04a59f3465e8a0b583ca72fc9bc2c8a"; }
{ locale = "es-AR"; arch = "linux-i686"; sha1 = "82887b30873baff493688a3d9b2b8acb0e335ed1"; }
{ locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d48e6977535776e5547969c486abb68f4a7f70d2"; }
{ locale = "es-ES"; arch = "linux-i686"; sha1 = "d9aad735745addbbe619ce51c6b793ce10a967bf"; }
{ locale = "es-ES"; arch = "linux-x86_64"; sha1 = "c429c1b6e38523b9912d5c9ae1425a48075fb2fd"; }
{ locale = "et"; arch = "linux-i686"; sha1 = "9fe1aaab4c8f53b4d01b1374511121a3cba3b38d"; }
{ locale = "et"; arch = "linux-x86_64"; sha1 = "b5759e44971e09703f4112499c85347fc30a5ef1"; }
{ locale = "eu"; arch = "linux-i686"; sha1 = "0e91e95057246a9843faca8a0c53b772f329d51d"; }
{ locale = "eu"; arch = "linux-x86_64"; sha1 = "b5cf9660cc877d3ca6943f4d365f02f3b5eb4ffa"; }
{ locale = "fi"; arch = "linux-i686"; sha1 = "116118d2e4540502c2b71c9d1fcf121923016d8d"; }
{ locale = "fi"; arch = "linux-x86_64"; sha1 = "fdbefa73fb355d4a97b7be2cc7f2785757c62d72"; }
{ locale = "fr"; arch = "linux-i686"; sha1 = "f9055260509b2bc85a7e8a95d13c90be4443054f"; }
{ locale = "fr"; arch = "linux-x86_64"; sha1 = "a5b880cea53c7ae278f6d6bb70208d697d2aa928"; }
{ locale = "fy-NL"; arch = "linux-i686"; sha1 = "77ca3d79ff9d8ebef0dac367b0025515663d11b0"; }
{ locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "40f3c82cc93286032facea886636e95558ecedf3"; }
{ locale = "ga-IE"; arch = "linux-i686"; sha1 = "1ecc581714b9ee079bea5de14cffdd35cea8a253"; }
{ locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "e5c270d9f4443068ba83dd6dcd7fb1bc318a8957"; }
{ locale = "gd"; arch = "linux-i686"; sha1 = "c6db2b2d54257eb9376a95a63a8ec630661b859f"; }
{ locale = "gd"; arch = "linux-x86_64"; sha1 = "bb561dd4a2cd0e72f6ec8d4abd7d30505603fbdf"; }
{ locale = "gl"; arch = "linux-i686"; sha1 = "00d3aa2504711fa89190068427e9c8c3fdb20f8e"; }
{ locale = "gl"; arch = "linux-x86_64"; sha1 = "4f0950bf70cea56969bf044d459799d54675b0ef"; }
{ locale = "he"; arch = "linux-i686"; sha1 = "dbfc82675022ddf4ca69bd64aedd62b7c670b6e0"; }
{ locale = "he"; arch = "linux-x86_64"; sha1 = "7c28e93a85543021861eb9314d3661edda04b086"; }
{ locale = "hr"; arch = "linux-i686"; sha1 = "b39ac627848ade0617430e284fed55d3ae846b8d"; }
{ locale = "hr"; arch = "linux-x86_64"; sha1 = "3ae901876dbe64fa30969dedc1d60e092a4f7924"; }
{ locale = "hsb"; arch = "linux-i686"; sha1 = "0d20bc9316882548fa3ce9797af3fdc95ff88cfe"; }
{ locale = "hsb"; arch = "linux-x86_64"; sha1 = "3a94683a81a76ce73453f2b3466c256b3e3e1e66"; }
{ locale = "hu"; arch = "linux-i686"; sha1 = "88998fc8b637cbde34c37120e637ebd1a080f75b"; }
{ locale = "hu"; arch = "linux-x86_64"; sha1 = "374cc24a23cc80c552044c43dbc2547d9adb2661"; }
{ locale = "hy-AM"; arch = "linux-i686"; sha1 = "1a6ad2c0d105daadf68db573871f45e6a83a8781"; }
{ locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "a43817b520218e6f5b83365bb6d5784f82fd3c61"; }
{ locale = "id"; arch = "linux-i686"; sha1 = "be03aa731ca6385f447d21e5b089fce89abdb605"; }
{ locale = "id"; arch = "linux-x86_64"; sha1 = "dcadd18432c9dbd31c23ba260c1b278e96620c55"; }
{ locale = "is"; arch = "linux-i686"; sha1 = "e40cba8fb39620ac3e065e27ae9bb2756d5f0808"; }
{ locale = "is"; arch = "linux-x86_64"; sha1 = "81d7b1212a49d3e3f4cce405bb32ab8b57b53183"; }
{ locale = "it"; arch = "linux-i686"; sha1 = "d1719489c95ad26dee243f4b13a7a3c13c80731a"; }
{ locale = "it"; arch = "linux-x86_64"; sha1 = "a5a86761df367d015d6b63f85db7c091be9f7557"; }
{ locale = "ja"; arch = "linux-i686"; sha1 = "cb934acf447a20761fb61be41a5093011962ed74"; }
{ locale = "ja"; arch = "linux-x86_64"; sha1 = "b08541d43c30c64df64f1fa9e3e444a00a1ce66b"; }
{ locale = "ko"; arch = "linux-i686"; sha1 = "5f6b9a343ad93c969ff864775cacbf008fd5683c"; }
{ locale = "ko"; arch = "linux-x86_64"; sha1 = "e1551063d40661de6a0067bb6d51ad0e89ad08f6"; }
{ locale = "lt"; arch = "linux-i686"; sha1 = "9c07080670ec9f1a57aec634f81cfd73defd9ccf"; }
{ locale = "lt"; arch = "linux-x86_64"; sha1 = "44eeb1185f75ba2a8e4a34c161161862a12dc54c"; }
{ locale = "nb-NO"; arch = "linux-i686"; sha1 = "26d12843a80bcbe4ea8008429bd075794e9dab20"; }
{ locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "89fec10ec8be9a298fed4ae5ebda68b117ee35ad"; }
{ locale = "nl"; arch = "linux-i686"; sha1 = "13bea7053d38cb7d00950cf4d13fe06cab33b4e7"; }
{ locale = "nl"; arch = "linux-x86_64"; sha1 = "1c927583ab814caac16ece34156110826ddbdf37"; }
{ locale = "nn-NO"; arch = "linux-i686"; sha1 = "1c8ca9891483fe489f26b82d5b81562223af1210"; }
{ locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "88db986d9de826407f1692c1fddc64068eb190bb"; }
{ locale = "pa-IN"; arch = "linux-i686"; sha1 = "db25c5d46fbab8692882bf32422eb334a5790ed4"; }
{ locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a50bf1a7277a7bbbc162a547916abae63a49becd"; }
{ locale = "pl"; arch = "linux-i686"; sha1 = "b4500262a14c781546966bc713c1a574b29bd221"; }
{ locale = "pl"; arch = "linux-x86_64"; sha1 = "196c388eb6bc00099196cc6774fa2fa327b36d81"; }
{ locale = "pt-BR"; arch = "linux-i686"; sha1 = "19e5c34a64a0a2d7258f285ad3d4182e0c1859e2"; }
{ locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "cf17768842cdbfc3fb4f922655e102ace1420b4c"; }
{ locale = "pt-PT"; arch = "linux-i686"; sha1 = "60cb1312edde3d610ba7b786f7e0030066c097fc"; }
{ locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "82535ac23e75f77767a844735b5950109ed7ef15"; }
{ locale = "rm"; arch = "linux-i686"; sha1 = "15bdb9f7b06ad28ab5bb6a219afc2cf98bd94689"; }
{ locale = "rm"; arch = "linux-x86_64"; sha1 = "ba4aa04ea6380d6ca9e5776806f478da3a18acf2"; }
{ locale = "ro"; arch = "linux-i686"; sha1 = "30319593b61aa454c72e372c47c97fd98e425cfa"; }
{ locale = "ro"; arch = "linux-x86_64"; sha1 = "364734483184c769370ca2948dc9335bfe6fe1ba"; }
{ locale = "ru"; arch = "linux-i686"; sha1 = "5b5bf58fb96072590d4d3e9e1f7239c352910b49"; }
{ locale = "ru"; arch = "linux-x86_64"; sha1 = "bee00bc517deaa46d5e409d80b54f19bf8133e44"; }
{ locale = "si"; arch = "linux-i686"; sha1 = "17d313829c47fc57256181b5a916605860f5c20f"; }
{ locale = "si"; arch = "linux-x86_64"; sha1 = "69d536b6c14b29a86503cf9d492e20318e6ca550"; }
{ locale = "sk"; arch = "linux-i686"; sha1 = "01e1fa5218459dc6e32d7a4d51bd120bc96c3f13"; }
{ locale = "sk"; arch = "linux-x86_64"; sha1 = "24cfbe861062ba1f3e5847b4b05c925a2db52518"; }
{ locale = "sl"; arch = "linux-i686"; sha1 = "b01bd9bff5d31998f69cbc18c31df3798346d5bb"; }
{ locale = "sl"; arch = "linux-x86_64"; sha1 = "ab0a0ffc3816923384f519caef4b07830526a3b1"; }
{ locale = "sq"; arch = "linux-i686"; sha1 = "e310ae1b0f32c67ccc03097fe9917f37eca3b271"; }
{ locale = "sq"; arch = "linux-x86_64"; sha1 = "2d746d4743ca5be9dfb082129f2527ef4453e8f8"; }
{ locale = "sr"; arch = "linux-i686"; sha1 = "9053948612aa9de8898d7e3606eb08d855fff41a"; }
{ locale = "sr"; arch = "linux-x86_64"; sha1 = "b3c621a120756aba91c985deb06a31051b63468f"; }
{ locale = "sv-SE"; arch = "linux-i686"; sha1 = "ef7480dc06af7376387a27da47e49bd2e5078453"; }
{ locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "c23f9b1832ab1d0317d09017c5a39824638da921"; }
{ locale = "ta-LK"; arch = "linux-i686"; sha1 = "eea8f9b4832b6bdc61b0cd4dedb5d78aae02c953"; }
{ locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "75f4856b28f589098599a786a242681a911ff92e"; }
{ locale = "tr"; arch = "linux-i686"; sha1 = "5ca3104abb9636ffcd5cdf913b14f48ba2a03977"; }
{ locale = "tr"; arch = "linux-x86_64"; sha1 = "8edb7885b506d1b4288bded01dccb00b89c929f2"; }
{ locale = "uk"; arch = "linux-i686"; sha1 = "2776e9dc93263ac8c7cf757e0a03f71b0a3d2a9c"; }
{ locale = "uk"; arch = "linux-x86_64"; sha1 = "7ec1dc5df673394c3e61293d92d369045a0d2bd6"; }
{ locale = "vi"; arch = "linux-i686"; sha1 = "1582f2552bc644729ffcb0d42b405e065a56ca9c"; }
{ locale = "vi"; arch = "linux-x86_64"; sha1 = "5e24d1ce8e6b74883dabb70dc1ac03c034e6e659"; }
{ locale = "zh-CN"; arch = "linux-i686"; sha1 = "f8df723a211049e853628b5f2dd7240b4216871c"; }
{ locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2cb69569638090ae09d552e95aaae40b876144e3"; }
{ locale = "zh-TW"; arch = "linux-i686"; sha1 = "ca3790624a90e49e7271bccf3870a8da629df074"; }
{ locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "ebe6e83ee9f2fce3823d01c4900231bc00682fba"; }
{ locale = "ar"; arch = "linux-i686"; sha1 = "e78d69e77c7a41a5d1db177d1ff2011620d0030e"; }
{ locale = "ar"; arch = "linux-x86_64"; sha1 = "0392f81672db2005796966f125a50722d62437d5"; }
{ locale = "ast"; arch = "linux-i686"; sha1 = "583d831cc2a2b9707e76ecead28d830ce4971b0e"; }
{ locale = "ast"; arch = "linux-x86_64"; sha1 = "741ce8879c18477048eace82676a4e3dc8a9c248"; }
{ locale = "be"; arch = "linux-i686"; sha1 = "f838f7034293f188566d5866a8e02a7045477deb"; }
{ locale = "be"; arch = "linux-x86_64"; sha1 = "cd32f6da77e0c9f0d82659105f696daa8ad71798"; }
{ locale = "bg"; arch = "linux-i686"; sha1 = "784d23acca591ebceca30c67e0468e53c9ee2776"; }
{ locale = "bg"; arch = "linux-x86_64"; sha1 = "547e8d013635e88e1575a68b0ea11b375c430213"; }
{ locale = "bn-BD"; arch = "linux-i686"; sha1 = "7ddc0b28640e4e43fa5d70790a46be663962be99"; }
{ locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b56e9b9e781f73074d2c4ee19e5bd267c6aad9ec"; }
{ locale = "br"; arch = "linux-i686"; sha1 = "a28f9b548ae4c081e792b77dda3395874b355d13"; }
{ locale = "br"; arch = "linux-x86_64"; sha1 = "2c37c60ea39218abe1e937be7584ca9966cc6c81"; }
{ locale = "ca"; arch = "linux-i686"; sha1 = "1fecd72a93a5d76c506dfc5c95e6f0e613f5e89f"; }
{ locale = "ca"; arch = "linux-x86_64"; sha1 = "32063fa5a27838a4ca9f5dd7c091e01b464653b2"; }
{ locale = "cs"; arch = "linux-i686"; sha1 = "32ccce02f24ba87cd1c8e5997feb95c6e54b8cbd"; }
{ locale = "cs"; arch = "linux-x86_64"; sha1 = "98ce62455ffbb373eb47f3c107042510b4ceae23"; }
{ locale = "cy"; arch = "linux-i686"; sha1 = "4eb168b3858107239fef24c97da279c5f33c737a"; }
{ locale = "cy"; arch = "linux-x86_64"; sha1 = "4d1dea9922cebc848bb45d82d413968b99f06e73"; }
{ locale = "da"; arch = "linux-i686"; sha1 = "87b5de179a6be0cc8cca4c125fe32b6c0a23e08b"; }
{ locale = "da"; arch = "linux-x86_64"; sha1 = "06a0bd4ac2a7709703c3cc860268fcdbccf2ac83"; }
{ locale = "de"; arch = "linux-i686"; sha1 = "00f40a074255e4f3fe2d3bead1a37b1d406bca68"; }
{ locale = "de"; arch = "linux-x86_64"; sha1 = "9e58b681b85028a932104295a8e39e209a21e549"; }
{ locale = "dsb"; arch = "linux-i686"; sha1 = "0ee112d071dd3fb580521bf730e762e314c3c0fb"; }
{ locale = "dsb"; arch = "linux-x86_64"; sha1 = "69a01bc3875151dd3a7b283f8edc44896778f00d"; }
{ locale = "el"; arch = "linux-i686"; sha1 = "3ac525634c74814cd8fd73b841b4aa8095af6ca4"; }
{ locale = "el"; arch = "linux-x86_64"; sha1 = "cce461a7de648677ada0e7ab144c6b492044a370"; }
{ locale = "en-GB"; arch = "linux-i686"; sha1 = "321795d34d8708fff3149d99db41abbde3d59a38"; }
{ locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f9435cb01e929591ab54f313442c42fc31007041"; }
{ locale = "en-US"; arch = "linux-i686"; sha1 = "415c1b828bad3680da7b6f0ac6c6d85be3002ca5"; }
{ locale = "en-US"; arch = "linux-x86_64"; sha1 = "56eddaa513439a3c66deed3b1396660cecfb7224"; }
{ locale = "es-AR"; arch = "linux-i686"; sha1 = "9963d13b6b6ab8fe4df7f69fee812e8ed3c79f2b"; }
{ locale = "es-AR"; arch = "linux-x86_64"; sha1 = "4c64efa0c7b3b46e3db8c2a8bf1afa7fd59b1afb"; }
{ locale = "es-ES"; arch = "linux-i686"; sha1 = "7fe8db80f25a155a4fbe606b43e8ea192bdeb2d3"; }
{ locale = "es-ES"; arch = "linux-x86_64"; sha1 = "2a5f57603236604829e5d75103216b2239354b04"; }
{ locale = "et"; arch = "linux-i686"; sha1 = "f99161ca84c7bf660198481757a97505bff41016"; }
{ locale = "et"; arch = "linux-x86_64"; sha1 = "220155dbc6f604f3a3daaaa5bafd8f096409931a"; }
{ locale = "eu"; arch = "linux-i686"; sha1 = "117546c2ea2d2410e0d0da57f79b8a17e39fea0d"; }
{ locale = "eu"; arch = "linux-x86_64"; sha1 = "ec22ab958396424a1134c6e2e7a6f182ef38d2e3"; }
{ locale = "fi"; arch = "linux-i686"; sha1 = "2115972a75ab795253b1ac639b3c939cc90b186c"; }
{ locale = "fi"; arch = "linux-x86_64"; sha1 = "c59da6176e5278f05c489449d477a8b508612efc"; }
{ locale = "fr"; arch = "linux-i686"; sha1 = "76a50fa696f0f489cd129fd5590853a6b689987e"; }
{ locale = "fr"; arch = "linux-x86_64"; sha1 = "772b5eab11f94b2f7713e43b7c384f9d24d407bc"; }
{ locale = "fy-NL"; arch = "linux-i686"; sha1 = "156b5e3a99bb2ee1bc489f3f1d06643860709d55"; }
{ locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "02c52d17d1d2d98d1281ae957205eabb0dae4c3a"; }
{ locale = "ga-IE"; arch = "linux-i686"; sha1 = "f1e8e28988504c4bec059348942d38b3c1a3b3f3"; }
{ locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "80491a140c3d3b29f46eb882c41fa84842e3e44b"; }
{ locale = "gd"; arch = "linux-i686"; sha1 = "412e478fb2a56fb53ca27fdf01346a1c8f3e7a53"; }
{ locale = "gd"; arch = "linux-x86_64"; sha1 = "31a4aee19453bc754db2149e2cfa952ee6829ef7"; }
{ locale = "gl"; arch = "linux-i686"; sha1 = "70e5d130dc08a86d7ae7b28e29fbd7485e750a6e"; }
{ locale = "gl"; arch = "linux-x86_64"; sha1 = "b0735f3f05f36b174399300c8eb8c851aa92ea1c"; }
{ locale = "he"; arch = "linux-i686"; sha1 = "28eda52f1a9b13c15faeb87b241bef6be001f856"; }
{ locale = "he"; arch = "linux-x86_64"; sha1 = "d311d07f86e3280d422dcaa76925308dec1bbf29"; }
{ locale = "hr"; arch = "linux-i686"; sha1 = "d19f966f31fa298a4d6d2b61d83a407c950b94ba"; }
{ locale = "hr"; arch = "linux-x86_64"; sha1 = "b730ed1556bc3337dba3d4391773746c344fd16d"; }
{ locale = "hsb"; arch = "linux-i686"; sha1 = "bb6e4f02d1b7ebfa56c3510fe7707218c7ee0fbc"; }
{ locale = "hsb"; arch = "linux-x86_64"; sha1 = "826ce8b68e61a6c6e340ab7e2766f7a432927aa0"; }
{ locale = "hu"; arch = "linux-i686"; sha1 = "af06b6b2d52dba79ca21cfc7e9eff1b135ba79f8"; }
{ locale = "hu"; arch = "linux-x86_64"; sha1 = "c90755e7048bb1b33d0407010db770a3a20f144a"; }
{ locale = "hy-AM"; arch = "linux-i686"; sha1 = "56992cb46445b4f389e62e5e621a09ee37558864"; }
{ locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "764c62cb4b44f25947ef778cd78de2ce17546da6"; }
{ locale = "id"; arch = "linux-i686"; sha1 = "02170606677c5d1177e98fec537ab9997d1d2bb2"; }
{ locale = "id"; arch = "linux-x86_64"; sha1 = "9079cdf731c69ad204ec2e4d92b1b9e7e476b8f8"; }
{ locale = "is"; arch = "linux-i686"; sha1 = "59e47a5d030c8a18faaff875d06fc2fee8ff2fa9"; }
{ locale = "is"; arch = "linux-x86_64"; sha1 = "207c2e8671f9266c70b03c42e4b6952c7b139fcc"; }
{ locale = "it"; arch = "linux-i686"; sha1 = "cb724a67e5e0413f670602cb351fd8c7538d4074"; }
{ locale = "it"; arch = "linux-x86_64"; sha1 = "24901bb227c7df290d030bfaccf048b6fbbd2bf6"; }
{ locale = "ja"; arch = "linux-i686"; sha1 = "8df9208999956eea39f4774c482da5db3ed5662b"; }
{ locale = "ja"; arch = "linux-x86_64"; sha1 = "6f29589c86eee9cf95410c0e0098e2b96bffb4d0"; }
{ locale = "ko"; arch = "linux-i686"; sha1 = "e266fb9dba4368e80d206c248fe3c1bc202dc064"; }
{ locale = "ko"; arch = "linux-x86_64"; sha1 = "106a6152a5f91407ee1cde665f70b39fbe6bfe69"; }
{ locale = "lt"; arch = "linux-i686"; sha1 = "3385483d2db12873b645add7e16455874cd2ac91"; }
{ locale = "lt"; arch = "linux-x86_64"; sha1 = "fb2aafa56998000c6f08730c467d7fb3e37a7f70"; }
{ locale = "nb-NO"; arch = "linux-i686"; sha1 = "93a2f4e45b47335cad077581601b1da6becb5e5b"; }
{ locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "7d609d01d0cf46b2d94f15253e0e1cd1ba42d6ac"; }
{ locale = "nl"; arch = "linux-i686"; sha1 = "35d4c18935d64b4ca371eed75def0cda549715ad"; }
{ locale = "nl"; arch = "linux-x86_64"; sha1 = "168a20038f76eafec00a63501019a55b59b7c9b0"; }
{ locale = "nn-NO"; arch = "linux-i686"; sha1 = "3fc3c67c8f60814f70e8b53d7896d392b38b1af6"; }
{ locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "be54f52ea730447b53e020c1ed0c804a7f22bf40"; }
{ locale = "pa-IN"; arch = "linux-i686"; sha1 = "8a4db5fea163ebbb7738f86d878f371323b0da10"; }
{ locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "71ac68f8b117549e7a66207ca556cfc951827406"; }
{ locale = "pl"; arch = "linux-i686"; sha1 = "1d5fcf5ce59e552e1d122249a158d4956e6e9610"; }
{ locale = "pl"; arch = "linux-x86_64"; sha1 = "1519da5234c5a7a7ba569c1d995a8ecefcd266aa"; }
{ locale = "pt-BR"; arch = "linux-i686"; sha1 = "913ba6f41cdbde5a4d0bb7d67751c29d29a4b294"; }
{ locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ca6e7915533cacd710980711e8143061e6e7fc2e"; }
{ locale = "pt-PT"; arch = "linux-i686"; sha1 = "5578ba04b7d431a78728cb08cd25513c269db003"; }
{ locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "a2a42233fac046158dbe8ee2f743cddb53df151a"; }
{ locale = "rm"; arch = "linux-i686"; sha1 = "e8abf6f03cb05a42c47c6dcb68ab9226229fcc14"; }
{ locale = "rm"; arch = "linux-x86_64"; sha1 = "0a69eb3783653ee645c443b24feb1c100a2e0688"; }
{ locale = "ro"; arch = "linux-i686"; sha1 = "73fb22e26cd39b32ba42d427d200dd20f6206884"; }
{ locale = "ro"; arch = "linux-x86_64"; sha1 = "9ea1dbfc283efb72abca7b7ef97c168c54026b0b"; }
{ locale = "ru"; arch = "linux-i686"; sha1 = "fa9e4eb824a7f2d09bfcf66eb7740e4bdff24131"; }
{ locale = "ru"; arch = "linux-x86_64"; sha1 = "a0f6e30587f549f44140bbd9fcb7c3abe12e5ec3"; }
{ locale = "si"; arch = "linux-i686"; sha1 = "cbed568fa683f3b95bd5e63470f5035d67135c8b"; }
{ locale = "si"; arch = "linux-x86_64"; sha1 = "613576519cc050facff46a4c419f997d2a9660f4"; }
{ locale = "sk"; arch = "linux-i686"; sha1 = "e22226e26405d9aac5bac49e458f08980ffa7419"; }
{ locale = "sk"; arch = "linux-x86_64"; sha1 = "d96029ff232537645a6d9f93394e02e9c68b8c2a"; }
{ locale = "sl"; arch = "linux-i686"; sha1 = "cfb39baf1c3637d4e77f177d4075ec6a1d78e522"; }
{ locale = "sl"; arch = "linux-x86_64"; sha1 = "78264ea3ff48ff1e5e89c174a181636fe5498f7d"; }
{ locale = "sq"; arch = "linux-i686"; sha1 = "c55b151b1945ca507fef2e00a492fda7dc622f80"; }
{ locale = "sq"; arch = "linux-x86_64"; sha1 = "75138732d8f82a879c0ba3c657dde6e41192f55c"; }
{ locale = "sr"; arch = "linux-i686"; sha1 = "34e9e650bc5adc27a4262897914d8b97d65d9d95"; }
{ locale = "sr"; arch = "linux-x86_64"; sha1 = "236189aa59dee7d991d2c7e15467666d9fa1c4ec"; }
{ locale = "sv-SE"; arch = "linux-i686"; sha1 = "924e01fad080da3c2f52834d9f55511cc2c56781"; }
{ locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "2c5ad3832956d427f5a415681145fb2e32a1be71"; }
{ locale = "ta-LK"; arch = "linux-i686"; sha1 = "b87a9ec4cc658cfb0fcf45f82546ed385104bbdd"; }
{ locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "db30febd32a867e125df3039dfcef74055f4428e"; }
{ locale = "tr"; arch = "linux-i686"; sha1 = "513c56c7308d6562a14b268e17f6f7d79e4860da"; }
{ locale = "tr"; arch = "linux-x86_64"; sha1 = "9f69846c81b847736b917521fae2f6c1cdcaea38"; }
{ locale = "uk"; arch = "linux-i686"; sha1 = "d43edd5cce1f121e2676b3876ca4579142e7df21"; }
{ locale = "uk"; arch = "linux-x86_64"; sha1 = "4eeddcadc812dc66a7c510e39018baf98ed928bc"; }
{ locale = "vi"; arch = "linux-i686"; sha1 = "75832dada4af3880d00d5918a2d8b2e5ad50fb53"; }
{ locale = "vi"; arch = "linux-x86_64"; sha1 = "8521ce3fb633bd9deafb2bdbba5b8a487a08e23a"; }
{ locale = "zh-CN"; arch = "linux-i686"; sha1 = "22ec231d065c73627c39147b34c656dfdcd27d14"; }
{ locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "fa037a2ba7e8559ed8bbbc86772dcff24eada7e3"; }
{ locale = "zh-TW"; arch = "linux-i686"; sha1 = "685ec1667d29b45a144cba118ad97eb3b340feb8"; }
{ locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "859f97ddbb05c76495fd09c4f039bc6324cc60a1"; }
];
}

View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
homepage = https://projects.coin-or.org/Cbc;
license = lib.licenses.epl10;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.linux;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
description = "A mixed integer programming solver";
};
}

View File

@ -37,17 +37,17 @@ assert rtmpSupport -> rtmpdump != null;
let
rel = "Isengard";
ffmpeg_2_6_3 = fetchurl {
url = "https://github.com/xbmc/FFmpeg/archive/2.6.3-${rel}.tar.gz";
sha256 = "129nwrj9i758vz9xakpp68sm1l7z4in0krq6ayyqnpsnm54r9xlc";
ffmpeg_2_6_4 = fetchurl {
url = "https://github.com/xbmc/FFmpeg/archive/2.6.4-${rel}.tar.gz";
sha256 = "0gsjz8sr0dqq68gcln29xhz3h35n77769h1gb0ias0apmpaad1r4";
};
in stdenv.mkDerivation rec {
name = "kodi-" + version;
version = "15.0";
version = "15.1";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
sha256 = "1zqdmqffjfr5219cvpbvq9v1z5p5pzi2m9xs9lzk4jz7rxrs3nr7";
sha256 = "0187qxzyq4nhzbcwbhi71j4bl5k7pwjryhklil90gy5ziw6n3ckj";
};
buildInputs = [
@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
--replace "/bin/bash" "${bash}/bin/bash -ex"
cp ${ffmpeg_2_6_3} tools/depends/target/ffmpeg/ffmpeg-2.6.3-${rel}.tar.gz
cp ${ffmpeg_2_6_4} tools/depends/target/ffmpeg/ffmpeg-2.6.4-${rel}.tar.gz
'';
preConfigure = ''

View File

@ -0,0 +1,33 @@
{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio
, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "0.8.0";
name = "rkt-${version}";
src = fetchFromGitHub {
rev = "v${version}";
owner = "coreos";
repo = "rkt";
sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0";
};
buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
preConfigure = ''
./autogen.sh
'';
installPhase = ''
mkdir -p $out/bin
cp -Rv build-rkt-${version}/bin/* $out/bin
'';
meta = with lib; {
description = "A fast, composable, and secure App Container runtime for Linux";
homepage = http://rkt.io;
license = licenses.asl20;
maintainers = with maintainers; [ ragge ];
platforms = platforms.linux;
};
}

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
};
propagatedUserEnvPkgs =
[ gnome3.gnome_themes_standard gnome3.libgnomekbd sound-theme-freedesktop ];
[ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
# https://bugzilla.gnome.org/show_bug.cgi?id=752596
enableParallelBuilding = false;
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
preFixup = with gnome3; ''
wrapProgram $out/bin/gnome-control-center \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
for i in $out/share/applications/*; do
substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
done

View File

@ -55,8 +55,8 @@ in mkDerivation (rec {
inherit version;
src = fetchgit {
url = git://github.com/ghcjs/ghcjs.git;
rev = "fb1faa9cb0a11a8b27b0033dfdb07aafb6add35e"; # master branch
sha256 = "1vqf19059j86h3rnbvzcp55bdqd5dkw3krb5vkw5mgsmva2g8sch";
rev = "39c1cb6d5d2551b306a7957a0e7f682f4a048490"; # master branch
sha256 = "1v2hpmhdssgf1jmchiwkvp5j8j6rw3k0hpkf326vb8l1b0kbmibr";
};
isLibrary = true;
isExecutable = true;

View File

@ -1,95 +0,0 @@
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
let
loader386 = "${glibc}/lib/ld-linux.so.2";
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
loaderArm = "${glibc}/lib/ld-linux.so.3";
in
stdenv.mkDerivation {
name = "go-1.0.3";
src = fetchurl {
url = http://go.googlecode.com/files/go1.0.3.src.tar.gz;
sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz";
};
buildInputs = [ bison glibc bash makeWrapper ];
# I'm not sure what go wants from its 'src', but the go installation manual
# describes an installation keeping the src.
preUnpack = ''
mkdir -p $out/share
cd $out/share
'';
prePatch = ''
cd ..
if [ ! -d go ]; then
mv * go
fi
cd go
patchShebangs ./ # replace /bin/bash
# !!! substituteInPlace does not seems to be effective.
sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
#sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
# -e 's,/bin/echo,${coreutils}/bin/echo,' \
# src/pkg/exec/exec_test.go
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
# The os test wants to read files in an existing path. Just it don't be /usr/bin.
sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
'';
patches = [ ./cacert.patch ./1_0-opt-error.patch ./1_0-gcc-bug.patch ];
GOOS = "linux";
GOARCH = if stdenv.system == "i686-linux" then "386"
else if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "armv5tel-linux" then "arm"
else throw "Unsupported system";
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
installPhase = ''
mkdir -p "$out/bin"
export GOROOT="$(pwd)/"
export GOBIN="$out/bin"
export PATH="$GOBIN:$PATH"
cd ./src
./all.bash
cd -
# Wrap the tools to define the location of the
# libraries.
for a in go gofmt godoc; do
wrapProgram "$out/bin/$a" \
--set "GOROOT" $out/share/go \
${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""}
done
# Copy the emacs configuration for Go files.
mkdir -p "$out/share/emacs/site-lisp"
cp ./misc/emacs/* $out/share/emacs/site-lisp/
'';
meta = {
branch = "1.0";
homepage = http://golang.org/;
description = "The Go Programming language";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [ pierron viric ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -1,79 +0,0 @@
{ stdenv, fetchurl, bison, bash, makeWrapper }:
stdenv.mkDerivation {
name = "go-1.1.2";
src = fetchurl {
url = http://go.googlecode.com/files/go1.1.2.src.tar.gz;
sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz";
};
buildInputs = [ bison bash makeWrapper ];
preUnpack = ''
mkdir -p $out/share
cd $out/share
'';
prePatch = ''
cd ..
if [ ! -d go ]; then
mv * go
fi
cd go
patchShebangs ./ # replace /bin/bash
rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
# The os test wants to read files in an existing path. Just it don't be /usr/bin.
sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
# Disable some tests
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go
'';
# Unfortunately we have to use Mac OS X's own GCC
preBuild = ''
export PATH=/usr/bin:$PATH
'';
#patches = [ ./cacert.patch ];
GOOS = "darwin";
GOARCH = if stdenv.system == "x86_64-darwin" then "amd64" else "386";
installPhase = ''
mkdir -p "$out/bin"
# CGO is broken on Maverick. See: http://code.google.com/p/go/issues/detail?id=5926
# Reevaluate once go 1.1.3 is out
export CGO_ENABLED=0
export GOROOT="$(pwd)/"
export GOBIN="$out/bin"
export PATH="$GOBIN:$PATH"
cd ./src
./all.bash
cd -
# Wrap the tools to define the location of the
# libraries.
for a in go gofmt godoc; do
wrapProgram "$out/bin/$a" \
--set "GOROOT" $out/share/go
done
# Copy the emacs configuration for Go files.
mkdir -p "$out/share/emacs/site-lisp"
cp ./misc/emacs/* $out/share/emacs/site-lisp/
'';
meta = with stdenv.lib; {
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ zef ];
platforms = platforms.darwin;
};
}

View File

@ -1,101 +0,0 @@
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc
, removeGodocExternals ? false }:
let
loader386 = "${glibc}/lib/ld-linux.so.2";
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
loaderArm = "${glibc}/lib/ld-linux.so.3";
in
stdenv.mkDerivation {
name = "go-1.1.2";
src = fetchurl {
url = http://go.googlecode.com/files/go1.1.2.src.tar.gz;
sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz";
};
buildInputs = [ bison glibc bash makeWrapper ];
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
# I'm not sure what go wants from its 'src', but the go installation manual
# describes an installation keeping the src.
preUnpack = ''
mkdir -p $out/share
cd $out/share
'';
prePatch = ''
cd ..
if [ ! -d go ]; then
mv * go
fi
cd go
patchShebangs ./ # replace /bin/bash
# !!! substituteInPlace does not seems to be effective.
sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
#sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
# -e 's,/bin/echo,${coreutils}/bin/echo,' \
# src/pkg/exec/exec_test.go
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
# The os test wants to read files in an existing path. Just it don't be /usr/bin.
sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
# ParseInLocation fails the test
sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
'' + stdenv.lib.optionalString removeGodocExternals ''
sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html
'';
patches = [ ./cacert.patch ];
GOOS = "linux";
GOARCH = if stdenv.system == "i686-linux" then "386"
else if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "armv5tel-linux" then "arm"
else throw "Unsupported system";
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
installPhase = ''
mkdir -p "$out/bin"
export GOROOT="$(pwd)/"
export GOBIN="$out/bin"
export PATH="$GOBIN:$PATH"
cd ./src
./all.bash
cd -
# Wrap the tools to define the location of the
# libraries.
for a in go gofmt godoc; do
wrapProgram "$out/bin/$a" \
--set "GOROOT" $out/share/go \
${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""}
done
# Copy the emacs configuration for Go files.
mkdir -p "$out/share/emacs/site-lisp"
cp ./misc/emacs/* $out/share/emacs/site-lisp/
'';
meta = with stdenv.lib; {
branch = "1.1";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ pierron viric ];
platforms = platforms.linux;
};
}

View File

@ -1,92 +0,0 @@
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc
, libgpgerror }:
let
loader386 = "${glibc}/lib/ld-linux.so.2";
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
loaderArm = "${glibc}/lib/ld-linux.so.3";
in
stdenv.mkDerivation {
name = "go-1.2.2";
src = fetchurl {
url = https://storage.googleapis.com/golang/go1.2.2.src.tar.gz;
sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167";
};
buildInputs = [ bison glibc bash makeWrapper libgpgerror ];
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
# I'm not sure what go wants from its 'src', but the go installation manual
# describes an installation keeping the src.
preUnpack = ''
mkdir -p $out/share
cd $out/share
'';
prePatch = ''
cd ..
if [ ! -d go ]; then
mv * go
fi
cd go
patchShebangs ./ # replace /bin/bash
# !!! substituteInPlace does not seems to be effective.
sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
#sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
# -e 's,/bin/echo,${coreutils}/bin/echo,' \
# src/pkg/exec/exec_test.go
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
# The os test wants to read files in an existing path. Just it don't be /usr/bin.
sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
# ParseInLocation fails the test
sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
'';
patches = [ ./cacert-1.2.patch ];
GOOS = "linux";
GOARCH = if stdenv.system == "i686-linux" then "386"
else if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "armv5tel-linux" then "arm"
else throw "Unsupported system";
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
GO386 = 387; # from Arch: don't assume sse2 on i686
installPhase = ''
mkdir -p "$out/bin"
export GOROOT="$(pwd)/"
export GOBIN="$out/bin"
export PATH="$GOBIN:$PATH"
cd ./src
./all.bash
cd -
# Copy the emacs configuration for Go files.
mkdir -p "$out/share/emacs/site-lisp"
cp ./misc/emacs/* $out/share/emacs/site-lisp/
'';
meta = with stdenv.lib; {
branch = "1.2";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ pierron viric ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -1,113 +0,0 @@
{ stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:
let
loader386 = "${glibc}/lib/ld-linux.so.2";
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
loaderArm = "${glibc}/lib/ld-linux.so.3";
srcs = {
golang = fetchurl {
url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz;
sha1 = "b54b7deb7b7afe9f5d9a3f5dd830c7dede35393a";
};
tools = fetchhg {
url = https://code.google.com/p/go.tools/;
rev = "e1c276c4e679";
sha256 = "0x62njflwkd99i2ixbksg6mjppl1wfg86f0g3swn350l1h0xzp76";
};
};
in
stdenv.mkDerivation {
name = "go-1.3.3";
src = srcs.golang;
# perl is used for testing go vet
buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ;
# I'm not sure what go wants from its 'src', but the go installation manual
# describes an installation keeping the src.
preUnpack = ''
mkdir -p $out/share
cd $out/share
'';
postUnpack = ''
mkdir -p $out/share/go/src/pkg/code.google.com/p/
cp -rv --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/pkg/code.google.com/p/go.tools
'';
prePatch = ''
# Ensure that the source directory is named go
cd ..
if [ ! -d go ]; then
mv * go
fi
cd go
patchShebangs ./ # replace /bin/bash
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
# !!! substituteInPlace does not seems to be effective.
# The os test wants to read files in an existing path. Just don't let it be /usr/bin.
sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
# Disable the unix socket test
sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
# ParseInLocation fails the test
sed -i '/TestParseInSydney/areturn' src/pkg/time/format_test.go
'' + lib.optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c
sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
'';
patches = [ ./cacert-1.2.patch ./R_386_GOT32.patch ];
GOOS = if stdenv.isDarwin then "darwin" else "linux";
GOARCH = if stdenv.isDarwin then "amd64"
else if stdenv.system == "i686-linux" then "386"
else if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "armv5tel-linux" then "arm"
else throw "Unsupported system";
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
GO386 = 387; # from Arch: don't assume sse2 on i686
CGO_ENABLED = if stdenv.isDarwin then 0 else 1;
installPhase = ''
export CC=cc
mkdir -p "$out/bin"
unset GOPATH
export GOROOT="$(pwd)/"
export GOBIN="$out/bin"
export PATH="$GOBIN:$PATH"
cd ./src
./all.bash
cd -
# Build extra tooling
# TODO: Fix godoc tests
TOOL_ROOT=code.google.com/p/go.tools/cmd
go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc
go test -v $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc
# Copy the emacs configuration for Go files.
mkdir -p "$out/share/emacs/site-lisp"
cp ./misc/emacs/* $out/share/emacs/site-lisp/
'';
setupHook = ./setup-hook.sh;
meta = with stdenv.lib; {
branch = "1.3";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan ];
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
patches = [
./cacert-1.4.patch
./remove-tools.patch
./remove-tools-1.4.patch
];
GOOS = if stdenv.isDarwin then "darwin" else "linux";

View File

@ -1,19 +0,0 @@
http://code.google.com/p/go/source/detail?r=8b13b2ec6b18
--- a/src/cmd/cgo/gcc.go 2014-07-02 12:00:12.171796197 +0200
+++ b/src/cmd/cgo/gcc.go 2014-07-02 12:01:57.844472754 +0200
@@ -840,6 +840,15 @@
func (p *Package) gccErrors(stdin []byte) string {
// TODO(rsc): require failure
args := p.gccCmd()
+
+ // GCC 4.8.0 has a bug: it sometimes does not apply
+ // -Wunused-value to values that are macros defined in system
+ // headers. See issue 5118. Adding -Wsystem-headers avoids
+ // that problem. This will produce additional errors, but it
+ // doesn't matter because we will ignore all errors that are
+ // not marked for the cgo-test file.
+ args = append(args, "-Wsystem-headers")
+
if *debugGcc {
fmt.Fprintf(os.Stderr, "$ %s <<EOF\n", strings.Join(args, " "))
os.Stderr.Write(stdin)

View File

@ -1,12 +0,0 @@
https://code.google.com/p/go-wiki/wiki/OlderVersions
--- a/src/cmd/cc/funct.c 2014-07-02 11:54:42.230663598 +0200
+++ b/src/cmd/cc/funct.c 2014-07-02 11:55:01.653790128 +0200
@@ -269,7 +269,7 @@
goto bad;
f = alloc(sizeof(*f));
- for(o=0; o<sizeof(f->sym); o++)
+ for(o=0; o<nelem(f->sym); o++)
f->sym[o] = S;
t->funct = f;

View File

@ -1,46 +0,0 @@
From 609d996fac7f68b34032572b7bde627f658b95f2 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Mon, 6 Oct 2014 14:17:48 -0400
Subject: [PATCH] cmd/8l: accept R_386_GOT32 in push instruction
Fixes #8382.
LGTM=iant
R=iant
CC=golang-codereviews
https://golang.org/cl/149540045
---
src/cmd/8l/asm.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c
index c135dce..98c0424 100644
--- a/src/cmd/8l/asm.c
+++ b/src/cmd/8l/asm.c
@@ -117,13 +117,21 @@ adddynrel(LSym *s, Reloc *r)
case 256 + R_386_GOT32:
if(targ->type != SDYNIMPORT) {
// have symbol
- // turn MOVL of GOT entry into LEAL of symbol itself
- if(r->off < 2 || s->p[r->off-2] != 0x8b) {
- diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);
+ if(r->off >= 2 && s->p[r->off-2] == 0x8b) {
+ // turn MOVL of GOT entry into LEAL of symbol address, relative to GOT.
+ s->p[r->off-2] = 0x8d;
+ r->type = R_GOTOFF;
return;
}
- s->p[r->off-2] = 0x8d;
- r->type = R_GOTOFF;
+ if(r->off >= 2 && s->p[r->off-2] == 0xff && s->p[r->off-1] == 0xb3) {
+ // turn PUSHL of GOT entry into PUSHL of symbol itself.
+ // use unnecessary SS prefix to keep instruction same length.
+ s->p[r->off-2] = 0x36;
+ s->p[r->off-1] = 0x68;
+ r->type = R_ADDR;
+ return;
+ }
+ diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);
return;
}
addgotsym(ctxt, targ);

View File

@ -1,15 +0,0 @@
Go comes with hardcoded cacert. We add the usual in NixOS,
for easier NixOS life.
diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go
index 76e79f4..6ef1dd3 100644
--- a/src/pkg/crypto/x509/root_unix.go
+++ b/src/pkg/crypto/x509/root_unix.go
@@ -15,6 +15,7 @@ var certFiles = []string{
"/etc/ssl/ca-bundle.pem", // OpenSUSE
"/etc/ssl/cert.pem", // OpenBSD
"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
+ "/etc/ssl/certs/ca-bundle.crt", // NixOS
}
func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {

View File

@ -1,15 +0,0 @@
Go comes with hardcoded cacert. We add the usual in NixOS,
for easier NixOS life.
diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go
index 76e79f4..6ef1dd3 100644
--- a/src/pkg/crypto/x509/root_unix.go
+++ b/src/pkg/crypto/x509/root_unix.go
@@ -15,6 +15,7 @@ var certFiles = []string{
"/etc/ssl/ca-bundle.pem", // OpenSUSE
"/etc/ssl/cert.pem", // OpenBSD
"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD
+ "/etc/ssl/certs/ca-bundle.crt", // NixOS
}
func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {

View File

@ -1,28 +0,0 @@
{ lib, goPackages, fetchFromGitHub }:
with goPackages;
buildGoPackage rec {
rev = "c7329055e2aeb253a947e5cc876586ff4ca19199";
name = "gox-${lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/mitchellh/gox";
src = fetchFromGitHub {
inherit rev;
owner = "mitchellh";
repo = "gox";
sha256 = "0zhb88jjxqn3sdc4bpzvajqvgi9igp5gk03q12gaksaxhy2wl4jy";
};
buildInputs = [ iochan ];
propagatedBuildInputs = [ go ];
dontInstallSrc = true;
meta = with lib; {
description = "A simple, no-frills tool for Go cross compilation that behaves a lot like standard go build";
homepage = https://github.com/mitchellh/gox;
maintainers = with maintainers; [ cstrahan ];
platforms = platforms.unix;
};
}

View File

@ -1,18 +1,20 @@
{stdenv, fetchgit, coq, coqPackages}:
let revision = "b73a594af5460567dc233b2f2e7b0f781ae0490d"; in
stdenv.mkDerivation rec {
name = "coq-QuickChick-${coq.coq-version}-${version}";
version = "21f50a02";
version = "20150605-${builtins.substring 0 7 revision}";
src = fetchgit {
url = git://github.com/QuickChick/QuickChick.git;
rev = "21f50a02e752f6d99d5bfefefcd2ad45df5e778a";
sha256 = "15hsirm443cr098hksfcg3nbjm9mdnmxzpz61qq7ap7lglabl7pw";
rev = revision;
sha256 = "1yql40x1zbrc6wzfafvfaxzhw57v1n468lxdv1rvsjd7gyyf74y7";
};
buildInputs = [ coq.ocaml coq.camlp5 coqPackages.ssreflect ];
propagatedBuildInputs = [ coq ];
buildInputs = [ coq.ocaml coq.camlp5 ];
propagatedBuildInputs = [ coq coqPackages.ssreflect ];
enableParallelBuilding = true;

View File

@ -166,7 +166,7 @@ self: super: {
# Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
darcs = (overrideCabal super.darcs (drv: {
doCheck = false; # The test suite won't even start.
patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
postPatch = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
})).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; });
# https://github.com/massysett/rainbox/issues/1
@ -206,7 +206,7 @@ self: super: {
x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
then let inherit (pkgs.darwin) security_tool;
in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
patchPhase = (drv.patchPhase or "") + ''
postPatch = (drv.postPatch or "") + ''
substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
'';
})
@ -216,7 +216,7 @@ self: super: {
then super.double-conversion
else overrideCabal super.double-conversion (drv:
{
patchPhase = ''
postPatch = ''
substituteInPlace double-conversion.cabal --replace stdc++ c++
'';
});
@ -721,7 +721,7 @@ self: super: {
# Already fixed in upstream darcs repo.
xmonad-contrib = overrideCabal super.xmonad-contrib (drv: {
patchPhase = ''
postPatch = ''
sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs
sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs
'';
@ -732,7 +732,7 @@ self: super: {
# Hardcoded include path
poppler = overrideCabal super.poppler (drv: {
patchPhase = ''
postPatch = ''
sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal
sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc
'';
@ -769,9 +769,7 @@ self: super: {
# https://github.com/nushio3/doctest-prop/issues/1
doctest-prop = dontCheck super.doctest-prop;
# https://github.com/goldfirere/singletons/issues/116
# https://github.com/goldfirere/singletons/issues/117
# https://github.com/goldfirere/singletons/issues/118
clash-lib = dontDistribute super.clash-lib;
clash-verilog = dontDistribute super.clash-verilog;
Frames = dontDistribute super.Frames;
@ -897,8 +895,7 @@ self: super: {
# https://github.com/liyang/thyme/issues/36
thyme = dontCheck super.thyme;
# https://github.com/k0ral/hbro/issues/15
hbro = markBroken super.hbro;
# https://github.com/k0ral/hbro-contrib/issues/1
hbro-contrib = dontDistribute super.hbro-contrib;
# https://github.com/aka-bash0r/multi-cabal/issues/4
@ -919,20 +916,7 @@ self: super: {
# https://github.com/GaloisInc/HaNS/pull/8
hans = appendPatch super.hans ./patches/hans-disable-webserver.patch;
# https://github.com/yi-editor/yi/issues/776
yi = markBroken super.yi;
yi-monokai = dontDistribute super.yi-monokai;
yi-snippet = dontDistribute super.yi-snippet;
yi-solarized = dontDistribute super.yi-solarized;
yi-spolsky = dontDistribute super.yi-spolsky;
# https://github.com/athanclark/commutative/issues/1
commutative = dontCheck super.commutative;
# https://github.com/athanclark/set-with/issues/1
set-with = dontCheck super.set-with;
# https://github.com/athanclark/sets/issues/1
# https://github.com/athanclark/sets/issues/2
sets = dontCheck super.sets;
# https://github.com/lens/lens-aeson/issues/18
@ -986,4 +970,11 @@ self: super: {
'';
});
# https://github.com/yesodweb/Shelly.hs/issues/106
# https://github.com/yesodweb/Shelly.hs/issues/108
shelly = dontCheck super.shelly;
# https://github.com/bos/configurator/issues/22
configurator = dontCheck super.configurator;
}

View File

@ -90,10 +90,10 @@ self: super: {
# Setup: At least the following dependencies are missing: base <4.8
hspec-expectations = overrideCabal super.hspec-expectations (drv: {
patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
});
utf8-string = overrideCabal super.utf8-string (drv: {
patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
});
pointfree = doJailbreak super.pointfree;
@ -178,15 +178,6 @@ self: super: {
in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
self.webkitgtk3-javascriptcore ];
# contacted maintainer by e-mail
cmdlib = markBrokenVersion "0.3.5" super.cmdlib;
darcs-fastconvert = dontDistribute super.darcs-fastconvert;
ivory-backend-c = dontDistribute super.ivory-backend-c;
ivory-bitdata = dontDistribute super.ivory-bitdata;
ivory-examples = dontDistribute super.ivory-examples;
ivory-hw = dontDistribute super.ivory-hw;
laborantin-hs = dontDistribute super.laborantin-hs;
# https://github.com/cartazio/arithmoi/issues/1
arithmoi = markBroken super.arithmoi;
NTRU = dontDistribute super.NTRU;
@ -281,4 +272,7 @@ self: super: {
# https://github.com/haskell/haddock/issues/427
haddock = dontCheck super.haddock;
# The tests in vty-ui do not build, but vty-ui itself builds.
vty-ui = enableCabalFlag super.vty-ui "no-tests";
}

View File

@ -85,8 +85,8 @@ self: super: {
# https://github.com/magthe/sandi/issues/7
sandi = overrideCabal super.sandi (drv: {
patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
);
postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
});
# blaze-builder requires an additional build input on older compilers.
blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder;

View File

@ -127,8 +127,8 @@ self: super: {
# https://github.com/magthe/sandi/issues/7
sandi = overrideCabal super.sandi (drv: {
patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
);
postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
});
# Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable.
ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; };

View File

@ -34,11 +34,22 @@ self: super: {
xhtml = null;
# Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
# GHC 7.10.x's Haddock binary cannot generate hoogle files.
# https://ghc.haskell.org/trac/ghc/ticket/9921
mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; });
Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
version = "1.23.0.0";
src = pkgs.fetchFromGitHub {
owner = "haskell";
repo = "cabal";
rev = "fe7b8784ac0a5848974066bdab76ce376ba67277";
sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s";
};
jailbreak = false;
doHaddock = false;
postUnpack = "sourceRoot+=/Cabal";
});
jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: {
executableHaskellDepends = [ self.Cabal_1_23_0_0 ];
preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
});
# haddock: No input file(s).
nats = dontHaddock super.nats;
@ -55,10 +66,10 @@ self: super: {
# Setup: At least the following dependencies are missing: base <4.8
hspec-expectations = overrideCabal super.hspec-expectations (drv: {
patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
});
utf8-string = overrideCabal super.utf8-string (drv: {
patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
});
# bos/attoparsec#92

View File

@ -65,10 +65,10 @@ self: super: {
# Setup: At least the following dependencies are missing: base <4.8
hspec-expectations = overrideCabal super.hspec-expectations (drv: {
patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
});
utf8-string = overrideCabal super.utf8-string (drv: {
patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
});
# bos/attoparsec#92

View File

@ -56,7 +56,7 @@ self: super: {
vector = null;
pqueue = overrideCabal super.pqueue (drv: {
patchPhase = ''
postPatch = ''
sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs

View File

@ -47,18 +47,29 @@ let
defaultScope = mkScope self;
callPackage = drv: args: callPackageWithScope defaultScope drv args;
withPackages = packages: callPackage ./with-packages-wrapper.nix {
inherit (self) llvmPackages;
haskellPackages = self;
inherit packages;
};
in
import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {
inherit mkDerivation callPackage;
ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix {
inherit (self) llvmPackages;
haskellPackages = self;
packages = pkgs self;
};
ghcWithPackages = selectFrom: withPackages (selectFrom self);
ghc = ghc // { withPackages = self.ghcWithPackages; };
ghcWithHoogle = selectFrom:
let
packages = selectFrom self;
hoogle = callPackage ./hoogle.nix { inherit packages; };
in withPackages (packages ++ [ hoogle ]);
ghc = ghc // {
withPackages = self.ghcWithPackages;
withHoogle = self.ghcWithHoogle;
};
};

File diff suppressed because it is too large Load Diff

View File

@ -2,5 +2,4 @@
COMMAND=$1
shift
HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \
"$COMMAND" -d @out@/share/hoogle "$@"
exec @hoogle@/bin/hoogle "$COMMAND" -d @out@/share/doc/hoogle "$@"

View File

@ -23,7 +23,7 @@
# This will build mmorph and monadControl, and have the hoogle installation
# refer to their documentation via symlink so they are not garbage collected.
{ stdenv, hoogle, rehoo
{ lib, stdenv, hoogle, rehoo
, ghc, packages ? [ ghc.ghc ]
}:
@ -35,62 +35,76 @@ stdenv.mkDerivation {
name = "hoogle-local-0.1";
buildInputs = [hoogle rehoo];
phases = [ "installPhase" ];
phases = [ "buildPhase" ];
docPackages = packages;
installPhase = ''
docPackages = (lib.closePropagation packages);
buildPhase = ''
if [ -z "$docPackages" ]; then
echo "ERROR: The packages attribute has not been set"
exit 1
fi
mkdir -p $out/share/hoogle/doc
export HOOGLE_DOC_PATH=$out/share/hoogle/doc
cd $out/share/hoogle
mkdir -p $out/share/doc/hoogle
function import_dbs() {
find $1 -name '*.txt' | while read f; do
newname=$(basename "$f" | tr '[:upper:]' '[:lower:]')
if [[ -f $f && ! -f ./$newname ]]; then
cp -p $f ./$newname
cp -p $f "./$newname"
hoogle convert -d "$(dirname $f)" "./$newname"
fi
done
}
for i in $docPackages; do
findInputs $i docPackages propagated-native-build-inputs
findInputs $i docPackages propagated-build-inputs
echo importing builtin packages
for docdir in ${ghc}/share/doc/ghc*/html/libraries/*; do
if [[ -d $docdir ]]; then
import_dbs $docdir
ln -sfn $docdir $out/share/doc/hoogle
fi
done
echo importing other packages
for i in $docPackages; do
if [[ ! $i == $out ]]; then
for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do
name=`basename $docdir`
docdir=$docdir/html
if [[ -d $docdir ]]; then
import_dbs $docdir
ln -sf $docdir $out/share/hoogle/doc
ln -sfn $docdir $out/share/doc/hoogle/$name
fi
done
fi
done
import_dbs ${ghc}/share/doc/ghc*/html/libraries
ln -sf ${ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
echo building hoogle database
# FIXME: rehoo is marked as depricated on Hackage
chmod 644 *.hoo *.txt
rehoo -j4 -c64 .
rm -fr downloads *.dep *.txt
mv default.hoo x || exit 0
rm -f *.hoo
mv x default.hoo || exit 1
mv default.hoo .x
rm -fr downloads *.dep *.txt *.hoo
mv .x $out/share/doc/hoogle/default.hoo
if [ ! -f default.hoo ]; then
echo "Unable to build the default Hoogle database"
exit 1
fi
echo building haddock index
# adapted from GHC's gen_contents_index
cd $out/share/doc/hoogle
args=
for hdfile in `ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort`
do
name_version=`echo "$hdfile" | sed 's#/.*##'`
args="$args --read-interface=$name_version,$hdfile"
done
${ghc}/bin/haddock --gen-index --gen-contents -o . \
-t "Haskell Hierarchical Libraries" \
-p ${ghc}/share/doc/ghc*/html/libraries/prologue.txt \
$args
echo finishing up
mkdir -p $out/bin
substitute ${wrapper} $out/bin/hoogle \
--subst-var out --subst-var-by shell ${stdenv.shell} \
@ -98,6 +112,10 @@ stdenv.mkDerivation {
chmod +x $out/bin/hoogle
'';
passthru = {
isHaskellLibrary = false; # for the filter in ./with-packages-wrapper.nix
};
meta = {
description = "A local Hoogle database";
platforms = ghc.meta.platforms;

View File

@ -82,10 +82,6 @@ rec {
triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
withHoogle = haskellEnv: with haskellEnv.haskellPackages;
import ./hoogle.nix {
inherit (pkgs) stdenv;
inherit hoogle rehoo ghc;
packages = haskellEnv.paths;
};
#FIXME: throw this away sometime in the future. added 2015-08-18
withHoogle = throw "withHoogle is no longer supported, use ghcWithHoogle instead";
}

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libusb1 }:
stdenv.mkDerivation rec {
name = "libmtp-1.1.8";
name = "libmtp-1.1.9";
propagatedBuildInputs = [ libusb1 ];
buildInputs = [ pkgconfig ];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/libmtp/${name}.tar.gz";
sha256 = "10i2vnj8r6hyd61xgyhmxbsissq971g50fhm1h6mc3m4d99qg7iz";
sha256 = "12dinqic0ljnhrwx3rc61jc7q24ybr0mckc2ya5kh1s1np0d7w93";
};
meta = {

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libressl-${version}";
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
sha256 = "0bapzvxrg09p4hlzdhsvk0ljc3gsjj4ixjpf09dn0fzwmd81fcsg";
sha256 = "0551i4jbs81ark3jy6nycqpyqn7rg30nvcdjvdg58s6l6fgv1570";
};
enableParallelBuilding = true;

View File

@ -3,18 +3,18 @@
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.5.1";
version = "2.5.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "0pqqb2bh0a17426diwyhk5vbxcfz45rppbxmjydsmai94jm3cgix";
sha256 = "0pzs645315nvn981w3nj8fi30g6kq67cmj7hq7da658qlk0p6r7i";
};
jarsrc = fetchurl {
# NOTE: This is actually a .jar, Github has issues
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
sha256 = "1irl3w66xq1xbbs4g10dnw1vknfw8al70nhr744gfn2za27w0xdl";
sha256 = "0qhvgvii4x3p49bx494f6fc7dfvxx2crp2wbkldxx2brvh105iv4";
};
patches = [ ./lein-fix-jar-path.patch ];

View File

@ -1,28 +0,0 @@
{ lib, goPackages, fetchFromGitHub }:
with goPackages;
buildGoPackage rec {
rev = "8ca23475bcb43213a55dd8210b69363f6b0e09c1";
name = "golint-${lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/golang/lint";
src = fetchFromGitHub {
inherit rev;
owner = "golang";
repo = "lint";
sha256 = "16wbykik6dw3x9s7iqi4ln8kvzsh3g621wb8mk4nfldw7lyqp3cs";
};
subPackages = [ "golint" ];
dontInstallSrc = true;
meta = with lib; {
description = "Linter for Go source code";
homepage = https://github.com/golang/lint;
license = licenses.mit;
maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
};
}

View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
''
mkdir -p data/keymaps/i386/neo
cat "$neoSrc" > data/keymaps/i386/neo/neo.map
sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.in
sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am
# Add the dvp keyboard in the dvorak folder
${gzip}/bin/gzip -c -d ${dvpSrc} > data/keymaps/i386/dvorak/dvp.map

View File

@ -75,17 +75,17 @@ rec {
};
grsecurity_stable = grsecPatch
{ kversion = "3.14.50";
revision = "201508102128";
{ kversion = "3.14.51";
revision = "201508181951";
branch = "stable";
sha256 = "0inp0ab8pcjfj1wnrkyiwb6cxjp2ymqcjv7lq30a4ij6qcvmfb5s";
sha256 = "1sp1gwa7ahzflq7ayb51bg52abrn5zx1hb3pff3axpjqq7vfai6f";
};
grsecurity_unstable = grsecPatch
{ kversion = "4.1.5";
revision = "201508102129";
{ kversion = "4.1.6";
revision = "201508181953";
branch = "test";
sha256 = "1pc40xd7k0fzzd99lshy58gnapv701hjvc4bm0slfzagh241545a";
sha256 = "1m227k1wb1q588vkgmngcz86k0wpzan6vra67pcx2478mabm3s89";
};
grsec_fix_path =

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }:
let
version = "2.02.124";
version = "2.02.128";
in
stdenv.mkDerivation {
@ -9,15 +9,20 @@ stdenv.mkDerivation {
src = fetchurl {
url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
sha256 = "0myqs0ajpjmlc56vp4f66x5izhbh7wzzf3408gqnrjmikb5sr9rh";
sha256 = "0a5m63b729ranbnmg964b36jlbfc140bs92di37w2gq54hzp1v97";
};
configureFlags =
"--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-cmdlib"
+ (stdenv.lib.optionalString enable_dmeventd " --enable-dmeventd")
;
configureFlags = [
"--disable-readline"
"--enable-udev_rules"
"--enable-udev_sync"
"--enable-pkgconfig"
"--enable-applib"
"--enable-cmdlib"
] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd";
buildInputs = [ pkgconfig udev ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ udev ];
preConfigure =
''

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
{stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
extraConfig ? ""}:
assert stdenv.isLinux;
@ -52,15 +52,18 @@ let
UCLIBC_HAS_FPU n
'';
name = "uclibc-0.9.34-pre-20150131";
rev = "343f6b8f1f754e397632b0552e4afe586c8b392b";
in
stdenv.mkDerivation {
name = "uclibc-0.9.34-pre-20150131" + stdenv.lib.optionalString (cross != null)
("-" + cross.config);
name = name + stdenv.lib.optionalString (cross != null) ("-" + cross.config);
src = fetchurl {
url = http://www.uclibc.org/downloads/snapshots/uClibc-20150131.tar.bz2;
sha256 = "14svyxw4nizdcz4vqk9nizlgy32d8ngpvcca34jjbdjjg77xdvkc";
src = fetchzip {
name = name + "-source";
url = "http://git.uclibc.org/uClibc/snapshot/uClibc-${rev}.tar.bz2";
sha256 = "1kgylzpid7da5i7wz7slh5q9rnq1m8bv5h9ilm76g0xwc2iwlhbw";
};
# 'ftw' needed to build acl, a coreutils dependency

View File

@ -131,8 +131,6 @@ let
else true;
in
assert licenseAllowed attrs;
lib.addPassthru (derivation (
(removeAttrs attrs
["meta" "passthru" "crossAttrs" "pos"
@ -152,7 +150,7 @@ let
computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));
in
{
builder = attrs.realBuilder or shell;
builder = assert licenseAllowed attrs; attrs.realBuilder or shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
stdenv = result;
system = result.system;

View File

@ -1,12 +1,12 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2015-08-07";
version = "2015-08-18";
src = fetchgit {
url = "git://github.com/ceph/ceph.git";
rev = "dcd6e96495d949066962d1c7e18a9d4188b0fa37";
sha256 = "1w62xfbcdx2q5wjz2bqlhn4bb1iag8xyhgjc2nklqk7py9lif16m";
rev = "cf8a360cd1e3937aa1ac74fbf39790b7fb43e71f";
sha256 = "0d8vlxap800x8gil16124nb4yvfqb5wa3pk09knrikmmwia49k9v";
};
patches = [ ./fix-pythonpath.patch ];

View File

@ -0,0 +1,22 @@
{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }:
stdenv.mkDerivation rec {
name = "antimicro-${version}";
version = "2.18";
src = fetchzip {
url = "https://github.com/Ryochan7/antimicro/archive/${version}.tar.gz";
sha256 = "0kyl4xl2am50v2xscgy2irpcdj78f7flgfhljyjck4ynf8d40vb7";
};
buildInputs = [
cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst
];
meta = with stdenv.lib; {
description = "GUI for mapping keyboard and mouse controls to a gamepad";
homepage = "https://github.com/Ryochan7/antimicro";
maintainers = with maintainers; [ jb55 ];
license = licenses.gpl3;
};
}

View File

@ -1,15 +1,21 @@
{ stdenv, fetchgit, go_1_3 }:
stdenv.mkDerivation {
name = "logstash-forwarder-20141216";
src = fetchgit {
url = https://github.com/elasticsearch/logstash-forwarder.git;
rev = "6082bd8aaecb2180f5b56f4fb1b2940a6935ef7b";
sha256 = "1686rlx5p7d2806cg8y4376m4l7nvg1yjgg52ccrs0v4fnqs6292";
{ stdenv, fetchFromGitHub, go }:
stdenv.mkDerivation rec {
name = "logstash-forwarder-${version}";
version = "0.4.0";
src = fetchFromGitHub {
owner = "elasticsearch";
repo = "logstash-forwarder";
rev = "v${version}";
sha256 = "05g7366w8f7h75n1ia7njdpmparr6sfvn45xxfh5412zigqidz6l";
};
buildInputs = [ go_1_3 ];
buildInputs = [ go ];
installPhase = ''
mkdir -p $out/bin
cp build/bin/logstash-forwarder $out/bin
find . -name logstash-forwarder -type f -exec cp {} $out/bin \;
'';
meta = {

View File

@ -10,17 +10,17 @@
buildPythonPackage rec {
name = "youtube-dl-${version}";
version = "2015.05.29";
version = "2015.08.16.1";
src = fetchurl {
url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
sha256 = "04g78anvy519pj8m8ys1ifmnmp1x3i9bw3afwqjch71n9f77papy";
};
buildInputs = [ makeWrapper zip pandoc ];
# Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
postInstall = stdenv.lib.optionalString (ffmpeg != null)
postInstall = stdenv.lib.optionalString (ffmpeg != null)
''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
meta = with stdenv.lib; {

View File

@ -1,21 +1,18 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, cppunit, libgcrypt
, c-ares, openssl, libxml2, sqlite, zlib }:
{ stdenv, fetchurl, pkgconfig, autoreconfHook
, openssl, c-ares, libxml2, sqlite, zlib, libssh2
}:
stdenv.mkDerivation rec {
name = "aria2-${version}";
version = "1.19.0";
src = fetchFromGitHub {
owner = "tatsuhiro-t";
repo = "aria2";
rev = "release-${version}";
sha256 = "1k4b8jfg4wjsvybb7hysplp6h831allhiqdy9jwsyy0m0zmgk00a";
src = fetchurl {
url = "mirror://sourceforge/aria2/${name}.tar.xz";
sha256 = "0xm4fmap9gp2pz6z01mnnpmazw6pnhzs8qc58181m5ai4gy5ksp2";
};
buildInputs = [
pkgconfig autoreconfHook cppunit libgcrypt c-ares openssl libxml2
sqlite zlib
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ];
configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];

View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which }:
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
stdenv.mkDerivation rec {
name = "ecryptfs-${version}";
version = "106";
version = "108";
src = fetchurl {
url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz";
sha256 = "1d5nlzcbl8ch639zi3lq6d14gkk4964j6dqhfs87i67867fhlghp";
sha256 = "1pfpzc907m4qi5h2rxmkqq072c6g22pik2rilj4bl4qishd8p0sj";
};
#TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
--prefix PATH ":" "${rsync}/bin" \
--prefix PATH ":" "${keyutils}/bin" \
--prefix PATH ":" "${which}/bin" \
--prefix PATH ":" "${lsof}/bin" \
--prefix PATH ":" "$out/bin"
done
'';

View File

@ -3,7 +3,7 @@
, makeWrapper
, xclip ? null, xdotool ? null, dmenu ? null
, x11Support ? true
, x11Support ? !stdenv.isDarwin
}:
assert x11Support -> xclip != null

View File

@ -398,7 +398,7 @@ let
inherit name sha256;
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
meta.homepage = "https://github.com/${owner}/${repo}/";
};
} // { inherit rev; };
fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
inherit name sha256;
@ -1214,7 +1214,7 @@ let
inherit callPackage;
};
cudatoolkit = cudatoolkit5;
cudatoolkit = cudatoolkit7;
curlFull = curl.override {
idnSupport = true;
@ -2853,6 +2853,8 @@ let
rkflashtool = callPackage ../tools/misc/rkflashtool { };
rkrlv2 = callPackage ../applications/audio/rkrlv2 {};
rmlint = callPackage ../tools/misc/rmlint {
inherit (pythonPackages) sphinx;
};
@ -4044,18 +4046,6 @@ let
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { inherit stdenv fetchNuGet; });
go_1_0 = callPackage ../development/compilers/go/1.0.nix { };
go_1_1 =
if stdenv.isDarwin then
callPackage ../development/compilers/go/1.1-darwin.nix { }
else
callPackage ../development/compilers/go/1.1.nix { };
go_1_2 = callPackage ../development/compilers/go/1.2.nix { };
go_1_3 = callPackage ../development/compilers/go/1.3.nix { };
go_1_4 = callPackage ../development/compilers/go/1.4.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -4064,7 +4054,7 @@ let
go-repo-root = callPackage ../development/tools/misc/go-repo-root { };
gox = callPackage ../development/compilers/go/gox.nix { };
gox = goPackages.gox;
gprolog = callPackage ../development/compilers/gprolog { };
@ -8633,16 +8623,6 @@ let
### DEVELOPMENT / GO MODULES
go13Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
go = go_1_3;
buildGoPackage = import ../development/go-modules/generic {
go = go_1_3;
govers = go13Packages.govers;
inherit lib;
};
overrides = (config.goPackageOverrides or (p: {})) pkgs;
});
go14Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
go = go_1_4;
buildGoPackage = import ../development/go-modules/generic {
@ -10057,7 +10037,7 @@ let
gotags = callPackage ../development/tools/gotags { };
golint = callPackage ../development/tools/golint { goPackages = go13Packages; };
golint = goPackages.lint;
godep = callPackage ../development/tools/godep { };
@ -10270,7 +10250,7 @@ let
uclibc = callPackage ../os-specific/linux/uclibc { };
uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
inherit fetchurl stdenv libiconvReal;
inherit fetchzip stdenv libiconvReal;
linuxHeaders = linuxHeadersCross;
gccCross = gccCrossStageStatic;
cross = assert crossSystem != null; crossSystem;
@ -10839,6 +10819,7 @@ let
bleachbit = callPackage ../applications/misc/bleachbit { };
blender = callPackage ../applications/misc/blender {
cudatoolkit = cudatoolkit7;
python = python34;
};
@ -12628,6 +12609,8 @@ let
RhythmDelay = callPackage ../applications/audio/RhythmDelay { };
rkt = callPackage ../applications/virtualization/rkt { };
rofi = callPackage ../applications/misc/rofi {
automake = automake114x;
};
@ -13279,10 +13262,11 @@ let
++ lib.optional (cfg.enableTrezor or false) trezor-bridge
++ lib.optional (cfg.enableBluejeans or false) bluejeans
);
libs = (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals (cfg.enableQuakeLive or false)
libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
(with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash;
gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ];
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
++ lib.optional (config.pulseaudio or false) libpulseaudio;
gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
gtk_modules = [ libcanberra ];
};
@ -14714,6 +14698,8 @@ let
### MISC
antimicro = callPackage ../tools/misc/antimicro { };
atari800 = callPackage ../misc/emulators/atari800 { };
ataripp = callPackage ../misc/emulators/atari++ { };

View File

@ -4,7 +4,6 @@
, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchFromBitbucket, fetchbzr, pkgs }:
let
isGo13 = go.meta.branch == "1.3";
isGo14 = go.meta.branch == "1.4";
buildFromGitHub = { rev, date ? null, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // {
@ -21,7 +20,6 @@ let
crypto = buildFromGitHub {
rev = "e7913d6af127b363879a06a5ae7c5e93c089aedd";
disabled = isGo13;
owner = "golang";
repo = "crypto";
sha256 = "0g2gm2wmanprsirmclxi8qxjkw93nih60ff8jwrfb4wyn7hxbds7";
@ -328,6 +326,13 @@ let
propagatedBuildInputs = [ pflag ];
};
cli-go = buildFromGitHub {
rev = "v1.2.0";
owner = "codegangsta";
repo = "cli";
sha256 = "1axcpc8wgs0b66dpl36pz97pqbxkgvvbwz1b6rf7gl103jqpii40";
};
columnize = buildFromGitHub {
rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a";
owner = "ryanuber";
@ -501,6 +506,13 @@ let
};
};
cookoo = buildFromGitHub {
rev = "v1.2.0";
owner = "Masterminds";
repo = "cookoo";
sha256 = "1mxqnxddny43k1shsvd39sfzfs0d20gv3vm9lcjp04g3b0rplck1";
};
dbus = buildGoPackage rec {
rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea";
name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";
@ -633,6 +645,14 @@ let
subPackages = [ "./" ]; # don't try to build test fixtures
};
glide = buildFromGitHub {
rev = "0.4.1";
owner = "Masterminds";
repo = "glide";
sha256 = "0237l8s7z1ysfkv3kmw4788fg4kjcq2sh6073bjcwynz3hldkrlr";
buildInputs = [ cookoo cli-go go-gypsy ];
};
gls = buildFromGitHub {
rev = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690";
owner = "jtolds";
@ -1000,7 +1020,6 @@ let
rev = "9847b93751a5fbaf227b893d172cee0104ac6427";
name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/coreos/go-etcd";
disabled = isGo13;
src = fetchFromGitHub {
inherit rev;
@ -1042,6 +1061,13 @@ let
excludedPackages = "examples";
};
go-gypsy = buildFromGitHub {
rev = "42fc2c7ee9b8bd0ff636cd2d7a8c0a49491044c5";
owner = "kylelemons";
repo = "go-gypsy";
sha256 = "04iy8rdk19n7i18bqipknrcb8lsy1vr4d1iqyxsxq6rmb7298iwj";
};
go-homedir = buildFromGitHub {
rev = "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4";
owner = "mitchellh";
@ -1248,7 +1274,6 @@ let
rev = "2688e91251d9d8e404e86dd8f096e23b2f086958";
name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/coreos/go-systemd";
disabled = isGo13;
excludedPackages = "examples";
@ -1309,6 +1334,17 @@ let
sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z";
};
lint = buildFromGitHub {
rev = "7b7f4364ff76043e6c3610281525fabc0d90f0e4";
date = "2015-06-23";
owner = "golang";
repo = "lint";
sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9";
excludedPackages = "testdata";
dontInstallSrc = true;
buildInputs = [ tools ];
};
goquery = buildGoPackage rec {
rev = "f065786d418c9d22a33cad33decd59277af31471"; #tag v.0.3.2
name = "goquery-${stdenv.lib.strings.substring 0 7 rev}";