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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2017-01-29 02:16:29 +02:00
parent bb8859bd66 2f38d1fd1f
commit 424cfe7686
101 changed files with 3219 additions and 1769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/platforms.nix
+1 -1
View File
@@ -20,5 +20,5 @@ rec {
openbsd = ["i686-openbsd" "x86_64-openbsd"]; openbsd = ["i686-openbsd" "x86_64-openbsd"];
unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux"]; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"];
} }
maintainers/scripts/hydra-eval-failures.py
Executable
+89
View File
@@ -0,0 +1,89 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python -p pythonFull pythonPackages.requests pythonPackages.pyquery pythonPackages.click
# To use, just execute this script with --help to display help.
import subprocess
import json
import click
import requests
from pyquery import PyQuery as pq
maintainers_json = subprocess.check_output([
'nix-instantiate',
'lib/maintainers.nix',
'--eval',
'--json'])
maintainers = json.loads(maintainers_json)
MAINTAINERS = {v: k for k, v in maintainers.iteritems()}
def get_response_text(url):
return pq(requests.get(url).text) # IO
EVAL_FILE = {
'nixos': 'nixos/release.nix',
'nixpkgs': 'pkgs/top-level/release.nix',
}
def get_maintainers(attr_name):
nixname = attr_name.split('.')
meta_json = subprocess.check_output([
'nix-instantiate',
'--eval',
'--strict',
'-A',
'.'.join(nixname[1:]) + '.meta',
EVAL_FILE[nixname[0]],
'--json'])
meta = json.loads(meta_json)
if meta.get('maintainers'):
return [MAINTAINERS[name] for name in meta['maintainers'] if MAINTAINERS.get(name)]
@click.command()
@click.option(
'--jobset',
default="nixos/release-16.09",
help='Hydra project like nixos/release-16.09')
def cli(jobset):
"""
Given a Hydra project, inspect latest evaluation
and print a summary of failed builds
"""
url = "http://hydra.nixos.org/jobset/{}".format(jobset)
# get the last evaluation
click.echo(click.style(
'Getting latest evaluation for {}'.format(url), fg='green'))
d = get_response_text(url)
evaluations = d('#tabs-evaluations').find('a[class="row-link"]')
latest_eval_url = evaluations[0].get('href')
# parse last evaluation page
click.echo(click.style(
'Parsing evaluation {}'.format(latest_eval_url), fg='green'))
d = get_response_text(latest_eval_url + '?full=1')
# TODO: aborted evaluations
# TODO: dependency failed without propagated builds
for tr in d('img[alt="Failed"]').parents('tr'):
a = pq(tr)('a')[1]
print "- [ ] [{}]({})".format(a.text, a.get('href'))
maintainers = get_maintainers(a.text)
if maintainers:
print " - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers)))
# TODO: print last three persons that touched this file
# TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked?
if __name__ == "__main__":
try:
cli()
except:
import pdb;pdb.post_mortem()
nixos/doc/manual/release-notes/rl-1703.xml
+8 -1
View File
@@ -46,7 +46,14 @@ following incompatible changes:</para>
for what those parameters represent. for what those parameters represent.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>ansible</literal> now defaults to ansible version 2 as version 1
has been removed due to a serious <link
xlink:href="https://www.computest.nl/advisories/CT-2017-0109_Ansible.txt">
vulnerability</link> unpatched by upstream.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
<literal>gnome</literal> alias has been removed along with <literal>gnome</literal> alias has been removed along with
nixos/modules/module-list.nix
+2
View File
@@ -328,6 +328,7 @@
./services/monitoring/scollector.nix ./services/monitoring/scollector.nix
./services/monitoring/smartd.nix ./services/monitoring/smartd.nix
./services/monitoring/statsd.nix ./services/monitoring/statsd.nix
./services/monitoring/sysstat.nix
./services/monitoring/systemhealth.nix ./services/monitoring/systemhealth.nix
./services/monitoring/teamviewer.nix ./services/monitoring/teamviewer.nix
./services/monitoring/telegraf.nix ./services/monitoring/telegraf.nix
@@ -521,6 +522,7 @@
./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix ./services/web-apps/atlassian/jira.nix
./services/web-apps/frab.nix
./services/web-apps/mattermost.nix ./services/web-apps/mattermost.nix
./services/web-apps/nixbot.nix ./services/web-apps/nixbot.nix
./services/web-apps/pump.io.nix ./services/web-apps/pump.io.nix
nixos/modules/services/logging/fluentd.nix
+7 -1
View File
@@ -21,6 +21,12 @@ in {
default = ""; default = "";
description = "Fluentd config."; description = "Fluentd config.";
}; };
package = mkOption {
type = types.path;
default = pkgs.fluentd;
description = "The fluentd package to use.";
};
}; };
}; };
@@ -32,7 +38,7 @@ in {
description = "Fluentd Daemon"; description = "Fluentd Daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.fluentd}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}"; ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
}; };
}; };
nixos/modules/services/monitoring/arbtt.nix
+1 -1
View File
@@ -49,7 +49,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.user.services.arbtt = { systemd.user.services.arbtt = {
description = "arbtt statistics capture service"; description = "arbtt statistics capture service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "default.target" ];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
nixos/modules/services/system/dbus.nix
+8 -12
View File
@@ -31,9 +31,6 @@ let
cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out
# avoid circular includes
sed -ri 's@(<include ignore_missing="yes">/etc/dbus-1/(system|session)\.conf</include>)@<!-- \1 -->@g' $out/{system,session}.conf
# include by full path # include by full path
sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf
@@ -98,11 +95,6 @@ in
environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ]; environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ];
environment.etc = singleton
{ source = configDir;
target = "dbus-1";
};
users.extraUsers.messagebus = { users.extraUsers.messagebus = {
uid = config.ids.uids.messagebus; uid = config.ids.uids.messagebus;
description = "D-Bus system message bus daemon user"; description = "D-Bus system message bus daemon user";
@@ -134,8 +126,8 @@ in
reloadIfChanged = true; reloadIfChanged = true;
restartTriggers = [ configDir ]; restartTriggers = [ configDir ];
serviceConfig.ExecStart = [ serviceConfig.ExecStart = [
"" "" # Default dbus.service has two entries, we need to override both.
"${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf ${daemonArgs}" "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/system.conf ${daemonArgs}"
]; ];
}; };
@@ -145,13 +137,17 @@ in
reloadIfChanged = true; reloadIfChanged = true;
restartTriggers = [ configDir ]; restartTriggers = [ configDir ];
serviceConfig.ExecStart = [ serviceConfig.ExecStart = [
"" "" # Default dbus.service has two entries, we need to override both.
"${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=${configDir}/session.conf ${daemonArgs}" "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/session.conf ${daemonArgs}"
]; ];
}; };
sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ]; sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ];
}; };
environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
system.extraSystemBuilderCmds = ''
ln -s ${configDir} $out/dbus
'';
}; };
} }
nixos/modules/services/web-apps/frab.nix
+224
View File
@@ -0,0 +1,224 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.frab;
package = pkgs.frab;
ruby = package.ruby;
databaseConfig = builtins.toJSON { production = cfg.database; };
frabEnv = {
RAILS_ENV = "production";
RACK_ENV = "production";
SECRET_KEY_BASE = cfg.secretKeyBase;
FRAB_HOST = cfg.host;
FRAB_PROTOCOL = cfg.protocol;
FROM_EMAIL = cfg.fromEmail;
RAILS_SERVE_STATIC_FILES = "1";
} // cfg.extraEnvironment;
frab-rake = pkgs.stdenv.mkDerivation rec {
name = "frab-rake";
buildInputs = [ package.env pkgs.makeWrapper ];
phases = "installPhase fixupPhase";
installPhase = ''
mkdir -p $out/bin
makeWrapper ${package.env}/bin/bundle $out/bin/frab-bundle \
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") frabEnv)} \
--set PATH '${lib.makeBinPath (with pkgs; [ nodejs file imagemagick ])}:$PATH' \
--set RAKEOPT '-f ${package}/share/frab/Rakefile' \
--run 'cd ${package}/share/frab'
makeWrapper $out/bin/frab-bundle $out/bin/frab-rake \
--add-flags "exec rake"
'';
};
in
{
options = {
services.frab = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable the frab service.
'';
};
host = mkOption {
type = types.str;
example = "frab.example.com";
description = ''
Hostname under which this frab instance can be reached.
'';
};
protocol = mkOption {
type = types.str;
default = "https";
example = "http";
description = ''
Either http or https, depending on how your Frab instance
will be exposed to the public.
'';
};
fromEmail = mkOption {
type = types.str;
default = "frab@localhost";
description = ''
Email address used by frab.
'';
};
listenAddress = mkOption {
type = types.str;
default = "localhost";
description = ''
Address or hostname frab should listen on.
'';
};
listenPort = mkOption {
type = types.int;
default = 3000;
description = ''
Port frab should listen on.
'';
};
statePath = mkOption {
type = types.str;
default = "/var/lib/frab";
description = ''
Directory where frab keeps its state.
'';
};
user = mkOption {
type = types.str;
default = "frab";
description = ''
User to run frab.
'';
};
group = mkOption {
type = types.str;
default = "frab";
description = ''
Group to run frab.
'';
};
secretKeyBase = mkOption {
type = types.str;
description = ''
Your secret key is used for verifying the integrity of signed cookies.
If you change this key, all old signed cookies will become invalid!
Make sure the secret is at least 30 characters and all random,
no regular words or you'll be exposed to dictionary attacks.
'';
};
database = mkOption {
type = types.attrs;
default = {
adapter = "sqlite3";
database = "/var/lib/frab/db.sqlite3";
pool = 5;
timeout = 5000;
};
example = {
adapter = "postgresql";
database = "frab";
host = "localhost";
username = "frabuser";
password = "supersecret";
encoding = "utf8";
pool = 5;
};
description = ''
Rails database configuration for Frab as Nix attribute set.
'';
};
extraEnvironment = mkOption {
type = types.attrs;
default = {};
example = {
FRAB_CURRENCY_UNIT = "€";
FRAB_CURRENCY_FORMAT = "%n%u";
EXCEPTION_EMAIL = "frab-owner@example.com";
SMTP_ADDRESS = "localhost";
SMTP_PORT = "587";
SMTP_DOMAIN = "localdomain";
SMTP_USER_NAME = "root";
SMTP_PASSWORD = "toor";
SMTP_AUTHENTICATION = "1";
SMTP_NOTLS = "1";
};
description = ''
Additional environment variables to set for frab for further
configuration. See the frab documentation for more information.
'';
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ frab-rake ];
users.extraUsers = [
{ name = cfg.user;
group = cfg.group;
home = "${cfg.statePath}";
}
];
users.extraGroups = [ { name = cfg.group; } ];
systemd.services.frab = {
after = [ "network.target" "gitlab.service" ];
wantedBy = [ "multi-user.target" ];
environment = frabEnv;
preStart = ''
mkdir -p ${cfg.statePath}/system/attachments
chown ${cfg.user}:${cfg.group} -R ${cfg.statePath}
mkdir /run/frab -p
ln -sf ${pkgs.writeText "frab-database.yml" databaseConfig} /run/frab/database.yml
ln -sf ${cfg.statePath}/system /run/frab/system
if ! test -e "${cfg.statePath}/db-setup-done"; then
${frab-rake}/bin/frab-rake db:setup
touch ${cfg.statePath}/db-setup-done
else
${frab-rake}/bin/frab-rake db:migrate
fi
'';
serviceConfig = {
PermissionsStartOnly = true;
PrivateTmp = true;
PrivateDevices = true;
Type = "simple";
User = cfg.user;
Group = cfg.group;
TimeoutSec = "300s";
Restart = "on-failure";
RestartSec = "10s";
WorkingDirectory = "${package}/share/frab";
ExecStart = "${frab-rake}/bin/frab-bundle exec rails server " +
"--binding=${cfg.listenAddress} --port=${toString cfg.listenPort}";
};
};
};
}
nixos/release-small.nix
+3 -5
View File
@@ -53,8 +53,7 @@ in rec {
nixpkgs = { nixpkgs = {
inherit (nixpkgs') inherit (nixpkgs')
apacheHttpd_2_2 apacheHttpd
apacheHttpd_2_4
cmake cmake
cryptsetup cryptsetup
emacs emacs
@@ -63,13 +62,12 @@ in rec {
imagemagick imagemagick
jdk jdk
linux linux
mysql55 mysql
nginx nginx
nodejs nodejs
openssh openssh
php php
postgresql92 postgresql
postgresql93
python python
rsyslog rsyslog
stdenv stdenv
pkgs/applications/audio/freewheeling/default.nix
+11 -7
View File
@@ -1,22 +1,26 @@
{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
, libSM, libsndfile, libogg , libSM, libsndfile, libogg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "freewheeling-${version}"; name = "freewheeling-${version}";
version = "100"; version = "2016-11-15";
src = fetchsvn { src = fetchFromGitHub {
url = svn://svn.code.sf.net/p/freewheeling/code; owner = "free-wheeling";
rev = version; repo = "freewheeling";
sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv"; rev = "05ef3bf150fa6ba1b1d437b1fd70ef363289742f";
sha256 = "19plf7r0sq4271ln5bya95mp4i1j30x8hsxxga2kla27z953n9ih";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ buildInputs = [
gnutls33 freetype SDL SDL_gfx SDL_ttf freetype SDL SDL_gfx SDL_ttf
liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
(gnutls.overrideAttrs (oldAttrs: {
configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
}))
]; ];
patches = [ ./am_path_sdl.patch ./xml.patch ]; patches = [ ./am_path_sdl.patch ./xml.patch ];
pkgs/applications/graphics/rawtherapee/default.nix
+6 -8
View File
@@ -3,21 +3,19 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.2.1025"; version = "5.0";
name = "rawtherapee-" + version; name = "rawtherapee-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Beep6581"; owner = "Beep6581";
repo = "RawTherapee"; repo = "RawTherapee";
rev = "dc4bbe906ba92ddc66f98a3c26ce19822bfb99ab"; rev = "9fbbb052eefb739753f0f3d631e45694d659610a";
sha256 = "0c5za9s8533fiyl32378dq9rgd5044xi8y0wm2gkr7krbdnx74l3"; sha256 = "0r8wzxp7q77g3hjz7dr5lh5wih762pgjad3lkzjfhki9lxr7ii7q";
}; };
buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp buildInputs = [
lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx
patches = [
./fix-glibmm-output.patch
]; ];
cmakeFlags = [ cmakeFlags = [
pkgs/applications/graphics/scantailor/default.nix
+5 -3
View File
@@ -1,15 +1,17 @@
{stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: {stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "scantailor-0.9.11.1"; name = "scantailor-0.9.12.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/scantailor/scantailor/archive/RELEASE_0_9_11_1.tar.gz"; url = "https://github.com/scantailor/scantailor/archive/RELEASE_0_9_12_1.tar.gz";
sha256 = "1z06yg228r317m8ab3mywg0wbpj0x2llqj187bh4g3k4xc2fcm8m"; sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg";
}; };
buildInputs = [ qt4 cmake libjpeg libtiff boost ]; buildInputs = [ qt4 cmake libjpeg libtiff boost ];
enableParallelBuilding = true;
meta = { meta = {
homepage = http://scantailor.org/; homepage = http://scantailor.org/;
description = "Interactive post-processing tool for scanned pages"; description = "Interactive post-processing tool for scanned pages";
pkgs/applications/misc/rtv/default.nix
+2 -2
View File
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }: { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
version = "1.13.0"; version = "1.14.1";
name = "rtv-${version}"; name = "rtv-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "michael-lazar"; owner = "michael-lazar";
repo = "rtv"; repo = "rtv";
rev = "v${version}"; rev = "v${version}";
sha256 = "0rxncbzb4a7zlfxmnn5jm6yvwviaaj0v220vwv82hkjiwcdjj8jf"; sha256 = "03106sdsvj4zjjaqqg7qvm3n959plvy08a6n28ir1yf67kwzsx8a";
}; };
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pkgs/applications/misc/termite/default.nix
-1
View File
@@ -35,7 +35,6 @@ let
homepage = https://github.com/thestinger/termite/; homepage = https://github.com/thestinger/termite/;
maintainers = with maintainers; [ koral garbas ]; maintainers = with maintainers; [ koral garbas ];
platforms = platforms.all; platforms = platforms.all;
broken = true;
}; };
}; };
in if configFile == null then termite else symlinkJoin { in if configFile == null then termite else symlinkJoin {
pkgs/applications/networking/browsers/firefox-bin/sources.nix
+369 -369
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox/default.nix
+2 -2
View File
@@ -148,8 +148,8 @@ in {
firefox-unwrapped = common { firefox-unwrapped = common {
pname = "firefox"; pname = "firefox";
version = "51.0"; version = "51.0.1";
sha512 = "4406f840a7a2b4e76a74e846d702b717618fb5b677f1c6df864c3428033dd22aad295d656f1fc57e581fd202d894c5483a16691a60b6ca7710315b157b812467"; sha512 = "556e31b717c0640ef5e181e00b9d2a6ea0ace7c16ae04333d0f2e9e120d0ab9efe82a4ca314ef43594c080523edf37953e65dbf694c7428be0a024f3719d8312";
updateScript = import ./update.nix { updateScript = import ./update.nix {
name = "firefox"; name = "firefox";
inherit writeScript xidel coreutils gnused gnugrep curl ed; inherit writeScript xidel coreutils gnused gnugrep curl ed;
pkgs/applications/networking/cluster/terraform/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "terraform-${version}"; name = "terraform-${version}";
version = "0.8.4"; version = "0.8.5";
rev = "v${version}"; rev = "v${version}";
goPackagePath = "github.com/hashicorp/terraform"; goPackagePath = "github.com/hashicorp/terraform";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev; inherit rev;
owner = "hashicorp"; owner = "hashicorp";
repo = "terraform"; repo = "terraform";
sha256 = "0wjz7plzi7bgrbw22kgqpbai1j3rmqayrmjcp9dq6a361l9a0msw"; sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
}; };
postInstall = '' postInstall = ''
pkgs/applications/networking/instant-messengers/gajim/default.nix
+48 -11
View File
@@ -1,6 +1,9 @@
{ stdenv, fetchurl, python, intltool, pkgconfig, libX11 { stdenv, fetchurl, autoreconfHook, python, intltool, pkgconfig, libX11
, ldns, pythonPackages , ldns, pythonPackages
# Test requirements
, xvfb_run, dnsutils
, enableJingle ? true, farstream ? null, gst_plugins_bad ? null , enableJingle ? true, farstream ? null, gst_plugins_bad ? null
, libnice ? null , libnice ? null
, enableE2E ? true , enableE2E ? true
@@ -25,17 +28,33 @@ stdenv.mkDerivation rec {
version = "0.16.6"; version = "0.16.6";
src = fetchurl { src = fetchurl {
url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; name = "${name}.tar.bz2";
sha256 = "1p3qwzy07f0wkika9yigyiq167l2k6wn12flqa7x55z4ihbysmqk"; url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?"
+ "ref=${name}";
sha256 = "1s0h4xll9490vh7ygmi4zsd1fa107f3s9ykhpq0snb04fllwhjq7";
}; };
patches = [ patches = let
(fetchurl { # An attribute set of revisions to apply from the upstream repository.
name = "gajim-icon-index.patch"; cherries = {
url = "https://dev.gajim.org/gajim/gajim/commit/7d20ed2b98a3070add188efab7308a5a06d9f4a2.diff"; misc-test-fixes = {
sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; rev = "1f0d7387fd020df5dfc9a6349005ec7dedb7c008";
}) sha256 = "0nazpzyg50kl0k8z4dkn033933iz60g1i6nzhib1nmzhwwbnacc5";
]; };
jingle-fix = {
rev = "491d32a2ec13ed3a482e151e0b403eda7b4151b8";
sha256 = "1pfg1ysr0p6rcwmd8ikjs38av3c4gcxn8pxr6cnnj27n85gvi30g";
};
fix-connection-mock = {
rev = "46a19733d208fbd2404cbaeedd8c203d0b6557a4";
sha256 = "0l3s577pksnz16r4mqa1zmz4y165amsx2mclrm4vzlszy35rmy2b";
};
};
in mapAttrsToList (name: { rev, sha256 }: fetchurl {
name = "gajim-${name}.patch";
url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff";
inherit sha256;
}) cherries;
postPatch = '' postPatch = ''
sed -i -e '0,/^[^#]/ { sed -i -e '0,/^[^#]/ {
@@ -47,6 +66,11 @@ stdenv.mkDerivation rec {
sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \ sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \
src/features_window.py src/features_window.py
sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py
# We want to run tests in installCheckPhase rather than checkPhase to test
# whether the *installed* version of Gajim works rather than just whether it
# works in the unpacked source tree.
sed -i -e '/sys\.path\.insert.*gajim_root.*\/src/d' test/lib/__init__.py
'' + optionalString enableSpelling '' '' + optionalString enableSpelling ''
sed -i -e 's|=.*find_lib.*|= "${gtkspell2}/lib/libgtkspell.so"|' \ sed -i -e 's|=.*find_lib.*|= "${gtkspell2}/lib/libgtkspell.so"|' \
src/gtkspell.py src/gtkspell.py
@@ -57,9 +81,15 @@ stdenv.mkDerivation rec {
] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]; ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ];
nativeBuildInputs = [ nativeBuildInputs = [
pythonPackages.wrapPython intltool pkgconfig autoreconfHook pythonPackages.wrapPython intltool pkgconfig
# Test dependencies
xvfb_run dnsutils
]; ];
autoreconfPhase = ''
sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
pythonPackages.pygobject2 pythonPackages.pyGtkGlade pythonPackages.pygobject2 pythonPackages.pyGtkGlade
pythonPackages.pyasn1 pythonPackages.pyasn1
@@ -89,6 +119,13 @@ stdenv.mkDerivation rec {
done done
''; '';
doInstallCheck = true;
installCheckPhase = ''
XDG_DATA_DIRS="$out/share/gajim''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" \
PYTHONPATH="test:$out/share/gajim/src:''${PYTHONPATH:+:}$PYTHONPATH" \
xvfb-run make test
'';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {
pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+233 -233
View File
@@ -1,585 +1,585 @@
{ {
version = "45.6.0"; version = "45.7.0";
sources = [ sources = [
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ar/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ar/thunderbird-45.7.0.tar.bz2";
locale = "ar"; locale = "ar";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "7a2976d272ecc0a3727e34b0841865fea6de9f05195089aa912831836c6f74b9fd34de0ed327cf96cf5b8c0e39829e2db5dd364a92e4ffc48e7139a0fd9cf066"; sha512 = "5e971fbaebf1e827da0f257277f7589777f426da8ce5465bfc2e5ca935cbe3b573562a94671f5b90b1005447169000b14c422aafdba68ceb7b48c7c1cc529fb0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ast/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ast/thunderbird-45.7.0.tar.bz2";
locale = "ast"; locale = "ast";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "fcb1efd553617825e5ca55afe56a6e36cd8a0c067f4e851c6527058fe1b8169da2e548932e21bc7a52eacec9fa2c55b0cc1369a850a9927ba6c686ed6f5940e6"; sha512 = "9ae45c5ff83dab4b4da3849d147546e8265718e568a82a14ec111128ac97b606dc122962954e8f2650e29f7bd7335508eebf30b3245165ac5563ccbe9960dffb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/be/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/be/thunderbird-45.7.0.tar.bz2";
locale = "be"; locale = "be";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "7ca8e07771a984510f2114bcf58397e49e6d64013dfba94e3312ad926e05afb01dc5beced22e5c00f0e43d742752f8a96b5ef167f4d892a01fbaedc194b76d49"; sha512 = "6aa812541b2db739e2afabfbc00e3de8c068460b9689490adfb0306b54914efee6a3fe1854f1c5e18eaf266220c1c3b7291e4da0d3f8cf0f7d651a0ef83ea8eb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bg/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/bg/thunderbird-45.7.0.tar.bz2";
locale = "bg"; locale = "bg";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "fe717fc5590f420e13a0c8bedba031b8ed5e2379ddf613fc14d82f718afe9341d953baf4f056fca88366248a5f3777cbcc3c12e5bccc33ac07698d3de8306370"; sha512 = "54d657278863d8b8030119fd1a31656c822e4c12eaa607ee3b61dac2ac24ed11069e913f3d6b1c868a040bfb610d79133e3bfc509937fe742f23d1d5c8be0480";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bn-BD/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/bn-BD/thunderbird-45.7.0.tar.bz2";
locale = "bn-BD"; locale = "bn-BD";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "9e87ff7976eed19137767b0e9ee2b43b41701edc060201da8d54c68d40f26d88f07c3972d59d59e74191bf30163eec642d6b72f7e633fe48d5cc34f1624d7983"; sha512 = "45ba00305d7ee59d4d33c73f1dd6bdd6e49f74e7bc41092fc3216f09e36987a0f7a5aed42788a2c4873eee9121267d7206813066b1b63d3a8b6953cdaad62882";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/br/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/br/thunderbird-45.7.0.tar.bz2";
locale = "br"; locale = "br";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "2c829c85255d15aa6ad9a941404290a546dbe7522877bfc0b9869415e6f806f853252bb646650d8a9f9729cfd139121dceafc4c1c052030ff7ff7b17e9cef4c3"; sha512 = "277660c584fe60336a3333fedb181713e8eb5a9ede4844238a61748a279c68d5768d96fbaa93b9c6132af5a37fdd38650e0c91579a6b17a3501caf213054426b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ca/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ca/thunderbird-45.7.0.tar.bz2";
locale = "ca"; locale = "ca";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "452f701dd496fe6da40372188f7db2628cbe9b7db737b167d052a4dd75c668fb2505e68b6ec299b8a9d0e4cb448a57f8805aabd0d898e21cb67e89eba0163014"; sha512 = "c9e69470dec521144fb96f99e9a22987f5e982b4e385ead271966e62e4c252d880aec2581e6f0692710cab8f9667c5c34f26c9cd86ccc84c7bf25b21abd4461f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cs/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/cs/thunderbird-45.7.0.tar.bz2";
locale = "cs"; locale = "cs";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "2574febad30bf072d7a0674ff821ca35845d6a5fda09cfce9cff18960af210ded42370bd148324e3599b14977cea770e59e8425c1bf0e6a52824c52f0a864457"; sha512 = "0be3aac8ffd4d0ad3571740933c3da0e1cd47dbd7e555eca9862751da367f0128537fd190159c138bc5f713fb282189d23220b45ada59de8ead59711566e7b8d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cy/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/cy/thunderbird-45.7.0.tar.bz2";
locale = "cy"; locale = "cy";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "f07456acf596b6e3e98586177ebe41cdc09a7476c465371153062b394f0e89a0bf17ead255375cd0616c2db063dce3ac9aeba8d29f7e5906fc1c323000b49f22"; sha512 = "a36b500385a55756686e5d3378ae1b84df4d438507bbf0c84fbdb6e2a3942e2eb032b37f004fbb70d2ce00b495082534ffae670811b1b0ff82bf33b88d3481c6";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/da/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/da/thunderbird-45.7.0.tar.bz2";
locale = "da"; locale = "da";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "7bda2aeb26814fc9b2b1afb4470ec17f0b069b779e99ddd3ee423ac3776ca47d23223009cd35d2f6e495e7b5523787a228fa55db6e56f0c724b45e5ba2bac9d4"; sha512 = "f704327994b2ab085fddf9749dd440062ee8e2d5a9aedb2fd6b4c80bad6fc2ece620ed7794f14b8f55b4e1c358178f6b11d61086e0535b077a770573942f3c33";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/de/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/de/thunderbird-45.7.0.tar.bz2";
locale = "de"; locale = "de";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "7a9c629f957c74e54c2e82912836fc1f2688f37ceee43a31b29d1d4b9b2c477e7ebff3f4b4969386e7aee458215f22a76ede4abba9138fd8d64411a0bd7103d3"; sha512 = "cae4b36fca75a9246a91cd0a26248ac2d9d4f1be93eb4ae7b172a9ee66efab17d023a8008e318c0db1b1fe227fd0085def6441a8e16e2fb284198805754aca7f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/dsb/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/dsb/thunderbird-45.7.0.tar.bz2";
locale = "dsb"; locale = "dsb";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "666a64764cbd0f216f9b960f78b1e45d63c008332efd93b9e233842f37478d9c0f2d1faac494a5b28d43ff21a9e01059fa8b46554d05f47d919483b6d63befab"; sha512 = "5fb46ea74aecac2ea56ad2cf10b00098d144be99d841648cd76baaaba6e26709f4f470d58a22465a3a62dbc4578c8001afe857a4e9536b30bb50d0fa942a25bb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/el/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/el/thunderbird-45.7.0.tar.bz2";
locale = "el"; locale = "el";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "02a7f06adfb93ee1694e0389e01b6bd2fe51e5e2379cf3c0fd34b8c7c8d7f58a848679fae19a7cea851bbfcf96fae493a020701841b2753678a142e3925b56e8"; sha512 = "33fbac5d0cd9348d2e1a5ff239770d058cd29382abebe394756088ff0610e7fce00021ce0f62d81570c557451dcc5352d0c9644f83c08c0f24a496c60194ecc1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-GB/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/en-GB/thunderbird-45.7.0.tar.bz2";
locale = "en-GB"; locale = "en-GB";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "1e45378d32c04db6b802480e245663f3c4522105da6c548d6ff1e5eebead55f53322909b87ecf0b97b85fab30b684ef8e9f3c0175a033824bccadffbb42cad7f"; sha512 = "f763c506aa22cb40a9c991a17ca6bdf5e7451a4b727733c54e58aaca2f1945ad008ffb51665f4d960d70189e5008853fbe0308382c8c9300b3156b143fca2375";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-US/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/en-US/thunderbird-45.7.0.tar.bz2";
locale = "en-US"; locale = "en-US";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "ab06b894f881ebc847cdcc11ffabcf7d9b626da9ce17c4195e7c401963bb3937b8a05eb73ea2fb988662f318568af3ad7142d3fc556cfe139d4393249c353446"; sha512 = "c186bb0d52eeb8ad87b26871257a9ac6a29cb418ff9956e81804ebd1f557d28f31d99124c530f141b612594dd149996c6258d11953698e5e9083bd1b7c7ebdc3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-AR/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/es-AR/thunderbird-45.7.0.tar.bz2";
locale = "es-AR"; locale = "es-AR";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "07be1c0f88aa49a8264bfccbc6db3e738dcde83d93f86939bf3ffb5f85c835252f2f4a74a8cb3eb5d2ea6a1b4af31d3d84418090a23be36aa11965cd4ed67b66"; sha512 = "5aeadcfb8417898367f192f09c1a12595e772d72f66fefb54510ea447942b1a715bd619224dab0047d218bf35e6b7a88562d7bf45f4bfede3f94d189af209e0b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-ES/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/es-ES/thunderbird-45.7.0.tar.bz2";
locale = "es-ES"; locale = "es-ES";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "2c51ff6931dea175ad6d8eb64c768792f61bef1cb5762efa3e7261cbf14c7619c81ef44a8d6e1ebe7d9764d2608b85e6ddbe47ec437f500c65037d6be8341d88"; sha512 = "d4762f067f645489147cb53c5fa1e6eb7e2f6df7bfb541b824988a8e918df289498e27af70407a1537b28dfa40d0483a0da08fe757839e3bea2d958e2d9ea7c4";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/et/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/et/thunderbird-45.7.0.tar.bz2";
locale = "et"; locale = "et";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "e726a397cecb1d624fef5840b89a177591c8a10d397042b2c5f47574d9b88d0725a1b53999e2d268a67c4efd1b4551ffa2052398c1ad14903a8b0217b5b353bc"; sha512 = "c4b2f7f2b13ea7fb5a14e5ae2e258962f8f3a269d3d35987d37015d72d42d196e6581928f6cb4f5300036c58d4e6ab69b085588164e6b516a778b0f5c789f22a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/eu/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/eu/thunderbird-45.7.0.tar.bz2";
locale = "eu"; locale = "eu";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "85c2fdc7e27a8298d8e553f221595ae0d7872eae4e78d143d533a18582d8f40195db38f179aa2ed558e790fb7c58510a8ad6037c698ab149d3bd582e34528e5c"; sha512 = "d38a6bf51d9b8b8c15a709bd8618cf71cee799afea3466f0d197a8c4a1b9b8c4dc60da1b43f398619fe3a73b8444429cdd48af8065bd3a34f91f271d78169ea0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fi/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/fi/thunderbird-45.7.0.tar.bz2";
locale = "fi"; locale = "fi";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "ad4516f11670424d31e7fc5c9b12bcf1f0c63110b81ab45a3c5b5a897e1d0a3ce1855117254902ca177a04fc422c193c742098a431dbd8b760bdefe1d7c4c6a3"; sha512 = "087b9b6b500ecb674b013a8f9fd050cd7694c6e07f90de8e421ac46558afb5b73640d293c155c200f06df3e1dc40adb8d2f2b2f28d30aa83cc888c5f7097f8e1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fr/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/fr/thunderbird-45.7.0.tar.bz2";
locale = "fr"; locale = "fr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "4abb3fd8430867262811a4aa56304666ad6a1336959afff73fcdc38f157505975d6c340219db4980157f38dcb4b2596cdf623f311f6fbd29e613a89bed35beca"; sha512 = "50824c56fbcd2d164f891a749114b3401e01845b0118b007528542f82884a832ef1cd5fa72b41cf878de80a1f220e453cd26356375275b72b8b7e14dbb94abd9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fy-NL/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/fy-NL/thunderbird-45.7.0.tar.bz2";
locale = "fy-NL"; locale = "fy-NL";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "dddab8f7453bfc074f3cd8d6aea33402f66be1bec08ea7c152873af63c802e03edf01e74db236dac6e088f836f188258d3dc62fefa833ffc525ca15b71cfbf21"; sha512 = "5e32fb0c933a9b5dfd4557a16b41bd8fd17f734b66b887a10780e7a3c5658383450fd63c42f693ed095056fcbdd45e7b2fc2bd7a919225b8dd8152c0620b93df";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ga-IE/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ga-IE/thunderbird-45.7.0.tar.bz2";
locale = "ga-IE"; locale = "ga-IE";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "66acfc92a997ef6a2f1dfdf6a6952eebd7788b14d3080867349619b3f9559bbac4cfe6e983ad87900e089a0cb15dab2b9f77dcac69adb66ef0f97f9b5cc4e809"; sha512 = "747c305440e3fbacd96dbd1aba42fc85d302171220eca94bb46930f618404ec152de5a1bc130fd7033098d7f9401fc945df51c8215a49e7ba1d6fedc22679d81";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gd/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/gd/thunderbird-45.7.0.tar.bz2";
locale = "gd"; locale = "gd";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "e4d2fefb8e7c0c14395af7f695e216f6fdb685ca150cb803a347228aaea988169a7093747e770921716123a9333bbc00560e6324ff2f4f966cd895c2fbe6e21d"; sha512 = "6e661d5c2b6a531dd4600ac55c65d895e176477a85a0311697e1a14d3888da2de40d03701e4f447898e4119c210bb64d90ef2a3f1d131540ae521cf4448bfb7f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gl/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/gl/thunderbird-45.7.0.tar.bz2";
locale = "gl"; locale = "gl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "6cc628399fa0adce0fe740e77a8e708988f7dee4d004bcb785fe567ca680fca79fde756e479cab9017828cebe48fa091e402d52d6bed54aae9cc5b6e28f246d8"; sha512 = "9da68b8ea5125f94c22ef74bad14ce2f624e59521e62b778884fa68740a2bcc632b80d83a3e85011bbcdc76bac7cebe7853f22ad6bf7c9642878a089dbd034fb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/he/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/he/thunderbird-45.7.0.tar.bz2";
locale = "he"; locale = "he";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "82bbf5a5fe84953d9118948fe3e9d4d6a46ceaafe42f76ea3dda36134458d30f0c73f2ab61682d2627b8c3d598d2174d549d8b4b80bf5c3071627b57b713329a"; sha512 = "cc9e36346cc7b0b18afaf23e7637d51e2232db028f9b9d5c708a1bb4ba0cd62638343fae5dd414098c6755782a2e8e9ac4731e38746574610edbad94acb65bad";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hr/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/hr/thunderbird-45.7.0.tar.bz2";
locale = "hr"; locale = "hr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "c70dcfc8506132ce0764de325c8e0debafdc8460052bfa4901172f880b935d1c0bd70b1f7d227604f6bfd155c2ff165c1ad7a5b509d512483b54eff80e910a1a"; sha512 = "0f68a4059b2053319cdf0fe335f782d9a53e392c5d1c471326cdc47f2f779dcce75e4882e6c9e339cf6d0589f084ab54d9ef5d4c4df193c96a7f476cd0c5f9ef";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hsb/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/hsb/thunderbird-45.7.0.tar.bz2";
locale = "hsb"; locale = "hsb";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "5baeaa2ae960514551d062979cd60644971b6603ab33b9773a3eff10e267f0029b2edd5d48734dfcf99697ec77c88e12f4f240ea18a7433a0a2eb07f70283389"; sha512 = "f6077a9c5b91f5688d2f71201064015d87bf38bc34d9f556ee1037650815c05e71a2cfc0d67736c308fdb6b5217f0fec56fbfc5a7044940f06c809579a80610e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hu/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/hu/thunderbird-45.7.0.tar.bz2";
locale = "hu"; locale = "hu";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "bbba8bfef9168efcf0aca6fa98596b3d7bbfaf456ceca263825d2f96b054d6dbc672e1086db645a48966f82cd0d6f4c85e9846935dc7b2595faeefa81c66904f"; sha512 = "958d7b9d82fc4ecbd0387df0bf2c95d27fde530b28519a5c7e6795f0e62ec0fcdc77bcf526342d5e13df993236daa2576f205c8333705adc2be35f156d5b9176";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hy-AM/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/hy-AM/thunderbird-45.7.0.tar.bz2";
locale = "hy-AM"; locale = "hy-AM";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "b58088defd9a2f76aa779bf080135a5735e1531de065b1a3ac6f9048266e763bee8a22be634f435584d308aa5a532b72687bbddc8f7dedaca39642ed04137bfa"; sha512 = "2415b150651c0a6f173238180973a6ec1615e67fbb7fb7aa4d2d3d773e14c0584ca2c8ac268fb8c6597c1985fc91db741d6a842e17b47f4841cd50a13cb7896b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/id/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/id/thunderbird-45.7.0.tar.bz2";
locale = "id"; locale = "id";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "c83198b8ac60132f3124253c082ea0d5a45f1db7a7a6509ea18e3d084e26796364e6ced3c20675620cfc7f849b4e7fe342c86d0cea24eee48c815dc02730074f"; sha512 = "3a682b3a4dc497244446674c98e588ed0f8f5e835eef00d9530e78d84a62e43ad849b807b8d6a9086ed20347b874da2ae486769e451ec19525e8e34004a34727";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/is/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/is/thunderbird-45.7.0.tar.bz2";
locale = "is"; locale = "is";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "285427b6f53c181889b78d005071f71211a2a51b6fa5f3eaf5a573a4a5e15cd83d946b97f3da89d383fd797a6985f8c1d589fe40e1267a73224848080af9b79c"; sha512 = "9fd5b5a7d606913ab9697754093e21daefbb70baf515200bb3b8400f6eed2cce39b1415ef6f4ddb195c40bdd7deb9ed8c863c5d3c2ba4b8d4e3714f62ead7fc5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/it/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/it/thunderbird-45.7.0.tar.bz2";
locale = "it"; locale = "it";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "5e763b01fce3bb3ce5deaea0d3e4bb51b5cd752ab5fa191a064400f7961d237924b98013179f0d32017bc527478d665d6fbc74482680aaf041444d3c376497ae"; sha512 = "0d05dca4e136b3aac77af366f3356a5af32c0f46589a6303eafdf63f0e8128fd9c4f80232852ff91ab1f0a4e06e27daa70fbff640e3f6a30c0a31dae280b0cf1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ja/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ja/thunderbird-45.7.0.tar.bz2";
locale = "ja"; locale = "ja";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "7dd7b1f9fcfe103d8b70587e2a8307bec93766b504390ee138cab52bb8b8f76759af84568eccc71e5a88ee8cf3e326313930760cc92267ecf7e0fb29fc09f8e8"; sha512 = "ffe36363f9958132c8a4263f985ae3d5ab349fc7247cd3521a2ea613fb3dfea420d36af8e650d024d9db39b89b225751bccd0efc8e2e4d4c91bd8786657dc0db";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ko/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ko/thunderbird-45.7.0.tar.bz2";
locale = "ko"; locale = "ko";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "1776ae557e7f7d6df013d178a68f969aee4da9de6049f0055e290a808da61af4bd712d7915ac05a04c159db93fab7d994bd0317a471dc0498c2b5c0b8696cf71"; sha512 = "9d91b3df05ba7d55428cd3854a70a28e42d7d51a227d239a29c5d9efb11f8d0eaaf812bc71940d33875bb7bfed9699a9131874af8ee49e4504cb996c0c3571d7";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/lt/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/lt/thunderbird-45.7.0.tar.bz2";
locale = "lt"; locale = "lt";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "499a710619b3e9f86fe7e77e35ddbfece5609af92d79b50b697ea8539cd0b198ec88702a7c19a9169cdb2b1dead19fe786d0af16bc6fe2b9f3e0414780a1e1e9"; sha512 = "3b5aa45b9e893b784a192961c40c4c29dc3bba641b13b9aaaf0fc67b8d7b5aa3b404700c63fdf3f7bdeadaaae89495b1e37e274fb686a46b654113308dafaae5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nb-NO/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/nb-NO/thunderbird-45.7.0.tar.bz2";
locale = "nb-NO"; locale = "nb-NO";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "d97a5f532a000f3cf44e1b741a3a7026d07bf2c6012b4f6361021b81058aa93876304014d3d8d7181695c526cfd887523e217b7b502c493f5327bb4ba4d00461"; sha512 = "1959225b4fb510cc414b57934728c75e91bbd9d105ce0cfc7784167c4f30676adb59302e9252475c758dec08618df733f8873378a0d0ca3db4dd51b9c469c424";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nl/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/nl/thunderbird-45.7.0.tar.bz2";
locale = "nl"; locale = "nl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "06df0ab52f6a9916bef1605283c7669a1afbe5ce7f6bed5746673ad5ad222034333bb41a6a1d81e87165105e3493d095bc90c5a910cb48041042367972dd9d61"; sha512 = "c4c32627de1e70a9934178bbf05298ccd22194269dfd82907919b91edbbd9ee177c3cbb821e8c62d6aa6fd67207ecab633e80cadfa85bf1fed8d67a508e1da42";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nn-NO/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/nn-NO/thunderbird-45.7.0.tar.bz2";
locale = "nn-NO"; locale = "nn-NO";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "3509fbcb2955b226d869e43812665c7d2752956f68cff8cd4df3dbb3d0bda2b060218ede3eb9fdae285ed6765ce89c720793f905e09a97d6d22c2e36db890261"; sha512 = "3ca25a101458c38677eac0998a3d88097d9a56214e2cfb47113ea250e2aa504ad0f2f9f97b94644c39a8079a0ef57ba3a6d89298180f16c26f0e253b25338a57";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pa-IN/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/pa-IN/thunderbird-45.7.0.tar.bz2";
locale = "pa-IN"; locale = "pa-IN";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "b113f1134df372dd4d369eb9d4c9c30dfe15fc8d65c153ca2087a6ce3ade368554ea2e9561b7d4642f7ec52247071bb323649e884ebd89b8472bc046c1e3be5e"; sha512 = "8ff5831dad507d975946f30b28c757e3dbab3b48c410df24b9a18e2b01cdc0813640f75603e14a5fadf7f449657b5dbe580cbec2f93f1c010d252c491510588f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pl/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/pl/thunderbird-45.7.0.tar.bz2";
locale = "pl"; locale = "pl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "4ea27afc66451ba40c8cfa22930598925dc18b4b074ab190d8c8866d0f516e9887e8c006ec1564b490a79f67b0b2c88d3fdfa616727e36bf705d780af82a27f3"; sha512 = "b50a227c15ef35067baa3ce95fe0fc8e6f5cc2d90abd14f3d783198573de530bf0d86b216cb065b73ab540f213cd2a896beb8335a7d5cce150110d3e23e5846b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-BR/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/pt-BR/thunderbird-45.7.0.tar.bz2";
locale = "pt-BR"; locale = "pt-BR";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "263ac30d26e20733eb332c6ae6837e3ebe7b8c41ff1cc15e47951f22e89873a620218e9caa2a3cfb74a93e619575a4812b362d4908372fd3ce05406d7ef295d5"; sha512 = "f286dfb2dca8b69569059c39eba7dd2d78037440f64687fb7543f2209d54e5b68884da910a91f87f0f16ba0516d78da65835f56d94a3ccd89644aaee83e0d562";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-PT/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/pt-PT/thunderbird-45.7.0.tar.bz2";
locale = "pt-PT"; locale = "pt-PT";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "90ed68c12871e11165f9357a1e836fe8cf872bf654303c07e26f1bf30979d756e9fe6f034b4265d8f22fe8d31853ba76a983a8c7fe3759d7793f904f8cd0f788"; sha512 = "49a74c9068102b510995c1634e9a3084216caeb8995b07ad287fe0239040e9a63aa1f3800870912212cf5b94dcbd6672ad96154dc19589804f63eab8f9e0213f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/rm/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/rm/thunderbird-45.7.0.tar.bz2";
locale = "rm"; locale = "rm";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "ba6aa5a07a06e57a4241f1e9962f4a28b4221032b8b3220cbfec2f3675f808367c586da0fba987e7d1309bb3bcc4d2ed48ea8ef98a6f4a3e65d4fd9fe06c527d"; sha512 = "c17bade5200a48d8aae39b6084768065709e45d3eb29054c507d038d88d3f2ab4ee0ec4fec111b20c5acec341817fd1ac52babcf581b985d0e28e8e2a35e1934";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ro/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ro/thunderbird-45.7.0.tar.bz2";
locale = "ro"; locale = "ro";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "caeecf69a9da3dfeb2c3ef8b0d8733e81e32ac201c0c5b60206160d47172863c91f2a0fddf3e7d2f707918934467c01a0dbbe1f63e3859a7106974b3a5f084a8"; sha512 = "f146430b29fd011df252a077bb283221b3af1ce7dea1f482f807624326909a98e9dc18debaa184b3704554fda591961b70c5f09748c8d523e309dccc08c790e8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ru/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ru/thunderbird-45.7.0.tar.bz2";
locale = "ru"; locale = "ru";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "22727502ca4dec94470a71456c19ffd7f01b75118480ae67ed4849510bf77c8ec1359ddb0233e41c1b1dbad219ad5111d0b11c6c7ae7258ec10167f27b08f197"; sha512 = "3794c474c09e20c9c58359a005377fa7a2336c72399b7149191c54dc824031377470b8b105d731380efc3a89f73c7befa18a443210affc3d8062943d8db9f544";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/si/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/si/thunderbird-45.7.0.tar.bz2";
locale = "si"; locale = "si";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "b872fb53f0380f77dd4dd87ccde7151db206adaa81801aa907db398df1a51bf3ae65510c452b035cf71c9000dd949106c9d64f44cbde7f1419cc41e403ac6d29"; sha512 = "a06ad8b09784b1dc291a3196765f98b89ca66b1c68b1546b3cb71864c73339063af62e8f06ec3518c6508cb54dc2f3cc93b50906a3ff9cba88809ee9b18c731e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sk/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sk/thunderbird-45.7.0.tar.bz2";
locale = "sk"; locale = "sk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "32b1e962e7e4e6aa8d198e080a09b43d21cb307bb8a3af50fc7170748604ce3b6f96b5f59b56b5c0edd61f7af31ccec9446aac50ef9eb94e5ef7a48c71e99541"; sha512 = "6f4a883e1da1dc3902e0230c2105eda528e882caeaac0762c8a7bcd5e9c63e003bb803f921af2e7f9c7a21f34fbbb3558222d8e018f083553d5f532b915896c7";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sl/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sl/thunderbird-45.7.0.tar.bz2";
locale = "sl"; locale = "sl";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "c9192435795c677aae642884e773362d17e5afd8e5943e2759d1486e4ca5bddb35be3c99a4b6869aa7018db4bffa09f0b63e500eb26a00cd35c141543eec0a00"; sha512 = "328199364bcbf2816fce38597fe8554dc0ddf31cc1ab027c5b7e1a490d7261e4c440938ede308e7aabfa3a05f9b7ba9880209eaeab306022e4b46fd0eeef5b94";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sq/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sq/thunderbird-45.7.0.tar.bz2";
locale = "sq"; locale = "sq";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "2150abcdded45107ce54ee58f55bbb78f9fdd0fae143fe423e14f4debfa4819c23b021c8d4d36dfe606e206d3dc3deda0671cd08f6d82f7ceca7e7591e7df3a6"; sha512 = "a04e1b5d44fdaaec2ddc49d531eef3c7bb84347533f84e0974a243a5b3b90ba8acee63080ba191b5404432e4ec597ced4cd69d674d1ec50e21825ff79fbe7af1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sr/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sr/thunderbird-45.7.0.tar.bz2";
locale = "sr"; locale = "sr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "a9bdf3062d72095d080ad309f25bb8aa27635d3497fd99e6982ae3ba635f61c97e66fe9aefb88466f6f22c6e691692d70abe00c10294353d88fc288111dad6f1"; sha512 = "f9439cb927e37769e3da2e511865114d9cb76d2a8de6de4b83f240606609501090fa8f0348c515aebe97d7214842c2731de24f3881baa32fc04b0d2779711704";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sv-SE/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sv-SE/thunderbird-45.7.0.tar.bz2";
locale = "sv-SE"; locale = "sv-SE";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "4353836558baf234d4dd3376a6262ac0af576f16d725c71ec5eb994a72599e748d2334cb916a3050db8f719aa68f2f9d7204aaa4a41ff9da339db933fb64d496"; sha512 = "db3c318588b029cac92b0d4f85da41aa09538e1c8941719fa2a87302d5d025e83c08a86ce720417b1dd8810b7284c1ff913bf299791c60b5babc1a81e7cbfdc4";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ta-LK/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ta-LK/thunderbird-45.7.0.tar.bz2";
locale = "ta-LK"; locale = "ta-LK";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "9f4c8192c6d683325efcfed3d5ccea7218e2eaf3193ccde00be8542f13e8b3771d2a3690ff212cabaef067452f72061fb47a8184ef16fdf59d687e3b760126a5"; sha512 = "976fa4171b0f7f085cb5d5d5ca23cc009c26bde5bedc4c8ebd76e30d6dc75b19ba3022167639b4df03d85865f2c9e1725a70e2badae644622a233a1d74a3a989";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/tr/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/tr/thunderbird-45.7.0.tar.bz2";
locale = "tr"; locale = "tr";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "12f567a390f44a79af8615f677b87164d74172f7540ebe6d08023e017576493b0da5a63c466ffc2c3a4c406b0d9e8753e00aaa45dd1acb751621cbb8d9e53415"; sha512 = "fd336f9880d03cf276d8749afbd605452344d3e7966a260e81020f59eb30166f10ba0d2bc17ff0e635a5cb1d15dad46cae36629526cc3383827ca162743c3642";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/uk/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/uk/thunderbird-45.7.0.tar.bz2";
locale = "uk"; locale = "uk";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "844e7ee825d304ae19edfbd4c324ba11c2037c9a97fc96f8b99da7fc3ad0137d3106069fdfb06814d2df20a75c6051416b52448ec56980858c70110676294f90"; sha512 = "3f9ae50655d274ed6a7022a2af0f9f403a835dd3d76027f176ddfddf4fc3095b1e5951cbdf043e449a34b387b7ad446740a01c2867573064039e3a1b34f7f66b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/vi/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/vi/thunderbird-45.7.0.tar.bz2";
locale = "vi"; locale = "vi";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "35c0fee2083c922284fc11a048150d53a343fe7980160d2c4cf2046e588056457b4e5876dfceb51b79a828886d9671a1934d51079c6d1e64e9af979927d9d8db"; sha512 = "82fccaecc5e654f4d49292bc8d45d7b27aed13a63df0cfd7eccd8b06131f5cb3053d1e3dda5e6cbeedfa6df275833fa38860c0ddb6cf59402b2e4c3aea208cad";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-CN/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/zh-CN/thunderbird-45.7.0.tar.bz2";
locale = "zh-CN"; locale = "zh-CN";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "039cb44b4e07fdaf6d9b1eb717baf798b3f3a3cf8726ce97b4fa7ab7e938b9365158597747e406916ae35150c9cf96af74590c5189a64ddfbf65740c1cd45c5c"; sha512 = "d4d35875d1c0edc2d67cccf9804b5dbe66f4808155933515fa6c532f657856bde441c3bf1af9553d4417e4858ca64db112d4d9fbdbd1151cd22d38da09b7a895";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-TW/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/zh-TW/thunderbird-45.7.0.tar.bz2";
locale = "zh-TW"; locale = "zh-TW";
arch = "linux-x86_64"; arch = "linux-x86_64";
sha512 = "4721eed25de2cc71728d7cee651fdf51ef5b791873a3e59df2720c0f46269bf375e0e9456024ca4ec9ca31f8178b5af704e2fa9cb057860fa46b72ff4b22970c"; sha512 = "0d7986de773742dbab8210aa97cf6c7d80b792cfae192a06a3cf1c0b39436431ce174c3b97c5421879eb261960bb5eeb52c8b22abcba208b531fd45896ba9124";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ar/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ar/thunderbird-45.7.0.tar.bz2";
locale = "ar"; locale = "ar";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "e149770dd3229d3a00e56cd34848afbb1ff6765e66da4fa449156dc58c6990bd35e442ea8c14cf90e63541a34fbcfec8d8714350186e863ded72391b60622c69"; sha512 = "8ff8bb47f0a845139f813df40d021a215e498c38149b53f57094b4ee20484f4a0ad668337b6dc79ad8e84d6a6a9b9a99de6fed57accdf5b8dc123b0833961d0e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ast/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ast/thunderbird-45.7.0.tar.bz2";
locale = "ast"; locale = "ast";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "3bf557b9e9ce9f4b84e3407dfed2fbaaa280893033d4bee0724543b6951e0533050b8feeb0a01b4693140815ced705a5ef16e800d149f967bb39329dcbecb5f7"; sha512 = "8968e2f4d61b4753c6e1cc07a0f61ad6fbe0d205b29b424bfeda4bcdc3b23d3458561eca7287dded12196c008b6ad699f680b61aaf6dd7f4ee6dd7e813b25ed3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/be/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/be/thunderbird-45.7.0.tar.bz2";
locale = "be"; locale = "be";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "ace07c8982b68ed259b344aab73790fc9f90f98f39b65a57c6be7463c3918d545c4a0a6ff6df5b8ef7b7b07ae44c7e69a1bfa84c7cc82b9dd62bba075a2a113c"; sha512 = "2a3b2e5f101a6a69f425494934900d151545a026d8c77a4e08342d3816de5229802c834120e5a797b5691b55fb5e486d21b3dea189ce6ffb8e4323e0f2dc2051";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bg/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/bg/thunderbird-45.7.0.tar.bz2";
locale = "bg"; locale = "bg";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "fed2ed25fe530939c4116daa3a3a09075812b005a937c36cab385bfb867d703a84feef50e2006f83009a25c0736c9b032c17605b2364d8fde4799d1e9f479b8c"; sha512 = "09de26308307a0fc43dfde5a5033c737a79d76e80a4f5e457b87a8c8710dfe05acd1fd782e3b86872673c61b9d559162135b017a9f93dc3ef9d93c530b7f513b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bn-BD/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/bn-BD/thunderbird-45.7.0.tar.bz2";
locale = "bn-BD"; locale = "bn-BD";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "84190d0cc6884f14ccf4ce06dbd69193f90591becd5d8064ea89c7ec12ec411bf766bff1bc5d5c6f142fa53ed2b9ce494718f7d32a74a027819de32381b24526"; sha512 = "040523cd6589834870b23de3660a81fd588e2d2ba8c727be6d19cf92ec0b669d79058a8139f0ca7a289493658324216f8fe3fcfeed2721fc54c7c3860bf1e0ef";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/br/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/br/thunderbird-45.7.0.tar.bz2";
locale = "br"; locale = "br";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "619857fadb8721ccf103a3739a1336e2cafbfa62a0a2ab074254481d50f0d301f7718d47b5a3d42922fa562f1382de2aa8b5256bc62d829400926a494bc19403"; sha512 = "df02188626d3180ea0822756a116f1b6a4cee6178b0e0fc22bccc3970ea3aa5717b75cb5623f5dddadf354ac0c890acd4f13f434418b7431b944ccef2833aafa";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ca/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ca/thunderbird-45.7.0.tar.bz2";
locale = "ca"; locale = "ca";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "3314b1129be6ce854a6b028849167af5f93c289073f962f5de09eb37fc7a2c40eb75b8b361289c879c4b7f752170f05a01dc6ae996bba4a5b706c1deb037cfc4"; sha512 = "2ab3ff92c2899ca294631e9b0a2402080493f478affb40eee4aad7b001c7a7d8f8cc81b5659c16d7d134c8ecf6e8f1447fd6daccf7ff82b03f283be55638bde3";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cs/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/cs/thunderbird-45.7.0.tar.bz2";
locale = "cs"; locale = "cs";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "07d21c5f4aef38b9f7b330bf0c06f10ba3fc7cfeedcdd45e45ffb9ad4e5b1f729cb5d249028a87a8ce122da96c240447a6eed4be2220e302a2c55ac39cb1628a"; sha512 = "7ba56912a4ce6e87b6e4a1303f254608960aa2a156e7d246230e4dbaaf50f083b9f4afc52e89966caea6fd64eefe3dc9bbcdfccd1c0e65910efc49e44bfd5a76";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cy/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/cy/thunderbird-45.7.0.tar.bz2";
locale = "cy"; locale = "cy";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "b2f86ed9ebfd8124611f6d9e20cf36322e36cecc2fea688649b9f6df231d65ed4cad192e12b7a27367b3b7706e510c5547c5bb22aedab76d420540cea9b81ee5"; sha512 = "f74b4829ada40e7b507012ae77cef420d3e8f77b41e8adee352dd1f91300f090e98dafc852f7983d04a8eea4ae90d1978301c39347aa75ad68eec42822a9c1fb";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/da/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/da/thunderbird-45.7.0.tar.bz2";
locale = "da"; locale = "da";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "00ef125afcb33ebd5f11b765c9c3ea9e3e240e3416d00012cbf1b82377f8d610ab2b4aac800d7a0ae0f443447840b35d92e58600d83dfb6c6dd76e8ecabd3924"; sha512 = "29139a2f285a684952a209e898e444af2290b32940de11f3a93db472985bab2071d813dd69e73df5422f8088772cf76591a792b567a957d9a36aba54102603d0";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/de/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/de/thunderbird-45.7.0.tar.bz2";
locale = "de"; locale = "de";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "05e1cae57b9a2e2fb274c2efc130e596c5f6c35ce14055156f728a662e9f8f5423a42708629726e0a70e3420aeb1d9b3b224c019cbbaa6f4a0cee69f78c740ac"; sha512 = "5cf919f3ff9911068b57afe972539a5f5c35335cc1b2462437cd31767d2b949305d77f30a839e89421c60a92abe63be3b4805acc0c5c37eb4f95e3e465449fc9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/dsb/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/dsb/thunderbird-45.7.0.tar.bz2";
locale = "dsb"; locale = "dsb";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "dd0dadb02dd11dc9c39c6aa67eb995b786fdec47e966cb79177bde56400300b214ba90509a50ad839b36908da18829eb02431a4e1cae3e878dcb3debed258bc1"; sha512 = "989afa417e7819de693327caf9c13a8e2704aef0627795807c715e0c4a2bde9f2a5c67ea13d0a541cee79d74643cec58c07d1a8121ebc86ecf1c4b121c10f777";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/el/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/el/thunderbird-45.7.0.tar.bz2";
locale = "el"; locale = "el";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "12fc5fe4fb9fcccc295cd05c46850dab1ebfa81e0fc1ea073c493ef7c8db73e2c96999e9b1a29cda8f8cfa5437920f8a6b88d3b6911fd88dfde2673563e2afc1"; sha512 = "20679e832ded809351203c788ec4e87a303ee6dfeb56b5bdeb6745a59d8ec3980e42356126ee20abdba35143fe7f7e24112aa6ddd9059c7fa9b1919b730c4f06";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-GB/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/en-GB/thunderbird-45.7.0.tar.bz2";
locale = "en-GB"; locale = "en-GB";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "0e195cd68923d8b8bedb4028d17b08d029eecc82d0b40de575b55d573dda6227684043cf50c959c790746a6b38089e02cc996cc8a23cb31011c6fe4c3fd2ae89"; sha512 = "44b92fd4895d25e43e4875f2f654886f2bfbe1d97643eec7da098bff9046ce61a2423a55557911dc1c02bbb49e44d907b31adcb3743804ef358ce38d86691b0d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-US/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/en-US/thunderbird-45.7.0.tar.bz2";
locale = "en-US"; locale = "en-US";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "d3ceea1ef1e3562d682882b14f518f917143e4c4417ac07e8a474c52a57ccf0169fe1580355dcda0710e03c67b46eeb78fd59b31b831b8f431ef1a0cd9a37c2e"; sha512 = "3aad942932385264efd5eec81aeda2bae552b281f89416a6228f9f3b6f7f58e927fdf46d8da0064e51a792d2e4deefecc17717422ee911691a2305d72fa8f913";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-AR/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/es-AR/thunderbird-45.7.0.tar.bz2";
locale = "es-AR"; locale = "es-AR";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "19a3703f4f3fc5ce82ac8f69468fabb494ff663ed0b507af4a7cb74fcfefc5eb7e8090771392a800cbec88897c9c00315b457289eb1be860e1b47dff2f25a5d3"; sha512 = "28bb08df80f60ea268b4d8706a61cc6ead17c059d2d05d3017e6199a4c5c73bbb63c3159d9f35656749b6c1990a4938ebb6b10c1d016504b3346fbf9b18b6182";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-ES/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/es-ES/thunderbird-45.7.0.tar.bz2";
locale = "es-ES"; locale = "es-ES";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "706987651522f9c843c8771a4e58c474661da8a45104e1dfdd1b72be74c3a43d9eaaf4f9eb3661718c4237515afc90272c535579d0db1fa3715a29d03bef36af"; sha512 = "dff7c77e94b7ad138b153e9a83934da72a2f57db5c1a6404a0c47fc26c2ae241b5c65ac56f499e54f8cf488a9fc9d144194326afb710f959bafdd4b9c56a7348";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/et/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/et/thunderbird-45.7.0.tar.bz2";
locale = "et"; locale = "et";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "3ec0d0fa4ab85a3ce958b8c637e4d208f803e861f3b544d3f15a79ac1e1704efa963eb127f1687cbe5f4e75926bf1731bd9fd781a6e7fdda07035766eba8d39d"; sha512 = "a3ec79f99783b5ae9ce6b3d690f959bbb80f0a41396bde676f9b1bf8a68e39200525a35c8932123906dfbd84df4b6de19e0a9f27c2d3883b2a3c71c1349e5969";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/eu/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/eu/thunderbird-45.7.0.tar.bz2";
locale = "eu"; locale = "eu";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "54eaeebfce0f0c805954be911c3ac666993d9bf927ccdb01ce0f322524451523ccb7d6d8fee473eebd9cac14d6653655de8f0e6861f8d4fb0953658cd808b74e"; sha512 = "90255f58a358fa9e9b27d36b1b9b954d753ef584118f84405bf4b4d1dde4cf2a19c3dda91b30551f03b1d07c2f96c00f8ba72726fb2f4c325f7db82387fd45c2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fi/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/fi/thunderbird-45.7.0.tar.bz2";
locale = "fi"; locale = "fi";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "51d09e9b7ecbf4891ceee5fde9fe00ce2ac9cbf4a2fc0a3f1433e7004677d6fc35067734c3f0506362b346953423f71844937c1187db9194ebe952adad1abef6"; sha512 = "d19f0a819a3b5b04038cfaf7adf3ec4da337789ad5fd809b27447427838140fffb35a5bab8a0e018d65fa467935fe691a578ce044eb57d746b4df48f879ac8c9";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fr/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/fr/thunderbird-45.7.0.tar.bz2";
locale = "fr"; locale = "fr";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "0c3b9635cf107cdfb91c4cdc4771c25b112fd7d87341c88259a5670c5fa716e105cb910b1b6b85d8c22d518abba5a538f87250c8bb34c71df4cb98bf7026f8be"; sha512 = "0e9204299add1f7ca774b59eae56d8a04c3a575894f9824d7d60c19769e2bd596def6537dd07cdc7e025ce2cf0220577864dd1f0701c2fdfb39c22e87ac03e83";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fy-NL/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/fy-NL/thunderbird-45.7.0.tar.bz2";
locale = "fy-NL"; locale = "fy-NL";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "45adb1b96d4d57c5302ca373f193b5a7e0a9f8577fabcb37c184bc8aaa66cdd4b0136e810af0ca8f1a7727fd51d60ee1006f6dc3e5fd182ff45056fc923d7d13"; sha512 = "d62bb3d3fab33aa5556d80ae7331771f8ae8efd389d301c98aab57debb6aec0765bca89bf254819e3b7bcdda392a12f27771e344b486027cb8faa5fc051f5a05";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ga-IE/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ga-IE/thunderbird-45.7.0.tar.bz2";
locale = "ga-IE"; locale = "ga-IE";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "4c3453566e747b57f94ef980a7d9b4d2a1c5b78584b0bcf1eea4d8c6b26ca177f18cf94811e5301a12e7de8939a11bbebe202683449b367f29a391a94d020cb1"; sha512 = "30248eb96c52255c476dc43aa5232a1185143d5fc56a246fd8d1219c573a63eee1a583d96d470b8bcfdfa1e48f6fa8e49c10c990ee75936078dc5ba2612af533";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gd/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/gd/thunderbird-45.7.0.tar.bz2";
locale = "gd"; locale = "gd";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "ba0f0ee9c8a2a64c414e1621c8d5ce47194ef144f026e3306cf2c81d214fd0e1df541fea11dfdc2de7629cdc8ba2a4aaccb16dc7cc0c3404925177b893ca5d73"; sha512 = "853cd5f940c155aaabea87b2436282ee9e60de0744aa28426ebe7d5d3a2cda653c88c9fd5c1cb335fe5e4447b8b4eee79674dc5bb18a113e665906e13a5faadf";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gl/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/gl/thunderbird-45.7.0.tar.bz2";
locale = "gl"; locale = "gl";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "f1d948b366842bfc2fd349ccae3c6c9f586fd69e99f0a0f9804bf3bff25ce6262451513952ad30f128626bffd6f9719d377868fb7d2fa56d8b6f54b2f4751ea8"; sha512 = "3505a993c4f0062be5108096c104e8d2c34bbd677036f3facbc9e71cdff66dcdfcf720b02065e03e18030f81c3571d8d971febdbc8e593ea7cb3b52d5cdfa969";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/he/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/he/thunderbird-45.7.0.tar.bz2";
locale = "he"; locale = "he";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "1e0f048b272b4927d19f66390577ae2a37a32dadc24e36a7cdfd48e4257db09f5433c2812429c1700a5fa1f3630deb3c43db316de921d8e9be58f41388d2502d"; sha512 = "183c71c1b5745d27d6e5a2a9f6131e5a8da942fac1e3c4b1111973d0c22441a264119a088c7f3fa525dda31c40177c6017b7e67f9e518f851c41a16180b88533";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hr/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/hr/thunderbird-45.7.0.tar.bz2";
locale = "hr"; locale = "hr";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "a821b66d67f32c84d0bf4172fb82ee487c13703122821042b00739890777573288c31c5178f4dfb6fce587eb58a19eaccd6f23b4b8f3d851fc203293674fb510"; sha512 = "485aa2be69afc9fc9576ef03b19d33423c15667096b57c5b6b47ab303d0ea5376c1a01a1d92a4c679874bff109a6206c585adcc6f6ed954ce17343722d4ba7ab";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hsb/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/hsb/thunderbird-45.7.0.tar.bz2";
locale = "hsb"; locale = "hsb";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "c756ae475fc1964ae915a68313411ec8ab4a7d4744685de2ffeaaae33d58fcc08712657a2f030b1b358d02d9653c26478515ecbd915881e33cdaca9d9842fb38"; sha512 = "8bf706f4b5662e5febd4a23cd939af570e75fcee4f0af2304b7239349eb4ee40a361eaf5cb02d103db4cb80c5962d9a549b282d0692dfb335dd1d0206ef9d604";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hu/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/hu/thunderbird-45.7.0.tar.bz2";
locale = "hu"; locale = "hu";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "d2f68c86f57fb9351c5c2ba74a8976bc89810634dbf5a521c34a553ccb6ff27eaf66fdc92e50c0f226246e9fc25316d4305feea1c3801513f418f58dff1955bd"; sha512 = "de6aa8dc185ba3fed516fa478dc9c66211f26bde7e21d6b2b86b19ad58e192ca4540bc0847fbd5d24c4f32602f05577cffd2c3046f5282afbe55432d2ef16bd2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hy-AM/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/hy-AM/thunderbird-45.7.0.tar.bz2";
locale = "hy-AM"; locale = "hy-AM";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "42ad523ad7f30638a69d8d549491af06ab9f740f8eb0b81e681236a09ce39de3758e2af61f2857293d085603f3530df3edaa23c19a014034528d3d130517fcef"; sha512 = "2c9138c07246475d7fd9be05f631126f0051b2cb7ad688d6d4bc02254d5b9fce3eaebea7b8ff8df6e82d45211ca0279a03b8616d776dc30bc0a30f867ff01214";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/id/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/id/thunderbird-45.7.0.tar.bz2";
locale = "id"; locale = "id";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "42a023e474e440b8201dbe5caaa7354546f89d5e4e9fcd34152dae93349bab8872f6060e5029fa629fd9853999ecf08688e51a2d9a16400265bc5c61a9abf783"; sha512 = "2bed57e5998da429c80e2e04a4250c58bcdc17214a94a80d1d03bdefcbf7567bd65ac3ceb46f7b9d59ac37eec0bfe31f4050f02894be6828c2fc96488e4290f2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/is/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/is/thunderbird-45.7.0.tar.bz2";
locale = "is"; locale = "is";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "6fe784f65ee584a1fb9fdc962be412e09ff43e88afa29365ddabf6a237ae7a1c854c05d5e3b3bbef83653fae94646c7a32144c2f7907304573b5f71e5f978ac9"; sha512 = "ba2e12db8b2ef82971762bb13e802bdf1e65252843687b40dee0455e6de46083220904cdf51c492ccdb13c7390b8692e5d4db7e4f170c88b545ee17e50710083";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/it/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/it/thunderbird-45.7.0.tar.bz2";
locale = "it"; locale = "it";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "dae36c69bfa5cc80ad9489c76acdc6094f5fcd2c41f8c2f5dcd5d8d103aca564daaa96b27426f8096aaf555b6786f7d2c2227cbf1096d7eae53285b337d8221c"; sha512 = "e1fbedc1c8eb67cb0528ffc8c103cf0606a43240471e920fdc3cec4c3cd0ac357878992ee67a2eff90f8abf5c6654a27f17dc37c69d0d828d3e9c3fd0345e34a";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ja/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ja/thunderbird-45.7.0.tar.bz2";
locale = "ja"; locale = "ja";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "c33ba443ee0556b28b60ba4517913d54a931cc2b63339262b35a1d576166e9abe1e7f6297f11683397a13f5c7b71cd96f97e60ad1a956aa27ba9fbd7f0c5fb43"; sha512 = "2741dcc26e73c0ef5fee48b84b02c336310aa15004d4b7cc2781e80f045dd5ba5b21aacc9c90e223c22c4491914810c6df9435d025ea76929605fc6462f6713e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ko/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ko/thunderbird-45.7.0.tar.bz2";
locale = "ko"; locale = "ko";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "0587a7bb7218b16c859717e99a3fd96e697b3a32dd322361edfbaf0b069522914e84b74160466d3b25fac76d925af485b9688fb5a3e072f1eff94dabb0239669"; sha512 = "5236c168604748c2a3edb8f0ffeedaa51792fceb61e4b5439932324c8bf94304ff65598655f2c6f66260c253563a381cf99ab5c07dce89a3728afef346e48e66";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/lt/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/lt/thunderbird-45.7.0.tar.bz2";
locale = "lt"; locale = "lt";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "0789f1357a0c2a61fa676c9c375c79c29e78c3b3bf8faa2a392ec90714e1e581bd07eb75628284e6873c66553c613e7b43a18532a01cc66510f0bdcbef5f5b83"; sha512 = "2c919f8835753afcf6f9d7cb027c1df8e00f6d197a0fe26e3de7222bed2a54028843974cf2b0ec2d88a29e22e6ad84192b1ecc3057528647db8b7e9eb29f040c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nb-NO/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/nb-NO/thunderbird-45.7.0.tar.bz2";
locale = "nb-NO"; locale = "nb-NO";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "906ebc96274cc490b82b434f648ba33f16a4f2b641e99142fcf18cd24701ed0b4b34558b2b380a0ff1d4ebe253ffd99d6b2cf4b9cf059a3f071c9e3bee94dd0b"; sha512 = "dbc4609240a5cf5e6db64360b386da196039fb6d7ac4517b8f5de5466dca830a06b284db2f7db7d4352f5cffe2122277e90b37b2a2533dd9a3a3ec1691c8824f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nl/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/nl/thunderbird-45.7.0.tar.bz2";
locale = "nl"; locale = "nl";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "d18b521eddf0e71cecb33473275bb44038717cefadddc648441b0d4c7a01aaa08e45fad28e3eb74e8d01d1a637db1ef4d999d45a83c2fcb3aa3e7430b73b666f"; sha512 = "b7f0517d2eda98ab6d6de52513eb7493231eb1e319862256798280c1fc924af8a0f3330bf8aac01916b54d54b2b5c7427897a6b2516229e4387a77424a349f4c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nn-NO/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/nn-NO/thunderbird-45.7.0.tar.bz2";
locale = "nn-NO"; locale = "nn-NO";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "66f7b07352f7a6064d3a805d8d348ae4956240b42359a2d3fbd1d96291a025e1f4920ddcb0cd9312e1d8f146fcceae4e0d9811a9e6ae43479307aa204d8de8d3"; sha512 = "cf3ffbc00fb2553bf87da5f0efbd5d115d717de04a047f0cbdc17bb500dc05880495b3242c5d75801374418d1aa6f173303cad7f9325558cd6da6c67d42b675c";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pa-IN/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/pa-IN/thunderbird-45.7.0.tar.bz2";
locale = "pa-IN"; locale = "pa-IN";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "828e57876a063979f945d0cee371b57e43d2f26eba4723a8983b448b85a091a303da068f17ba73f1eb23b35e06d9b3a37b56d9a3be49c202c950d2bd2ed9db05"; sha512 = "70d224c9145cf6225335cdbbfd137d73131651fa22cc326657c0e75c3c1c4a73730c4193d575da5c7881bb607ddfebd74ce428a1425e12b60e5dfeac661bad02";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pl/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/pl/thunderbird-45.7.0.tar.bz2";
locale = "pl"; locale = "pl";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "6ca824649b5f030423213dd573018af5b6a8033fa86b6b23c5b99e59afdd5234cd2c7a8237124dabbf75175511afff980dd3d971f59967c3522b633680d7277a"; sha512 = "664c04d5650c24ae6c2422b41dbaf737fe83b8cd142a869b5ce4042688bc3c4da26fea9bd034a9ab978cd8404cabc90822c3ba23983fb75bfd0118570b0eb9d5";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-BR/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/pt-BR/thunderbird-45.7.0.tar.bz2";
locale = "pt-BR"; locale = "pt-BR";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "399dc86d31375ea3af21e6032b686ffdec65a3c0ca403d95bc89e0e7715e6c998dc846057ff4a6b919fda794a9fdabb53eafd7a07d8894a65e1109c9c52e43d1"; sha512 = "a25f39972af8ce6181ca703b7f35307e74c436a476e1a3482d770aca41275b98373ad8279ba0095c68b5518c525d0813a3d215712d65aef661af8cef5d97ae52";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-PT/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/pt-PT/thunderbird-45.7.0.tar.bz2";
locale = "pt-PT"; locale = "pt-PT";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "f758fb69c99c02fe1bcab8c9a4b02eeebcc190c30e73f4b009521c36956cc7f076e1f544181a332807bee93ec39d7d170cca3f0d87fc6ed89b60a4515c394749"; sha512 = "4fab35699dc609be69a1d613b5996d412b6c79c2b79f04466ea862713509abee1f12e1188371374027a37df953dda810d44dc066c9cfad2737bd5dd433beb522";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/rm/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/rm/thunderbird-45.7.0.tar.bz2";
locale = "rm"; locale = "rm";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "d338c243cbfa41e5b54195923bc12876e45683271df477d492058973dbc0f7352d59863a3bde571ab001612b8ce5704512f1bc0ad1e8af066f7aa448b5c89f0a"; sha512 = "4167aabf7a012824637ecc1e356b983e79a91c02d5079bb2d99546c99fdd3e7631323420d78d4b8fda596d8a9bec82ebb02d0a8092af5c71ff3b7536ecb77df8";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ro/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ro/thunderbird-45.7.0.tar.bz2";
locale = "ro"; locale = "ro";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "2c011b2cef9c5761c1297b2cc2dcd442ae9fd8d0f28d0f469aa2abbd6da80fe11bd607df8fb224ff03bd21932bdd40591532722756c467b498313da0f639c3fc"; sha512 = "b642339e49fc0c06481d9fcfdbcc1234ec2313ffbe0c6825d34ae1447b128afe1c20c5c983a565be1a42d740a9989548b59c9fbb737e952d7aca0804d41be75e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ru/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ru/thunderbird-45.7.0.tar.bz2";
locale = "ru"; locale = "ru";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "90fe536806f6e2ec20c470c72812ff8e54af58499ba220f9b6a5b6043c3a6072c78dc834c4204ca4e1f9d5ab71093296c958fe12409e50435136903f3ea3d544"; sha512 = "08e4b72edc6a4625639e313acfa6caddd0d82630930d32eb6c01f3e4a5fcb5e62836856c4f8e27e1855a14eacf66fe84078bb7445a8f809dbe31c41b86818a26";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/si/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/si/thunderbird-45.7.0.tar.bz2";
locale = "si"; locale = "si";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "36fed4f969775870a3e224aef66b36d8b8f1adec2471b4b45d75c52318b9481bdd81a9f583589b4c5450045e4a8abff91f3fb9083f4bafd237c742015626291f"; sha512 = "1464769f4b50a7cf2eb8b51a6040bb623a5d7942665943ac16f3659139724253ba8b75cf6987c3e67e7d88c7a7d680aa34800672fdcfaf6c130e3690316fcba4";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sk/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sk/thunderbird-45.7.0.tar.bz2";
locale = "sk"; locale = "sk";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "e89ac23a25ae446f69e9c31478cc844253ba57de01893bd12b6b2bbe0e599fa09bf1506e9cfcbeab506998d81bc170fe1cff2d0e9aa13411299a5441d40d8959"; sha512 = "63b2cdbde995f2977e2047a9d0966358d10ad717e16ec1e7b013973203dea5cfa48cd3677407a21d89783496babee62c912887591b09701be95295f67878448d";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sl/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sl/thunderbird-45.7.0.tar.bz2";
locale = "sl"; locale = "sl";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "6a74cc252d64d6d11a98af51e8fffc8a4bba8c74e2647afee9cfaae55ffcabe7ef9d82ee95a1a4d169fc057025c84f1253f455c6bd5e8f5fb9e33d7372c96a01"; sha512 = "82d43393eb873c96334ee994d07f9fe4873efeda9dc326a1398ddfcbd02a83c2b20c1d78c0e1f88f5c1a4c4b4008c94eff07912696cffb2cd7d5340cfef7d5b2";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sq/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sq/thunderbird-45.7.0.tar.bz2";
locale = "sq"; locale = "sq";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "2ab4b18e5560eb495093aa0e5867f6e91148fe1cf7123f50306cb19b646b0834cde8cbd449df46f7e12b597465ee69910ad386e9920e26cdadc2085ca92e7af9"; sha512 = "5fb9aae5dd7e39e60ca17c4ba12c418f0ef75952f35537ae3ff4b1f57914f9ddcc5e8c8dbfcbad2c4a29911a6e48b6e96514759112170bb377b7883484f7a83b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sr/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sr/thunderbird-45.7.0.tar.bz2";
locale = "sr"; locale = "sr";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "dc23ac3a9c3fc8b0105bdac2b14f24a0cd76b7f6c3bcd3994d979ef2db44a9f11bc2e5648148bd45008ea832261399898737b39727c0a61a03b8315aeede6bde"; sha512 = "b1fa8938971d0736da1e297fb8a431750e8a1681250015aa249d3e6a1b797933c47e3ab43516cdc199ac4213b4e3505b8ce68264ed342a53bba7e4d86ef64e6b";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sv-SE/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sv-SE/thunderbird-45.7.0.tar.bz2";
locale = "sv-SE"; locale = "sv-SE";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "ebcac4ddcb84291613eeb64289e1f9f374a6085eb587df3cffc906dd7d7950f7564be1aed17c794d37f415840459b82c0c6edebefab2d8ba6f3e34c20426757a"; sha512 = "ed008ecc0355faf21e79121c9987823220b9ff796df22ab59ccf79dbfc336d998df51f13500a9a189fd40900a9fec52cb53be0811e391a48d4149f021bfffd77";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ta-LK/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ta-LK/thunderbird-45.7.0.tar.bz2";
locale = "ta-LK"; locale = "ta-LK";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "b164c7e70aa313517ecd85828a3734113f504f7e86ae615a24465a4334f41197af42b181f1f0048782d841422c3847eff1b8868450d190e362a36ffb5d1f2b6d"; sha512 = "4bd8c5a05706f88b2678331e8096d0b04d2717bfc9e6f22d6abf00881fcea46c4de50bf435d51a1022c9217ce837668439d152d0dd257ac2e77fdea44421810f";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/tr/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/tr/thunderbird-45.7.0.tar.bz2";
locale = "tr"; locale = "tr";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "6c3d65c4c277382961238e491f90e0f33a265614614428f2abeeb3779cc3b23b068d8ddf7f4a7c98a4c7497b22df79b3ba16ef0191b9cfb752aa24316d4fb8e3"; sha512 = "0f3aa7228a605df6e2f5fcaddfb95009ea6b9084791d876ed1fca148ba11b08646ea1265bb1d6771e681f5b33317ea43381ef271842d263e7c387942447a3748";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/uk/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/uk/thunderbird-45.7.0.tar.bz2";
locale = "uk"; locale = "uk";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "6754bead8887f244c6d87a6c76f45247933fae42fc74240c453bbef8acfa7a85ba282db4185c1fb6ec9e93115e3d9e4ac0ee113c00db9634f26a4eec6f79ea6b"; sha512 = "825ff1066f1b533ac5091fa74a050fdc760145f378126b2b7cb63b9bf3e58936372d475fa5b2b900cb79ea99f553a4228182c09c1483ded6f2256a831966d37e";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/vi/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/vi/thunderbird-45.7.0.tar.bz2";
locale = "vi"; locale = "vi";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "34110501557ea23c1c854fbba9e6c043e25634f5993f34197b8d5842ee88d4717c87a0a8fe326a35dd12e74fcfbf9ddb0b6e7db0b09a058d710680e37cd5b939"; sha512 = "b8fdfe8463c99695219a59f2951363685249a6ced9ecb38b7e25455b4102baf334e69437b15bdcb06ca36575367b13cd3331d7ac5e0349d8fdcb4350b70cc680";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-CN/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/zh-CN/thunderbird-45.7.0.tar.bz2";
locale = "zh-CN"; locale = "zh-CN";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "493073bee16e9e22db0d3c2700f13f1304129c28528a80fb9a548afbabaaa147b7ac46a254cc3b05619d47e94e61c29ff7cc80618c8af09b3659e6c91883c017"; sha512 = "f41c99d2a972210e0999fd6a509ffed9fa34edee23f7925c8dccdd5f492aef7c15fb3fc995ea549d095746302852e3957b9da01346277a2ed6b3efafa1a2acb1";
} }
{ url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-TW/thunderbird-45.6.0.tar.bz2"; { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/zh-TW/thunderbird-45.7.0.tar.bz2";
locale = "zh-TW"; locale = "zh-TW";
arch = "linux-i686"; arch = "linux-i686";
sha512 = "7ac66a0ee967e7f87d084acda72120c65bb64c2572f42249b97baf9755b0b7dc314a1d88049941a7be86846f98f236cdfe54b87b22ff7f66b6099397788373b2"; sha512 = "d903664c9cefe044e0871b527d0a2f45812312c99f541832887abdef46d6c741085f807bf09a9e6f83d24992377ced5a84534a33f933025dd6bde11a7aa8cde3";
} }
]; ];
} }
pkgs/applications/networking/mailreaders/thunderbird/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
enableOfficialBranding ? false enableOfficialBranding ? false
}: }:
let version = "45.6.0"; in let version = "45.7.0"; in
let verName = "${version}"; in let verName = "${version}"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
sha512 = "1f4579ac37b8ab98c91fe2e3e6742ba1b005ca9346d23f467d19e6af45eb457cab749bf91ed2a79f2058bd66f54da661da3ea5d5786f8c4b472d8a2a6c34db4b"; sha512 = "99cea54b553158c1e08cf19157ac2bb6822fd1fef0501d36f983e6b8d4f2143a2e6124d61297446944033d3fed9326fe0f12ca45db0b5815be71a0777e73ffb0";
}; };
patches = [ ./gcc6.patch ]; patches = [ ./gcc6.patch ];
pkgs/applications/video/cinelerra/default.nix
+17 -5
View File
@@ -2,8 +2,9 @@
, pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
, libtiff, freetype, mjpegtools, x264, gettext, openexr , libtiff, freetype, mjpegtools, x264, gettext, openexr
, libXext, libXxf86vm, libXv, libXi, libX11, xextproto, libtheora, libpng , libXext, libXxf86vm, libXv, libXi, libX11, libXft, xextproto, libtheora, libpng
, libdv, libuuid, file, nasm, perl }: , libdv, libuuid, file, nasm, perl
, fontconfig, intltool }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cinelerra-git"; name = "cinelerra-git";
@@ -15,8 +16,16 @@ stdenv.mkDerivation {
src = fetchgit { src = fetchgit {
url = "git://git.cinelerra-cv.org/j6t/cinelerra.git"; url = "git://git.cinelerra-cv.org/j6t/cinelerra.git";
rev = "01dc4375a0fb65d10dd95151473d0e195239175f"; # 2.3
sha256 = "0grz644vrnajhxn96x05a3rlwrbd20yq40sw3y5yg7bvi96900gf"; #rev = "58ef118e63bf2fac8c99add372c584e93b008bae";
#sha256 = "1wx8c9rvh4y7fgg39lb02cy3sanms8a4fayr70jbhcb4rp691lph";
# master 22 nov 2016
#rev = "dbc22e0f35a9e8c274b06d4075b51dc9bace34aa";
#sha256 = "0c76j98ws1x2s5hzcdlykxm2bi7987d9nanka428xj62id0grla5";
# j6t/cinelerra.git
rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4";
sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r";
}; };
# touch config.rpath: work around bug in automake 1.10 ? # touch config.rpath: work around bug in automake 1.10 ?
@@ -34,12 +43,15 @@ stdenv.mkDerivation {
a52dec alsaLib fftw lame libavc1394 libiec61883 a52dec alsaLib fftw lame libavc1394 libiec61883
libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
mjpegtools x264 gettext openexr mjpegtools x264 gettext openexr
libXext libXxf86vm libXv libXi libX11 xextproto libXext libXxf86vm libXv libXi libX11 libXft xextproto
libtheora libpng libdv libuuid libtheora libpng libdv libuuid
nasm nasm
perl perl
fontconfig intltool
]; ];
enableParallelBuilding = true;
meta = { meta = {
description = "Video Editor"; description = "Video Editor";
homepage = http://www.cinelerra.org; homepage = http://www.cinelerra.org;
pkgs/applications/video/obs-studio/default.nix
+2 -2
View File
@@ -22,13 +22,13 @@ let
optional = stdenv.lib.optional; optional = stdenv.lib.optional;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "obs-studio-${version}"; name = "obs-studio-${version}";
version = "0.15.2"; version = "17.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jp9000"; owner = "jp9000";
repo = "obs-studio"; repo = "obs-studio";
rev = "${version}"; rev = "${version}";
sha256 = "0vw203a1zj2npras589ml6gr5s11h9bhaica90plrh5ajayg0qwj"; sha256 = "0x5lnl1xkmm8x4g0f8rma8ir1bcldz9sssj2fzkv80hn79h2cvxm";
}; };
nativeBuildInputs = [ cmake nativeBuildInputs = [ cmake
pkgs/applications/video/shotcut/default.nix
+10 -3
View File
@@ -5,11 +5,11 @@ qmakeHook, makeQtWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "shotcut-${version}"; name = "shotcut-${version}";
version = "16.10"; version = "17.01";
src = fetchurl { src = fetchurl {
url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz";
sha256 = "0brskci86bwdj2ahjfvv3v254ligjn97bm0f6c8yg46r0jb8q5xw"; sha256 = "1f3276q58rvw1brxfnm9z3v99fx63wml6j02sgmpzazw3172lnpg";
}; };
buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit
@@ -17,10 +17,17 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
prePatch = ''
sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
NICE=$(type -P nice)
sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
'';
postInstall = '' postInstall = ''
mkdir -p $out/share/shotcut mkdir -p $out/share/shotcut
cp -r src/qml $out/share/shotcut/ cp -r src/qml $out/share/shotcut/
wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
pkgs/applications/virtualization/qemu/2.8.nix
-93
View File
@@ -1,93 +0,0 @@
{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib
, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex
, bison, lzo, snappy, libaio, gnutls, nettle, curl
, makeWrapper
, attr, libcap, libcap_ng
, CoreServices, Cocoa, rez, setfile
, numaSupport ? stdenv.isLinux, numactl
, seccompSupport ? stdenv.isLinux, libseccomp
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
, sdlSupport ? !stdenv.isDarwin, SDL
, vncSupport ? true, libjpeg, libpng
, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir
, x86Only ? false
, nixosTestRunner ? false
}:
with stdenv.lib;
let
version = "2.8.0";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
in
stdenv.mkDerivation rec {
name = "qemu-"
+ stdenv.lib.optionalString x86Only "x86-only-"
+ stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
+ version;
src = fetchurl {
url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs";
};
buildInputs =
[ python2 zlib pkgconfig glib ncurses perl pixman
vde2 texinfo libuuid flex bison makeWrapper lzo snappy
gnutls nettle curl
]
++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ]
++ optionals seccompSupport [ libseccomp ]
++ optionals numaSupport [ numactl ]
++ optionals pulseSupport [ libpulseaudio ]
++ optionals sdlSupport [ SDL ]
++ optionals vncSupport [ libjpeg libpng ]
++ optionals spiceSupport [ spice_protocol spice usbredir ]
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ];
enableParallelBuilding = true;
patches = [
./no-etc-install.patch
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
hardeningDisable = [ "stackprotector" ];
configureFlags =
[ "--smbd=smbd" # use `smbd' from $PATH
"--audio-drv-list=${audio}"
"--sysconfdir=/etc"
"--localstatedir=/var"
]
++ optional numaSupport "--enable-numa"
++ optional seccompSupport "--enable-seccomp"
++ optional spiceSupport "--enable-spice"
++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
++ optional stdenv.isDarwin "--enable-cocoa"
++ optional stdenv.isLinux "--enable-linux-aio";
postFixup =
''
for exe in $out/bin/qemu-system-* ; do
paxmark m $exe
done
'';
postInstall =
''
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
if [ -e "$p" ]; then
makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
fi
'';
meta = with stdenv.lib; {
homepage = http://www.qemu.org/;
description = "A generic and open source machine emulator and virtualizer";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ viric eelco ];
platforms = platforms.linux ++ platforms.darwin;
};
}
pkgs/applications/virtualization/qemu/CVE-2016-9102.patch
-12
View File
@@ -1,12 +0,0 @@
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index d938427..7557a7d 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -3261,6 +3261,7 @@
xattr_fidp->fs.xattr.flags = flags;
v9fs_string_init(&xattr_fidp->fs.xattr.name);
v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name);
+ g_free(xattr_fidp->fs.xattr.value);
xattr_fidp->fs.xattr.value = g_malloc0(size);
err = offset;
put_fid(pdu, file_fidp);
pkgs/applications/virtualization/qemu/default.nix
+5 -122
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib { stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib
, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex , ncurses, perl, pixman, vde2, alsaLib, texinfo, flex
, bison, lzo, snappy, libaio, gnutls, nettle, curl , bison, lzo, snappy, libaio, gnutls, nettle, curl
, makeWrapper , makeWrapper
, attr, libcap, libcap_ng , attr, libcap, libcap_ng
@@ -16,26 +16,26 @@
with stdenv.lib; with stdenv.lib;
let let
version = "2.7.0"; version = "2.8.0";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa," + optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,"; + optionalString sdlSupport "sdl,";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qemu-" name = "qemu-"
+ stdenv.lib.optionalString x86Only "x86-only-" + stdenv.lib.optionalString x86Only "x86-only-"
+ stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
+ version; + version;
src = fetchurl { src = fetchurl {
url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "0lqyz01z90nvxpc3nx4djbci7hx62cwvs5zwd6phssds0sap6vij"; sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs";
}; };
buildInputs = buildInputs =
[ python2 zlib pkgconfig glib ncurses perl pixman [ python2 zlib pkgconfig glib ncurses perl pixman
vde2 texinfo libuuid flex bison makeWrapper lzo snappy vde2 texinfo flex bison makeWrapper lzo snappy
gnutls nettle curl gnutls nettle curl
] ]
++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ]
@@ -51,123 +51,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./no-etc-install.patch ./no-etc-install.patch
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/net-vmxnet-initialise-local-tx-descriptor-CVE-2016-6836.patch";
sha256 = "1i01vsxsdwrb5r7i9dmrshal4fvpj2j01cmvfkl5wz3ssq5z02wc";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-an-assert-expression-CVE-2016-7157.patch";
sha256 = "1wqf9k79wdr1k25siyhhybz1bpb0iyshv6fvsf55pgk5p0dg1970";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-misuse-of-MPTSAS_CONFIG_PACK-CVE-2016-7157.patch";
sha256 = "0l78fcbq8mywlgax234dh4226kxzbdgmarz1yrssaaiipkzq4xgw";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptsas-use-g_new0-to-allocate-MPTSASRequest-obj-CVE-2016-7423.patch";
sha256 = "14l8w40zjjhpmzz4rkh69h5na8d4did7v99ng7nzrychakd5l29h";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-check-page-count-while-initialising-descriptor-rings-CVE-2016-7155.patch";
sha256 = "1dwkci5mqgx3xz2q69kbcn48l8vwql9g3qaza2jxi402xdgc07zn";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-loop-to-fetch-SG-list-CVE-2016-7156.patch";
sha256 = "1r5xm4m9g39p89smsia4i9jbs32nq9gdkpx6wgd91vmswggcbqsi";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-process-IO-loop-to-ring-size-CVE-2016-7421.patch";
sha256 = "07661d1kd0ddkmzsrjph7jnhz2qbfavkxamnvs3axaqpp52kx6ga";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/usb-xhci-fix-memory-leak-in-usb_xhci_exit-CVE-2016-7466.patch";
sha256 = "0nckwzn9k6369vni12s8hhjn73gbk6ns0mazns0dlgcq546q2fjj";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/virtio-add-check-for-descriptor-s-mapped-address-CVE-2016-7422.patch";
sha256 = "1f1ilpzlxfjqvwmv9h0mzygwl5l8zd690f32vxfv9g6rfbr5h72k";
})
(fetchpatch {
name = "qemu-CVE-2016-8909.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=0c0fc2b5fd534786051889459848764edd798050";
sha256 = "0mavkajxchfacpl4gpg7dhppbnhs1bbqn2rwqwiwkl0m5h19d9fv";
})
(fetchpatch {
name = "qemu-CVE-2016-8910.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=c7c35916692fe010fef25ac338443d3fe40be225";
sha256 = "10qmlggifdmvj5hg3brs712agjq6ppnslm0n5d5jfgjl7599wxml";
})
(fetchpatch {
name = "qemu-CVE-2016-9103.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=eb687602853b4ae656e9236ee4222609f3a6887d";
sha256 = "0j20n4z1wzybx8m7pn1zsxmz4rbl8z14mbalfabcjdgz8sx8g90d";
})
(fetchpatch {
name = "qemu-CVE-2016-9104.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=7e55d65c56a03dcd2c5d7c49d37c5a74b55d4bd6";
sha256 = "1l99sf70098l6v05dq4x7p2glxx1l4nq1l8l3711ykp9vxkp91qs";
})
(fetchpatch {
name = "qemu-CVE-2016-9105.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4c1586787ff43c9acd18a56c12d720e3e6be9f7c";
sha256 = "0b2w5myw2vjqk81wm8dz373xfhfkx3hgy7bxr94l060snxcl7ar4";
})
(fetchpatch {
name = "qemu-CVE-2016-9106.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fdfcc9aeea1492f4b819a24c94dfb678145b1bf9";
sha256 = "0npi3fag52icq7xr799h5zi11xscbakdhqmdab0kyl6q331cc32z";
})
(fetchpatch {
name = "qemu-CVE-2016-7994.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=cb3a0522b694cc5bb6424497b3f828ccd28fd1dd";
sha256 = "1zhmbqlj0hc69ia4s6h59pi1z3nmijkryxwmf4bzp9gahx8x4xm3";
})
(fetchpatch {
name = "qemu-CVE-2016-8668.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=8caed3d564672e8bc6d2e4c6a35228afd01f4723";
sha256 = "19sq6fh7nh8wrk52skky4vwm80029lhm093g11f539krmzjgipik";
})
(fetchpatch {
name = "qemu-CVE-2016-7907.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=070c4b92b8cd5390889716677a0b92444d6e087a";
sha256 = "0in89697r6kwkf302v3cg16390q7qs33n2b4kba26m4x65632dxm";
})
# FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html
# from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06
./CVE-2016-9102.patch
(fetchpatch {
name = "qemu-CVE-2016-9911.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=791f97758e223de3290592d169f8e6339c281714";
sha256 = "0952mpc81h42k5kqsw42prnw5vw86r3j88wk5z4sr1xd1sg428d6";
})
(fetchpatch {
name = "qemu-CVE-2016-9921_9922.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70";
sha256 = "125xlysdgpp59m4rp1mb59i3ipmf3yjk8x01gzvxcg1hnpgm4j4c";
})
(fetchpatch {
name = "qemu-CVE-2016-9845.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=42a8dadc74f8982fc269e54e3c5627b54d9f83d8";
sha256 = "0qivj585pp1g6xfzknzgi5d2p6can3ihfgpxz3wi12h5jl5q6677";
})
(fetchpatch {
name = "qemu-CVE-2016-9846.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=2d1cd6c7a91a4beb99a0c3a21be529222a708545";
sha256 = "1pa8wwxaz4k4sw1zfa4w0zlxkw6qpsrny1z8c8i8di91aswspq3i";
})
(fetchpatch {
name = "qemu-CVE-2016-9907.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=07b026fd82d6cf11baf7d7c603c4f5f6070b35bf";
sha256 = "0phsk2x6mfsd6gabmfk4pr5nc4aymcqsfd88zihlm9d20gg9pbv3";
})
(fetchpatch {
name = "qemu-CVE-2016-9912.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=b8e23926c568f2e963af39028b71c472e3023793";
sha256 = "1b711s63pg6rzqkqyx0mrlb4x6jv3dscc90qg8w6lflwlhwa73iv";
})
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
hardeningDisable = [ "stackprotector" ]; hardeningDisable = [ "stackprotector" ];
pkgs/build-support/dhall-to-nix.nix
+38
View File
@@ -0,0 +1,38 @@
/* `dhallToNix` is a utility function to convert expressions in the Dhall
configuration language to their corresponding Nix expressions.
Example:
dhallToNix "{ foo = 1, bar = True }"
=> { foo = 1; bar = true; }
dhallToNix "λ(x : Bool) → x == False"
=> x : x == false
dhallToNix "λ(x : Bool) → x == False" false
=> true
See https://hackage.haskell.org/package/dhall-nix/docs/Dhall-Nix.html for
a longer tutorial
Note that this uses "import from derivation", meaning that Nix will perform
a build during the evaluation phase if you use this `dhallToNix` utility
*/
{ stdenv, dhall-nix }:
let
dhallToNix = code :
let
file = builtins.toFile "dhall-expression" code;
drv = stdenv.mkDerivation {
name = "dhall-compiled.nix";
buildCommand = ''
dhall-to-nix <<< "${file}" > $out
'';
buildInputs = [ dhall-nix ];
};
in
import "${drv}";
in
dhallToNix
pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix
+8 -13
View File
@@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus { stdenv, intltool, fetchurl, apacheHttpd, nautilus
, pkgconfig, gtk3, glib, libxml2, gnused, systemd , pkgconfig, gtk3, glib, libxml2, gnused, systemd
, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd , bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: , gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -11,17 +11,18 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
preConfigure = '' preConfigure = ''
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
-e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
-i data/dav_user_2.4.conf
''; '';
configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd" configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd"
"--with-modules-path=${apacheHttpd_2_2.dev}/modules" "--with-modules-path=${apacheHttpd.dev}/modules"
"--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-systemduserunitdir=$(out)/etc/systemd/user"
"--disable-bluetooth"
"--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg
nautilus libnotify libcanberra_gtk3 systemd ]; nautilus libnotify libcanberra_gtk3 systemd ];
postInstall = '' postInstall = ''
@@ -30,12 +31,6 @@ stdenv.mkDerivation rec {
${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
''; '';
preFixup = ''
wrapProgram "$out/libexec/gnome-user-share-webdav" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://help.gnome.org/users/gnome-user-share/3.8; homepage = https://help.gnome.org/users/gnome-user-share/3.8;
description = "Service that exports the contents of the Public folder in your home directory on the local network"; description = "Service that exports the contents of the Public folder in your home directory on the local network";
pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/src/vteconv.cc b/src/vteconv.cc
index b78d3928..5cb63e7e 100644
--- a/src/vteconv.cc
+++ b/src/vteconv.cc
@@ -771,7 +771,7 @@ int
main (int argc,
char *argv[])
{
- g_test_init (&argc, &argv, NULL);
+ g_test_init (&argc, &argv, (char *)NULL);
g_test_add_func ("/vte/conv/utf8/strlen", test_utf8_strlen);
g_test_add_func ("/vte/conv/utf8/validate", test_utf8_validate);
diff --git a/src/vtetypes.cc b/src/vtetypes.cc
index 1365a295..8f38c9d9 100644
--- a/src/vtetypes.cc
+++ b/src/vtetypes.cc
@@ -407,7 +407,7 @@ test_util_smart_fd(void)
int
main(int argc, char *argv[])
{
- g_test_init (&argc, &argv, NULL);
+ g_test_init (&argc, &argv, (char *)NULL);
g_test_add_func("/vte/c++/grid/coords", test_grid_coords);
g_test_add_func("/vte/c++/grid/span", test_grid_span);
pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 2330939d..e0ac14eb 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -3409,7 +3409,7 @@ vte_sequence_handler_iterm2_1337(VteTerminalPrivate *that, GValueArray *params)
#define VTE_SEQUENCE_HANDLER(name) name
static const struct vteseq_n_struct *
-vteseq_n_lookup (register const char *str, register unsigned int len);
+vteseq_n_lookup (register const char *str, register size_t len);
#include"vteseq-n.cc"
#undef VTE_SEQUENCE_HANDLER
pkgs/desktops/gnome-3/3.22/core/vte/ng.nix
+24
View File
@@ -0,0 +1,24 @@
{ gnome3, fetchFromGitHub, autoconf, automake, gtk_doc, gettext, libtool, gperf }:
gnome3.vte.overrideAttrs (oldAttrs: rec {
name = "vte-ng-${version}";
version = "0.46.1.a";
src = fetchFromGitHub {
owner = "thestinger";
repo = "vte-ng";
rev = version;
sha256 = "125fpibid1liz50d7vbxy71pnm8b01x90xnkr4z3419b90lybr0a";
};
# The patches apply the changes from https://github.com/GNOME/vte/pull/7 and
# can be removed once the commits are merged into vte-ng.
patches = [
./fix_g_test_init_calls.patch
./fix_vteseq_n_lookup_declaration.patch
];
preConfigure = oldAttrs.preConfigure + "; ./autogen.sh";
nativeBuildInputs = [ gtk_doc autoconf automake gettext libtool gperf ];
})
pkgs/desktops/gnome-3/3.22/default.nix
+2
View File
@@ -234,6 +234,8 @@ let
vte_290 = callPackage ./core/vte/2.90.nix { }; vte_290 = callPackage ./core/vte/2.90.nix { };
vte-ng = callPackage ./core/vte/ng.nix { };
vino = callPackage ./core/vino { }; vino = callPackage ./core/vino { };
yelp = callPackage ./core/yelp { }; yelp = callPackage ./core/yelp { };
pkgs/development/compilers/coreclr/default.nix
+10 -7
View File
@@ -2,8 +2,8 @@
, fetchFromGitHub , fetchFromGitHub
, which , which
, cmake , cmake
, clang_35 , clang
, llvmPackages_36 , llvmPackages
, libunwind , libunwind
, gettext , gettext
, openssl , openssl
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
which which
cmake cmake
clang_35 clang
llvmPackages_36.llvm llvmPackages.llvm
llvmPackages_36.lldb llvmPackages.lldb
libunwind libunwind
gettext gettext
openssl openssl
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
configurePhase = '' configurePhase = ''
# Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's # Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's
# not wrapped # not wrapped
substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$" # substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$"
patchShebangs build.sh patchShebangs build.sh
patchShebangs src/pal/tools/gen-buildsys-clang.sh patchShebangs src/pal/tools/gen-buildsys-clang.sh
@@ -67,7 +67,10 @@ stdenv.mkDerivation rec {
BuildType = if debug then "Debug" else "Release"; BuildType = if debug then "Debug" else "Release";
hardeningDisable = [ "strictoverflow" "format" ]; hardeningDisable = [ "strictoverflow" "format" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; NIX_CFLAGS_COMPILE = [
"-Wno-error=unused-result" "-Wno-error=delete-non-virtual-dtor"
"-Wno-error=null-dereference"
];
buildPhase = '' buildPhase = ''
./build.sh $BuildArch $BuildType ./build.sh $BuildArch $BuildType
pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch
-29
View File
@@ -1,29 +0,0 @@
diff -Naur clang-3.6.0.src-orig/CMakeLists.txt clang-3.6.0.src/CMakeLists.txt
--- clang-3.6.0.src-orig/CMakeLists.txt 2015-03-05 05:56:20.788520896 +0100
+++ clang-3.6.0.src/CMakeLists.txt 2015-03-05 06:02:15.589365469 +0100
@@ -362,6 +362,7 @@
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "libclang")
install(TARGETS ${name}
+ EXPORT ClangTargets
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
RUNTIME DESTINATION bin)
@@ -516,15 +517,15 @@
set(CLANG_INSTALL_PACKAGE_DIR share/clang/cmake)
set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
- export(TARGETS ${CLANG_EXPORTS} FILE ${clang_cmake_builddir}/ClangTargets.cmake)
# Install a <prefix>/share/clang/cmake/ClangConfig.cmake file so that
# find_package(Clang) works. Install the target list with it.
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake
- ${CLANG_BINARY_DIR}/share/clang/cmake/ClangTargets.cmake
DESTINATION share/clang/cmake)
+ install(EXPORT ClangTargets DESTINATION share/clang/cmake)
+
# Also copy ClangConfig.cmake to the build directory so that dependent projects
# can build against a build directory of Clang more easily.
configure_file(
pkgs/development/compilers/llvm/3.6/clang/default.nix
-56
View File
@@ -1,56 +0,0 @@
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
self = stdenv.mkDerivation {
name = "clang-${version}";
unpackPhase = ''
unpackFile ${fetch "cfe" "1wwr8s6lzr324hv4s1k6na4j5zv6n9kdhi14s4kb9b13d93814df"}
mv cfe-${version}.src clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
buildInputs = [ cmake libedit libxml2 llvm ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
] ++
# Maybe with compiler-rt this won't be needed?
(stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
(stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
patches = [ ./purity.patch ./cmake-exports.patch ];
postPatch = ''
sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
'';
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
ln -sv ${llvm}/lib/LLVMgold.so $out/lib
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
ln -sv $out/bin/clang $out/bin/cpp
'';
enableParallelBuilding = true;
passthru = {
lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
isClang = true;
} // stdenv.lib.optionalAttrs stdenv.isLinux {
inherit gcc;
};
meta = {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
};
in self
pkgs/development/compilers/llvm/3.6/clang/purity.patch
-22
View File
@@ -1,22 +0,0 @@
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 198e82e..810d006 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -7355,17 +7355,6 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA,
CmdArgs.push_back("-shared");
}
- if (ToolChain.getArch() == llvm::Triple::arm ||
- ToolChain.getArch() == llvm::Triple::armeb ||
- ToolChain.getArch() == llvm::Triple::thumb ||
- ToolChain.getArch() == llvm::Triple::thumbeb ||
- (!Args.hasArg(options::OPT_static) &&
- !Args.hasArg(options::OPT_shared))) {
- CmdArgs.push_back("-dynamic-linker");
- CmdArgs.push_back(Args.MakeArgString(
- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
- }
-
CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename());
pkgs/development/compilers/llvm/3.6/default.nix
-35
View File
@@ -1,35 +0,0 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
version = "3.6.2";
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
inherit sha256;
};
compiler-rt_src = fetch "compiler-rt" "11qx8d3pbfqjaj2x207pvlvzihbs1z2xbw4crpz7aid6h1yz6bqg";
clang-tools-extra_src = fetch "clang-tools-extra" "1ssgs1108gnsggyx9wcl4hmq196f5ix0y1j7ygfh3xcqsckwc3ka";
self = {
llvm = callPackage ./llvm.nix {
inherit compiler-rt_src stdenv;
};
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src stdenv;
};
clang = wrapCC self.clang-unwrapped;
stdenv = overrideCC stdenv self.clang;
lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {};
};
in self
pkgs/development/compilers/llvm/3.6/libc++/darwin.patch
-30
View File
@@ -1,30 +0,0 @@
diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt
--- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100
+++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200
@@ -56,7 +56,7 @@
"-compatibility_version 1"
"-current_version ${LIBCXX_VERSION}"
"-install_name /usr/lib/libc++.1.dylib"
- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib"
+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
"-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
"/usr/lib/libSystem.B.dylib")
else()
@@ -64,14 +64,14 @@
list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7)
if (OSX_HAS_ARMV7)
set(OSX_RE_EXPORT_LINE
- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"
+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
"-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
else()
set(OSX_RE_EXPORT_LINE
- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib")
+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib")
endif()
else()
- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
+ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
endif()
list(APPEND link_flags
pkgs/development/compilers/llvm/3.6/libc++/default.nix
-41
View File
@@ -1,41 +0,0 @@
{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation rec {
name = "libc++-${version}";
src = fetch "libcxx" "10cbgi1nfksjrlgvbsx8pkcqxsgkszdqy5cj2zgwj2c2yi9d9wsj";
# instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
# force it to link with our copy
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace lib/CMakeLists.txt \
--replace 'OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib' \
'OSX_RE_EXPORT_LINE "${libcxxabi}/lib/libc++abi.dylib' \
--replace '"''${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"' \
'"${libcxxabi}/lib/libc++abi.dylib"'
'';
patches = [ ./darwin.patch ];
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = [
"-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include"
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
"-DLIBCXX_LIBCPPABI_VERSION=2"
"-DLIBCXX_CXX_ABI=libcxxabi"
];
enableParallelBuilding = true;
linkCxxAbi = stdenv.isLinux;
setupHook = ./setup-hook.sh;
meta = {
homepage = http://libcxx.llvm.org/;
description = "A new implementation of the C++ standard library, targeting C++11";
license = "BSD";
platforms = stdenv.lib.platforms.unix;
};
}
pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
-3
View File
@@ -1,3 +0,0 @@
linkCxxAbi="@linkCxxAbi@"
export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
pkgs/development/compilers/llvm/3.6/libc++abi.nix
-47
View File
@@ -1,47 +0,0 @@
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
stdenv.mkDerivation {
name = "libc++abi-${version}";
src = fetch "libcxxabi" "16xh54rlnbip4f2bwwbdm1sd6bkqky35jgp7fndnns0llpjqrd3g";
buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;
postUnpack = ''
unpackFile ${libcxx.src}
unpackFile ${llvm.src}
export NIX_CFLAGS_COMPILE+=" -I$PWD/include"
export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin
'';
installPhase = if stdenv.isDarwin
then ''
for file in lib/*; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# http://www.cmake.org/Wiki/CMake_RPATH_handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/cxxabi.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.so.1.0 $out/lib
install -m 644 ../include/cxxabi.h $out/include
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
meta = {
homepage = http://libcxxabi.llvm.org/;
description = "A new implementation of low level support for a standard C++ library";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}
pkgs/development/compilers/llvm/3.6/lldb.nix
-43
View File
@@ -1,43 +0,0 @@
{ stdenv
, fetch
, cmake
, zlib
, ncurses
, swig
, which
, libedit
, llvm
, clang-unwrapped
, python
, version
}:
stdenv.mkDerivation {
name = "lldb-${version}";
src = fetch "lldb" "1a93cpmlcnpyglgcyfjb3n7c33683wfhwzn36azpv6wicimwj3cl";
patchPhase = ''
sed -i 's|/usr/bin/env||' \
scripts/Python/finish-swig-Python-LLDB.sh \
scripts/Python/build-swig-Python.sh
'';
buildInputs = [ cmake python which swig ncurses zlib libedit ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
"-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
];
enableParallelBuilding = true;
meta = {
description = "A next-generation high-performance debugger";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
}
pkgs/development/compilers/llvm/3.6/llvm.nix
-73
View File
@@ -1,73 +0,0 @@
{ stdenv
, fetch
, perl
, groff
, cmake
, python
, libffi
, binutils
, libxml2
, valgrind
, ncurses
, version
, zlib
, compiler-rt_src
, debugVersion ? false
, enableSharedLibraries ? !stdenv.isDarwin
}:
let
src = fetch "llvm" "153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn";
in stdenv.mkDerivation rec {
name = "llvm-${version}";
unpackPhase = ''
unpackFile ${src}
mv llvm-${version}.src llvm
sourceRoot=$PWD/llvm
unpackFile ${compiler-rt_src}
mv compiler-rt-* $sourceRoot/projects/compiler-rt
'';
buildInputs = [ perl groff cmake libxml2 python libffi ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */;
propagatedBuildInputs = [ ncurses zlib ];
# hacky fix: created binaries need to be run before installation
preBuild = ''
mkdir -p $out/
ln -sv $PWD/lib $out
'';
cmakeFlags = with stdenv; [
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"
] ++ stdenv.lib.optional enableSharedLibraries
"-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
++ stdenv.lib.optionals ( isDarwin) [
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCAN_TARGET_i386=false"
];
postBuild = ''
rm -fR $out
paxmark m bin/{lli,llvm-rtdyld}
'';
enableParallelBuilding = true;
passthru.src = src;
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
platforms = stdenv.lib.platforms.all;
};
}
pkgs/development/compilers/openjdk/8.nix
+10 -10
View File
@@ -21,42 +21,42 @@ let
else else
throw "openjdk requires i686-linux or x86_64 linux"; throw "openjdk requires i686-linux or x86_64 linux";
update = "122"; update = "121";
build = "04"; build = "13";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
repover = "jdk8u${update}-b${build}"; repover = "jdk8u${update}-b${build}";
paxflags = if stdenv.isi686 then "msp" else "m"; paxflags = if stdenv.isi686 then "msp" else "m";
jdk8 = fetchurl { jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = "1zqqy5gzrx7f438j5pjdavj41plb04p6b1ikspksrgnhs5wrrr02"; sha256 = "1ns0lnl5n05k1kgp8d6fyyk6gx57sx7rmlcc33d3vxhr58560nbv";
}; };
langtools = fetchurl { langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz";
sha256 = "0hhsm23mxvjxmf0jxlhm57s203k88s8xbmk71l8zlnjsz88ni4gx"; sha256 = "0vj5mnqw80r4xqlmiab7wbrkhz3rl8ijhwqplkbs42wad75lvnh8";
}; };
hotspot = fetchurl { hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
sha256 = "1r4a52brsg1xd2dc2b8lzd4w4yvcjdmj9a6avjihx1hpgcs4xzd1"; sha256 = "0mcjjc34jvckg1f1x9v7gik3h5y4kx7skkfgzhknh14637jzb2hs";
}; };
corba = fetchurl { corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz";
sha256 = "0ixa6kdqkiq83817qdymiy772449iva11rh3pr68qpfnmbx1zzil"; sha256 = "0bxf1mrpmxgjmg40yi3ww7lh22f6h0nrvlvf5jwwzf4hb3a3998g";
}; };
jdk = fetchurl { jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz";
sha256 = "1kw4h3j93cvnlzh0vhj4xxdm90bk7hfg6kpqk09x0a12whh2ww3h"; sha256 = "10f641ngwiqr2z6hbz0xkyfh8h3z7kdxj5b1d30rgynzghf5wksr";
}; };
jaxws = fetchurl { jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
sha256 = "0wrj3jyv3922m3pxfg0i9c3ap71b0rass7swvhi996c029rd12r7"; sha256 = "1bgjpivlxi0qlmhvz838zzkzz26d4ly8b0c963kx0lpabz8p99xi";
}; };
jaxp = fetchurl { jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
sha256 = "0b743mygzdavdd59l98b3l6a03dihs4ipd1xlpkacy778wzpr59d"; sha256 = "17bcb5ic1ifk5rda1dzjd1483k9mah5npjg5dg77iyziq8kprvri";
}; };
nashorn = fetchurl { nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = "10wkshhzj15wvx7i53dbkwi85f4fbbxi26zphr5b6daf3ib0hind"; sha256 = "19fmlipqk9qiv7jc84b0z022q403nyp7b32a5qqqcn6aavdqnf7c";
}; };
openjdk8 = stdenv.mkDerivation { openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}"; name = "openjdk-8u${update}b${build}";
pkgs/development/compilers/rust/nightlyBin.nix
+2 -2
View File
@@ -9,7 +9,7 @@ let
bootstrapHash = bootstrapHash =
if stdenv.system == "x86_64-linux" if stdenv.system == "x86_64-linux"
then "05bppmc6hqgv2g4x76rj95xf40x2aikqmcnql5li27rqwliyxznj" then "1v7jvwigb29m15wilzcrk5jmlpaccpzbkhlzf7z5qw08320gvc91"
else throw "missing boostrap hash for platform ${stdenv.system}"; else throw "missing boostrap hash for platform ${stdenv.system}";
needsPatchelf = stdenv.isLinux; needsPatchelf = stdenv.isLinux;
@@ -19,7 +19,7 @@ let
sha256 = bootstrapHash; sha256 = bootstrapHash;
}; };
version = "2016-12-29"; version = "2017-01-26";
in in
rec { rec {
pkgs/development/compilers/zulu/default.nix
+4
View File
@@ -56,6 +56,10 @@ in stdenv.mkDerivation rec {
rpath = stdenv.lib.strings.makeLibraryPath libraries; rpath = stdenv.lib.strings.makeLibraryPath libraries;
passthru = {
home = "${zulu}";
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.azul.com/products/zulu/; homepage = https://www.azul.com/products/zulu/;
license = licenses.gpl2; license = licenses.gpl2;
pkgs/development/coq-modules/math-classes/default.nix
+23
View File
@@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, coq }:
stdenv.mkDerivation {
name = "coq${coq.coq-version}-math-classes-2016-06-08";
src = fetchFromGitHub {
owner = "math-classes";
repo = "math-classes";
rev = "751e63b260bd2f78b280f2566c08a18034bd40b3";
sha256 = "0kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr";
};
buildInputs = [ coq ];
enableParallelBuilding = true;
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
meta = with stdenv.lib; {
homepage = https://math-classes.github.io;
description = "A library of abstract interfaces for mathematical structures in Coq.";
maintainers = with maintainers; [ siddharthist ];
platforms = coq.meta.platforms;
};
}
pkgs/development/haskell-modules/configuration-common.nix
+3
View File
@@ -1190,6 +1190,9 @@ self: super: {
optparse-applicative = self.optparse-applicative_0_13_0_0; optparse-applicative = self.optparse-applicative_0_13_0_0;
}); });
# No upstream issue tracker
hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff;
lentil = super.lentil.overrideScope (self: super: { lentil = super.lentil.overrideScope (self: super: {
pipes = self.pipes_4_3_2; pipes = self.pipes_4_3_2;
optparse-applicative = self.optparse-applicative_0_13_0_0; optparse-applicative = self.optparse-applicative_0_13_0_0;
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
-2
View File
@@ -3060,7 +3060,6 @@ dont-distribute-packages:
crypto-enigma: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-enigma: [ i686-linux, x86_64-linux, x86_64-darwin ]
crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ]
crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
cryptonite-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ]
cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ]
cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4731,7 +4730,6 @@ dont-distribute-packages:
hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] hspear: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-expectations-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-expectations-pretty-diff: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
pkgs/development/interpreters/clojure/clooj.nix
+2 -2
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "clooj-${version}"; name = "clooj-${version}";
jar = fetchurl { jar = fetchurl {
url = "http://www.mediafire.com/download/prkf64humftrmz3/clooj-${version}-standalone.jar"; url = "http://download1492.mediafire.com/dptomdxrjaag/prkf64humftrmz3/clooj-0.4.4-standalone.jar";
sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
}; };
@@ -25,4 +25,4 @@ stdenv.mkDerivation {
homepage = https://github.com/arthuredelstein/clooj; homepage = https://github.com/arthuredelstein/clooj;
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}; };
} }
pkgs/development/interpreters/racket/default.nix
+2 -2
View File
@@ -32,11 +32,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "racket-${version}"; name = "racket-${version}";
version = "6.7"; version = "6.8";
src = fetchurl { src = fetchurl {
url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
sha256 = "0v1nz07vzz0c7rwyz15kbagpl4l42n871vbwij4wrbk2lx22ksgy"; sha256 = "1l9z1a0r5zydr50cklx9xjw3l0pwnf64i10xq7112fl1r89q3qgv";
}; };
FONTCONFIG_FILE = fontsConf; FONTCONFIG_FILE = fontsConf;
pkgs/development/interpreters/spidermonkey/17.nix
+1
View File
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
'' + stdenv.lib.optionalString stdenv.isAarch64 '' '' + stdenv.lib.optionalString stdenv.isAarch64 ''
patch -p1 -d ../.. < ${./aarch64-double-conversion.patch} patch -p1 -d ../.. < ${./aarch64-double-conversion.patch}
patch -p1 -d ../.. < ${./aarch64-48bit-va-fix.patch}
''; '';
preConfigure = '' preConfigure = ''
pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch
+106
View File
@@ -0,0 +1,106 @@
From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001
From: Zheng Xu <zheng.xu@linaro.org>
Date: Fri, 02 Sep 2016 17:40:05 +0800
Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits are clear. r=ehoogeveen
There might be 48-bit VA on arm64 depending on kernel configuration.
Manually mmap heap memory to align with the assumption made by JS engine.
Change-Id: Ic5d2b2fe4b758b3c87cc0688348af7e71a991146
---
diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
index 5b386a2..38101cf 100644
--- a/js/src/gc/Memory.cpp
+++ b/js/src/gc/Memory.cpp
@@ -309,6 +309,75 @@
#endif
}
+static inline void *
+MapMemory(size_t length, int prot, int flags, int fd, off_t offset)
+{
+#if defined(__ia64__)
+ /*
+ * The JS engine assumes that all allocated pointers have their high 17 bits clear,
+ * which ia64's mmap doesn't support directly. However, we can emulate it by passing
+ * mmap an "addr" parameter with those bits clear. The mmap will return that address,
+ * or the nearest available memory above that address, providing a near-guarantee
+ * that those bits are clear. If they are not, we return NULL below to indicate
+ * out-of-memory.
+ *
+ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual
+ * address space.
+ *
+ * See Bug 589735 for more information.
+ */
+ void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset);
+ if (region == MAP_FAILED)
+ return MAP_FAILED;
+ /*
+ * If the allocated memory doesn't have its upper 17 bits clear, consider it
+ * as out of memory.
+ */
+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) {
+ JS_ALWAYS_TRUE(0 == munmap(region, length));
+ return MAP_FAILED;
+ }
+ return region;
+#elif defined(__aarch64__)
+ /*
+ * There might be similar virtual address issue on arm64 which depends on
+ * hardware and kernel configurations. But the work around is slightly
+ * different due to the different mmap behavior.
+ *
+ * TODO: Merge with the above code block if this implementation works for
+ * ia64 and sparc64.
+ */
+ const uintptr_t start = (uintptr_t)(0x0000070000000000UL);
+ const uintptr_t end = (uintptr_t)(0x0000800000000000UL);
+ const uintptr_t step = ChunkSize;
+ /*
+ * Optimization options if there are too many retries in practice:
+ * 1. Examine /proc/self/maps to find an available address. This file is
+ * not always available, however. In addition, even if we examine
+ * /proc/self/maps, we may still need to retry several times due to
+ * racing with other threads.
+ * 2. Use a global/static variable with lock to track the addresses we have
+ * allocated or tried.
+ */
+ uintptr_t hint;
+ void* region = MAP_FAILED;
+ for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) {
+ region = mmap((void*)hint, length, prot, flags, fd, offset);
+ if (region != MAP_FAILED) {
+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) {
+ if (munmap(region, length)) {
+ MOZ_ASSERT(errno == ENOMEM);
+ }
+ region = MAP_FAILED;
+ }
+ }
+ }
+ return region == MAP_FAILED ? NULL : region;
+#else
+ return mmap(NULL, length, prot, flags, fd, offset);
+#endif
+}
+
void *
MapAlignedPages(size_t size, size_t alignment)
{
@@ -322,12 +391,12 @@
/* Special case: If we want page alignment, no further work is needed. */
if (alignment == PageSize) {
- return mmap(NULL, size, prot, flags, -1, 0);
+ return MapMemory(size, prot, flags, -1, 0);
}
/* Overallocate and unmap the region's edges. */
size_t reqSize = Min(size + 2 * alignment, 2 * size);
- void *region = mmap(NULL, reqSize, prot, flags, -1, 0);
+ void *region = MapMemory(reqSize, prot, flags, -1, 0);
if (region == MAP_FAILED)
return NULL;
pkgs/development/libraries/ffmpeg-full/default.nix
+4 -12
View File
@@ -4,7 +4,7 @@
*/ */
, gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab , gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab
, version3Licensing ? true # (L)GPL3: opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc , version3Licensing ? true # (L)GPL3: opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc
, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,faac,aacplus,blackmagic-design-desktop-video , nonfreeLicensing ? false # NONFREE: openssl,fdkaac,blackmagic-design-desktop-video
/* /*
* Build options * Build options
*/ */
@@ -12,7 +12,6 @@
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively) , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively)
, grayBuild ? true # Full grayscale support , grayBuild ? true # Full grayscale support
, swscaleAlphaBuild ? true # Alpha channel support in swscale , swscaleAlphaBuild ? true # Alpha channel support in swscale
, incompatibleLibavAbiBuild ? false # Incompatible Libav fork ABI
, hardcodedTablesBuild ? true # Hardcode decode tables instead of runtime generation , hardcodedTablesBuild ? true # Hardcode decode tables instead of runtime generation
, safeBitstreamReaderBuild ? true # Buffer boundary checking in bitreaders , safeBitstreamReaderBuild ? true # Buffer boundary checking in bitreaders
, memalignHackBuild ? false # Emulate memalign , memalignHackBuild ? false # Emulate memalign
@@ -49,14 +48,12 @@
/* /*
* External libraries options * External libraries options
*/ */
#, aacplusExtlib ? false, aacplus ? null # AAC+ encoder
, alsaLib ? null # Alsa in/output support , alsaLib ? null # Alsa in/output support
#, avisynth ? null # Support for reading AviSynth scripts #, avisynth ? null # Support for reading AviSynth scripts
, bzip2 ? null , bzip2 ? null
, celt ? null # CELT decoder , celt ? null # CELT decoder
#, crystalhd ? null # Broadcom CrystalHD hardware acceleration #, crystalhd ? null # Broadcom CrystalHD hardware acceleration
#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support #, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support
, faacExtlib ? false, faac ? null # AAC encoder
, fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder , fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder
#, flite ? null # Flite (voice synthesis) support #, flite ? null # Flite (voice synthesis) support
, fontconfig ? null # Needed for drawtext filter , fontconfig ? null # Needed for drawtext filter
@@ -220,11 +217,9 @@ assert swscaleLibrary -> avutilLibrary;
/* /*
* External libraries * External libraries
*/ */
#assert aacplusExtlib -> nonfreeLicensing;
#assert decklinkExtlib -> blackmagic-design-desktop-video != null #assert decklinkExtlib -> blackmagic-design-desktop-video != null
# && !isCygwin && multithreadBuild # POSIX threads required # && !isCygwin && multithreadBuild # POSIX threads required
# && nonfreeLicensing; # && nonfreeLicensing;
assert faacExtlib -> faac != null && nonfreeLicensing;
assert fdkaacExtlib -> fdk_aac != null && nonfreeLicensing; assert fdkaacExtlib -> fdk_aac != null && nonfreeLicensing;
assert gnutls != null -> !opensslExtlib; assert gnutls != null -> !opensslExtlib;
assert libxcbshmExtlib -> libxcb != null; assert libxcbshmExtlib -> libxcb != null;
@@ -237,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}"; name = "ffmpeg-full-${version}";
version = "3.1.3"; version = "3.2.2";
src = fetchurl { src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "08l8290gipm632dhrqndnphdpkc5ncqc1j3hxdx46r1a3q3mqmzq"; sha256 = "1z7d5y5crhsl5fm74236rdwbkd4jj5frx1l4iizjfym1w4gvs09z";
}; };
patchPhase = ''patchShebangs . patchPhase = ''patchShebangs .
@@ -267,7 +262,6 @@ stdenv.mkDerivation rec {
(enableFeature runtimeCpuDetectBuild "runtime-cpudetect") (enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
(enableFeature grayBuild "gray") (enableFeature grayBuild "gray")
(enableFeature swscaleAlphaBuild "swscale-alpha") (enableFeature swscaleAlphaBuild "swscale-alpha")
(enableFeature incompatibleLibavAbiBuild "incompatible-libav-abi")
(enableFeature hardcodedTablesBuild "hardcoded-tables") (enableFeature hardcodedTablesBuild "hardcoded-tables")
(enableFeature safeBitstreamReaderBuild "safe-bitstream-reader") (enableFeature safeBitstreamReaderBuild "safe-bitstream-reader")
(enableFeature memalignHackBuild "memalign-hack") (enableFeature memalignHackBuild "memalign-hack")
@@ -314,13 +308,11 @@ stdenv.mkDerivation rec {
/* /*
* External libraries * External libraries
*/ */
#(enableFeature aacplus "libaacplus")
#(enableFeature avisynth "avisynth") #(enableFeature avisynth "avisynth")
(enableFeature (bzip2 != null) "bzlib") (enableFeature (bzip2 != null) "bzlib")
(enableFeature (celt != null) "libcelt") (enableFeature (celt != null) "libcelt")
#(enableFeature crystalhd "crystalhd") #(enableFeature crystalhd "crystalhd")
#(enableFeature decklinkExtlib "decklink") #(enableFeature decklinkExtlib "decklink")
(enableFeature faacExtlib "libfaac")
(enableFeature (fdkaacExtlib && gplLicensing) "libfdk-aac") (enableFeature (fdkaacExtlib && gplLicensing) "libfdk-aac")
#(enableFeature (flite != null) "libflite") #(enableFeature (flite != null) "libflite")
"--disable-libflite" # Force disable until a solution is found "--disable-libflite" # Force disable until a solution is found
@@ -412,7 +404,7 @@ stdenv.mkDerivation rec {
samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
] ++ optional openglExtlib mesa ] ++ optional openglExtlib mesa
++ optionals x11grabExtlib [ libXext libXfixes ] ++ optionals x11grabExtlib [ libXext libXfixes ]
++ optionals nonfreeLicensing [ faac fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optionals nvenc [ nvidia-video-sdk ] ++ optionals nvenc [ nvidia-video-sdk ]
pkgs/development/libraries/gnutls/3.3.nix
-10
View File
@@ -1,10 +0,0 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.3.26";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz";
sha256 = "1n90qyz54hhnmf4fmap6zdyv7nihz6mrbqgxhd46h7aqdcmqhzba";
};
})
pkgs/development/libraries/libdrm/default.nix
+2 -1
View File
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
preConfigure = stdenv.lib.optionalString stdenv.isDarwin preConfigure = stdenv.lib.optionalString stdenv.isDarwin
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
configureFlags = [ "--enable-freedreno" "--disable-valgrind" ] configureFlags = [ "--disable-valgrind" ]
++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
++ stdenv.lib.optional stdenv.isDarwin "-C"; ++ stdenv.lib.optional stdenv.isDarwin "-C";
crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
pkgs/development/libraries/libmsgpack/0.5-CMake.patch
-14
View File
@@ -1,14 +0,0 @@
diff -r 791a4edd7e1d CMakeLists.txt
--- a/CMakeLists.txt Sun Oct 05 13:14:14 2014 +0100
+++ b/CMakeLists.txt Sun Oct 05 13:20:12 2014 +0100
@@ -157,8 +157,9 @@
INSTALL (TARGETS msgpack msgpack-static DESTINATION lib)
INSTALL (DIRECTORY src/msgpack DESTINATION include)
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack/version.h DESTINATION include/msgpack)
INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include)
-INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig)
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION lib/pkgconfig)
# Doxygen
FIND_PACKAGE (Doxygen)
pkgs/development/libraries/libmsgpack/0.5.nix
-14
View File
@@ -1,14 +0,0 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "0.5.9";
src = fetchFromGitHub {
owner = "msgpack";
repo = "msgpack-c";
rev = "cpp-${version}";
sha256 = "19cmlxfr0sc2b08a1mq9plk9fj5l1i20f69j4pvbhlnah3xqfdjs";
};
patches = [ ./0.5-CMake.patch ];
})
pkgs/development/libraries/libressl/2.3.nix
-22
View File
@@ -1,22 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libressl-${version}";
version = "2.3.9";
src = fetchurl {
url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
sha256 = "1z4nh45zdh1gllhgbvlgd2vk4srhbaswyn82l3dzcfmi9rk17zx6";
};
enableParallelBuilding = true;
outputs = [ "bin" "dev" "out" "man" ];
meta = with stdenv.lib; {
description = "Free TLS/SSL implementation";
homepage = "http://www.libressl.org";
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
};
}
pkgs/development/libraries/libvpx/default.nix
-2
View File
@@ -44,8 +44,6 @@ let
inherit (stdenv.lib) enableFeature optional optionals; inherit (stdenv.lib) enableFeature optional optionals;
in in
assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support
assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. /* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors.
pkgs/development/libraries/mesa/default.nix
+14 -13
View File
@@ -67,13 +67,14 @@ stdenv.mkDerivation {
"--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-driverdir=$(drivers)/lib/dri"
"--with-dri-searchpath=${driverLink}/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri"
"--with-egl-platforms=x11,wayland,drm" "--with-egl-platforms=x11,wayland,drm"
] ] ++ (if stdenv.isArm || stdenv.isAarch64 then [
++ optionals (stdenv.system != "armv7l-linux") [ "--with-gallium-drivers=nouveau,freedreno,vc4,swrast"
"--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast" "--with-dri-drivers=nouveau,swrast"
] else [
"--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,swrast"
"--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast" "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
"--with-vulkan-drivers=intel" "--with-vulkan-drivers=intel"
] ]) ++ [
++ [
(enableFeature enableTextureFloats "texture-float") (enableFeature enableTextureFloats "texture-float")
(enableFeature grsecEnabled "glx-rts") (enableFeature grsecEnabled "glx-rts")
(enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "dri3")
@@ -134,14 +135,6 @@ stdenv.mkDerivation {
$out/lib/libxatracker* \ $out/lib/libxatracker* \
$out/lib/libvulkan_* $out/lib/libvulkan_*
# move share/vulkan/icd.d/
mv $out/share/ $drivers/
# Update search path used by Vulkan (it's pointing to $out but
# drivers are in $drivers)
for js in $drivers/share/vulkan/icd.d/*.json; do
substituteInPlace "$js" --replace "$out" "$drivers"
done
mv $out/lib/dri/* $drivers/lib/dri # */ mv $out/lib/dri/* $drivers/lib/dri # */
rmdir "$out/lib/dri" rmdir "$out/lib/dri"
@@ -154,6 +147,14 @@ stdenv.mkDerivation {
# set the default search path for DRI drivers; used e.g. by X server # set the default search path for DRI drivers; used e.g. by X server
substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
'' + optionalString (!(stdenv.isArm || stdenv.isAarch64)) ''
# move share/vulkan/icd.d/
mv $out/share/ $drivers/
# Update search path used by Vulkan (it's pointing to $out but
# drivers are in $drivers)
for js in $drivers/share/vulkan/icd.d/*.json; do
substituteInPlace "$js" --replace "$out" "$drivers"
done
''; '';
# TODO: # TODO:
pkgs/development/libraries/mlt/qt-5.nix
+9 -3
View File
@@ -1,19 +1,21 @@
{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate { stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg
, fftw, vid-stab, opencv3, ladspa-sdk
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mlt-${version}"; name = "mlt-${version}";
version = "6.2.0"; version = "6.4.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
sha256 = "1zwzfgxrcbwkxnkiwv0a1rzxdnnaly90yyarl9wdw84nx11ffbnx"; sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47";
}; };
buildInputs = [ buildInputs = [
SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
makeWrapper movit pkgconfig qtbase qtsvg sox makeWrapper movit pkgconfig qtbase qtsvg sox fftw vid-stab opencv3
ladspa-sdk
]; ];
# Mostly taken from: # Mostly taken from:
@@ -31,6 +33,10 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
''; '';
passthru = {
inherit ffmpeg;
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Open source multimedia framework, designed for television broadcasting"; description = "Open source multimedia framework, designed for television broadcasting";
homepage = http://www.mltframework.org/; homepage = http://www.mltframework.org/;
pkgs/development/libraries/openssl/default.nix
+3 -8
View File
@@ -25,8 +25,8 @@ let
(versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")))
./darwin-arch.patch; ./darwin-arch.patch;
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];
setOutputFlags = false; setOutputFlags = false;
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
@@ -50,7 +50,7 @@ let
postConfigure = if makeDepend then "make depend" else null; postConfigure = if makeDepend then "make depend" else null;
makeFlags = [ "MANDIR=$(man)/share/man" ]; makeFlags = [ "MANDIR=$(man)/share/man" ];
# Parallel building is broken in OpenSSL. # Parallel building is broken in OpenSSL.
enableParallelBuilding = false; enableParallelBuilding = false;
@@ -109,11 +109,6 @@ let
in { in {
openssl_1_0_1-vulnerable = common {
version = "1.0.1u";
sha256 = "0fb7y9pwbd76pgzd7xzqfrzibmc0vf03sl07f34z5dhm2b5b84j3";
};
openssl_1_0_2 = common { openssl_1_0_2 = common {
version = "1.0.2k"; version = "1.0.2k";
sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"; sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb";
pkgs/development/libraries/sfml/default.nix
+2 -2
View File
@@ -3,14 +3,14 @@
}: }:
let let
version = "2.3"; version = "2.4.1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sfml-${version}"; name = "sfml-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/LaurentGomila/SFML/archive/${version}.tar.gz"; url = "https://github.com/LaurentGomila/SFML/archive/${version}.tar.gz";
sha256 = "12588hfs0pfsv20x3zhq0gdmxv9m7g27i5lfz88303kpglp9yzn2"; sha256 = "13irazmqk9vcgkigsjcxns7xjmnz1gifw0b656z1rpz208diklgr";
}; };
buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew
libXrandr libXrender udev xcbutilimage libXrandr libXrender udev xcbutilimage
pkgs/development/libraries/speexdsp/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-fft=gpl-fftw3" "--with-fft=gpl-fftw3"
]; ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon";
meta = with stdenv.lib; { meta = with stdenv.lib; {
hompage = http://www.speex.org/; hompage = http://www.speex.org/;
pkgs/development/mobile/titaniumenv/build-app.nix
+2 -1
View File
@@ -99,6 +99,7 @@ stdenv.mkDerivation {
security default-keychain -s $keychainName security default-keychain -s $keychainName
security unlock-keychain -p "" $keychainName security unlock-keychain -p "" $keychainName
security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
# Ensure that the requested provisioning profile can be found # Ensure that the requested provisioning profile can be found
@@ -130,7 +131,7 @@ stdenv.mkDerivation {
fi fi
# Do the actual build # Do the actual build
titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --ios-version ${iosVersion} --output-dir $out titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out
# Remove our generated keychain # Remove our generated keychain
${deleteKeychain} ${deleteKeychain}
pkgs/development/mobile/xcodeenv/build-app.nix
+4 -1
View File
@@ -62,6 +62,9 @@ stdenv.mkDerivation {
# Import the certificate into the keychain # Import the certificate into the keychain
security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A
# Grant the codesign utility permissions to read from the keychain
security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
# Determine provisioning ID # Determine provisioning ID
PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
@@ -77,7 +80,7 @@ stdenv.mkDerivation {
''} ''}
# Do the building # Do the building
xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""} xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""}
${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString release ''
${stdenv.lib.optionalString generateIPA '' ${stdenv.lib.optionalString generateIPA ''
pkgs/development/ocaml-modules/dolmen/default.nix
+27
View File
@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-dolmen-${version}";
version = "0.2";
src = fetchFromGitHub {
owner = "Gbury";
repo = "dolmen";
rev = "v${version}";
sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf";
};
buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ menhir ];
makeFlags = "-C src";
createFindlibDestdir = true;
meta = {
description = "An OCaml library providing clean and flexible parsers for input languages";
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}
pkgs/development/python-modules/ansible/2.1.nix
+50
View File
@@ -0,0 +1,50 @@
{ lib
, fetchurl
, buildPythonPackage
, pycrypto
, paramiko
, jinja2
, pyyaml
, httplib2
, boto
, six
, netaddr
, dns
, pywinrm
}:
buildPythonPackage rec {
pname = "ansible";
version = "2.1.4.0";
name = "${pname}-${version}";
src = fetchurl {
url = "http://releases.ansible.com/ansible/${name}.tar.gz";
sha256 = "05nc68900qrzqp88970j2lmyvclgrjki66xavcpzyzamaqrh7wg9";
};
prePatch = ''
sed -i "s,/usr/,$out," lib/ansible/constants.py
'';
doCheck = false;
dontStrip = true;
dontPatchELF = true;
dontPatchShebangs = false;
windowsSupport = true;
propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2
boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
meta = {
homepage = "http://www.ansible.com";
description = "A simple automation tool";
license = with lib.licenses; [ gpl3] ;
maintainers = with lib.maintainers; [
jgeerds
joamaki
];
platforms = with lib.platforms; linux ++ darwin;
};
}
pkgs/development/python-modules/ansible/2.2.nix
+50
View File
@@ -0,0 +1,50 @@
{ lib
, fetchurl
, buildPythonPackage
, pycrypto
, paramiko
, jinja2
, pyyaml
, httplib2
, boto
, six
, netaddr
, dns
, pywinrm
}:
buildPythonPackage rec {
pname = "ansible";
version = "2.2.1.0";
name = "${pname}-${version}";
src = fetchurl {
url = "http://releases.ansible.com/ansible/${name}.tar.gz";
sha256 = "0gz9i30pdmkchi936ijy873k8di6fmf3v5rv551hxyf0hjkjx8b3";
};
prePatch = ''
sed -i "s,/usr/,$out," lib/ansible/constants.py
'';
doCheck = false;
dontStrip = true;
dontPatchELF = true;
dontPatchShebangs = false;
windowsSupport = true;
propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2
boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
meta = {
homepage = "http://www.ansible.com";
description = "A simple automation tool";
license = with lib.licenses; [ gpl3] ;
maintainers = with lib.maintainers; [
jgeerds
joamaki
];
platforms = with lib.platforms; linux ++ darwin;
};
}
pkgs/development/tools/rust/racer/default.nix
+4 -4
View File
@@ -4,15 +4,15 @@ with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
name = "racer-${version}"; name = "racer-${version}";
version = "1.2.10"; version = "2.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "phildawes"; owner = "phildawes";
repo = "racer"; repo = "racer";
rev = "e5ffe9efc1d10d4a7d66944b4c0939b7c575530e"; rev = "93eac5cd633c937a05d4138559afe6fb054c7c28";
sha256 = "1cvgd6gcwb82p387h4wl8wz07z64is8jrihmf2z84vxmlrasmprm"; sha256 = "0smp5dv0f5bymficrg0dz8h9x4lhklrz6f31fbcy0vhg8l70di2n";
}; };
depsSha256 = "1d44q7hfxijn40q7y6xawgd3c91i90fmd1dyx7i2v9as29js5694"; depsSha256 = "1qq2fpjg1wfb7z2s8p4i2aw9swcpqsp9m5jmhbyvwnd281ag4z6a";
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
pkgs/development/tools/rust/rustfmt/default.nix
+4 -4
View File
@@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
name = "rustfmt-${version}"; name = "rustfmt-${version}";
version = "0.6.3"; version = "0.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-lang-nursery"; owner = "rust-lang-nursery";
repo = "rustfmt"; repo = "rustfmt";
rev = "61ab06a92eae355ed6447d85d3c416fb65e96bdb"; rev = "907134c2d10c0f11608dc4820b023f8040ad655a";
sha256 = "0fa16ycbvhyxs1b278q8jizrx9z0gis0ysjwk8fjws0282xsyvbk"; sha256 = "1sn590x6x93wjzkb78akqjim734hxynck3gmp8fx7gcrk5cch9mc";
}; };
depsSha256 = "1qg04nzba30fqswjf97wf0slai6lhrsy0bfv648sqnrf50virx5h"; depsSha256 = "1djpzgchl93radi52m89sjk2nbl9f4y15pwn4x78lqas0jlc6nlr";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A tool for formatting Rust code according to style guidelines"; description = "A tool for formatting Rust code according to style guidelines";
pkgs/development/tools/wp-cli/default.nix
+30 -19
View File
@@ -1,33 +1,44 @@
{ stdenv, lib, writeText, writeScript, fetchurl, php }: { stdenv, lib, fetchurl, php }:
let let
version = "1.0.0"; version = "1.0.0";
name = "wp-cli-${version}";
phpIni = writeText "wp-cli-php.ini" '' bin = "bin/wp";
[Phar] ini = "etc/php/wp-cli.ini";
phar.readonly = Off phar = "share/wp-cli/wp-cli.phar";
'';
wpBin = writeScript "wp" '' completion = fetchurl {
#! ${stdenv.shell} -e url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
exec ${php}/bin/php \ sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24";
-c ${phpIni} \
-f ${src} "$@"
'';
src = fetchurl {
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
sha256 = "06a80fz9na9arjdpmnislwr0121kkg11kxfqmac0axa9vkv9fjcp";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "wp-cli-${version}";
inherit name src; src = fetchurl {
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
sha256 = "06a80fz9na9arjdpmnislwr0121kkg11kxfqmac0axa9vkv9fjcp";
};
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin $out/etc/php
ln -s ${wpBin} $out/bin/wp
cat <<_EOF > $out/${bin}
#! ${stdenv.shell} -eu
exec ${lib.getBin php}/bin/php \\
-c $out/${ini} \\
-f $out/${phar} "\$@"
_EOF
chmod 755 $out/${bin}
cat <<_EOF > $out/${ini}
[Phar]
phar.readonly = Off
_EOF
chmod 644 $out/${ini}
install -Dm644 ${src} $out/${phar}
install -Dm644 ${completion} $out/share/bash-completion/completions/wp
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
pkgs/games/chocolate-doom/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: { stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chocolate-doom-2.2.1"; name = "chocolate-doom-2.3.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz";
sha256 = "140xnz0vc14ypy30l6yxbb9s972g2ffwd4lbic54zp6ayd9414ma"; sha256 = "0i57smxmbhxj0wgvxq845ba9zsn5nx5wmzkl71rdchyd4q5jmida";
}; };
buildInputs = [ autoreconfHook pkgconfig SDL SDL_mixer SDL_net ]; buildInputs = [ autoreconfHook pkgconfig SDL SDL_mixer SDL_net ];
patchPhase = '' patchPhase = ''
pkgs/misc/emulators/gxemul/default.nix
+12 -24
View File
@@ -1,12 +1,8 @@
{ stdenv, composableDerivation, fetchurl }: { stdenv, fetchurl }:
let edf = composableDerivation.edf; stdenv.mkDerivation rec {
version = "0.6.0.1"; name = "gxemul-${version}";
name = "gxemul-${version}"; version = "0.6.0.1";
in
composableDerivation.composableDerivation {} {
inherit name;
src = fetchurl { src = fetchurl {
url = "http://gxemul.sourceforge.net/src/${name}.tar.gz"; url = "http://gxemul.sourceforge.net/src/${name}.tar.gz";
@@ -15,21 +11,14 @@ composableDerivation.composableDerivation {} {
configurePhase = "./configure"; configurePhase = "./configure";
installPhase = "mkdir -p \$out/bin; cp gxemul \$out/bin;"; installPhase = ''
mkdir -p $out/bin;
mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; }; mkdir -p $out/share/${name};
cp gxemul $out/bin;
flags = { cp -r doc $out/share/${name};
doc = { installPhase = "mkdir -p \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; }; cp -r demos $out/share/${name};
demos = { installPhase = "mkdir -p \$out/share/${name}; cp -r demos \$out/share/${name};"; }; cp -r ./man $out/;
man = { installPhase = "cp -r ./man \$out/;";}; '';
};
cfg = {
docSupport = true;
demosSupport = true;
manSupport = true;
};
meta = { meta = {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
@@ -45,5 +34,4 @@ composableDerivation.composableDerivation {} {
''; '';
homepage = http://gxemul.sourceforge.net/; homepage = http://gxemul.sourceforge.net/;
}; };
} }
pkgs/os-specific/linux/android-udev-rules/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "android-udev-rules-${version}"; name = "android-udev-rules-${version}";
version = "20170109"; version = "20170125";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "M0Rf30"; owner = "M0Rf30";
repo = "android-udev-rules"; repo = "android-udev-rules";
rev = version; rev = version;
sha256 = "1fxr6iyb70swmmp46xvx8iz9h6xj7x6q9yfdsl958zd63j8sjzjr"; sha256 = "16m7w6f9rlsb2l8hwh8rf9i6x7zm2awdagg9fqlla7arhx8rnh0q";
}; };
installPhase = '' installPhase = ''
pkgs/os-specific/linux/kernel/linux-4.4.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args: { stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.4.44"; version = "4.4.45";
extraMeta.branch = "4.4"; extraMeta.branch = "4.4";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0j779p83w4i9vj7l23rx1ihymplgy44pjh53lf55napj0ckwzggs"; sha256 = "0h8p08mgvcvi6g1hl160lc3jaf3jk5d4ilgnkl8dv8s6fwj5kyr2";
}; };
kernelPatches = args.kernelPatches; kernelPatches = args.kernelPatches;
pkgs/os-specific/linux/kernel/linux-4.9.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args: { stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.9.5"; version = "4.9.6";
extraMeta.branch = "4.9"; extraMeta.branch = "4.9";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "fcf5c43efcc9540815dae8f4d4f73c04dca9a6906c762cbee1242fdd908cf5a7"; sha256 = "16yfrydxcdlbm8vmfqirc0gshsbka6mjgfwc2wqs422v19vsz4zl";
}; };
kernelPatches = args.kernelPatches; kernelPatches = args.kernelPatches;
pkgs/os-specific/linux/kmscube/default.nix
+23
View File
@@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }:
stdenv.mkDerivation rec {
name = "kmscube-2016-09-19";
src = fetchFromGitHub {
owner = "robclark";
repo = "kmscube";
rev = "8c6a20901f95e1b465bbca127f9d47fcfb8762e6";
sha256 = "045pf4q3g5b54cdbxppn1dxpcn81h630vmhrixz1d5bcl822nhwj";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libdrm libX11 mesa_noglu ];
meta = with stdenv.lib; {
description = "Example OpenGL app using KMS/GBM";
homepage = "https://github.com/robclark/kmscube";
license = licenses.mit;
maintainers = with maintainers; [ dezgeg ];
platforms = platforms.linux;
};
}
pkgs/os-specific/linux/libnl/default.nix
+2 -2
View File
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
name = "libnl-${version}"; name = "libnl-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "1078sbfgcb6ijal9af6lv26sy233wq14afyrc4bkdbnfl0zgsbwi"; sha256 = "0y8fcb1bfbdvxgckq5p6l4jzx0kvv3g11svy6d5v3i6zy9kkq8wh";
rev = "libnl3_2_23"; rev = "libnl3_2_29";
repo = "libnl"; repo = "libnl";
owner = "thom311"; owner = "thom311";
}; };
pkgs/os-specific/linux/musl/default.nix
-1
View File
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-shared" "--enable-shared"
"--enable-static" "--enable-static"
"--disable-gcc-wrapper"
]; ];
patches = [ patches = [
pkgs/servers/felix/default.nix
+6 -5
View File
@@ -1,10 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "apache-felix-2.0.5"; name = "apache-felix-${version}";
version = "5.6.1";
src = fetchurl { src = fetchurl {
url = http://apache.xl-mirror.nl/felix/org.apache.felix.main.distribution-2.0.5.tar.gz; url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz";
sha256 = "14nva0q1b45kmmalcls5yx97syd4vn3vcp8gywck1098qhidi66g"; sha256 = "0kis26iajzdid162j4i7g558q09x4hn9z7pqqys6ipb0fj84hz1x";
}; };
buildCommand = buildCommand =
'' ''
@@ -15,7 +16,7 @@ stdenv.mkDerivation {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An OSGi gateway"; description = "An OSGi gateway";
homepage = http://felix.apache.org; homepage = https://felix.apache.org;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.sander ]; maintainers = [ maintainers.sander ];
}; };
pkgs/servers/http/apache-httpd/2.2.nix
-80
View File
@@ -1,80 +0,0 @@
{ stdenv, fetchurl, pkgconfig, openssl, perl, zlib
, sslSupport, proxySupport ? true
, apr, aprutil, pcre
, ldapSupport ? true, openldap
, # Multi-processing module to use. This is built into the server and
# cannot be selected at runtime.
mpm ? "prefork"
}:
assert sslSupport -> openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert mpm == "prefork" || mpm == "worker" || mpm == "event";
stdenv.mkDerivation rec {
version = "2.2.31";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk";
};
# FIXME: -dev depends on -doc
outputs = [ "out" "dev" "doc" ];
setOutputFlags = false; # it would move $out/modules, etc.
propagatedBuildInputs = [ apr ]; # otherwise mod_* fail to find includes often
buildInputs = [ pkgconfig perl aprutil pcre zlib ] ++
stdenv.lib.optional sslSupport openssl;
# Required for ‘pthread_cancel’.
NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s");
patchPhase = ''
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
'';
preConfigure = ''
configureFlags="$configureFlags --includedir=$dev/include"
'';
configureFlags = ''
--with-z=${zlib.dev}
--with-pcre=${pcre.dev}
--enable-mods-shared=all
--enable-authn-alias
${if proxySupport then "--enable-proxy" else ""}
${if sslSupport then "--enable-ssl --with-ssl=${openssl.dev}" else ""}
${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""}
--with-mpm=${mpm}
--enable-cache
--enable-disk-cache
--enable-file-cache
--enable-mem-cache
--docdir=$(doc)/share/doc
'';
enableParallelBuilding = true;
stripDebugList = "lib modules bin";
postInstall = ''
mkdir -p $doc/share/doc/httpd
mv $out/manual $doc/share/doc/httpd
mkdir -p $dev/bin
mv $out/bin/apxs $dev/bin/apxs
'';
passthru = {
inherit apr aprutil sslSupport proxySupport;
};
meta = {
description = "Apache HTTPD, the world's most popular web server";
branch = "2.2";
homepage = http://httpd.apache.org/;
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
};
}
pkgs/servers/http/apache-modules/mod_dnssd/default.nix
+7 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, apacheHttpd_2_2, apr, avahi }: { stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mod_dnssd-0.6"; name = "mod_dnssd-0.6";
@@ -10,7 +10,12 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-lynx" ]; configureFlags = [ "--disable-lynx" ];
buildInputs = [ pkgconfig apacheHttpd_2_2 avahi apr ]; buildInputs = [ pkgconfig apacheHttpd avahi apr ];
patches = [ (fetchpatch {
url = "http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/mod-dnssd/vivid/download/package-import%40ubuntu.com-20130530193334-kqebiy78q534or5k/portforapache2.4.pat-20130530222510-7tlw5btqchd04edb-3/port-for-apache2.4.patch";
sha256 = "1hgcxwy1q8fsxfqyg95w8m45zbvxzskf1jxd87ljj57l7x1wwp4r";
}) ];
installPhase = '' installPhase = ''
mkdir -p $out/modules mkdir -p $out/modules
@@ -25,4 +30,3 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ lethalman ]; maintainers = with maintainers; [ lethalman ];
}; };
} }
pkgs/servers/web-apps/frab/Gemfile
+88
View File
@@ -0,0 +1,88 @@
source 'https://rubygems.org'
if ENV['CUSTOM_RUBY_VERSION']
ruby ENV['CUSTOM_RUBY_VERSION'] # i.e.: '2.3'
end
gem 'rails', '~> 4.2'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
gem 'mysql2', group: :mysql
gem 'pg', group: :postgresql
gem 'sqlite3', group: :sqlite3
# Use Puma as the app server
gem 'puma'
# Capistrano for deployment
group :capistrano do
gem 'airbrussh'
gem 'capistrano', '~> 3.4.0', require: false
gem 'capistrano-rails', require: false
gem 'capistrano-bundler', require: false
gem 'capistrano-rvm', require: false
gem 'capistrano3-puma', require: false
end
# Use jquery as the JavaScript library
gem 'jquery-rails'
gem 'jquery-migrate-rails'
gem 'jquery-ui-rails'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
gem 'activeresource'
gem 'acts_as_commentable'
gem 'bcrypt'
gem 'cancancan'
gem 'cocoon'
gem 'dotenv-rails'
gem 'haml'
gem 'localized_language_select', github: 'frab/localized_language_select', branch: 'master'
gem 'nokogiri'
gem 'paperclip', '~> 4.1'
gem 'paper_trail'
gem 'prawn', '< 1.0'
gem 'prawn_rails'
gem 'ransack'
gem 'ri_cal'
gem 'roust'
gem 'rqrcode'
#gem 'roust', :git => 'git@github.com:bulletproofnetworks/roust.git'
gem 'simple_form'
gem 'sucker_punch'
gem 'transitions', require: ['transitions', 'active_record/transitions']
gem 'will_paginate'
group :production do
gem 'exception_notification'
end
group :development, :test do
gem 'bullet'
gem 'pry-rails'
gem 'pry-byebug'
gem 'letter_opener'
gem 'faker'
end
group :test do
gem 'database_cleaner'
gem 'factory_girl_rails', '~> 4.0'
gem 'shoulda'
end
group :doc do
gem 'redcarpet' # documentation
gem 'github-markdown' # documentation
gem 'yard' # documentation
# gem 'rails-erd' # graph
# gem 'ruby-graphviz', require: 'graphviz' # Optional: only required for graphing
end
pkgs/servers/web-apps/frab/Gemfile.lock
+329
View File
@@ -0,0 +1,329 @@
GIT
remote: git://github.com/frab/localized_language_select.git
revision: 85df6b97789de6e29c630808b630e56a1b76f80c
branch: master
specs:
localized_language_select (0.3.0)
rails (>= 4.1.0)
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.7.1)
actionview (= 4.2.7.1)
activesupport (= 4.2.7.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.7.1)
activesupport (= 4.2.7.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.7.1)
activesupport (= 4.2.7.1)
globalid (>= 0.3.0)
activemodel (4.2.7.1)
activesupport (= 4.2.7.1)
builder (~> 3.1)
activerecord (4.2.7.1)
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
arel (~> 6.0)
activeresource (4.1.0)
activemodel (~> 4.0)
activesupport (~> 4.0)
rails-observers (~> 0.1.2)
activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
acts_as_commentable (4.0.2)
addressable (2.4.0)
airbrussh (1.1.1)
sshkit (>= 1.6.1, != 1.7.0)
arel (6.0.3)
bcrypt (3.1.11)
builder (3.2.2)
bullet (5.4.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.10.0)
byebug (9.0.5)
cancancan (1.15.0)
capistrano (3.4.1)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
capistrano-bundler (1.1.4)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-rails (1.1.8)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano3-puma (1.2.1)
capistrano (~> 3.0)
puma (>= 2.6)
chunky_png (1.3.7)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
cocoon (1.2.9)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
database_cleaner (1.5.3)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
railties (>= 4.0, < 5.1)
erubis (2.7.0)
exception_notification (4.2.1)
actionmailer (>= 4.0, < 6)
activesupport (>= 4.0, < 6)
execjs (2.7.0)
factory_girl (4.7.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
railties (>= 3.0.0)
faker (1.6.6)
i18n (~> 0.5)
github-markdown (0.6.9)
globalid (0.3.7)
activesupport (>= 4.1.0)
haml (4.0.7)
tilt
httparty (0.14.0)
multi_xml (>= 0.5.2)
i18n (0.7.0)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-migrate-rails (1.2.1)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.4.1)
launchy (~> 2.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.0)
mini_portile2 (2.1.0)
minitest (5.9.1)
multi_json (1.12.1)
multi_xml (0.5.5)
mysql2 (0.4.4)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.2.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
pkg-config (~> 1.1.7)
paper_trail (5.2.2)
activerecord (>= 3.0, < 6.0)
request_store (~> 1.1)
paperclip (4.3.7)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
pdf-core (0.1.6)
pg (0.19.0)
pkg-config (1.1.7)
polyamorous (1.3.1)
activerecord (>= 3.0)
prawn (0.15.0)
pdf-core (~> 0.1.3)
ttfunk (~> 1.1.0)
prawn_rails (0.0.11)
prawn (>= 0.11.1)
railties (>= 3.0.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.0)
byebug (~> 9.0)
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
puma (3.6.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7.1)
actionmailer (= 4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
activemodel (= 4.2.7.1)
activerecord (= 4.2.7.1)
activesupport (= 4.2.7.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
railties (4.2.7.1)
actionpack (= 4.2.7.1)
activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.3.0)
ransack (1.8.2)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.3)
redcarpet (3.3.4)
request_store (1.3.1)
ri_cal (0.8.8)
roust (1.8.9)
activesupport (>= 4.0.10)
httparty (>= 0.13.1)
mail (>= 2.5.4)
rqrcode (0.10.1)
chunky_png (~> 1.0)
sass (3.4.22)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
shoulda-context (1.2.1)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
simple_form (3.3.1)
actionpack (> 4, < 5.1)
activemodel (> 4, < 5.1)
slop (3.6.0)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
sshkit (1.11.3)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
sucker_punch (2.0.2)
concurrent-ruby (~> 1.0.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
transitions (1.2.0)
ttfunk (1.1.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.2)
execjs (>= 0.3.0, < 3)
uniform_notifier (1.10.0)
will_paginate (3.1.3)
yard (0.9.5)
PLATFORMS
ruby
DEPENDENCIES
activeresource
acts_as_commentable
airbrussh
bcrypt
bullet
cancancan
capistrano (~> 3.4.0)
capistrano-bundler
capistrano-rails
capistrano-rvm
capistrano3-puma
cocoon
coffee-rails (~> 4.1.0)
database_cleaner
dotenv-rails
exception_notification
factory_girl_rails (~> 4.0)
faker
github-markdown
haml
jbuilder (~> 2.0)
jquery-migrate-rails
jquery-rails
jquery-ui-rails
letter_opener
localized_language_select!
mysql2
nokogiri
paper_trail
paperclip (~> 4.1)
pg
prawn (< 1.0)
prawn_rails
pry-byebug
pry-rails
puma
rails (~> 4.2)
ransack
redcarpet
ri_cal
roust
rqrcode
sass-rails (~> 5.0)
shoulda
simple_form
sqlite3
sucker_punch
transitions
uglifier (>= 1.3.0)
will_paginate
yard
BUNDLED WITH
1.13.1
pkgs/servers/web-apps/frab/default.nix
+46
View File
@@ -0,0 +1,46 @@
{ stdenv, bundlerEnv, fetchFromGitHub, ruby, nodejs }:
let
env = bundlerEnv {
name = "frab";
inherit ruby;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
};
in
stdenv.mkDerivation rec {
name = "frab-2016-12-28";
src = fetchFromGitHub {
owner = "frab";
repo = "frab";
rev = "e4bbcfd1a9db7f89f53a8702c236d9628bafb72c";
sha256 = "04pzmif8jxjww3fdf2zbg3k7cm49vxc9hhf4xhmvdmvywgin6fqp";
};
buildInputs = [ env nodejs ];
buildPhase = ''
cp config/database.yml.template config/database.yml
cp .env.development .env.production
bundler exec rake assets:precompile RAILS_ENV=production
rm .env.production
'';
installPhase = ''
mkdir -p $out/share
cp -r . $out/share/frab
ln -sf /run/frab/database.yml $out/share/frab/config/database.yml
rm -rf $out/share/frab/tmp $out/share/frab/public/system
ln -sf /run/frab/system $out/share/frab/public/system
ln -sf /tmp $out/share/frab/tmp
'';
passthru = {
inherit env ruby;
};
}
pkgs/servers/web-apps/frab/gemset.nix
+932
View File
@@ -0,0 +1,932 @@
{
actionmailer = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lw1pss1mrjm7x7qcg9pvxv55rz3d994yf3mwmlfg1y12fxq00n3";
type = "gem";
};
version = "4.2.7.1";
};
actionpack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ray5bvlmkimjax011zsw0mz9llfkqrfm7q1avjlp4i0kpcz8zlh";
type = "gem";
};
version = "4.2.7.1";
};
actionview = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "11m2x5nlbqrw79fh6h7m444lrka7wwy32b0dvgqg7ilbzih43k0c";
type = "gem";
};
version = "4.2.7.1";
};
activejob = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ish5wd8nvmj7f6x1i22aw5ycizy5n1z1c7f3kyxmqwhw7lb0gaz";
type = "gem";
};
version = "4.2.7.1";
};
activemodel = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0acz0mbmahsc9mn41275fpfnrqwig5k09m3xhz3455kv90fn79v5";
type = "gem";
};
version = "4.2.7.1";
};
activerecord = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lk8l6i9p7qfl0pg261v5yph0w0sc0vysrdzc6bm5i5rxgi68flj";
type = "gem";
};
version = "4.2.7.1";
};
activeresource = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nr5is20cx18s7vg8bdrdc996s2abl3h7fsi1q6mqsrzw7nrv2fa";
type = "gem";
};
version = "4.1.0";
};
activesupport = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gds12k7nxrcc09b727a458ndidy1nfcllj9x22jcaj7pppvq6r4";
type = "gem";
};
version = "4.2.7.1";
};
acts_as_commentable = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p4bwyqmm4ybcscn292aixschdzvns2dpl8a7w4zm0rqy2619cc9";
type = "gem";
};
version = "4.0.2";
};
addressable = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs";
type = "gem";
};
version = "2.4.0";
};
airbrussh = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pv22d2kjdbsg9q45jca3f5gsylr2r1wfpn58g58xj4s4q4r95nx";
type = "gem";
};
version = "1.1.1";
};
arel = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk";
type = "gem";
};
version = "6.0.3";
};
bcrypt = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d254sdhdj6mzak3fb5x3jam8b94pvl1srladvs53j05a89j5z50";
type = "gem";
};
version = "3.1.11";
};
builder = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
type = "gem";
};
version = "3.2.2";
};
bullet = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "06pba7bdjnazbl0yhhvlina08nkawnm76zihkaam4k7fm0yrq1k0";
type = "gem";
};
version = "5.4.0";
};
byebug = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "18sdnscwwm76i2kbcib2ckwfwpq8b1dbfr97gdcx3j1x547yqv9x";
type = "gem";
};
version = "9.0.5";
};
cancancan = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "05kb459laaw339n7mas37v4k83nwz228bfpaghgybza347341x85";
type = "gem";
};
version = "1.15.0";
};
capistrano = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0f73w6gpml0ickmwky1cn6d8392q075zy10a323f3vmyvxyhr0jb";
type = "gem";
};
version = "3.4.1";
};
capistrano-bundler = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f4iikm7pn0li2lj6p53wl0d6y7svn0h76z9c6c582mmwxa9c72p";
type = "gem";
};
version = "1.1.4";
};
capistrano-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "03lzihrq72rwcqq7jiqak79wy0xbdnymn5gxj0bfgfjlg5kpgssw";
type = "gem";
};
version = "1.1.8";
};
capistrano-rvm = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "15sy8zcal041yy5kb7fcdqnxvndgdhg3w1kvb5dk7hfjk3ypznsa";
type = "gem";
};
version = "0.1.2";
};
capistrano3-puma = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ynz1arnr07kcl0vsaa1znhp2ywhhs4fwndnkw8sasr9bydksln8";
type = "gem";
};
version = "1.2.1";
};
chunky_png = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p1zy4gyfp7rapr2yxcljkw6qh0chkwf356i387b3fg85cwdj4xh";
type = "gem";
};
version = "1.3.7";
};
climate_control = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0krknwk6b8lwv1j9kjbxib6kf5zh4pxkf3y2vcyycx5d6nci1s55";
type = "gem";
};
version = "0.0.3";
};
cocaine = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "01kk5xd7lspbkdvn6nyj0y51zhvia3z6r4nalbdcqw5fbsywwi7d";
type = "gem";
};
version = "0.5.8";
};
cocoon = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gzznkrs6qy31v85cvdqyn5wd3vwlciwibf9clmd6gi4dns21pmv";
type = "gem";
};
version = "1.2.9";
};
coderay = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r";
type = "gem";
};
version = "1.1.1";
};
coffee-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mv1kaw3z4ry6cm51w8pfrbby40gqwxanrqyqr0nvs8j1bscc1gw";
type = "gem";
};
version = "4.1.1";
};
coffee-script = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
type = "gem";
};
version = "2.4.1";
};
coffee-script-source = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k4fg39rrkl3bpgchfj94fbl9s4ysaz16w8dkqncf2vyf79l3qz0";
type = "gem";
};
version = "1.10.0";
};
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kb4sav7yli12pjr8lscv8z49g52a5xzpfg3z9h8clzw6z74qjsw";
type = "gem";
};
version = "1.0.2";
};
database_cleaner = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj";
type = "gem";
};
version = "1.5.3";
};
dotenv = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p6zz0xzb15vq8jphpw2fh6m4dianw7s76ci8vj9x3zxayrn4lfm";
type = "gem";
};
version = "2.1.1";
};
dotenv-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "17s6c0yqaz01xd5wywjscbvv0pa3grak2lhwby91j84qm6h95vxz";
type = "gem";
};
version = "2.1.1";
};
erubis = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
type = "gem";
};
version = "2.7.0";
};
exception_notification = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vclsr0rjfy1khvqyj67lgpa0v14nb542vvjkyaswn367nnmijhw";
type = "gem";
};
version = "4.2.1";
};
execjs = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1";
type = "gem";
};
version = "2.7.0";
};
factory_girl = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i";
type = "gem";
};
version = "4.7.0";
};
factory_girl_rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r";
type = "gem";
};
version = "4.7.0";
};
faker = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "09amnh5d0m3q2gpb0vr9spbfa8l2nc0kl3s79y6sx7a16hrl4vvc";
type = "gem";
};
version = "1.6.6";
};
github-markdown = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nax4fyyhz9xmi7q6mmc6d1h8hc0cxda9d7q5z0pba88mj00s9fj";
type = "gem";
};
version = "0.6.9";
};
globalid = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "11plkgyl3w9k4y2scc1igvpgwyz4fnmsr63h2q4j8wkb48nlnhak";
type = "gem";
};
version = "0.3.7";
};
haml = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
type = "gem";
};
version = "4.0.7";
};
httparty = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1msa213hclsv14ijh49i1wggf9avhnj2j4xr58m9jx6fixlbggw6";
type = "gem";
};
version = "0.14.0";
};
i18n = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
type = "gem";
};
version = "0.7.0";
};
jbuilder = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jbh1296imd0arc9nl1m71yfd7kg505p8srr1ijpsqv4hhbz5qci";
type = "gem";
};
version = "2.6.0";
};
jquery-migrate-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pcfs339wki4ax4imb4qi2xb04bbj6j4xvn8x3yn6yf95frrvch6";
type = "gem";
};
version = "1.2.1";
};
jquery-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0prqyixv7j2qlq67qdr3miwcyvi27b9a82j51gbpb6vcl0ig2rik";
type = "gem";
};
version = "4.2.1";
};
jquery-ui-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gfygrv4bjpjd2c377lw7xzk1b77rxjyy3w6wl4bq1gkqvyrkx77";
type = "gem";
};
version = "5.0.5";
};
json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
type = "gem";
};
version = "1.8.3";
};
launchy = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
type = "gem";
};
version = "2.4.3";
};
letter_opener = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21";
type = "gem";
};
version = "1.4.1";
};
localized_language_select = {
source = {
fetchSubmodules = false;
rev = "85df6b97789de6e29c630808b630e56a1b76f80c";
sha256 = "1b2pd8120nrl3s3idpgdzhrjkn9g5sxnkx4j671fjiyhadlr0q5j";
type = "git";
url = "git://github.com/frab/localized_language_select.git";
};
version = "0.3.0";
};
loofah = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8";
type = "gem";
};
version = "2.0.3";
};
mail = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c9vqfy0na9b5096i5i4qvrvhwamjnmajhgqi3kdsdfl8l6agmkp";
type = "gem";
};
version = "2.6.4";
};
method_source = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
type = "gem";
};
version = "0.8.2";
};
mime-types = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
type = "gem";
};
version = "3.1";
};
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
type = "gem";
};
version = "3.2016.0521";
};
mimemagic = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "101lq4bnjs7ywdcicpw3vbz9amg5gbb4va1626fybd2hawgdx8d9";
type = "gem";
};
version = "0.3.0";
};
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
type = "gem";
};
version = "2.1.0";
};
minitest = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0300naf4ilpd9sf0k8si9h9sclkizaschn8bpnri5fqmvm9ybdbq";
type = "gem";
};
version = "5.9.1";
};
multi_json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
type = "gem";
};
version = "1.12.1";
};
multi_xml = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8";
type = "gem";
};
version = "0.5.5";
};
mysql2 = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v537b7865f4z610rljy8prwmq1yhk3zalp9mcbxn7aqb3g75pra";
type = "gem";
};
version = "0.4.4";
};
net-scp = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
type = "gem";
};
version = "1.2.1";
};
net-ssh = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "11djaq0h3bzzy61dca3l84rrs91702hha4vgg387gviipgz7f3yy";
type = "gem";
};
version = "3.2.0";
};
nokogiri = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv";
type = "gem";
};
version = "1.6.7.2";
};
paper_trail = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w3y2h1w0kml2fmzx4sdcrhnbj273npwrs0cx91xdgy2qfjj6hmr";
type = "gem";
};
version = "5.2.2";
};
paperclip = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r8krh5xg790845wzlc2r7l0jwskw4c4wk9xh4bpprqykwaghg0r";
type = "gem";
};
version = "4.3.7";
};
pdf-core = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x121sznmhfmjnk0rzpp6djxgi28afpc8avnhn3kzlmpc87r7fyi";
type = "gem";
};
version = "0.1.6";
};
pg = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bplv27d0f8vwdj51967498pl1cjxq19hhcj4hdjr4h3s72l2z4j";
type = "gem";
};
version = "0.19.0";
};
pkg-config = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lljiqnm0b4z6iy87lzapwrdfa6ps63x2z5zbs038iig8dqx2g0z";
type = "gem";
};
version = "1.1.7";
};
polyamorous = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1501y9l81b2lwb93fkycq8dr1bi6qcdhia3qv4fddnmrdihkl3pv";
type = "gem";
};
version = "1.3.1";
};
prawn = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "04pxzfmmy8a6bv3zvh1mmyy5zi4bj994kq1v6qnlq2xlhvg4cxjc";
type = "gem";
};
version = "0.15.0";
};
prawn_rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "19m1pv2rsl3rf9rni78l8137dy2sq1r2443biv19wi9nis2pvgdg";
type = "gem";
};
version = "0.0.11";
};
pry = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "05xbzyin63aj2prrv8fbq2d5df2mid93m81hz5bvf2v4hnzs42ar";
type = "gem";
};
version = "0.10.4";
};
pry-byebug = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pvc94kgxd33p6iz41ghyadq8zfbjhkk07nvz2mbh3yhrc8w7gmw";
type = "gem";
};
version = "3.4.0";
};
pry-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6";
type = "gem";
};
version = "0.3.4";
};
puma = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rmcny3jr1jj01f9fqijwmikj212a5iql7ghifklm77x4a8pp399";
type = "gem";
};
version = "3.6.0";
};
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
type = "gem";
};
version = "1.6.4";
};
rack-test = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
type = "gem";
};
version = "0.6.3";
};
rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1avd16ir7qx23dcnz1b3cafq1lja6rq0w222bs658p9n33rbw54l";
type = "gem";
};
version = "4.2.7.1";
};
rails-deprecated_sanitizer = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
type = "gem";
};
version = "1.0.3";
};
rails-dom-testing = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v8jl6803mbqpxh4hn0szj081q1a3ap0nb8ni0qswi7z4la844v8";
type = "gem";
};
version = "1.0.7";
};
rails-html-sanitizer = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7";
type = "gem";
};
version = "1.0.3";
};
rails-observers = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy";
type = "gem";
};
version = "0.1.2";
};
railties = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "04rz7cn64zzvq7lnhc9zqmaqmqkq84q25v0ym9lcw75j1cj1mrq4";
type = "gem";
};
version = "4.2.7.1";
};
rake = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cnjmbcyhm4hacpjn337mg1pnaw6hj09f74clwgh6znx8wam9xla";
type = "gem";
};
version = "11.3.0";
};
ransack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cya3wygwjhj8rckckkl387bmva4nyfvqcl0qhp9hk3zv8y6wxjc";
type = "gem";
};
version = "1.8.2";
};
redcarpet = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "04v85p0bnpf1c7w4n0yr03s35yimxh0idgdrrybl9y13zbw5kgvg";
type = "gem";
};
version = "3.3.4";
};
request_store = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv";
type = "gem";
};
version = "1.3.1";
};
ri_cal = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1flga63anfpfpdwz6lpm3icpdqmvjq757hihfaw63rlkwq4pf390";
type = "gem";
};
version = "0.8.8";
};
roust = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zdnwxxh34psv0iybcdnk9w4dpgpr07j3w1fvigkpccgz5vs82qk";
type = "gem";
};
version = "1.8.9";
};
rqrcode = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h1pnnydgs032psakvg3l779w3ghbn08ajhhhw19hpmnfhrs8k0a";
type = "gem";
};
version = "0.10.1";
};
sass = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy";
type = "gem";
};
version = "3.4.22";
};
sass-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb";
type = "gem";
};
version = "5.0.6";
};
shoulda = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0csmf15a7mcinfq54lfa4arp0f4b2jmwva55m0p94hdf3pxnjymy";
type = "gem";
};
version = "3.5.0";
};
shoulda-context = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "06wv2ika5zrbxn0m3qxwk0zkbspxids3zmlq3xxays5qmvl1qb55";
type = "gem";
};
version = "1.2.1";
};
shoulda-matchers = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0";
type = "gem";
};
version = "2.8.0";
};
simple_form = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ii3rkkbj5cc10f5rdiny18ncdh36kijr25cah0ybbr7kigh3v3b";
type = "gem";
};
version = "3.3.1";
};
slop = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
type = "gem";
};
version = "3.6.0";
};
sprockets = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1";
type = "gem";
};
version = "3.7.0";
};
sprockets-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zr9vk2vn44wcn4265hhnnnsciwlmqzqc6bnx78if1xcssxj6x44";
type = "gem";
};
version = "3.2.0";
};
sqlite3 = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny";
type = "gem";
};
version = "1.3.11";
};
sshkit = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wpqvr2dyxwp3shwh0221i1ahyg8vd2hyilmjvdi026l00gk2j4l";
type = "gem";
};
version = "1.11.3";
};
sucker_punch = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l8b53mlzl568kdl4la8kcjjcnawmbl0q6hq9c3kkyippa5c0x55";
type = "gem";
};
version = "2.0.2";
};
thor = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
type = "gem";
};
version = "0.19.1";
};
thread_safe = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
type = "gem";
};
version = "0.3.5";
};
tilt = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf";
type = "gem";
};
version = "2.0.5";
};
transitions = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "11byymi45s4pxbhj195277r16dyhxkqc2jwf7snbhan23izzay2c";
type = "gem";
};
version = "1.2.0";
};
ttfunk = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jvgqhp0i6v9d7davwdn20skgi508yd0xcf1h4p9f5dlslmpnkhj";
type = "gem";
};
version = "1.1.1";
};
tzinfo = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
type = "gem";
};
version = "1.2.2";
};
uglifier = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0f30s1631k03x4wm7xyc79g92pppzvyysa773zsaq2kcry1pmifc";
type = "gem";
};
version = "3.0.2";
};
uniform_notifier = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l";
type = "gem";
};
version = "1.10.0";
};
will_paginate = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xlls78hkkmk33q1rb84rgg2xr39g06a1z1239nq59c825g83k01";
type = "gem";
};
version = "3.1.3";
};
yard = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gjl0sh7h0a9s67pllagw8192kscljg4y8nddfrqhji4g21yvcas";
type = "gem";
};
version = "0.9.5";
};
}
pkgs/stdenv/linux/bootstrap-files/aarch64.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ {
busybox = import <nix/fetchurl.nix> { busybox = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-for-merge/busybox; url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-01-27-264d42b9c/busybox;
sha256 = "12qcml1l67skpjhfjwy7gr10nc86gqcwjmz9ggp7knss8gq8pv7f"; sha256 = "12qcml1l67skpjhfjwy7gr10nc86gqcwjmz9ggp7knss8gq8pv7f";
executable = true; executable = true;
}; };
bootstrapTools = import <nix/fetchurl.nix> { bootstrapTools = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-for-merge/bootstrap-tools.tar.xz; url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-01-27-264d42b9c/bootstrap-tools.tar.xz;
sha256 = "10sqgh0dchp1906h06jznxh8gfflnzbpfy27hng2mmc1l0c7irjr"; sha256 = "13h7lgkjyxrmfkx5k1w6rj3j4iqrk28pqagiwqcg8izrydy318bi";
}; };
} }
pkgs/tools/misc/nginx-config-formatter/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
version = "2016-06-16";
name = "nginx-config-formatter-${version}";
src = fetchFromGitHub {
owner = "1connect";
repo = "nginx-config-formatter";
rev = "fe5c77d2a503644bebee2caaa8b222c201c0603d";
sha256 = "0akpkbq5136k1i1z1ls6yksis35hbr70k8vd10laqwvr1jj41bga";
};
buildInputs = [ python3 ];
doCheck = true;
checkPhase = ''
python3 $src/test_nginxfmt.py
'';
installPhase = ''
mkdir -p $out/bin
install -m 0755 $src/nginxfmt.py $out/bin/nginxfmt
'';
meta = with stdenv.lib; {
description = "nginx config file formatter";
maintainers = with maintainers; [ Baughn ];
license = licenses.asl20;
homepage = https://github.com/1connect/nginx-config-formatter;
};
}
pkgs/tools/misc/timidity/default.nix
+6 -34
View File
@@ -1,9 +1,6 @@
{ composableDerivation, stdenv, fetchurl, alsaLib, libjack2, ncurses }: { stdenv, fetchurl, alsaLib, libjack2, ncurses, pkgconfig }:
let inherit (composableDerivation) edf; in
composableDerivation.composableDerivation {} {
stdenv.mkDerivation {
name = "timidity-2.14.0"; name = "timidity-2.14.0";
src = fetchurl { src = fetchurl {
@@ -11,37 +8,12 @@ composableDerivation.composableDerivation {} {
sha256 = "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"; sha256 = "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr";
}; };
mergeAttrBy.audioModes = a : b : "${a},${b}"; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ alsaLib libjack2 ncurses ];
preConfigure = '' configureFlags = [ "--enable-audio=oss,alsa,jack" "--with-default-output=alsa" "--enable-ncurses" ];
configureFlags="$configureFlags --enable-audio=$audioModes"
'';
# configure still has many more options... NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"];
flags = {
oss = {
audioModes = "oss";
};
alsa = {
audioModes = "alsa";
buildInputs = [alsaLib];
# this is better than /dev/dsp !
configureFlags = ["--with-default-output-mode=alsa"];
};
jack = {
audioModes = "jack";
buildInputs = [libjack2];
NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"];
};
} // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };};
cfg = {
ncursesSupport = true;
ossSupport = true;
alsaSupport = true;
jackSupport = true;
};
instruments = fetchurl { instruments = fetchurl {
url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;
pkgs/tools/networking/nuttcp/default.nix
+51
View File
@@ -0,0 +1,51 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "nuttcp-${version}";
version = "8.1.4";
src = fetchurl {
urls = [
"http://nuttcp.net/nuttcp/latest/${name}.c"
"http://nuttcp.net/nuttcp/${name}/${name}.c"
"http://nuttcp.net/nuttcp/beta/${name}.c"
];
sha256 = "1mygfhwxfi6xg0iycivx98ckak2abc3vwndq74278kpd8g0yyqyh";
};
man = fetchurl {
url = "http://nuttcp.net/nuttcp/${name}/nuttcp.8";
sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx";
};
unpackPhase = ":";
buildPhase = ''
gcc -O2 -o nuttcp $src
'';
installPhase = ''
mkdir -p $out/bin
cp nuttcp $out/bin
'';
meta = with stdenv.lib; {
description = "Network performance measurement tool";
longDescription = ''
nuttcp is a network performance measurement tool intended for use by
network and system managers. Its most basic usage is to determine the raw
TCP (or UDP) network layer throughput by transferring memory buffers from
a source system across an interconnecting network to a destination
system, either transferring data for a specified time interval, or
alternatively transferring a specified number of bytes. In addition to
reporting the achieved network throughput in Mbps, nuttcp also provides
additional useful information related to the data transfer such as user,
system, and wall-clock time, transmitter and receiver CPU utilization,
and loss percentage (for UDP transfers).
'';
license = licenses.gpl2;
homepage = http://nuttcp.net/;
maintainers = with maintainers; [ viric ];
platforms = platforms.unix;
};
}
pkgs/tools/networking/openconnect.nix → pkgs/tools/networking/openconnect/default.nix
+6 -2
View File
@@ -7,13 +7,13 @@ in
assert xor (openssl != null) (gnutls != null); assert xor (openssl != null) (gnutls != null);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openconnect-7.06"; name = "openconnect-7.08";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz" "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
]; ];
sha256 = "1wkhmgfxkdkhy2p9w9idrgipxmxij2z4f88flfk3fifwd19nkkzs"; sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w";
}; };
preConfigure = '' preConfigure = ''
@@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ]; propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ];
meta = { meta = {
description = "VPN Client for Cisco's AnyConnect SSL VPN";
homepage = http://www.infradead.org/openconnect/;
license = stdenv.lib.licenses.lgpl21;
maintainers = with stdenv.lib.maintainers; [ pradeepchhetri ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
} }
pkgs/tools/security/tor/torbrowser.nix
+8 -3
View File
@@ -3,16 +3,19 @@
, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
, gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg , gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg
, libpulseaudio , libpulseaudio
, mediaSupport ? false
}: }:
let let
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath ([
stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype
fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
] ++ stdenv.lib.optionals mediaSupport [
gstreamer gst_plugins_base gmp ffmpeg gstreamer gst_plugins_base gmp ffmpeg
libpulseaudio libpulseaudio
] ; ]);
# Ignored if !mediaSupport
gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ]; gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ];
gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x: gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
@@ -77,7 +80,9 @@ stdenv.mkDerivation rec {
fi fi
export FONTCONFIG_PATH=\$HOME/Data/fontconfig export FONTCONFIG_PATH=\$HOME/Data/fontconfig
export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath} ${stdenv.lib.optionalString mediaSupport ''
export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath}
''}
exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@" exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@"
EOF EOF
chmod +x $out/bin/tor-browser chmod +x $out/bin/tor-browser
pkgs/tools/security/vault/default.nix
+6 -6
View File
@@ -4,12 +4,12 @@ let
vaultBashCompletions = fetchFromGitHub { vaultBashCompletions = fetchFromGitHub {
owner = "iljaweis"; owner = "iljaweis";
repo = "vault-bash-completion"; repo = "vault-bash-completion";
rev = "62c142e20929f930c893ebe3366350d735e81fbd"; rev = "e2f59b64be1fa5430fa05c91b6274284de4ea77c";
sha256 = "0nfv10ykjq9751ijdyq728gjlgldm1lxvrar8kf6nz6rdfnnl2n5"; sha256 = "10m75rp3hy71wlmnd88grmpjhqy0pwb9m8wm19l0f463xla54frd";
}; };
in buildGoPackage rec { in buildGoPackage rec {
name = "vault-${version}"; name = "vault-${version}";
version = "0.6.3"; version = "0.6.4";
goPackagePath = "github.com/hashicorp/vault"; goPackagePath = "github.com/hashicorp/vault";
@@ -17,7 +17,7 @@ in buildGoPackage rec {
owner = "hashicorp"; owner = "hashicorp";
repo = "vault"; repo = "vault";
rev = "v${version}"; rev = "v${version}";
sha256 = "0cbaws106v5dxqjii1s9rmk55pm6y34jls35iggpx0pp1dd433xy"; sha256 = "0rrrzkza12zbbfc24q4q7ygfczq1j8ljsjagsa8vpp3375dflzdy";
}; };
buildFlagsArray = '' buildFlagsArray = ''
@@ -26,7 +26,7 @@ in buildGoPackage rec {
''; '';
postInstall = '' postInstall = ''
mkdir -p $bin/share/bash-completion/completions/ mkdir -p $bin/share/bash-completion/completions/
cp ${vaultBashCompletions}/vault-bash-completion.sh $bin/share/bash-completion/completions/vault cp ${vaultBashCompletions}/vault-bash-completion.sh $bin/share/bash-completion/completions/vault
''; '';
@@ -34,6 +34,6 @@ in buildGoPackage rec {
homepage = https://www.vaultproject.io; homepage = https://www.vaultproject.io;
description = "A tool for managing secrets"; description = "A tool for managing secrets";
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem offline ]; maintainers = with maintainers; [ rushmorem offline pradeepchhetri ];
}; };
} }
pkgs/top-level/all-packages.nix
+21 -36
View File
@@ -91,6 +91,10 @@ with pkgs;
cmark = callPackage ../development/libraries/cmark { }; cmark = callPackage ../development/libraries/cmark { };
dhallToNix = callPackage ../build-support/dhall-to-nix.nix {
inherit (haskellPackages) dhall-nix;
};
dockerTools = callPackage ../build-support/docker { }; dockerTools = callPackage ../build-support/docker { };
dotnetenv = callPackage ../build-support/dotnetenv { dotnetenv = callPackage ../build-support/dotnetenv {
@@ -2533,6 +2537,8 @@ with pkgs;
netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; netsniff-ng = callPackage ../tools/networking/netsniff-ng { };
nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { };
ninka = callPackage ../development/tools/misc/ninka { }; ninka = callPackage ../development/tools/misc/ninka { };
nodejs = hiPrio nodejs-6_x; nodejs = hiPrio nodejs-6_x;
@@ -3076,6 +3082,8 @@ with pkgs;
numlockx = callPackage ../tools/X11/numlockx { }; numlockx = callPackage ../tools/X11/numlockx { };
nuttcp = callPackage ../tools/networking/nuttcp { };
nssmdns = callPackage ../tools/networking/nss-mdns { }; nssmdns = callPackage ../tools/networking/nss-mdns { };
nwdiag = pythonPackages.nwdiag; nwdiag = pythonPackages.nwdiag;
@@ -3890,7 +3898,7 @@ with pkgs;
sshpass = callPackage ../tools/networking/sshpass { }; sshpass = callPackage ../tools/networking/sshpass { };
sslscan = callPackage ../tools/security/sslscan { sslscan = callPackage ../tools/security/sslscan {
openssl = openssl_1_0_1-vulnerable.override { enableSSL2 = true; }; openssl = openssl_1_0_2.override { enableSSL2 = true; };
}; };
sslmate = callPackage ../development/tools/sslmate { }; sslmate = callPackage ../development/tools/sslmate { };
@@ -4198,11 +4206,11 @@ with pkgs;
openconnect = openconnect_gnutls; openconnect = openconnect_gnutls;
openconnect_openssl = callPackage ../tools/networking/openconnect.nix { openconnect_openssl = callPackage ../tools/networking/openconnect {
gnutls = null; gnutls = null;
}; };
openconnect_gnutls = callPackage ../tools/networking/openconnect.nix { openconnect_gnutls = callPackage ../tools/networking/openconnect {
openssl = null; openssl = null;
}; };
@@ -4678,7 +4686,6 @@ with pkgs;
clang_39 = llvmPackages_39.clang; clang_39 = llvmPackages_39.clang;
clang_38 = llvmPackages_38.clang; clang_38 = llvmPackages_38.clang;
clang_37 = llvmPackages_37.clang; clang_37 = llvmPackages_37.clang;
clang_36 = llvmPackages_36.clang;
clang_35 = wrapCC llvmPackages_35.clang; clang_35 = wrapCC llvmPackages_35.clang;
clang_34 = wrapCC llvmPackages_34.clang; clang_34 = wrapCC llvmPackages_34.clang;
@@ -5227,7 +5234,6 @@ with pkgs;
llvm_39 = llvmPackages_39.llvm; llvm_39 = llvmPackages_39.llvm;
llvm_38 = llvmPackages_38.llvm; llvm_38 = llvmPackages_38.llvm;
llvm_37 = llvmPackages_37.llvm; llvm_37 = llvmPackages_37.llvm;
llvm_36 = llvmPackages_36.llvm;
llvm_35 = llvmPackages_35.llvm; llvm_35 = llvmPackages_35.llvm;
llvm_34 = llvmPackages_34.llvm; llvm_34 = llvmPackages_34.llvm;
@@ -5246,10 +5252,6 @@ with pkgs;
isl = isl_0_14; isl = isl_0_14;
}; };
llvmPackages_36 = callPackage ../development/compilers/llvm/3.6 {
inherit (stdenvAdapters) overrideCC;
};
llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
} // stdenv.lib.optionalAttrs stdenv.isDarwin { } // stdenv.lib.optionalAttrs stdenv.isDarwin {
@@ -6008,8 +6010,7 @@ with pkgs;
augeas = callPackage ../tools/system/augeas { }; augeas = callPackage ../tools/system/augeas { };
ansible = python2Packages.ansible; ansible = python2Packages.ansible2;
ansible2 = python2Packages.ansible2; ansible2 = python2Packages.ansible2;
antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
@@ -7470,10 +7471,6 @@ with pkgs;
gnutls = gnutls34; gnutls = gnutls34;
gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
guileBindings = config.gnutls.guile or false;
};
gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix { gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
guileBindings = config.gnutls.guile or false; guileBindings = config.gnutls.guile or false;
}; };
@@ -8197,7 +8194,6 @@ with pkgs;
libmtp = callPackage ../development/libraries/libmtp { }; libmtp = callPackage ../development/libraries/libmtp { };
libmsgpack = callPackage ../development/libraries/libmsgpack { }; libmsgpack = callPackage ../development/libraries/libmsgpack { };
libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { };
libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { }; libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { };
libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {
@@ -8986,9 +8982,6 @@ with pkgs;
openslp = callPackage ../development/libraries/openslp {}; openslp = callPackage ../development/libraries/openslp {};
libressl = libressl_2_5; libressl = libressl_2_5;
libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix {
fetchurl = fetchurlBoot;
};
libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix { libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
fetchurl = fetchurlBoot; fetchurl = fetchurlBoot;
}; };
@@ -9011,7 +9004,6 @@ with pkgs;
onlyHeaders = true; onlyHeaders = true;
}; };
}) })
openssl_1_0_1-vulnerable
openssl_1_0_2 openssl_1_0_2
openssl_1_1_0 openssl_1_1_0
openssl_1_0_2-steam; openssl_1_0_2-steam;
@@ -10162,15 +10154,7 @@ with pkgs;
rdf4store = callPackage ../servers/http/4store { }; rdf4store = callPackage ../servers/http/4store { };
apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd = pkgs.apacheHttpd_2_4;
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix {
sslSupport = true;
};
apacheHttpd_2_4 = lowPrio (callPackage ../servers/http/apache-httpd/2.4.nix {
# 1.0.2+ for ALPN support
openssl = openssl_1_0_2;
});
apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {
inherit apacheHttpd; inherit apacheHttpd;
@@ -10195,7 +10179,6 @@ with pkgs;
}; };
apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages; apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages;
apacheHttpdPackages_2_2 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_2 pkgs.apacheHttpdPackages_2_2;
apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;
archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { }; archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { };
@@ -10306,6 +10289,8 @@ with pkgs;
foswiki = callPackage ../servers/foswiki { }; foswiki = callPackage ../servers/foswiki { };
frab = callPackage ../servers/web-apps/frab { };
freepops = callPackage ../servers/mail/freepops { }; freepops = callPackage ../servers/mail/freepops { };
freeradius = callPackage ../servers/freeradius { }; freeradius = callPackage ../servers/freeradius { };
@@ -11109,6 +11094,8 @@ with pkgs;
kmscon = callPackage ../os-specific/linux/kmscon { }; kmscon = callPackage ../os-specific/linux/kmscon { };
kmscube = callPackage ../os-specific/linux/kmscube { };
latencytop = callPackage ../os-specific/linux/latencytop { }; latencytop = callPackage ../os-specific/linux/latencytop { };
ldm = callPackage ../os-specific/linux/ldm { }; ldm = callPackage ../os-specific/linux/ldm { };
@@ -14655,11 +14642,6 @@ with pkgs;
inherit (darwin.stubs) rez setfile; inherit (darwin.stubs) rez setfile;
}; };
qemu_28 = callPackage ../applications/virtualization/qemu/2.8.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa;
inherit (darwin.stubs) rez setfile;
};
qgis = callPackage ../applications/gis/qgis {}; qgis = callPackage ../applications/gis/qgis {};
qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };
@@ -15189,7 +15171,9 @@ with pkgs;
vte = gnome2.vte.override { pythonSupport = true; }; vte = gnome2.vte.override { pythonSupport = true; };
}; };
termite = callPackage ../applications/misc/termite { vte = null; }; termite = callPackage ../applications/misc/termite {
vte = gnome3.vte-ng;
};
tesseract = callPackage ../applications/graphics/tesseract { }; tesseract = callPackage ../applications/graphics/tesseract { };
@@ -17031,6 +17015,7 @@ with pkgs;
flocq = callPackage ../development/coq-modules/flocq {}; flocq = callPackage ../development/coq-modules/flocq {};
interval = callPackage ../development/coq-modules/interval {}; interval = callPackage ../development/coq-modules/interval {};
mathcomp = callPackage ../development/coq-modules/mathcomp { }; mathcomp = callPackage ../development/coq-modules/mathcomp { };
math-classes = callPackage ../development/coq-modules/math-classes { };
ssreflect = callPackage ../development/coq-modules/ssreflect { }; ssreflect = callPackage ../development/coq-modules/ssreflect { };
fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
}; };
pkgs/top-level/lua-packages.nix
+16 -12
View File
@@ -14,6 +14,14 @@
let let
isLua51 = lua.luaversion == "5.1"; isLua51 = lua.luaversion == "5.1";
isLua52 = lua.luaversion == "5.2"; isLua52 = lua.luaversion == "5.2";
platformString =
if stdenv.isDarwin then "macosx"
else if stdenv.isFreeBSD then "freebsd"
else if stdenv.isLinux then "linux"
else if stdenv.isSunOS then "solaris"
else throw "unsupported platform";
self = _self; self = _self;
_self = with self; { _self = with self; {
inherit lua; inherit lua;
@@ -155,19 +163,19 @@ let
}; };
luasec = buildLuaPackage rec { luasec = buildLuaPackage rec {
name = "sec-0.6pre-2015-04-17"; name = "sec-0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brunoos"; owner = "brunoos";
repo = "luasec"; repo = "luasec";
rev = "12e1b1f1d9724974ecc6ca273a0661496d96b3e7"; rev = "lua${name}";
sha256 = "0m917qgi54p6n2ak33m67q8sxcw3cdni99bm216phjjka9rg7qwd"; sha256 = "0wv8l7f7na7kw5xn8mjik2wpxbizl7zvvp5s7fcwvz9kl5jdpk5b";
}; };
buildInputs = [ openssl ]; buildInputs = [ openssl ];
preBuild = '' preBuild = ''
makeFlagsArray=( makeFlagsArray=(
${stdenv.lib.optionalString stdenv.isLinux "linux"} ${platformString}
LUAPATH="$out/lib/lua/${lua.luaversion}" LUAPATH="$out/lib/lua/${lua.luaversion}"
LUACPATH="$out/lib/lua/${lua.luaversion}" LUACPATH="$out/lib/lua/${lua.luaversion}"
INC_PATH="-I${lua}/include" INC_PATH="-I${lua}/include"
@@ -176,7 +184,7 @@ let
meta = { meta = {
homepage = "https://github.com/brunoos/luasec"; homepage = "https://github.com/brunoos/luasec";
hydraPlatforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.flosse ]; maintainers = [ stdenv.lib.maintainers.flosse ];
}; };
}; };
@@ -197,11 +205,7 @@ let
preBuild = '' preBuild = ''
makeFlagsArray=( makeFlagsArray=(
LUAV=${lua.luaversion} LUAV=${lua.luaversion}
PLAT=${if stdenv.isDarwin then "macosx" PLAT=${platformString}
else if stdenv.isFreeBSD then "freebsd"
else if stdenv.isLinux then "linux"
else if stdenv.isSunOS then "solaris"
else throw "unsupported platform"}
prefix=$out prefix=$out
); );
''; '';
@@ -244,7 +248,7 @@ let
preBuild = '' preBuild = ''
makeFlagsArray=( makeFlagsArray=(
linux ${platformString}
LUAPATH="$out/share/lua/${lua.luaversion}" LUAPATH="$out/share/lua/${lua.luaversion}"
LUACPATH="$out/lib/lua/${lua.luaversion}" LUACPATH="$out/lib/lua/${lua.luaversion}"
INCDIR="-I${lua}/include" INCDIR="-I${lua}/include"
@@ -344,7 +348,7 @@ let
makeFlagsArray=(CC=$CC); makeFlagsArray=(CC=$CC);
''; '';
buildFlags = if stdenv.isDarwin then "macosx" else ""; buildFlags = platformString;
installPhase = '' installPhase = ''
mkdir -p $out/lib/lua/${lua.luaversion} mkdir -p $out/lib/lua/${lua.luaversion}
pkgs/top-level/ocaml-packages.nix
+2
View File
@@ -146,6 +146,8 @@ let
ctypes = callPackage ../development/ocaml-modules/ctypes { }; ctypes = callPackage ../development/ocaml-modules/ctypes { };
dolmen = callPackage ../development/ocaml-modules/dolmen { };
dolog = callPackage ../development/ocaml-modules/dolog { }; dolog = callPackage ../development/ocaml-modules/dolog { };
easy-format = callPackage ../development/ocaml-modules/easy-format { }; easy-format = callPackage ../development/ocaml-modules/easy-format { };
pkgs/top-level/perl-packages.nix
+22 -7
View File
@@ -386,11 +386,17 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestNoWarnings Moo TypeTiny ]; buildInputs = [ TestNoWarnings Moo TypeTiny ];
}; };
ListCompare = buildPerlPackage { ListCompare = buildPerlPackage rec {
name = "List-Compare-1.18"; name = "List-Compare-0.53";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.39.tar.gz; url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz";
sha256 = "1v4gn176faanzf1kr9axdp1220da7nkvz0d66mnk34nd0skjjxcl"; sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550";
};
buildInputs = [ IOCaptureOutput ];
meta = {
homepage = http://thenceforward.net/perl/modules/List-Compare/;
description = "Compare elements of two or more lists";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
}; };
}; };
@@ -6257,7 +6263,11 @@ let self = _self // overrides; _self = with self; {
name = "HTML-Tiny-1.05"; name = "HTML-Tiny-1.05";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
sha256 = "18zxg7z51f5daidnwl9vxsrs3lz0y6n5ddqhpb748bjyk3awkkfp"; sha256 = "d7cdc9d5985e2e44ceba10b756acf1e0d3a1b3ee3b516e5b54adb850fe79fda3";
};
meta = {
description = "Lightweight, dependency free HTML/XML generation";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
}; };
}; };
@@ -6591,10 +6601,15 @@ let self = _self // overrides; _self = with self; {
}; };
IOCaptureOutput = buildPerlPackage rec { IOCaptureOutput = buildPerlPackage rec {
name = "IO-CaptureOutput-1.1103"; name = "IO-CaptureOutput-1.1104";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
sha256 = "1bcl7p87ysbzab6hssq19xn3djzc0yk9l4hk0a2mqbqb8hv6p0m5"; sha256 = "fcc732fcb438f97a72b30e8c7796484bef2562e374553b207028e2fbf73f8330";
};
meta = {
homepage = https://github.com/dagolden/IO-CaptureOutput;
description = "Capture STDOUT and STDERR from Perl code, subprocesses or XS";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
}; };
}; };
pkgs/top-level/python-packages.nix
+53 -94
View File
@@ -923,79 +923,11 @@ in {
}; };
}; };
ansible = buildPythonPackage rec { ansible = self.ansible2;
version = "1.9.6"; ansible2 = self.ansible_2_2;
name = "ansible-${version}";
disabled = isPy3k;
src = pkgs.fetchurl { ansible_2_1 = callPackage ../development/python-modules/ansible/2.1.nix {};
url = "https://releases.ansible.com/ansible/${name}.tar.gz"; ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {};
sha256 = "0pgfh5z4w44sjgd77q6k769a5ipigjlm28zbpf2jhvz7n60kfxsh";
};
prePatch = ''
sed -i "s,/usr/,$out," lib/ansible/constants.py
'';
doCheck = false;
dontStrip = true;
dontPatchELF = true;
dontPatchShebangs = true;
windowsSupport = true;
propagatedBuildInputs = with self; [
pycrypto paramiko jinja2 pyyaml httplib2 boto six
netaddr dns
] ++ optional windowsSupport pywinrm;
meta = {
homepage = "http://www.ansible.com";
description = "A simple automation tool";
license = with licenses; [ gpl3] ;
maintainers = with maintainers; [
jgeerds
joamaki
];
platforms = with platforms; linux ++ darwin;
};
};
ansible2 = buildPythonPackage rec {
version = "2.2.0.0";
name = "ansible-${version}";
disabled = isPy3k;
src = pkgs.fetchurl {
url = "http://releases.ansible.com/ansible/${name}.tar.gz";
sha256 = "11l5814inr44ammp0sh304rqx2382fr629c0pbwf0k1rjg99iwfr";
};
prePatch = ''
sed -i "s,/usr/,$out," lib/ansible/constants.py
'';
doCheck = false;
dontStrip = true;
dontPatchELF = true;
dontPatchShebangs = true;
windowsSupport = true;
propagatedBuildInputs = with self; [
pycrypto paramiko jinja2 pyyaml httplib2 boto six
netaddr dns
] ++ optional windowsSupport pywinrm;
meta = with stdenv.lib; {
homepage = "http://www.ansible.com";
description = "A simple automation tool";
license = with licenses; [ gpl3 ];
maintainers = with maintainers; [
copumpkin
jgeerds
];
platforms = with platforms; linux ++ darwin;
};
};
apipkg = buildPythonPackage rec { apipkg = buildPythonPackage rec {
name = "apipkg-1.4"; name = "apipkg-1.4";
@@ -3959,11 +3891,11 @@ in {
cloudpickle = buildPythonPackage rec { cloudpickle = buildPythonPackage rec {
name = "cloudpickle-${version}"; name = "cloudpickle-${version}";
version = "0.2.1"; version = "0.2.2";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/c/cloudpickle/${name}.tar.gz"; url = "mirror://pypi/c/cloudpickle/${name}.tar.gz";
sha256 = "0fsw28nmzrpk0g02y84d7pigkqr64a3x2jhhkfixplxfwravd97f"; sha256 = "0x4fbycipkhfax7lydaxcnc14g42g274qba17j51shr5gbq6m8lx";
}; };
buildInputs = with self; [ pytest mock ]; buildInputs = with self; [ pytest mock ];
@@ -5498,11 +5430,11 @@ in {
dask = buildPythonPackage rec { dask = buildPythonPackage rec {
name = "dask-${version}"; name = "dask-${version}";
version = "0.11.0"; version = "0.13.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/d/dask/${name}.tar.gz"; url = "mirror://pypi/d/dask/${name}.tar.gz";
sha256 = "ef32490c0b156584a71576dccec4dfe550a0cd81a9c131a4ee2e43c241b601c3"; sha256 = "1f8r6jj9666cnvx3f8bilcx0017smmlw4i4v2p1nwxshs0k514hs";
}; };
buildInputs = with self; [ pytest ]; buildInputs = with self; [ pytest ];
@@ -5561,13 +5493,14 @@ in {
zict = buildPythonPackage rec { zict = buildPythonPackage rec {
name = "zict-${version}"; name = "zict-${version}";
version = "0.0.3"; version = "0.1.1";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/z/zict/${name}.tar.gz"; url = "mirror://pypi/z/zict/${name}.tar.gz";
sha256 = "1xsrlzrih0qmxvxqhk2c5vhzxirf509fppzdfyardl50jpsllni6"; sha256 = "12h95vbkbar1hc6cr1kpr6zr486grj3mpx4lznvmnai0iy6pbqp4";
}; };
buildInputs = with self; [ pytest ];
propagatedBuildInputs = with self; [ heapdict ]; propagatedBuildInputs = with self; [ heapdict ];
meta = { meta = {
@@ -5581,17 +5514,17 @@ in {
distributed = buildPythonPackage rec { distributed = buildPythonPackage rec {
name = "distributed-${version}"; name = "distributed-${version}";
version = "1.13.3"; version = "1.15.1";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/d/distributed/${name}.tar.gz"; url = "mirror://pypi/d/distributed/${name}.tar.gz";
sha256 = "0nka6hqz986j1fhvfmxffgvmnxh66giq9a3ml58jsaf0riq9mjrc"; sha256 = "037a07sdf2ch1d360nqwqz3b4ld8msydng7mw4i5s902v7xr05l6";
}; };
buildInputs = with self; [ pytest docutils ]; buildInputs = with self; [ pytest docutils ];
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado
psutil botocore zict lz4 psutil botocore zict lz4 sortedcollections sortedcontainers
] ++ (if !isPy3k then [ singledispatch ] else []); ] ++ (if !isPy3k then [ singledispatch ] else []);
# py.test not picking up local config file, even when running # py.test not picking up local config file, even when running
@@ -5692,11 +5625,11 @@ in {
s3fs = buildPythonPackage rec { s3fs = buildPythonPackage rec {
name = "s3fs-${version}"; name = "s3fs-${version}";
version = "0.0.4"; version = "0.0.8";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/s/s3fs/${name}.tar.gz"; url = "mirror://pypi/s/s3fs/${name}.tar.gz";
sha256 = "0gxs9zf0j97liby038i89k5njfrpvdgw0jw34ghzvlp1nzbwxwzl"; sha256 = "0zbdzqrim0zig94fk1hswg4vfdjplw6jpx3pdi42qc830h0nscn8";
}; };
buildInputs = with self; [ docutils ]; buildInputs = with self; [ docutils ];
@@ -14678,6 +14611,26 @@ in {
}; };
}; };
sortedcollections = buildPythonPackage rec {
name = "sortedcollections-${version}";
version = "0.4.2";
src = pkgs.fetchurl {
url = "mirror://pypi/s/sortedcollections/${name}.tar.gz";
sha256 = "12dlzln9gyv8smsy2k6d6dmr0ywrpwyrr1cjy649ia5h1g7xdvwa";
};
buildInputs = [ self.sortedcontainers ];
# wants to test all python versions with tox:
doCheck = false;
meta = {
description = "Python Sorted Collections";
homepage = http://www.grantjenks.com/docs/sortedcollections/;
license = licenses.asl20;
};
};
hyperframe = buildPythonPackage rec { hyperframe = buildPythonPackage rec {
name = "hyperframe-${version}"; name = "hyperframe-${version}";
version = "4.0.1"; version = "4.0.1";
@@ -18131,11 +18084,11 @@ in {
partd = buildPythonPackage rec { partd = buildPythonPackage rec {
name = "partd-${version}"; name = "partd-${version}";
version = "0.3.6"; version = "0.3.7";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/p/partd/${name}.tar.gz"; url = "mirror://pypi/p/partd/${name}.tar.gz";
sha256 = "1wl8kifdljnpbz0ls7mbbc9j23fc5xzm639im7h88spyg02w68hm"; sha256 = "066d254d2dh9xcanffgkjgwxpz5v0059b063bij10fvzl2y49hzx";
}; };
buildInputs = with self; [ pytest ]; buildInputs = with self; [ pytest ];
@@ -18218,17 +18171,21 @@ in {
}; };
paste = buildPythonPackage rec { paste = buildPythonPackage rec {
name = "paste-1.7.5.1"; name = "paste-${version}";
disabled = isPy3k; version = "2.0.3";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = mirror://pypi/P/Paste/Paste-1.7.5.1.tar.gz; url = "mirror://pypi/P/Paste/Paste-${version}.tar.gz";
sha256 = "11645842ba8ec986ae8cfbe4c6cacff5c35f0f4527abf4f5581ae8b4ad49c0b6"; sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3";
}; };
buildInputs = with self; [ nose ]; checkInputs = with self; [ nose ];
propagatedBuildInputs = with self; [ six ];
doCheck = false; # some files required by the test seem to be missing # Certain tests require network
checkPhase = ''
NOSE_EXCLUDE=test_ok,test_form,test_error,test_stderr,test_paste_website nosetests
'';
meta = { meta = {
description = "Tools for using a Web Server Gateway Interface stack"; description = "Tools for using a Web Server Gateway Interface stack";
@@ -18266,7 +18223,7 @@ in {
doCheck = false; doCheck = false;
buildInputs = with self; [ nose ]; buildInputs = with self; [ nose ];
propagatedBuildInputs = with self; [ paste PasteDeploy cheetah argparse ]; propagatedBuildInputs = with self; [ six paste PasteDeploy cheetah argparse ];
meta = { meta = {
description = "A pluggable command-line frontend, including commands to setup package file layouts"; description = "A pluggable command-line frontend, including commands to setup package file layouts";
@@ -25700,16 +25657,18 @@ in {
toolz = buildPythonPackage rec{ toolz = buildPythonPackage rec{
name = "toolz-${version}"; name = "toolz-${version}";
version = "0.8.0"; version = "0.8.2";
src = pkgs.fetchurl{ src = pkgs.fetchurl{
url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479"; sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa";
}; };
buildInputs = with self; [ nose ]; buildInputs = with self; [ nose ];
checkPhase = '' checkPhase = ''
# https://github.com/pytoolz/toolz/issues/357
rm toolz/tests/test_serialization.py
nosetests toolz/tests nosetests toolz/tests
''; '';

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