Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát 2016-05-14 21:37:55 +02:00
commit b1ac3404e0
106 changed files with 1826 additions and 1139 deletions

View file

@ -355,6 +355,7 @@
tailhook = "Paul Colomiets <paul@colomiets.name>";
taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
teh = "Tom Hunger <tehunger@gmail.com>";
telotortium = "Robert Irelan <rirelan@gmail.com>";
thall = "Niclas Thall <niclas.thall@gmail.com>";
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";

View file

@ -150,6 +150,10 @@ in
system.build.binsh = pkgs.bashInteractive;
# Ensure TERMINFO is set appropriately *before* user shells are run,
# as they may depend on it
environment.sessionVariables.TERMINFO = "/run/current-system/sw/share/terminfo";
# Set session variables in the shell as well. This is usually
# unnecessary, but it allows changes to session variables to take
# effect without restarting the session (e.g. by opening a new

View file

@ -2,12 +2,30 @@
with lib;
let cfg = config.services.rsnapshot;
let
cfg = config.services.rsnapshot;
cfgfile = pkgs.writeText "rsnapshot.conf" ''
config_version 1.2
cmd_cp ${pkgs.coreutils}/bin/cp
cmd_rsync ${pkgs.rsync}/bin/rsync
cmd_ssh ${pkgs.openssh}/bin/ssh
cmd_logger ${pkgs.inetutils}/bin/logger
cmd_du ${pkgs.coreutils}/bin/du
lockfile /run/rsnapshot.pid
${cfg.extraConfig}
'';
in
{
options = {
services.rsnapshot = {
enable = mkEnableOption "rsnapshot backups";
enableManualRsnapshot = mkOption {
description = "Whether to enable manual usage of the rsnapshot command with this module.";
default = true;
example = false;
type = types.bool;
};
extraConfig = mkOption {
default = "";
@ -39,37 +57,17 @@ in
as retain options.
'';
};
package = mkOption {
type = types.package;
default = pkgs.rsnapshot;
defaultText = "pkgs.rsnapshot";
example = literalExample "pkgs.rsnapshotGit";
description = ''
RSnapshot package to use.
'';
};
};
};
config = mkIf cfg.enable (let
myRsnapshot = cfg.package.override { configFile = rsnapshotCfg; };
rsnapshotCfg = with pkgs; writeText "gen-rsnapshot.conf" (''
config_version 1.2
cmd_cp ${coreutils}/bin/cp
cmd_rsync ${rsync}/bin/rsync
cmd_ssh ${openssh}/bin/ssh
cmd_logger ${inetutils}/bin/logger
cmd_du ${coreutils}/bin/du
lockfile /run/rsnapshot.pid
${cfg.extraConfig}
'');
in {
environment.systemPackages = [ myRsnapshot ];
config = mkIf cfg.enable (mkMerge [
{
services.cron.systemCronJobs =
mapAttrsToList (interval: time: "${time} root ${myRsnapshot}/bin/rsnapshot ${interval}") cfg.cronIntervals;
mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot -c ${cfgfile} ${interval}") cfg.cronIntervals;
}
);
(mkIf cfg.enableManualRsnapshot {
environment.systemPackages = [ pkgs.rsnapshot ];
environment.etc."rsnapshot.conf".source = cfgfile;
})
]);
}

View file

@ -161,8 +161,8 @@ in {
'';
postStart = ''
until ${pkgs.curl.bin}/bin/curl -s -L --fail --head http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} >/dev/null; do
sleep 2
until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do
sleep 1
done
'';

View file

@ -193,6 +193,7 @@ in
<filename><replaceable>pkg</replaceable>/lib/udev/rules.d</filename>
will be included.
'';
apply = map getBin;
};
path = mkOption {

View file

@ -36,7 +36,9 @@ let
USERS_AUTO_ASSIGN_ORG = b2s cfg.users.autoAssignOrg;
USERS_AUTO_ASSIGN_ORG_ROLE = cfg.users.autoAssignOrgRole;
AUTH_ANONYMOUS_ENABLE = b2s cfg.auth.anonymous.enable;
AUTH_ANONYMOUS_ENABLED = b2s cfg.auth.anonymous.enable;
ANALYTICS_REPORTING_ENABLED = b2s cfg.analytics.reporting.enable;
} // cfg.extraOptions;
in {
@ -196,6 +198,14 @@ in {
};
};
analytics.reporting = {
enable = mkOption {
description = "Whether to allow anonymous usage reporting to stats.grafana.net";
default = true;
type = types.bool;
};
};
extraOptions = mkOption {
description = ''
Extra configuration options passed as env variables as specified in
@ -218,7 +228,7 @@ in {
after = ["networking.target"];
environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
serviceConfig = {
ExecStart = "${cfg.package}/bin/grafana -homepath ${cfg.dataDir}";
ExecStart = "${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}";
WorkingDirectory = cfg.dataDir;
User = "grafana";
};

View file

@ -154,7 +154,7 @@ in
chown ${bindUser} /var/run/named
'';
script = "${pkgs.bind}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
};
};
}

View file

@ -12,9 +12,6 @@ let
dest = if cfg.externalIP == null then "-j MASQUERADE" else "-j SNAT --to-source ${cfg.externalIP}";
externalInterfaceFilter = param:
optionalString (cfg.externalInterface != null) "${param} ${cfg.externalInterface}";
flushNat = ''
iptables -w -t nat -D PREROUTING -j nixos-nat-pre 2>/dev/null|| true
iptables -w -t nat -F nixos-nat-pre 2>/dev/null || true
@ -39,20 +36,19 @@ let
# NAT the marked packets.
${optionalString (cfg.internalInterfaces != []) ''
iptables -w -t nat -A nixos-nat-post -m mark --mark 1 \
${externalInterfaceFilter "-o"} ${dest}
-o ${cfg.externalInterface} ${dest}
''}
# NAT packets coming from the internal IPs.
${concatMapStrings (range: ''
iptables -w -t nat -A nixos-nat-post \
-s '${range}' \! -d '${range}'
${externalInterfaceFilter "-o"} ${dest}
-s '${range}' -o ${cfg.externalInterface} ${dest}
'') cfg.internalIPs}
# NAT from external ports to internal ports.
${concatMapStrings (fwd: ''
iptables -w -t nat -A nixos-nat-pre \
${externalInterfaceFilter "-i"} -p tcp \
-i ${cfg.externalInterface} -p tcp \
--dport ${builtins.toString fwd.sourcePort} \
-j DNAT --to-destination ${fwd.destination}
'') cfg.forwardPorts}
@ -104,8 +100,7 @@ in
};
networking.nat.externalInterface = mkOption {
type = types.nullOr types.str;
default = null;
type = types.str;
example = "eth1";
description =
''

View file

@ -195,7 +195,7 @@ in
authorizedKeysFiles = mkOption {
type = types.listOf types.str;
default = [];
description = "Files from with authorized keys are read.";
description = "Files from which authorized keys are read.";
};
extraConfig = mkOption {

View file

@ -10,13 +10,12 @@ let
in
{
###### interface
options = {
services.teamspeak3 = {
enable = mkOption {
type = types.bool;
default = false;
@ -96,34 +95,32 @@ in
###### implementation
config = mkIf cfg.enable {
users.extraUsers.teamspeak =
{ name = "teamspeak";
config = mkMerge [
(mkIf cfg.enable {
users.users.teamspeak = {
description = "Teamspeak3 voice communication server daemon";
group = group;
uid = config.ids.uids.teamspeak;
home = cfg.dataDir;
createHome = true;
};
users.extraGroups.teamspeak =
{ name = "teamspeak";
users.groups.teamspeak = {
gid = config.ids.gids.teamspeak;
};
systemd.services.teamspeak3-server = {
description = "Teamspeak3 voice communication server daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
systemd.services.teamspeak3-server = {
description = "Teamspeak3 voice communication server daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
mkdir -p ${cfg.dataDir}
mkdir -p ${cfg.logPath}
chown ${user}:${group} ${cfg.dataDir}
chown ${user}:${group} ${cfg.logPath}
'';
preStart = ''
mkdir -p ${cfg.logPath}
chown ${user}:${group} ${cfg.logPath}
'';
serviceConfig =
{ ExecStart = ''
serviceConfig = {
ExecStart = ''
${ts3}/bin/ts3server \
dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \
voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \
@ -133,10 +130,12 @@ in
WorkingDirectory = cfg.dataDir;
User = user;
Group = group;
PermissionsStartOnly = true; # preStart needs to run with root permissions
PermissionsStartOnly = true;
};
};
};
})
{
meta.maintainers = with lib.maintainers; [ arobyn ];
}
];
}

View file

@ -12,20 +12,29 @@ in
{
options = {
services.xserver.desktopManager.xfce.enable = mkOption {
type = types.bool;
default = false;
description = "Enable the Xfce desktop environment.";
services.xserver.desktopManager.xfce = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the Xfce desktop environment.";
};
thunarPlugins = mkOption {
default = [];
type = types.listOf types.package;
example = literalExample "[ pkgs.xfce.thunar-archive-plugin ]";
description = ''
A list of plugin that should be installed with Thunar.
'';
};
noDesktop = mkOption {
type = types.bool;
default = false;
description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
};
};
services.xserver.desktopManager.xfce.thunarPlugins = mkOption {
default = [];
type = types.listOf types.package;
example = literalExample "[ pkgs.xfce.thunar-archive-plugin ]";
description = ''
A list of plugin that should be installed with Thunar.
'';
};
};
@ -62,14 +71,12 @@ in
pkgs.xfce.terminal
(pkgs.xfce.thunar.override { thunarPlugins = cfg.thunarPlugins; })
pkgs.xfce.xfce4icontheme
pkgs.xfce.xfce4panel
pkgs.xfce.xfce4session
pkgs.xfce.xfce4settings
pkgs.xfce.xfce4mixer
pkgs.xfce.xfce4volumed
pkgs.xfce.xfce4screenshooter
pkgs.xfce.xfconf
pkgs.xfce.xfdesktop
pkgs.xfce.xfwm4
# This supplies some "abstract" icons such as
# "utilities-terminal" and "accessories-text-editor".
@ -81,9 +88,13 @@ in
pkgs.xfce.gvfs
pkgs.xfce.xfce4_appfinder
pkgs.xfce.tumbler # found via dbus
pkgs.xfce.xfce4notifyd # found via dbus
]
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager
++ optionals (!cfg.noDesktop)
[ pkgs.xfce.xfce4panel
pkgs.xfce.xfdesktop
pkgs.xfce.xfce4notifyd # found via dbus
];
environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];

View file

@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "ncmpcpp-${version}";
version = "0.7.3";
version = "0.7.4";
src = fetchurl {
url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
sha256 = "04mj6r0whikliblxfbz92pibwcd7a3ywkryf01a89zd4bi1jk2rc";
sha256 = "0qqy3w2vw3i9rxz0z8n0plmwwfv6gzrxip86l894l1xbvzqja16p";
};
configureFlags = [ "BOOST_LIB_SUFFIX=" ]

View file

@ -81,6 +81,6 @@ in stdenv.mkDerivation rec {
--replace crashplan/skin skin \
--replace bin/CrashPlanDesktop CrashPlanDesktop
wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${gtk2}/lib:${glib}/lib:${libXtst}/lib"
wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ gtk2 glib libXtst ]}"
'';
}

View file

@ -0,0 +1,30 @@
{ stdenv, fetchgit, emacs }:
stdenv.mkDerivation rec {
name = "pcache-0.2.3";
src = fetchgit {
url = "https://github.com/sigma/pcache.git";
rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6";
sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs --batch -f batch-byte-compile pcache.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install pcache.el pcache.elc $out/share/emacs/site-lisp
'';
meta = {
description = "Persistent caching for Emacs";
homepage = https://github.com/sigma/pcache.el;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -0,0 +1,23 @@
{stdenv, fetchurl, emacs}:
let version = "1.9.0";
in stdenv.mkDerivation {
name = "emacs-s-${version}";
src = fetchurl {
url = "https://github.com/magnars/s.el/archive/${version}.tar.gz";
sha256 = "1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs -L . --batch -f batch-byte-compile *.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install *.el *.elc $out/share/emacs/site-lisp
'';
}

View file

@ -0,0 +1,32 @@
{stdenv, fetchurl, emacs}:
stdenv.mkDerivation rec {
name = "xml-rpc-1.6.8";
src = fetchurl {
url = https://launchpadlibrarian.net/40270196/xml-rpc.el;
sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b";
};
phases = [ "buildPhase" "installPhase"];
buildInputs = [ emacs ];
buildPhase = ''
cp $src xml-rpc.el
emacs --batch -f batch-byte-compile xml-rpc.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install xml-rpc.el* $out/share/emacs/site-lisp
'';
meta = {
description = "Elisp implementation of clientside XML-RPC";
homepage = https://launchpad.net/xml-rpc-el;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -146,136 +146,148 @@ in
{
android-studio = buildAndroidStudio rec {
android-studio = let buildNumber = "143.2821654"; in buildAndroidStudio rec {
name = "android-studio-${version}";
version = "2.0.0.20";
build = "143.2739321";
version = "2.1.1.0";
build = "AI-${buildNumber}";
description = "Android development environment based on IntelliJ IDEA";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
"/android-studio-ide-${build}-linux.zip";
sha256 = "14bb4ha868015wm8v8vivxfylfzm7gbvf01h82w4bhzdbzgn1zpr";
"/android-studio-ide-${buildNumber}-linux.zip";
sha256 = "1zxxzyhny7j4vzlydrhwz3g8l8zcml84mhkcf5ckx8xr50j3m101";
};
};
clion = buildClion rec {
name = "clion-${version}";
version = "1.2.4";
build = "143.1186";
version = "1.2.5";
build = "CL-143.2370.46";
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
sha256 = "0asjgfshbximjk6i57fz3d2ykby5qw5x6nhw91cpzrzszc59dmm2";
sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp";
};
};
idea14-community = buildIdea rec {
name = "idea-community-${version}";
version = "14.1.6";
build = "IC-141.3056.4";
version = "14.1.7";
build = "IC-141.3058.30";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "157969b37sbafby1r1gva2xm3a3y0dgj7pisgxmk8k1d5rgncvil";
sha256 = "1i4mdjm9dd6zvxlpdgd3bqg45ir0cfc9hl55cdc0hg5qwbz683fz";
};
};
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2016.1.1";
build = "IC-145.597";
version = "2016.1.2";
build = "IC-145.971.21";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "1r0kvq8vk8ln4cabqjvfqp0lfy9vf8c8vddh76sd41d635pamba6";
sha256 = "15c92wsfw16j48k12x4vw78886yf9yjx7hwwjamgf28lmzvc37iz";
};
};
idea14-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "14.1.7";
build = "IU-141.3058.30";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "a2259249f6e7bf14ba17b0af90a18d24d9b4670af60d24f0bb51af2f62500fc2";
};
};
idea15-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "15.0.5";
build = "IU-143.2332.3";
version = "15.0.6";
build = "IU-143.2370.31";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "1hvc5cmbfpp0qad0236ffh3g7zwfk64rh5bkkb750h3387jz7nr2";
sha256 = "012aap2qn0jx4x34bdv9ivrsr86vvf683srb5vpj27hc4l6rw6ll";
};
};
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2016.1.1";
build = "IU-145.597";
version = "2016.1.2";
build = "IU-145.971.21";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "d5a7d2d657fe2ad170716054c6ccd164e509cf50ee6eee8b61fe3490071940df";
sha256 = "0dxpx4nx845vgqxl5qz029d3w3kn3hi98wgzympidplxrphgalgy";
};
};
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "7.1.2";
build = "141.1119";
version = "7.1.5";
build = "RM-141.3058.29";
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "1gz14lv5jhnrnshp7lkx3wgrdf0y60abs4q78yhv2x9dc6ld1gmj";
sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l";
};
};
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2016.1.2";
build = "145.844";
version = "2016.1.3";
build = "PC-145.971.25";
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1kxwjg5l2fzpn6hr0iir0dv1n5l02jl02aff9wrj95186wxivg3a";
sha256 = "1ks7crrfnhzkdxban2hh2pnr986vqwmac5zybmb1ighcyamhdi4q";
};
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2016.1.2";
build = "145.844";
version = "2016.1.3";
build = "PY-145.971.25";
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1kwi9d80r2yp5ivbvslrj70iam966rv4a8diajbwpcc26m7rj3kk";
sha256 = "1rn0i5qbvfjbl4v571ngmyslispibcq5ab0fb7xjl38vr1y417f2";
};
};
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "10.0.1";
build = "PS-143.382";
version = "10.0.4";
build = "PS-143.2370.33";
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "12bqil8pxzmbv8a7pxn2529ph2x7szr3wvkvgxaisydm463kpdk8";
sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
};
};
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "10.0.4";
build = "141.1550";
version = "10.0.5";
build = "WS-141.3058.35";
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "171i544ssvjnbr1vq6ncxlj38swsygacavsa427qa4s5wzyvdipj";
sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic";
};
};

