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

Merge branch 'staging'

Browse Source
This commit is contained in:
Vladimír Čunát 2017-04-14 10:32:13 +02:00
commit 24444513fb
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
75 changed files with 1451 additions and 2704 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/default.nix
View File

@ -1,8 +1,3 @@
/* Library of low-level helper functions for nix expressions.
*
* Please implement (mostly) exhaustive unit tests
* for new functions in `./tests.nix'.
*/
let
# trivial, often used functions

10
lib/tests.nix
View File

@ -277,14 +277,4 @@ runTests {
expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
};
testComposeExtensions = {
expr = let obj = makeExtensible (self: { foo = self.bar; });
f = self: super: { bar = false; baz = true; };
g = self: super: { bar = super.baz or false; };
f_o_g = composeExtensions f g;
composed = obj.extend f_o_g;
in composed.foo;
expected = true;
};
}

9
lib/trivial.nix
View File

@ -85,15 +85,6 @@ rec {
# argument, but it's nice this way if several uses of `extends` are cascaded.
extends = f: rattrs: self: let super = rattrs self; in super // f self super;
# Compose two extending functions of the type expected by 'extends'
# into one where changes made in the first are available in the
# 'super' of the second
composeExtensions =
f: g: self: super:
let fApplied = f self super;
super' = super // fApplied;
in fApplied // g self super';
# Create an overridable, recursive attribute set. For example:
#
# nix-repl> obj = makeExtensible (self: { })

2
nixos/doc/manual/release-notes/rl-1709.xml
View File

@ -35,8 +35,6 @@ following incompatible changes:</para>
<itemizedlist>
<listitem>
<para>
Top-level <literal>idea</literal> package collection was renamed.
All JetBrains IDEs are now at <literal>jetbrains</literal>.
</para>
</listitem>
</itemizedlist>

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

@ -19,12 +19,6 @@ let
'';
};
domain = mkOption {
type = types.nullOr types.str;
default = null;
description = "Domain to fetch certificate for (defaults to the entry name)";
};
email = mkOption {
type = types.nullOr types.str;
default = null;
@ -163,10 +157,9 @@ in
servicesLists = mapAttrsToList certToServices cfg.certs;
certToServices = cert: data:
let
domain = if data.domain != null then data.domain else cert;
cpath = "${cfg.directory}/${cert}";
rights = if data.allowKeysForGroup then "750" else "700";
cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ]
++ optionals (data.email != null) [ "--email" data.email ]
++ concatMap (p: [ "-f" p ]) data.plugins
++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains);

3
nixos/modules/services/web-servers/lighttpd/gitweb.nix
View File

@ -60,8 +60,7 @@ in
"/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi"
)
setenv.add-environment = (
"GITWEB_CONFIG" => "${gitwebConfigFile}",
"HOME" => "${cfg.projectroot}"
"GITWEB_CONFIG" => "${gitwebConfigFile}"
)
}
'';

2
nixos/modules/system/boot/systemd-lib.nix
View File

@ -10,7 +10,7 @@ rec {
makeUnit = name: unit:
let
pathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""] name;
pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name;
in
if unit.enable then
pkgs.runCommand "unit-${pathSafeName}"

12
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View File

@ -820,10 +820,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnorb";
version = "1.2.3";
version = "1.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar";
sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7";
url = "https://elpa.gnu.org/packages/gnorb-1.2.1.tar";
sha256 = "0mip0czvpdl26xz9wamii5azj9bacjhdg0jgkrxyv17vqqlbag9x";
};
packageRequires = [ cl-lib ];
meta = {
@ -940,10 +940,10 @@
}) {};
ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "ivy";
version = "0.9.0";
version = "0.8.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-0.9.0.tar";
sha256 = "1p5gfy16xik613ib30mv4yac004z4lpsybmraln1badyd6n3b07s";
url = "https://elpa.gnu.org/packages/ivy-0.8.0.tar";
sha256 = "1c1impdk1p082v6nb9lms4n258z6ngz8ra90cshprs0ingrk705p";
};
packageRequires = [ emacs ];
meta = {

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

4
pkgs/applications/editors/jetbrains/common.nix → pkgs/applications/editors/idea/common.nix
View File

@ -63,10 +63,6 @@ with stdenv; lib.makeOverridable mkDerivation rec {
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
--prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
# Some internals want libstdc++.so.6
stdenv.cc.cc.lib
]}" \
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \

