nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-16.09' into staging-16.09

Browse Source
This commit is contained in:
Eelco Dolstra
2016-10-13 17:38:21 +02:00
parent 261665cc4b 23f8a2d797
commit 7cfc69fdbd
109 changed files with 7405 additions and 3868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/maintainers.nix
View File

@@ -89,6 +89,7 @@
codyopel = "Cody Opel <codyopel@gmail.com>";
colemickens = "Cole Mickens <cole.mickens@gmail.com>";
copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
corngood = "David McFarland <corngood@gmail.com>";
coroa = "Jonas Hörsch <jonas@chaoflow.net>";
couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
cransom = "Casey Ransom <cransom@hubns.net>";
@@ -348,6 +349,7 @@
roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>";
roconnor = "Russell O'Connor <roconnor@theorem.ca>";
romildo = "José Romildo Malaquias <malaquias@gmail.com>";
ronny = "Ronny Pfannschmidt <nixos@ronnypfannschmidt.de>";
rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>";

64
nixos/doc/manual/release-notes/rl-1609.xml
View File

@@ -49,7 +49,62 @@ has the following highlights: </para>
<para>The following new services were added since the last release:</para>
<itemizedlist>
<listitem><para><literal>(this will get automatically generated at release time)</literal></para></listitem>
<listitem><para><literal>hardware/video/amdgpu.nix</literal></para></listitem>
<listitem><para><literal>hardware/video/displaylink.nix</literal></para></listitem>
<listitem><para><literal>programs/info.nix</literal></para></listitem>
<listitem><para><literal>programs/mosh.nix</literal></para></listitem>
<listitem><para><literal>programs/spacefm.nix</literal></para></listitem>
<listitem><para><literal>programs/tmux.nix</literal></para></listitem>
<listitem><para><literal>programs/xonsh.nix</literal></para></listitem>
<listitem><para><literal>security/chromium-suid-sandbox.nix</literal></para></listitem>
<listitem><para><literal>security/hidepid.nix</literal></para></listitem>
<listitem><para><literal>services/audio/squeezelite.nix</literal></para></listitem>
<listitem><para><literal>services/backup/znapzend.nix</literal></para></listitem>
<listitem><para><literal>services/continuous-integration/buildkite-agent.nix</literal></para></listitem>
<listitem><para><literal>services/continuous-integration/hydra/default.nix</literal></para></listitem>
<listitem><para><literal>services/continuous-integration/gocd-agent/default.nix</literal></para></listitem>
<listitem><para><literal>services/continuous-integration/gocd-server/default.nix</literal></para></listitem>
<listitem><para><literal>services/development/hoogle.nix</literal></para></listitem>
<listitem><para><literal>services/editors/emacs.nix</literal></para></listitem>
<listitem><para><literal>services/games/factorio.nix</literal></para></listitem>
<listitem><para><literal>services/games/terraria.nix</literal></para></listitem>
<listitem><para><literal>services/logging/awstats.nix</literal></para></listitem>
<listitem><para><literal>services/logging/graylog.nix</literal></para></listitem>
<listitem><para><literal>services/misc/emby.nix</literal></para></listitem>
<listitem><para><literal>services/misc/mantisbt.nix</literal></para></listitem>
<listitem><para><literal>services/misc/nzbget.nix</literal></para></listitem>
<listitem><para><literal>services/misc/packagekit.nix</literal></para></listitem>
<listitem><para><literal>services/misc/sonarr.nix</literal></para></listitem>
<listitem><para><literal>services/misc/spice-vdagentd.nix</literal></para></listitem>
<listitem><para><literal>services/misc/taskserver</literal></para></listitem>
<listitem><para><literal>services/network-filesystems/tahoe.nix</literal></para></listitem>
<listitem><para><literal>services/networking/coturn.nix</literal></para></listitem>
<listitem><para><literal>services/networking/ferm.nix</literal></para></listitem>
<listitem><para><literal>services/networking/gdomap.nix</literal></para></listitem>
<listitem><para><literal>services/networking/libreswan.nix</literal></para></listitem>
<listitem><para><literal>services/networking/logmein-hamachi.nix</literal></para></listitem>
<listitem><para><literal>services/networking/mfi.nix</literal></para></listitem>
<listitem><para><literal>services/networking/mjpg-streamer.nix</literal></para></listitem>
<listitem><para><literal>services/networking/mosquitto.nix</literal></para></listitem>
<listitem><para><literal>services/networking/nntp-proxy.nix</literal></para></listitem>
<listitem><para><literal>services/networking/offlineimap.nix</literal></para></listitem>
<listitem><para><literal>services/networking/pptpd.nix</literal></para></listitem>
<listitem><para><literal>services/networking/sniproxy.nix</literal></para></listitem>
<listitem><para><literal>services/networking/smokeping.nix</literal></para></listitem>
<listitem><para><literal>services/networking/toxvpn.nix</literal></para></listitem>
<listitem><para><literal>services/networking/xl2tpd.nix</literal></para></listitem>
<listitem><para><literal>services/networking/zerobin.nix</literal></para></listitem>
<listitem><para><literal>services/security/oauth2_proxy.nix</literal></para></listitem>
<listitem><para><literal>services/torrent/flexget.nix</literal></para></listitem>
<listitem><para><literal>services/web-apps/mattermost.nix</literal></para></listitem>
<listitem><para><literal>services/web-apps/tt-rss.nix</literal></para></listitem>
<listitem><para><literal>services/web-servers/caddy.nix</literal></para></listitem>
<listitem><para><literal>services/web-servers/lighttpd/inginious.nix</literal></para></listitem>
<listitem><para><literal>services/x11/compton.nix</literal></para></listitem>
<listitem><para><literal>services/x11/xbanish.nix</literal></para></listitem>
<listitem><para><literal>system/boot/loader/systemd-boot/systemd-boot.nix</literal></para></listitem>
<listitem><para><literal>system/boot/plymouth.nix</literal></para></listitem>
<listitem><para><literal>virtualisation/xe-guest-utilities.nix</literal></para></listitem>
</itemizedlist>
<para>When upgrading from a previous release, please be aware of the
@@ -108,6 +163,13 @@ following incompatible changes:</para>
</para>
</listitem>
<listitem>
<para>
Using packages compiled with older Wayland may yield an error "undefined reference to `wl_proxy_*`".
Please upgrade those packages and <link xlink:href="https://github.com/NixOS/nixpkgs/issues/16779">see bug report for more details.</link>
</para>
</listitem>
<listitem>
<para>Gitlab's maintainance script
<command>gitlab-runner</command> was removed and split up into the

6
nixos/lib/testing.nix
View File

@@ -181,9 +181,11 @@ rec {
eval $i2=/tmp/xchg/$_basename
${coreutils}/bin/ls -la $xchg
done
unset i i2 _basename xchg
export > $xchg/saved-env
unset i i2 _basename
export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env
unset xchg
export tests='${testScript}'
${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
''; # */

5
nixos/modules/config/timezone.nix
View File

@@ -37,14 +37,15 @@ in
environment.sessionVariables.TZDIR = "/etc/zoneinfo";
# This way services are restarted when tzdata changes.
systemd.globalEnvironment.TZDIR = tzdir;
environment.etc.localtime =
{ source = "${tzdir}/${config.time.timeZone}";
{ source = "/etc/zoneinfo/${config.time.timeZone}";
mode = "direct-symlink";
};
environment.etc.zoneinfo.source = "${pkgs.tzdata}/share/zoneinfo";
environment.etc.zoneinfo.source = tzdir;
};

56
nixos/modules/hardware/video/amdgpu-pro.nix Normal file
View File

@@ -0,0 +1,56 @@
# This module provides the proprietary AMDGPU-PRO drivers.
{ config, lib, pkgs, pkgs_i686, ... }:
with lib;
let
drivers = config.services.xserver.videoDrivers;
enabled = elem "amdgpu-pro" drivers;
package = config.boot.kernelPackages.amdgpu-pro;
package32 = pkgs_i686.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
opengl = config.hardware.opengl;
in
{
config = mkIf enabled {
services.xserver.drivers = singleton
{ name = "amdgpu"; modules = [ package ]; libPath = [ package ]; };
hardware.opengl.package = package;
hardware.opengl.package32 = package32;
boot.extraModulePackages = [ package ];
boot.blacklistedKernelModules = [ "radeon" ];
hardware.firmware = [ package ];
system.activationScripts.setup-amdgpu-pro = ''
mkdir -p /run/lib
ln -sfn ${package}/lib ${package.libCompatDir}
'' + optionalString opengl.driSupport32Bit ''
ln -sfn ${package32}/lib ${package32.libCompatDir}
'';
environment.etc = {
"amd/amdrc".source = package + "/etc/amd/amdrc";
"amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb";
"gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf";
"OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd";
"vulkan/icd.d/amd_icd64.json".source = package + "/etc/vulkan/icd.d/amd_icd64.json";
} // optionalAttrs opengl.driSupport32Bit {
"OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd";
"vulkan/icd.d/amd_icd32.json".source = package32 + "/etc/vulkan/icd.d/amd_icd32.json";
};
};
}

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

@@ -38,6 +38,7 @@
./hardware/opengl.nix
./hardware/pcmcia.nix
./hardware/video/amdgpu.nix
./hardware/video/amdgpu-pro.nix
./hardware/video/ati.nix
./hardware/video/bumblebee.nix
./hardware/video/displaylink.nix

1
nixos/modules/security/acme.nix
View File

@@ -283,6 +283,7 @@ in
timerConfig = {
OnCalendar = cfg.renewInterval;
Unit = "acme-${cert}.service";
Persistent = "yes";
};
})
);

6
nixos/modules/services/networking/kippo.nix
View File

@@ -54,7 +54,7 @@ rec {
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs.pythonPackages; [
python twisted_11 pycrypto pyasn1 ];
python pkgs.kippo.twisted pycrypto pyasn1 ];
environment.etc."kippo.cfg".text = ''
# Automatically generated by NixOS.
@@ -84,7 +84,7 @@ rec {
description = "Kippo Web Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted_11}/lib/python2.7/site-packages/:.";
environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.kippo.twisted}/lib/python2.7/site-packages/:.";
preStart = ''
if [ ! -d ${cfg.varPath}/ ] ; then
mkdir -p ${cfg.logPath}/tty
@@ -107,7 +107,7 @@ rec {
fi
'';
serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted_11}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
serviceConfig.PermissionsStartOnly = true;
serviceConfig.User = "kippo";
serviceConfig.Group = "kippo";

2
nixos/modules/services/x11/display-managers/sddm.nix
View File

@@ -14,7 +14,7 @@ let
xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh
${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@"
exec systemd-cat ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@"
'';
Xsetup = pkgs.writeScript "Xsetup" ''

4
nixos/modules/services/x11/xserver.nix
View File

@@ -529,6 +529,10 @@ in
Restart = "always";
RestartSec = "200ms";
SyslogIdentifier = "display-manager";
# Stop restarting if the display manager stops (crashes) 2 times
# in one minute. Starting X typically takes 3-4s.
StartLimitInterval = "30s";
StartLimitBurst = "3";
};
};

1
nixos/modules/system/activation/activation-script.nix
View File

