A fixed version of commit eb750f9a7b
For detailed explanation see: https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
This commit is contained in:
Vladimír Čunát
commit
6617c8bd87
55 changed files with 2438 additions and 1313 deletions
|
|
@ -1,3 +1,8 @@
|
|||
/* 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
|
||||
|
|
|
|||
|
|
@ -277,4 +277,14 @@ 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;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,6 +80,15 @@ 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: { })
|
||||
|
|
|
|||
|
|
@ -14,5 +14,5 @@ removeAttrs (import ../../pkgs/top-level/release.nix
|
|||
supportedSystems = [ "x86_64-linux" ];
|
||||
})
|
||||
[ # Remove jobs whose evaluation depends on a writable Nix store.
|
||||
"tarball" "unstable"
|
||||
"tarball" "unstable" "darwin-tested"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ 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>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,12 @@ 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;
|
||||
|
|
@ -157,9 +163,10 @@ 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" cert "--default_root" data.webroot "--valid_min" cfg.validMin ]
|
||||
cmdline = [ "-v" "-d" domain "--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);
|
||||
|
|
|
|||
|
|
@ -60,7 +60,8 @@ in
|
|||
"/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi"
|
||||
)
|
||||
setenv.add-environment = (
|
||||
"GITWEB_CONFIG" => "${gitwebConfigFile}"
|
||||
"GITWEB_CONFIG" => "${gitwebConfigFile}",
|
||||
"HOME" => "${cfg.projectroot}"
|
||||
)
|
||||
}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
|
|
|
|||
|
|
@ -820,10 +820,10 @@
|
|||
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "gnorb";
|
||||
version = "1.2.1";
|
||||
version = "1.2.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gnorb-1.2.1.tar";
|
||||
sha256 = "0mip0czvpdl26xz9wamii5azj9bacjhdg0jgkrxyv17vqqlbag9x";
|
||||
url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar";
|
||||
sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
|
|
@ -940,10 +940,10 @@
|
|||
}) {};
|
||||
ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
|
||||
pname = "ivy";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ivy-0.8.0.tar";
|
||||
sha256 = "1c1impdk1p082v6nb9lms4n258z6ngz8ra90cshprs0ingrk705p";
|
||||
url = "https://elpa.gnu.org/packages/ivy-0.9.0.tar";
|
||||
sha256 = "1p5gfy16xik613ib30mv4yac004z4lpsybmraln1badyd6n3b07s";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -63,6 +63,10 @@ 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" \
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
|
||||
{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
|
||||
, coreutils, gnugrep, which, git, python, unzip, p7zip
|
||||
, androidsdk, jdk
|
||||
}:
|
||||
|
|
@ -6,10 +6,12 @@
|
|||
assert stdenv.isLinux;
|
||||
|
||||
let
|
||||
mkIdeaProduct = callPackage ./common.nix { };
|
||||
mkJetBrainsProduct = callPackage ./common.nix { };
|
||||
|
||||
# Sorted alphabetically
|
||||
|
||||
buildClion = { name, version, src, license, description, wmClass }:
|
||||
(mkIdeaProduct rec {
|
||||
(mkJetBrainsProduct rec {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "CLion";
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -24,8 +26,43 @@ 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 }:
|
||||
(mkIdeaProduct rec {
|
||||
(mkJetBrainsProduct rec {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "IDEA";
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -41,21 +78,8 @@ 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 }:
|
||||
(mkIdeaProduct {
|
||||
(mkJetBrainsProduct {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "PhpStorm";
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -71,25 +95,8 @@ 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 }:
|
||||
(mkIdeaProduct rec {
|
||||
(mkJetBrainsProduct rec {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "PyCharm";
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -115,47 +122,101 @@ let
|
|||
propagatedUserEnvPkgs = [ python ];
|
||||
};
|
||||
|
||||
buildDataGrip = { name, version, src, license, description, wmClass }:
|
||||
(mkIdeaProduct {
|
||||
buildRider = { name, version, src, license, description, wmClass }:
|
||||
lib.overrideDerivation (mkJetBrainsProduct rec {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "DataGrip";
|
||||
product = "Rider";
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://www.jetbrains.com/datagrip/";
|
||||
homepage = "https://www.jetbrains.com/rider/";
|
||||
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.
|
||||
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.
|
||||
'';
|
||||
maintainers = with maintainers; [ loskutov ];
|
||||
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 ];
|
||||
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 = "2016.3.3";
|
||||
version = "2017.1";
|
||||
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 = "1zziyg0y51lfybflq83qwd94wcypkv4gh0cdkwfybbk4yidpnz05";
|
||||
sha256 = "00fc023ca56f2781864cddc7bd5c2897d837d1db17dd8f987abe046ed4df3ca5";
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
};
|
||||
|
||||
clion1 = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "1.2.5";
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
datagrip = buildDataGrip rec {
|
||||
name = "datagrip-${version}";
|
||||
version = "2017.1";
|
||||
description = "Your Swiss Army Knife for Databases and SQL";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
|
||||
sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp";
|
||||
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
|
||||
sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa";
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
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";
|
||||
};
|
||||
|
||||
idea14-community = buildIdea rec {
|
||||
|
|
@ -218,40 +279,28 @@ in
|
|||
wmClass = "jetbrains-idea";
|
||||
};
|
||||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "2016.3.2";
|
||||
description = "The Most Intelligent Ruby and Rails IDE";
|
||||
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/ruby/RubyMine-${version}.tar.gz";
|
||||
sha256 = "1fqlrvhlk09z8nx68qv4nqs5n8ldia3lixsl6r04gsfyl1a69sb6";
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
};
|
||||
|
||||
ruby-mine7 = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "7.1.5";
|
||||
description = "The Most Intelligent Ruby and Rails IDE";
|
||||
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/ruby/RubyMine-${version}.tar.gz";
|
||||
sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l";
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
};
|
||||
|
||||
ruby-mine8 = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "8.0.4";
|
||||
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 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a";
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
};
|
||||
|
||||
pycharm-community = buildPycharm rec {
|
||||
|
|
@ -278,28 +327,52 @@ in
|
|||
wmClass = "jetbrains-pycharm";
|
||||
};
|
||||
|
||||
phpstorm = buildPhpStorm rec {
|
||||
name = "phpstorm-${version}";
|
||||
version = "2017.1";
|
||||
description = "Professional IDE for Web and PHP developers";
|
||||
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/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
|
||||
url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz";
|
||||
sha256 = "90f9f8f1919e0f1dad42387f1a308483448323b089c13c409f3dd4d52992266b";
|
||||
};
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
wmClass = "jetbrains-rider";
|
||||
};
|
||||
|
||||
phpstorm10 = buildPhpStorm rec {
|
||||
name = "phpstorm-${version}";
|
||||
version = "10.0.4";
|
||||
description = "Professional IDE for Web and PHP developers";
|
||||
ruby-mine = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "2017.1";
|
||||
description = "The Most Intelligent Ruby and Rails IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
|
||||
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
|
||||
sha256 = "6c27f43ddc385ffba2cb2f011b80ab46d9b128d0fccf3b4ea43272fe36401a3a";
|
||||
};
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
wmClass = "jetbrains-rubymine";
|
||||
};
|
||||
|
||||
ruby-mine7 = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "7.1.5";
|
||||
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 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l";
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
};
|
||||
|
||||
ruby-mine8 = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "8.0.4";
|
||||
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 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a";
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
};
|
||||
|
||||
webstorm = buildWebStorm rec {
|
||||
|
|
@ -337,16 +410,4 @@ 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";
|
||||
};
|
||||
}
|
||||
|
|
@ -20,11 +20,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "nano-${version}";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nano/${name}.tar.xz";
|
||||
sha256 = "1hjxr0kgq3q1fcns9y4lj0dbhjf33j3pa2wayrb3p3c8v3sbrh8m";
|
||||
sha256 = "02vdnv30ms2s53ch5j4ldch5sxwjsg3098zkvwrwhi9k6yxshdg9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
|
||||
|
|
|
|||
22
pkgs/applications/misc/gpsbabel/clang-4.patch
Normal file
22
pkgs/applications/misc/gpsbabel/clang-4.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
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;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gpsbabel-${version}";
|
||||
|
|
@ -12,13 +12,15 @@ 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 ];
|
||||
buildInputs = [ zlib qt4 which ]
|
||||
++ lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
/* FIXME: Building the documentation, with "make doc", requires this:
|
||||
|
||||
|
|
@ -40,11 +42,11 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs testo
|
||||
substituteInPlace testo \
|
||||
--replace "-x /usr/bin/hexdump" ""
|
||||
'' + (
|
||||
''
|
||||
# The raymarine and gtm tests fail on i686 despite -ffloat-store.
|
||||
if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;"
|
||||
else ""
|
||||
);
|
||||
+ 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";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Convert, upload and download data from GPS and Map programs";
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ stdenv.mkDerivation {
|
|||
libPath = stdenv.lib.makeLibraryPath
|
||||
[ stdenv.cc.cc
|
||||
alsaLib
|
||||
alsaLib.dev
|
||||
atk
|
||||
cairo
|
||||
curl
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "terragrunt-${version}";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
goPackagePath = "github.com/gruntwork-io/terragrunt";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
rev = "v${version}";
|
||||
owner = "gruntwork-io";
|
||||
repo = "terragrunt";
|
||||
sha256 = "0i0ds6llkzrn6a0qq53d2pbb6ghc47lnd004zqfbgn3kwiajx73b";
|
||||
sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# This file was generated by go2nix.
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/aws/aws-sdk-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/aws/aws-sdk-go";
|
||||
rev = "78568b07950e5e7948496878fe99b9436add41d4";
|
||||
sha256 = "0qi3q9qx8k055i2hlc6n8agl7nw1hzcw7aqqykla6z0hjv2hq0c3";
|
||||
rev = "c790b8046767d9c773ad83c327ab988312f85a94";
|
||||
sha256 = "0bhk7j088r8hhf05l70gpfnprxk7vzgb1fql9brk065hw2xnplsr";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -32,8 +32,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/go-getter";
|
||||
rev = "c3d66e76678dce180a7b452653472f949aedfbcd";
|
||||
sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7";
|
||||
rev = "e48f67b534e614bf7fbd978fd0020f61a17b7527";
|
||||
sha256 = "0dlmirfi0pfbwylcjf2mggzav5r7bzdy19m3by6dgarn6izx6g7i";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -77,8 +77,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/mapstructure";
|
||||
rev = "db1efb556f84b25a0a13a04aad883943538ad2e0";
|
||||
sha256 = "1pl1rwc9q3kz0banwi493cyhmn5mlc4mb97sx68jkdz6pck7fy0h";
|
||||
rev = "53818660ed4955e899c0bcafa97299a388bd7c8e";
|
||||
sha256 = "10gdkk8gcjv0lg15ajy68dwgvfkjhawk08ccs9x9ym1adp6l2ycs";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -95,8 +95,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53";
|
||||
sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db";
|
||||
rev = "8ba6f23b6e36d03666a14bd9421f5e3efcb59aca";
|
||||
sha256 = "01s53ny3p0fdx64rnwcnmjj4xpc5adihnh6islsfq5z1ph2phhnj";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -43,6 +43,15 @@ 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";
|
||||
|
|
@ -92,8 +101,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
|
||||
ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
|
||||
ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-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
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -1,17 +1,21 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2, libXmu }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "trayer-1.1.6";
|
||||
name = "trayer-1.1.7";
|
||||
|
||||
buildInputs = [ pkgconfig gdk_pixbuf gtk2 libXmu ];
|
||||
buildInputs = [ pkgconfig gdk_pixbuf gtk2 ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sargon";
|
||||
repo = "trayer-srg";
|
||||
rev = name;
|
||||
sha256 = "0mmya7a1qh3zyqgvcx5fz2lvr9n0ilr490l1j3z4myahi4snk2mg";
|
||||
sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -52,11 +52,12 @@ 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 to look in default search paths
|
||||
# Force compilers and other tools 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}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [ ./nix_share_path.patch ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = gnome3.maintainers;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,15 +57,16 @@ 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,24 @@ def _resolve_libtool(options, binary, libraries):
|
||||
@@ -53,10 +53,27 @@ 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'''
|
||||
+ (
|
||||
+ (?:
|
||||
|
|
@ -85,7 +86,7 @@ index 838d343..ca7fc0d 100644
|
|||
|
||||
|
||||
# This is a what we do for non-la files. We assume that we are on an
|
||||
@@ -115,7 +129,11 @@ def _resolve_non_libtool(options, binary, libraries):
|
||||
@@ -115,7 +132,11 @@ def _resolve_non_libtool(options, binary, libraries):
|
||||
m = pattern.search(line)
|
||||
if m:
|
||||
del patterns[library]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk }:
|
||||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtk-mac-integration-2.0.8";
|
||||
|
|
@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc ];
|
||||
buildInputs = [ glib gtk ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ];
|
||||
buildInputs = [ glib ];
|
||||
propagatedBuildInputs = [ gtk ];
|
||||
|
||||
preAutoreconf = ''
|
||||
gtkdocize
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libressl-${version}";
|
||||
version = "2.5.1";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
|
||||
sha256 = "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp";
|
||||
sha256 = "0c4awq45cl757fv7f7f75i5i0ibc6v7ns13n7xvfak7chv2lrqql";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS = "-D__STDC_CONSTANT_MACROS=1";
|
||||
NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1";
|
||||
|
||||
patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,6 @@ 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";
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation {
|
|||
"LAPACK="
|
||||
];
|
||||
|
||||
NIX_CFLAGS = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
|
||||
|
||||
postInstall = ''
|
||||
# Build and install shared library
|
||||
|
|
|
|||
|
|
@ -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
|
||||
, libidn, libedit, readline, mesa, libintlOrEmpty
|
||||
, enableGeoLocation ? true, geoclue2, sqlite
|
||||
, gst-plugins-base
|
||||
}:
|
||||
|
|
@ -18,12 +18,27 @@ stdenv.mkDerivation rec {
|
|||
description = "Web content rendering engine, GTK+ port";
|
||||
homepage = "http://webkitgtk.org/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
hydraPlatforms = [];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
preConfigure = "patchShebangs Tools";
|
||||
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"
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
||||
|
|
@ -32,29 +47,54 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# see if we can clean this up....
|
||||
|
||||
patches = [ ./finding-harfbuzz-icu.patch ];
|
||||
patches = [ ./finding-harfbuzz-icu.patch ]
|
||||
++ optionals stdenv.isDarwin [
|
||||
./PR-152650-2.patch
|
||||
./PR-153138.patch
|
||||
./PR-157554.patch
|
||||
./PR-157574.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPORT=GTK"
|
||||
"-DUSE_LIBHYPHEN=0"
|
||||
"-DENABLE_GLES2=ON"
|
||||
]
|
||||
++ 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"
|
||||
];
|
||||
|
||||
# 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";
|
||||
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"
|
||||
+ (optionalString stdenv.isDarwin " -lintl");
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake perl python2 ruby bison gperf sqlite
|
||||
pkgconfig gettext gobjectIntrospection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk2 wayland libwebp enchant libnotify gnutls pcre nettle libidn
|
||||
buildInputs = libintlOrEmpty ++ [
|
||||
gtk2 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 ]);
|
||||
++ (with xlibs; [ libXdmcp libXt libXtst ])
|
||||
++ optionals stdenv.isDarwin [ libedit readline mesa ]
|
||||
++ optional stdenv.isLinux wayland;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libsoup gtk3
|
||||
|
|
|
|||
62
pkgs/development/libraries/webkitgtk/PR-152650-2.patch
Normal file
62
pkgs/development/libraries/webkitgtk/PR-152650-2.patch
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
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
Normal file
26
pkgs/development/libraries/webkitgtk/PR-153138.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
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
Normal file
33
pkgs/development/libraries/webkitgtk/PR-157554.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
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
Normal file
62
pkgs/development/libraries/webkitgtk/PR-157574.patch
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
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
Normal file
17
pkgs/development/python-modules/phonenumbers/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ 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
Normal file
25
pkgs/development/tools/compile-daemon/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ 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
Normal file
48
pkgs/development/tools/compile-daemon/deps.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
# 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";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -55,6 +55,7 @@ let
|
|||
TextTable
|
||||
XMLSimple
|
||||
nixUnstable
|
||||
nixUnstable.perl-bindings
|
||||
git
|
||||
boehmgc
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,23 +1,24 @@
|
|||
{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts
|
||||
{ stdenv, fetchurl, pythonPackages, zip, makeWrapper, nix, nix-prefetch-git
|
||||
, nix-prefetch-hg
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
version = "1.6.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
|
||||
sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn";
|
||||
sha256 = "133sjx8r1jdb5gi3caawa9m7v496jv4id2c3zqnx8hria22425za";
|
||||
};
|
||||
|
||||
click = fetchurl {
|
||||
url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
|
||||
sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
|
||||
url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz";
|
||||
sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
|
||||
};
|
||||
|
||||
requests = fetchurl {
|
||||
url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz";
|
||||
sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d";
|
||||
url = "https://pypi.python.org/packages/16/09/37b69de7c924d318e51ece1c4ceb679bf93be9d05973bb30c35babd596e2/requests-2.13.0.tar.gz";
|
||||
sha256 = "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
|
@ -27,7 +28,11 @@ in stdenv.mkDerivation rec {
|
|||
click
|
||||
requests
|
||||
];
|
||||
buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ];
|
||||
buildInputs = [
|
||||
pythonPackages.python pythonPackages.flake8
|
||||
zip makeWrapper nix.out nix-prefetch-git nix-prefetch-hg
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
postUnpack = ''
|
||||
|
|
@ -47,13 +52,14 @@ 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-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.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
|
||||
'';
|
||||
|
||||
commonPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
echo "#!${python.interpreter}" > $out/bin/pypi2nix
|
||||
echo "#!${pythonPackages.python.interpreter}" > $out/bin/pypi2nix
|
||||
echo "import pypi2nix.cli" >> $out/bin/pypi2nix
|
||||
echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
|
||||
|
||||
|
|
@ -62,8 +68,16 @@ 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"
|
||||
wrapProgram $out/bin/pypi2nix \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
--prefix PATH : "${nix-prefetch-git}/bin:${nix-prefetch-hg}/bin"
|
||||
'';
|
||||
|
||||
shellHook = ''
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt
|
||||
, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr
|
||||
, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev
|
||||
, 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
|
||||
cairo dbus expat zlib libpng12 udev
|
||||
libX11 libXcursor libXdamage libXfixes libXrender libXi
|
||||
libXcomposite libXext libXrandr libXtst libSM libICE libxcb
|
||||
];
|
||||
|
|
@ -25,19 +25,16 @@ let
|
|||
gnome-sharp gtk-sharp-2_0
|
||||
];
|
||||
|
||||
ver = "5.3.5";
|
||||
ver = "5.5.3";
|
||||
build = "f1";
|
||||
date = "20160525";
|
||||
pkgVer = "${ver}${build}";
|
||||
fullVer = "${pkgVer}+${date}";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "unity-editor-${version}";
|
||||
version = pkgVer;
|
||||
version = "${ver}x${build}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.unity3d.com/download_unity/linux/unity-editor-installer-${fullVer}.sh";
|
||||
sha256 = "0lmc65175fdvbyn3565pjlg6cc4l5i58fj7bxzi5cqykkbzv5wdm";
|
||||
url = "http://beta.unity3d.com/download/a2454d41e248/unity-editor-installer-${version}Linux.sh";
|
||||
sha256 = "1hvas4n1hm0qp0265gk1nh03kypd9690fnxvzg70f5ni9q97pvm0";
|
||||
};
|
||||
|
||||
nosuidLib = ./unity-nosuid.c;
|
||||
|
|
@ -46,9 +43,10 @@ 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 = ''
|
||||
|
|
@ -125,6 +123,7 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://unity3d.com/;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.10.9";
|
||||
version = "4.10.10";
|
||||
extraMeta.branch = "4.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1y8cpwhkcb8lsryiyqqr1w58snw26x3x6c4f9v1xnh9grz0s4j6h";
|
||||
sha256 = "0hbzbzykay1yyrqz06lx9rwhf1xzzjs21i561gi4fjkm1bazv8l4";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.4.60";
|
||||
version = "4.4.61";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "18r0m991q62gy5i7gkkpyhz65h2d9z4x9qpys5f2i78smq2yk67f";
|
||||
sha256 = "1nii9a6sp6lfkj94m2ia8vzb5kmk0r4nzsm4xf283b8m8qbfgpih";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.9.21";
|
||||
version = "4.9.22";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "093cbrzdpj9f3ddxh2p1n05lrrs8yc6hh9jibbjv75vrpx4kfl4p";
|
||||
sha256 = "0sh3p14y50f14m4m5pz2nvr48xgk8qr8zdhzgxi1143af1c1rnyv";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.9.21";
|
||||
version = "4.9.22";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha512 = "1l1m23qdcz4pqnawq2xxiw8pwapgf84ggvb16696qfsh36dhwr62hmg0k5vip2c7yp74dls2gw9qcwhgv9dp7ki74xhzbhpv3148fjd";
|
||||
sha512 = "1hnbadbfvsqsdp7rd1zy07wi3wvryfr0cibk7jq0f35zfkpf4qyry9l1p28kca64p6zg2qb2arnr2p2qgbpx8dzsnwq6q072qddq4hg";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
|
|
|||
|
|
@ -100,9 +100,9 @@ rec {
|
|||
};
|
||||
|
||||
grsecurity_testing = grsecPatch
|
||||
{ kver = "4.9.21";
|
||||
grrev = "201704091948";
|
||||
sha512 = "1pa9vchnii319w3jarp4aclyjpwpk2s3ddi9facvy0r148xxqsl30hk2l0ihb9wwr9pz5a8l2z85skkkp65hpaz6fr9wmy9d1lb1hwh";
|
||||
{ kver = "4.9.22";
|
||||
grrev = "201704120836";
|
||||
sha512 = "3320r4myn9y5wf2i2aybl1aapcl9sms0z6p343xh5x0pvaphsjhksnh7cndrq0qxc7fqdwzh9nw1vf84qy02cg5nf8bq025jpkfp7qh";
|
||||
};
|
||||
|
||||
# This patch relaxes grsec constraints on the location of usermode helpers,
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emby-${version}";
|
||||
version = "3.2.10";
|
||||
version = "3.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
|
||||
sha256 = "0qqqaxlmcy3nfygbfy1bjc188x8k461nckj1sxfvy6wiv6jjfc25";
|
||||
sha256 = "0vbb7ax3100djz6zl8vji04a1x3r9vrrgkar605sc2w9n1j1msp2";
|
||||
};
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "1.11.10";
|
||||
sha256 = "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp";
|
||||
version = "1.11.13";
|
||||
sha256 = "1lqm2ixld5b55s4i1yy5337c6ifp7jzjfsm51z49hagdz0g602rn";
|
||||
})
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ let
|
|||
};
|
||||
in pythonPackages.buildPythonApplication rec {
|
||||
name = "matrix-synapse-${version}";
|
||||
version = "0.19.3";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dnlv2rgda94zlgwkpryjsypcf995l7zdp19d2xiq7zpd13x6yag";
|
||||
sha256 = "1ss89dd4xn80y0zafs6dc9c24ba1kxk20jhjvqbcbbng6mlynj9h";
|
||||
};
|
||||
|
||||
patches = [ ./matrix-synapse.patch ];
|
||||
|
|
@ -41,6 +41,7 @@ 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.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ let
|
|||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
|
||||
nativeBuildInputs =
|
||||
[ perl pkgconfig ]
|
||||
[ pkgconfig ]
|
||||
++ lib.optionals (!lib.versionAtLeast version "1.12pre") [ perl ]
|
||||
++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];
|
||||
|
||||
buildInputs = [ curl openssl sqlite xz ]
|
||||
|
|
@ -43,12 +44,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.optional (!lib.versionAtLeast version "1.12pre") [
|
||||
++ lib.optionals (!lib.versionAtLeast version "1.12pre") [
|
||||
"--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
|
||||
"--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
|
||||
"--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
|
||||
];
|
||||
|
||||
|
|
@ -97,13 +98,33 @@ 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";
|
||||
|
|
@ -117,18 +138,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 = "pre5122_c60715e";
|
||||
suffix = "pre5152_915f62fa";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
|
||||
sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
|
||||
rev = "915f62fa19790d8f826aeb4dd3d2bb5bde2f67e9";
|
||||
sha256 = "0mf7y7hvzw2x5dp482qy8774djr3vzcjaqq58cp82zdil8l7kwjd";
|
||||
};
|
||||
fromGit = true;
|
||||
});
|
||||
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ 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
|
||||
|
|
|
|||
|
|
@ -6073,7 +6073,9 @@ with pkgs;
|
|||
|
||||
pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
|
||||
|
||||
pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; };
|
||||
pypi2nix = callPackage ../development/tools/pypi2nix {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
||||
svg2tikz = python27Packages.svg2tikz;
|
||||
|
||||
|
|
@ -6401,6 +6403,8 @@ with pkgs;
|
|||
|
||||
coan = callPackage ../development/tools/analysis/coan { };
|
||||
|
||||
compile-daemon = callPackage ../development/tools/compile-daemon { };
|
||||
|
||||
complexity = callPackage ../development/tools/misc/complexity { };
|
||||
|
||||
cookiecutter = pythonPackages.cookiecutter;
|
||||
|
|
@ -7846,6 +7850,10 @@ 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 { };
|
||||
|
|
@ -9259,7 +9267,7 @@ with pkgs;
|
|||
|
||||
openslp = callPackage ../development/libraries/openslp {};
|
||||
|
||||
libressl = libressl_2_4;
|
||||
libressl = libressl_2_5;
|
||||
libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
|
||||
fetchurl = fetchurlBoot;
|
||||
};
|
||||
|
|
@ -13890,7 +13898,7 @@ with pkgs;
|
|||
libart = pkgs.gnome2.libart_lgpl;
|
||||
};
|
||||
|
||||
idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; });
|
||||
jetbrains = recurseIntoAttrs (callPackages ../applications/editors/jetbrains { androidsdk = androidsdk_extras; });
|
||||
|
||||
libquvi = callPackage ../applications/video/quvi/library.nix { };
|
||||
|
||||
|
|
@ -13983,7 +13991,9 @@ with pkgs;
|
|||
|
||||
gosmore = callPackage ../applications/misc/gosmore { };
|
||||
|
||||
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
|
||||
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
|
||||
inherit (darwin) IOKit;
|
||||
};
|
||||
|
||||
gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
|
||||
|
||||
|
|
|
|||
|
|
@ -118,6 +118,8 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
phonenumbers = callPackage ../development/python-modules/phonenumbers { };
|
||||
|
||||
agate-dbf = buildPythonPackage rec {
|
||||
name = "agate-dbf-0.1.0";
|
||||
disabled = isPy3k;
|
||||
|
|
@ -3187,6 +3189,9 @@ in {
|
|||
runHook postCheck
|
||||
'';
|
||||
|
||||
# Network access
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/boto/boto3;
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
|
|
@ -10381,31 +10386,6 @@ 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";
|
||||
|
|
@ -10597,7 +10577,7 @@ in {
|
|||
sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ django_1_7 ];
|
||||
propagatedBuildInputs = with self; [ django ];
|
||||
|
||||
# tests appear to be broken on 0.6.1 at least
|
||||
doCheck = ( version != "0.6.1" );
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
{ 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 {
|
||||
|
||||
# Ensure that we don't build packages marked as unfree.
|
||||
allPackages = args: packageSet (args // {
|
||||
config.allowUnfree = false;
|
||||
config.inHydra = true;
|
||||
});
|
||||
allPackages = args: packageSet (args // nixpkgsArgs);
|
||||
|
||||
pkgs = pkgsFor "x86_64-linux";
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,11 @@
|
|||
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; };
|
||||
with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
|
||||
|
||||
let
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
{ runCommand, fetchFromGitHub, git }:
|
||||
|
||||
let
|
||||
version = "2017-04-08";
|
||||
rev = "9876afbb35a2fe28748990f76d91eaae827e2aae";
|
||||
sha256 = "14wk74s0mqhxzmgaq07y75y8v4jkffzhs981y9cz806asdcxlrwh";
|
||||
version = "2017-04-11";
|
||||
rev = "4dff0d079e01ca61b093c5a2fb6123378dfd0d38";
|
||||
sha256 = "1ygahq5kmagjmwhrss01134vfb8lvim9110y3abjkmp3cc4xwfhy";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
|
|
|
|||
Loading…
Reference in a new issue