291
pkgs/applications/editors/jetbrains/default.nix → pkgs/applications/editors/idea/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
, coreutils, gnugrep, which, git, python, unzip, p7zip
, androidsdk, jdk
}:
@ -6,12 +6,10 @@
assert stdenv.isLinux;
let
mkJetBrainsProduct = callPackage ./common.nix { };
# Sorted alphabetically
mkIdeaProduct = callPackage ./common.nix { };
buildClion = { name, version, src, license, description, wmClass }:
(mkJetBrainsProduct rec {
(mkIdeaProduct rec {
inherit name version src wmClass jdk;
product = "CLion";
meta = with stdenv.lib; {
@ -26,43 +24,8 @@ let
};
});
buildDataGrip = { name, version, src, license, description, wmClass }:
(mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "DataGrip";
meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/datagrip/";
inherit description license;
longDescription = ''
DataGrip is a new IDE from JetBrains built for database admins.
It allows you to quickly migrate and refactor relational databases,
construct efficient, statically checked SQL queries and much more.
'';
maintainers = with maintainers; [ loskutov ];
platforms = platforms.linux;
};
});
buildGogland = { name, version, src, license, description, wmClass }:
(mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "Gogland";
meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/go/";
inherit description license;
longDescription = ''
Gogland is the codename for a new commercial IDE by JetBrains
aimed at providing an ergonomic environment for Go development.
The new IDE extends the IntelliJ platform with the coding assistance
and tool integrations specific for the Go language
'';
maintainers = [ maintainers.miltador ];
platforms = platforms.linux;
};
});
buildIdea = { name, version, src, license, description, wmClass }:
(mkJetBrainsProduct rec {
(mkIdeaProduct rec {
inherit name version src wmClass jdk;
product = "IDEA";
meta = with stdenv.lib; {
@ -78,8 +41,21 @@ let
};
});
buildRubyMine = { name, version, src, license, description, wmClass }:
(mkIdeaProduct rec {
inherit name version src wmClass jdk;
product = "RubyMine";
meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/ruby/";
inherit description license;
longDescription = description;
maintainers = with maintainers; [ edwtjo ];
platforms = platforms.linux;
};
});
buildPhpStorm = { name, version, src, license, description, wmClass }:
(mkJetBrainsProduct {
(mkIdeaProduct {
inherit name version src wmClass jdk;
product = "PhpStorm";
meta = with stdenv.lib; {
@ -95,8 +71,25 @@ let
};
});
buildWebStorm = { name, version, src, license, description, wmClass }:
(mkIdeaProduct {
inherit name version src wmClass jdk;
product = "WebStorm";
meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/webstorm/";
inherit description license;
longDescription = ''
WebStorm provides an editor for HTML, JavaScript (incl. Node.js),
and CSS with on-the-fly code analysis, error prevention and
automated refactorings for JavaScript code.
'';
maintainers = with maintainers; [ abaldeau ];
platforms = platforms.linux;
};
});
buildPycharm = { name, version, src, license, description, wmClass }:
(mkJetBrainsProduct rec {
(mkIdeaProduct rec {
inherit name version src wmClass jdk;
product = "PyCharm";
meta = with stdenv.lib; {
@ -122,101 +115,47 @@ let
propagatedUserEnvPkgs = [ python ];
};
buildRider = { name, version, src, license, description, wmClass }:
lib.overrideDerivation (mkJetBrainsProduct rec {
buildDataGrip = { name, version, src, license, description, wmClass }:
(mkIdeaProduct {
inherit name version src wmClass jdk;
product = "Rider";
product = "DataGrip";
meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/rider/";
homepage = "https://www.jetbrains.com/datagrip/";
inherit description license;
longDescription = ''
JetBrains Rider is a new .NET IDE based on the IntelliJ
platform and ReSharper. Rider supports .NET Core,
.NET Framework and Mono based projects. This lets you
develop a wide array of applications including .NET desktop
apps, services and libraries, Unity games, ASP.NET and
ASP.NET Core web applications.
DataGrip is a new IDE from JetBrains built for database admins.
It allows you to quickly migrate and refactor relational databases,
construct efficient, statically checked SQL queries and much more.
'';
maintainers = [ maintainers.miltador ];
platforms = platforms.linux;
};
}) (attrs: {
patchPhase = attrs.patchPhase + ''
# Patch built-in mono for ReSharperHost to start successfully
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen
'';
});
buildRubyMine = { name, version, src, license, description, wmClass }:
(mkJetBrainsProduct rec {
inherit name version src wmClass jdk;
product = "RubyMine";
meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/ruby/";
inherit description license;
longDescription = description;
maintainers = with maintainers; [ edwtjo ];
maintainers = with maintainers; [ loskutov ];
platforms = platforms.linux;
};
});
buildWebStorm = { name, version, src, license, description, wmClass }:
(mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "WebStorm";
meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/webstorm/";
inherit description license;
longDescription = ''
WebStorm provides an editor for HTML, JavaScript (incl. Node.js),
and CSS with on-the-fly code analysis, error prevention and
automated refactorings for JavaScript code.
'';
maintainers = with maintainers; [ abaldeau ];
platforms = platforms.linux;
};
});
in
{
# Sorted alphabetically
clion = buildClion rec {
name = "clion-${version}";
version = "2017.1";
version = "2016.3.3";
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "00fc023ca56f2781864cddc7bd5c2897d837d1db17dd8f987abe046ed4df3ca5";
sha256 = "1zziyg0y51lfybflq83qwd94wcypkv4gh0cdkwfybbk4yidpnz05";
};
wmClass = "jetbrains-clion";
};
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
version = "2017.1";
description = "Your Swiss Army Knife for Databases and SQL";
clion1 = buildClion rec {
name = "clion-${version}";
version = "1.2.5";
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa";
url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp";
};
wmClass = "jetbrains-datagrip";
};
gogland = buildGogland rec {
name = "gogland-${version}";
version = "171.3780.106";
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "cbe84d07fdec6425d8ac63b0ecd5e04148299c1c0c6d05751523aaaa9360110b";
};
wmClass = "jetbrains-gogland";
wmClass = "jetbrains-clion";
};
idea14-community = buildIdea rec {
@ -279,74 +218,14 @@ in
wmClass = "jetbrains-idea";
};
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2017.1";
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
};
wmClass = "jetbrains-phpstorm";
};
phpstorm10 = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "10.0.4";
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
};
wmClass = "jetbrains-phpstorm";
};
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2017.1";
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "14p6f15n0927awgpsdsdqgmdfbbwkykrw5xggz5hnfl7d05i4sb6";
};
wmClass = "jetbrains-pycharm-ce";
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2017.1";
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1rvic3njsq480pslhw6rxld7jngchihkplq3dfnmkr2h9gx26lkf";
};
wmClass = "jetbrains-pycharm";
};
rider = buildRider rec {
name = "rider-${version}";
version = "171.3655.1246";
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz";
sha256 = "90f9f8f1919e0f1dad42387f1a308483448323b089c13c409f3dd4d52992266b";
};
wmClass = "jetbrains-rider";
};
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2017.1";
version = "2016.3.2";
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "6c27f43ddc385ffba2cb2f011b80ab46d9b128d0fccf3b4ea43272fe36401a3a";
sha256 = "1fqlrvhlk09z8nx68qv4nqs5n8ldia3lixsl6r04gsfyl1a69sb6";
};
wmClass = "jetbrains-rubymine";
};
@ -375,6 +254,54 @@ in
wmClass = "jetbrains-rubymine";
};
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2017.1";
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "14p6f15n0927awgpsdsdqgmdfbbwkykrw5xggz5hnfl7d05i4sb6";
};
wmClass = "jetbrains-pycharm-ce";
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2017.1";
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1rvic3njsq480pslhw6rxld7jngchihkplq3dfnmkr2h9gx26lkf";
};
wmClass = "jetbrains-pycharm";
};
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2017.1";
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
};
wmClass = "jetbrains-phpstorm";
};
phpstorm10 = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "10.0.4";
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
};
wmClass = "jetbrains-phpstorm";
};
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2017.1";
@ -410,4 +337,16 @@ in
};
wmClass = "jetbrains-webstorm";
};
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
version = "2016.3.2";
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3";
};
wmClass = "jetbrains-datagrip";
};
}

4
pkgs/applications/editors/nano/default.nix
View File

@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
name = "nano-${version}";
version = "2.8.1";
version = "2.8.0";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
sha256 = "02vdnv30ms2s53ch5j4ldch5sxwjsg3098zkvwrwhi9k6yxshdg9";
sha256 = "1hjxr0kgq3q1fcns9y4lj0dbhjf33j3pa2wayrb3p3c8v3sbrh8m";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

22
pkgs/applications/misc/gpsbabel/clang-4.patch
View File