@@ -145,6 +145,7 @@ in
${pkgs.e2fsprogs}/bin/chattr -f -i /var/empty || true
find /var/empty -mindepth 1 -delete
chmod 0555 /var/empty
chown root:root /var/empty
${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true
'';

52
nixos/modules/virtualisation/ec2-amis.nix
View File

@@ -1,4 +1,4 @@
{
let self = {
"14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470";
"14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c";
"14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e";
@@ -134,4 +134,52 @@
"16.03".us-west-2.hvm-s3 = "ami-925c9ff2";
"16.03".us-west-2.pv-ebs = "ami-5e61a23e";
"16.03".us-west-2.pv-s3 = "ami-734c8f13";
}
# 16.09.666.3738950
"16.09".ap-northeast-1.hvm-ebs = "ami-35578954";
"16.09".ap-northeast-1.hvm-s3 = "ami-d6528cb7";
"16.09".ap-northeast-1.pv-ebs = "ami-07548a66";
"16.09".ap-northeast-1.pv-s3 = "ami-f1548a90";
"16.09".ap-northeast-2.hvm-ebs = "ami-d48753ba";
"16.09".ap-northeast-2.hvm-s3 = "ami-4c865222";
"16.09".ap-northeast-2.pv-ebs = "ami-ca8551a4";
"16.09".ap-northeast-2.pv-s3 = "ami-9c8551f2";
"16.09".ap-south-1.hvm-ebs = "ami-922450fd";
"16.09".ap-south-1.hvm-s3 = "ami-6d3a4e02";
"16.09".ap-south-1.pv-ebs = "ami-4d394d22";
"16.09".ap-south-1.pv-s3 = "ami-17384c78";
"16.09".ap-southeast-1.hvm-ebs = "ami-f824809b";
"16.09".ap-southeast-1.hvm-s3 = "ami-f924809a";
"16.09".ap-southeast-1.pv-ebs = "ami-af2480cc";
"16.09".ap-southeast-1.pv-s3 = "ami-5826823b";
"16.09".ap-southeast-2.hvm-ebs = "ami-40fecd23";
"16.09".ap-southeast-2.hvm-s3 = "ami-48fecd2b";
"16.09".ap-southeast-2.pv-ebs = "ami-dffecdbc";
"16.09".ap-southeast-2.pv-s3 = "ami-e0fccf83";
"16.09".eu-central-1.hvm-ebs = "ami-1d8b7472";
"16.09".eu-central-1.hvm-s3 = "ami-1c8b7473";
"16.09".eu-central-1.pv-ebs = "ami-8c8d72e3";
"16.09".eu-central-1.pv-s3 = "ami-3488775b";
"16.09".eu-west-1.hvm-ebs = "ami-15662766";
"16.09".eu-west-1.hvm-s3 = "ami-476b2a34";
"16.09".eu-west-1.pv-ebs = "ami-876928f4";
"16.09".eu-west-1.pv-s3 = "ami-70682903";
"16.09".sa-east-1.hvm-ebs = "ami-27bc2e4b";
"16.09".sa-east-1.hvm-s3 = "ami-e4b92b88";
"16.09".sa-east-1.pv-ebs = "ami-4dbe2c21";
"16.09".sa-east-1.pv-s3 = "ami-77fc6e1b";
"16.09".us-east-1.hvm-ebs = "ami-93347684";
"16.09".us-east-1.hvm-s3 = "ami-5e347649";
"16.09".us-east-1.pv-ebs = "ami-b0387aa7";
"16.09".us-east-1.pv-s3 = "ami-51357746";
"16.09".us-west-1.hvm-ebs = "ami-06337a66";
"16.09".us-west-1.hvm-s3 = "ami-76307916";
"16.09".us-west-1.pv-ebs = "ami-fd327b9d";
"16.09".us-west-1.pv-s3 = "ami-cc347dac";
"16.09".us-west-2.hvm-ebs = "ami-49fe2729";
"16.09".us-west-2.hvm-s3 = "ami-93fc25f3";
"16.09".us-west-2.pv-ebs = "ami-14fe2774";
"16.09".us-west-2.pv-s3 = "ami-74f12814";
latest = self."16.09";
}; in self

42
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

@@ -16203,6 +16203,27 @@
license = lib.licenses.free;
};
}) {};
inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inherit-local";
version = "1.1";
src = fetchFromGitHub {
owner = "shlevy";
repo = "inherit-local";
rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063";
sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87";
name = "inherit-local";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/inherit-local";
license = lib.licenses.free;
};
}) {};
init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "init-loader";
@@ -20413,6 +20434,27 @@
license = lib.licenses.free;
};
}) {};
nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-buffer";
version = "1.2.2";
src = fetchFromGitHub {
owner = "shlevy";
repo = "nix-buffer";
rev = "eb28bf99c3562cfda07f312ca49e0b594f0ff81b";
sha256 = "148iyy8ma1n5a3biyal5rafxpp0zzn81nyy06jlzrkzjy44iyzwi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd";
name = "nix-buffer";
};
packageRequires = [ emacs f ];
meta = {
homepage = "https://melpa.org/#/nix-buffer";
license = lib.licenses.free;
};
}) {};
nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-mode";

39
pkgs/applications/misc/octoprint/default.nix
View File