View file

@ -13,10 +13,10 @@ let
};
in
stdenv.mkDerivation {
name = "netbeans-8.0.2";
name = "netbeans-8.1";
src = fetchurl {
url = http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905.zip;
sha256 = "1h9cqpwsnrhcnn4fqz3rr4s5jln8cfwki8af9zikq9j6aza337xv";
url = http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201.zip;
sha256 = "1aaf132mndpgfbd5v8izqzp37hjs5gwqwd6zrb519fx0viz9aq5r";
};
buildCommand = ''

View file

@ -6,7 +6,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
assert gksuSupport -> gksu != null;
let
build = "3103";
build = "3114";
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
@ -20,13 +20,13 @@ in let
fetchurl {
name = "sublimetext-${build}.tar.bz2";
url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2";
sha256 = "1qidnczndyhyp9rfzmpqah00lrx7z1a0fy7a13lzwqq3gslhwf1l";
sha256 = "0xrfx76ilw5hlx26hv9zx1kw8q9qf76646yyjmn36p6mq9vs6y0d";
}
else
fetchurl {
name = "sublimetext-${build}.tar.bz2";
url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2";
sha256 = "1x8kb3prs6wa5s5rj0gfq96zx6k5q3s168yhfsa36x2szi6x6y4x";
sha256 = "0nmi2gkpz56a47a0f56nx6nl3sl7gif035517gx2v82113y9nh66";
};
dontStrip = true;
@ -76,7 +76,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Sophisticated text editor for code, markup and prose";
homepage = https://www.sublimetext.com/;
maintainers = with maintainers; [ wmertens demin-dmitriy ];
maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ];
license = licenses.unfree;
platforms = platforms.linux;
};

View file

@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
version = "2.55.0";
version = "2.56.0";
name = "calibre-${version}";
src = fetchurl {
url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
sha256 = "12412d5vjp141xp5qvif50fskd1vsmr15h956z3bh6j99n8z5953";
sha256 = "0xv5s664l72idqbi7ymapj1k3gr47r9fbx41fqplsih0ckcg3njj";
};
inherit python;

View file

@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
name = "gnuradio-${version}";
version = "3.7.9.1";
version = "3.7.9.2";
src = fetchurl {
url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
sha256 = "0zlnxyqq3dyrg0nz2hpydlhyzv26vlkdavs8w01k448lxkqz01lw";
sha256 = "0qdmakvgq3jxnnqpcn3k4q07vj8ycrbyzv32h76k71cv13w2yrki";
};
buildInputs = [

View file

@ -70,11 +70,11 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "11.2.202.616";
version = "11.2.202.621";
src = fetchurl {
url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
sha256 = "0y4bjkla6ils4crmx61pi31s4gscy8rgiv7xccx1z0g6hba9j73l";
sha256 = "0xv7pzna4pfmi9bjwfbr0kf92xvdgpirm97kks4kphwngf3bzrm0";
};
nativeBuildInputs = [ unzip ];

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
let version = "3.17.0"; in
let version = "3.17.0.1"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
sha256 = "0vb5zqpvh0fi0a7nkz79cdmbzjk1cpmbyqx77nfkvd1kz1fcsqrp";
sha256 = "0ai3a0nys3yjmlvlv57nli77x6x0a2r409b4f5w4kr9mi6f4z4a7";
};
configureFlags = [

View file

@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
preConfigure = "cd steam-mobile";
postInstall = ''
mkdir -p $out/lib/pidgin/
mkdir -p $out/lib/purple-2
mkdir -p $out/share/pixmaps/pidgin/protocols/
cp libsteam.so $out/lib/pidgin/
cp libsteam.so $out/lib/purple-2/
unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/
'';

View file

@ -13,5 +13,8 @@ in symlinkJoin {
wrapProgram $out/bin/pidgin \
--suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \
${toString extraArgs}
wrapProgram $out/bin/finch \
--suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion}" \
${toString extraArgs}
'';
}

View file