@ -1,22 +0,0 @@
diff --git a/bushnell.cc b/bushnell.cc
index 8fa844d..40707c4 100644
--- a/bushnell.cc
+++ b/bushnell.cc
@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name)
name = "Waypoint";
}
- for (t = bushnell_icons; t->icon > 0; t++) {
+ for (t = bushnell_icons; t->icon != 0; t++) {
if (0 == name.compare(t->icon, Qt::CaseInsensitive)) {
return t->symbol;
}
@@ -147,7 +147,7 @@ static const char*
bushnell_get_name_from_symbol(signed int s)
{
icon_mapping_t* t;
- for (t = bushnell_icons; t->icon > 0; t++) {
+ for (t = bushnell_icons; t->icon != 0; t++) {
if (s == t->symbol) {
return t->icon;
}

14
pkgs/applications/misc/gpsbabel/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }:
{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }:
stdenv.mkDerivation rec {
name = "gpsbabel-${version}";
@ -12,15 +12,13 @@ stdenv.mkDerivation rec {
};
patches = [
./clang-4.patch
(fetchpatch {
url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip;
sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr";
})
];
buildInputs = [ zlib qt4 which ]
++ lib.optionals stdenv.isDarwin [ IOKit ];
buildInputs = [ zlib qt4 which ];
/* FIXME: Building the documentation, with "make doc", requires this:
@ -42,11 +40,11 @@ stdenv.mkDerivation rec {
patchShebangs testo
substituteInPlace testo \
--replace "-x /usr/bin/hexdump" ""
''
'' + (
# The raymarine and gtm tests fail on i686 despite -ffloat-store.
+ lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"
# The gtm, kml and tomtom asc tests fail on darwin, see PR #23572.
+ lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test";
if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;"
else ""
);
meta = with stdenv.lib; {
description = "Convert, upload and download data from GPS and Map programs";

1
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -82,7 +82,6 @@ stdenv.mkDerivation {
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc
alsaLib
alsaLib.dev
atk
cairo
curl

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "terragrunt-${version}";
version = "0.11.1";
version = "0.11.0";
goPackagePath = "github.com/gruntwork-io/terragrunt";
@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
sha256 = "0i0ds6llkzrn6a0qq53d2pbb6ghc47lnd004zqfbgn3kwiajx73b";
};
goDeps = ./deps.nix;

18
pkgs/applications/networking/cluster/terragrunt/deps.nix
View File

@ -1,12 +1,12 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
# This file was generated by go2nix.
[
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "c790b8046767d9c773ad83c327ab988312f85a94";
sha256 = "0bhk7j088r8hhf05l70gpfnprxk7vzgb1fql9brk065hw2xnplsr";
rev = "78568b07950e5e7948496878fe99b9436add41d4";
sha256 = "0qi3q9qx8k055i2hlc6n8agl7nw1hzcw7aqqykla6z0hjv2hq0c3";
};
}
{
@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-getter";
rev = "e48f67b534e614bf7fbd978fd0020f61a17b7527";
sha256 = "0dlmirfi0pfbwylcjf2mggzav5r7bzdy19m3by6dgarn6izx6g7i";
rev = "c3d66e76678dce180a7b452653472f949aedfbcd";
sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7";
};
}
{
@ -77,8 +77,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "53818660ed4955e899c0bcafa97299a388bd7c8e";
sha256 = "10gdkk8gcjv0lg15ajy68dwgvfkjhawk08ccs9x9ym1adp6l2ycs";
rev = "db1efb556f84b25a0a13a04aad883943538ad2e0";
sha256 = "1pl1rwc9q3kz0banwi493cyhmn5mlc4mb97sx68jkdz6pck7fy0h";
};
}
{
@ -95,8 +95,8 @@
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "8ba6f23b6e36d03666a14bd9421f5e3efcb59aca";
sha256 = "01s53ny3p0fdx64rnwcnmjj4xpc5adihnh6islsfq5z1ph2phhnj";
rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53";
sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db";
};
}
]

13
pkgs/applications/video/kodi/default.nix
View File

@ -43,15 +43,6 @@ let
url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz";
sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
};
# Usage of kodi fork of libdvdnav and libdvdread is necessary for functional dvd playback:
libdvdnav_src = fetchurl {
url = "https://github.com/xbmc/libdvdnav/archive/981488f.tar.gz";
sha256 = "312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d";
};
libdvdread_src = fetchurl {
url = "https://github.com/xbmc/libdvdread/archive/17d99db.tar.gz";
sha256 = "e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b";
};
in stdenv.mkDerivation rec {
name = "kodi-${version}";
version = "17.1";
@ -101,8 +92,8 @@ in stdenv.mkDerivation rec {
--replace "/bin/bash" "${bash}/bin/bash -ex"
cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz
ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
cp ${libdvdnav_src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
cp ${libdvdread_src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
'';
preConfigure = ''

12
pkgs/applications/window-managers/trayer/default.nix
View File

@ -1,21 +1,17 @@
{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2, libXmu }:
stdenv.mkDerivation rec {
name = "trayer-1.1.7";
name = "trayer-1.1.6";
buildInputs = [ pkgconfig gdk_pixbuf gtk2 ];
buildInputs = [ pkgconfig gdk_pixbuf gtk2 libXmu ];
src = fetchFromGitHub {
owner = "sargon";
repo = "trayer-srg";
rev = name;
sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a";
sha256 = "0mmya7a1qh3zyqgvcx5fz2lvr9n0ilr490l1j3z4myahi4snk2mg";
};
preConfigure = ''
patchShebangs configure
'';
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {

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

@ -52,12 +52,11 @@ let
export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin'
export PKG_CONFIG_PATH=/usr/lib/pkgconfig
# Force compilers and other tools to look in default search paths
# Force compilers to look in default search paths
export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32'
export PKG_CONFIG_PATH=/usr/lib/pkgconfig
export ACLOCAL_PATH=/usr/share/aclocal
${profile}
'';

2
pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [ ./nix_share_path.patch ];
meta = with stdenv.lib; {
platforms = with platforms; linux ++ darwin;
platforms = platforms.linux;
maintainers = gnome3.maintainers;
};
}

3
pkgs/development/libraries/glibc/common.nix
View File

@ -48,7 +48,8 @@ stdenv.mkDerivation ({
"/bin:/usr/bin", which is inappropriate on NixOS machines. This
patch extends the search path by "/run/current-system/sw/bin". */
./fix_path_attribute_in_getconf.patch
];
]
++ lib.optional stdenv.isi686 ./fix-i686-memchr.patch;
postPatch =
# Needed for glibc to build with the gnumake 3.82

23
pkgs/development/libraries/glibc/fix-i686-memchr.patch Normal file
View File

@ -0,0 +1,23 @@
Fix i686 memchr overflow calculation (BZ#21182)
https://sourceware.org/git/?p=glibc.git;a=commit;h=3abeeec5f46ff03
diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S
index 910679c..e41f324 100644
--- a/sysdeps/i386/i686/multiarch/memchr-sse2.S
+++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S
@@ -117,7 +117,6 @@ L(crosscache):
# ifndef USE_AS_RAWMEMCHR
jnz L(match_case2_prolog1)
- lea -16(%edx), %edx
/* Calculate the last acceptable address and check for possible
addition overflow by using satured math:
edx = ecx + edx
@@ -125,6 +124,7 @@ L(crosscache):
add %ecx, %edx
sbb %eax, %eax
or %eax, %edx
+ sub $16, %edx
jbe L(return_null)
lea 16(%edi), %edi
# else

4
pkgs/development/libraries/gmp/6.x.nix
View File

@ -3,11 +3,11 @@
let inherit (stdenv.lib) optional optionalString; in
let self = stdenv.mkDerivation rec {
name = "gmp-6.1.1";
name = "gmp-6.1.2";
src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
sha256 = "1mpzprdzkgfpdc1v2lf4dxlxps4x8bvmzvd8n1ri6gw9y9jrh458";
sha256 = "1clg7pbpk6qwxj5b2mw0pghzawp2qlm3jf9gdd8i6fl6yh2bnxaj";
};
#outputs TODO: split $cxx due to libstdc++ dependency

10
pkgs/development/libraries/gnutls/3.5.10.nix Normal file
View File

@ -0,0 +1,10 @@
{ callPackage, fetchurl, libunistring, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.5.10";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
};
})

12
pkgs/development/libraries/gnutls/3.5.nix
View File

@ -1,10 +1,18 @@
{ callPackage, fetchurl, libunistring, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.5.10";
version = "3.5.11";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
sha256 = "13z2dxxyrsb7gfpl1k2kafqh2zaigi872y5xgykhs9cyaz2mqxji";
};
# Skip two tests introduced in 3.5.11. Probable reasons of failure:
# - pkgconfig: building against the result won't work before installing
# - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox
postPatch = ''
sed '2iexit 77' -i tests/pkgconfig.sh
sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c
'';
})

9
pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
View File

@ -57,16 +57,15 @@ diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
index 838d343..ca7fc0d 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -53,10 +53,27 @@ def _resolve_libtool(options, binary, libraries):
@@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
# Match absolute paths on OS X to conform to how libraries are usually
# referenced on OS X systems.
def _ldd_library_pattern(library_name):
+ nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
pattern = "(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
if platform.system() == 'Darwin':
pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
- if platform.system() == 'Darwin':
- pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
- return re.compile(pattern % re.escape(library_name))
+ return re.compile(pattern % re.escape(library_name))
+ pattern = r'''
+ (
+ (?:
@ -86,7 +85,7 @@ index 838d343..ca7fc0d 100644
# This is a what we do for non-la files. We assume that we are on an
@@ -115,7 +132,11 @@ def _resolve_non_libtool(options, binary, libraries):
@@ -115,7 +129,11 @@ def _resolve_non_libtool(options, binary, libraries):
m = pattern.search(line)
if m:
del patterns[library]

7
pkgs/development/libraries/gtk-mac-integration/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }:
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk }:
stdenv.mkDerivation rec {
name = "gtk-mac-integration-2.0.8";
@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";
};
nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ];
buildInputs = [ glib ];
propagatedBuildInputs = [ gtk ];
nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc ];
buildInputs = [ glib gtk ];
preAutoreconf = ''
gtkdocize

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
stdenv.mkDerivation rec {
name = "libdrm-2.4.76";
name = "libdrm-2.4.79";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "7cdfb83ea77def453299dd95332aa9257c9f3534ff5844f5c0ce87265c275f3a";
sha256 = "c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/libressl/2.5.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libressl-${version}";
version = "2.5.3";
version = "2.5.1";
src = fetchurl {
url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
sha256 = "0c4awq45cl757fv7f7f75i5i0ibc6v7ns13n7xvfak7chv2lrqql";
sha256 = "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp";
};
enableParallelBuilding = true;

12
pkgs/development/libraries/libsigsegv/aarch64.patch
View File

@ -1,12 +0,0 @@
diff --git a/configure b/configure
index 6c4e868..0298e19 100755
--- a/configure
+++ b/configure
@@ -14501,6 +14501,7 @@ else
case "$host_cpu" in
a29k | \
+ aarch64* | \
alpha* | \
arc | \
arm* | strongarm* | xscale* | \

13
pkgs/development/libraries/libsigsegv/default.nix
View File

@ -1,21 +1,14 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "libsigsegv-2.10";
name = "libsigsegv-2.11";
src = fetchurl {
url = "mirror://gnu/libsigsegv/${name}.tar.gz";
sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44";
sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x";
};
# Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch
# but applied directly to configure since we can't use autoreconf while bootstrapping.
patches = if stdenv.isAarch64 || stdenv.cross.arch or "" == "aarch64"
then [ ./aarch64.patch ]
else null; # TODO: change to lib.optional on next mass rebuild
# https://github.com/NixOS/nixpkgs/issues/6028
doCheck = false;
doCheck = true;
meta = {
homepage = http://www.gnu.org/software/libsigsegv/;

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

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "libsndfile-1.0.27";
name = "libsndfile-1.0.28";
src = fetchurl {
url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz";
sha256 = "1h7s61nhf7vklh9sdsbbqzb6x287q4x4j1jc5gmjragl4wprb4d3";
sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz";
};
buildInputs = [ pkgconfig flac libogg libvorbis ]

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

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "lzo-2.09";
name = "lzo-2.10";
src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz";
sha256 = "0k5kpj3jnsjfxqqkblpfpx0mqcy86zs5fhjhgh2kq1hksg7ag57j";
sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60";
};
configureFlags = [ "--enable-shared" ];

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

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1";
NIX_CFLAGS = "-D__STDC_CONSTANT_MACROS=1";
patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];

1
pkgs/development/libraries/science/math/openblas/default.nix
View File

@ -98,6 +98,7 @@ stdenv.mkDerivation {
''PREFIX="''$(out)"''
"NUM_THREADS=64"
"INTERFACE64=${if blas64 then "1" else "0"}"
"NO_STATIC=1"
]
++ mapAttrsToList (var: val: var + "=" + val) config;

2
pkgs/development/libraries/science/math/suitesparse/4.2.nix
View File

@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
"LAPACK="
];
NIX_CFLAGS = "-fPIC";
meta = with stdenv.lib; {
homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
description = "A suite of sparse matrix algorithms";

2
pkgs/development/libraries/science/math/suitesparse/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation {
"LAPACK="
];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
NIX_CFLAGS = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
postInstall = ''
# Build and install shared library

58
pkgs/development/libraries/webkitgtk/2.14.nix
View File

@ -2,7 +2,7 @@
, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
, libidn, libedit, readline, mesa, libintlOrEmpty
, libidn
, enableGeoLocation ? true, geoclue2, sqlite
, gst-plugins-base
}:
@ -18,27 +18,12 @@ stdenv.mkDerivation rec {
description = "Web content rendering engine, GTK+ port";
homepage = "http://webkitgtk.org/";
license = licenses.bsd2;
platforms = with platforms; linux ++ darwin;
platforms = platforms.linux;
hydraPlatforms = [];
maintainers = with maintainers; [ ];
};
postConfigure = optionalString stdenv.isDarwin ''
substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \
--replace "../../lib/libWTFGTK.a" ""
substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
--replace "../../lib/libbmalloc.a" ""
sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \
Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
--replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a"
'';
preConfigure = "patchShebangs Tools";
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
@ -47,54 +32,29 @@ stdenv.mkDerivation rec {
# see if we can clean this up....
patches = [ ./finding-harfbuzz-icu.patch ]
++ optionals stdenv.isDarwin [
./PR-152650-2.patch
./PR-153138.patch
./PR-157554.patch
./PR-157574.patch
];
patches = [ ./finding-harfbuzz-icu.patch ];
cmakeFlags = [
"-DPORT=GTK"
"-DUSE_LIBHYPHEN=0"
]
++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
++ optionals stdenv.isDarwin [
"-DUSE_SYSTEM_MALLOC=ON"
"-DUSE_ACCELERATE=0"
"-DENABLE_INTROSPECTION=ON"
"-DENABLE_MINIBROWSER=OFF"
"-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
"-DENABLE_MINIBROWSER=OFF"
"-DENABLE_VIDEO=ON"
"-DENABLE_QUARTZ_TARGET=ON"
"-DENABLE_X11_TARGET=OFF"
"-DENABLE_OPENGL=OFF"
"-DENABLE_WEB_AUDIO=OFF"
"-DENABLE_WEBGL=OFF"
"-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
"-DENABLE_GTKDOC=OFF"
"-DENABLE_GLES2=ON"
];
# XXX: WebKit2 missing include path for gst-plugins-base.
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"
+ (optionalString stdenv.isDarwin " -lintl");
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
nativeBuildInputs = [
cmake perl python2 ruby bison gperf sqlite
pkgconfig gettext gobjectIntrospection
];
buildInputs = libintlOrEmpty ++ [
gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
buildInputs = [
gtk2 wayland libwebp enchant libnotify gnutls pcre nettle libidn
libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
gst-plugins-base libxkbcommon epoxy at_spi2_core
] ++ optional enableGeoLocation geoclue2
++ (with xlibs; [ libXdmcp libXt libXtst ])
++ optionals stdenv.isDarwin [ libedit readline mesa ]
++ optional stdenv.isLinux wayland;
++ (with xlibs; [ libXdmcp libXt libXtst ]);
propagatedBuildInputs = [
libsoup gtk3

62
pkgs/development/libraries/webkitgtk/PR-152650-2.patch
View File

@ -1,62 +0,0 @@
From 4607ea0a569b3c527ae8dce341ab55eb0d69d8f7 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 8 Mar 2016 17:26:23 -0800
Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac
https://bugs.webkit.org/show_bug.cgi?id=152650
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
ChangeLog | 10 ++++++++++
Source/PlatformGTK.cmake | 2 +-
Source/cmake/OptionsGTK.cmake | 5 -----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
index af4d2e3..0b11b56 100644
--- a/Source/PlatformGTK.cmake
+++ b/Source/PlatformGTK.cmake
@@ -34,7 +34,7 @@ endmacro()
add_gtkdoc_generator("docs-build.stamp" "")
if (ENABLE_GTKDOC)
add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
-elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
+elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING)
add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
# Add a default build step which check that documentation does not have any warnings
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 6b01f1a..b443d10 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING)
set(ENABLE_INTROSPECTION OFF)
endif ()
-# Override the cached variable, gtk-doc does not really work when building on Mac.
-if (APPLE)
- set(ENABLE_GTKDOC OFF)
-endif ()
-
set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
index 4c8237b..a628ae0 100644
--- a/Tools/gtk/gtkdoc.py
+++ b/Tools/gtk/gtkdoc.py
@@ -322,6 +322,11 @@ class GTKDoc(object):
env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
else:
env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
+ current_dyld_library_path = env.get('DYLD_LIBRARY_PATH')
+ if current_ld_library_path:
+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path)
+ else:
+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path
if ldflags:
env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
--
2.7.2

26
pkgs/development/libraries/webkitgtk/PR-153138.patch
View File

@ -1,26 +0,0 @@
From 07886d9eacb7587dd52a9bcae10c1fc8ab56a910 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri, 15 Jan 2016 11:53:07 -0800
Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=153138
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
Source/JavaScriptCore/bytecode/StructureStubInfo.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
index 1e4b4f5..9b27aed 100644
--- a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
+++ b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
@@ -26,6 +26,8 @@
#include "config.h"
#include "StructureStubInfo.h"
+#include "JSCellInlines.h"
+
#include "JSObject.h"
#include "PolymorphicAccess.h"
#include "Repatch.h"
--
2.7.0

33
pkgs/development/libraries/webkitgtk/PR-157554.patch
View File

@ -1,33 +0,0 @@
https://bugs.webkit.org/show_bug.cgi?id=157554
--- a/Source/WTF/wtf/OSRandomSource.cpp
+++ b/Source/WTF/wtf/OSRandomSource.cpp
@@ -29,7 +29,7 @@
#include <stdint.h>
#include <stdlib.h>
-#if !OS(DARWIN) && OS(UNIX)
+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
@@ -46,7 +46,7 @@
namespace WTF {
-#if !OS(DARWIN) && OS(UNIX)
+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
{
CRASH();
@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length)
{
-#if OS(DARWIN)
- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
+#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ return arc4random_buf(buffer, length);
#elif OS(UNIX)
int fd = open("/dev/urandom", O_RDONLY, 0);
if (fd < 0)

62
pkgs/development/libraries/webkitgtk/PR-157574.patch
View File

@ -1,62 +0,0 @@
diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
index ab53183..1310dec 100644
--- a/Source/JavaScriptCore/API/WebKitAvailability.h
+++ b/Source/JavaScriptCore/API/WebKitAvailability.h
@@ -27,57 +27,12 @@
#define __WebKitAvailability__
#if defined(__APPLE__)
-
-#include <AvailabilityMacros.h>
#include <CoreFoundation/CoreFoundation.h>
-
-#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-/* To support availability macros that mention newer OS X versions when building on older OS X versions,
- we provide our own definitions of the underlying macros that the availability macros expand to. We're
- free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with
- an application rather than as part of the system.
-*/
-
-#ifndef __NSi_10_10 // Building from trunk rather than SDK.
-#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available.
-#endif
-
-#ifndef __NSi_10_11 // Building from trunk rather than SDK.
-#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
-#endif
-
-#ifndef __NSi_10_12 // Building from trunk rather than SDK.
-#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available.
-#endif
-
-#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
-#define __AVAILABILITY_INTERNAL__MAC_10_9
-#endif
-
-#ifndef __AVAILABILITY_INTERNAL__MAC_10_10
-#define __AVAILABILITY_INTERNAL__MAC_10_10
#endif
-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
-#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
-#endif
-
-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
-#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
-#endif
-
-#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
-
-#if defined(BUILDING_GTK__)
#undef CF_AVAILABLE
#define CF_AVAILABLE(_mac, _ios)
#undef CF_ENUM_AVAILABLE
#define CF_ENUM_AVAILABLE(_mac, _ios)
-#endif
-
-#else
-#define CF_AVAILABLE(_mac, _ios)
-#define CF_ENUM_AVAILABLE(_mac, _ios)
-#endif
#endif /* __WebKitAvailability__ */

17
pkgs/development/python-modules/phonenumbers/default.nix
View File

@ -1,17 +0,0 @@
{ stdenv, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
name = "phonenumbers-8.4.0";
meta = {
description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
homepage = "https://github.com/daviddrysdale/python-phonenumbers";
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ fadenb ];
};
src = fetchurl {
url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
sha256 = "1c052gd7ra3v183jq2x5nwa428wxh1g3psfh0ay5jwwmcxy78vab";
};
}

25
pkgs/development/tools/compile-daemon/default.nix
View File

@ -1,25 +0,0 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "compile-daemon-unstable-${version}";
version = "2017-03-08";
rev = "d447e567232bcb84cedd3b2be012c7127f31f469";
goPackagePath = "github.com/githubnemo/CompileDaemon";
src = fetchFromGitHub {
owner = "githubnemo";
repo = "CompileDaemon";
inherit rev;
sha256 = "0jfbipp3gd89n6d7gds1qvfkqvz80qdlqqhijxffh8z8ss0xinqc";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "Very simple compile daemon for Go";
license = licenses.bsd2;
maintainers = with maintainers; [ profpatsch ];
inherit (src.meta) homepage;
};
}

48
pkgs/development/tools/compile-daemon/deps.nix
View File

@ -1,48 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0-devel
[
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "9131ab34cf20d2f6d83fdc67168a5430d1c7dc23";
sha256 = "111x6rhpxfjhwkjrmrirqqh6nc68q5g7air9fl5kgr3bg85hybr5";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "a392f450ea64cee2b268dfaacdc2502b50a22b18";
sha256 = "1msiq5nb1sdhwfjv65hjnvr2s4pfsp8mv6f5z8aa8n9bjf0cksyc";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "57fdcb988a5c543893cc61bce354a6e24ab70022";
sha256 = "1fkhmi3nhz6vasfvjzjjwxkbpwsb9hzc0g5h1rygqrnzjykl2r39";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "99f16d856c9836c42d24e7ab64ea72916925fa97";
sha256 = "0g2x5krfhnraq03v0b48y3xv3ffg92pbgvps0npj9l7wq8q9hkmx";
};
}
{
goPackagePath = "gopkg.in/fsnotify.v1";
fetch = {
type = "git";
url = "https://gopkg.in/fsnotify.v1";
rev = "629574ca2a5df945712d3079857300b5e4da0236";
sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
};
}
]