@@ -1,6 +1,41 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
{ stdenv, fetchFromGitHub, pythonPackages, fetchurl }:
pythonPackages.buildPythonApplication rec {
let
tornado_4_0_1 = pythonPackages.buildPythonPackage rec {
name = "tornado-${version}";
version = "4.0.1";
propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
src = fetchurl {
url = "mirror://pypi/t/tornado/${name}.tar.gz";
sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df";
};
};
sockjs-tornado = pythonPackages.buildPythonPackage rec {
name = "sockjs-tornado-${version}";
version = "1.0.2";
src = fetchurl {
url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv";
};
# This is needed for compatibility with OctoPrint
propagatedBuildInputs = [ tornado_4_0_1 ];
meta = with stdenv.lib; {
description = "SockJS python server implementation on top of Tornado framework";
homepage = http://github.com/mrjoes/sockjs-tornado/;
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
};
in pythonPackages.buildPythonApplication rec {
name = "OctoPrint-${version}";
version = "1.2.15";

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "1wpcl6cgiv02s3zgxvgsmrws454g81lnvyfjmhhcdckkwyljcv5l";
sha256bin64 = "0snr5rd2r5jfjqhqwkxcw26j53fivmf60g3qfnp5xz5b6nlsab9g";
version = "54.0.2840.34";
sha256 = "1lix5wzcwf666vsdbdzz071rynswlxg5414k3nsrmlxwxhyh6qi4";
sha256bin64 = "02cv9vc1l2nlwa4a0lc7cj9c9czrwp1jd8d024bq16a5fvmhl01l";
version = "54.0.2840.50";
};
dev = {
sha256 = "1lbpj1wm35l2qf4fxfivd9drwwdrylv3knh8db889dyz5hrh3j5y";
sha256bin64 = "0rkvrrcr1j9662v00kf7x7qmdps1pd4hq818x7crkilczybd05pr";
version = "55.0.2868.3";
sha256 = "06kcymwi0wfir7w10g8viayk2h0b5a66dav76mlia4lm30p502kz";
sha256bin64 = "0mgamiffnnkaw8c68b5kyna84x7hlhrzmqfc36kzf434fmm8v5d6";
version = "55.0.2873.0";
};
stable = {
sha256 = "0qk0y457l91yzxradpinayzw3947s5s4axd75h968vrl0jan51vs";
sha256bin64 = "0sz4dfwxvkffcj4rrqh3vn2xxp2vvjzdjsy0s9wcvam01igmy261";
version = "53.0.2785.116";
sha256 = "1hyw0z7dsfaxyy8b4mvnfjy5yj0160hzz9m0wj3vn9zvkfvmhan5";
sha256bin64 = "0n0px7yi94gdxq7p6pjqfdz04bnh3mcvbaccjaglj6h5p0jc8abq";
version = "53.0.2785.143";
};
}

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@@ -70,11 +70,11 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "11.2.202.635";
version = "11.2.202.637";
src = fetchurl {
url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
sha256 = "0xlaf6152ksknigrv6fsasscyfnjkxml4nl22apiwzb34nrbzk3m";
sha256 = "0xp1pxhrnam4yi8wfwaifqx7m2im0zx2xv8xgbdm0llrzbkc57mh";
};
nativeBuildInputs = [ unzip ];
@@ -94,6 +94,8 @@ stdenv.mkDerivation rec {
dontStrip = true;
dontPatchELF = true;
preferLocalBuild = true;
outputs = [ "out" ] ++ lib.optional is-i686 "sa";
installPhase = ''

6
pkgs/applications/networking/dropbox/default.nix
View File

@@ -23,11 +23,11 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
version = "11.4.20";
version = "11.4.22";
sha256 =
{
"x86_64-linux" = "1mnjc00y1vs3c22hqf328idgsrrlq097kld67ab9q8d6l8r8qkr6";
"i686-linux" = "1s7m56if2wq34sc8aq46xnhrrnbhnsfi85jw0yp4dpcdwv6s38v5";
"x86_64-linux" = "1fpwknf8as2h6d8d11nb8i0q4ap5r6fvii919b3pj5d29jgfd25l";
"i686-linux" = "1dv60ijb93464js34vk3l8hm8a57zdpkzhrfkv2kp3v3172cqj8s";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =

4
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View File

@@ -4,7 +4,7 @@
let
version = "4.26.0.1657";
version = "4.27.0.1658";
rpath = stdenv.lib.makeLibraryPath [
xdg_utils
@@ -44,7 +44,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
sha256 = "1ififcy1lhm0g4x9sprwfxlg34pkarkypww5ywsf8hvbcdnj02gp";
sha256 = "1f0rgy5p9xcxfll6prir49vb7hjlnqx6xjaxlimhca4l30jvdsvn";
}
else
throw "HipChat is not supported on ${stdenv.system}";

12
pkgs/applications/networking/irc/irssi/otr/default.nix
View File

@@ -1,5 +1,11 @@
{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
{ stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
let
versionFix = fetchurl {
url = https://patch-diff.githubusercontent.com/raw/cryptodotis/irssi-otr/pull/60.patch;
sha256 = "18fk9nbzf3fvhvvvkrxv5l004hhimapqb6ra09m83268kbl4q3jy";
};
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "irssi-otr-${version}";
@@ -12,12 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg";
};
patchPhase = ''
prePatch = ''
sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am
sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac
sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am
'';
patches = [ versionFix ];
preConfigure = "sh ./bootstrap";
buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ];

48
pkgs/applications/networking/remote/remmina/default.nix
View File

@@ -1,9 +1,13 @@
{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper
, glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11
, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11
, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core
, openssl }:
let
version = "1.0.0";
version = "1.2.0-rcgit.15";
desktopItem = makeDesktopItem {
name = "remmina";
@@ -15,29 +19,45 @@ let
categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
};
# Latest release of remmina refers to thing that aren't yet in
# a FreeRDP release so we need to build one from git source
# See also https://github.com/FreeRDP/Remmina/pull/731
# Remove when FreeRDP release catches up with this commit
freerdp_git = stdenv.lib.overrideDerivation freerdp (args: {
name = "freerdp-git-2016-09-30";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = "dbb353db92e7a5cb0be3c73aa950fb1113e627ec";
sha256 = "1nhm4v6z9var9hasp4bkmhvlrksbdizx95swx19shizfc82s9g4y";
};
});
in
stdenv.mkDerivation {
name = "remmina-${version}";
src = fetchurl {
url = "https://github.com/downloads/FreeRDP/Remmina/Remmina-${version}.tar.gz";
sha256 = "7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "Remmina";
rev = "v${version}";
sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0";
};
buildInputs = [ cmake pkgconfig makeWrapper
glib gtk gettext libxkbfile libgnome_keyring libX11
freerdp libssh libgcrypt gnutls ];
glib gtk3 gettext libxkbfile libgnome_keyring libX11
freerdp_git libssh libgcrypt gnutls
pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret spice_protocol spice_gtk epoxy at_spi2_core
openssl ];
cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF";
patches = [ ./lgthread.patch ];
cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2";
postInstall = ''
mkdir -pv $out/share/applications
mkdir -pv $out/share/icons
cp ${desktopItem}/share/applications/* $out/share/applications
cp -r $out/share/remmina/icons/* $out/share/icons
wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
'';

16
pkgs/applications/networking/remote/remmina/lgthread.patch
View File

@@ -1,16 +0,0 @@
Fix [undefined reference to `g_thread_init'] as suggested by
http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html
diff -ru FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt FreeRDP-Remmina-356c033/remmina/CMakeLists.txt
--- FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt 2013-11-05 12:43:27.660276912 +0400
+++ FreeRDP-Remmina-356c033/remmina/CMakeLists.txt 2013-11-05 12:53:39.607018349 +0400
@@ -132,6 +132,8 @@
endif()
endif()
+set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgthread-2.0" )
+
add_subdirectory(po)
add_subdirectory(icons)
add_subdirectory(desktop)

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

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, go }:
stdenv.mkDerivation rec {
version = "0.14.5";
version = "0.14.7";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "172ca3xgc3dp9yiqm3fmq696615jnclgfg521sh5mk78na1r4mgz";
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "1mcn2vmv3hvp0ni9jxbjj3qp0l6ls07qmq33amhvjhpfafqzn279";
};
buildInputs = [ go ];

20
pkgs/applications/science/logic/coq/default.nix
View File

@@ -14,8 +14,8 @@ let
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
'' else "";
in
self =
stdenv.mkDerivation {
name = "coq-${version}";
@@ -62,6 +62,22 @@ stdenv.mkDerivation {
envHooks=(''${envHooks[@]} addCoqPath)
'';
passthru = {
emacsBufferSetup = pkgs: ''
; Propagate coq paths to children
(inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
(inherit-local-permanent coq-dependency-analyzer "${self}/bin/coqdep")
(inherit-local-permanent coq-compiler "${self}/bin/coqc")
; If the coq-library path was already set, re-set it based on our current coq
(when (fboundp 'get-coq-library-directory)
(inherit-local-permanent coq-library-directory (get-coq-library-directory))
(coq-prog-args))
; Pass proof-general's coq flags to flycheck command (pretty ugly, should probably be part of PG)
(inherit-local-permanent flycheck-command-wrapper-function (lambda (cmd)
(append (funcall (default-value 'flycheck-command-wrapper-function) cmd) (coq-coqtop-prog-args coq-load-path))))
'';
};
meta = with stdenv.lib; {
description = "Formal proof management system";
longDescription = ''
@@ -76,4 +92,4 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
platforms = platforms.unix;
};
}
}; in self

6
pkgs/applications/video/openshot-qt/default.nix
View File

@@ -8,13 +8,13 @@ let
in
stdenv.mkDerivation rec {
name = "openshot-qt-${version}";
version = "2.0.7";
version = "2.1.0";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "openshot-qt";
rev = "v${version}";
sha256 = "1s4b61fd8cyjy8kvc25mqd97dkxx6gqmz02i42rrcriz51pw8wgh";
sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c";
};
buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt
chmod +x $out/bin/openshot-qt
wrapProgram $out/bin/openshot-qt \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$PYTHONPATH"
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH"
'';
doCheck = false;

4
pkgs/applications/video/openshot-qt/libopenshot-audio.nix
View File

@@ -5,13 +5,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "libopenshot-audio-${version}";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot-audio";
rev = "v${version}";
sha256 = "0pgw7vzx3znglwm58187ybhg5maa13n4xcy5hrhzfsp8bqhrwkc7";
sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6";
};
buildInputs = [

10
pkgs/applications/video/openshot-qt/libopenshot.nix
View File

@@ -1,5 +1,7 @@
{stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp}:
, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp
, cppzmq, czmqpp
}:
with stdenv.lib;
@@ -8,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
name = "libopenshot-${version}";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
sha256 = "12nfkris7spn8n4s8fvy2f6yk1hqh97wzh1z3fsdxldg4gppi903";
sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm";
};
patchPhase = ''
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake doxygen
imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby
unittest-cpp
unittest-cpp cppzmq czmqpp
];
LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}";

4
pkgs/applications/video/shotcut/default.nix
View File

@@ -5,11 +5,11 @@ qmakeHook, makeQtWrapper }:
stdenv.mkDerivation rec {
name = "shotcut-${version}";
version = "16.08";
version = "16.10";
src = fetchurl {
url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz";
sha256 = "10f32mfj3f8mjp0yi0jb7wc5d3inycn5c1pvqdagjhyyv3rvx9zy";
sha256 = "0brskci86bwdj2ahjfvv3v254ligjn97bm0f6c8yg46r0jb8q5xw";
};
buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit

2
pkgs/applications/virtualization/cbfstool/default.nix
View File

@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ iasl flex bison ];
hardeningDisable = [ "fortify" ];
CFLAGS = "-Wno-error=sign-compare";
buildPhase = ''
export LEX=${flex}/bin/flex
@@ -34,4 +35,3 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
};
}

1
pkgs/build-support/build-fhs-userenv/env.nix
View File

@@ -89,6 +89,7 @@ let
# symlink other core stuff
ln -s /host/etc/localtime localtime
ln -s /host/etc/zoneinfo zoneinfo
ln -s /host/etc/machine-id machine-id
ln -s /host/etc/os-release os-release

15
pkgs/build-support/cc-wrapper/default.nix
View File

@@ -46,7 +46,20 @@ stdenv.mkDerivation {
inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
gnugrep_bin = if nativeTools then "" else gnugrep;
passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; };
passthru = {
inherit libc nativeTools nativeLibc nativePrefix isGNU isClang;
emacsBufferSetup = pkgs: ''
; We should handle propagation here too
(mapc (lambda (arg)
(when (file-directory-p (concat arg "/include"))
(setenv "NIX_CFLAGS_COMPILE" (concat (getenv "NIX_CFLAGS_COMPILE") " -isystem " arg "/include")))
(when (file-directory-p (concat arg "/lib"))
(setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib")))
(when (file-directory-p (concat arg "/lib64"))
(setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
'';
};
buildCommand =
''

48
pkgs/build-support/emacs/buffer.nix
View File

@@ -1,23 +1,47 @@
# Functions to build elisp files to locally configure emcas buffers.
# See https://github.com/shlevy/nix-buffer
{ lib, writeText }:
{ lib, writeText, inherit-local }:
{
withPackages = pkgs: let
coqs = builtins.filter (x: (builtins.parseDrvName x.name).name == "coq") pkgs;
coq = builtins.head coqs;
pg-setup = if builtins.length coqs == 0 then "" else ''
(setq-local coq-prog-name "${coq}/bin/coqtop")
(setq-local coq-dependency-analyzer "${coq}/bin/coqdep")
(setq-local coq-compiler "${coq}/bin/coqc")
(setq-local coq-library-directory (get-coq-library-directory))
(coq-prog-args)
'';
extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs);
in writeText "dir-locals.el" ''
(require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc")
; Only set up nixpkgs buffer handling when we have some buffers active
(defvar nixpkgs--buffer-count 0)
(when (eq nixpkgs--buffer-count 0)
; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer
(defun nixpkgs--around-generate (orig name)
(if (eq (aref name 0) ?\s)
(let ((buf (funcall orig name)))
(when (inherit-local-inherit-child buf)
(with-current-buffer buf
(make-local-variable 'kill-buffer-hook)
(setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count))
(add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count)))
buf)
(funcall orig name)))
(advice-add 'generate-new-buffer :around #'nixpkgs--around-generate)
; When we have no more nixpkgs buffers, tear down the buffer handling
(defun nixpkgs--decrement-buffer-count ()
(setq nixpkgs--buffer-count (1- nixpkgs--buffer-count))
(when (eq nixpkgs--buffer-count 0)
(advice-remove 'generate-new-buffer #'nixpkgs--around-generate)
(fmakunbound 'nixpkgs--around-generate)
(fmakunbound 'nixpkgs--decrement-buffer-count))))
(setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count))
(make-local-variable 'kill-buffer-hook)
(add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count)
; Add packages to PATH and exec-path
(make-local-variable 'process-environment)
(put 'process-environment 'permanent-local t)
(inherit-local 'process-environment)
(setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH")))
(setq-local exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path))
${pg-setup}
(inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path))
${lib.concatStringsSep "\n" extras}
'';
}

2
pkgs/data/fonts/dejavu-fonts/default.nix
View File

@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
# See http://dejavu-fonts.org/wiki/License for details
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

6
pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
View File

@@ -1,6 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }:
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
, webkitgtk }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -12,7 +13,8 @@ stdenv.mkDerivation rec {
gnome3.geocode_glib libchamplain file libsoup
gdk_pixbuf librsvg autoreconfHook
gnome3.gsettings_desktop_schemas gnome3.evolution_data_server
gnome3.gnome_online_accounts gnome3.defaultIconTheme ];
gnome3.gnome_online_accounts gnome3.defaultIconTheme
webkitgtk ];
patches = [ ./soup.patch ];

4
pkgs/development/compilers/go/1.7.nix
View File

@@ -15,13 +15,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.7";
version = "1.7.1";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "03wc4r5pgxrlh3lp8l0hb1bhsrwv4hfq1fcj8n82bfk3hvj43am2";
sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356";
};
# perl is used for testing go vet

10
pkgs/development/compilers/go/remove-tools-1.7.patch
View File

@@ -1,8 +1,8 @@
diff --git a/src/go/build/build.go b/src/go/build/build.go
index 496fe11..8c81dbd 100644
index 9706b8b..f250751 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -1388,7 +1388,7 @@ func init() {
@@ -1513,7 +1513,7 @@ func init() {
}
// ToolDir is the directory containing build tools.
@@ -12,11 +12,11 @@ index 496fe11..8c81dbd 100644
// IsLocalImport reports whether the import path is
// a local import path, like ".", "..", "./foo", or "../foo".
diff --git a/src/runtime/extern.go b/src/runtime/extern.go
index d346362..fb22b6e 100644
index 441dcd9..a50277e 100644
--- a/src/runtime/extern.go
+++ b/src/runtime/extern.go
@@ -194,6 +194,17 @@ func GOROOT() string {
return defaultGoroot
@@ -230,6 +230,17 @@ func GOROOT() string {
return sys.DefaultGoroot
}
+// GOTOOLDIR returns the root of the Go tree.

2
pkgs/development/compilers/llvm/3.8/clang/default.nix
View File

@@ -6,7 +6,7 @@ let
name = "clang-${version}";
unpackPhase = ''
unpackFile ${fetch "cfe" "1ybcac8hlr9vl3wg8s4v6cp0c0qgqnwprsv85lihbkq3vqv94504"}
unpackFile ${fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"}
mv cfe-${version}.src clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}

6
pkgs/development/compilers/llvm/3.8/default.nix
View File

@@ -2,7 +2,7 @@
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
version = "3.8.0";
version = "3.8.1";
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
@@ -10,8 +10,8 @@ let
inherit sha256;
};
compiler-rt_src = fetch "compiler-rt" "1c2nkp9563873ffz22qmhc0wakgj428pch8rmhym8agjamz3ily8";
clang-tools-extra_src = fetch "clang-tools-extra" "1i0yrgj8qrzjjswraz0i55lg92ljpqhvjr619d268vka208aigdg";
compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
self = {
llvm = callPackage ./llvm.nix {

2
pkgs/development/compilers/llvm/3.8/libc++/default.nix
View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "libc++-${version}";
src = fetch "libcxx" "0yr3fh8vj38289b9cwk37zsy7x98dcd3kjy7xxy8mg20p48lb01n";
src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp";
postUnpack = ''
unpackFile ${libcxxabi.src}

2
pkgs/development/compilers/llvm/3.8/libc++abi.nix
View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libc++abi-${version}";
src = fetch "libcxxabi" "0175rv2ynkklbg96kpw13iwhnzyrlw3r12f4h09p9v7nmxqhivn5";
src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1";
buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;

9
pkgs/development/compilers/llvm/3.8/lldb.nix
View File

@@ -15,7 +15,7 @@
stdenv.mkDerivation {
name = "lldb-${version}";
src = fetch "lldb" "0dasg12gf5crrd9pbi5rd1y8vwlgqp8nxgw9g4z47w3x2i28zxp3";
src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l";
postUnpack = ''
# Hack around broken standalone builf as of 3.8
@@ -25,12 +25,9 @@ stdenv.mkDerivation {
cp "$(ls -d llvm-*.src)/lib/Support/regex_impl.h" "$srcDir/tools/lib/Support/"
'';
buildInputs = [ cmake python which swig ncurses zlib libedit ];
buildInputs = [ cmake python which swig ncurses zlib libedit llvm ];
preConfigure = ''
export CXXFLAGS="-pthread"
export LDFLAGS="-ldl"
'';
hardeningDisable = [ "format" ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"

2
pkgs/development/compilers/llvm/3.8/llvm.nix
View File

@@ -18,7 +18,7 @@
}:
let
src = fetch "llvm" "0ikfq0gxac8xpvxj23l4hk8f12ydx48fljgrz1gl9xp0ks704nsm";
src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf";
in stdenv.mkDerivation rec {
name = "llvm-${version}";

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

@@ -273,6 +273,7 @@ self: super: {
xmlgen = dontCheck super.xmlgen;
hapistrano = dontCheck super.hapistrano;
HerbiePlugin = dontCheck super.HerbiePlugin;
wai-cors = dontCheck super.wai-cors;
# These packages try to access the network.
amqp = dontCheck super.amqp;
@@ -971,11 +972,17 @@ self: super: {
});
# https://github.com/commercialhaskell/stack/issues/2263
stack = appendPatch super.stack (pkgs.fetchpatch {
url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch";
sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29";
stack = (dontJailbreak super.stack).overrideScope (self: super: {
http-client = self.http-client_0_5_3_2;
http-client-tls = self.http-client-tls_0_3_3;
http-conduit = self.http-conduit_2_2_2_1;
optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
criterion = super.criterion.override { inherit (super) optparse-applicative; };
});
# Test suite fails a QuickCheck property.
optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;
# GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for
# it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config
# depend on freeglut, which provides GHC to necessary information to generate a correct RPATH.
@@ -1008,4 +1015,7 @@ self: super: {
# https://github.com/pontarius/pontarius-xmpp/issues/105
pontarius-xmpp = dontCheck super.pontarius-xmpp;
# https://github.com/fpco/store/issues/77
store = dontCheck super.store;
}

1
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@@ -190,6 +190,7 @@ self: super: {
hackage-security = dontHaddock (dontCheck super.hackage-security);
# GHC versions prior to 8.x require additional build inputs.
attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
Glob = addBuildDepends super.Glob (with self; [semigroups]);
Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";

74
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@@ -32,7 +32,7 @@ core-packages:
- xhtml-3000.2.1
default-package-overrides:
# LTS Haskell 7.1
# LTS Haskell 7.2
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@@ -286,7 +286,7 @@ default-package-overrides:
- Chart ==1.8
- Chart-cairo ==1.8
- Chart-diagrams ==1.8
- ChasingBottoms ==1.3.1.1
- ChasingBottoms ==1.3.1.2
- cheapskate ==0.1.0.5
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
@@ -343,8 +343,8 @@ default-package-overrides:
- concurrent-extra ==0.7.0.10
- concurrent-output ==1.7.7
- concurrent-supply ==0.1.8
- conduit ==1.2.7
- conduit-combinators ==1.0.7
- conduit ==1.2.8
- conduit-combinators ==1.0.8
- conduit-extra ==1.1.13.3
- conduit-iconv ==0.1.1.1
- conduit-parse ==0.1.2.0
@@ -460,7 +460,7 @@ default-package-overrides:
- djinn-lib ==0.0.1.2
- dlist ==0.8.0.2
- dlist-instances ==0.1.1.1
- dns ==2.0.5
- dns ==2.0.6
- do-list ==1.0.1
- dockerfile ==0.1.0.1
- docopt ==0.7.0.4
@@ -535,7 +535,7 @@ default-package-overrides:
- farmhash ==0.1.0.5
- fast-builder ==0.0.0.6
- fast-digits ==0.2.1.0
- fast-logger ==2.4.6
- fast-logger ==2.4.7
- fasta ==0.10.4.0
- fay ==0.23.1.12
- fay-base ==0.20.0.1
@@ -579,7 +579,7 @@ default-package-overrides:
- forecast-io ==0.2.0.0
- foreign-store ==0.2
- formatting ==6.2.2
- fortran-src ==0.1.0.3
- fortran-src ==0.1.0.4
- Frames ==0.1.6
- free ==4.12.4
- free-vl ==0.1.4
@@ -611,9 +611,9 @@ default-package-overrides:
- ghc-paths ==0.1.0.9
- ghc-syb-utils ==0.2.3
- ghc-tcplugins-extra ==0.2
- ghc-typelits-extra ==0.2
- ghc-typelits-knownnat ==0.2.1
- ghc-typelits-natnormalise ==0.5
- ghc-typelits-extra ==0.2.1
- ghc-typelits-knownnat ==0.2.2
- ghc-typelits-natnormalise ==0.5.1
- ghcid ==0.6.5
- ghcjs-codemirror ==0.0.0.1
- ghcjs-hplay ==0.3.4.2
@@ -773,7 +773,7 @@ default-package-overrides:
- hackmanager ==0.1.0.0
- haddock-api ==2.17.3
- haddock-library ==1.4.2
- hailgun ==0.4.1.0
- hailgun ==0.4.1.1
- half ==0.2.2.3
- hamlet ==1.2.0
- HandsomeSoup ==0.4.2
@@ -949,7 +949,7 @@ default-package-overrides:
- hvect ==0.3.1.0
- hw-bits ==0.1.0.1
- hw-conduit ==0.0.0.11
- hw-diagnostics ==0.0.0.3
- hw-diagnostics ==0.0.0.4
- hw-parser ==0.0.0.1
- hw-prim ==0.1.0.3
- hw-rankselect ==0.3.0.0
@@ -978,7 +978,7 @@ default-package-overrides:
- imm ==1.0.1.0
- immortal ==0.2.2
- include-file ==0.1.0.3
- incremental-parser ==0.2.4.1
- incremental-parser ==0.2.5
- indentation-core ==0.0
- indentation-parsec ==0.0
- indents ==0.3.3
@@ -1306,7 +1306,7 @@ default-package-overrides:
- pdfinfo ==1.5.4
- pem ==0.2.2
- permutation ==0.5.0.5
- persistable-record ==0.4.0.2
- persistable-record ==0.4.0.3
- persistable-types-HDBC-pg ==0.0.1.4
- persistent ==2.6
- persistent-postgresql ==2.6
@@ -1386,7 +1386,7 @@ default-package-overrides:
- prometheus-metrics-ghc ==0.1.0.1
- prompt ==0.1.1.2
- protobuf ==0.2.1.1
- protobuf-simple ==0.1.0.1
- protobuf-simple ==0.1.0.2
- protocol-buffers ==2.4.0
- protocol-buffers-descriptor ==2.4.0
- protolude ==0.1.7
@@ -1480,7 +1480,7 @@ default-package-overrides:
- rest-types ==1.14.1.1
- rest-wai ==0.2.0.1
- result ==0.2.5.1
- rethinkdb ==2.2.0.6
- rethinkdb ==2.2.0.7
- rethinkdb-client-driver ==0.0.23
- retry ==0.7.4.1
- rev-state ==0.1.2
@@ -1522,7 +1522,7 @@ default-package-overrides:
- seqloc ==0.6.1.1
- serf ==0.1.1.0
- servant ==0.8.1
- servant-aeson-specs ==0.5.1.1
- servant-aeson-specs ==0.5.2.0
- servant-auth-cookie ==0.3.2
- servant-blaze ==0.7.1
- servant-cassava ==0.8
@@ -1715,7 +1715,7 @@ default-package-overrides:
- texmath ==0.8.6.5
- text ==1.2.2.1
- text-all ==0.3.0.2
- text-binary ==0.2.1
- text-binary ==0.2.1.1
- text-conversions ==0.3.0
- text-format ==0.3.1.1
- text-icu ==0.7.0.1
@@ -1864,7 +1864,7 @@ default-package-overrides:
- wai-conduit ==3.0.0.3
- wai-cors ==0.2.5
- wai-eventsource ==3.0.0
- wai-extra ==3.0.17
- wai-extra ==3.0.18
- wai-logger ==2.3.0
- wai-middleware-caching ==0.1.0.2
- wai-middleware-caching-lru ==0.1.0.0
@@ -1893,7 +1893,7 @@ default-package-overrides:
- web-routes-hsp ==0.24.6.1
- web-routes-th ==0.22.5
- web-routes-wai ==0.24.3
- webdriver ==0.8.3
- webdriver ==0.8.4
- webdriver-angular ==0.1.11
- webkitgtk3 ==0.14.2.0
- webkitgtk3-javascriptcore ==0.14.2.0
@@ -1962,8 +1962,8 @@ default-package-overrides:
- yesod-auth-basic ==0.1.0.2
- yesod-auth-hashdb ==1.5.1.3
- yesod-auth-oauth2 ==0.2.2
- yesod-bin ==1.4.18.3
- yesod-core ==1.4.24
- yesod-bin ==1.4.18.5
- yesod-core ==1.4.25
- yesod-eventsource ==1.4.0.1
- yesod-fay ==0.8.0
- yesod-fb ==0.3.4
@@ -2197,8 +2197,11 @@ dont-distribute-packages:
amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-s3: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-swf: [ i686-linux, x86_64-linux, x86_64-darwin ]
AMI: [ i686-linux, x86_64-linux, x86_64-darwin ]
ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ]
amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2532,6 +2535,7 @@ dont-distribute-packages:
car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ]
carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ]
carettah: [ i686-linux, x86_64-linux, x86_64-darwin ]
Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ]
casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ]
casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
casadi-bindings-internal: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2604,6 +2608,7 @@ dont-distribute-packages:
clafer: [ i686-linux, x86_64-linux, x86_64-darwin ]
claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ]
claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ]
clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ]
CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ]
clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ]
clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3028,6 +3033,7 @@ dont-distribute-packages:
easyplot: [ i686-linux, x86_64-linux, x86_64-darwin ]
easyrender: [ i686-linux, x86_64-linux, x86_64-darwin ]
ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ]
ec2-unikernel: [ i686-linux, x86_64-linux, x86_64-darwin ]
ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ]
ecu: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3201,6 +3207,7 @@ dont-distribute-packages:
FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ]
fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ]
foldl-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ]
folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
follower: [ i686-linux, x86_64-linux, x86_64-darwin ]
foma: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3537,6 +3544,7 @@ dont-distribute-packages:
halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ]
halma: [ i686-linux, x86_64-linux, x86_64-darwin ]
hampp: [ i686-linux, x86_64-linux, x86_64-darwin ]
hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ]
hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ]
hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ]
handsy: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3935,6 +3943,8 @@ dont-distribute-packages:
hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ]
hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ]
hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ]
hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ]
hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ]
hops: [ i686-linux, x86_64-linux, x86_64-darwin ]
hoq: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3980,6 +3990,7 @@ dont-distribute-packages:
hruby: [ i686-linux, x86_64-linux, x86_64-darwin ]
hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ]
hs-di: [ i686-linux, x86_64-linux, x86_64-darwin ]
hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ]
hs-duktape: [ i686-linux, x86_64-linux, x86_64-darwin ]
hs-ffmpeg: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4017,6 +4028,7 @@ dont-distribute-packages:
hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ]
hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4232,6 +4244,7 @@ dont-distribute-packages:
invertible: [ i686-linux, x86_64-linux, x86_64-darwin ]
io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ]
io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ]
ion: [ i686-linux, x86_64-linux, x86_64-darwin ]
IOR: [ i686-linux, x86_64-linux, x86_64-darwin ]
IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ]
iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4293,6 +4306,7 @@ dont-distribute-packages:
joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ]
jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ]
jort: [ i686-linux, x86_64-linux, x86_64-darwin ]
jose-jwt: [ i686-linux, x86_64-linux, x86_64-darwin ]
js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ]
jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ]
jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4369,6 +4383,7 @@ dont-distribute-packages:
knots: [ i686-linux, x86_64-linux, x86_64-darwin ]
koellner-phonetic: [ i686-linux, x86_64-linux, x86_64-darwin ]
Konf: [ i686-linux, x86_64-linux, x86_64-darwin ]
kontra-config: [ i686-linux, x86_64-linux, x86_64-darwin ]
korfu: [ i686-linux, x86_64-linux, x86_64-darwin ]
kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ]
krpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4693,6 +4708,7 @@ dont-distribute-packages:
mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ]
moan: [ i686-linux, x86_64-linux, x86_64-darwin ]
modbus-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ]
modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ]
modify-fasta: [ i686-linux, x86_64-linux, x86_64-darwin ]
modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4837,6 +4853,7 @@ dont-distribute-packages:
nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ]
nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ]
nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
nettle: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-address: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5389,6 +5406,7 @@ dont-distribute-packages:
rivet-simple-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ]
rivet: [ i686-linux, x86_64-linux, x86_64-darwin ]
RJson: [ i686-linux, x86_64-linux, x86_64-darwin ]
rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ]
Rlang-QQ: [ i686-linux, x86_64-linux, x86_64-darwin ]
rlwe-challenges: [ i686-linux, x86_64-linux, x86_64-darwin ]
rmonad: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5407,6 +5425,7 @@ dont-distribute-packages:
rope: [ i686-linux, x86_64-linux, x86_64-darwin ]
rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ]
roshask: [ i686-linux, x86_64-linux, x86_64-darwin ]
rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ]
rosso: [ i686-linux, x86_64-linux, x86_64-darwin ]
rounding: [ i686-linux, x86_64-linux, x86_64-darwin ]
roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5540,6 +5559,7 @@ dont-distribute-packages:
servant-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5685,6 +5705,8 @@ dont-distribute-packages:
SNet: [ i686-linux, x86_64-linux, x86_64-darwin ]
snm: [ i686-linux, x86_64-linux, x86_64-darwin ]
snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ]
snowflake-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ]
SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ]
SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6069,6 +6091,7 @@ dont-distribute-packages:
unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ]
universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
unjson: [ i686-linux, x86_64-linux, x86_64-darwin ]
unlit: [ i686-linux, x86_64-linux, x86_64-darwin ]
unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ]
unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6372,6 +6395,12 @@ dont-distribute-packages:
YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ]
yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-keymap-cua: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-keymap-emacs: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-keymap-vim: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-misc-modes: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-mode-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
yi-mode-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ]
yices: [ i686-linux, x86_64-linux, x86_64-darwin ]
yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ]
Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6392,6 +6421,7 @@ dont-distribute-packages:
zeromq3-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
zeroth: [ i686-linux, x86_64-linux, x86_64-darwin ]
ZFS: [ i686-linux, x86_64-linux, x86_64-darwin ]
zip: [ i686-linux, x86_64-linux, x86_64-darwin ]
zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ]
ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ]
zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ]

13
pkgs/development/haskell-modules/default.nix
View File

@@ -6,12 +6,13 @@
let
allCabalFiles = pkgs.fetchFromGitHub {
owner = "commercialhaskell";
repo = "all-cabal-hashes";
rev = "72f1318540eff69544eb8c14a16f630d0c5448b8";
sha256 = "1czi1rajk2726mqrw3qp7a43h26acbjw54ll3ns063yzg9hg469m";
};
allCabalFiles = stdenv.mkDerivation {
name = "all-cabal-hashes-0";
buildCommand = ''
mkdir -p $out
tar -C $out --strip-components=1 -x -f ${builtins.fetchurl "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"}
'';
};
inherit (stdenv.lib) fix' extends;

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

File diff suppressed because it is too large Load Diff

6
pkgs/development/interpreters/mujs/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchgit, clang }:
stdenv.mkDerivation rec {
name = "mujs-2016-02-22";
name = "mujs-2016-09-21";
src = fetchgit {
url = git://git.ghostscript.com/mujs.git;
rev = "624f975aae6b451e35406d8cdde808626052ce2c";
sha256 = "0cab7x73v380wklpkbrc1k4iyh4q2jyx3zxbymlfi1spmrpn6skl";
rev = "5c337af4b3df80cf967e4f9f6a21522de84b392a";
sha256 = "1x5g6nycggc83md2dbr2nahjbkkmmn64bg25a8hih7z72sw41dgw";
};
buildInputs = [ clang ];

4
pkgs/development/libraries/c-ares/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "c-ares-1.10.0";
name = "c-ares-1.12.0";
src = fetchurl {
url = "http://c-ares.haxx.se/download/${name}.tar.gz";
sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x";
sha256 = "1yv5ygkd813glz8hbagykgp1hlb6450chig061hr7pyw7i0gk4l6";
};
meta = with stdenv.lib; {

28
pkgs/development/libraries/czmqpp/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }:
stdenv.mkDerivation rec {
name = "czmqpp-${version}";
version = "1.2.0";
src = fetchFromGitHub {
owner = "zeromq";
repo = "czmqpp";
rev = "v${version}";
sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja";
};
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ chris-martin ];
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
propagatedBuildInputs = [ czmq ];
# https://github.com/zeromq/czmqpp/issues/42
patches = [ ./socket.patch ];
}

17
pkgs/development/libraries/czmqpp/socket.patch Normal file
View File

@@ -0,0 +1,17 @@
--- /src/socket.cpp
+++ /src/socket.cpp
@@ -60,12 +60,12 @@
int socket::bind(const std::string& address)
{
// format-security: format not a string literal and no format arguments.
- return zsocket_bind(self_, address.c_str());
+ return zsocket_bind(self_, "%s", address.c_str());
}
int socket::connect(const std::string& address)
{
// format-security: format not a string literal and no format arguments.
- return zsocket_connect(self_, address.c_str());
+ return zsocket_connect(self_, "%s", address.c_str());
}
bool operator==(const socket& sock_a, const socket& sock_b)

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

@@ -19,11 +19,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libass-${version}";
version = "0.13.2";
version = "0.13.4";
src = fetchurl {
url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
sha256 = "1kpsw4zw95v4cjvild9wpk73dzavn1khsm3bm32kcz6amnkd166n";
sha256 = "1dlzkjybnpl2fkvyjq0qblb7qw12cs893bs7zj3rvf8ij342yjnq";
};
configureFlags = [

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libelf }:
stdenv.mkDerivation rec {
name = "libdwarf-20160613";
name = "libdwarf-20161001";
src = fetchurl {
url = "http://www.prevanders.net/${name}.tar.gz";
sha256 = "1nfdfn5xf3n485pvpb853awyxxnvrg207i0wmrr7bhk8fcxdxbn0";
sha512 = "2c522ae0b6e2afffd09e2e79562987fd819b197c9bce4900b6a4fd176b5ff229e88c6b755cfbae7831e7160ddeb3bfe2afbf39d756d7e75ec31ace0668554048";
};
configureFlags = " --enable-shared --disable-nonshared";

2
pkgs/development/libraries/openjpeg/2.0.nix
View File

@@ -4,5 +4,5 @@ callPackage ./generic.nix (args // rec {
version = "2.0.1";
branch = "2";
revision = "version.2.0.1";
sha256 = "1r81hq0hx2papjs3hfmpsl0024f6lblk0bq53dfm2wcpi916q7pw";
sha256 = "03d0r8x66cxri9i20nr9gm1jnkp85yyd8mkrbmawv5nvybd0r7wv";
})

6
pkgs/development/libraries/openjpeg/2.1.nix
View File

@@ -1,8 +1,8 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2.1.1";
version = "2.1.2";
branch = "2.1";
revision = "v2.1.1";
sha256 = "1hrn10byrlw7hb7hwv2zvff89rxy3bsbn0im5ki4kdk63jw5p601";
revision = "v2.1.2";
sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h";
})

36
pkgs/development/libraries/uri/default.nix Normal file
View File

@@ -0,0 +1,36 @@
{ stdenv, fetchFromGitHub, cmake, doxygen }:
stdenv.mkDerivation {
name = "uri-2016-09-04";
src = fetchFromGitHub {
owner = "cpp-netlib";
repo = "uri";
rev = "8b1eec80621ea7be1db3b28f1621e531cc72855c";
sha256 = "0f77y79b11pp31y0qpydki2nnxd6gpycp24fmrapi70fsni2ah0d";
};
buildInputs = [ cmake doxygen ];
cmakeFlags = [ "-DUri_BUILD_TESTS=OFF" "-DBUILD_SHARED_LIBS=ON" ];
postBuild = ''
make doc
'';
# https://github.com/cpp-netlib/uri/issues/90
postInstall = ''
mv $out/include $out/include2
mv $out/include2/include $out/
rmdir $out/include2
mkdir -p $out/share/doc
mv html $out/share/doc/uri
'';
meta = {
description = "C++ URI library";
homepage = http://cpp-netlib.org;
license = stdenv.lib.licenses.boost;
platforms = stdenv.lib.platforms.all;
};
}

24
pkgs/development/perl-modules/dbiclassx-fix.patch Normal file
View File

@@ -0,0 +1,24 @@
From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001
From: Peter Rabbitson <ribasushi@cpan.org>
Date: Tue, 13 Sep 2016 17:15:48 +0200
Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite)
libsqlite version
---
Changes | 2 ++
t/prefetch/grouped.t | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t
index 4aad6b1..c0d2224 100644
--- a/t/prefetch/grouped.t
+++ b/t/prefetch/grouped.t
@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all;
# add an extra track to one of the cds, and then make sure we can get it on top
# (check if limit works)
- my $top_cd = $cd_rs->slice (1,1)->next;
+ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next;
$top_cd->create_related ('tracks', {
title => 'over the top',
});

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

@@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite }:
{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin
, makeWrapper
}:
stdenv.mkDerivation rec {
name = "gpshell-${version}";
@@ -9,7 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
};
buildInputs = [ pkgconfig globalplatform pcsclite ];
buildInputs = [ pkgconfig globalplatform pcsclite makeWrapper ];
postFixup = ''
wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"
'';
meta = with stdenv.lib; {
homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;

8
pkgs/development/tools/misc/kibana/default.nix
View File

@@ -3,8 +3,12 @@
with stdenv.lib;
let
inherit (builtins) elemAt;
archOverrides = {
"i686" = "x86";
};
info = splitString "-" stdenv.system;
arch = elemAt info 0;
arch = (elemAt info 0);
elasticArch = archOverrides."${arch}" or arch;
plat = elemAt info 1;
shas = {
"x86_64-linux" = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw";
@@ -16,7 +20,7 @@ in stdenv.mkDerivation rec {
version = "4.6.0";
src = fetchurl {
url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${arch}.tar.gz";
url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz";
sha256 = shas."${stdenv.system}";
};

19
pkgs/development/tools/vagrant/default.nix
View File

@@ -4,7 +4,7 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
let
version = "1.8.5";
version = "1.8.6";
rake = buildRubyGem {
inherit ruby;
gemName = "rake";
@@ -13,8 +13,8 @@ let
};
sha256 = {
"x86_64-linux" = "1na5hxm3ilx268hk68dpgkks1jjh9q7p3ksjx8ssiijq6df47vih";
"i686-linux" = "16psr5s0azpzavizh74085z7wygkfs4ribsfalvbd96phkrkp2wp";
"x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76";
"i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch = builtins.replaceStrings ["-linux"] [""] stdenv.system;
@@ -28,22 +28,11 @@ in stdenv.mkDerivation rec {
inherit sha256;
};
# Remove the patchFlags/patches when 1.8.6 is released
patchFlags = [
"-p1"
"-d ./opt/vagrant/embedded/gems/gems/vagrant-${version}"
];
patches = (fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/mitchellh/vagrant/pull/7611.diff";
name = "fix_incorrect_ssh_keys_permissions.patch";
sha256 = "0lqa9xpg79ggp9fc8gzb5lv675ydj2p8l55bx4hs1hf8zz2c1hjf";
});
meta = with stdenv.lib; {
description = "A tool for building complete development environments";
homepage = http://vagrantup.com;
license = licenses.mit;
maintainers = with maintainers; [ lovek323 globin jgeerds ];
maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ];
platforms = platforms.linux;
};

21
pkgs/misc/emulators/fs-uae/default.nix
View File

@@ -1,24 +1,18 @@
{ stdenv, fetchurl, pkgconfig
, gettext, gtk, SDL, zlib, glib, openal, mesa, lua, freetype }:
, gettext, gtk2, SDL2, zlib, glib, openal, mesa, lua, freetype, libmpeg2, zip }:
with stdenv.lib;
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
name = "fs-uae-${version}";
version = "2.4.3";
version = "2.8.0";
src = fetchurl {
urls = [ "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz" ];
sha256 = "05wngvpqj8kj4wzi5jzzhvs19iljb3m6ba1l2hk4rz68b400ndv6";
url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
sha256 = "1cvvlkzhh4rrpax7505bngw990rx86l1nhad174zpqc9ah93il25";
};
buildInputs = [ pkgconfig gettext gtk SDL zlib glib openal mesa lua freetype ];
phases = "unpackPhase buildPhase installPhase";
# Strange: the docs recommend SDL2, but it does compile only with SDL1
buildPhase = "make sdl=1";
installPhase = "make install prefix=$out";
buildInputs = [ pkgconfig gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ];
meta = {
description = "An accurate, customizable Amiga Emulator";
@@ -30,9 +24,8 @@ stdenv.mkDerivation rec{
'';
license = licenses.gpl2Plus;
homepage = http://fs-uae.net;
maintainers = [ maintainers.AndersonTorres ];
maintainers = with stdenv.lib; [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux;
};
}
# TODO: testing and Python GUI support
# TODO: SDL2 support

155
pkgs/os-specific/linux/amdgpu-pro/default.nix Normal file
View File

@@ -0,0 +1,155 @@
{ stdenv, fetchurl, elfutils, mesa_noglu
, xorg, patchelf, openssl, libdrm, libudev
, libxcb, libxshmfence, epoxy, perl, zlib
, libsOnly ? false, kernel ? null
}:
assert (!libsOnly) -> kernel != null;
with stdenv.lib;
let
kernelDir = if libsOnly then null else kernel.dev;
inherit (mesa_noglu) driverLink;
bitness = if stdenv.is64bit then "64" else "32";
libArch =
if stdenv.system == "i686-linux" then
"i386-linux-gnu"
else if stdenv.system == "x86_64-linux" then
"x86_64-linux-gnu"
else throw "amdgpu-pro is Linux only. Sorry. The build was stopped.";
libReplaceDir = "/usr/lib/${libArch}";
in stdenv.mkDerivation rec {
version = "16.30";
pname = "amdgpu-pro";
build = "16.30.3-315407";
libCompatDir = "/run/lib/${libArch}";
name = pname + "-" + version + (optionalString (!libsOnly) "-${kernelDir.version}");
src = fetchurl {
url =
"https://www2.ati.com/drivers/linux/amdgpu-pro_${build}.tar.xz";
sha256 = "97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354";
curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx";
};
hardeningDisable = [ "pic" "format" ];
inherit libsOnly;
postUnpack = ''
cd $sourceRoot
mkdir root
cd root
for deb in ../*.deb; do echo $deb; ar p $deb data.tar.xz | tar -xJ; done
sourceRoot=.
'';
modulePatches = [
./patches/0001-add-OS-detection-for-arch.patch
./patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
./patches/0003-add-kcl_drm_gem_object_lookup.patch
./patches/0004-paging-changes-for-linux-4.6.patch
./patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
./patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
./patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
./patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
./patches/0009-disable-dal-by-default.patch
./patches/0010-remove-dependency-on-System.map.patch
];
patchPhase = optionalString (!libsOnly) ''
pushd usr/src/amdgpu-pro-${build}
for patch in $modulePatches; do echo $patch; patch -p1 < $patch; done
popd
'';
preBuild = optionalString (!libsOnly) ''
makeFlags="$makeFlags M=$(pwd)/usr/src/amdgpu-pro-${build}"
'';
postBuild = optionalString (!libsOnly) ''
xz usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko
'';
makeFlags = optionalString (!libsOnly)
"-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build modules";
depLibPath = makeLibraryPath [
stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib
xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev
];
installPhase = ''
mkdir -p $out
cp -r usr/bin $out/bin
cp -r etc $out/etc
cp -r usr/include $out/include
cp -r usr/lib/${libArch} $out/lib
mv $out/lib/amdgpu-pro/* $out/lib/
rmdir $out/lib/amdgpu-pro
cp -r usr/share $out/share
'' + optionalString (!libsOnly) ''
if [ -d $out/lib/xorg ]; then
rm $out/lib/xorg
mv $out/lib/1.18 $out/lib/xorg
rm -r $out/lib/1.*
fi
cp -r lib/firmware $out/lib/firmware
mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz
cp usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz
'' + ''
interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)"
libPath="$out/lib:$out/lib/gbm:$depLibPath"
echo patching with $interpreter $libPath
for prog in "$out"/bin/*; do
echo patching program $prog
patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$prog"
done
for lib in `find "$out/lib/" -name '*.so*'`; do
echo patching library $lib
patchelf --set-rpath "$libPath" "$lib"
done
'';
postFixup = assert (stringLength libReplaceDir == stringLength libCompatDir); ''
libPath="$out/lib:$out/lib/gbm:$depLibPath"
for lib in libgbm.so.1.0.0 ${optionalString (!libsOnly) "xorg/modules/drivers/amdgpu_drv.so"} amdvlk${bitness}.so vdpau/libvdpau_amdgpu.so; do
if [ -e "$out/lib/$lib" ]; then
patchelf --set-rpath "$libPath" "$out/lib/$lib"
fi
done
for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do
if [ -e "$out/lib/$lib" ]; then
perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib"
fi
done
substituteInPlace "$out/etc/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib"
'';
buildInputs = [
patchelf
perl
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "AMDGPU-PRO drivers";
homepage = http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx ;
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ corngood ];
# Copied from the nvidia default.nix to prevent a store collision.
priority = 4;
};
}

26
pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch Normal file
View File

@@ -0,0 +1,26 @@
From e78ede724fff53fc0220999f6381242142ce8c33 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 21 Aug 2016 16:30:25 -0300
Subject: [PATCH 1/8] add OS detection for arch
---
amd/backport/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/amd/backport/Makefile b/amd/backport/Makefile
index 0c285ef..6447a15 100644
--- a/amd/backport/Makefile
+++ b/amd/backport/Makefile
@@ -17,6 +17,9 @@ else ifeq ("ubuntu",$(OS_NAME))
ccflags-y += -DOS_NAME_UBUNTU
else ifeq ("steamos",$(OS_NAME))
ccflags-y += -DOS_NAME_STEAMOS
+else ifeq ("arch",$(OS_NAME))
+ccflags-y += -DOS_NAME_ARCH
+OS_VERSION = "0.0"
else
ccflags-y += -DOS_NAME_UNKNOWN
endif
--
2.9.3

25
pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch Normal file
View File

@@ -0,0 +1,25 @@
From d84bd62a10308efb6a414e8f6582a7b1e9860638 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 21 Aug 2016 16:31:12 -0300
Subject: [PATCH 2/8] update kcl_ttm_bo_reserve for linux-4.7
---
amd/backport/include/kcl/kcl_ttm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h
index 3575004..0d1560d 100644
--- a/amd/backport/include/kcl/kcl_ttm.h
+++ b/amd/backport/include/kcl/kcl_ttm.h
@@ -84,7 +84,7 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo,
bool interruptible, bool no_wait,
struct ww_acquire_ctx *ticket)
{
-#if defined(BUILD_AS_DKMS)
+#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket);
#else
return ttm_bo_reserve(bo, interruptible, no_wait, ticket);
--
2.9.3

204
pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch Normal file
View File

@@ -0,0 +1,204 @@
From 2637dfe990e4c277bc724f6ba48e6661506805ec Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 21 Aug 2016 16:37:34 -0300
Subject: [PATCH 3/8] add kcl_drm_gem_object_lookup
---
amd/amdgpu/amdgpu_atpx_handler.c | 4 ++++
amd/amdgpu/amdgpu_bo_list.c | 2 +-
amd/amdgpu/amdgpu_cs.c | 2 +-
amd/amdgpu/amdgpu_display.c | 2 +-
amd/amdgpu/amdgpu_gem.c | 10 +++++-----
amd/amdgpu/dce_v10_0.c | 2 +-
amd/amdgpu/dce_v11_0.c | 2 +-
amd/amdgpu/dce_v8_0.c | 2 +-
amd/backport/include/kcl/kcl_drm.h | 11 +++++++++++
amd/dal/amdgpu_dm/amdgpu_dm_types.c | 2 +-
10 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c
index cc9b998..7e47478 100644
--- a/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/amd/amdgpu/amdgpu_atpx_handler.c
@@ -565,7 +565,11 @@ void amdgpu_register_atpx_handler(void)
if (!r)
return;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0);
+#else
vga_switcheroo_register_handler(&amdgpu_atpx_handler);
+#endif
}
/**
diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c
index 35d0856..1d163ec 100644
--- a/amd/amdgpu/amdgpu_bo_list.c
+++ b/amd/amdgpu/amdgpu_bo_list.c
@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
struct amdgpu_bo *bo;
struct mm_struct *usermm;
- gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
+ gobj = kcl_drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
if (!gobj) {
r = -ENOENT;
goto error_free;
diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c
index d16ed26..b0390b5 100644
--- a/amd/amdgpu/amdgpu_cs.c
+++ b/amd/amdgpu/amdgpu_cs.c
@@ -92,7 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
{
struct drm_gem_object *gobj;
- gobj = drm_gem_object_lookup(p->adev->ddev, p->filp,
+ gobj = kcl_drm_gem_object_lookup(p->adev->ddev, p->filp,
data->handle);
if (gobj == NULL)
return -EINVAL;
diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c
index 46326b3..9b5441f 100644
--- a/amd/amdgpu/amdgpu_display.c
+++ b/amd/amdgpu/amdgpu_display.c
@@ -594,7 +594,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev,
struct amdgpu_framebuffer *amdgpu_fb;
int ret;
- obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
+ obj = kcl_drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
if (obj == NULL) {
dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
"can't create framebuffer\n", mode_cmd->handles[0]);
diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c
index 0069aec..d10c282 100644
--- a/amd/amdgpu/amdgpu_gem.c
+++ b/amd/amdgpu/amdgpu_gem.c
@@ -397,7 +397,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
struct drm_gem_object *gobj;
struct amdgpu_bo *robj;
- gobj = drm_gem_object_lookup(dev, filp, handle);
+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle);
if (gobj == NULL) {
return -ENOENT;
}
@@ -461,7 +461,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
int r = 0;
long ret;
- gobj = drm_gem_object_lookup(dev, filp, handle);
+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle);
if (gobj == NULL) {
return -ENOENT;
}
@@ -495,7 +495,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
int r = -1;
DRM_DEBUG("%d \n", args->handle);
- gobj = drm_gem_object_lookup(dev, filp, args->handle);
+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
if (gobj == NULL)
return -ENOENT;
robj = gem_to_amdgpu_bo(gobj);
@@ -643,7 +643,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
return -EINVAL;
}
- gobj = drm_gem_object_lookup(dev, filp, args->handle);
+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
if (gobj == NULL)
return -ENOENT;
rbo = gem_to_amdgpu_bo(gobj);
@@ -705,7 +705,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
struct amdgpu_bo *robj;
int r;
- gobj = drm_gem_object_lookup(dev, filp, args->handle);
+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
if (gobj == NULL) {
return -ENOENT;
}
diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
index 7554dd7..6d38754 100644
--- a/amd/amdgpu/dce_v10_0.c
+++ b/amd/amdgpu/dce_v10_0.c
@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
return -EINVAL;
}
- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
if (!obj) {
DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
return -ENOENT;
diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
index d9c9b88..93dbc1a 100644
--- a/amd/amdgpu/dce_v11_0.c
+++ b/amd/amdgpu/dce_v11_0.c
@@ -2604,7 +2604,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
return -EINVAL;
}
- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
if (!obj) {
DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
return -ENOENT;
diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
index 7a027ce..c56a298 100644
--- a/amd/amdgpu/dce_v8_0.c
+++ b/amd/amdgpu/dce_v8_0.c
@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,
return -EINVAL;
}
- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
if (!obj) {
DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
return -ENOENT;
diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h
index a65ee25..5a8a7b3 100644
--- a/amd/backport/include/kcl/kcl_drm.h
+++ b/amd/backport/include/kcl/kcl_drm.h
@@ -3,6 +3,7 @@
#include <linux/version.h>
#include <drm/drmP.h>
+#include <drm/drm_gem.h>
#if defined(BUILD_AS_DKMS)
extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw);
@@ -123,4 +124,14 @@ static inline int kcl_drm_universal_plane_init(struct drm_device *dev, struct dr
#endif
}
+static inline struct drm_gem_object *kcl_drm_gem_object_lookup(struct drm_device *dev,
+ struct drm_file *filp,
+ u32 handle) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+ return drm_gem_object_lookup(filp, handle);
+#else
+ return drm_gem_object_lookup(dev, filp, handle);
+#endif
+}
+
#endif /* AMDGPU_BACKPORT_KCL_DRM_H */
diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
index 3f357a5..2e2d2e6 100644
--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
@@ -152,7 +152,7 @@ static int dm_crtc_pin_cursor_bo_new(
amdgpu_crtc = to_amdgpu_crtc(crtc);
- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
if (!obj) {
DRM_ERROR(
--
2.9.3

42
pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch Normal file
View File

@@ -0,0 +1,42 @@
From 2bd83488ccea22bb9e399986c171cccc3b6beb93 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 21 Aug 2016 16:40:32 -0300
Subject: [PATCH 4/8] paging changes for linux-4.6
---
amd/amdgpu/amdgpu_ttm.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
index 7bdebde..8b676c2 100644
--- a/amd/amdgpu/amdgpu_ttm.c
+++ b/amd/amdgpu/amdgpu_ttm.c
@@ -548,8 +548,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)
list_add(&guptask.list, &gtt->guptasks);
spin_unlock(&gtt->guptasklock);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+ r = get_user_pages(userptr, num_pages, write, 0, p, NULL);
+#else
r = get_user_pages(current, current->mm, userptr, num_pages,
- write, 0, p, NULL);
+ write, 0, p, NULL);
+#endif
spin_lock(&gtt->guptasklock);
list_del(&guptask.list);
@@ -625,7 +629,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm)
set_page_dirty(page);
mark_page_accessed(page);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+ put_page(page);
+#else
page_cache_release(page);
+#endif
}
sg_free_table(ttm->sg);
--
2.9.3

48
pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch Normal file
View File

@@ -0,0 +1,48 @@
From c41c15fa04e363c41272e7b5d767710170691347 Mon Sep 17 00:00:00 2001
From: "Luke A. Guest" <laguest@archeia.com>
Date: Mon, 4 Jul 2016 19:19:45 +0100
Subject: [PATCH 5/8] LRU stuff isn't available until >= 4.7.x
---
amd/amdgpu/amdgpu_ttm.c | 4 ++--
amd/backport/kcl_ttm.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
index 8b676c2..752d065 100644
--- a/amd/amdgpu/amdgpu_ttm.c
+++ b/amd/amdgpu/amdgpu_ttm.c
@@ -907,7 +907,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
return flags;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
{
@@ -969,7 +969,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
.fault_reserve_notify = &amdgpu_bo_fault_reserve_notify,
.io_mem_reserve = &amdgpu_ttm_io_mem_reserve,
.io_mem_free = &amdgpu_ttm_io_mem_free,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
.lru_removal = &amdgpu_ttm_lru_removal,
.lru_tail = &amdgpu_ttm_lru_tail,
.swap_lru_tail = &amdgpu_ttm_swap_lru_tail,
diff --git a/amd/backport/kcl_ttm.c b/amd/backport/kcl_ttm.c
index 24f7a83..1a2cb7b 100644
--- a/amd/backport/kcl_ttm.c
+++ b/amd/backport/kcl_ttm.c
@@ -7,7 +7,7 @@ static int _kcl_ttm_bo_del_from_lru(struct ttm_buffer_object *bo)
{
int put_count = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
struct ttm_bo_device *bdev = bo->bdev;
if (bdev->driver->lru_removal)
--
2.9.3

29
pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch Normal file
View File

@@ -0,0 +1,29 @@
From 5b90b8d8ab44637c707623b25ee98aa4ebded308 Mon Sep 17 00:00:00 2001
From: "Luke A. Guest" <laguest@archeia.com>
Date: Mon, 4 Jul 2016 19:30:08 +0100
Subject: [PATCH 6/8] Change name of vblank_disable_allowed to
vblank_disable_immediate under 4.7.x.
---
amd/amdgpu/amdgpu_irq.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c
index d13865a..5cfa69f 100644
--- a/amd/amdgpu/amdgpu_irq.c
+++ b/amd/amdgpu/amdgpu_irq.c
@@ -240,7 +240,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
INIT_WORK(&adev->hotplug_work,
amdgpu_hotplug_work_func);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+ adev->ddev->vblank_disable_immediate = true;
+#else
adev->ddev->vblank_disable_allowed = true;
+#endif
INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func);
--
2.9.3

29
pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch Normal file
View File

@@ -0,0 +1,29 @@
From 27ef2ce0d4d8eeb3bca32ddeae503f0a334832aa Mon Sep 17 00:00:00 2001
From: "Luke A. Guest" <laguest@archeia.com>
Date: Mon, 4 Jul 2016 19:41:08 +0100
Subject: [PATCH 7/8] Remove connector parameter from
__drm_atomic_helper_connector_destroy_state for 4.7.x kernels.
---
amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
index 2e2d2e6..cd34607 100644
--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
@@ -1205,7 +1205,11 @@ void amdgpu_dm_connector_atomic_destroy_state(
struct dm_connector_state *dm_state =
to_dm_connector_state(state);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+ __drm_atomic_helper_connector_destroy_state(state);
+#else
__drm_atomic_helper_connector_destroy_state(connector, state);
+#endif
kfree(dm_state);
}
--
2.9.3

25
pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch Normal file
View File

@@ -0,0 +1,25 @@
From c9f2501131da0d9173e21f7e8ff5741a7fcfedb6 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 21 Aug 2016 16:58:45 -0300
Subject: [PATCH 8/8] fix apparent typo in bandwidth_calcs causing array error
---
amd/dal/dc/calcs/bandwidth_calcs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/amd/dal/dc/calcs/bandwidth_calcs.c b/amd/dal/dc/calcs/bandwidth_calcs.c
index 8a19139..c4ededd 100644
--- a/amd/dal/dc/calcs/bandwidth_calcs.c
+++ b/amd/dal/dc/calcs/bandwidth_calcs.c
@@ -3181,7 +3181,7 @@ static void calculate_bandwidth(
bw_int_to_fixed(
2),
vbios->mcifwrmc_urgent_latency),
- results->dmif_burst_time[i][j]),
+ results->dmif_burst_time[results->y_clk_level][results->sclk_level]),
results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])),
results->dispclk),
bw_int_to_fixed(
--
2.9.3

25
pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch Normal file
View File

@@ -0,0 +1,25 @@
From 49d45957ddaafe13a9cc7bacd1b9665fe9c517ac Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 25 Aug 2016 22:17:06 -0300
Subject: [PATCH] disable dal by default
---
amd/amdgpu/amdgpu_drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c
index 793528b..9a4dfcc 100644
--- a/amd/amdgpu/amdgpu_drv.c
+++ b/amd/amdgpu/amdgpu_drv.c
@@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1;
int amdgpu_vm_fault_stop = 0;
int amdgpu_vm_debug = 0;
int amdgpu_exp_hw_support = 0;
-int amdgpu_dal = -1;
+int amdgpu_dal = 0;
int amdgpu_sched_jobs = 32;
int amdgpu_sched_hw_submission = 2;
int amdgpu_powerplay = -1;
--
2.9.3

112
pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch Normal file
View File

@@ -0,0 +1,112 @@
From fbc0d704f47526ca38f518b60237962cc6b08305 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 25 Aug 2016 23:08:02 -0300
Subject: [PATCH] remove dependency on System.map
---
amd/backport/Makefile | 3 +--
amd/backport/kcl_fence.c | 10 ++++++++--
amd/backport/symbols | 3 ---
dkms.conf | 1 -
pre-build.sh | 32 --------------------------------
5 files changed, 9 insertions(+), 40 deletions(-)
delete mode 100644 amd/backport/symbols
delete mode 100755 pre-build.sh
diff --git a/amd/backport/Makefile b/amd/backport/Makefile
index 6447a15..4682e0f 100644
--- a/amd/backport/Makefile
+++ b/amd/backport/Makefile
@@ -53,10 +53,9 @@ ccflags-y += -DOS_NAME_RHEL_7
endif
endif
-BACKPORT_OBJS = symbols.o
endif
-BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
+BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS))
diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c
index 2141eef..ceef1fe 100644
--- a/amd/backport/kcl_fence.c
+++ b/amd/backport/kcl_fence.c
@@ -22,8 +22,14 @@ struct default_wait_cb {
struct task_struct *task;
};
-extern void
-(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb);
+static void
+fence_default_wait_cb(struct fence *fence, struct fence_cb *cb)
+{
+ struct default_wait_cb *wait =
+ container_of(cb, struct default_wait_cb, base);
+
+ wake_up_process(wait->task);
+}
signed long
_kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count,
diff --git a/amd/backport/symbols b/amd/backport/symbols
deleted file mode 100644
index 2d3f2ee..0000000
--- a/amd/backport/symbols
+++ /dev/null
@@ -1,3 +0,0 @@
-SYMS=""
-
-SYMS+="fence_default_wait_cb"
diff --git a/dkms.conf b/dkms.conf
index 9ca148e..36be480 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu"
BUILT_MODULE_LOCATION[0]="amd/amdgpu"
DEST_MODULE_LOCATION[0]="/extra"
AUTOINSTALL="yes"
-PRE_BUILD="pre-build.sh $kernelver"
\ No newline at end of file
diff --git a/pre-build.sh b/pre-build.sh
deleted file mode 100755
index 88ec680..0000000
--- a/pre-build.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-KERNELVER=$1
-KERNELVER_BASE=${KERNELVER%%-*}
-
-version_lt () {
- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1)
- [ "$1" != "$newest" ]
-}
-
-version_ge () {
- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1)
- [ "$1" = "$newest" ]
-}
-
-version_gt () {
- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1)
- [ "$1" != "$oldest" ]
-}
-
-version_le () {
- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1)
- [ "$1" = "$oldest" ]
-}
-
-source amd/backport/symbols
-
-echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c
-for sym in $SYMS; do
- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}')
- echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c
-done
--
2.9.3