@ -1,11 +1,8 @@
{ stdenv, fetchurl, makeWrapper }:
let
version = "3.0.10.3";
version = "3.0.12.4";
arch = if stdenv.is64bit then "amd64" else "x86";
libDir = if stdenv.is64bit then "lib64" else "lib";
in
@ -14,25 +11,30 @@ stdenv.mkDerivation {
src = fetchurl {
urls = [
"http://dl.4players.de/ts/releases/${version}/teamspeak3-server_linux-${arch}-${version}.tar.gz"
"http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux-${arch}-${version}.tar.gz"
"http://dl.4players.de/ts/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"
"http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"
];
sha256 = if stdenv.is64bit
then "9606dd5c0c3677881b1aab833cb99f4f12ba08cc77ef4a97e9e282d9e10b0702"
else "8b8921e0df04bf74068a51ae06d744f25d759a8c267864ceaf7633eb3f81dbe5";
then "1n8vgbgnfbllfvsl82ai6smv6hl32a3nd071j2dp79agjz4fic3b"
else "19vkcgb0h71amixry8r72qqwaxwplzyz9nrxg5bdjjg8r2mkh4bc";
};
buildInputs = [ makeWrapper ];
buildPhase =
''
mv ts3server_linux_${arch} ts3server
echo "patching ts3server"
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
--force-rpath \
ts3server
cp tsdns/tsdnsserver tsdnsserver
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
--force-rpath \
tsdnsserver
'';
installPhase =
@ -44,17 +46,19 @@ stdenv.mkDerivation {
mkdir -p $out/lib/teamspeak
mv * $out/lib/teamspeak/
# Make a symlink to the binary from bin.
# Make symlinks to the binaries from bin.
mkdir -p $out/bin/
ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server
ln -s $out/lib/teamspeak/tsdnsserver $out/bin/tsdnsserver
wrapProgram $out/lib/teamspeak/ts3server --prefix LD_LIBRARY_PATH : $out/lib/teamspeak
wrapProgram $out/lib/teamspeak/tsdnsserver --prefix LD_LIBRARY_PATH : $out/lib/tsdnsserver
'';
dontStrip = true;
dontPatchELF = true;
meta = {
meta = {
description = "TeamSpeak voice communication server";
homepage = http://teamspeak.com/;
license = stdenv.lib.licenses.unfreeRedistributable;

View file

@ -64,7 +64,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2";
inherit (source) sha256;
inherit (source) sha512;
};
phases = "unpackPhase installPhase";

View file

@ -1,61 +1,43 @@
version = if ARGV.empty?
"latest"
else
ARGV[0]
end
require "open-uri"
base_path = "archive.mozilla.org/pub/thunderbird/releases"
version =
if ARGV.empty?
$stderr.puts("Usage: ruby generate_sources.rb <version> > sources.nix")
exit(-1)
else
ARGV[0]
end
base_path = "http://archive.mozilla.org/pub/thunderbird/releases"
Source = Struct.new(:hash, :arch, :locale, :filename)
sources = open("#{base_path}/#{version}/SHA512SUMS") do |input|
input.readlines
end.select do |line|
/\/thunderbird-.*\.tar\.bz2$/ === line && !(/source/ === line)
end.map do |line|
hash, name = line.chomp.split(/ +/)
Source.new(hash, *(name.split("/")))
end.sort_by do |source|
[source.locale, source.arch]
end
arches = ["linux-i686", "linux-x86_64"]
arches.each do |arch|
system("wget", "--recursive", "--continue", "--no-parent", "--reject-regex", ".*\\?.*", "--reject", "xpi", "http://#{base_path}/#{version}/#{arch}/")
end
locales = Dir.glob("#{base_path}/#{version}/#{arches[0]}/*").map do |path|
File.basename(path)
end.sort
locales.delete("index.html")
locales.delete("xpi")
# real version number, e.g. "30.0" instead of "latest".
real_version = Dir.glob("#{base_path}/#{version}/#{arches[0]}/#{locales[0]}/thunderbird-*")[0].match(/thunderbird-([0-9.]*)/)[1][0..-2]
locale_arch_path_tuples = locales.flat_map do |locale|
arches.map do |arch|
path = Dir.glob("#{base_path}/#{version}/#{arch}/#{locale}/thunderbird-*")[0]
[locale, arch, path]
end
end
paths = locale_arch_path_tuples.map do |tuple| tuple[2] end
hashes = IO.popen(["sha256sum", "--binary", *paths]) do |input|
input.each_line.map do |line|
$stderr.puts(line)
line.match(/^[0-9a-f]*/)[0]
end
end
puts(<<"EOH")
# This file is generated from generate_sources.rb. DO NOT EDIT.
# Execute the following command in a temporary directory to update the file.
# Execute the following command to update the file.
#
# ruby generate_sources.rb > sources.nix
# ruby generate_sources.rb 45.1.0 > sources.nix
{
version = "#{real_version}";
version = "#{version}";
sources = [
EOH
locale_arch_path_tuples.zip(hashes) do |tuple, hash|
locale, arch, path = tuple
puts(%Q| { locale = "#{locale}"; arch = "#{arch}"; sha256 = "#{hash}"; }|)
sources.each do |source|
puts(%Q| { locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|)
end
puts(<<'EOF')

View file

@ -1,126 +1,126 @@
# This file is generated from generate_sources.rb. DO NOT EDIT.
# Execute the following command in a temporary directory to update the file.
# Execute the following command to update the file.
#
# ruby generate_sources.rb > sources.nix
# ruby generate_sources.rb 45.1.0 > sources.nix
{
version = "45.0";
version = "45.1.0";
sources = [
{ locale = "ar"; arch = "linux-i686"; sha256 = "1edc09feab9b25f333f192c07b33e0f4b3ee093145d32f4eca4e93003a396ce4"; }
{ locale = "ar"; arch = "linux-x86_64"; sha256 = "0681fca92f04ae1c4b3a306756f050f128b0534ee93ca6bc7fa0b5d5272a3bf3"; }
{ locale = "ast"; arch = "linux-i686"; sha256 = "f16600e6cfa49a99c6a827231e1411fefb6a0c83f9cfc44e862b3a97f7c778fc"; }
{ locale = "ast"; arch = "linux-x86_64"; sha256 = "9c37be63be7dc3f338af3326d5917592096b94df2423d1dc81daea4e31cd8658"; }
{ locale = "be"; arch = "linux-i686"; sha256 = "1779ec20a630b02543f51eb735f33e1b920061e328a8c0966209096f47051a18"; }
{ locale = "be"; arch = "linux-x86_64"; sha256 = "826d926a96ec9e8d5b46ed4649ac67ebe1a67db1eb746ee5e37b1fdf0f09ddb0"; }
{ locale = "bg"; arch = "linux-i686"; sha256 = "aa6d3070ffebb5fe9f9205cab6c6bb3b57033e5d6acbafc45ca3fc89fa35f849"; }
{ locale = "bg"; arch = "linux-x86_64"; sha256 = "e21460bf056e8b1fe683a11b688307580a13b51db03ffb235dc32c6e50ce8ac7"; }
{ locale = "bn-BD"; arch = "linux-i686"; sha256 = "77d6dd2686b8bd5962c70a8ea09c10cbc0f60a0c7effdf00ac346bca9b6af313"; }
{ locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "a417f6bcd228afa2be0c71206af9f06841a8dc29950a8975e6455af215911e1f"; }
{ locale = "br"; arch = "linux-i686"; sha256 = "920c81326f5f33e1e1a3a4229d0544360aa9f7bbe5eb32db3ea30dc34764e515"; }
{ locale = "br"; arch = "linux-x86_64"; sha256 = "be967c23e45a06532dd8a2611a31bc842ff79c6da6b63444bd9f6a3db7f834a2"; }
{ locale = "ca"; arch = "linux-i686"; sha256 = "98d88b01ed35dbbaf5b06418a26018c86d6b07f9ce9fe999b007ce6844e3832c"; }
{ locale = "ca"; arch = "linux-x86_64"; sha256 = "616a724f6a0a1493c321a83c274895ba7234977f2d7ab264d44dda39d34dddaf"; }
{ locale = "cs"; arch = "linux-i686"; sha256 = "ebebf6d26d900103851e1f8ccc5cb26506902a996a5c92674f165c79ad090fde"; }
{ locale = "cs"; arch = "linux-x86_64"; sha256 = "43b1a4ad27868b968112c86893465d8c765d383a9653b64dc27609644b7c4bfc"; }
{ locale = "cy"; arch = "linux-i686"; sha256 = "52b7a40c87adac16d77e9a03827c0db49286f1576ead85c6a5bff3b8ab33d546"; }
{ locale = "cy"; arch = "linux-x86_64"; sha256 = "2c413971b22bafac67729e6f5967513f4dabbff441cad4aecaa3fa363aed807a"; }
{ locale = "da"; arch = "linux-i686"; sha256 = "aab8b9b66d9b80c94ff9b26102cec7cb9ff9c7dc859f4606bba8d48d47ebebf4"; }
{ locale = "da"; arch = "linux-x86_64"; sha256 = "24daf3a574619b2be424b4f5bbda732b500bd6ea5eff6e3b858dfe4bb0b2cfa1"; }
{ locale = "de"; arch = "linux-i686"; sha256 = "385860c48089394ba0bd939cc60506c62f9d4b54903ee3c0e04006e6af619408"; }
{ locale = "de"; arch = "linux-x86_64"; sha256 = "e0e61f60915f7562151e47e3458830aa1323519ce76cbd9638559ec177da1093"; }
{ locale = "dsb"; arch = "linux-i686"; sha256 = "e2a19f5fc03bb3ea1a97ed501540b42fea923033592b0790aa4bcd93ff619421"; }
{ locale = "dsb"; arch = "linux-x86_64"; sha256 = "95fa2341481aa869ef1d417c617ccbe54cc0f57ac0b4cb7266c6399887e1f04a"; }
{ locale = "el"; arch = "linux-i686"; sha256 = "3dc35863b9aea5cfdb28ecd71ad798eee711c859d27acb46fb2294861ba713d7"; }
{ locale = "el"; arch = "linux-x86_64"; sha256 = "546a4cf57c52ef054c2c58b9792b5b8ed0933368d8f4343f78604328c4117d42"; }
{ locale = "en-GB"; arch = "linux-i686"; sha256 = "74194c95fba578feec4ac92569be45a9b948a4ae403d62bce5e11f5047ebbf11"; }
{ locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9da80fa8d1c96e08c2338c77c67548e4a16e151c8ebddfb28da779f1bfeabefe"; }
{ locale = "en-US"; arch = "linux-i686"; sha256 = "c4e1d0a902ab04db666ac90cf1003f8b48ed88e3291fbbf1d6b2606e805a45b0"; }
{ locale = "en-US"; arch = "linux-x86_64"; sha256 = "843ce88b796c4705c61ab5a68a215fc82c2ee32e655c2c4d0dd244e97ae0705d"; }
{ locale = "es-AR"; arch = "linux-i686"; sha256 = "4fe05cbcf9b1d5aee936c29f19675c1d9658630cfe0c68570244ac57a5e8612e"; }
{ locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0c3b83406c1b38249e52e0c8f17389e9861cfd5578a15a66c9bad89784d21b31"; }
{ locale = "es-ES"; arch = "linux-i686"; sha256 = "937a41e69189e50ac893d06abcd5ab032281f0531a2cb5acbd60bfdd4fff6a75"; }
{ locale = "es-ES"; arch = "linux-x86_64"; sha256 = "3d58ed89c2dd316fdbcf218666ca837b5200dc35462a89f41e8a83c4eb7620fa"; }
{ locale = "et"; arch = "linux-i686"; sha256 = "46e211a049ca3e3e986db7620b087a4ec41b73b1f4051aece68881c73b342bf7"; }
{ locale = "et"; arch = "linux-x86_64"; sha256 = "69c968a92241703e4cc71e905b35a74e4326f6b8e32cad84dbeb3ea1b802c7a1"; }
{ locale = "eu"; arch = "linux-i686"; sha256 = "dc638be813979a640e12f1fc4bed727ce639bc8d50b1b1d084e8733a067155ef"; }
{ locale = "eu"; arch = "linux-x86_64"; sha256 = "26362027c5e5b3d69ebaecbed10c300d232dd3ccdbf96e113f720518584f5c03"; }
{ locale = "fi"; arch = "linux-i686"; sha256 = "947481357bacb8a91b0a49956007e8ffaf0575815d5dcff0750f4cb2890f9e22"; }
{ locale = "fi"; arch = "linux-x86_64"; sha256 = "35716446800a69a71aaf6f91e8bab850f8f681e6acaa6f36429f71a2bdd0e04a"; }
{ locale = "fr"; arch = "linux-i686"; sha256 = "27aeb7724e1d76d1d81bf583b94580d3745177b1983b63e4dd88ec6ae204ba13"; }
{ locale = "fr"; arch = "linux-x86_64"; sha256 = "482aba9f35f2026e4b9dfb009f45925f87a71a21c9338fd27a52ca1113d9759e"; }
{ locale = "fy-NL"; arch = "linux-i686"; sha256 = "7adb9045525b10914173092731ed3a4194e68b3b3661a83b008e8cb651518b0c"; }
{ locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "4177e0f51a0877633cde98bc0d81a8f6391c6a87932546dfc094deea30ea5190"; }
{ locale = "ga-IE"; arch = "linux-i686"; sha256 = "c77fd8481fe999f3e0b63952137762947c58a397be82027755bbe2aa8bee9c8a"; }
{ locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "39c2da28763cccabf86c6713bc62862edd37605c117d9c197cdeaabbb1cab31d"; }
{ locale = "gd"; arch = "linux-i686"; sha256 = "2be49f3b06a46ed89687de23459c42052b7a50814d32127121007c620fc56f8a"; }
{ locale = "gd"; arch = "linux-x86_64"; sha256 = "e0f9d78a12263fe8b8d40332bcc52a7c8db374c655564394e4ed850cf4567593"; }
{ locale = "gl"; arch = "linux-i686"; sha256 = "2f66892cf58b1aa63a748b9be966fbd07077a369a46ee4e4d241be37abfe083d"; }
{ locale = "gl"; arch = "linux-x86_64"; sha256 = "235b01ed0a702de629a61ee0a69ff4564fe479782d85c95a69fc121e5bf96df1"; }
{ locale = "he"; arch = "linux-i686"; sha256 = "5a3486d56950a6b14dcacf8cb40a55a7d2024c2838c52f77acc745fcbba6863e"; }
{ locale = "he"; arch = "linux-x86_64"; sha256 = "fae68a673712cb7929baf4e54358c851846901d519359ab53b270cfd215ecc5c"; }
{ locale = "hr"; arch = "linux-i686"; sha256 = "e2044cda9fd387af1368115a47e56c5a81d2f9fbf9135dc7b5441b88ac5bda1d"; }
{ locale = "hr"; arch = "linux-x86_64"; sha256 = "7205a8f3b20a5a1a7af08860a99d2be2d4ec78873f7e0cb579040285c3ef85f8"; }
{ locale = "hsb"; arch = "linux-i686"; sha256 = "a2357944e25f3d1434d33cade62d079b0dee878c8f6d1aa2d3cae94500dce14a"; }
{ locale = "hsb"; arch = "linux-x86_64"; sha256 = "3bb4658ecd2bce8d2204859cf95f8a85f90c6eb6f15e44ac50c1824aaa884da3"; }
{ locale = "hu"; arch = "linux-i686"; sha256 = "31da7a7cde19de47455b6cd855ed0e77efaa30e76989a26df71bce73134e384e"; }
{ locale = "hu"; arch = "linux-x86_64"; sha256 = "4703c48e899d36eb8d6aeb0f1d0101bf39f12c921716b7aaf041068b42046dfb"; }
{ locale = "hy-AM"; arch = "linux-i686"; sha256 = "bec4ef424007894fe85a06cf8af03da2bc48c7d68e6ecde3287a6863408e6392"; }
{ locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "028bd4d92f502c4b4b0af52f5d992abfdf4d988974d8b991194284aa5ccb25b3"; }
{ locale = "id"; arch = "linux-i686"; sha256 = "5718068cd54ecb06e0ce7a4ddc87b923b76d7341a989a946717e2b34b1b49a0e"; }
{ locale = "id"; arch = "linux-x86_64"; sha256 = "112928c75789795e21050b8202d49b50fdb3b10f21c3d2c140e9cbd7ba96bafe"; }
{ locale = "is"; arch = "linux-i686"; sha256 = "4bd5abdb8fb9c389601b9e6c8fcd18e53e8c24097ee338199ee12b03f580faff"; }
{ locale = "is"; arch = "linux-x86_64"; sha256 = "e4ee538f072398ae16c70ebcd32e06129b2d94a88104710a2b165af1b1da8541"; }
{ locale = "it"; arch = "linux-i686"; sha256 = "2269ea4101db9f9bb961d79fa30ecece49178a747cb10fb5f90f09d14dcbacd6"; }
{ locale = "it"; arch = "linux-x86_64"; sha256 = "04cef93ee74ff13d6ddc9cfe60440d128bc8b432be62d988094d73461138cff1"; }
{ locale = "ja"; arch = "linux-i686"; sha256 = "762e6c0879c0983dc059f3b4550681d947b0ceb2dd82331a587463d881c7fb65"; }
{ locale = "ja"; arch = "linux-x86_64"; sha256 = "90748465b87b0bffcf70e7c6d83d2f6ce7873b751a5c1dc2d63d18cc60a8c25a"; }
{ locale = "ko"; arch = "linux-i686"; sha256 = "ce867efb9452465ae1f6ab0eebbe06721c3987614b42c901a12e43ce3e5a6ad5"; }
{ locale = "ko"; arch = "linux-x86_64"; sha256 = "9aab21893818eb86a7da148650873c4e6e1faa047d35e1ff6845001d4eabb2d4"; }
{ locale = "lt"; arch = "linux-i686"; sha256 = "3f8fec266c7e612183ea1d60e44f90c8f5c713b2af0038ca10fef9964662c0a9"; }
{ locale = "lt"; arch = "linux-x86_64"; sha256 = "f7efb6a495e57439c287ed8cdeacbdff6980ff89493497ab384a3c3c33fccaea"; }
{ locale = "nb-NO"; arch = "linux-i686"; sha256 = "02b0002e52a7e1c91a4f200ece1c9e1b133b7d50688e483c041cdf57ef7d8a06"; }
{ locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "d4d6f125a9af64ad1967e414cb4f5d7a4cdc636c805f9790bf1c79573900aeef"; }
{ locale = "nl"; arch = "linux-i686"; sha256 = "16b9e1d15b64b7d44ba3f2e39aa5a772a6d26ec347170b86c6455f4591bae22b"; }
{ locale = "nl"; arch = "linux-x86_64"; sha256 = "0d8b130e681ca5a2ebd7b2f032b5779eb148540d7802097df8430f6cf095a5f8"; }
{ locale = "nn-NO"; arch = "linux-i686"; sha256 = "37d08bbf72c34ee677dd0fe39016f75a13e5e078ce23236b742a0de2131421dd"; }
{ locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "c76e50a850ef98f07e030564fa8ec7411ca31aa128e8b6393227e40c91b47938"; }
{ locale = "pa-IN"; arch = "linux-i686"; sha256 = "3aef7a6aef6d05c17f757603c81f2f550c0681b3f3ae38abd02d8224c10754c0"; }
{ locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "b5434c9a814f6ece725ef1bf7f47381fe7b56e2c1c05832a75e95152b8706725"; }
{ locale = "pl"; arch = "linux-i686"; sha256 = "215845fbfd3e76c73861b59324df380b794413b25efd1189975589bc843b9d28"; }
{ locale = "pl"; arch = "linux-x86_64"; sha256 = "0f07a3c7f6518dbe056814e0ab257036ffabd3770bebdf2ccd053eaee499654c"; }
{ locale = "pt-BR"; arch = "linux-i686"; sha256 = "28f668d318a441cd57c9e85dda1de98502a545933b7af2a3d2aef066952a3eb9"; }
{ locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "eae9dee3c5677e40ec3ce0c6594937671ae07be49b8488abbe94d1ba52bd3f16"; }
{ locale = "pt-PT"; arch = "linux-i686"; sha256 = "36d9ae4720d5e673c02e2fe850f3e66786b853f1e5e81368e3e62715b612cc57"; }
{ locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "bb5156054e96d515bac61cf942560d73166c27f052abf05344d81544b3d09938"; }
{ locale = "rm"; arch = "linux-i686"; sha256 = "79322d60677bfeb493f0ebc64d336201ff75f34af6131a8fda742518c45c7cc0"; }
{ locale = "rm"; arch = "linux-x86_64"; sha256 = "7544877e762913619dda73a3ebbc48d81aa2519a014284b79d7fdb65de678f20"; }
{ locale = "ro"; arch = "linux-i686"; sha256 = "d1ab21feb037542faf032668ba6875157775f5efa95b3c1a8a31cc0fc8ea0a40"; }
{ locale = "ro"; arch = "linux-x86_64"; sha256 = "8f2ef95bd7d82086dd8369e2ec144348d085527cab8e89b33d938c93103c4e15"; }
{ locale = "ru"; arch = "linux-i686"; sha256 = "99390a8350cdf26c69203670458fbc7b6700797a55fa37f498148dca0fbca7b7"; }
{ locale = "ru"; arch = "linux-x86_64"; sha256 = "6a52e3d8db23fd0c1e091f1b90dc80603cd8ce345d488228f3b595f1b707bb60"; }
{ locale = "si"; arch = "linux-i686"; sha256 = "15e8ca12df3192e174f2787aca1d4a5b992ca2f45525a5d2f06683b2e8864bd3"; }
{ locale = "si"; arch = "linux-x86_64"; sha256 = "6b7d66bbe8cb6ed0c4a1f44a3885d5c7e4a5db79a1db98530a099e6bb7a417bc"; }
{ locale = "sk"; arch = "linux-i686"; sha256 = "4ce5be3d7455c72ec7c6ecb56824220ab74712b1c4ee27212010cb8e12959edb"; }
{ locale = "sk"; arch = "linux-x86_64"; sha256 = "1a3911a18156a2dce9417c84bff20b7f41b8e5f5e2a578ffe33b26db0b4bcb30"; }
{ locale = "sl"; arch = "linux-i686"; sha256 = "a43200e303054b34c4e4e7c81f561a8c1d33c122af61e23b89b3a8cb8c0d26d5"; }
{ locale = "sl"; arch = "linux-x86_64"; sha256 = "f7e456499b7acf5e8eae4d04abcf43210f00bab8b4b7f42e047f2ee13473f3f6"; }
{ locale = "sq"; arch = "linux-i686"; sha256 = "9a444b55077da2817c72538c72f53e6ff945e4f88ba6c222e2676de21bae2435"; }
{ locale = "sq"; arch = "linux-x86_64"; sha256 = "96eb242e79a7155fe85dcd7eb1b1606f9d84c72aebffed2244cb149d7d77740f"; }
{ locale = "sr"; arch = "linux-i686"; sha256 = "79c98c7d34b327b596f0a3e417508d5bbe77fd61b761995635559cc5f88d85e7"; }
{ locale = "sr"; arch = "linux-x86_64"; sha256 = "0041421d294f06d993dd4184b66f6fa6c58244b231a64da1b20dd76b5becb4b4"; }
{ locale = "sv-SE"; arch = "linux-i686"; sha256 = "a17ab2cc74b4c9367c21a176eb1cd83fce74bea24996b4987644659f9ef0bc68"; }
{ locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0fd181a6d7425db8f0077175b8905f3a646af081a9db1a2b635f8c95c99e01b2"; }
{ locale = "ta-LK"; arch = "linux-i686"; sha256 = "34eca4b0d4d808b280045381def6976106e3e78c43d901bc512b9aea83537876"; }
{ locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "4633828b594d330c252b5e4931e85f98797ec2aa17400e546dea7a4099bfe543"; }
{ locale = "tr"; arch = "linux-i686"; sha256 = "b8584087e44d967ec5badeee5d9ac86653709f858e65b4356e0fa8d3ea5e3369"; }
{ locale = "tr"; arch = "linux-x86_64"; sha256 = "dda18542ba3f27cf0b2a1499121c43dc5c085ada40cd825dad119135a1fd4385"; }
{ locale = "uk"; arch = "linux-i686"; sha256 = "5cb1e2fdbf857f93851ee1b1aa3ad00c538def17641f14742b446414706f74c1"; }
{ locale = "uk"; arch = "linux-x86_64"; sha256 = "84dc247e8a46f0ff1b5bd7f25956e0988edab18e72649b7d4c264b6160a47de2"; }
{ locale = "vi"; arch = "linux-i686"; sha256 = "a38fde2cbdb45552950db906b19eed3135e930da8242791811683bb2fb850fb4"; }
{ locale = "vi"; arch = "linux-x86_64"; sha256 = "5eff491a6d6ec1b54788beb300f61fbd98be72037a769054967af7a062afec61"; }
{ locale = "zh-CN"; arch = "linux-i686"; sha256 = "c4644e65f6d1a1cb710806026814c416268453b571531e87d71800deb3625128"; }
{ locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "dd8d802b34d76ccdeb569b86aec75f27d29c23b6c74ce6d5bfb0a5239ee581af"; }
{ locale = "zh-TW"; arch = "linux-i686"; sha256 = "1a9e7322512caa10247f58674fbbf55d5a624ef36a9d570d8ebdb6e1c5c6889a"; }
{ locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "a84310a24bfe845e9c3992fe5441e9cbc049054fdc53f659dbea997ae17e937f"; }
{ locale = "ar"; arch = "linux-i686"; sha512 = "f07bdaa53396e4135585f513d79668ebc47e2ea6008724b25ea8b20e6421f9951018ce4f3f0cef3b4318b9a2dc5d7835c310f90599245ab6182a8aff67e31824"; }
{ locale = "ar"; arch = "linux-x86_64"; sha512 = "b7e21034dcb85cd0c8fe5faf99db1fc939d058dc49e229bf8e5886ca39bb940ffa79ef6255a408703a99506b724664b1a39c3c38dd7df5b87a138e23799bd923"; }
{ locale = "ast"; arch = "linux-i686"; sha512 = "c6c38930e02fe3c52c5da390b24655441f3470b04ac6b2d12e23d7a6ee880d68b80c3c18c1d1c62f662677cf78a25f5f5aab02975b05b46771ed057e4ed61ead"; }
{ locale = "ast"; arch = "linux-x86_64"; sha512 = "3a2b26610231115c3e974ee1474632647ad1eb6b9611c9eeaef253fc94adcdd312d108bb6add23e45e64b7f46c073b853c3b07919bc8124c82509f52c8a6afe7"; }
{ locale = "be"; arch = "linux-i686"; sha512 = "a8569095bec1c87af03739665bd47878e9b762e6dc993f3d25f77f0d8eae98d9b074492521e54470b16d37232d49665eed5a64c7fa640f2e9c7c609327d215d3"; }
{ locale = "be"; arch = "linux-x86_64"; sha512 = "2ad4c5e61200368234ff55cf7c1a524f7579c4f585834770b761172ec59aa213c2b2e368fa78399a5384c24500ba98cc8a41546417ef1a09562ed836ff6d4dd9"; }
{ locale = "bg"; arch = "linux-i686"; sha512 = "523f1c502d76aaa328508a8c6679715104b459b51231d6e24d59f299523808161ca81a1198d6a55587d688296b194f4983ebfca2f266a8aad2440ec79a4be096"; }
{ locale = "bg"; arch = "linux-x86_64"; sha512 = "e65d7253a75b0296139766cf8215cb900aa0e29beeebd1ca0229773a19ff0e2083fd82133d404214c3af200123137b95ec2b887e3d2c5d9a295ecd79087558bd"; }
{ locale = "bn-BD"; arch = "linux-i686"; sha512 = "12d895ece57a2add45ffa82a8ad332c377ae8a091972f9f8824ddaee6f9b859ab4bfeacddb0b861296b1b4b913767826997cc5e0147788eae78dea1833255a94"; }
{ locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "09979e0ca185cf59d8aa135382cda296a0c635620e9bb77eb61c6ecdd06ba424334ef21d7208715f75b4f421b19dadcaa68942adf6a827a991930baa71b1074b"; }
{ locale = "br"; arch = "linux-i686"; sha512 = "48c9881b5e452e30848bb9b4a2d0fd1a2b25e42a962acdaa79c3af1fdca7382dee9a8560fd78e84a4147af4681ee2f1c6c369a5854f7a82404cf6c78079420b7"; }
{ locale = "br"; arch = "linux-x86_64"; sha512 = "49bb2fb147312d431c3f6184a499366f7059524b126b4233f3195651675401628ebfcb3f2bea33edd5e0d7eafd8f64fc54528e48e46cc9874c5e8c8924d1b8fb"; }
{ locale = "ca"; arch = "linux-i686"; sha512 = "954785700f3ec5abd4700203f653023277a1c866f9acc703f501d5de5f9f0b600b8b8e634c1d7b2ed5b5892e8c92d750e192b630d3f21ba8d4477794f0a3791e"; }
{ locale = "ca"; arch = "linux-x86_64"; sha512 = "93eaa656195dc2e69646f6127511725fb805b99509ab53561c58b23bf272a51e0effd674c59a414003e3d106aea06277baef280a06b7cb2678a1332e79ab65b1"; }
{ locale = "cs"; arch = "linux-i686"; sha512 = "d7fd9f68e9db4e8b194110399537d584b1c3dfb27af26f0151070edbc716ef15172d4d3b4668d324b152689cd7f1048c27582705a03e903e3cad97686a5b46c6"; }
{ locale = "cs"; arch = "linux-x86_64"; sha512 = "7bb0c4f17ee2672b61d364da90fad387d5ebdd44f3e6e89d3b0db0e00c8165aa02b60d33c74a2eb7e4752334327c71bbff9162a9f4e35d3c7480b454fe770772"; }
{ locale = "cy"; arch = "linux-i686"; sha512 = "7290bde6396f6c44c92ee4494ab039e3d91fc9ebb3636fa0f4fd083fd92e8e68e0f6f4e327f4ccaa12fded1c3ea9af703f99c01e11c380385f97aff1c61ebd2d"; }
{ locale = "cy"; arch = "linux-x86_64"; sha512 = "239a310abba653b649b37470741cba5bd151f9783ca1f536cba27bddbd9d42e49798d592cb08ad132d2e126d5710e3cd83c8da5b7216e2020ec6040d6b0fddf5"; }
{ locale = "da"; arch = "linux-i686"; sha512 = "f9d778b8724181495df36e65841fea9b6aada84b754ed0405e988c617f27ff9250dbe23a2f7ce9b44418e4260d2b16c2b15fe4ad4a925b0d862c3451da789176"; }
{ locale = "da"; arch = "linux-x86_64"; sha512 = "17a3c221f55be21bf58c6b47471e3fb4d1415f8fd2ddcd4301115c6771b7a837b4c50d9b054bee02cc25a96961ca0b55aff952b1ed1890ef120b6b84711aed36"; }
{ locale = "de"; arch = "linux-i686"; sha512 = "cc63b30bef02a96bfbdd0f36c18ea2e142ed7285880e6d28e41726067e55b53adf3a863deea98397d0b1e3dec0237d0911f4ba86860841a5147522d0b269cea6"; }
{ locale = "de"; arch = "linux-x86_64"; sha512 = "4a6c4e48278b6a95cd91b71027cb2dd8e44d1904c287e36ca85ebae80dbf526ae58de359c759f0e8878f36e7c8e22d66ec3a1bc16f583d6619d3519de0bd27fa"; }
{ locale = "dsb"; arch = "linux-i686"; sha512 = "a7bbc58a4c8d60f74308fdda9ce431ff11b12e1b7e5059649b7636e6547dc84f43b0a3f96f59a80e3aef3a2c13435431dd62a3932489f0dc1ff5b58d8e0fabd2"; }
{ locale = "dsb"; arch = "linux-x86_64"; sha512 = "f472bd612938d16d708eb62b9f472b37e5694bc5d54270515a5b37e29986bfae7081d628950cff6599fade83e50039b1d6c9d1f23932591c80f4645dd6f3b4ec"; }
{ locale = "el"; arch = "linux-i686"; sha512 = "401837b5cc0ddc491a034c78c1b71f8d4ccd96ebf3f11eb99919b3c20d0c3a31b48e61599794f826f91273fbe2545465743c6ca4bb48d4b2bbe57dcabcc9725c"; }
{ locale = "el"; arch = "linux-x86_64"; sha512 = "d69b96264e6d56235dc8f2217ac8192d531fe5ab97fad58a35948ded8fbd9d37e68687516a862a81b87f8ae27487f1c288866b93e6ab5e9182272f6b261eb508"; }
{ locale = "en-GB"; arch = "linux-i686"; sha512 = "de081ed39200214b27fe249498c6f5a3381f35a2fbd74816e45dc5403239c3a3a9218b9de05ac6b970b2e7479e96e86eed45591594a723833e7fd8b535efaae6"; }
{ locale = "en-GB"; arch = "linux-x86_64"; sha512 = "4acbbbac6ed26b76b93b2ba469f12498840dd5f9f5a49e2b7002dd57abd984f3bbecf9e0af89f2684da13326ba994d7ae69e1333162c65429a1c47692c542101"; }
{ locale = "en-US"; arch = "linux-i686"; sha512 = "e30f11ffbf7ade1e46923a52bccbbfc3722229d15a323cd5f812f1287004f7d2f09a688c29205de3baa06c9314bed892747ed8a6a15eacd36fb1b8494b78965b"; }
{ locale = "en-US"; arch = "linux-x86_64"; sha512 = "53dc9169aeb45fde1bf96897dc49e113a24bf851cf19b9d428d4362856267a4974dd06c1ffaebc1b0a4db120175677dd3867dcff66be98c2aa4815f89910f5a7"; }
{ locale = "es-AR"; arch = "linux-i686"; sha512 = "3e1ace4acda96fc6997fa8b10b2c1926105bdaebbbda3341fa5c3c87d3e88400b436c8ba09eaf4ed5fc100440fffbfbddb0ceea19986bffb33291a5d1ac52737"; }
{ locale = "es-AR"; arch = "linux-x86_64"; sha512 = "f000230d1cf00a1423bd441a93dcb4c384ea6a0071f15910c2cd814f65181022951e1eea6bb1179c4315c861a01caff137bb846edb65b5d4fbf6642fa7849dd1"; }
{ locale = "es-ES"; arch = "linux-i686"; sha512 = "34948a7e78f7d8a0830397977ff13b1c76032eb7d909903f2ea1d4579082db9cf1e91ae804082af189b03ba89fa283a1392380b8c4e45956ef339c64da546681"; }
{ locale = "es-ES"; arch = "linux-x86_64"; sha512 = "d0204eb82b8c8a80e5d3bc82ca9a8e9c25c6e0d8dbb7da9a43f25a10088a819b4c8695c88528b1ebd76328eab23da474ec2e539c31b6947b282602a593f75c1d"; }
{ locale = "et"; arch = "linux-i686"; sha512 = "41484b954518e5f75dd8fc21ffd803f1a7f3e8dae0a35df98f0c9fac8e3cde11dd085f026536c752c1c34d9c8d11b55eb9b55fbbec57e36b65806608ad24b471"; }
{ locale = "et"; arch = "linux-x86_64"; sha512 = "79a38b25ee9e465cfba965b6451aed749e5aecd2c8c62741d0caa4918a1c1c3cde8b3c7aa905dc205e8d3a8bffc6a795faece4da9017d2bc48064aaee641c909"; }
{ locale = "eu"; arch = "linux-i686"; sha512 = "d7b370fa6f36cb218f8cbab7be9c42ecefa9ee4b6760bb2097f9bbf337a3c6a5ae9cf2051abc97a7ed5b7de14685252288d07af3ee0c25d5b371aa638944e3e4"; }
{ locale = "eu"; arch = "linux-x86_64"; sha512 = "3efe13a25a3f72441001bc04054009536b98a852e29dd8b012c0014c990db1078f0e95266d3b6c0c4b8edcd1928ae32f557ef82ccbd1a9545b2a6111254ae04f"; }
{ locale = "fi"; arch = "linux-i686"; sha512 = "7599bad72c5536e41d23ebac041389dbd868af9e6180655b67eb402df80c47ed454e26c982666056444f6813250d824cab913319ccfeb50645278f46ca88284e"; }
{ locale = "fi"; arch = "linux-x86_64"; sha512 = "77a5adfc44a95f358a6c376ccb49b2ff526b164be92f190000698e97b5391a38b026e2923010c41cdda6c5c8d21e25710c92cff84a7e7a23cb8e9cf845d1c8a8"; }
{ locale = "fr"; arch = "linux-i686"; sha512 = "b14e26ba3a2f729e4a3014220578ef4aba28bc6064a19afbaf622c1bc4f52b05245d0b689f7e62e1d46e5dde4732a255032ca94587f5d1eb9986c5313d8849ea"; }
{ locale = "fr"; arch = "linux-x86_64"; sha512 = "4d2644b8fe269d4698cb5655dd76bde4162be36682403a803995f3a47adc7da53ddd2c70553228e1564cc1c99dc1ef408002ca17e55de358e4cf8afc966a9c57"; }
{ locale = "fy-NL"; arch = "linux-i686"; sha512 = "94e31d2828dec13e6fe454a88515de3254c7f646bda3589f362367c35963043c8e97f5562727032af8228dff6fb59d1d5590a9128e686777708895d7030b1117"; }
{ locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "4b42d9e722e4f1e1e99f23bb6cf7650711deab5ed18ac49c3f4b6b7829d4e201990f8065ef65e01345772bb5c6ff3b9231430713e14e3bb5a032b52398782e46"; }
{ locale = "ga-IE"; arch = "linux-i686"; sha512 = "3d44f51dc1e770bfeec3dd8f55e346cfc5b272430ecc4034704ac71e7c63bc6c9c5b907edcdefec0c4d98be94265f444cc067ff7ee6851031edae56a931ea898"; }
{ locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "51d849d608697b1c2c2b8fd2da90d8c5777ec90fa0aad9bb99e660bf69819576fb97a235512b710b41a76f96e07b9d4676a31583012d78341fcafef9cee7de9c"; }
{ locale = "gd"; arch = "linux-i686"; sha512 = "d22933ad961fc061cf89db77c12b46bbd7f47d2b4c43fb348b17c373328805c9d2563626deb28ae405b9f4bd53237139b4ae07d99c8aebb7aa55d6fc3688e4c9"; }
{ locale = "gd"; arch = "linux-x86_64"; sha512 = "a1636bfbbafe782ad4ac2b32c32555b0420434203b340b716a1af783fa7e079bd1017c72f8c7f9df6d194463658c3c2d420e7c76bfad73fbf4b01ba248849a84"; }
{ locale = "gl"; arch = "linux-i686"; sha512 = "4e9429fc676c541f28fedf04e47b833814077ca39ab6bfcd69f9113942ec1e0988440fd0cbe76a02adbfff532c4526d52bd9e8480c3c34f1a5e31ce81d4d2552"; }
{ locale = "gl"; arch = "linux-x86_64"; sha512 = "6ff7d7c0216e6df3c2d21dc066c7a1a9efb153cc5341f9b8886e162300f2bb9d35f3bbe04b1524aba7af7e11feadb4d5bf2fd3b3a87176ee469cc019dd5b2318"; }
{ locale = "he"; arch = "linux-i686"; sha512 = "d73580ad744a7f0d1b33656c804f34cec7fadd434cfe2983bd766562c0839787c1f7d24d46e0a8750d39099964bbab50c4a4f11e284b7ae1a4a51ac72780f7ab"; }
{ locale = "he"; arch = "linux-x86_64"; sha512 = "f4a3dbd3aa8bb63e77a2870a815ba393bd8eef5966e267d16d5509214bd542956b3f522001d21950899ff6134c27c7076bc8284988b9a3097e8e85b22c9d0283"; }
{ locale = "hr"; arch = "linux-i686"; sha512 = "ee46234fae33de0b773dcc425134bcd63dc84e9928d3aa2327b9f4c4ac518460e780f14bac3dff5c1c8983e6e27fd90ea13e0a63ac8c764c5206fcff1ce1dc21"; }
{ locale = "hr"; arch = "linux-x86_64"; sha512 = "f00506936eeac1d6ccbfbcc4f1ec3ff7435013c4bb547c3ed8d75771aa20c23207349bb1850a58df054a16669897118a4e163a3629da5d612b3d7de1ef4c824a"; }
{ locale = "hsb"; arch = "linux-i686"; sha512 = "3c507f80021faa40302a1e28c74f561cacf65519f30a947ad8a518e605a53354293a3c50de3bfc486dec2d9876e1d391a653ce99d97a7551ce4e8ed937831556"; }
{ locale = "hsb"; arch = "linux-x86_64"; sha512 = "0c17827cbcd6198c763b940d4ac1b2ea9d94f6d985bf680874ea2c8902b819d383ef011290ee75b824994a15cb4bf509e137ec05ce98fd17f5d416d8c7f9d8b5"; }
{ locale = "hu"; arch = "linux-i686"; sha512 = "7454371f38c9c58fb7c3f4b278898fd8963162e718d0208cb0536d28621849337e1550abc95b3eacd4b244ffd074595744433ed1454c4964e709252c12dcc48d"; }
{ locale = "hu"; arch = "linux-x86_64"; sha512 = "3641018778dd4d27ea47393c8529272ede548fa1a8fa055ec686bd444fef1b3599f5a5a43c51ebd40a7e71f72e3105bb5c51ad0c55824ead48b4d627b76cab95"; }
{ locale = "hy-AM"; arch = "linux-i686"; sha512 = "44c12b5f7a364b6968742a23641472c4ced9ae0f0da1c6d8b2f7e2f5c1b1f9f68574bdc268fdb80c2236b58ac9a2e65eb9c5de69622b4ff837a3f3d223cf599d"; }
{ locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "36c4a325bc850011805665a23191ff2577d012fb6610c8665c79b7576ba381b8017f96fafd3e6f5975cdaed1c608204bc42963d618163c73f8df2d07f8d60183"; }
{ locale = "id"; arch = "linux-i686"; sha512 = "a57d8c4d0ec83ff986ba9e0d41fdf883910d68a70ef47f5f6c88fa375b5f2d7c4811c8d9c9405b96c1ea5661be9daa26aac929a4a5a3727e7b34ba1baa14c716"; }
{ locale = "id"; arch = "linux-x86_64"; sha512 = "9e742f9afe17eb4837d8fdfc963c3dcffd270fdab5d44f63ed8feb01596bf1c7ed153ad2877ffff62e67eafdddd304172a9da04a50f20b4f63050da5a50c60cf"; }
{ locale = "is"; arch = "linux-i686"; sha512 = "a6911ac57b9ff4775713ca3e2e0046578a4cac3e5704ff22c078df38f0df39203684732f576cc309c5aeb1912ab88ce8dea4b48860e7f659abac1ed29db6e37a"; }
{ locale = "is"; arch = "linux-x86_64"; sha512 = "9a914a3662c5b3f32800a0b75ea0f2dc5c7d4a8ae8284e2f4dc8a0cceb3fab5c6ff49e5b73fa351705754e3febf4a100f638d1e17d6d9b2b5c2ecdee1e343d23"; }
{ locale = "it"; arch = "linux-i686"; sha512 = "88d38d5f614e218fd6b11a033b6b09a4801a4f2b3cb75cb3f4402189f741bbcb4070ce5e34358b796fdc8912ca886f6e793aaaec960e11cec0e5dd812e136ea9"; }
{ locale = "it"; arch = "linux-x86_64"; sha512 = "ac57b1bb5a13c150c8ceab677a4f58156dc01e5f6b53c07ce3333fdc27eb0b41b781b485490aa0bc7c25ec84d20a10f92fa961b7aa8a5e5a816d95bcce60463f"; }
{ locale = "ja"; arch = "linux-i686"; sha512 = "1ec20b0069c6397219da16c650de6eda4d7f5b8a552152473929cd45cc7039cbf8a114199057499ac8471746ac43437e3acc8bbf4601afd12174926c4f8be4d9"; }
{ locale = "ja"; arch = "linux-x86_64"; sha512 = "6d5b2fab683f3b7c2f2fc885670ae37ff3e326a6b78df27aaf44996d39ab5a2bce3c69a61e7e01ffa488e37563f8df2961c1f24d916cec371a04f4058444f547"; }
{ locale = "ko"; arch = "linux-i686"; sha512 = "7d580958ce1d876d9de4aac6262a8caa3e8c3b36f9e5b9262ce90a1d3ca58611bad4acf633802bd1e83e7ce4a20488f5b9f8ecc8747a325fd7ca451a3461b491"; }
{ locale = "ko"; arch = "linux-x86_64"; sha512 = "d47061f406703e89c38b0547ffabe8ad5ebfc1139ddd381b57bc7ccf53897f2dd5d57bc0df0e017a31ecfdf5a65b546a095fea8d3950ae8ace5bbeb1cd8cc29b"; }
{ locale = "lt"; arch = "linux-i686"; sha512 = "ed76ca4c087c40f0d08ede83d652a00754a6abec26d17c3c7294ee3c77d39d8cb90613535817d81358876a11f11cc79fa9ae024c81d37a5e82496630003383d5"; }
{ locale = "lt"; arch = "linux-x86_64"; sha512 = "07a028860cf5fdf633cbecbde1f44706be95d27ed96c9c71103fe2b3342a9129807755605b30b720d146568145f3ae3d4ff624b88ed9f5df004f1ce9732ffcfb"; }
{ locale = "nb-NO"; arch = "linux-i686"; sha512 = "268e74b8be4229e28858a0a7bd76186b28cfde52fa70baf599bd0ec5da2a20c70647b32d3f4e3c58934dab873ebaa6b5dcf4762a9aed7d8710f14809bb154325"; }
{ locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "687925509d18fab5830071e60670de0850522153a76d560d96c5d482ddb3e0bf1416f10a816e151f2ee7d2f2ef09bb2b86d23d65b1348ea62bfca700e0d09be3"; }
{ locale = "nl"; arch = "linux-i686"; sha512 = "4e395c48adb2fed27824dc763360f135c2ad787ff7cd6258b50055cd9ae44c92dcab2de458270fcd18b365817218889fe363205253f781dbcbd337800d727c76"; }
{ locale = "nl"; arch = "linux-x86_64"; sha512 = "8fdd6ed769f239abce3ad7dce2c86c1a29fe4c7c13c2018f4225b23e7a23da37fa8661273eade4ebafec1d7989d922f40075805966e306e19764d78b54d48b72"; }
{ locale = "nn-NO"; arch = "linux-i686"; sha512 = "4d71dbbecce1f3865d56510c20b7d27feabaf4ca2f98b1942c729b72e084ef3a90d6e96d43a77143a33c31dbe71a978fdca550905469f04fcb01a3c0edb82f62"; }
{ locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ddd787da7709c09dafa91bb979931d0d48b93c93d7937f3717e9d7a39b718be4f7acb4766f908e7065b7ef791c105c2b79ffa54f5faee2d040a63687d5cf2ee1"; }
{ locale = "pa-IN"; arch = "linux-i686"; sha512 = "6720b2608293b0eb5638f3e25779bf9ce0ffcf86b8cc82c2d5136d96f9139d208ff5e7d6d3c1a95f1cad8d1d782935633da766ab77141d086f821bb23dff1e0f"; }
{ locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "3f89c3f02dfbc90e6f4e6d3b4f4c42654137cfe813be4ac65f88a469af90d25b2d0cc298ea5014d01ef10ff789e71afd723ab66916fd67daab4e2bf9cf40c904"; }
{ locale = "pl"; arch = "linux-i686"; sha512 = "01e6168dd32d5e03574fa79614cb5acdd9eb61639f6ad13e90e890314315b53a7cb98434ff39e71a261fc5d1c6483a5ba9792cc3f0cf013eef766d6d4a792eac"; }
{ locale = "pl"; arch = "linux-x86_64"; sha512 = "7e4a33bfe95a204cba81a6c8e849a121754ee6a0e52b54d571af2806cb139230a7b2e8fd7a336c0ab262da5a8e61ba6ec89bb9b4481aa23cf45a2955beb86713"; }
{ locale = "pt-BR"; arch = "linux-i686"; sha512 = "f4b4ac433e491808d2078b0d1289dae2904ac7e00bdbd9dd60d6b3a92fadac09a9c794c708b3fa75e6c03c15ba0c5ebfe1db51aee191237f4fc7a2420052dcfc"; }
{ locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "9429227039305cc49303878a24d77e34ddcade34da293879ac8112375c06644ecdd3651c899c14b2c821684967851557858040433f40a455370dd6da53e197fe"; }
{ locale = "pt-PT"; arch = "linux-i686"; sha512 = "48f0a0844eb8773ce0af33acf39483a47f5801810115f5424898fc7750f7b53dde5145152a61a82967ff0186876851d65e5a6352476ee27731780d17a2436a71"; }
{ locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "f835bd03c3b0f548bd451044232be5a2a267bb8e3fa2cdefb792f85012ede6bb3d9561ccfa8d62046337ce9cf4c7700e9b12468cd4f7d60406a7ff9f1f691f79"; }
{ locale = "rm"; arch = "linux-i686"; sha512 = "523c68231e9d435dbdcb923a30a30b5b24496e6889168d5351d5bad19bb0a33d8ce744b65450ab2884ec34690cdc27f81e03614dbe7996735edde0ff47afadc4"; }
{ locale = "rm"; arch = "linux-x86_64"; sha512 = "cb6438f3fdf5d6486b170acc779c5f9930099c36a914fdf58649f85552eb92d13637290a160ad7c4b9384aa102f5e8cbea7eaf5017c8eccc4331d6ce80de4e5b"; }
{ locale = "ro"; arch = "linux-i686"; sha512 = "3e7064e268e5539eba92ec30a3a17fbfc4bc958fe40ad96bc1140c6c8e4b2427b94ce1e51c1e41623c0c439c1881107a9b47493f6f92905b64194ec336b62a77"; }
{ locale = "ro"; arch = "linux-x86_64"; sha512 = "5b9f1d7e6ddeb878ea440d1761212df3060815d2a12ae4bd9516b111b8bfc1f432a73243c97d106de0ebc0184a873d5b331b979f42c74c156f5c0b6bd8ade711"; }
{ locale = "ru"; arch = "linux-i686"; sha512 = "e6044379ca3214e84103ce9fe71bec73d943b16534f1eba374d6f9f1a019d40731424d49e9dc54f2e4731677288373e23645073dfa8a092675f94860ea41835b"; }
{ locale = "ru"; arch = "linux-x86_64"; sha512 = "3eafca9f2d67b22e1e12435145825cfb71631fc24e53f556a6e903d81671092e25a1efabf92eee3455d24a2669cb7a17a28dea94932a65ac02ddd9a2971d5806"; }
{ locale = "si"; arch = "linux-i686"; sha512 = "ad52b55de7bb04b3907df881ceb9c8a21ca227bbf52316b1bf2e0b20bdcab4049cf1291d054ab7f8ff40678359bff9b7ae90394409fdf11c74cd7165be0f02d6"; }
{ locale = "si"; arch = "linux-x86_64"; sha512 = "0670fca36e7a83d203693f2e554a64455a24f638a4d72f2f1c7ede8b6e20e4b3dc1234d4525b07a305f8b74d11e676f5dbcd4303ec859d4096a1367d758be6a4"; }
{ locale = "sk"; arch = "linux-i686"; sha512 = "99cdde9e68a878ff6ad00531a738b5cf8fa82342e7287ecf9ed57815bb9e9e599021b068c2ec128cc527c9f1ff21abcaeb8f694a34dd8661fc19610df30231fc"; }
{ locale = "sk"; arch = "linux-x86_64"; sha512 = "6fe5511d7bb8a44a6cb1a91837f96636a57d8c9c180213ad785e254c30db1c26d854681f1bde120c64a9171f371649a42b23f8bb5a44ebe0fc2834c9013b05ea"; }
{ locale = "sl"; arch = "linux-i686"; sha512 = "3774102fce53a1f7f680b1105372c50c8bdf5bfd90dc752a4eae21fadb7fe8e55e16a1bf3f5a625fb14e432a6ce2f3f5afd11f770a2d05a093af9b2962f7d57e"; }
{ locale = "sl"; arch = "linux-x86_64"; sha512 = "c181d6505c8b7702cb361e0eab902fa7fa6afabeaa5391419a54909f865063c1695f65e22134cfd4ae0f17b224a540edd82c359f325469cb989f5116d901a674"; }
{ locale = "sq"; arch = "linux-i686"; sha512 = "cdf379fd3459828a5d3b397f5ab5680426163519b5ac3107673714792d39cfa811c57f7e796f0fdba439a372ffaee12f4dca335ca31f4c64fb7030e0b334ff8b"; }
{ locale = "sq"; arch = "linux-x86_64"; sha512 = "e4d9e888bbcdc2ef729dc0d0eee0a84e0fdd8b7983f43146b8f0c0cf674bcdd0e74f34e8d172e83e38dc6c0736729ad7386bb1c21309d4dd5d665eaa334185cf"; }
{ locale = "sr"; arch = "linux-i686"; sha512 = "7f9b792229152f204722a58e8db073f464393d3871c84c7c1b38eddc39551e08aaf3dd537438baa9f802b42305ddb79aa903cbd9a8da9823af202ff784f26df2"; }
{ locale = "sr"; arch = "linux-x86_64"; sha512 = "0d318caf92c8efaf9af26e245c34f6eb133dbacc50fce93dfaa38c099d7bf3e84c2f37f38bbdcc24220525a18707c0790041230c8533b602c72e222bd6ad8c81"; }
{ locale = "sv-SE"; arch = "linux-i686"; sha512 = "5b1b22d1df530ce164df04d537081378a56ab574a83ed4e489d01aa590ced55132d1f9d79eb93f397063a781ee96d55e732c5d19061bdb9d048238de0a6fdc3a"; }
{ locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "860b8f4a3d6ef9173bb74285a2c8e1a5163b64c153372f7945de87811e9e108b7e9bc45c412af65fc4678aa3d037a647673e1f8ffd13dac01312c2fddbbff9bd"; }
{ locale = "ta-LK"; arch = "linux-i686"; sha512 = "3655a5902ab96979bd63631ed03da20378117968b3543f397ef1ed276784cda3dc07e296b9cc0b394f5d3d7781ff5011fcf0f52d4f1937a835f9aa10700fd301"; }
{ locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "e7552e32fbeebcd183f30ecbe5f24aeac7c331be03e46ed953a62395a6ea2b1d417ac1cf7f1b2983fdfface7dc5a74fd0e2cce365248a581adde0ed3ea16ee90"; }
{ locale = "tr"; arch = "linux-i686"; sha512 = "c853f1fead6155ffc1af4b9630907e68d1253baed19a8a957b7a5d977e45ca9d095e41bb2a1aea5cbde92d7680b4242915586d4cd7cc6b97350ae8c3ab2f4a82"; }
{ locale = "tr"; arch = "linux-x86_64"; sha512 = "84db95b4af21962210a5975b41736e73ed6f0d773717664043fcc80133c21dfede2c8a4522c5c8aaa3452f7bb9802f6de589eeec6d4408f7a90b132431e22a13"; }
{ locale = "uk"; arch = "linux-i686"; sha512 = "6feead54fd7a40888dd57d187fdfd8dd0863b34135af1aa2baaed72bbc0ee3ba6322f182679b8f025068ee98872d5e5429636f19643f2373fd9b377218d568a6"; }
{ locale = "uk"; arch = "linux-x86_64"; sha512 = "705075b18ba24d01c35f42ae1ca5cc570971290717a0b134083d694514553b5932228abaa22e606605737007522d4436fb77827810b506d9fe037b0de5c10b6e"; }
{ locale = "vi"; arch = "linux-i686"; sha512 = "e45dbee20425ee413eca5d2985fb507be89e6d0b49c7b73109a6bba79d4f58c6630efa83334bb280963fc9a20a0de1bfa0103a562f0fefb67c513380a2e80f0e"; }
{ locale = "vi"; arch = "linux-x86_64"; sha512 = "b66e350c022fe14043482fa1112aa43508924e1e34044900416a8063a284c1df30bcb36a3694db161fced1f0e8bb26064cb4d088a862c477ba6991af75882798"; }
{ locale = "zh-CN"; arch = "linux-i686"; sha512 = "c16d4336e251b690452a483349429dde336101e5224445584311b5b7e68723e30e58a734839902e87c34c473e84f9f4b7d3c0b2e4d0c1e5da0b2a23e7dedcda8"; }
{ locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "5184083066f18dfc22735e25a551f6a68f8f2f1363c77f562912275c6364326386ccf435388bb4626f74b31243072fe9af3be0c023400ecd73736375272024ee"; }
{ locale = "zh-TW"; arch = "linux-i686"; sha512 = "19d9ac5f5f1343343ea32b53c4fd5f56f77148bcae210f2f1aebc7d63dd7db75a7bf63a68a90c8d19e5a8ea2c3b7ce87ae893ad5e58a3e0c35f1207b1ef0c912"; }
{ locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "d571188f33f526cb04af913486eb37ba7ba1597db0145958de8158857a47c1f5a42fe97d6c0891620fdeade4fd691f1a9e875c134398c85a9007eed1f5f55bef"; }
];
}

View file

@ -90,6 +90,7 @@ stdenv.mkDerivation rec {
'';
enableParallelBuilding = true;
requiredSystemFeatures = [ "big-parallel" ];
buildPhase = "../mozilla/mach build";

View file

@ -32,7 +32,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
*/
{ lib, lndir, makeWrapper, stdenv }: self:
{ lib, lndir, makeWrapper, runCommand, stdenv }: self:
with lib; let inherit (self) emacs; in
@ -49,67 +49,69 @@ stdenv.mkDerivation {
name = (appendToName "with-packages" emacs).name;
nativeBuildInputs = [ emacs lndir makeWrapper ];
inherit emacs explicitRequires;
phases = [ "installPhase" ];
installPhase = ''
readonly SHARE="share/emacs-with-packages"
mkdir -p "$out/bin"
mkdir -p "$out/$SHARE/bin"
mkdir -p "$out/$SHARE/site-lisp"
# Store all paths we want to add to emacs here, so that we only need to add
# one path to the load lists
deps = runCommand "emacs-packages-deps"
{ inherit explicitRequires lndir emacs; }
''
mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp
local requires
for pkg in $explicitRequires; do
findInputs $pkg requires propagated-user-env-packages
done
# requires now holds all requested packages and their transitive dependencies
local requires
for pkg in $explicitRequires; do
findInputs $pkg requires propagated-user-env-packages
done
# requires now holds all requested packages and their transitive dependencies
siteStart="$out/$SHARE/site-lisp/site-start.el"
linkPath() {
local pkg=$1
local origin_path=$2
local dest_path=$3
# Begin the new site-start.el by loading the original, which sets some
# NixOS-specific paths. Paths are searched in the reverse of the order
# they are specified in, so user and system profile paths are searched last.
cat >"$siteStart" <<EOF
# Add the path to the search path list, but only if it exists
if [[ -d "$pkg/$origin_path" ]]; then
$lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path"
fi
}
linkEmacsPackage() {
linkPath "$1" "bin" "bin"
linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
}
for pkg in $requires; do
linkEmacsPackage $pkg
done
siteStart="$out/share/emacs/site-lisp/site-start.el"
# A dependency may have brought the original siteStart, delete it and
# create our own
# Begin the new site-start.el by loading the original, which sets some
# NixOS-specific paths. Paths are searched in the reverse of the order
# they are specified in, so user and system profile paths are searched last.
rm -f $siteStart
cat >"$siteStart" <<EOF
(load-file "$emacs/share/emacs/site-lisp/site-start.el")
(add-to-list 'load-path "$out/$SHARE/site-lisp")
(add-to-list 'exec-path "$out/$SHARE/bin")
(add-to-list 'load-path "$out/share/emacs/site-lisp")
(add-to-list 'exec-path "$out/bin")
EOF
linkPath() {
local pkg=$1
local origin_path=$2
local dest_path=$3
# Byte-compiling improves start-up time only slightly, but costs nothing.
$emacs/bin/emacs --batch -f batch-byte-compile "$siteStart"
'';
# Add the path to the search path list, but only if it exists
if [[ -d "$pkg/$origin_path" ]]; then
lndir -silent "$pkg/$origin_path" "$out/$dest_path"
fi
}
# Add a package's paths to site-start.el
linkEmacsPackage() {
linkPath "$1" "bin" "$SHARE/bin"
linkPath "$1" "share/emacs/site-lisp" "$SHARE/site-lisp"
}
# First, link all the explicitly-required packages.
for pkg in $explicitRequires; do
linkEmacsPackage $pkg
done
# Next, link all the dependencies.
for pkg in $requires; do
linkEmacsPackage $pkg
done
# Byte-compiling improves start-up time only slightly, but costs nothing.
emacs --batch -f batch-byte-compile "$siteStart"
phases = [ "installPhase" ];
installPhase = ''
mkdir -p "$out/bin"
# Wrap emacs and friends so they find our site-start.el before the original.
for prog in $emacs/bin/*; do # */
local progname=$(basename "$prog")
rm -f "$out/bin/$progname"
makeWrapper "$prog" "$out/bin/$progname" \
--suffix EMACSLOADPATH ":" "$out/$SHARE/site-lisp:"
--suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:"
done
mkdir -p $out/share

View file

@ -2,17 +2,19 @@
stdenv.mkDerivation rec {
name = "man-pages-${version}";
version = "4.05";
version = "4.06";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "03d6aqgvhcsyciwdhl50h9bwn53iivvd7rbnh8als2ia9jwm2026";
sha256 = "0vv056k9yyf05dqal9m2pq3pv9c8lnp7i5rjxvcnic6aq7vyrafb";
};
# keep developer docs separately (man2 and man3)
outputs = [ "out" "docdev" ];
makeFlags = [ "MANDIR=$(out)/share/man" ];
postFixup = ''moveToOutput share/man/man2 "$docdev" '';
postFixup = ''
moveToOutput share/man/man2 "$docdev"
'';
meta = with stdenv.lib; {
description = "Linux development manual pages";

View file

@ -2,22 +2,22 @@
stdenv.mkDerivation rec {
name = "ats2-${version}";
version = "0.2.4";
version = "0.2.6";
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
sha256 = "0dx3r2vxmarj3aqm0xlcmls1h08pll9y9k4820df41awyrwmfvcy";
sha256 = "0hfaw8mrxrmb9kdbz5sp4nfjsmncmq6zqwm1n2x2p6arn0za6y9i";
};
buildInputs = [ gmp ];
setupHook = ./setup-hook.sh;
meta = {
meta = with stdenv.lib; {
description = "Functional programming language with dependent types";
homepage = "http://www.ats-lang.org";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ttuegel ];
};
}

View file

@ -7,12 +7,12 @@ let
in
stdenv.mkDerivation rec {
version = "8.0.0.20160421";
version = "8.0.1";
name = "ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/8.0.1-rc4/${name}-src.tar.xz";
sha256 = "183p1ilk8rlndi1vmg2vmlx00s18q3j31kin85qpbvicsxb8j1j1";
url = "https://downloads.haskell.org/~ghc/8.0.1/${name}-src.tar.xz";
sha256 = "0riyry246a6km4mw1q9iiw6p75ww2f8s81i34g151zwwdygk7qpf";
};
patches = [

View file

@ -165,8 +165,10 @@ let result = stdenv.mkDerivation rec {
EOF
# Oracle Java Mission Control needs to know where libgtk-x11 and related is
wrapProgram "$out/bin/jmc" \
--suffix-each LD_LIBRARY_PATH ':' "${rpath}" \
if test -n "$installjdk"; then
wrapProgram "$out/bin/jmc" \
--suffix-each LD_LIBRARY_PATH ':' "${rpath}"
fi
'';
inherit installjdk pluginSupport;

View file

@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "91";
patchVersion = "92";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256_i686 = "0lndni81vfpz2l6zb8zsshaavk0483q5jc8yzj4fdjv6wnshbkay";
sha256_x86_64 = "0lkm3fz1vdi69f34sysavvh3abx603j1frc9hxvr08pwvmm536vg";
sha256_i686 = "095j2hh2xas05jajy4qdj9hxq3k460x4m12rcaxkaxw754imj0vj";
sha256_x86_64 = "11wrqd3qbkhimbw9n4g9i0635pjhhnijwxyid7lvjv26kdgg58vr";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
version = "2.4.5";
version = "2.4.6";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
sha256 = "1ajcrma18z0zr7h69bg4v2brxnxa4ljc9a55pk4q92vi3ypyks47";
sha256 = "0s474wy7db7j1pans5ks986b52bdmn40l29zl6xl44y23fsvagwv";
};
buildInputs = [ unzip makeWrapper ];

View file

@ -302,8 +302,8 @@ in {
};
php70 = generic {
version = "7.0.5";
sha256 = "1s8xnnxwq5big2rnbp3w7zw7wh5d5ra9p2q9bxwylds5wrzsy29c";
version = "7.0.6";
sha256 = "1dr9cglqvw3n1ln1fmkmp16lmwz2dd2n2akl3s68ap4nm69g3p8l";
};
}

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
, openglSupport ? false, mesa_noglu ? null
, openglSupport ? false, mesa ? null
, alsaSupport ? true, alsaLib ? null
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
, pulseaudioSupport ? true, libpulseaudio ? null
@ -10,7 +10,7 @@
# PulseAudio.
assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (mesa_noglu != null && x11Support);
assert openglSupport -> (mesa != null && x11Support);
assert x11Support -> (xlibsWrapper != null && libXrandr != null);
assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> libpulseaudio != null;
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
optionals x11Support [ xlibsWrapper libXrandr ] ++
optional alsaSupport alsaLib ++
optional stdenv.isLinux libcap ++
optional openglSupport mesa_noglu ++
optional openglSupport mesa ++
optional pulseaudioSupport libpulseaudio ++
optional stdenv.isDarwin Cocoa;

View file

@ -1,17 +1,16 @@
{ stdenv, fetchurl, unzip, cmake, boost, zlib }:
{ stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }:
let
major = "3";
minor = "1";
revision = "1";
version = "${major}.${minor}.${revision}";
version = "3.2";
in
stdenv.mkDerivation {
name = "assimp-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/assimp/assimp-${major}.${minor}/assimp-${version}_no_test_models.zip";
sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s";
src = fetchFromGitHub{
owner = "assimp";
repo = "assimp";
rev = "v${version}";
sha256 = "09fsksbq9a8gykwmw6gaicwh2ladrln1jc1xc5yk7w6x180cbb1x";
};
buildInputs = [ unzip cmake boost zlib ];

View file

@ -5,6 +5,7 @@
, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
, rasterizerSupport ? false # Internal rasterizer
, largeTilesSupport ? false # Use larger tiles in the rasterizer
, libiconv
}:
assert encaSupport -> enca != null;
@ -38,7 +39,8 @@ stdenv.mkDerivation rec {
buildInputs = [ freetype fribidi ]
++ optional encaSupport enca
++ optional fontconfigSupport fontconfig
++ optional harfbuzzSupport harfbuzz;
++ optional harfbuzzSupport harfbuzz
++ optional stdenv.isDarwin libiconv;
meta = {
description = "Portable ASS/SSA subtitle renderer";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libfilezilla-${version}";
version = "0.5.0";
version = "0.5.1";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
sha256 = "07f5hk5izqgqjadrwy608gi0w3scm3zvpsv63j7bgfqk67qilslc";
sha256 = "1ydpk6i5vjd78i0531cxlkjvlmvvrsfyc7hv7wx81ws3rkp5hnsq";
};
meta = with stdenv.lib; {

View file

@ -15,11 +15,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-1.2.3";
name = "libinput-1.3.0";
src = fetchurl {
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
sha256 = "1wp937sn2dzqhrbl2bhapqb0pvybc80z8ynw7yfkm5ycl39skch9";
sha256 = "1sn1s1bz06fa49izqkqf519sjclsvhf42i6slzx1w5hx4vxpb2lr";
};
outputs = [ "dev" "out" ];

View file

@ -0,0 +1,30 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
name = "xgboost-${version}";
version = "2016-05-14";
# needs submodules
src = fetchgit {
url = "https://github.com/dmlc/xgboost";
rev = "9c26566eb09733423f821f139938ff4105c3775d";
sha256 = "0nmhgl70mnc2igkfppdw2in66zdczzsqxrlsb4bknrglpp3axnm1";
};
enableParallelBuilding = true;
installPhase = ''
mkdir -p $out
cp -r include $out
install -Dm755 lib/libxgboost.so $out/lib/libxgboost.so
install -Dm755 xgboost $out/bin/xgboost
'';
meta = with stdenv.lib; {
description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
homepage = "https://github.com/dmlc/xgboost";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
}

View file

@ -1,13 +1,13 @@
{ stdenv, fetchzip, ocaml, findlib, qtest }:
let version = "2.4.0"; in
let version = "2.5.2"; in
stdenv.mkDerivation {
name = "ocaml-batteries-${version}";
src = fetchzip {
url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
sha256 = "0bxp5d05w1igwh9vcgvhd8sd6swf2ddsjphw0mkakdck9afnimmd";
sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07";
};
buildInputs = [ ocaml findlib qtest ];

View file

@ -15,11 +15,11 @@ let
};
in stdenv.mkDerivation rec {
name = "python-${python.version}-bootstrapped-pip-${version}";
version = "8.1.1";
version = "8.1.2";
src = fetchurl {
url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl";
sha256 = "0p62v87lm595kwmxrnqxc81dr7h6maaxj1y28b00bf9ag11c7fa4";
url = "https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-${version}-py2.py3-none-any.whl";
sha256 = "18cjrd66mn4a0gwa99zzs89lrb0xn4xmajdzya6zqd7v16cdsr34";
};
unpackPhase = ''

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, python, exiv2, scons, boost }:
let version = "0.3.0"; in
let version = "0.3.2"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "pyexiv2-${version}";
src = fetchurl {
url = "http://launchpad.net/pyexiv2/0.3.x/0.3/+download/pyexiv2-0.3.0.tar.bz2";
sha256 = "1y7r2z0ja166cx8fmykq7gaif02drknqqbxaf18fhv9nmgz4jrg9";
url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2";
sha256 = "09r1ga6kj5cnmrldpkqzvdhh7xi7aad9g4fbcr1gawgsd9y13g0a";
};
buildPhase = ''

View file

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ python pkgconfig glib gobjectIntrospection ];
propagatedBuildInputs = [ pycairo cairo ];
passthru.pythonPath = [];
meta = {
homepage = http://live.gnome.org/PyGObject;
description = "Python bindings for Glib";

View file

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
buildInputs = [ python pkgconfig glib ];
passthru.pythonPath = [];
# in a "normal" setup, pygobject and pygtk are installed into the
# same site-packages: we need a pth file for both. pygtk.py would be
# used to select a specific version, in our setup it should have no

View file

@ -40,6 +40,8 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
passthru.pythonPath = [];
meta = {
description = "Python bindings for Qt";
license = "GPL";

View file

@ -53,4 +53,6 @@ in stdenv.mkDerivation {
'';
enableParallelBuilding = true;
passthru.pythonPath = [];
}

View file

@ -16,6 +16,8 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el
buildInputs = [ python ];
passthru.pythonPath = [];
meta = with stdenv.lib; {
description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/";

View file

@ -19,6 +19,8 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el
buildInputs = [ python ];
passthru.pythonPath = [];
meta = with stdenv.lib; {
description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/";

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "6.17";
version = "6.18";
name = "checkstyle-${version}";
src = fetchurl {
url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
sha256 = "1cfcjz1fg9ilqqaqlbzd5n7nsx1kzy6sabjp92b9d8mwy15bn5ql";
sha256 = "1ls2q6zvnfsvb3b5d9s1p6c5gcdnwm2mlj2dm8jr4nifkymi6q5m";
};
installPhase = ''

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
version = "1.653";
version = "2.3";
src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
sha256 = "1z24vddr8v64g4x3s7qx5n30sjcm2xpz7mn23zlc0n8lhnmkzqs8";
sha256 = "0x59dbvh6y25ki5jy51djbfbhf8g2j3yd9f3n66f7bkdfw8p78g1";
};
meta = with stdenv.lib; {
description = "An extendable open source continuous integration server";

View file

@ -20,9 +20,14 @@ let ccache = stdenv.mkDerivation rec {
passthru = {
# A derivation that provides gcc and g++ commands, but that
# will end up calling ccache for the given cacheDir
links = extraConfig: (runCommand "ccache-links"
{ passthru.gcc = gcc; passthru.isGNU = true; }
''
links = extraConfig: stdenv.mkDerivation rec {
name = "ccache-links";
passthru = {
inherit gcc;
isGNU = true;
};
inherit (gcc.cc) lib;
buildCommand = ''
mkdir -p $out/bin
if [ -x "${gcc.cc}/bin/gcc" ]; then
cat > $out/bin/gcc << EOF
@ -48,7 +53,8 @@ let ccache = stdenv.mkDerivation rec {
for file in $(ls ${gcc.cc} | grep -vw bin); do
ln -s ${gcc.cc}/$file $out/$file
done
'');
'';
};
};
meta = with stdenv.lib; {

View file

@ -1,35 +1,53 @@
{ stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
{ stdenv, lib, go, gox, goPackages, fetchFromGitHub
, fetchgit, fetchhg, fetchbzr, fetchsvn }:
stdenv.mkDerivation rec {
name = "packer-0.8.6";
name = "packer-${version}";
version = "0.10.1";
src = import ./deps.nix {
inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
inherit stdenv lib go gox goPackages fetchgit fetchhg fetchbzr fetchsvn;
};
buildInputs = [ go gox ];
buildInputs = [ go gox goPackages.tools ];
configurePhase = ''
export GOPATH=$PWD/share/go
export XC_ARCH=$(go env GOARCH)
export XC_OS=$(go env GOOS)
mkdir $GOPATH/bin
cd $GOPATH/src/github.com/mitchellh/packer
# Don't fetch the deps
substituteInPlace "Makefile" --replace ': deps' ':'
# Avoid using git
sed \
-e "s|GITBRANCH:=.*||" \
-e "s|GITSHA:=.*|GITSHA=${src.rev}|" \
-i Makefile
sed \
-e "s|GIT_COMMIT=.*|GIT_COMMIT=${src.rev}|" \
-e "s|GIT_DIRTY=.*|GIT_DIRTY=|" \
-i "scripts/build.sh"
'';
buildPhase = ''
make generate releasebin
'';
installPhase = ''
export GOPATH=$src
XC_ARCH=$(go env GOARCH)
XC_OS=$(go env GOOS)
mkdir -p $out/bin
cd $src/src/github.com/mitchellh/packer
gox \
-os="''${XC_OS}" \
-arch="''${XC_ARCH}" \
-output "$out/bin/packer-{{.Dir}}" \
./...
mv $out/bin/packer{*packer*,}
mv bin/* $out/bin
'';
meta = with stdenv.lib; {
description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
homepage = "http://www.packer.io";
homepage = http://www.packer.io;
license = licenses.mpl20;
maintainers = with maintainers; [ cstrahan ];
maintainers = with maintainers; [ cstrahan zimbatm ];
platforms = platforms.unix;
};
}

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,37 @@
{ stdenv, fetchurl, python3, python3Packages }:
stdenv.mkDerivation {
name = "postiats-utilities-2.0.1";
src = fetchurl {
url = "https://github.com/Hibou57/PostiATS-Utilities/archive/v2.0.1.tar.gz";
sha256 = "12jlzqigmaa9m37x0nq5v3gq8v61m73i5kzdnsm06chf0przpaix";
};
meta = with stdenv.lib; {
homepage = "https://github.com/Hibou57/PostiATS-Utilities";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.ttuegel ];
};
buildInputs = [ python3 python3Packages.wrapPython ];
phases = "unpackPhase patchPhase installPhase";
postPatch = ''
for f in pats-* postiats/*.py; do
sed -i "$f" -e "1 s,python3,python,"
done
'';
installPhase = ''
libdir="$out/lib/${python3.libPrefix}/site-packages"
mkdir -p "$libdir"
cp -r postiats "$libdir"
mkdir -p "$out/bin"
install pats-* "$out/bin"
wrapPythonPrograms
'';
}

View file

@ -0,0 +1,34 @@
{ stdenv, fetchgit, rustPlatform, makeWrapper }:
with rustPlatform;
buildRustPackage rec {
name = "racerd-${version}";
version = "0.1.1";
src = fetchgit {
url = "git://github.com/jwilm/racerd.git";
rev = "dcbb7885e84eb5e2fbb2072e185701ad1abbd93a";
sha256 = "18c6a1x0li5yxif9qqnsnyas6if0m6srbqh0h0nywgx0lm8bpgly";
};
doCheck = false;
depsSha256 = "0ca0lc8mm8kczll5m03n5fwsr0540c2xbfi4nn9ksn0s4sap50yn";
buildInputs = [ makeWrapper ];
RUST_SRC_PATH = ''${rustc.src}/src'';
installPhase = ''
mkdir -p $out/bin
cp -p target/release/racerd $out/bin/
wrapProgram $out/bin/racerd --set RUST_SRC_PATH "$RUST_SRC_PATH"
'';
meta = with stdenv.lib; {
description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs";
homepage = "https://github.com/jwilm/racerd";
license = licenses.asl20;
platforms = platforms.all;
};
}

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis
SDL SDL_net expat libjpeg libpng
SDL SDL_net expat libjpeg libpng fftwSinglePrec
];
nativeBuildInputs = [ pkgconfig ];

View file

@ -1,26 +0,0 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, librsvg }:
stdenv.mkDerivation rec {
version = "0.1.1";
name = "sails-${version}";
src = fetchurl {
url = "https://github.com/kragniz/sails/archive/v${version}.tar.gz";
sha256 = "0k55ib6cb78filgq3yrdib69qrzsny0209bq6h0v1yigry0sa62v";
};
buildInputs = [ cmake pkgconfig gtk3 librsvg ];
NIX_CFLAGS_COMPILE = "-Wno-error";
meta = with stdenv.lib; {
description = "Simulator for autonomous sailing boats";
homepage = https://github.com/kragniz/sails;
license = licenses.gpl3;
longDescription = ''
Sails is a simulator designed to test the AI of autonomous sailing
robots. It emulates the basic physics of sailing a small single sail
boat'';
maintainers = with maintainers; [ kragniz ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,42 @@
{ stdenv, fetchFromGitHub, pkgconfig, jansson }:
let
libsailing = fetchFromGitHub {
owner = "sails-simulator";
repo = "libsailing";
rev = "c24cddb717f81cd432868b8d41e04486c0a440fd";
sha256 = "0mna0c9n8lvfdf4y1iigjy3dlks70hq6jik52zkik2yxvkqv949f";
};
in
stdenv.mkDerivation rec {
version = "0.2.0";
name = "sailsd-${version}";
src = fetchFromGitHub {
owner = "sails-simulator";
repo = "sailsd";
rev = "${version}";
sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb";
};
buildInputs = [ pkgconfig jansson libsailing ];
INSTALL_PATH = "$(out)";
postUnpack = ''
rmdir $sourceRoot/libsailing
cp -r ${libsailing} $sourceRoot/libsailing
chmod 755 -R $sourceRoot/libsailing
'';
meta = with stdenv.lib; {
description = "Simulator daemon for autonomous sailing boats";
homepage = https://github.com/sails-simulator/sailsd;
license = licenses.gpl3;
longDescription = ''
Sails is a simulator designed to test the AI of autonomous sailing
robots. It emulates the basic physics of sailing a small single sail
boat'';
maintainers = with maintainers; [ kragniz ];
platforms = platforms.all;
};
}

View file

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "xlockmore-5.46";
name = "xlockmore-5.47";
src = fetchurl {
url = "http://www.tux.org/~bagleyd/xlock/${name}.tar.xz";
sha256 = "1ps0dmnh912x8mwns94y2607xk90rjxrjn5s1pkmmpjg5h9bxcrj";
sha256 = "138d79b8zc2hambbr9fnxp3fhihlcljgqns04zf0kv2f53pavqwl";
};
# Optionally, it can use GTK+.

View file

@ -1,7 +1,7 @@
# TODO check that no license information gets lost
{ fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages_38, zip
, vim_configurable, vimPlugins, xkb_switch, git
, vim_configurable, vimPlugins, xkb_switch, git, racerdRust
, Cocoa ? null
}:
@ -953,6 +953,10 @@ rec {
llvmPackages_38.llvm
] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
propogatedBuildInputs = [
racerdRust
];
buildPhase = ''
patchShebangs .
substituteInPlace plugin/youcompleteme.vim \

View file

@ -4,6 +4,10 @@
llvmPackages.llvm
] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
propogatedBuildInputs = [
racerdRust
];
buildPhase = ''
patchShebangs .
substituteInPlace plugin/youcompleteme.vim \

View file

@ -1,4 +1,3 @@
# What is LIBGL_DRIVERS_PATH used for?
# TODO gentoo removes some tools because there are xorg sources (?)
source $stdenv/setup
@ -6,15 +5,10 @@ set -x
die(){ echo $@; exit 1; }
mkdir fglrx # custom unpack:
cd fglrx
unzip $src
cd ..
run_file=$(echo fglrx/amd-driver-installer-*)
run_file=fglrx-$build/amd-driver-installer-$build-x86.x86_64.run
sh $run_file --extract .
eval "$patchPhase1"
case "$system" in
x86_64-linux)
arch=x86_64
@ -33,9 +27,9 @@ esac
if test -z "$libsOnly"; then
kernelVersion=$(cd ${kernel}/lib/modules && ls)
kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/build)
linuxsources=$(echo ${kernel}/lib/modules/$kernelVersion/source)
kernelVersion=$(cd ${kernelDir}/lib/modules && ls)
kernelBuild=$(echo ${kernelDir}/lib/modules/$kernelVersion/build)
linuxsources=$(echo ${kernelDir}/lib/modules/$kernelVersion/source)
# note: maybe the .config file should be used to determine this ?
# current kbuild infrastructure allows using CONFIG_* defines
@ -231,7 +225,7 @@ fi
fglrx_dri.so \
libaticaldd.so
do
patchelf --set-rpath $gcc/$lib_arch/ $out/lib/$pelib2
patchelf --set-rpath $glibcDir/lib/:$libStdCxx/lib/ $out/lib/$pelib2
done
}
@ -245,12 +239,12 @@ if test -z "$libsOnly"; then
eval "$patchPhaseSamples"
( # build and install fgl_glxgears
cd fgl_glxgears;
cd fgl_glxgears;
gcc -DGL_ARB_texture_multisample=1 -g \
-I$mesa/include \
-I$out/include \
-L$mesa/lib -lGL -lGLU -lX11 -lm \
-o $out/bin/fgl_glxgears -Wall fgl_glxgears.c
-o $out/bin/fgl_glxgears -Wall fgl_glxgears.c
)
true || ( # build and install
@ -267,12 +261,12 @@ if test -z "$libsOnly"; then
-I${xf86vidmodeproto}/include \
-I$out/X11R6/include \
-L$out/lib \
-Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c
-Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c
)
{
# patch and copy statically linked qt libs used by amdcccle
patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 &&
patchelf --set-interpreter $(echo $glibcDir/lib/ld-linux*.so.2) $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 &&
patchelf --set-rpath $gcc/$lib_arch/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 &&
patchelf --set-rpath $gcc/$lib_arch/:$out/share/ati/:$libXrender/lib/:$libSM/lib/:$libICE/lib/:$libfontconfig/lib/:$libfreetype/lib/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtGui.so.4 &&
mkdir -p $out/share/ati
@ -285,7 +279,7 @@ if test -z "$libsOnly"; then
patchelf --shrink-rpath $BIN/amdcccle
for prog in $BIN/*; do
cp -f $prog $out/bin &&
patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog) &&
patchelf --set-interpreter $(echo $glibcDir/lib/ld-linux*.so.2) $out/bin/$(basename $prog) &&
wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib/:$gcc/lib/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/:$libfontconfig/lib/:$libfreetype/lib/:$LD_LIBRARY_PATH
done
}

View file

@ -11,10 +11,6 @@ assert (!libsOnly) -> kernel != null;
with stdenv.lib;
let
version = "15.7";
in
# This derivation requires a maximum of gcc49, Linux kernel 4.1 and xorg.xserver 1.17
# and will not build or run using versions newer
@ -31,11 +27,14 @@ in
# http://wiki.cchtml.com/index.php/Main_Page
#
# /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so
# This is done in the builder script.
stdenv.mkDerivation {
stdenv.mkDerivation rec {
version = "15.12";
pname = "ati-drivers";
build = "15.302";
linuxonly =
if stdenv.system == "i686-linux" then
@ -44,7 +43,7 @@ stdenv.mkDerivation {
true
else throw "ati-drivers are Linux only. Sorry. The build was stopped.";
name = "ati-drivers-${version}" + (optionalString (!libsOnly) "-${kernel.version}");
name = pname + "-" + version + (optionalString (!libsOnly) "-${kernelDir.version}");
builder = ./builder.sh;
gcc = stdenv.cc.cc;
@ -57,15 +56,16 @@ stdenv.mkDerivation {
libICE = xorg.libICE;
libfreetype = freetype;
libfontconfig = fontconfig;
libStdCxx = stdenv.cc.cc.lib;
src = fetchurl {
url = "http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86_64.zip";
sha256 = "ffde64203f49d9288eaa25f4d744187b6f4f14a87a444bab6a001d822b327a9d";
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
url =
"https://www2.ati.com/drivers/linux/radeon-crimson-15.12-15.302-151217a-297685e.zip";
sha256 = "0n0ynqmjkjp5dl5q07as7ps3rlyyn63hq4mlwgd7c7v82ky2skvh";
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux+x86_64";
};
patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
patchPhase1 = "patch -p1 < ${./kernel-api-fixes.patch}";
buildInputs =
[ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
@ -81,28 +81,28 @@ stdenv.mkDerivation {
inherit libsOnly;
kernel = if libsOnly then null else kernel.dev;
kernelDir = if libsOnly then null else kernel.dev;
inherit glibc /* glibc only used for setting interpreter */;
# glibc only used for setting the binaries interpreter
glibcDir = glibc.out;
# outputs TODO: probably many fixes are needed;
# this in particular would be much better by lib.makeLibraryPath
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
[ "${xorg.libXrandr.out}/lib/"
"${xorg.libXrender.out}/lib/"
"${xorg.libXext.out}/lib/"
"${xorg.libX11.out}/lib/"
"${xorg.libXinerama.out}/lib/"
"${xorg.libSM.out}/lib/"
"${xorg.libICE.out}/lib/"
"${stdenv.cc.cc.out}/lib/"
LD_LIBRARY_PATH = makeLibraryPath
[ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE
mesa
fontconfig
freetype
stdenv.cc.cc
];
# without this some applications like blender don't start, but they start
# with nvidia. This causes them to be symlinked to $out/lib so that they
# appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH
extraDRIlibs = [ xorg.libXrandr xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM xorg.libICE ];
extraDRIlibs = [ xorg.libXrandr.out xorg.libXrender.out xorg.libXext.out
xorg.libX11.out xorg.libXinerama.out xorg.libSM.out
xorg.libICE.out ];
inherit mesa; # only required to build the examples
@ -119,6 +119,4 @@ stdenv.mkDerivation {
priority = 4;
};
}

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.5.3";
version = "4.5.4";
extraMeta.branch = "4.5";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1z0265cxv63br147vridmcqbz3cx3q3finy40hwljwv1r2lggid4";
sha256 = "1s0mhhxx2sw93a9cin5mvjl82ah93a4sa2lfkvs6ay73mw3ifp2p";
};
kernelPatches = args.kernelPatches;

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.5.3";
version = "4.5.4";
extraMeta.branch = "4.5";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1z0265cxv63br147vridmcqbz3cx3q3finy40hwljwv1r2lggid4";
sha256 = "1s0mhhxx2sw93a9cin5mvjl82ah93a4sa2lfkvs6ay73mw3ifp2p";
};
kernelPatches = args.kernelPatches;

View file

@ -22,8 +22,11 @@ let
assert kversion == kernel.version;
{ name = "grsecurity-${grversion}-${kversion}";
inherit grversion kernel patches kversion revision;
# When updating versions/hashes, ALWAYS use the official version; we use
# this mirror only because upstream removes sources files immediately upon
# releasing a new version ...
patch = fetchurl {
url = "https://grsecurity.net/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch";
url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/test/grsecurity-${grversion}-${kversion}-${revision}.patch";
inherit sha256;
};
features.grsecurity = true;
@ -105,9 +108,9 @@ rec {
grsecurity_4_5 = grsecPatch
{ kernel = pkgs.grsecurity_base_linux_4_5;
patches = [ grsecurity_fix_path_4_5 ];
kversion = "4.5.3";
revision = "201605080858";
sha256 = "0m6x45n9ayn4022r64dx7lxfxg3s632hlrr0260ac9gc0abyk06j";
kversion = "4.5.4";
revision = "201605131918";
sha256 = "0f5s8lj6zc4jp2cpxm7r891px3dmb6m3ximfigwq809yydg5aimv";
};
grsecurity_latest = grsecurity_4_5;

View file

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
, kexectools, libmicrohttpd, linuxHeaders, libseccomp, iptables
, kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
, iptables
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
, enableKDbus ? false
}:

View file

@ -1,39 +0,0 @@
source "$stdenv/setup" || exit 1
# Unpack
unpackPhase
cd "$sourceRoot/upstream/tarballs"
tar xzvf *
cd tcp_wrappers_7.6
# Patch
patchPhase
for patch in debian/patches/*
do
echo "applying Debian patch \`$(basename $patch)'..."
patch --batch -p1 < $patch
done
substituteInPlace "Makefile" --replace \
"REAL_DAEMON_DIR=/usr/sbin" "REAL_DAEMON_DIR=$out/sbin" \
--replace "/tmp" '$$TMPDIR'
echo "building..."
make REAL_DAEMON_DIR="$out/sbin" linux
# Install
mkdir -p "$out/sbin"
cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin"
mkdir -p "$out/lib"
cp -v shared/lib*.so* "$out/lib"
mkdir -p "$out/include"
cp -v *.h "$out/include"
mkdir -p "$out/man"
for i in 3 5 8;
do
mkdir -p "$out/man/man$i"
cp *.$i "$out/man/man$i" ;
done

View file

@ -15,7 +15,40 @@ stdenv.mkDerivation {
})
];
builder = ./builder.sh;
prePatch = ''
cd upstream/tarballs
tar xzvf *
cd tcp_wrappers_7.6
'';
postPatch = ''
for patch in debian/patches/*; do
echo "applying Debian patch \`$(basename $patch)'..."
patch --batch -p1 < $patch
done
'';
buildPhase = ''
make REAL_DAEMON_DIR="$out/sbin" linux
'';
installPhase = ''
mkdir -p "$out/sbin"
cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin"
mkdir -p "$out/lib"
cp -v shared/lib*.so* "$out/lib"
mkdir -p "$out/include"
cp -v *.h "$out/include"
mkdir -p "$out/man"
for i in 3 5 8;
do
mkdir -p "$out/man/man$i"
cp *.$i "$out/man/man$i" ;
done
'';
meta = {
description = "TCP Wrappers, a network logger, also known as TCPD or LOG_TCP";
@ -32,7 +65,7 @@ stdenv.mkDerivation {
'';
homepage = ftp://ftp.porcupine.org/pub/security/index.html;
license = "BSD-style";
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -0,0 +1,26 @@
diff --git a/configure b/configure
index 6779cc3..4275520 100755
--- a/configure
+++ b/configure
@@ -15707,21 +15707,6 @@ $as_echo "not found" >&6; }
*-hp-hpux*)
DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto"
;;
- *-apple-darwin*)
- #
- # Apple's ld seaches for serially for dynamic
- # then static libraries. This means you can't
- # use -L to override dynamic system libraries
- # with static ones when linking. Instead
- # we specify a absolute path.
- #
- if test -f "$use_openssl/lib/libcrypto.dylib"
- then
- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
- else
- DST_OPENSSL_LIBS="$use_openssl/lib/libcrypto.a"
- fi
- ;;
*)
DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
;;

View file

@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
sha256 = "0mmhzi4483mkak47wj255a36g3v0yilxwfwlbckr1hssinri5m7q";
};
patches = [ ./remove-mkdir-var.patch ];
outputs = [ "dev" "bin" "out" "man" ];
patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
buildInputs = [ openssl libtool perl libxml2 ];
@ -30,6 +33,11 @@ stdenv.mkDerivation rec {
"--without-python"
];
postInstall = ''
moveToOutput bin/bind9-config $dev
moveToOutput bin/isc-config.sh $dev
'';
meta = {
homepage = "http://www.isc.org/software/bind";
description = "Domain name server";

View file

@ -0,0 +1,40 @@
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index f354cfb..2aa0cc5 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -71,7 +71,9 @@ EXTERN const char * ns_g_version INIT(VERSION);
EXTERN const char * ns_g_product INIT(PRODUCT);
EXTERN const char * ns_g_description INIT(DESCRIPTION);
EXTERN const char * ns_g_srcid INIT(SRCID);
+#if 0
EXTERN const char * ns_g_configargs INIT(CONFIGARGS);
+#endif
EXTERN const char * ns_g_builder INIT(BUILDER);
EXTERN in_port_t ns_g_port INIT(0);
EXTERN isc_dscp_t ns_g_dscp INIT(-1);
diff --git a/bin/named/main.c b/bin/named/main.c
index 556db54..edab41d 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -636,8 +636,10 @@ parse_command_line(int argc, char *argv[]) {
(*ns_g_description != '\0') ? " " : "",
ns_g_description, ns_g_srcid);
printf("running on %s\n", ns_os_uname());
+#if 0
printf("built by %s with %s\n",
ns_g_builder, ns_g_configargs);
+#endif
#ifdef __clang__
printf("compiled by CLANG %s\n", __VERSION__);
#else
@@ -998,8 +1000,10 @@ setup(void) {
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "running on %s", ns_os_uname());
+#if 0
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "built with %s", ns_g_configargs);
+#endif
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE,

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, jre }:
let version = "5.3"; in
let version = "6.0"; in
stdenv.mkDerivation rec {
name = "subsonic-${version}";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz";
sha256 = "11ylg89r9dbxyas7jcyij6fpm84dixskdkahb3hdi4ig0wqwswfw";
sha256 = "0aw7lz7bkhqvjj3lkk68n2aqr5l84s91cgifg2379w2j7dgd056z";
};
inherit jre;

View file

@ -1,21 +1,20 @@
{ lib, goPackages, fetchurl, fetchFromGitHub }:
goPackages.buildGoPackage rec {
version = "2.6.0";
version = "3.0.1";
name = "grafana-v${version}";
goPackagePath = "github.com/grafana/grafana";
subPackages = [ "./" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "160jarvmfvrzpk8agbl44761qz4rw273d59jg6kzd0ghls03wipr";
sha256 = "1zykgf8xq7m040d4yljcbz23gh8ppaqnxj50ncj1cjyi5k88i3i9";
};
srcStatic = fetchurl {
url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}.linux-x64.tar.gz";
sha256 = "1i4aw5jvamgqfaanxlh3l83sn8xx10wpihciihvf7s3846s623ab";
url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-.linux-x64.tar.gz";
sha256 = "14wq2cbf4djnwbbyfbhnwmwqpfh5g4yp1dckg5zzf2109ymkjrqd";
};
preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
@ -29,7 +28,7 @@ goPackages.buildGoPackage rec {
description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB";
license = licenses.asl20;
homepage = http://grafana.org/;
maintainers = with maintainers; [ offline ];
maintainers = with maintainers; [ offline fpletz ];
platforms = platforms.linux;
};
}

View file

@ -23,19 +23,20 @@
, icuSupport ? true, icu
, clientSupport ? true, mpd_clientlib
, opusSupport ? true, libopus
, soundcloudSupport ? true, yajl
}:
let
opt = stdenv.lib.optional;
mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
major = "0.19";
minor = "12";
minor = "15";
in stdenv.mkDerivation rec {
name = "mpd-${major}.${minor}";
src = fetchurl {
url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
sha256 = "0xg8w5vn6xd0yfw55qj6wnav7v14nmr00s3d4w5gixbjrv3ycvvv";
sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c";
};
buildInputs = [ pkgconfig glib boost ]
@ -65,7 +66,8 @@ in stdenv.mkDerivation rec {
++ opt gmeSupport game-music-emu
++ opt icuSupport icu
++ opt clientSupport mpd_clientlib
++ opt opusSupport libopus;
++ opt opusSupport libopus
++ opt soundcloudSupport yajl;
configureFlags =
[ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
@ -94,6 +96,7 @@ in stdenv.mkDerivation rec {
(mkFlag gmeSupport "gme")
(mkFlag clientSupport "libmpdclient")
(mkFlag opusSupport "opus")
(mkFlag soundcloudSupport "soundcloud")
"--enable-debug"
]
++ opt stdenv.isLinux

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sslh-${version}";
version = "1.17";
version = "1.18";
src = fetchurl {
url = "https://github.com/yrutschle/sslh/archive/v${version}.tar.gz";
sha256 = "1l8ssm47f0hwiisgfj0ca5j2z8j98pir4pf2acrj1798fnzw6mxm";
url = "http://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz";
sha256 = "1ba5fxd2s6jh9n3wbp2a782q7syc4m6qvfrggnscdbywfyrsa08n";
};
postPatch = "patchShebangs *.sh";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)";
license = licenses.gpl2Plus;
homepage = http://www.rutschle.net/tech/sslh.shtml;
maintainers = [ maintainers.koral ];
maintainers = with maintainers; [ koral fpletz ];
platforms = platforms.all;
};
}

View file

@ -1,20 +1,5 @@
{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger,
configFile ? "/etc/rsnapshot.conf" }:
{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger }:
let patch = writeText "rsnapshot-config.patch" ''
--- rsnapshot-program.pl 2013-10-05 20:31:08.715991442 +0200
+++ rsnapshot-program.pl 2013-10-05 20:31:42.496193633 +0200
@@ -383,7 +383,7 @@
}
# set global variable
- $config_file = $default_config_file;
+ $config_file = '${configFile}';
}
# accepts no args
'';
in
stdenv.mkDerivation rec {
name = "rsnapshot-1.4.1";
@ -25,10 +10,12 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [perl openssh rsync logger];
configureFlags = [ "--sysconfdir=/etc --prefix=/" ];
makeFlags = [ "DESTDIR=$(out)" ];
patchPhase = ''
substituteInPlace "Makefile.in" --replace \
"/usr/bin/pod2man" "${perl}/bin/pod2man"
patch -p0 <${patch}
'';
meta = with stdenv.lib; {

View file

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "zstd-${version}";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
sha256 = "1r1l4pak289bjnkak2yrw65yhxfvqcmdsh10c1k0hi0wm7k3qcbw";
sha256 = "19pp2sjrv8qwzfc9c1mf0idhkicjhr41fsc9d1fyncc34f9riavl";
rev = "v${version}";
repo = "zstd";
owner = "Cyan4973";

View file

@ -2,14 +2,14 @@
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
}:
let version = "4.5.2"; in
let version = "4.5.3"; in
stdenv.mkDerivation rec {
name = "btrfs-progs-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "09qjz3idz8y3rlrb0sxshc1bnpmrr4v9lqg5aimp09i9ywa8kyxf";
sha256 = "1lzbw275xgv69v4z8hmsf3jnip38116hxhkpv0madk8wv049drz6";
};
buildInputs = [

View file

@ -1,21 +1,22 @@
{ stdenv, fetchurl }:
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "dosfstools-${version}";
version = "4.0";
version = "3.0.28";
src = fetchurl {
sha256 = "1bvxbv1w6vhbx0nx7ygp700wq5k2hjv0hm7w0kz1x7amaf4p6dwh";
url = "https://github.com/dosfstools/dosfstools/releases/download/v${version}/${name}.tar.xz";
src = fetchFromGitHub {
owner = "dosfstools";
repo = "dosfstools";
rev = "v${version}";
sha256 = "0lqirpxcn8ml0anq8aqmaljfsji9h6mdzz0jrs0yqqfhgg90bkg2";
};
configureFlags = [ "--enable-compat-symlinks" ];
makeFlags = "PREFIX=$(out)";
meta = with stdenv.lib; {
meta = {
description = "Utilities for creating and checking FAT and VFAT file systems";
repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git;
homepage = http://www.daniel-baumann.ch/software/dosfstools/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, libgcrypt
, pkgconfig, glib, linuxHeaders, sqlite }:
{ stdenv, fetchFromGitHub, libgcrypt
, pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }:
stdenv.mkDerivation rec {
name = "duperemove-${version}";
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
meta = {
meta = with stdenv.lib; {
description = "A simple tool for finding duplicated extents and submitting them for deduplication";
homepage = https://github.com/markfasheh/duperemove;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ bluescreen303 thoughtpolice ];
platforms = lib.platforms.all;
license = licenses.gpl2;
maintainers = with maintainers; [ bluescreen303 thoughtpolice ];
platforms = platforms.linux;
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "f2fs-tools-${version}";
version = "1.5.0";
version = "1.6.1";
src = fetchurl {
url = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${name}.tar.gz";
sha256 = "1pdgl78xkagxlmavy6x118wjzz8yvl8n08fc1m6wah9bf93qlhdf";
sha256 = "1fkq1iqr5kxs6ihhbmjk4i19q395azcl60mnslqwfrlbrd3p40gm";
};
nativeBuildInputs = [ autoreconfHook ];

View file

@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
buildInputs = [ lvm2 libaio readline ];
buildInputs = [ lvm2 libaio readline gzip ];
preBuild =
''
makeFlagsArray=(GZIP="${gzip}/bin/gzip -9 -c" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib)
makeFlagsArray=(GZIP="-9" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib)
substituteInPlace multipath/Makefile --replace /etc $out/etc
substituteInPlace kpartx/Makefile --replace /etc $out/etc

View file

@ -1,27 +1,23 @@
{ stdenv, fetchFromGitHub
, cmake
, fuse }:
stdenv.mkDerivation rec {
name = "securefs-${version}";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
sha256 = "1n9kgrvc600lfclrk8cj2zy8md1brqhs8kvzdwfxgxavdh0wakkc";
sha256 = "1drksvwfgfpgcn2mzb65ljqlg2kgn6nald9fnz60hliw8f1wiqvh";
rev = version;
repo = "securefs";
owner = "netheril96";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ fuse ];
enableParallelBuilding = true;
doCheck = false; # tests require the fuse module to be loaded
installPhase = ''
install -D -m0755 {.,$out/bin}/securefs
'';
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Transparent encryption filesystem";

View file

@ -68,7 +68,8 @@ let
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
# Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
# and {Open,Free}BSD.
doCheck = stdenv ? glibc;
# With non-standard storeDir: https://github.com/NixOS/nix/issues/512
doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store";
# Saw random failures like help2man: can't get '--help' info from
# man/sha512sum.td/sha512sum.

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "2.0.0";
version = "2.0.1";
name = "graylog-${version}";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "0qn2rf2aarfr34387fiv34rmav20c66b4zs9bkm8gpvj0laxrqh2";
sha256 = "0i9nng361qnnws7jnk5m91nj5ifg4h78yayahsfjn37665rsrdga";
};
dontBuild = true;

View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
name = "parallel-20160322";
name = "parallel-20160422";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "020vfcwapla6b4c9pr5ik7kg47fswszdds2mr52kc907xi4zcc34";
sha256 = "0hmcr5lcg3701rh804fch6qp6pcrmgwcaigbm4c14dk6293qynh6";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "zsh-navigation-tools-${version}";
version = "2.1.6";
version = "2.1.12";
src = fetchFromGitHub {
owner = "psprint";
repo = "zsh-navigation-tools";
rev = "v${version}";
sha256 = "1q0232hg64walnxcfdb5d1qjfg0pdr1781k7q5rwwm8ka0xalzcd";
sha256 = "0ih7k6sbhjskwxhqq0hm0j3ydzrzi56wzb656clgnc6zihsjr2m2";
};
dontBuild = true;

View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, gettext }:
{ stdenv, fetchurl, gettext, autoreconfHook }:
stdenv.mkDerivation rec {
name = "axel-${version}";
version = "2.6";
version = "2.7";
src = fetchurl {
url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
sha256 = "17j6kp4askr1q5459ak71m1bm0qa3dyqbxvi5ifh2bjvjlp516mx";
sha256 = "174x4bp4gcwmpf94hdsdxlpk7q7ldgpsicry7x2pa9zw4yz86wl0";
};
buildInputs = [ gettext ];
buildInputs = [ gettext autoreconfHook ];
installFlags = [ "ETCDIR=$(out)/etc" ];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
stdenv.mkDerivation rec {
name = "radvd-2.12";
name = "radvd-2.13";
src = fetchurl {
url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
sha256 = "0yvlzzdxz2h5fm7grbf1xfs8008bzcdjpficm2cf52g771rffw5h";
sha256 = "1lzgg6zpizcldb78n5gkykjnpr7sqm4r1xy9bm4ig0chbrink4ka";
};
buildInputs = [ pkgconfig libdaemon bison flex check ];

View file

@ -1,12 +1,12 @@
{stdenv, fetchurl, lzo, openssl, zlib}:
stdenv.mkDerivation rec {
version = "1.0.26";
version = "1.0.28";
name = "tinc-${version}";
src = fetchurl {
url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
sha256 = "08ds8s32cjslms1q227ihd6jz35583v378ij4pknfa5xngfijhrb";
sha256 = "0i5kx3hza359nclyhb60kxlzqyx0phmg175350hww28g6scjcl0b";
};
buildInputs = [ lzo openssl zlib ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "dpkg-${version}";
version = "1.18.6";
version = "1.18.7";
src = fetchurl {
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
sha256 = "18nywp0gs8bnywll9qrcg8g1fli4p5xd6h8sazhsmrxgp8iw62yx";
sha256 = "0yxqv7b5a1qhhas9dzxr5gwj22jqxisrwzvrmwms8l67dlx6vqxc";
};
postPatch = ''

View file

@ -18,7 +18,7 @@ let mkPrefetchScript = tool: src: deps:
wrapArgs="$wrapArgs --prefix PATH : $dep/bin"
done
wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin"
wrapArgs="$wrapArgs --prefix PATH : ${nix}/bin" # For nix-hash
wrapArgs="$wrapArgs --prefix PATH : ${nix.out}/bin" # For nix-hash
wrapArgs="$wrapArgs --set HOME : /homeless-shelter"
wrapProgram $out/bin/$name $wrapArgs
'';

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
stdenv.mkDerivation rec {
version = "1.4.20";
version = "1.4.23";
name = "ccid-${version}";
src = fetchurl {
url = "https://alioth.debian.org/frs/download.php/file/4140/ccid-1.4.20.tar.bz2";
sha256 = "1g0w4pv6q30d8lhs3kd6nywkhh34nhf9fbcbcvbxdvk3pdjvh320";
url = "https://alioth.debian.org/frs/download.php/file/4169/ccid-1.4.23.tar.bz2";
sha256 = "0s7c2g8idnnh19958aswaa2s51ncr2j7gqrkk5g95qpfnv7asdh8";
};
patchPhase = ''

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "p0f-${version}";
version = "3.08b";
version = "3.09b";
src = fetchurl {
url = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz";
sha256 = "1v4afs66qxk53h8vhfk5x17xvgj32qixwjvz4023gnx59gzag2fs";
sha256 = "0zqfq3gdnha29ckvlqmyp36c0jhj7f69bhqqx31yb6vkirinhfsl";
};
buildInputs = [ libpcap ];

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