1
pkgs/development/tools/misc/hydra/default.nix
View File

@ -55,7 +55,6 @@ let
TextTable
XMLSimple
nixUnstable
nixUnstable.perl-bindings
git
boehmgc
];

36
pkgs/development/tools/pypi2nix/default.nix
View File

@ -1,24 +1,23 @@
{ stdenv, fetchurl, pythonPackages, zip, makeWrapper, nix, nix-prefetch-git
, nix-prefetch-hg
{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts
}:
let
version = "1.8.0";
version = "1.6.0";
src = fetchurl {
url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
sha256 = "133sjx8r1jdb5gi3caawa9m7v496jv4id2c3zqnx8hria22425za";
sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn";
};
click = fetchurl {
url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz";
sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
};
requests = fetchurl {
url = "https://pypi.python.org/packages/16/09/37b69de7c924d318e51ece1c4ceb679bf93be9d05973bb30c35babd596e2/requests-2.13.0.tar.gz";
sha256 = "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp";
url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz";
sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d";
};
in stdenv.mkDerivation rec {
@ -28,11 +27,7 @@ in stdenv.mkDerivation rec {
click
requests
];
buildInputs = [
pythonPackages.python pythonPackages.flake8
zip makeWrapper nix.out nix-prefetch-git nix-prefetch-hg
];
buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ];
sourceRoot = ".";
postUnpack = ''
@ -52,14 +47,13 @@ in stdenv.mkDerivation rec {
patchPhase = ''
sed -i -e "s|default='nix-shell',|default='${nix.out}/bin/nix-shell',|" $out/pkgs/pypi2nix/cli.py
sed -i -e "s|nix-prefetch-git|${nix-prefetch-git}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py
sed -i -e "s|nix-prefetch-hg|${nix-prefetch-hg}/bin/nix-prefetch-hg|" $out/pkgs/pypi2nix/stage2.py
sed -i -e "s|nix-prefetch-git|${nix-prefetch-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py
'';
commonPhase = ''
mkdir -p $out/bin
echo "#!${pythonPackages.python.interpreter}" > $out/bin/pypi2nix
echo "#!${python.interpreter}" > $out/bin/pypi2nix
echo "import pypi2nix.cli" >> $out/bin/pypi2nix
echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
@ -68,16 +62,8 @@ in stdenv.mkDerivation rec {
export PYTHONPATH=$out/pkgs:$PYTHONPATH
'';
# flake8 doesn't run on python3
doCheck = false;
checkPhase = ''
flake8 ${src}/src
'';
installPhase = commonPhase + ''
wrapProgram $out/bin/pypi2nix \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PATH : "${nix-prefetch-git}/bin:${nix-prefetch-hg}/bin"
wrapProgram $out/bin/pypi2nix --prefix PYTHONPATH : "$PYTHONPATH"
'';
shellHook = ''

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

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt
, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev
, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr
, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
@ -11,7 +11,7 @@ let
libPath64 = lib.makeLibraryPath [
gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr
alsaLib GConf cups libcap fontconfig freetype pango
cairo dbus expat zlib libpng12 udev
cairo dbus expat zlib libpng12
libX11 libXcursor libXdamage libXfixes libXrender libXi
libXcomposite libXext libXrandr libXtst libSM libICE libxcb
];
@ -25,16 +25,19 @@ let
gnome-sharp gtk-sharp-2_0
];
ver = "5.5.3";
ver = "5.3.5";
build = "f1";
date = "20160525";
pkgVer = "${ver}${build}";
fullVer = "${pkgVer}+${date}";
in stdenv.mkDerivation rec {
name = "unity-editor-${version}";
version = "${ver}x${build}";
version = pkgVer;
src = fetchurl {
url = "http://beta.unity3d.com/download/a2454d41e248/unity-editor-installer-${version}Linux.sh";
sha256 = "1hvas4n1hm0qp0265gk1nh03kypd9690fnxvzg70f5ni9q97pvm0";
url = "http://download.unity3d.com/download_unity/linux/unity-editor-installer-${fullVer}.sh";
sha256 = "0lmc65175fdvbyn3565pjlg6cc4l5i58fj7bxzi5cqykkbzv5wdm";
};
nosuidLib = ./unity-nosuid.c;
@ -43,10 +46,9 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "monodevelop" ];
sourceRoot = "unity-editor-${version}Linux";
unpackPhase = ''
echo -e 'q\ny' | fakeroot sh $src
sourceRoot="unity-editor-${pkgVer}"
'';
buildPhase = ''
@ -123,7 +125,6 @@ in stdenv.mkDerivation rec {
'';
dontStrip = true;
dontPatchELF = true;
meta = with stdenv.lib; {
homepage = https://unity3d.com/;

6
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
View File

@ -76,7 +76,11 @@ appleDerivation rec {
/usr/lib/libSystem.dylib \
-reexported_symbols_list ${./system_symbols}
libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }')
# We used to determine these impurely based on the host system, but then when we got some 10.12 Hydra boxes,
# one of them accidentally built this derivation, referenced libsystem_symptoms.dylib, which doesn't exist on
# 10.11, and then broke all subsequent builds on 10.11. By picking a 10.11 compatible subset of the libraries,
# we avoid scary impurity issues like that.
libs=$(cat ${./reexported_libraries} | grep -v '^#')
for i in $libs; do
if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then

41
pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries Normal file
View File

@ -0,0 +1,41 @@
# These are generated with otool -L /usr/lib/libSystem.dylib on a 10.11 machine
/usr/lib/system/libcache.dylib
/usr/lib/system/libcommonCrypto.dylib
/usr/lib/system/libcompiler_rt.dylib
/usr/lib/system/libcopyfile.dylib
/usr/lib/system/libcorecrypto.dylib
/usr/lib/system/libdispatch.dylib
/usr/lib/system/libdyld.dylib
/usr/lib/system/libkeymgr.dylib
/usr/lib/system/liblaunch.dylib
/usr/lib/system/libmacho.dylib
/usr/lib/system/libquarantine.dylib
/usr/lib/system/libremovefile.dylib
/usr/lib/system/libsystem_asl.dylib
/usr/lib/system/libsystem_blocks.dylib
# We handle this specially in the expression
# /usr/lib/system/libsystem_c.dylib
/usr/lib/system/libsystem_configuration.dylib
/usr/lib/system/libsystem_coreservices.dylib
/usr/lib/system/libsystem_coretls.dylib
/usr/lib/system/libsystem_dnssd.dylib
/usr/lib/system/libsystem_info.dylib
# We handle this specially in the expression
# /usr/lib/system/libsystem_kernel.dylib
/usr/lib/system/libsystem_m.dylib
/usr/lib/system/libsystem_malloc.dylib
/usr/lib/system/libsystem_network.dylib
/usr/lib/system/libsystem_networkextension.dylib
/usr/lib/system/libsystem_notify.dylib
/usr/lib/system/libsystem_platform.dylib
/usr/lib/system/libsystem_pthread.dylib
/usr/lib/system/libsystem_sandbox.dylib
/usr/lib/system/libsystem_secinit.dylib
/usr/lib/system/libsystem_trace.dylib
/usr/lib/system/libunc.dylib
/usr/lib/system/libunwind.dylib
/usr/lib/system/libxpc.dylib

98
pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
View File

@ -1,98 +0,0 @@
diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
index 09c0e12..ac6b085 100644
--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
+++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
@@ -187,6 +187,7 @@ struct DynamicLibrary {
ld::File::ObjcConstraint _objcConstraint;
Options::Platform _platform;
std::vector<Token> _allowedClients;
+ std::vector<Token> _allowableClients;
std::vector<Token> _reexportedLibraries;
std::vector<Token> _symbols;
std::vector<Token> _classes;
@@ -246,6 +247,14 @@ class TBDFile {
});
}
+ void parseAllowableClients(DynamicLibrary& lib) {
+ if ( !hasOptionalToken("allowable-clients") )
+ return;
+ parseFlowSequence([&](Token name) {
+ lib._allowableClients.emplace_back(name);
+ });
+ }
+
void parseReexportedDylibs(DynamicLibrary& lib) {
if ( !hasOptionalToken("re-exports") )
return;
@@ -306,6 +315,21 @@ class TBDFile {
return false;
}
+ void skipUUIDs(DynamicLibrary& lib) {
+ expectToken("uuids");
+ while ( true ) {
+ auto token = next();
+ if ( token == "]" )
+ break;
+ }
+ }
+
+ void skipParentUmbrella(DynamicLibrary& lib) {
+ if (!hasOptionalToken("parent-umbrella"))
+ return;
+ next();
+ }
+
void parsePlatform(DynamicLibrary& lib) {
expectToken("platform");
@@ -410,6 +434,7 @@ class TBDFile {
}
parseAllowedClients(lib);
+ parseAllowableClients(lib);
parseReexportedDylibs(lib);
parseSymbols(lib);
if ( !hasOptionalToken("-") )
@@ -455,17 +480,21 @@ class TBDFile {
return result.front();
}
- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) {
+ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) {
auto selectedArchName = parseAndSelectArchitecture(requestedArchName);
if (selectedArchName.empty())
throwf("invalid arch");
+ if(isTbdV2)
+ skipUUIDs(lib);
parsePlatform(lib);
parseInstallName(lib);
parseCurrentVersion(lib);
parseCompatibilityVersion(lib);
parseSwiftVersion(lib);
parseObjCConstraint(lib);
+ if(isTbdV2)
+ skipParentUmbrella(lib);
parseExportsBlock(lib, selectedArchName);
}
@@ -476,7 +505,8 @@ public:
_tokenizer.reset();
DynamicLibrary lib;
expectToken("---");
- parseDocument(lib, requestedArchName);
+ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2");
+ parseDocument(lib, requestedArchName, isTbdV2);
expectToken("...");
return lib;
}
@@ -486,6 +516,7 @@ public:
auto token = next();
if ( token != "---" )
return false;
+ hasOptionalToken("!tapi-tbd-v2");
return !parseAndSelectArchitecture(requestedArchName).empty();
}

10
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -6,13 +6,13 @@
let
baseParams = rec {
name = "cctools-port-${version}";
version = "886";
version = "895";
src = fetchFromGitHub {
owner = "tpoechtrager";
repo = "cctools-port";
rev = "02f0b8ecd87a3951653d838a321ae744815e21a5";
sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2
sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
};
buildInputs = [ autoconf automake libtool_2 libuuid ] ++
@ -22,10 +22,6 @@ let
patches = [
./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
] ++ stdenv.lib.optionals stdenv.isDarwin [
# See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
./undo-unknown-triple.patch
./ld-tbd-v2.patch
];
enableParallelBuilding = true;

17
pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
View File

@ -1,17 +0,0 @@
diff --git a/cctools/as/driver.c b/cctools/as/driver.c
index b06d085..c03397a 100644
--- a/cctools/as/driver.c
+++ b/cctools/as/driver.c
@@ -363,12 +363,6 @@ char **envp)
/* Add -c or clang will run ld(1). */
new_argv[j] = "-c";
j++;
- /* cctools-port start */
- new_argv[j] = "-target";
- j++;
- new_argv[j] = "unknown-apple-darwin";
- j++;
- /* cctools-port end */
new_argv[j] = NULL;
if(execute(new_argv, verbose))
exit(0);

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

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

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.61";
version = "4.4.60";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1nii9a6sp6lfkj94m2ia8vzb5kmk0r4nzsm4xf283b8m8qbfgpih";
sha256 = "18r0m991q62gy5i7gkkpyhz65h2d9z4x9qpys5f2i78smq2yk67f";
};
kernelPatches = args.kernelPatches;

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.9.22";
version = "4.9.21";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0sh3p14y50f14m4m5pz2nvr48xgk8qr8zdhzgxi1143af1c1rnyv";
sha256 = "093cbrzdpj9f3ddxh2p1n05lrrs8yc6hh9jibbjv75vrpx4kfl4p";
};
kernelPatches = args.kernelPatches;

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.9.22";
version = "4.9.21";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha512 = "1hnbadbfvsqsdp7rd1zy07wi3wvryfr0cibk7jq0f35zfkpf4qyry9l1p28kca64p6zg2qb2arnr2p2qgbpx8dzsnwq6q072qddq4hg";
sha512 = "1l1m23qdcz4pqnawq2xxiw8pwapgf84ggvb16696qfsh36dhwr62hmg0k5vip2c7yp74dls2gw9qcwhgv9dp7ki74xhzbhpv3148fjd";
};
kernelPatches = args.kernelPatches;

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