19
pkgs/os-specific/linux/kernel/linux-3.14.nix Normal file
View File

@@ -0,0 +1,19 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "3.14.77";
extraMeta.branch = "3.14";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1v3cc3ddla2b8gkwbms4x3lbjygw87r13150nikf1gc0hf64rqp0";
};
kernelPatches = args.kernelPatches;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4.23";
version = "4.4.24";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1ljvga8c6p3aww3jpi810rvf4m9qr1rjy8ya6s1xq07b08g5hpbk";
sha256 = "0yhs1742wrl0ip9wsayparjpr7vccljnhfjimgy4fjp3w6aync1k";
};
kernelPatches = args.kernelPatches;

4
pkgs/os-specific/linux/kernel/linux-4.7.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.7.5";
version = "4.7.7";
extraMeta.branch = "4.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p";
sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d";
};
kernelPatches = args.kernelPatches;

19
pkgs/os-specific/linux/kernel/linux-4.8.nix Normal file
View File

@@ -0,0 +1,19 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.8.1";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0rcqgi91jz5iyx1nrd4qjmvh0sgqjpqj94bwjh56c21nkxxiahg6";
};
kernelPatches = args.kernelPatches;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-grsecurity.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.7.5";
version = "4.7.7";
extraMeta.branch = "4.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p";
sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d";
};
kernelPatches = args.kernelPatches;