@ -100,9 +100,9 @@ rec {
};
grsecurity_testing = grsecPatch
{ kver = "4.9.22";
grrev = "201704120836";
sha512 = "3320r4myn9y5wf2i2aybl1aapcl9sms0z6p343xh5x0pvaphsjhksnh7cndrq0qxc7fqdwzh9nw1vf84qy02cg5nf8bq025jpkfp7qh";
{ kver = "4.9.21";
grrev = "201704091948";
sha512 = "1pa9vchnii319w3jarp4aclyjpwpk2s3ddi9facvy0r148xxqsl30hk2l0ihb9wwr9pz5a8l2z85skkkp65hpaz6fr9wmy9d1lb1hwh";
};
# This patch relaxes grsec constraints on the location of usermode helpers,

9
pkgs/os-specific/linux/procps-ng/default.nix
View File

@ -1,11 +1,12 @@
{ lib, stdenv, fetchurl, ncurses }:
stdenv.mkDerivation {
name = "procps-3.3.11";
stdenv.mkDerivation rec {
name = "procps-${version}";
version = "3.3.12";
src = fetchurl {
url = mirror://sourceforge/procps-ng/procps-ng-3.3.11.tar.xz;
sha256 = "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9";
url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz";
sha256 = "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf";
};
buildInputs = [ ncurses ];

4
pkgs/servers/emby/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "emby-${version}";
version = "3.2.12";
version = "3.2.10";
src = fetchurl {
url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
sha256 = "0vbb7ax3100djz6zl8vji04a1x3r9vrrgkar605sc2w9n1j1msp2";
sha256 = "0qqqaxlmcy3nfygbfy1bjc188x8k461nckj1sxfvy6wiv6jjfc25";
};
buildInputs = with pkgs; [

4
pkgs/servers/http/nginx/mainline.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (args // {
version = "1.11.13";
sha256 = "1lqm2ixld5b55s4i1yy5337c6ifp7jzjfsm51z49hagdz0g602rn";
version = "1.11.10";
sha256 = "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp";
})

5
pkgs/servers/matrix-synapse/default.nix
View File

@ -24,13 +24,13 @@ let
};
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
version = "0.20.0";
version = "0.19.3";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
sha256 = "1ss89dd4xn80y0zafs6dc9c24ba1kxk20jhjvqbcbbng6mlynj9h";
sha256 = "0dnlv2rgda94zlgwkpryjsypcf995l7zdp19d2xiq7zpd13x6yag";
};
patches = [ ./matrix-synapse.patch ];
@ -41,7 +41,6 @@ in pythonPackages.buildPythonApplication rec {
signedjson systemd twisted ujson unpaddedbase64 pyyaml
matrix-angular-sdk bleach netaddr jinja2 psycopg2
psutil msgpack lxml matrix-synapse-ldap3
phonenumbers jsonschema
];
# Checks fail because of Tox.

4
pkgs/tools/compression/xz/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "xz-5.2.2";
name = "xz-5.2.3";
src = fetchurl {
url = "http://tukaani.org/xz/${name}.tar.bz2";
sha256 = "1da071wyx921pyx3zkxlnbpp14p6km98pnp66mg1arwi9dxgbxbg";
sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x";
};
outputs = [ "bin" "dev" "out" "man" "doc" ];

43
pkgs/tools/package-management/nix/default.nix
View File

@ -16,8 +16,7 @@ let
outputs = [ "out" "dev" "man" "doc" ];
nativeBuildInputs =
[ pkgconfig ]
++ lib.optionals (!lib.versionAtLeast version "1.12pre") [ perl ]
[ perl pkgconfig ]
++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];
buildInputs = [ curl openssl sqlite xz ]
@ -44,12 +43,12 @@ let
[ "--with-store-dir=${storeDir}"
"--localstatedir=${stateDir}"
"--sysconfdir=/etc"
"--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
"--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
"--disable-init-state"
"--enable-gc"
]
++ lib.optionals (!lib.versionAtLeast version "1.12pre") [
"--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
"--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
++ lib.optional (!lib.versionAtLeast version "1.12pre") [
"--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
];
@ -98,33 +97,13 @@ let
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all;
};
passthru = { inherit fromGit; };
};
perl-bindings = { nix }: stdenv.mkDerivation {
name = "nix-perl-" + nix.version;
inherit (nix) src;
postUnpack = "sourceRoot=$sourceRoot/perl";
nativeBuildInputs =
[ perl pkgconfig curl nix libsodium ]
++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ];
configureFlags =
[ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
"--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
"--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
];
};
in rec {
nix = nixStable;
nixStable = (common rec {
nixStable = common rec {
name = "nix-1.11.8";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
@ -138,18 +117,18 @@ in rec {
--replace 'std::less<Symbol>, gc_allocator<Value *>' \
'std::less<Symbol>, gc_allocator<std::pair<const Symbol, Value *> >'
'';
}) // { perl-bindings = nixStable; };
};
nixUnstable = (lib.lowPrio (common rec {
nixUnstable = lib.lowPrio (common rec {
name = "nix-1.12${suffix}";
suffix = "pre5152_915f62fa";
suffix = "pre5122_c60715e";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "915f62fa19790d8f826aeb4dd3d2bb5bde2f67e9";
sha256 = "0mf7y7hvzw2x5dp482qy8774djr3vzcjaqq58cp82zdil8l7kwjd";
rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
};
fromGit = true;
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
});
}

9
pkgs/tools/text/gawk/default.nix
View File

@ -5,22 +5,23 @@ let
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
name = "gawk-4.1.3";
name = "gawk-4.1.4";
src = fetchurl {
url = "mirror://gnu/gawk/${name}.tar.xz";
sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3";
sha256 = "0rn2mmjxm767zliqzd67j7h2ncjn4j0321c60y9fy3grs3i89qak";
};
# When we do build separate interactive version, it makes sense to always include man.
outputs = [ "out" "info" ] ++ stdenv.lib.optional (!interactive) "man";
doCheck = !(
# FIXME: 4.1.4 testsuite breaks when only C locales are available
doCheck = false /*!(
stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
|| stdenv.isDarwin # XXX: `locale' segfaults
|| stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff?
|| stdenv.isFreeBSD
);
)*/;
nativeBuildInputs = [ xz.bin ];
buildInputs =

6
pkgs/tools/text/patchutils/default.nix
View File

@ -1,15 +1,13 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "patchutils-0.3.3";
name = "patchutils-0.3.4";
src = fetchurl {
url = "http://cyberelk.net/tim/data/patchutils/stable/${name}.tar.xz";
sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg";
};
patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {

84
pkgs/tools/text/patchutils/drop-comments.patch
View File

@ -1,84 +0,0 @@
From 58987954647f51dc42fb13b7759923c6170dd905 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Fri, 9 May 2014 16:23:27 +0100
Subject: Make --clean drop comments after '@@' lines as well (trac #29).
diff --git a/Makefile.am b/Makefile.am
index 99ad2a3..f3c6dbc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -198,6 +198,7 @@ TESTS = tests/newline1/run-test \
tests/convert1/run-test \
tests/convert2/run-test \
tests/clean1/run-test \
+ tests/clean2/run-test \
tests/stdin/run-test
# These ones don't work yet.
diff --git a/src/filterdiff.c b/src/filterdiff.c
index 383e72b..6ca2316 100644
--- a/src/filterdiff.c
+++ b/src/filterdiff.c
@@ -2,7 +2,7 @@
* filterdiff - extract (or exclude) a diff from a diff file
* lsdiff - show which files are modified by a patch
* grepdiff - show files modified by a patch containing a regexp
- * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011 Tim Waugh <twaugh@redhat.com>
+ * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011, 2013, 2014 Tim Waugh <twaugh@redhat.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -408,7 +408,8 @@ do_unified (FILE *f, char *header[2], int match, char **line,
" Hunk #%lu, %s",
hunknum, bestname);
- fputs (trailing, output_to);
+ fputs (clean_comments ? "\n" : trailing,
+ output_to);
break;
case Before:
// Note the initial line number
diff --git a/tests/clean2/run-test b/tests/clean2/run-test
new file mode 100755
index 0000000..42320df
--- /dev/null
+++ b/tests/clean2/run-test
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# This is a filterdiff(1) testcase.
+# Test: Make sure --clean removes hunk-level comments.
+
+
+. ${top_srcdir-.}/tests/common.sh
+
+cat << EOF > diff
+non-diff line
+--- a/file1
++++ b/file1
+@@ -0,0 +1 @@ this is a hunk-level comment
++a
+EOF
+
+${FILTERDIFF} --clean diff 2>errors >filtered || exit 1
+[ -s errors ] && exit 1
+
+cat << EOF | cmp - filtered || exit 1
+--- a/file1
++++ b/file1
+@@ -0,0 +1 @@
++a
+EOF
+
+${FILTERDIFF} --clean -x file1 diff 2>errors >filtered || exit 1
+[ -s errors ] && exit 1
+cat << EOF | cmp - filtered || exit 1
+--- a/file1
++++ b/file1
+@@ -0,0 +1 @@
++a
+EOF
--
cgit v0.10.1

1
pkgs/top-level/aliases.nix
View File

@ -62,7 +62,6 @@ doNotDisplayTwice rec {
gnustep-make = gnustep.make; # added 2016-7-6
htmlTidy = html-tidy; # added 2014-12-06
iana_etc = iana-etc; # added 2017-03-08
idea = jetbrains; # added 2017-04-03
inherit (haskell.compiler) jhc uhc; # 2015-05-15
inotifyTools = inotify-tools;
joseki = apache-jena-fuseki; # added 2016-02-28

30
pkgs/top-level/all-packages.nix
View File

@ -6073,9 +6073,7 @@ with pkgs;
pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
pypi2nix = callPackage ../development/tools/pypi2nix {
pythonPackages = python3Packages;
};
pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; };
svg2tikz = python27Packages.svg2tikz;
@ -6403,8 +6401,6 @@ with pkgs;
coan = callPackage ../development/tools/analysis/coan { };
compile-daemon = callPackage ../development/tools/compile-daemon { };
complexity = callPackage ../development/tools/misc/complexity { };
conan = callPackage ../development/tools/build-managers/conan { };
@ -7741,9 +7737,15 @@ with pkgs;
gnutls = gnutls35;
gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix {
guileBindings = config.gnutls.guile or false;
};
gnutls35 = callPackage
(if stdenv.isDarwin
# Avoid > 3.5.10 due to frameworks for now; see discussion on:
# https://github.com/NixOS/nixpkgs/commit/d6454e6a1
then ../development/libraries/gnutls/3.5.10.nix
else ../development/libraries/gnutls/3.5.nix)
{
guileBindings = config.gnutls.guile or false;
};
gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
guileBindings = config.gnutls.guile or false;
@ -7852,10 +7854,6 @@ with pkgs;
gtk = gtk2;
};
gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration {
gtk = gtk3;
};
gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
gtkspell2 = callPackage ../development/libraries/gtkspell { };
@ -9269,7 +9267,7 @@ with pkgs;
openslp = callPackage ../development/libraries/openslp {};
libressl = libressl_2_5;
libressl = libressl_2_4;
libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
fetchurl = fetchurlBoot;
};
@ -13904,7 +13902,7 @@ with pkgs;
libart = pkgs.gnome2.libart_lgpl;
};
jetbrains = recurseIntoAttrs (callPackages ../applications/editors/jetbrains { androidsdk = androidsdk_extras; });
idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; });
libquvi = callPackage ../applications/video/quvi/library.nix { };
@ -13997,9 +13995,7 @@ with pkgs;
gosmore = callPackage ../applications/misc/gosmore { };
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
inherit (darwin) IOKit;
};
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
gpscorrelate = callPackage ../applications/misc/gpscorrelate { };