6
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -86,9 +86,9 @@ rec {
};
grsecurity_testing = grsecPatch
{ kver = "4.7.5";
grrev = "201609261522";
sha256 = "1306lw3byw6cyi0dqh0dcl67l0bi043zmp3582hjpkwj934bahf7";
{ kver = "4.7.7";
grrev = "201610101902";
sha256 = "18x8grxj03bh9gqlm3sfgjl8vy5gpyrjr8nmdnrnas6ycmbvyjx4";
};
# This patch relaxes grsec constraints on the location of usermode helpers,

4
pkgs/os-specific/linux/kmod/aggregator.nix
View File

@@ -17,10 +17,12 @@ buildEnv {
echo "kernel version is $kernelVersion"
shopt -s extglob
# Regenerate the depmod map files. Be sure to pass an explicit
# kernel version number, otherwise depmod will use `uname -r'.
if test -w $out/lib/modules/$kernelVersion; then
rm -f $out/lib/modules/$kernelVersion/modules.*
rm -f $out/lib/modules/$kernelVersion/modules.!(builtin*|order*)
${kmod}/bin/depmod -b $out -a $kernelVersion
fi
'';

40
pkgs/os-specific/linux/nvidia-x11/365.35-kernel-4.7.patch
View File

@@ -1,40 +0,0 @@
diff -Naur NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-fb.c NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-fb.c
--- NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-fb.c 2016-07-31 19:07:06.595038290 -0400
+++ NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-fb.c 2016-07-31 19:09:18.532197060 -0400
@@ -114,7 +114,7 @@
* We don't support any planar format, pick up first buffer only.
*/
- gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
+ gem = drm_gem_object_lookup(file, cmd->handles[0]);
if (gem == NULL)
{
diff -Naur NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-gem.c NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-gem.c
--- NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-gem.c 2016-07-31 19:07:06.595038290 -0400
+++ NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-gem.c 2016-07-31 19:08:56.187492736 -0400
@@ -408,7 +408,7 @@
mutex_lock(&dev->struct_mutex);
- gem = drm_gem_object_lookup(dev, file, handle);
+ gem = drm_gem_object_lookup(file, handle);
if (gem == NULL)
{
diff -Naur NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-uvm/uvm_linux.h NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-uvm/uvm_linux.h
--- NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-uvm/uvm_linux.h 2016-07-31 19:07:06.600038448 -0400
+++ NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-uvm/uvm_linux.h 2016-07-31 19:08:06.506926763 -0400
@@ -554,12 +554,6 @@
INIT_RADIX_TREE(tree, GFP_NOWAIT);
}
-static bool radix_tree_empty(struct radix_tree_root *tree)
-{
- void *dummy;
- return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
-}
-
#if !defined(NV_USLEEP_RANGE_PRESENT)
static void __sched usleep_range(unsigned long min, unsigned long max)

16
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@@ -12,28 +12,30 @@ assert (!libsOnly) -> kernel != null;
let
versionNumber = "367.35";
versionNumber = "367.57";
# Policy: use the highest stable version as the default (on our master).
inherit (stdenv.lib) makeLibraryPath;
nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
name = "nvidia-x11-${versionNumber}${nameSuffix}";
builder = ./builder.sh;
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "05g36bxcfk21ab8b0ay3zy21k5nd71468p9y1nbflx7ghpx25jrq";
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "1fw87nvbf8dmy7clwmm7jwp842c78mkz9bcb060wbihsywkfkm23";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "0m4k8f0212l63h22wk6hgi8fbfsgxqih5mizsw4ixqqmjd75av4a";
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run";
sha256 = "0lc87bgr29l9idhy2a4bsplkwx9r0dz9kjhcc5xq2xqkkyr5sqd1";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
@@ -55,7 +57,7 @@ stdenv.mkDerivation {
[ gtk atk pango glib gdk_pixbuf cairo ] );
programPath = makeLibraryPath [ xorg.libXv ];
patches = if (!libsOnly) && (versionAtLeast kernel.dev.version "4.7") then [ ./365.35-kernel-4.7.patch ] else [];
buildInputs = [ perl nukeReferences ];

16
pkgs/os-specific/linux/rtkit/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, dbus, libcap }:
{ stdenv, fetchurl, pkgconfig, dbus, libcap, fetchpatch }:
stdenv.mkDerivation rec {
name = "rtkit-0.11";
@@ -12,6 +12,20 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
patches = [
# Drop removed ControlGroup stanza
(fetchpatch {
url = "http://git.0pointer.net/rtkit.git/patch/?id=6c28e20c0be2f616a025059fda0ffac84e7f4f17";
sha256 = "0lsxk5nv08i1wjb4xh20i5fcwg3x0qq0k4f8bc0r9cczph2sv7ck";
})
# security patch: Pass uid of caller to polkit
(fetchpatch {
url = "http://git.0pointer.net/rtkit.git/patch/?id=88d4082ef6caf6b071d749dca1c50e7edde914cc";
sha256 = "0hp1blbi359qz8fmr6nj4w9yc0jf3dd176f8pn25wdj38n13qkix";
})
];
buildInputs = [ pkgconfig dbus libcap ];
meta = {

14
pkgs/os-specific/linux/util-linux/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
{ lib, stdenv, fetchurl, pkgconfig, zlib, libseccomp, fetchpatch, autoreconfHook, ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
stdenv.mkDerivation rec {
name = "util-linux-${version}";
@@ -14,7 +14,11 @@ stdenv.mkDerivation rec {
patches = [
./rtcwake-search-PATH-for-shutdown.patch
];
(fetchpatch {
name = "CVE-2016-2779.diff";
url = https://github.com/karelzak/util-linux/commit/8e4925016875c6a4f2ab4f833ba66f0fc57396a2.patch;
sha256 = "0kmigkq4s1b1ijrq8vcg2a5cw4qnm065m7cb1jn1q1f4x99ycy60";
})];
outputs = [ "bin" "dev" "out" "man" ];
@@ -50,9 +54,11 @@ stdenv.mkDerivation rec {
makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
nativeBuildInputs = [ pkgconfig ];
# autoreconfHook is required for CVE-2016-2779
nativeBuildInputs = [ pkgconfig autoreconfHook ];
# libseccomp is required for CVE-2016-2779
buildInputs =
[ zlib pam ]
[ zlib pam libseccomp ]
++ lib.optional (ncurses != null) ncurses
++ lib.optional (systemd != null) systemd
++ lib.optional (perl != null) perl;

40
pkgs/servers/kippo/default.nix
View File

@@ -25,16 +25,48 @@
#
# Use this package at your own risk.
{stdenv, pkgs, config, fetchurl, ... }:
{stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
let
twisted_13 = pythonPackages.buildPythonPackage rec {
# NOTE: When updating please check if new versions still cause issues
# to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
disabled = pythonPackages.isPy3k;
name = "Twisted-13.2.0";
src = fetchurl {
url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89";
};
propagatedBuildInputs = with pythonPackages; [ zope_interface ];
# Generate Twisted's plug-in cache. Twited users must do it as well. See
# http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
# and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for
# details.
postInstall = "$out/bin/twistd --help > /dev/null";
meta = with stdenv.lib; {
homepage = http://twistedmatrix.com/;
description = "Twisted, an event-driven networking engine written in Python";
longDescription = ''
Twisted is an event-driven networking engine written in Python
and licensed under the MIT license.
'';
license = licenses.mit;
};
};
in stdenv.mkDerivation rec {
name = "kippo-${version}";
version = "0.8";
src = fetchurl {
url = "https://kippo.googlecode.com/files/kippo-${version}.tar.gz";
sha1 = "f57a5cf88171cb005afe44a4b33cb16f825c33d6";
};
buildInputs = with pkgs.pythonPackages; [ pycrypto pyasn1 twisted_11 ];
buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ];
installPhase = ''
substituteInPlace ./kippo.tac --replace "kippo.cfg" "$out/src/kippo.cfg"
substituteInPlace ./kippo.cfg --replace "log_path = log" "log_path = /var/log/kippo" \
@@ -51,6 +83,8 @@ stdenv.mkDerivation rec {
mv $out/src/utils/* $out/bin
'';
passthru.twisted = twisted_13;
meta = with stdenv.lib; {
homepage = https://code.google.com/p/kippo;
description = "SSH Honeypot";

16
pkgs/servers/web-apps/pump.io/composition.nix Normal file
View File

@@ -0,0 +1,16 @@
# This file has been generated by node2nix 1.1.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
inherit nodejs;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}

31
pkgs/servers/web-apps/pump.io/default.nix
View File

@@ -1,34 +1,19 @@
{ stdenv, fetchFromGitHub, makeWrapper, callPackage, nodejs, python, utillinux, graphicsmagick }:
{ pkgs, system, stdenv, fetchurl, makeWrapper, nodejs, graphicsmagick }:
with stdenv.lib;
let
nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
inherit stdenv nodejs fetchurl fetchgit;
neededNatives = [ python ] ++ optional stdenv.isLinux utillinux;
self = nodePackages;
generated = ./node-packages.nix;
# To regenerate composition.nix, run generate.sh.
nodePackages = import ./composition.nix {
inherit pkgs system nodejs;
};
in nodePackages.buildNodePackage rec {
version = "git-2015-11-09";
name = "pump.io-${version}";
src = fetchFromGitHub {
owner = "e14n";
repo = "pump.io";
rev = "2f8d6b3518607ed02b594aee0db6ccacbe631b2d";
sha256 = "1xym3jzpxlni1n2i0ixwrnpkx5fbnd1p6sm1hf9n3w5m2lx6gdw5";
};
deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
buildInputs = [ makeWrapper ];
in
nodePackages.package.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ makeWrapper ];
postInstall = ''
for prog in pump pump-authorize pump-follow pump-post-note pump-register-app pump-register-user pump-stop-following; do
wrapProgram "$out/bin/$prog" \
--set NODE_PATH "$out/lib/node_modules/pump.io/node_modules/" \
--prefix PATH : ${graphicsmagick}/bin:$out/bin
done
'';
@@ -65,4 +50,4 @@ in nodePackages.buildNodePackage rec {
* Experimenting with social software
'';
};
}
})

29
pkgs/servers/web-apps/pump.io/generate.sh Executable file
View File

@@ -0,0 +1,29 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix curl jshon
set -e
# Normally, this node2nix invocation would be sufficient:
# exec node2nix --input node-packages.json --composition composition.nix
#
# But pump.io soft-depends on extra modules, which have to be *inside*
# its own node_modules, not beside them.
#
# So we hack these extra deps into package.json and feed that into
# node2nix.
#
# Also jshon does funny things with slashes in strings, which can be
# fixed with sed.
curl https://raw.githubusercontent.com/e14n/pump.io/v1.0.0/package.json | \
jshon -e dependencies \
-s '*' -i databank-mongodb \
-s '*' -i databank-redis \
-s '*' -i databank-memcached \
-s '*' -i databank-lrucache \
-p | sed 's=\\/=/=g' > full-package.json
node2nix --input full-package.json --composition composition.nix --node-env ../../../development/node-packages/node-env.nix
# overriding nodePackages src doesn't seem to work, so...
sed -i 's|src = ./.|src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }|' node-packages.nix

43
pkgs/servers/web-apps/pump.io/node-packages.json
View File

@@ -1,36 +1,7 @@
{
"name": "pump.io",
"dependencies": {
"bcrypt": "0.8.x",
"bunyan": "0.16.x",
"connect": "1.x",
"connect-auth": "0.5.3",
"connect-databank": "0.13.x",
"crypto-cacerts": "0.1.x",
"databank": "0.19.x",
"databank-lrucache": "^0.1.2",
"databank-memcached": "^0.15.0",
"databank-mongodb": "^0.18.10",
"databank-redis": "^0.19.6",
"dateformat": "1.x",
"dialback-client": "~0.1.5",
"emailjs": "0.3.x",
"express": "2.5.x",
"gm": "1.9.x",
"jankyqueue": "0.1.x",
"mkdirp": "0.3.x",
"node-uuid": "1.3.x",
"oauth-evanp": "~0.9.10-evanp.2",
"optimist": "0.3.x",
"schlock": "~0.2.1",
"set-immediate": "0.1.x",
"showdown": "0.3.x",
"sockjs": "0.3.x",
"step": "0.0.x",
"underscore": "1.4.x",
"underscore-contrib": "0.1.x",
"utml": "0.2.x",
"validator": "0.4.x",
"webfinger": "~0.4.2"
}
}
[
"pump.io",
"databank-mongodb",
"databank-redis",
"databank-memcached",
"databank-lrucache"
]

7122
pkgs/servers/web-apps/pump.io/node-packages.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/shells/bash/bash-4.3-patches.nix
View File

@@ -47,4 +47,6 @@ patch: [
(patch "044" "16bzaq9fs2kaw2n2k6vvljkjw5k5kx06isnq8hxkfrxz60384f4k")
(patch "045" "08q02mj9imp2njpgm6f5q5m61i7qzp33rbxxzarixalyisbw6vms")
(patch "046" "13v8dymwj83wcvrfayjqrs5kqar05bcj4zpiacrjkkchnsk5dd5k")
(patch "047" "0jkwqviwkqdc13wv3q0g0kapjr68ggs1xzhqy696pfkqgvg4i4n6")
(patch "048" "18nzlk1idwkq0xd54s83lx8kam8kcvz7yc0mw6hnq2ax3i2ib0jv")
]

2
pkgs/tools/backup/borg/default.nix
View File

@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
preConfigure = ''
export BORG_OPENSSL_PREFIX="${openssl.dev}"
export BORG_LZ4_PREFIX="${lz4}"
export BORG_LZ4_PREFIX="${lz4.dev}"
'';
postInstall = ''

21
pkgs/tools/compression/lhasa/default.nix Normal file
View File

@@ -0,0 +1,21 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "lhasa-0.3.1";
src = fetchurl {
url = https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz;
sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z";
};
meta = {
description = "Free Software replacement for the Unix LHA tool";
longDescription = ''
Lhasa is a Free Software replacement for the Unix LHA tool, for
decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for
the tool is a library, so that it can be reused for other purposes.
'';
license = stdenv.lib.licenses.isc;
homepage = http://fragglet.github.io/lhasa;
maintainers = with stdenv.lib; [ maintainers.sander ];
platforms = stdenv.lib.platforms.linux;
};
}

9
pkgs/tools/misc/tmuxp/default.nix
View File

@@ -2,20 +2,17 @@
pythonPackages.buildPythonApplication rec {
name = "tmuxp-${version}";
version = "1.2.0";
version = "1.2.2";
namePrefix = "";
src = fetchurl {
url = "mirror://pypi/t/tmuxp/${name}.tar.gz";
sha256 = "05z5ssv9glsqmcy9fdq06bawy1274dnzqsqd3a4z4jd0w6j09smn";
sha256 = "1g37pdxs0wmnskqm7qsqm0ygwpc1dxk1d7lrzpgs717zxaak8vln";
};
patchPhase = ''
# Dependencies required for testing shouldn't pinned to
# a specific version.
substituteInPlace requirements/test.txt \
--replace "==" ">="
sed -i 's/==.*$//' requirements/test.txt
'';
buildInputs = with pythonPackages; [

10
pkgs/tools/networking/gmvault/default.nix
View File

@@ -1,19 +1,19 @@
{ pkgs, fetchurl, buildPythonApplication, pythonPackages }:
{ pkgs, fetchurl, pythonPackages }:
buildPythonApplication rec {
version = "1.8.1-beta";
pythonPackages.buildPythonApplication rec {
version = "1.9.1";
name = "gmvault-${version}";
src = fetchurl {
url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz";
name = "${name}.tar.bz";
sha256 = "0b575cnrd6jzcpa05mbn2swzcy0r9ck09pkhs4ydj6d3ir52j80c";
sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji";
};
doCheck = false;
propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook
argparse ];
argparse chardet ];
startScript = ./gmvault.py;

5
pkgs/tools/networking/libreswan/default.nix
View File

@@ -42,14 +42,15 @@ stdenv.mkDerivation {
# Fix python script to use the correct python
sed -i -e 's|#!/usr/bin/python|#!/usr/bin/env python|' -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' programs/verify/verify.in
'';
# Set appropriate paths for build
preBuild = "export INC_USRLOCAL=\${out}";
makeFlags = [
makeFlags = [
"INITSYSTEM=systemd"
(if docs then "all" else "base")
];
CFLAGS = "-Wno-error=sign-compare";
installTargets = [ (if docs then "install" else "install-base") ];
# Hack to make install work

4
pkgs/tools/networking/modemmanager/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ModemManager-${version}";
version = "1.4.6";
version = "1.4.16";
src = fetchurl {
url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz";
sha256 = "1kd5nn5rm88c8rgmzwy2fsf3cr7fai7r85mi61kcby0hcgsapv8c";
sha256 = "1qhbi1mv8l2dvpw7fmw2p2fd51y0x3v1pqgnahd1ndfial3vqwss";
};
nativeBuildInputs = [ intltool pkgconfig ];

4
pkgs/tools/networking/network-manager-applet/default.nix
View File

@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "network-manager-applet";
version = networkmanager.version;
version = "1.2.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz";
sha256 = "02b42e7c17c9cd6c840563750da92ce58da1ec621df7f0c2402016026e727756";
sha256 = "0ym31m55hj65mmbq2yihy49z5x5z1qpx7jalk64kwx1rr5b2kxyz";
};
configureFlags = [ "--sysconfdir=/etc" ];

4
pkgs/tools/networking/network-manager/default.nix
View File

@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
name = "network-manager-${version}";
pname = "NetworkManager";
major = "1.2";
version = "${major}.2";
version = "${major}.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
sha256 = "41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9";
sha256 = "1alglc7xwi9q12l4xan5w3k0zmcz3zcjg01s8h8d0wnldlqbggqr";
};
preConfigure = ''

2
pkgs/tools/networking/network-manager/openconnect.nix
View File

@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-openconnect";
version = networkmanager.version;
version = "1.2.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz";

4
pkgs/tools/networking/network-manager/openvpn.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-openvpn";
version = networkmanager.version;
version = "1.2.6";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz";
sha256 = "47a6d219a781eff8491c7876b7fb95b12dcfb8f8a05f916f95afc65c7babddef";
sha256 = "1c0z7x5kkxi1mjimww7kpvci4071sviv1n3wk6r6r1wa1axy4wr3";
};
buildInputs = [ openvpn networkmanager libsecret ]

4
pkgs/tools/networking/network-manager/pptp.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-pptp";
version = networkmanager.version;
version = "1.2.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz";
sha256 = "a72cb88ecc0a9edec836e8042c592d68b8b290c0d78082e6b25cf08b46c6be5d";
sha256 = "0phc0fksxl6ql133yyirak3vw043k8a82dnlnpaydk1liivcx5xx";
};
buildInputs = [ networkmanager pptp ppp libsecret ]

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