32
pkgs/top-level/python-packages.nix
View File

@ -118,8 +118,6 @@ in {
};
};
phonenumbers = callPackage ../development/python-modules/phonenumbers { };
agate-dbf = buildPythonPackage rec {
name = "agate-dbf-0.1.0";
disabled = isPy3k;
@ -3189,9 +3187,6 @@ in {
runHook postCheck
'';
# Network access
doCheck = false;
meta = {
homepage = https://github.com/boto/boto3;
license = stdenv.lib.licenses.asl20;
@ -10386,6 +10381,31 @@ in {
};
};
django_1_7 = buildPythonPackage rec {
name = "Django-${version}";
version = "1.7.11";
disabled = pythonOlder "2.7";
src = pkgs.fetchurl {
url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz";
sha256 = "18arf0zr98q2gxhimm2fgh0avwcdax1mcnps0cyn06wgrr7i8f90";
};
# too complicated to setup
doCheck = false;
# patch only $out/bin to avoid problems with starter templates (see #3134)
postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"
'';
meta = {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
};
};
django_1_6 = buildPythonPackage rec {
name = "Django-${version}";
version = "1.6.11.5";
@ -10577,7 +10597,7 @@ in {
sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0";
};
propagatedBuildInputs = with self; [ django ];
propagatedBuildInputs = with self; [ django_1_7 ];
# tests appear to be broken on 0.6.1 at least
doCheck = ( version != "0.6.1" );

8
pkgs/top-level/release-lib.nix
View File

@ -1,15 +1,17 @@
{ supportedSystems
, packageSet ? (import ../..)
, scrubJobs ? true
, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
}:
with import ../../lib;
rec {
allPackages = args: packageSet (args // nixpkgsArgs);
# Ensure that we don't build packages marked as unfree.
allPackages = args: packageSet (args // {
config.allowUnfree = false;
config.inHydra = true;
});
pkgs = pkgsFor "x86_64-linux";

4
pkgs/top-level/release.nix
View File

@ -15,11 +15,9 @@
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
, # Strip most of attributes when evaluating to spare memory usage
scrubJobs ? true
, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
}:
with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
let

6
pkgs/top-level/rust-packages.nix
View File

@ -7,9 +7,9 @@
{ runCommand, fetchFromGitHub, git }:
let
version = "2017-04-11";
rev = "4dff0d079e01ca61b093c5a2fb6123378dfd0d38";
sha256 = "1ygahq5kmagjmwhrss01134vfb8lvim9110y3abjkmp3cc4xwfhy";
version = "2017-04-08";
rev = "9876afbb35a2fe28748990f76d91eaae827e2aae";
sha256 = "14wk74s0mqhxzmgaq07y75y8v4jkffzhs981y9cz806asdcxlrwh";
src = fetchFromGitHub {
inherit rev;