Merge branch 'master' into hs-vulkan
This commit is contained in:
Peter Simons
GitHub
commit
6c577a37b6
|
|
@ -374,7 +374,7 @@ and `CFLAGS`.
|
|||
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
|
||||
homepage = http://hgomersall.github.com/pyFFTW/;
|
||||
license = with licenses; [ bsd2 bsd3 ];
|
||||
maintainer = with maintainers; [ fridh ];
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,8 @@ rec {
|
|||
};
|
||||
# Misc boolean options
|
||||
useAndroidPrebuilt = false;
|
||||
useiOSPrebuilt = false;
|
||||
isiPhoneSimulator = false;
|
||||
} // mapAttrs (n: v: v final.parsed) inspect.predicates
|
||||
// args;
|
||||
in assert final.useAndroidPrebuilt -> final.isAndroid;
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ rec {
|
|||
|
||||
################################################################################
|
||||
|
||||
types.system = mkOptionType {
|
||||
types.parsedPlatform = mkOptionType {
|
||||
name = "system";
|
||||
description = "fully parsed representation of llvm- or nix-style platform tuple";
|
||||
merge = mergeOneOption;
|
||||
|
|
@ -215,7 +215,7 @@ rec {
|
|||
isSystem = isType "system";
|
||||
|
||||
mkSystem = components:
|
||||
assert types.system.check components;
|
||||
assert types.parsedPlatform.check components;
|
||||
setType "system" components;
|
||||
|
||||
mkSkeletonFromList = l: {
|
||||
|
|
|
|||
|
|
@ -1971,6 +1971,11 @@
|
|||
github = "kragniz";
|
||||
name = "Louis Taylor";
|
||||
};
|
||||
krav = {
|
||||
email = "kristoffer@microdisko.no";
|
||||
github = "krav";
|
||||
name = "Kristoffer Thømt Ravneberg";
|
||||
};
|
||||
kristoff3r = {
|
||||
email = "k.soeholm@gmail.com";
|
||||
github = "kristoff3r";
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ points to the generated virtual network.
|
|||
test1 = {pkgs, config, ...}:
|
||||
{
|
||||
services.openssh.enable = true;
|
||||
nixpkgs.system = "i686-linux";
|
||||
nixpkgs.localSystem.system = "i686-linux";
|
||||
deployment.targetHost = "test1.example.net";
|
||||
|
||||
# Other NixOS options
|
||||
|
|
@ -51,7 +51,7 @@ points to the generated virtual network.
|
|||
services.openssh.enable = true;
|
||||
services.httpd.enable = true;
|
||||
environment.systemPackages = [ pkgs.lynx ];
|
||||
nixpkgs.system = "x86_64-linux";
|
||||
nixpkgs.localSystem.system = "x86_64-linux";
|
||||
deployment.targetHost = "test2.example.net";
|
||||
|
||||
# Other NixOS options
|
||||
|
|
@ -66,7 +66,7 @@ In each NixOS configuration, two attributes have a special meaning.
|
|||
The <varname>deployment.targetHost</varname> specifies the address
|
||||
(domain name or IP address)
|
||||
of the system which is used by <command>ssh</command> to perform
|
||||
remote deployment operations. The <varname>nixpkgs.system</varname>
|
||||
remote deployment operations. The <varname>nixpkgs.localSystem.system</varname>
|
||||
attribute can be used to specify an architecture for the target machine,
|
||||
such as <varname>i686-linux</varname> which builds a 32-bit NixOS
|
||||
configuration. Omitting this property will build the configuration
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
, lib ? import ../../lib
|
||||
}:
|
||||
|
||||
let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system;
|
||||
let extraArgs_ = extraArgs; pkgs_ = pkgs;
|
||||
extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
|
||||
in if e == "" then [] else [(import (builtins.toPath e))];
|
||||
in
|
||||
|
|
@ -36,7 +36,7 @@ let
|
|||
_file = ./eval-config.nix;
|
||||
key = _file;
|
||||
config = {
|
||||
nixpkgs.system = lib.mkDefault system_;
|
||||
nixpkgs.localSystem = lib.mkDefault { inherit system; };
|
||||
_module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -58,10 +58,13 @@ in
|
|||
pkgs = mkOption {
|
||||
defaultText = literalExample
|
||||
''import "''${nixos}/.." {
|
||||
inherit (config.nixpkgs) config overlays system;
|
||||
inherit (config.nixpkgs) config overlays localSystem crossSystem;
|
||||
}
|
||||
'';
|
||||
default = import ../../.. { inherit (cfg) config overlays system crossSystem; };
|
||||
default = import ../../.. {
|
||||
localSystem = { inherit (cfg) system; } // cfg.localSystem;
|
||||
inherit (cfg) config overlays crossSystem;
|
||||
};
|
||||
type = pkgsType;
|
||||
example = literalExample ''import <nixpkgs> {}'';
|
||||
description = ''
|
||||
|
|
@ -73,8 +76,9 @@ in
|
|||
relative to the location of this NixOS module, because
|
||||
NixOS and Nixpkgs are distributed together for consistency,
|
||||
so the <code>nixos</code> in the default value is in fact a
|
||||
relative path. The <code>config</code>, <code>overlays</code>
|
||||
and <code>system</code> come from this option's siblings.
|
||||
relative path. The <code>config</code>, <code>overlays</code>,
|
||||
<code>localSystem</code>, and <code>crossSystem</code> come
|
||||
from this option's siblings.
|
||||
|
||||
This option can be used by applications like NixOps to increase
|
||||
the performance of evaluation, or to create packages that depend
|
||||
|
|
@ -130,13 +134,40 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
crossSystem = mkOption {
|
||||
type = types.nullOr types.attrs;
|
||||
default = null;
|
||||
localSystem = mkOption {
|
||||
type = types.attrs; # TODO utilize lib.systems.parsedPlatform
|
||||
default = { system = builtins.currentSystem; };
|
||||
example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
|
||||
defaultText = literalExample
|
||||
''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
|
||||
description = ''
|
||||
The description of the system we're cross-compiling to, or null
|
||||
if this isn't a cross-compile. See the description of the
|
||||
crossSystem argument in the nixpkgs manual.
|
||||
Specifies the platform on which NixOS should be built. When
|
||||
<code>nixpkgs.crossSystem</code> is unset, it also specifies
|
||||
the platform <emphasis>for</emphasis> which NixOS should be
|
||||
built. If this option is unset, it defaults to the platform
|
||||
type of the machine where evaluation happens. Specifying this
|
||||
option is useful when doing distributed multi-platform
|
||||
deployment, or when building virtual machines. See its
|
||||
description in the Nixpkgs manual for more details.
|
||||
|
||||
Ignored when <code>nixpkgs.pkgs</code> is set.
|
||||
'';
|
||||
};
|
||||
|
||||
crossSystem = mkOption {
|
||||
type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform
|
||||
default = null;
|
||||
example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
|
||||
defaultText = literalExample
|
||||
''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
|
||||
description = ''
|
||||
Specifies the platform for which NixOS should be
|
||||
built. Specify this only if it is different from
|
||||
<code>nixpkgs.localSystem</code>, the platform
|
||||
<emphasis>on</emphasis> which NixOS should be built. In other
|
||||
words, specify this to cross-compile NixOS. Otherwise it
|
||||
should be set as null, the default. See its description in the
|
||||
Nixpkgs manual for more details.
|
||||
|
||||
Ignored when <code>nixpkgs.pkgs</code> is set.
|
||||
'';
|
||||
|
|
@ -146,10 +177,20 @@ in
|
|||
type = types.str;
|
||||
example = "i686-linux";
|
||||
description = ''
|
||||
Specifies the Nix platform type for which NixOS should be built.
|
||||
If unset, it defaults to the platform type of your host system.
|
||||
Specifying this option is useful when doing distributed
|
||||
multi-platform deployment, or when building virtual machines.
|
||||
Specifies the Nix platform type on which NixOS should be built.
|
||||
It is better to specify <code>nixpkgs.localSystem</code> instead.
|
||||
<programlisting>
|
||||
{
|
||||
nixpkgs.system = ..;
|
||||
}
|
||||
</programlisting>
|
||||
is the same as
|
||||
<programlisting>
|
||||
{
|
||||
nixpkgs.localSystem.system = ..;
|
||||
}
|
||||
</programlisting>
|
||||
See <code>nixpkgs.localSystem</code> for more information.
|
||||
|
||||
Ignored when <code>nixpkgs.pkgs</code> is set.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ in
|
|||
|
||||
services.dysnomia.properties = {
|
||||
hostname = config.networking.hostName;
|
||||
system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
|
||||
inherit (config.nixpkgs.localSystem) system;
|
||||
|
||||
supportedTypes = (import "${pkgs.stdenv.mkDerivation {
|
||||
name = "supportedtypes";
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
options =
|
||||
let
|
||||
scrubbedEval = evalModules {
|
||||
modules = [ { nixpkgs.system = config.nixpkgs.system; } ] ++ baseModules;
|
||||
modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ baseModules;
|
||||
args = (config._module.args) // { modules = [ ]; };
|
||||
specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -32,8 +32,15 @@ with lib;
|
|||
rootDevice="${config.fileSystems."/".device}"
|
||||
if [ -e "$rootDevice" ]; then
|
||||
rootDevice="$(readlink -f "$rootDevice")"
|
||||
parentDevice="$(lsblk -npo PKNAME "$rootDevice")"
|
||||
TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}"
|
||||
parentDevice="$rootDevice"
|
||||
while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do
|
||||
parentDevice="''${parentDevice%[0-9]}";
|
||||
done
|
||||
partNum="''${rootDevice#''${parentDevice}}"
|
||||
if [ "''${parentDevice%[0-9]p}" != "''${parentDevice}" ] && [ -b "''${parentDevice%p}" ]; then
|
||||
parentDevice="''${parentDevice%p}"
|
||||
fi
|
||||
TMPDIR=/run sh $(type -P growpart) "$parentDevice" "$partNum"
|
||||
udevadm settle
|
||||
fi
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ let
|
|||
|
||||
# If the host is 64-bit and the container is 32-bit, add a
|
||||
# --personality flag.
|
||||
${optionalString (config.nixpkgs.system == "x86_64-linux") ''
|
||||
${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") ''
|
||||
if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then
|
||||
extraFlags+=" --personality=x86"
|
||||
fi
|
||||
|
|
@ -255,7 +255,7 @@ let
|
|||
};
|
||||
|
||||
|
||||
system = config.nixpkgs.system;
|
||||
system = config.nixpkgs.localSystem.system;
|
||||
|
||||
bindMountOpts = { name, config, ... }: {
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
|||
# container available within the VM, because we don't have network access.
|
||||
virtualisation.pathsInNixDB = let
|
||||
emptyContainer = import ../lib/eval-config.nix {
|
||||
inherit (config.nixpkgs) system;
|
||||
inherit (config.nixpkgs.localSystem) system;
|
||||
modules = lib.singleton {
|
||||
containers.foo.config = {};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ let
|
|||
# faust.wrapWithBuildEnv.
|
||||
postInstall = ''
|
||||
# syntax error when eval'd directly
|
||||
pattern="faust2!(svg)"
|
||||
pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))"
|
||||
(shopt -s extglob; rm "$out"/bin/$pattern)
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ let
|
|||
# faust.wrapWithBuildEnv.
|
||||
postInstall = ''
|
||||
# syntax error when eval'd directly
|
||||
pattern="faust2!(svg)"
|
||||
pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))"
|
||||
(shopt -s extglob; rm "$out"/bin/$pattern)
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,25 +2,25 @@
|
|||
|
||||
let
|
||||
modules = [
|
||||
{ name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; }
|
||||
{ name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; }
|
||||
{ name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; }
|
||||
{ name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; }
|
||||
{ name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; }
|
||||
{ name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; }
|
||||
{ name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; }
|
||||
{ name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; }
|
||||
{ name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; }
|
||||
{ name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; }
|
||||
{ name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; }
|
||||
{ name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; }
|
||||
{ name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; }
|
||||
{ name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; }
|
||||
{ name = "icicles-chg.el"; sha256 = "1kqlhisg5g9ycylzqiwxrmmgfw2jw599wisz26wvi48lac2icgg7"; }
|
||||
{ name = "icicles-cmd1.el"; sha256 = "17cpw798bl6p77cmjl7lwdnxa1qpw4z1wacjq2mdc8fh81cyw3am"; }
|
||||
{ name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; }
|
||||
{ name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; }
|
||||
{ name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; }
|
||||
{ name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; }
|
||||
{ name = "icicles-fn.el"; sha256 = "1sn56z5rjsvqsy3vs7af7yai0c0qdjvcxvwwc59rhswrbi6zlxz5"; }
|
||||
{ name = "icicles-mac.el"; sha256 = "1wyvqzlpq5n70mggqijb8f5r5q9y1hxxngp64sixy0xszy5d12dk"; }
|
||||
{ name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; }
|
||||
{ name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; }
|
||||
{ name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; }
|
||||
{ name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; }
|
||||
];
|
||||
|
||||
forAll = f: map f modules;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2017-10-28";
|
||||
version = "2018-04-16";
|
||||
name = "icicles-${version}";
|
||||
|
||||
srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
|
||||
|
|
|
|||
35
pkgs/applications/graphics/fstl/default.nix
Normal file
35
pkgs/applications/graphics/fstl/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fstl-${version}";
|
||||
version = "0.9.3";
|
||||
|
||||
buildInputs = [qtbase mesa_glu];
|
||||
|
||||
prePatch = ''
|
||||
sed -i "s|/usr/bin|$out/bin|g" qt/fstl.pro
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
qmake qt/fstl.pro
|
||||
'';
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv fstl.app $out/Applications
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkeeter";
|
||||
repo = "fstl";
|
||||
rev = "v" + version;
|
||||
sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The fastest STL file viewer";
|
||||
homepage = "https://github.com/mkeeter/fstl";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ tweber ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,6 +8,7 @@ let
|
|||
ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON
|
||||
PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS
|
||||
CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
|
||||
EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:
|
||||
{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }:
|
||||
|
||||
let
|
||||
name = "gv-3.7.4";
|
||||
|
|
@ -11,7 +11,18 @@ stdenv.mkDerivation {
|
|||
sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
|
||||
};
|
||||
|
||||
buildInputs = [ Xaw3d ghostscriptX perl ];
|
||||
configureFlags = stdenv.lib.optionals stdenv.isDarwin [
|
||||
"--enable-SIGCHLD-fallback"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
Xaw3d
|
||||
ghostscriptX
|
||||
perl
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
pkgconfig
|
||||
libiconv
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i "src/"*.in
|
||||
|
|
@ -32,6 +43,6 @@ stdenv.mkDerivation {
|
|||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ GEM
|
|||
http_parser.rb (0.6.0)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (3.7.3)
|
||||
jekyll (3.8.0)
|
||||
addressable (~> 2.4)
|
||||
colorator (~> 1.0)
|
||||
em-websocket (~> 0.5)
|
||||
|
|
@ -36,9 +36,9 @@ GEM
|
|||
pathutil (~> 0.9)
|
||||
rouge (>= 1.7, < 4)
|
||||
safe_yaml (~> 1.0)
|
||||
jekyll-avatar (0.5.0)
|
||||
jekyll-avatar (0.6.0)
|
||||
jekyll (~> 3.0)
|
||||
jekyll-mentions (1.2.0)
|
||||
jekyll-mentions (1.3.0)
|
||||
activesupport (~> 4.0)
|
||||
html-pipeline (~> 2.3)
|
||||
jekyll (~> 3.0)
|
||||
|
|
@ -69,13 +69,13 @@ GEM
|
|||
pathutil (0.16.1)
|
||||
forwardable-extended (~> 2.6)
|
||||
public_suffix (3.0.2)
|
||||
rb-fsevent (0.10.2)
|
||||
rb-fsevent (0.10.3)
|
||||
rb-inotify (0.9.10)
|
||||
ffi (>= 0.5.0, < 2)
|
||||
rouge (3.1.1)
|
||||
ruby_dep (1.5.0)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.5.5)
|
||||
sass (3.5.6)
|
||||
sass-listen (~> 4.0.0)
|
||||
sass-listen (4.0.0)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
|
|
|
|||
|
|
@ -104,28 +104,28 @@
|
|||
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff";
|
||||
sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.7.3";
|
||||
version = "3.8.0";
|
||||
};
|
||||
jekyll-avatar = {
|
||||
dependencies = ["jekyll"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf";
|
||||
sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
};
|
||||
jekyll-mentions = {
|
||||
dependencies = ["activesupport" "html-pipeline" "jekyll"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd";
|
||||
sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
};
|
||||
jekyll-sass-converter = {
|
||||
dependencies = ["sass"];
|
||||
|
|
@ -250,10 +250,10 @@
|
|||
rb-fsevent = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
|
||||
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
};
|
||||
rb-inotify = {
|
||||
dependencies = ["ffi"];
|
||||
|
|
@ -292,10 +292,10 @@
|
|||
dependencies = ["sass-listen"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
|
||||
sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.5";
|
||||
version = "3.5.6";
|
||||
};
|
||||
sass-listen = {
|
||||
dependencies = ["rb-fsevent" "rb-inotify"];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ GEM
|
|||
http_parser.rb (~> 0.6.0)
|
||||
eventmachine (1.2.5)
|
||||
execjs (2.7.0)
|
||||
faraday (0.14.0)
|
||||
faraday (0.15.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
fast-stemmer (1.0.2)
|
||||
ffi (1.9.23)
|
||||
|
|
@ -34,7 +34,7 @@ GEM
|
|||
http_parser.rb (0.6.0)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (3.7.3)
|
||||
jekyll (3.8.0)
|
||||
addressable (~> 2.4)
|
||||
colorator (~> 1.0)
|
||||
em-websocket (~> 0.5)
|
||||
|
|
@ -47,7 +47,7 @@ GEM
|
|||
pathutil (~> 0.9)
|
||||
rouge (>= 1.7, < 4)
|
||||
safe_yaml (~> 1.0)
|
||||
jekyll-avatar (0.5.0)
|
||||
jekyll-avatar (0.6.0)
|
||||
jekyll (~> 3.0)
|
||||
jekyll-coffeescript (1.1.1)
|
||||
coffee-script (~> 2.2)
|
||||
|
|
@ -56,7 +56,7 @@ GEM
|
|||
jekyll (~> 3.3)
|
||||
jekyll-gist (1.5.0)
|
||||
octokit (~> 4.2)
|
||||
jekyll-mentions (1.2.0)
|
||||
jekyll-mentions (1.3.0)
|
||||
activesupport (~> 4.0)
|
||||
html-pipeline (~> 2.3)
|
||||
jekyll (~> 3.0)
|
||||
|
|
@ -101,16 +101,16 @@ GEM
|
|||
public_suffix (3.0.2)
|
||||
pygments.rb (1.2.1)
|
||||
multi_json (>= 1.0.0)
|
||||
rb-fsevent (0.10.2)
|
||||
rb-fsevent (0.10.3)
|
||||
rb-inotify (0.9.10)
|
||||
ffi (>= 0.5.0, < 2)
|
||||
rdiscount (2.2.0.1)
|
||||
rdoc (6.0.1)
|
||||
rdoc (6.0.3)
|
||||
redcarpet (3.4.0)
|
||||
rouge (3.1.1)
|
||||
ruby_dep (1.5.0)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.5.5)
|
||||
sass (3.5.6)
|
||||
sass-listen (~> 4.0.0)
|
||||
sass-listen (4.0.0)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
|
|
|
|||
|
|
@ -96,10 +96,10 @@
|
|||
dependencies = ["multipart-post"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
|
||||
sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
};
|
||||
fast-stemmer = {
|
||||
source = {
|
||||
|
|
@ -163,19 +163,19 @@
|
|||
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff";
|
||||
sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.7.3";
|
||||
version = "3.8.0";
|
||||
};
|
||||
jekyll-avatar = {
|
||||
dependencies = ["jekyll"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf";
|
||||
sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
};
|
||||
jekyll-coffeescript = {
|
||||
dependencies = ["coffee-script" "coffee-script-source"];
|
||||
|
|
@ -208,10 +208,10 @@
|
|||
dependencies = ["activesupport" "html-pipeline" "jekyll"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd";
|
||||
sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
};
|
||||
jekyll-paginate = {
|
||||
source = {
|
||||
|
|
@ -413,10 +413,10 @@
|
|||
rb-fsevent = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
|
||||
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
};
|
||||
rb-inotify = {
|
||||
dependencies = ["ffi"];
|
||||
|
|
@ -438,10 +438,10 @@
|
|||
rdoc = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vzhv04lp76iax258dh47zsxhjg34r9sg76vgikbyfywjzflvfyj";
|
||||
sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.1";
|
||||
version = "6.0.3";
|
||||
};
|
||||
redcarpet = {
|
||||
source = {
|
||||
|
|
@ -479,10 +479,10 @@
|
|||
dependencies = ["sass-listen"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
|
||||
sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.5";
|
||||
version = "3.5.6";
|
||||
};
|
||||
sass-listen = {
|
||||
dependencies = ["rb-fsevent" "rb-inotify"];
|
||||
|
|
|
|||
15
pkgs/applications/misc/jekyll/update.sh
Executable file
15
pkgs/applications/misc/jekyll/update.sh
Executable file
|
|
@ -0,0 +1,15 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bundix zlib
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
|
||||
readonly BASEDIR="$(dirname $(readlink -f $0))"
|
||||
|
||||
for directory in "basic" "full"; do
|
||||
pushd "$BASEDIR/$directory"
|
||||
rm -f Gemfile.lock gemset.nix
|
||||
bundix --magic
|
||||
rm -rf .bundle vendor
|
||||
popd
|
||||
done
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.daidouji.com/oneko/";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = [ maintainers.xaverdh ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qmapshack-${version}";
|
||||
version = "1.10.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
|
||||
sha256 = "10qk6c5myw5dhkbw7pcrx3900kiqhs32vy47xl2844nzb4fq2liw";
|
||||
sha256 = "0yqilfldmfw8m18jbkffv4ar1px6kjs0zlgb216bnhahcr1y8r9y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
42
pkgs/applications/misc/sleepyhead/default.nix
Normal file
42
pkgs/applications/misc/sleepyhead/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ stdenv, fetchgit, qt5, zlib, libGLU, libX11 }:
|
||||
|
||||
let
|
||||
name = "sleepyhead-${version}";
|
||||
version = "1.0.0-beta-git";
|
||||
in stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchgit {
|
||||
url = https://gitlab.com/sleepyhead/sleepyhead-code.git;
|
||||
rev = "9e2329d8bca45693231b5e3dae80063717c24578";
|
||||
sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtbase qt5.qtwebkit qt5.qtserialport
|
||||
zlib
|
||||
libGLU
|
||||
libX11
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp sleepyhead/SleepyHead $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://sleepyhead.jedimark.net/;
|
||||
description = "Review and explore data produced by CPAP and related machines";
|
||||
longDescription = ''
|
||||
SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea.
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.krav ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ callPackage, stdenv }:
|
||||
|
||||
let
|
||||
stableVersion = "2.1.4";
|
||||
stableVersion = "2.1.5";
|
||||
# Currently there is no preview version.
|
||||
previewVersion = stableVersion;
|
||||
addVersion = args:
|
||||
|
|
@ -10,8 +10,8 @@ let
|
|||
in args // { inherit version branch; };
|
||||
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
|
||||
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
|
||||
guiSrcHash = "03x9qgqs4y9swyipigviyscvlcfkb2v6iasc54nv07ks8srqwf93";
|
||||
serverSrcHash = "0qzx0y4mqxpn5xhzgr2865lvszhi6szdli1jq64gihwdy3bhli4f";
|
||||
guiSrcHash = "1d7pwm36bqjm0d021z5qnx49v8zf4yi9jn5hn6zlbiqbz53l1x7l";
|
||||
serverSrcHash = "002pqm4jcm5qbbw1vnhjdrgysh7d6xmdl66605wz1vbp7xn5s961";
|
||||
in {
|
||||
guiStable = mkGui {
|
||||
stable = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "inboxer-${version}";
|
||||
version = "1.0.4";
|
||||
version = "1.1.2";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Unofficial, free and open-source Google Inbox Desktop App";
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
|
||||
sha256 = "0i6qmrnga80q8s6dabfgh0fcdnc2wpj948za04zi1ajv4fjwjh0n";
|
||||
sha256 = "100185j10dj044mg5p9xlq7fj7n7xki9qw5xn845dgq0dpj8rkrm";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tixati-${version}";
|
||||
version = "2.55";
|
||||
version = "2.57";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
|
||||
sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w";
|
||||
sha256 = "0z6znh62ry4fmc6c54zq79pk1b5bwkz93bxsfgvxpf6sajpyf9n7";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -52,6 +52,10 @@ stdenv.mkDerivation rec {
|
|||
++ (optional (opencvSupport) "-DOpenCV=ON")
|
||||
;
|
||||
|
||||
# Previous attempts to fix parallel builds (see patch above) were not entirely successful.
|
||||
# Sporadic build failures still exist. Dislable parallel builds for now.
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
|
||||
homepage = "http://shogun-toolbox.org/";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, texlive, bison, flex
|
||||
{ stdenv, fetchurl, fetchpatch, texlive, bison, flex
|
||||
, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
|
||||
, readline, gettext, libpng, libao, gfortran, perl
|
||||
, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
|
||||
|
|
@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optionals (!enableGUI) [
|
||||
# when enableGui is false, giac is compiled without fltk. That means some
|
||||
# outputs differ in the make check. Patch around this:
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
|
||||
sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
for i in doc/*/Makefile*; do
|
||||
substituteInPlace "$i" --replace "/bin/cp" "cp";
|
||||
|
|
@ -37,10 +46,11 @@ stdenv.mkDerivation rec {
|
|||
libGLU_combined fltk xorg.libX11
|
||||
];
|
||||
|
||||
outputs = [ "out" ];
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
hardeningDisable = [ "format" "bindnow" "relro" ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack"
|
||||
|
|
@ -57,6 +67,13 @@ stdenv.mkDerivation rec {
|
|||
for file in $(find $out -name Makefile) ; do
|
||||
sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ;
|
||||
done;
|
||||
|
||||
# reference cycle
|
||||
rm "$out/share/giac/doc/el/"{casinter,tutoriel}/Makefile
|
||||
|
||||
mkdir -p "$doc/share/giac"
|
||||
mv "$out/share/giac/doc" "$doc/share/giac"
|
||||
mv "$out/share/giac/examples" "$doc/share/giac"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
21
pkgs/applications/search/grepcidr/default.nix
Normal file
21
pkgs/applications/search/grepcidr/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "grepcidr-${version}";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.pc-tools.net/files/unix/${name}.tar.gz";
|
||||
sha256 = "1yzpa1nigmmp4hir6377hrkpp0z6jnxgccaw2jbqgydbglvnm231";
|
||||
};
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Filter IPv4 and IPv6 addresses matching CIDR patterns";
|
||||
homepage = http://www.pc-tools.net/unix/grepcidr/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.fadenb ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, fetchurl, python2Packages
|
||||
, fetchpatch
|
||||
, withSFTP ? true
|
||||
}:
|
||||
|
||||
|
|
@ -17,8 +18,15 @@ python2Packages.buildPythonApplication rec {
|
|||
propagatedBuildInputs = []
|
||||
++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ];
|
||||
|
||||
# Bazaar can't find the certificates alone
|
||||
patches = [ ./add_certificates.patch ];
|
||||
patches = [
|
||||
# Bazaar can't find the certificates alone
|
||||
./add_certificates.patch
|
||||
(fetchpatch {
|
||||
url = "https://bazaar.launchpad.net/~brz/brz/trunk/revision/6754";
|
||||
sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
|
||||
name = "CVE-2017-14176.patch";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
|
||||
--subst-var-by certPath /etc/ssl/certs/ca-certificates.crt
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
|
||||
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
|
||||
, libvdpau, libsamplerate, live555, fluidsynth
|
||||
, onlyLibVLC ? false
|
||||
, qt4 ? null
|
||||
, withQt5 ? false, qtbase ? null, qtx11extras ? null
|
||||
, jackSupport ? false
|
||||
|
|
@ -68,8 +67,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-vdpau"
|
||||
"--enable-dvdnav"
|
||||
"--enable-samplerate"
|
||||
]
|
||||
++ optional onlyLibVLC "--disable-vlc";
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "weston-${version}";
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
|
||||
sha256 = "19936zlkb75xcaidd8fag4ah8000wrh2ziqy7nxkq36pimgdbqfd";
|
||||
sha256 = "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ let makeDeps = dependencies:
|
|||
'';
|
||||
|
||||
configureCrate =
|
||||
{ crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies }:
|
||||
{ crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }:
|
||||
let version_ = lib.splitString "-" crateVersion;
|
||||
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
|
||||
version = lib.splitString "." (lib.head version_);
|
||||
|
|
@ -58,6 +58,7 @@ let makeDeps = dependencies:
|
|||
completeDepsDir = lib.concatStringsSep " " completeDeps;
|
||||
completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
|
||||
in ''
|
||||
cd ${workspace_member}
|
||||
runHook preConfigure
|
||||
${echo_build_heading colors}
|
||||
${noisily colors verbose}
|
||||
|
|
@ -146,10 +147,15 @@ let makeDeps = dependencies:
|
|||
mkdir -p $OUT_DIR
|
||||
target/build/${crateName}/build_script_build > target/build/${crateName}.opt
|
||||
set +e
|
||||
EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
|
||||
EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
|
||||
EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ')
|
||||
EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
|
||||
EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
|
||||
EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
|
||||
EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
|
||||
|
||||
for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
|
||||
export $env
|
||||
done
|
||||
|
||||
CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/")
|
||||
grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
|
||||
| sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env
|
||||
|
|
@ -171,8 +177,7 @@ let makeDeps = dependencies:
|
|||
dependencies, completeDeps, completeBuildDeps,
|
||||
crateFeatures, libName, build, release, libPath,
|
||||
crateType, metadata, crateBin, finalBins,
|
||||
extraRustcOpts,
|
||||
verbose, colors }:
|
||||
extraRustcOpts, verbose, colors }:
|
||||
|
||||
let depsDir = lib.concatStringsSep " " dependencies;
|
||||
completeDepsDir = lib.concatStringsSep " " completeDeps;
|
||||
|
|
@ -182,7 +187,7 @@ let makeDeps = dependencies:
|
|||
rustcOpts =
|
||||
lib.lists.foldl' (opts: opt: opts + " " + opt)
|
||||
(if release then "-C opt-level=3" else "-C debuginfo=2")
|
||||
extraRustcOpts;
|
||||
(["-C codegen-units=1"] ++ extraRustcOpts);
|
||||
rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
|
||||
version_ = lib.splitString "-" crateVersion;
|
||||
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
|
||||
|
|
@ -221,12 +226,12 @@ let makeDeps = dependencies:
|
|||
build_bin() {
|
||||
crate_name=$1
|
||||
crate_name_=$(echo $crate_name | sed -e "s/-/_/g")
|
||||
main_file=""
|
||||
if [[ ! -z $2 ]]; then
|
||||
main_file=""
|
||||
if [[ ! -z $2 ]]; then
|
||||
main_file=$2
|
||||
fi
|
||||
echo_build_heading $@
|
||||
noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
|
||||
fi
|
||||
echo_build_heading $@
|
||||
noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
|
||||
${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
|
||||
$LINK ${deps}$EXTRA_LIB --cap-lints allow \
|
||||
$BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
|
||||
|
|
@ -374,7 +379,7 @@ stdenv.mkDerivation (rec {
|
|||
);
|
||||
|
||||
crateFeatures = if crate ? features then
|
||||
lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features)
|
||||
lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #"
|
||||
else "";
|
||||
|
||||
libName = if crate ? libName then crate.libName else crate.crateName;
|
||||
|
|
@ -407,24 +412,26 @@ stdenv.mkDerivation (rec {
|
|||
) "" crate.crateBin
|
||||
else "";
|
||||
|
||||
build = if crate ? build then crate.build else "";
|
||||
build = crate.build or "";
|
||||
workspace_member = crate.workspace_member or ".";
|
||||
crateVersion = crate.version;
|
||||
crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];
|
||||
crateType =
|
||||
if lib.attrByPath ["procMacro"] false crate then "proc-macro" else
|
||||
if lib.attrByPath ["plugin"] false crate then "dylib" else
|
||||
if crate ? type then crate.type else "lib";
|
||||
(crate.type or "lib");
|
||||
colors = lib.attrByPath [ "colors" ] "always" crate;
|
||||
configurePhase = configureCrate {
|
||||
inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
|
||||
crateFeatures libName build release libPath crateVersion
|
||||
crateFeatures libName build workspace_member release libPath crateVersion
|
||||
crateAuthors verbose colors;
|
||||
};
|
||||
extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
|
||||
buildPhase = buildCrate {
|
||||
inherit crateName dependencies completeDeps completeBuildDeps
|
||||
crateFeatures libName build release libPath crateType crateVersion
|
||||
crateAuthors metadata crateBin finalBins verbose colors extraRustcOpts;
|
||||
crateFeatures libName build release libPath crateType
|
||||
crateVersion crateAuthors metadata crateBin finalBins verbose colors
|
||||
extraRustcOpts;
|
||||
};
|
||||
installPhase = installCrate crateName metadata;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b35023f435e7713e5053d3dcd16691e3aff48227.tar.gz";
|
||||
sha256 = "1mnh1bhr8caszxrl44l3iig8kshq7djibnmy0sx0q7inj260xcs7";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/61de1110af16fa0645a8cc8bbaf4a9c6fca9d8e8.tar.gz";
|
||||
sha256 = "0vwfm1imwcffyliaama572ksjgqmwxk48py0wgvgpi2vg08w7a12";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
# build-tools
|
||||
, bootPkgs, alex, happy
|
||||
, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3
|
||||
, autoconf, automake, coreutils, fetchurl, perl, python3
|
||||
|
||||
, libffi, libiconv ? null, ncurses
|
||||
|
||||
|
|
@ -68,13 +68,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
inherit (src) rev;
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.haskell.org/ghc.git";
|
||||
rev = "6d7eecff7948ad77854f834f55b4d4f942276ad3";
|
||||
sha256 = "0aqy5x0b6qxhyvxw1q9pssf1xvhbyviglqkjrx4gvhbr3nax3wxp";
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
sha256 = "0yq4y0smn92sksnjjva28b8847krxizns6rm50j3pgq69br35k01";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -102,9 +100,6 @@ stdenv.mkDerivation rec {
|
|||
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
|
||||
|
||||
echo -n "${buildMK}" > mk/build.mk
|
||||
echo ${version} >VERSION
|
||||
echo ${src.rev} >GIT_COMMIT_ID
|
||||
./boot
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
||||
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ assert stdenv.system == "x86_64-linux";
|
|||
assert swingSupport -> xorg != null;
|
||||
|
||||
let
|
||||
version = "10";
|
||||
version = "10.0.1";
|
||||
|
||||
downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
|
||||
|
||||
|
|
@ -52,19 +52,19 @@ let result = stdenv.mkDerivation rec {
|
|||
requireFile {
|
||||
name = "jdk-${version}_linux-x64_bin.tar.gz";
|
||||
url = "${downloadUrlBase}/jdk10-downloads-4416644.html";
|
||||
sha256 = "0338m0x5lka0xjsbcll70r1i308bjw3m42cm9dx9zmfk70kplj5c";
|
||||
sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf";
|
||||
}
|
||||
else if packageType == "JRE" then
|
||||
requireFile {
|
||||
name = "jre-${version}_linux-x64_bin.tar.gz";
|
||||
url = "${downloadUrlBase}/jre10-downloads-4417026.html";
|
||||
sha256 = "1clawcahkla1h9pxnqfqzcgv51aqgq78v1ws5jygbk6fbbi7l54w";
|
||||
sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq";
|
||||
}
|
||||
else if packageType == "ServerJRE" then
|
||||
requireFile {
|
||||
name = "serverjre-${version}_linux-x64_bin.tar.gz";
|
||||
url = "${downloadUrlBase}/sjre10-downloads-4417025.html";
|
||||
sha256 = "0kiyg33fv29ad0nyl35r7y0bhyxivb2hxlds44m9l0259s55nwhw";
|
||||
sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw";
|
||||
}
|
||||
else abort "unknown package Type ${packageType}";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
import ./jdk-linux-base.nix {
|
||||
productVersion = "8";
|
||||
patchVersion = "162";
|
||||
patchVersion = "172";
|
||||
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
|
||||
sha256.i686-linux = "097vlvvj1vr7815rgarf5x97lagi4q0kai0x4lvd4y3wrzdqikzf";
|
||||
sha256.x86_64-linux = "0mq2d0lj53gzn4qqdjdgbwl0h857k2rnsnr2hkmvihnrgza85v38";
|
||||
sha256.armv7l-linux = "0xzsgdmpgs1n1g70hgly0mpxflhjrmq3vxwx8gl0kmqdiv4hqwjp";
|
||||
sha256.aarch64-linux = "19ykcsmvkf7sdq2lqwvyi60nhb8v7f88dqjycimrsar9y4r7skf8";
|
||||
sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa";
|
||||
sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818";
|
||||
sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln";
|
||||
sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s";
|
||||
jceName = "jce_policy-8.zip";
|
||||
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
|
|
|
|||
|
|
@ -866,6 +866,9 @@ self: super: {
|
|||
# https://github.com/fpco/stackage/issues/3126
|
||||
stack = doJailbreak super.stack;
|
||||
|
||||
# https://github.com/snoyberg/monad-logger/issues/1
|
||||
monad-logger = self.monad-logger_0_3_28_5;
|
||||
|
||||
# These packages depend on each other, forming an infinite loop.
|
||||
scalendar = markBroken (super.scalendar.override { SCalendar = null; });
|
||||
SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
|
||||
|
|
@ -1022,6 +1025,11 @@ self: super: {
|
|||
|
||||
# This package refers to the wrong library (itself in fact!)
|
||||
vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
|
||||
|
||||
# Both need a more up-to-date version
|
||||
hlint = super.hlint.override { extra = self.extra_1_6_6; };
|
||||
hoogle = super.hoogle.override { extra = self.extra_1_6_6; };
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -583,7 +583,7 @@ self: super: {
|
|||
});
|
||||
|
||||
# Older versions don't compile.
|
||||
brick = self.brick_0_36;
|
||||
brick = doJailbreak super.brick_0_36; # https://github.com/jtdaugherty/brick/issues/171
|
||||
HaTeX = self.HaTeX_3_19_0_0;
|
||||
matrix = self.matrix_0_3_6_1;
|
||||
pandoc = self.pandoc_2_1_3;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ core-packages:
|
|||
- ghcjs-base-0
|
||||
|
||||
default-package-overrides:
|
||||
# LTS Haskell 11.4
|
||||
# LTS Haskell 11.5
|
||||
- abstract-deque ==0.3
|
||||
- abstract-deque-tests ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
|
|
@ -72,7 +72,7 @@ default-package-overrides:
|
|||
- aeson-generic-compat ==0.0.1.1
|
||||
- aeson-injector ==1.1.0.0
|
||||
- aeson-picker ==0.1.0.4
|
||||
- aeson-pretty ==0.8.5
|
||||
- aeson-pretty ==0.8.7
|
||||
- aeson-qq ==0.8.2
|
||||
- aeson-typescript ==0.1.0.6
|
||||
- aeson-utils ==0.3.0.2
|
||||
|
|
@ -140,8 +140,8 @@ default-package-overrides:
|
|||
- auto-update ==0.1.4
|
||||
- avwx ==0.3.0.2
|
||||
- axiom ==0.4.6
|
||||
- b9 ==0.5.43
|
||||
- backprop ==0.1.5.0
|
||||
- b9 ==0.5.44
|
||||
- backprop ==0.1.5.1
|
||||
- bank-holidays-england ==0.1.0.6
|
||||
- barrier ==0.1.1
|
||||
- base16-bytestring ==0.1.1.6
|
||||
|
|
@ -157,6 +157,9 @@ default-package-overrides:
|
|||
- basic-prelude ==0.7.0
|
||||
- bbdb ==0.8
|
||||
- bcrypt ==0.0.11
|
||||
- beam-core ==0.7.2.0
|
||||
- beam-migrate ==0.3.1.0
|
||||
- beam-sqlite ==0.3.2.0
|
||||
- bench ==1.0.9
|
||||
- benchpress ==0.2.2.10
|
||||
- bencode ==0.6.0.0
|
||||
|
|
@ -178,7 +181,7 @@ default-package-overrides:
|
|||
- binary-shared ==0.8.3
|
||||
- binary-tagged ==0.1.4.2
|
||||
- bindings-DSL ==1.0.24
|
||||
- bindings-GLFW ==3.1.2.3
|
||||
- bindings-GLFW ==3.1.2.4
|
||||
- bindings-libzip ==1.0.1
|
||||
- bindings-uname ==0.1
|
||||
- bioace ==0.0.1
|
||||
|
|
@ -207,7 +210,7 @@ default-package-overrides:
|
|||
- blaze-bootstrap ==0.1.0.1
|
||||
- blaze-builder ==0.4.1.0
|
||||
- blaze-html ==0.9.0.1
|
||||
- blaze-markup ==0.8.2.0
|
||||
- blaze-markup ==0.8.2.1
|
||||
- blaze-svg ==0.3.6.1
|
||||
- blaze-textual ==0.2.1.0
|
||||
- bloodhound ==0.15.0.2
|
||||
|
|
@ -462,7 +465,7 @@ default-package-overrides:
|
|||
- data-serializer ==0.3.4
|
||||
- datasets ==0.2.5
|
||||
- data-textual ==0.3.0.2
|
||||
- data-tree-print ==0.1.0.0
|
||||
- data-tree-print ==0.1.0.1
|
||||
- dataurl ==0.1.0.0
|
||||
- DAV ==1.3.2
|
||||
- dawg-ord ==0.5.1.0
|
||||
|
|
@ -551,8 +554,8 @@ default-package-overrides:
|
|||
- ekg ==0.4.0.15
|
||||
- ekg-core ==0.1.1.4
|
||||
- ekg-json ==0.1.0.6
|
||||
- ekg-statsd ==0.2.2.0
|
||||
- ekg-wai ==0.1.0.2
|
||||
- ekg-statsd ==0.2.3.0
|
||||
- ekg-wai ==0.1.0.3
|
||||
- elerea ==2.9.0
|
||||
- eliminators ==0.3
|
||||
- elm-core-sources ==1.0.0
|
||||
|
|
@ -755,7 +758,7 @@ default-package-overrides:
|
|||
- glaze ==0.3.0.1
|
||||
- glazier ==0.11.0.1
|
||||
- glazier-pipes ==0.1.5.1
|
||||
- GLFW-b ==1.4.8.1
|
||||
- GLFW-b ==1.4.8.3
|
||||
- glib ==0.13.5.0
|
||||
- Glob ==0.9.2
|
||||
- glob-posix ==0.1.0.1
|
||||
|
|
@ -768,7 +771,7 @@ default-package-overrides:
|
|||
- GLURaw ==2.0.0.4
|
||||
- GLUT ==2.7.0.13
|
||||
- gluturtle ==0.0.58.1
|
||||
- gnuplot ==0.5.5.1
|
||||
- gnuplot ==0.5.5.2
|
||||
- goggles ==0.3.2
|
||||
- google-cloud ==0.0.4
|
||||
- google-oauth2-jwt ==0.2.2
|
||||
|
|
@ -802,7 +805,7 @@ default-package-overrides:
|
|||
- hamilton ==0.1.0.2
|
||||
- HandsomeSoup ==0.4.2
|
||||
- handwriting ==0.1.0.3
|
||||
- hapistrano ==0.3.5.3
|
||||
- hapistrano ==0.3.5.4
|
||||
- happstack-jmacro ==7.0.12
|
||||
- happstack-server ==7.5.1
|
||||
- happstack-server-tls ==7.1.6.5
|
||||
|
|
@ -855,7 +858,7 @@ default-package-overrides:
|
|||
- HDBC-mysql ==0.7.1.0
|
||||
- HDBC-session ==0.1.1.1
|
||||
- hdevtools ==0.1.6.1
|
||||
- heap ==1.0.3
|
||||
- heap ==1.0.4
|
||||
- heaps ==0.3.6
|
||||
- heatshrink ==0.1.0.0
|
||||
- hebrew-time ==0.1.1
|
||||
|
|
@ -983,7 +986,7 @@ default-package-overrides:
|
|||
- http-client-openssl ==0.2.1.1
|
||||
- http-client-tls ==0.3.5.3
|
||||
- http-common ==0.8.2.0
|
||||
- http-conduit ==2.3.0
|
||||
- http-conduit ==2.3.1
|
||||
- http-date ==0.0.6.1
|
||||
- http-link-header ==1.0.3
|
||||
- http-media ==0.7.1.2
|
||||
|
|
@ -1050,7 +1053,7 @@ default-package-overrides:
|
|||
- indexed-list-literals ==0.1.0.1
|
||||
- inflections ==0.4.0.1
|
||||
- influxdb ==1.3.0.1
|
||||
- ini ==0.3.5
|
||||
- ini ==0.3.6
|
||||
- inline-c ==0.6.0.5
|
||||
- inline-c-cpp ==0.2.1.0
|
||||
- inline-java ==0.8.2
|
||||
|
|
@ -1201,7 +1204,7 @@ default-package-overrides:
|
|||
- llvm-hs-pure ==5.1.2
|
||||
- lmdb ==0.2.5
|
||||
- load-env ==0.1.2
|
||||
- loch-th ==0.2.1
|
||||
- loch-th ==0.2.2
|
||||
- lockfree-queue ==0.2.3.1
|
||||
- log ==0.9.0.1
|
||||
- log-base ==0.7.4.0
|
||||
|
|
@ -1241,8 +1244,8 @@ default-package-overrides:
|
|||
- markov-chain ==0.0.3.4
|
||||
- markup ==4.0.4
|
||||
- marvin-interpolate ==1.1.2
|
||||
- massiv ==0.1.4.0
|
||||
- massiv-io ==0.1.1.0
|
||||
- massiv ==0.1.6.1
|
||||
- massiv-io ==0.1.2.0
|
||||
- mathexpr ==0.3.0.0
|
||||
- math-functions ==0.2.1.0
|
||||
- matplotlib ==0.6.0
|
||||
|
|
@ -1282,7 +1285,7 @@ default-package-overrides:
|
|||
- mime-mail-ses ==0.4.0.0
|
||||
- mime-types ==0.1.0.7
|
||||
- minimorph ==0.1.6.1
|
||||
- miniutter ==0.4.6.0
|
||||
- miniutter ==0.4.7.0
|
||||
- mintty ==0.1.1
|
||||
- misfortune ==0.1.1.2
|
||||
- miso ==0.14.0.0
|
||||
|
|
@ -1309,7 +1312,7 @@ default-package-overrides:
|
|||
- monadic-arrays ==0.2.2
|
||||
- monad-journal ==0.8.1
|
||||
- monadloc ==0.7.1
|
||||
- monad-logger ==0.3.28.3
|
||||
- monad-logger ==0.3.28.4
|
||||
- monad-logger-json ==0.1.0.0
|
||||
- monad-logger-prefix ==0.1.9
|
||||
- monad-logger-syslog ==0.1.4.0
|
||||
|
|
@ -1335,7 +1338,7 @@ default-package-overrides:
|
|||
- monad-unlift-ref ==0.2.1
|
||||
- mongoDB ==2.3.0.5
|
||||
- monoidal-containers ==0.3.1.0
|
||||
- monoid-extras ==0.4.3
|
||||
- monoid-extras ==0.4.4
|
||||
- monoid-subclasses ==0.4.6
|
||||
- monoid-transformer ==0.0.4
|
||||
- mono-traversable ==1.0.8.1
|
||||
|
|
@ -1378,7 +1381,7 @@ default-package-overrides:
|
|||
- nettle ==0.2.0
|
||||
- netwire ==5.0.3
|
||||
- netwire-input ==0.0.7
|
||||
- netwire-input-glfw ==0.0.8
|
||||
- netwire-input-glfw ==0.0.10
|
||||
- network ==2.6.3.5
|
||||
- network-anonymous-i2p ==0.10.0
|
||||
- network-anonymous-tor ==0.11.0
|
||||
|
|
@ -1505,7 +1508,7 @@ default-package-overrides:
|
|||
- perfect-hash-generator ==0.2.0.6
|
||||
- persistable-record ==0.6.0.3
|
||||
- persistable-types-HDBC-pg ==0.0.1.5
|
||||
- persistent ==2.8.1
|
||||
- persistent ==2.8.2
|
||||
- persistent-mongoDB ==2.8.0
|
||||
- persistent-mysql ==2.8.1
|
||||
- persistent-mysql-haskell ==0.4.0
|
||||
|
|
@ -1554,7 +1557,7 @@ default-package-overrides:
|
|||
- poly-arity ==0.1.0
|
||||
- polynomials-bernstein ==1.1.2
|
||||
- polyparse ==1.12
|
||||
- pomaps ==0.0.0.3
|
||||
- pomaps ==0.0.0.4
|
||||
- pooled-io ==0.0.2.1
|
||||
- PortMidi ==0.1.6.1
|
||||
- posix-paths ==0.2.1.5
|
||||
|
|
@ -1595,7 +1598,7 @@ default-package-overrides:
|
|||
- prim-uniq ==0.1.0.1
|
||||
- probability ==0.2.5.1
|
||||
- process-extras ==0.7.4
|
||||
- product-isomorphic ==0.0.3.1
|
||||
- product-isomorphic ==0.0.3.2
|
||||
- product-profunctors ==0.9.0.0
|
||||
- profiterole ==0.1
|
||||
- profunctors ==5.2.2
|
||||
|
|
@ -1715,7 +1718,7 @@ default-package-overrides:
|
|||
- req-url-extra ==0.1.0.0
|
||||
- reroute ==0.4.1.0
|
||||
- resource-pool ==0.2.3.2
|
||||
- resourcet ==1.2.0
|
||||
- resourcet ==1.2.1
|
||||
- rest-core ==0.39
|
||||
- rest-snap ==0.3.0.0
|
||||
- rest-stringmap ==0.2.0.7
|
||||
|
|
@ -1750,8 +1753,8 @@ default-package-overrides:
|
|||
- say ==0.1.0.0
|
||||
- sbp ==2.3.13
|
||||
- sbv ==7.5
|
||||
- SCalendar ==1.1.0
|
||||
- scalendar ==1.2.0
|
||||
- SCalendar ==1.1.0
|
||||
- scalpel ==0.5.1
|
||||
- scalpel-core ==0.5.1
|
||||
- scanner ==0.2
|
||||
|
|
@ -1776,16 +1779,16 @@ default-package-overrides:
|
|||
- semiring-simple ==1.0.0.1
|
||||
- semver ==0.3.3.1
|
||||
- sendfile ==0.7.9
|
||||
- sensu-run ==0.4.0.4
|
||||
- sensu-run ==0.4.0.5
|
||||
- seqalign ==0.2.0.4
|
||||
- seqloc ==0.6.1.1
|
||||
- sequence ==0.9.8
|
||||
- serf ==0.1.1.0
|
||||
- servant ==0.13
|
||||
- servant ==0.13.0.1
|
||||
- servant-blaze ==0.8
|
||||
- servant-cassava ==0.10
|
||||
- servant-client ==0.13
|
||||
- servant-client-core ==0.13
|
||||
- servant-client ==0.13.0.1
|
||||
- servant-client-core ==0.13.0.1
|
||||
- servant-docs ==0.11.2
|
||||
- servant-elm ==0.4.0.1
|
||||
- servant-exceptions ==0.1.1
|
||||
|
|
@ -1800,7 +1803,7 @@ default-package-overrides:
|
|||
- servant-pandoc ==0.5.0.0
|
||||
- servant-purescript ==0.9.0.2
|
||||
- servant-ruby ==0.7.0.0
|
||||
- servant-server ==0.13
|
||||
- servant-server ==0.13.0.1
|
||||
- servant-static-th ==0.2.0.1
|
||||
- servant-subscriber ==0.6.0.1
|
||||
- servant-swagger ==1.1.5
|
||||
|
|
@ -2055,8 +2058,7 @@ default-package-overrides:
|
|||
- th-to-exp ==0.0.1.1
|
||||
- th-utilities ==0.2.0.1
|
||||
- tibetan-utils ==0.1.1.5
|
||||
- tidal ==0.9.6
|
||||
- tidal-midi ==0.9.5.2
|
||||
- tidal ==0.9.8
|
||||
- tile ==0.3.0.0
|
||||
- time-compat ==0.1.0.3
|
||||
- timeit ==2.0
|
||||
|
|
@ -2138,8 +2140,8 @@ default-package-overrides:
|
|||
- union-find ==0.2
|
||||
- uniplate ==1.6.12
|
||||
- uniq-deep ==1.1.0.0
|
||||
- unique ==0
|
||||
- Unique ==0.4.7.2
|
||||
- unique ==0
|
||||
- unit-constraint ==0.0.0
|
||||
- units-parser ==0.1.1.2
|
||||
- universe ==1.0
|
||||
|
|
@ -2261,8 +2263,8 @@ default-package-overrides:
|
|||
- weigh ==0.0.7
|
||||
- wide-word ==0.1.0.6
|
||||
- wikicfp-scraper ==0.1.0.9
|
||||
- wild-bind ==0.1.1.1
|
||||
- wild-bind-x11 ==0.2.0.1
|
||||
- wild-bind ==0.1.2.0
|
||||
- wild-bind-x11 ==0.2.0.2
|
||||
- Win32 ==2.5.4.1
|
||||
- Win32-notify ==0.3.0.3
|
||||
- wire-streams ==0.1.1.0
|
||||
|
|
@ -2336,11 +2338,11 @@ default-package-overrides:
|
|||
- yeshql ==3.0.1.3
|
||||
- yesod ==1.6.0
|
||||
- yesod-alerts ==0.1.2.0
|
||||
- yesod-auth ==1.6.2
|
||||
- yesod-auth ==1.6.3
|
||||
- yesod-auth-fb ==1.9.0
|
||||
- yesod-auth-hashdb ==1.7
|
||||
- yesod-bin ==1.6.0
|
||||
- yesod-core ==1.6.2
|
||||
- yesod-core ==1.6.3
|
||||
- yesod-csp ==0.2.4.0
|
||||
- yesod-eventsource ==1.6.0
|
||||
- yesod-fb ==0.5.0
|
||||
|
|
@ -2385,7 +2387,7 @@ default-package-overrides:
|
|||
- zlib-lens ==0.1.2.1
|
||||
- zot ==0.0.3
|
||||
- zstd ==0.1.0.0
|
||||
- ztail ==1.2.0.1
|
||||
- ztail ==1.2.0.2
|
||||
|
||||
extra-packages:
|
||||
- aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier
|
||||
|
|
@ -2699,6 +2701,7 @@ dont-distribute-packages:
|
|||
AERN-RnToRm: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
aeson-diff-generic: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
aeson-flowtyped: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -2739,6 +2742,7 @@ dont-distribute-packages:
|
|||
algebraic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
AlgoRhythm: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
align-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -2754,6 +2758,7 @@ dont-distribute-packages:
|
|||
alternative-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
alternative-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
alto: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
alure: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -3080,6 +3085,7 @@ dont-distribute-packages:
|
|||
barrie: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
barrier: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
base-compat-batteries: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -3098,6 +3104,7 @@ dont-distribute-packages:
|
|||
bdcs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
beam-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
beam-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
beam-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
beam-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
beam: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -3265,6 +3272,7 @@ dont-distribute-packages:
|
|||
bowntz: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
braid: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
brain-bleep: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
brainheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
breakout: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
breve: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -3277,6 +3285,7 @@ dont-distribute-packages:
|
|||
brillig: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
bronyradiogermany-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
browscap: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
bson-generic: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -3594,6 +3603,7 @@ dont-distribute-packages:
|
|||
coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
columbia: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
com: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
combinat-compat: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -3709,6 +3719,7 @@ dont-distribute-packages:
|
|||
convert: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
coordinate: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -3742,6 +3753,7 @@ dont-distribute-packages:
|
|||
cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cpython: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cqrs-memory: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -4236,6 +4248,7 @@ dont-distribute-packages:
|
|||
eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
eros-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
eros: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
error-context: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
error-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
error-list: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
error-loc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -4332,6 +4345,7 @@ dont-distribute-packages:
|
|||
fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fast-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fast-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fast-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fasta: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -4661,6 +4675,7 @@ dont-distribute-packages:
|
|||
gf: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
GGg: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-core-smallstep: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-datasize: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -5019,6 +5034,7 @@ dont-distribute-packages:
|
|||
gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gtk-strut: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gtk2hs-cast-gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -5575,6 +5591,7 @@ dont-distribute-packages:
|
|||
HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -5688,6 +5705,8 @@ dont-distribute-packages:
|
|||
hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
HPath: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hPDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
HPhone: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
HPi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -5749,6 +5768,7 @@ dont-distribute-packages:
|
|||
hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hsaml2: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hsass: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hsay: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -5936,6 +5956,7 @@ dont-distribute-packages:
|
|||
hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hw-prim-bits: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -5943,6 +5964,9 @@ dont-distribute-packages:
|
|||
hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hworker: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hws: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -6347,6 +6371,7 @@ dont-distribute-packages:
|
|||
language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-oberon: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -6371,9 +6396,11 @@ dont-distribute-packages:
|
|||
latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
LATS: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
layered-state: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
layers: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
layouting: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lazy-hash-cache: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lazy-hash: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lazy-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -6439,6 +6466,7 @@ dont-distribute-packages:
|
|||
libstackexchange: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
libxls: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -6619,6 +6647,7 @@ dont-distribute-packages:
|
|||
mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
MailchimpSimple: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mailgun: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
main-tester: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
majority: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -6786,12 +6815,14 @@ dont-distribute-packages:
|
|||
MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mohws: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-abort-fd: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-finally: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
monad-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -7099,6 +7130,7 @@ dont-distribute-packages:
|
|||
numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numhask-array: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numhask-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numhask-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numhask: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -7231,6 +7263,7 @@ dont-distribute-packages:
|
|||
pagarme: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pam: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
panda: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pandoc-crossref: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -7375,6 +7408,7 @@ dont-distribute-packages:
|
|||
picosat: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
piet: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pig: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pinpon: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -7428,6 +7462,7 @@ dont-distribute-packages:
|
|||
plat: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
platinum-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
plex: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
plivo: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -8129,6 +8164,7 @@ dont-distribute-packages:
|
|||
servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
servant-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
servant-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
servant-client-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -8512,6 +8548,7 @@ dont-distribute-packages:
|
|||
stats: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
statsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
statsd: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
status-notifier-item: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stdata: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stdf: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -8739,6 +8776,7 @@ dont-distribute-packages:
|
|||
tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
terminal-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
termplot: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
terntup: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -8913,6 +8951,8 @@ dont-distribute-packages:
|
|||
travis: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
trawl: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
tree-diff: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
tree-traversals: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -8995,6 +9035,7 @@ dont-distribute-packages:
|
|||
type-spine: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
type-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -9135,6 +9176,7 @@ dont-distribute-packages:
|
|||
vector-space-map: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
vector-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Verba: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
|
|||
2821
pkgs/development/haskell-modules/hackage-packages.nix
generated
2821
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "j-${version}";
|
||||
version = "806";
|
||||
version = "808";
|
||||
jtype = "release";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsoftware";
|
||||
repo = "jsource";
|
||||
rev = "j${version}-${jtype}";
|
||||
sha256 = "0b9sbd5hbyr5454k0p53f03lpf03sz8mqwszaqi0vcs73bsprdjs";
|
||||
sha256 = "1sshm04p3yznlhfp6vyc7g8qxw95y67vhnh92cmz3lfy69n2q6bf";
|
||||
};
|
||||
|
||||
buildInputs = [ readline libedit ];
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = {
|
||||
description = "3D widget set based on the Athena Widget set";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
sh autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib";
|
||||
configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --enable-examples=no";
|
||||
|
||||
# libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o
|
||||
# libtool: error: cannot find the library 'libexamples.la'
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python }:
|
||||
{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rdkafka-${version}";
|
||||
|
|
@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ zlib perl python ];
|
||||
buildInputs = [ zlib perl python openssl ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
|
||||
|
||||
configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--disable-ssl" ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchPypi, buildPythonPackage
|
||||
, more-itertools, six
|
||||
, coverage, codecov, pytest, pytestcov, pytest-sugar, portend
|
||||
, pytest, pytestcov, portend
|
||||
, backports_unittest-mock, setuptools_scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ setuptools_scm ];
|
||||
|
||||
checkInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock ];
|
||||
checkInputs = [ pytest pytestcov portend backports_unittest-mock ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test cheroot
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, cheroot, portend, routes, six
|
||||
, setuptools_scm
|
||||
, backports_unittest-mock, codecov, coverage, objgraph, pathpy, pytest, pytest-sugar, pytestcov
|
||||
, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "CherryPy";
|
||||
version = "14.0.1";
|
||||
|
||||
|
|
@ -18,7 +17,7 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ setuptools_scm ];
|
||||
|
||||
checkInputs = [ backports_unittest-mock codecov coverage objgraph pathpy pytest pytest-sugar pytestcov ];
|
||||
checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ];
|
||||
|
||||
checkPhase = ''
|
||||
LANG=en_US.UTF-8 pytest
|
||||
|
|
|
|||
|
|
@ -4,17 +4,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mysql-connector";
|
||||
version = "8.0.6";
|
||||
version = "8.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mysql";
|
||||
repo = "mysql-connector-python";
|
||||
rev = version;
|
||||
sha256 = "1ygr7va56da12yp3gr7kzss9zgbs28q2lmdkw16rpxj108id4rkp";
|
||||
sha256 = "0w5sxy0zdkdj5cj35wwfjy9y8yn5yzk9biwwsglvhkqlkrms8fw1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ protobuf ];
|
||||
|
||||
# Tests are failing (TODO: unknown reason)
|
||||
# TypeError: __init__() missing 1 required positional argument: 'string'
|
||||
# But the library should be working as expected.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,20 +1,25 @@
|
|||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, pytest, pytest-sugar, pytest-warnings, setuptools_scm
|
||||
, tempora }:
|
||||
, pytest, setuptools_scm, tempora }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "portend";
|
||||
version = "2.2";
|
||||
|
||||
buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ];
|
||||
propagatedBuildInputs = [ tempora ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
propagatedBuildInputs = [ tempora ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Monitor TCP ports for bound or unbound states";
|
||||
homepage = https://github.com/jaraco/portend;
|
||||
|
|
|
|||
|
|
@ -19,5 +19,9 @@ buildPythonPackage rec {
|
|||
description = "A plugin that changes the default look and feel of py.test";
|
||||
homepage = https://github.com/Frozenball/pytest-sugar;
|
||||
license = licenses.bsd3;
|
||||
|
||||
# incompatible with pytest 3.5
|
||||
# https://github.com/Frozenball/pytest-sugar/issues/134
|
||||
broken = true; # 2018-04-20
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ buildPythonApplication rec {
|
|||
meta = {
|
||||
description = "Command-line tool for querying PyPI and Python packages installed on your system";
|
||||
homepage = https://github.com/cakebread/yolk;
|
||||
maintainer = with maintainers; [];
|
||||
maintainers = with maintainers; [];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,6 @@ buildPythonPackage rec {
|
|||
description = "Read and write ZIP files - backport of the zipfile module from Python 3.6";
|
||||
homepage = https://gitlab.com/takluyver/zipfile36;
|
||||
license = lib.licenses.psfl;
|
||||
maintainer = lib.maintainers.fridh;
|
||||
maintainers = lib.maintainers.fridh;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, buildPackages
|
||||
, fetchurl, zlib
|
||||
, fetchurl, zlib, autoreconfHook264
|
||||
, buildPlatform, hostPlatform, targetPlatform
|
||||
, noSysDirs, gold ? true, bison ? null
|
||||
}:
|
||||
|
|
@ -64,12 +64,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=22868
|
||||
./gold-symbol-visibility.patch
|
||||
];
|
||||
] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch;
|
||||
|
||||
outputs = [ "out" "info" "man" ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ bison ];
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
] ++ stdenv.lib.optionals targetPlatform.isiOS [
|
||||
autoreconfHook264
|
||||
];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
inherit noSysDirs;
|
||||
|
|
|
|||
112
pkgs/development/tools/misc/binutils/support-ios.patch
Normal file
112
pkgs/development/tools/misc/binutils/support-ios.patch
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
diff --git a/bfd/config.bfd b/bfd/config.bfd
|
||||
index f04a993f06..3357022f35 100644
|
||||
--- a/bfd/config.bfd
|
||||
+++ b/bfd/config.bfd
|
||||
@@ -238,7 +238,7 @@ case "${targ}" in
|
||||
|
||||
# START OF targmatch.h
|
||||
#ifdef BFD64
|
||||
- aarch64-*-darwin*)
|
||||
+ aarch64-*-darwin* | aarch64-*-ios*)
|
||||
targ_defvec=aarch64_mach_o_vec
|
||||
targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec"
|
||||
targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
|
||||
@@ -358,7 +358,7 @@ case "${targ}" in
|
||||
targ_selvecs=arc_elf32_be_vec
|
||||
;;
|
||||
|
||||
- arm-*-darwin*)
|
||||
+ arm-*-darwin* | arm-*-ios*)
|
||||
targ_defvec=arm_mach_o_vec
|
||||
targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec"
|
||||
targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index aae94501e4..4b1121e0d1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then
|
||||
;;
|
||||
*-*-solaris2* | *-*-hpux11*)
|
||||
;;
|
||||
- *-*-darwin* | *-*-aix*)
|
||||
+ *-*-darwin* | *-*-ios* | *-*-aix*)
|
||||
;;
|
||||
nvptx*-*-*)
|
||||
;;
|
||||
@@ -706,7 +706,7 @@ case "${target}" in
|
||||
;;
|
||||
x86_64-*-darwin[[912]]*)
|
||||
;;
|
||||
- *-*-darwin*)
|
||||
+ *-*-darwin* | *-*-ios*)
|
||||
noconfigdirs="$noconfigdirs target-libffi"
|
||||
;;
|
||||
*-*-netware*)
|
||||
@@ -788,7 +788,7 @@ esac
|
||||
# Disable the go frontend on systems where it is known to not work. Please keep
|
||||
# this in sync with contrib/config-list.mk.
|
||||
case "${target}" in
|
||||
-*-*-darwin* | *-*-cygwin* | *-*-mingw*)
|
||||
+*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*)
|
||||
unsupported_languages="$unsupported_languages go"
|
||||
;;
|
||||
esac
|
||||
@@ -797,7 +797,7 @@ esac
|
||||
# For testing, you can easily override this with --enable-libgo.
|
||||
if test x$enable_libgo = x; then
|
||||
case "${target}" in
|
||||
- *-*-darwin*)
|
||||
+ *-*-darwin* | *-*-ios*)
|
||||
# PR 46986
|
||||
noconfigdirs="$noconfigdirs target-libgo"
|
||||
;;
|
||||
@@ -916,11 +916,11 @@ esac
|
||||
case "${target}" in
|
||||
*-*-chorusos)
|
||||
;;
|
||||
- aarch64-*-darwin*)
|
||||
+ aarch64-*-darwin* | aarch64-*-ios*)
|
||||
noconfigdirs="$noconfigdirs ld gas gdb gprof"
|
||||
noconfigdirs="$noconfigdirs sim target-rda"
|
||||
;;
|
||||
- arm-*-darwin*)
|
||||
+ arm-*-darwin* | arm-*-ios*)
|
||||
noconfigdirs="$noconfigdirs ld gas gdb gprof"
|
||||
noconfigdirs="$noconfigdirs sim target-rda"
|
||||
;;
|
||||
@@ -936,7 +936,7 @@ case "${target}" in
|
||||
noconfigdirs="$noconfigdirs ld gas gprof"
|
||||
noconfigdirs="$noconfigdirs sim target-rda"
|
||||
;;
|
||||
- *-*-darwin*)
|
||||
+ *-*-darwin* | *-*-ios*)
|
||||
noconfigdirs="$noconfigdirs ld gas gdb gprof"
|
||||
noconfigdirs="$noconfigdirs sim target-rda"
|
||||
;;
|
||||
@@ -1226,7 +1226,7 @@ case "${host}" in
|
||||
hppa*-*)
|
||||
host_makefile_frag="config/mh-pa"
|
||||
;;
|
||||
- *-*-darwin*)
|
||||
+ *-*-darwin* | *-*-ios*)
|
||||
host_makefile_frag="config/mh-darwin"
|
||||
;;
|
||||
powerpc-*-aix*)
|
||||
@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
|
||||
# warn during gcc/ subconfigure; unless you're bootstrapping with
|
||||
# -flto it won't be needed until after installation anyway.
|
||||
case $target in
|
||||
- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
|
||||
+ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;;
|
||||
*) if test x"$enable_lto" = x"yes"; then
|
||||
AC_MSG_ERROR([LTO support is not enabled for this target.])
|
||||
fi
|
||||
@@ -2590,7 +2590,7 @@ rm -f conftest*
|
||||
# Decide which environment variable is used to find dynamic libraries.
|
||||
case "${host}" in
|
||||
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
|
||||
- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
|
||||
+ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
|
||||
*-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
|
||||
*) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
|
||||
esac
|
||||
|
|
@ -1,26 +1,24 @@
|
|||
{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }:
|
||||
{ stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gede-${version}";
|
||||
version = "2.0.4";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
|
||||
sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba";
|
||||
sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper python ];
|
||||
nativeBuildInputs = [ qmake makeWrapper python ];
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
buildInputs = [ ctags ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i build.py -e 's,qmake-qt4,qmake,'
|
||||
'';
|
||||
dontUseQmakeConfigure = true;
|
||||
|
||||
buildPhase = ":";
|
||||
|
||||
installPhase = ''
|
||||
python build.py install --prefix="$out"
|
||||
python build.py install --verbose --prefix="$out"
|
||||
wrapProgram $out/bin/gede \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "mypy";
|
||||
version = "0.580";
|
||||
version = "0.590";
|
||||
|
||||
# Tests not included in pip package.
|
||||
doCheck = false;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3bd95a1369810f7693366911d85be9f0a0bd994f6cb7162b7a994e5ded90e3d9";
|
||||
sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lxml typed-ast psutil ];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
inherit (s) version;
|
||||
description = ''Famous german card game'';
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = stdenv.lib.licenses.free;
|
||||
longDescription = ''Play the german card game Skat against the AI or over IRC.'';
|
||||
homepage = http://www.xskat.de/;
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
|
|||
sed -e '/chown /d' -i src/Imakefile
|
||||
sed -e '/chmod /d' -i src/Imakefile
|
||||
sed -e '/InstallAppDefaults/d' -i src/Imakefile
|
||||
sed -e 's/CC = gcc/CC = cc/g' -i src/Imakefile
|
||||
'';
|
||||
|
||||
makeFlags = ["BINDIR=$(out)/bin"];
|
||||
|
|
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A generic Sokoban game for X11";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
homepage = https://tracker.debian.org/pkg/xsok;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,106 +0,0 @@
|
|||
diff --git a/beep.c b/beep.c
|
||||
index 7da2e70..4323d31 100644
|
||||
--- a/beep.c
|
||||
+++ b/beep.c
|
||||
@@ -109,6 +109,7 @@ void do_beep(int freq) {
|
||||
/* BEEP_TYPE_EVDEV */
|
||||
struct input_event e;
|
||||
|
||||
+ memset(&e, 0, sizeof(e));
|
||||
e.type = EV_SND;
|
||||
e.code = SND_TONE;
|
||||
e.value = freq;
|
||||
@@ -124,10 +125,6 @@ void do_beep(int freq) {
|
||||
/* If we get interrupted, it would be nice to not leave the speaker beeping in
|
||||
perpetuity. */
|
||||
void handle_signal(int signum) {
|
||||
-
|
||||
- if(console_device)
|
||||
- free(console_device);
|
||||
-
|
||||
switch(signum) {
|
||||
case SIGINT:
|
||||
case SIGTERM:
|
||||
@@ -257,7 +254,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) {
|
||||
result->verbose = 1;
|
||||
break;
|
||||
case 'e' : /* also --device */
|
||||
- console_device = strdup(optarg);
|
||||
+ console_device = optarg;
|
||||
break;
|
||||
case 'h' : /* notice that this is also --help */
|
||||
default :
|
||||
@@ -276,26 +273,6 @@ void play_beep(beep_parms_t parms) {
|
||||
"%d delay after) @ %.2f Hz\n",
|
||||
parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq);
|
||||
|
||||
- /* try to snag the console */
|
||||
- if(console_device)
|
||||
- console_fd = open(console_device, O_WRONLY);
|
||||
- else
|
||||
- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
|
||||
- console_fd = open("/dev/vc/0", O_WRONLY);
|
||||
-
|
||||
- if(console_fd == -1) {
|
||||
- fprintf(stderr, "Could not open %s for writing\n",
|
||||
- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
|
||||
- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
|
||||
- perror("open");
|
||||
- exit(1);
|
||||
- }
|
||||
-
|
||||
- if (ioctl(console_fd, EVIOCGSND(0)) != -1)
|
||||
- console_type = BEEP_TYPE_EVDEV;
|
||||
- else
|
||||
- console_type = BEEP_TYPE_CONSOLE;
|
||||
-
|
||||
/* Beep */
|
||||
for (i = 0; i < parms.reps; i++) { /* start beep */
|
||||
do_beep(parms.freq);
|
||||
@@ -305,8 +282,6 @@ void play_beep(beep_parms_t parms) {
|
||||
if(parms.end_delay || (i+1 < parms.reps))
|
||||
usleep(1000*parms.delay); /* wait... */
|
||||
} /* repeat. */
|
||||
-
|
||||
- close(console_fd);
|
||||
}
|
||||
|
||||
|
||||
@@ -328,6 +303,26 @@ int main(int argc, char **argv) {
|
||||
signal(SIGTERM, handle_signal);
|
||||
parse_command_line(argc, argv, parms);
|
||||
|
||||
+ /* try to snag the console */
|
||||
+ if(console_device)
|
||||
+ console_fd = open(console_device, O_WRONLY);
|
||||
+ else
|
||||
+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
|
||||
+ console_fd = open("/dev/vc/0", O_WRONLY);
|
||||
+
|
||||
+ if(console_fd == -1) {
|
||||
+ fprintf(stderr, "Could not open %s for writing\n",
|
||||
+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
|
||||
+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
|
||||
+ perror("open");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
+ if (ioctl(console_fd, EVIOCGSND(0)) != -1)
|
||||
+ console_type = BEEP_TYPE_EVDEV;
|
||||
+ else
|
||||
+ console_type = BEEP_TYPE_CONSOLE;
|
||||
+
|
||||
/* this outermost while loop handles the possibility that -n/--new has been
|
||||
used, i.e. that we have multiple beeps specified. Each iteration will
|
||||
play, then free() one parms instance. */
|
||||
@@ -365,8 +360,8 @@ int main(int argc, char **argv) {
|
||||
parms = next;
|
||||
}
|
||||
|
||||
- if(console_device)
|
||||
- free(console_device);
|
||||
+ close(console_fd);
|
||||
+ console_fd = -1;
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
|
@ -1,33 +1,25 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
# this package is working only as root
|
||||
# in order to work as a non privileged user you would need to suid the bin
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "beep-1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnath";
|
||||
repo = "beep";
|
||||
rev = "0d790fa45777896749a885c3b93b2c1476d59f20";
|
||||
sha256 = "0dxz58an0sz5r82al5sc935y2z2k60rz12ikjvx7sz39rfirgfpc";
|
||||
src = fetchurl {
|
||||
url = http://www.johnath.com/beep/beep-1.3.tar.gz;
|
||||
sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r";
|
||||
};
|
||||
|
||||
patches = [ ./cve-2018-0492.patch ];
|
||||
|
||||
makeFlags = [
|
||||
"INSTALL_DIR=${placeholder "out"}/bin/"
|
||||
"MAN_DIR=${placeholder "out"}/man/man1/"
|
||||
];
|
||||
makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/";
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/{bin,man/man1}
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/man/man1
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = {
|
||||
description = "The advanced PC speaker beeper";
|
||||
homepage = http://www.johnath.com/beep/;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,9 +120,9 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
license = licenses.unfree;
|
||||
maintainer = [ maintainers.jraygauthier ];
|
||||
maintainers = [ maintainers.jraygauthier ];
|
||||
# A 32 bit linux would also be possible with some effort (specific download of binaries +
|
||||
# patching of the elf files with 32 bit interpreter).
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
maintainer = [ maintainers.jraygauthier ];
|
||||
maintainers = [ maintainers.jraygauthier ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
98
pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
Normal file
98
pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
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();
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook
|
||||
, llvm, libcxx, libcxxabi, clang, libuuid
|
||||
, libobjc ? null, maloader ? null, xctoolchain ? null
|
||||
, hostPlatform, targetPlatform
|
||||
|
|
@ -6,6 +6,14 @@
|
|||
}:
|
||||
|
||||
let
|
||||
|
||||
# We need to use an old version of cctools-port to support linking TBD files
|
||||
# in the iOS SDK. Note that this only provides support for SDK versions up to
|
||||
# 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the
|
||||
# default version here, which can support the new TBD format via Apple's
|
||||
# libtapi.
|
||||
useOld = targetPlatform.isiOS;
|
||||
|
||||
# The targetPrefix prepended to binary names to allow multiple binuntils on the
|
||||
# PATH to both be usable.
|
||||
targetPrefix = stdenv.lib.optionalString
|
||||
|
|
@ -16,10 +24,12 @@ in
|
|||
# Non-Darwin alternatives
|
||||
assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null);
|
||||
|
||||
assert enableDumpNormalizedLibArgs -> (!useOld);
|
||||
|
||||
let
|
||||
baseParams = rec {
|
||||
name = "${targetPrefix}cctools-port-${version}";
|
||||
version = "895";
|
||||
version = if useOld then "886" else "895";
|
||||
|
||||
src = fetchFromGitHub (if enableDumpNormalizedLibArgs then {
|
||||
owner = "tpoechtrager";
|
||||
|
|
@ -27,6 +37,11 @@ let
|
|||
# master with https://github.com/tpoechtrager/cctools-port/pull/34
|
||||
rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df";
|
||||
sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f";
|
||||
} else if useOld then {
|
||||
owner = "tpoechtrager";
|
||||
repo = "cctools-port";
|
||||
rev = "02f0b8ecd87a3951653d838a321ae744815e21a5";
|
||||
sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
|
||||
} else {
|
||||
owner = "tpoechtrager";
|
||||
repo = "cctools-port";
|
||||
|
|
@ -36,7 +51,11 @@ let
|
|||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool_2 ];
|
||||
nativeBuildInputs = [
|
||||
autoconf automake libtool_2
|
||||
] ++ stdenv.lib.optionals useOld [
|
||||
autoreconfHook
|
||||
];
|
||||
buildInputs = [ libuuid ] ++
|
||||
# Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
|
||||
stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
|
||||
|
|
@ -44,9 +63,14 @@ let
|
|||
|
||||
patches = [
|
||||
./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
|
||||
] ++ stdenv.lib.optionals useOld [
|
||||
# See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
|
||||
./undo-unknown-triple.patch
|
||||
./ld-tbd-v2.patch
|
||||
./support-ios.patch
|
||||
];
|
||||
|
||||
__propagatedImpureHostDeps = [
|
||||
__propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [
|
||||
# As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
|
||||
"/usr/lib/libobjc.A.dylib"
|
||||
"/usr/lib/libobjc.dylib"
|
||||
|
|
@ -86,12 +110,15 @@ let
|
|||
EOF
|
||||
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
||||
sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
|
||||
'' + stdenv.lib.optionalString useOld ''
|
||||
cd cctools
|
||||
'';
|
||||
|
||||
# TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
|
||||
# hairy to handle during bootstrap. Perhaps it could be optional?
|
||||
preConfigure = ''
|
||||
preConfigure = stdenv.lib.optionalString (!useOld) ''
|
||||
cd cctools
|
||||
'' + ''
|
||||
sh autogen.sh
|
||||
'';
|
||||
|
||||
|
|
|
|||
13
pkgs/os-specific/darwin/cctools/support-ios.patch
Normal file
13
pkgs/os-specific/darwin/cctools/support-ios.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/cctools/configure.ac b/cctools/configure.ac
|
||||
index 56e8f24..0b4b3ff 100644
|
||||
--- a/cctools/configure.ac
|
||||
+++ b/cctools/configure.ac
|
||||
@@ -39,7 +39,7 @@ EXTRACXXFLAGS=""
|
||||
WARNINGS=""
|
||||
|
||||
case $host_os in
|
||||
- darwin* )
|
||||
+ darwin* | ios*)
|
||||
isdarwin=yes
|
||||
AM_CONDITIONAL([ISDARWIN], [true])
|
||||
;;
|
||||
17
pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
Normal file
17
pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
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);
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
{ runCommand
|
||||
, lib
|
||||
, llvm
|
||||
, clang
|
||||
, binutils
|
||||
, stdenv
|
||||
, coreutils
|
||||
, gnugrep
|
||||
, buildPackages
|
||||
, hostPlatform
|
||||
, targetPlatform
|
||||
}:
|
||||
|
||||
/* As of this writing, known-good prefix/arch/simulator triples:
|
||||
* aarch64-apple-darwin14 | arm64 | false
|
||||
* arm-apple-darwin10 | armv7 | false
|
||||
* i386-apple-darwin11 | i386 | true
|
||||
* x86_64-apple-darwin14 | x86_64 | true
|
||||
*/
|
||||
|
||||
# Apple uses somewhat non-standard names for this. We could fall back on
|
||||
# `targetPlatform.parsed.cpu.name`, but that would be a more standard one and
|
||||
# likely to fail. Better just to require something manual.
|
||||
assert targetPlatform ? arch;
|
||||
|
||||
let
|
||||
|
||||
prefix = targetPlatform.config;
|
||||
inherit (targetPlatform) arch;
|
||||
simulator = targetPlatform.isiPhoneSimulator or false;
|
||||
|
||||
sdkType = if simulator then "Simulator" else "OS";
|
||||
|
||||
sdkVer = "10.2";
|
||||
|
||||
sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk";
|
||||
|
||||
in (import ../../../build-support/cc-wrapper {
|
||||
inherit stdenv coreutils gnugrep runCommand buildPackages;
|
||||
nativeTools = false;
|
||||
nativeLibc = false;
|
||||
inherit binutils;
|
||||
libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}";
|
||||
inherit (clang) cc;
|
||||
inherit hostPlatform targetPlatform;
|
||||
extraBuildCommands = ''
|
||||
if ! [ -d ${sdk} ]; then
|
||||
echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2
|
||||
exit 1
|
||||
fi
|
||||
# ugh
|
||||
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
|
||||
mv cc-cflags.tmp $out/nix-support/cc-cflags
|
||||
echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags
|
||||
|
||||
# Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust
|
||||
echo "-arch ${arch} -L${sdk}/usr/lib ${lib.optionalString simulator "-L${sdk}/usr/lib/system "}-i${if simulator then "os_simulator" else "phoneos"}_version_min 7.0.0" > $out/nix-support/libc-ldflags-before
|
||||
'';
|
||||
}) // {
|
||||
inherit sdkType sdkVer sdk;
|
||||
}
|
||||
68
pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
Normal file
68
pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ lib, hostPlatform, targetPlatform
|
||||
, clang-unwrapped
|
||||
, binutils-unwrapped
|
||||
, runCommand
|
||||
, stdenv
|
||||
, wrapBintoolsWith
|
||||
, wrapCCWith
|
||||
, buildIosSdk, targetIosSdkPkgs
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
minSdkVersion = "9.0";
|
||||
|
||||
iosPlatformArch = { parsed, ... }: {
|
||||
"arm" = "armv7";
|
||||
"aarch64" = "arm64";
|
||||
"x86_64" = "x86_64";
|
||||
}.${parsed.cpu.name};
|
||||
|
||||
in
|
||||
|
||||
rec {
|
||||
# TODO(kmicklas): Make a pure version of this for each supported SDK version.
|
||||
sdk = rec {
|
||||
name = "ios-sdk";
|
||||
type = "derivation";
|
||||
outPath = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk";
|
||||
|
||||
sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS";
|
||||
version = targetPlatform.sdkVer;
|
||||
};
|
||||
|
||||
binutils = wrapBintoolsWith {
|
||||
libc = targetIosSdkPkgs.libraries;
|
||||
bintools = binutils-unwrapped;
|
||||
extraBuildCommands = ''
|
||||
echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags
|
||||
'';
|
||||
};
|
||||
|
||||
clang = (wrapCCWith {
|
||||
cc = clang-unwrapped;
|
||||
bintools = binutils;
|
||||
libc = targetIosSdkPkgs.libraries;
|
||||
extraBuildCommands = ''
|
||||
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
|
||||
mv cc-cflags.tmp $out/nix-support/cc-cflags
|
||||
echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
|
||||
echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags
|
||||
echo "${if targetPlatform.isiPhoneSimulator then "-mios-simulator-version-min" else "-miphoneos-version-min"}=${minSdkVersion}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
}) // {
|
||||
inherit sdk;
|
||||
};
|
||||
|
||||
libraries = let sdk = buildIosSdk; in runCommand "libSystem-prebuilt" {
|
||||
passthru = {
|
||||
inherit sdk;
|
||||
};
|
||||
} ''
|
||||
if ! [ -d ${sdk} ]; then
|
||||
echo "You must have version ${sdk.version} of the iPhone${sdk.sdkType} sdk installed at ${sdk}" >&2
|
||||
exit 1
|
||||
fi
|
||||
ln -s ${sdk}/usr $out
|
||||
'';
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hwdata-${version}";
|
||||
version = "0.310";
|
||||
version = "0.311";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vcrhonek/hwdata/archive/v0.310.tar.gz";
|
||||
sha256 = "08mhwwc9g9cpfyxrwwviflkdk2jnqs6hc95iv4r5d59hqrj5kida";
|
||||
url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz";
|
||||
sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z";
|
||||
};
|
||||
|
||||
preConfigure = "patchShebangs ./configure";
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.34";
|
||||
version = "4.14.35";
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1f9bl4qw61xw49y5xz1wyilg8gh0wv9k868fh8n3hp17hm66qavq";
|
||||
sha256 = "01zfbd766y8hfsd248lffaj6d4ghl4j918m3yvl892p84xsp5aq2";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.15.17";
|
||||
version = "4.15.18";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1f20h22rrchvqd653a3ih8q6l13zl47bp6k2339x9ihq40rg5m9g";
|
||||
sha256 = "0hdg5h91zwypsgb1lp1m5q1iak1g00rml54fh6j7nj8dgrqwv29z";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.16.2";
|
||||
version = "4.16.3";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "157q43px707nizqwzi5nk87c0nvdif9fbi751f71wpgfp3iiy2s7";
|
||||
sha256 = "18w1dhq5dnmcqc3d8imwm90zwfw0fhda7sy5fjwkhzm93nl72s8d";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.127";
|
||||
version = "4.4.128";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1gscsvijik24p0skhjnhqxlvzj3kfy5cmn3x9wn6ka687hwjb3qa";
|
||||
sha256 = "1c5nlxazn2ijfra1bn3x4fdz3fx02j76hg430jgyij61vndgi5ka";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.93";
|
||||
version = "4.9.94";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "00srda6plvirmrr0bjgiksf00ssiigf5cqi4giy4mij5r6v8mxsq";
|
||||
sha256 = "15rd1rmvwx6wyqp857bdl77ijd233svm5wxyjyj8dy8n36yivk39";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "4.15.17";
|
||||
version = "4.15.18";
|
||||
revision = "a";
|
||||
sha256 = "0rm5dlfj3ryz879p04px1y3hvlfgh3ryk13ihldnl2j1dzl2046i";
|
||||
sha256 = "1wld16i3r06mqxwwkghsxnnivg1jpc6c15y9iclhdgl4srcs1qp6";
|
||||
|
||||
# modVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@ let
|
|||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "appdaemon";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = python.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ed925d3cb25db2c3f57304a0bca8fd0d9072d7ffe347ac5fcf68c4a30b7f1721";
|
||||
sha256 = "ad16773da21e34e258970bf5740d1634a36c8202ac72c6925d960308ef1c58cf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "metabase-${version}";
|
||||
version = "0.28.1";
|
||||
version = "0.28.6";
|
||||
|
||||
jar = fetchurl {
|
||||
src = fetchurl {
|
||||
url = "http://downloads.metabase.com/v${version}/metabase.jar";
|
||||
sha256 = "1nv3y4pnvzd7lwyj14nmhr3k52qd8hilcjxvd7qr3hb7kzmjvbzk";
|
||||
sha256 = "1dzs57yyx6k93gvyva9y38xdb4pbvdliad3zzgk3vs74fp1zh2vq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -14,13 +14,14 @@ stdenv.mkDerivation rec {
|
|||
unpackPhase = "true";
|
||||
|
||||
installPhase = ''
|
||||
makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $jar"
|
||||
makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The easy, open source way for everyone in your company to ask questions and learn from data.";
|
||||
homepage = https://metabase.com;
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ schneefux ];
|
||||
homepage = https://metabase.com;
|
||||
license = licenses.agpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ schneefux thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,33 +93,33 @@ let
|
|||
in {
|
||||
|
||||
postgresql93 = common {
|
||||
version = "9.3.21";
|
||||
version = "9.3.22";
|
||||
psqlSchema = "9.3";
|
||||
sha256 = "1q2038rvqa00rpk8sjbnwb19x64fcyjphw9x087432hq918vrfmr";
|
||||
sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v";
|
||||
};
|
||||
|
||||
postgresql94 = common {
|
||||
version = "9.4.16";
|
||||
version = "9.4.17";
|
||||
psqlSchema = "9.4";
|
||||
sha256 = "10ay2cy3m4g66jwvxknc0f0w6mv2v7vm0dzkq92s9n7446v65g6w";
|
||||
sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks";
|
||||
};
|
||||
|
||||
postgresql95 = common {
|
||||
version = "9.5.11";
|
||||
version = "9.5.12";
|
||||
psqlSchema = "9.5";
|
||||
sha256 = "1pf8fwx8a6vn344b80a1bf2p4hjg06sh69kb2qwswxbsw9scv0l1";
|
||||
sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02";
|
||||
};
|
||||
|
||||
postgresql96 = common {
|
||||
version = "9.6.7";
|
||||
version = "9.6.8";
|
||||
psqlSchema = "9.6";
|
||||
sha256 = "1ii4lrw8sncnz5g0fss1011shjhmbajzzhxx4f0bgsniq7rkvgif";
|
||||
sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga";
|
||||
};
|
||||
|
||||
postgresql100 = common {
|
||||
version = "10.2";
|
||||
version = "10.3";
|
||||
psqlSchema = "10.0";
|
||||
sha256 = "1bav2iyi93h866skrrlqlvsp4sfv1sfww1s305zpzffxcadh0cpy";
|
||||
sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2570,6 +2570,9 @@ let
|
|||
url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
|
||||
sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
|
||||
};
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
|
||||
'';
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ ];
|
||||
meta.platforms = stdenv.lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ in lib.init bootStages ++ [
|
|||
buildPlatform = localSystem;
|
||||
hostPlatform = crossSystem;
|
||||
targetPlatform = crossSystem;
|
||||
cc = if crossSystem.useiOSCross or false
|
||||
then buildPackages.darwin.ios-cross
|
||||
cc = if crossSystem.useiOSPrebuilt or false
|
||||
then buildPackages.darwin.iosSdkPkgs.clang
|
||||
else if crossSystem.useAndroidPrebuilt
|
||||
then buildPackages.androidenv.androidndkPkgs.gcc
|
||||
else buildPackages.gcc;
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ let
|
|||
license = either (listOf lib.types.attrs) (either lib.types.attrs str);
|
||||
maintainers = listOf (attrsOf str);
|
||||
priority = int;
|
||||
platforms = listOf (either str lib.systems.parsed.types.system);
|
||||
platforms = listOf (either str lib.systems.parsedPlatform.types.system);
|
||||
hydraPlatforms = listOf str;
|
||||
broken = bool;
|
||||
|
||||
|
|
|
|||
40
pkgs/tools/admin/ansible/2.5.nix
Normal file
40
pkgs/tools/admin/ansible/2.5.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, pythonPackages
|
||||
, windowsSupport ? false
|
||||
}:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
pname = "ansible";
|
||||
version = "2.5.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.ansible.com/ansible/${name}.tar.gz";
|
||||
sha256 = "06h0cmz0cgj1xszzn6rsypfc8lkazgh5g1yxyss1yx242d0wkw2i";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
sed -i "s,/usr/,$out," lib/ansible/constants.py
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
dontPatchShebangs = false;
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
|
||||
] ++ stdenv.lib.optional windowsSupport pywinrm;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.ansible.com;
|
||||
description = "A simple automation tool";
|
||||
license = with licenses; [ gpl3 ];
|
||||
maintainers = with maintainers; [
|
||||
jgeerds
|
||||
joamaki
|
||||
];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
28
pkgs/tools/misc/rw/default.nix
Normal file
28
pkgs/tools/misc/rw/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rw-${version}";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sortix.org/rw/release/rw-portable-${version}.tar.gz";
|
||||
# Use hash provided by upstream
|
||||
sha256 = "50009730e36991dfe579716f91f4f616f5ba05ffb7bf69c03d41bf305ed93b6d";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://sortix.org/rw;
|
||||
description = "Block device and byte copying program similar to dd";
|
||||
longDescription = ''
|
||||
rw is a command line program which copies information between files
|
||||
or byte streams. The rw command is designed to be a replacement for
|
||||
dd with standard style command line flags.
|
||||
'';
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -228,6 +228,7 @@ mapAliases (rec {
|
|||
vimprobable2Wrapper = vimprobable2; # added 2015-01
|
||||
virtviewer = virt-viewer; # added 2015-12-24
|
||||
vorbisTools = vorbis-tools; # added 2016-01-26
|
||||
wineStaging = wine-staging; # added 2018-01-08
|
||||
winusb = woeusb; # added 2017-12-22
|
||||
x11 = xlibsWrapper; # added 2015-09
|
||||
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
|
||||
|
|
|
|||
|
|
@ -2395,6 +2395,8 @@ with pkgs;
|
|||
|
||||
fsfs = callPackage ../tools/filesystems/fsfs { };
|
||||
|
||||
fstl = qt5.callPackage ../applications/graphics/fstl { };
|
||||
|
||||
fswebcam = callPackage ../os-specific/linux/fswebcam { };
|
||||
|
||||
fuseiso = callPackage ../tools/filesystems/fuseiso { };
|
||||
|
|
@ -4699,6 +4701,8 @@ with pkgs;
|
|||
|
||||
runzip = callPackage ../tools/archivers/runzip { };
|
||||
|
||||
rw = callPackage ../tools/misc/rw { };
|
||||
|
||||
rxp = callPackage ../tools/text/xml/rxp { };
|
||||
|
||||
rzip = callPackage ../tools/compression/rzip { };
|
||||
|
|
@ -4853,6 +4857,8 @@ with pkgs;
|
|||
|
||||
sleuthkit = callPackage ../tools/system/sleuthkit {};
|
||||
|
||||
sleepyhead = callPackage ../applications/misc/sleepyhead {};
|
||||
|
||||
slimrat = callPackage ../tools/networking/slimrat {
|
||||
inherit (perlPackages) WWWMechanize LWP;
|
||||
};
|
||||
|
|
@ -6916,15 +6922,14 @@ with pkgs;
|
|||
libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc;
|
||||
};
|
||||
|
||||
wrapBintoolsWith = { bintools, libc }: bintoolsWrapperFun {
|
||||
wrapBintoolsWith = { bintools, libc, extraBuildCommands ? "" }: bintoolsWrapperFun {
|
||||
nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false;
|
||||
nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false;
|
||||
nativePrefix = stdenv.cc.nativePrefix or "";
|
||||
|
||||
noLibc = (libc == null);
|
||||
|
||||
inherit bintools libc;
|
||||
extraBuildCommands = "";
|
||||
inherit bintools libc extraBuildCommands;
|
||||
};
|
||||
|
||||
# prolog
|
||||
|
|
@ -7446,6 +7451,7 @@ with pkgs;
|
|||
ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {};
|
||||
ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {};
|
||||
ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {};
|
||||
ansible_2_5 = callPackage ../tools/admin/ansible/2.5.nix {};
|
||||
ansible = ansible_2_4;
|
||||
ansible2 = ansible_2_4;
|
||||
|
||||
|
|
@ -7816,7 +7822,7 @@ with pkgs;
|
|||
|
||||
funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
|
||||
|
||||
gede = callPackage ../development/tools/misc/gede { };
|
||||
gede = libsForQt5.callPackage ../development/tools/misc/gede { };
|
||||
|
||||
gdbgui = callPackage ../development/tools/misc/gdbgui { };
|
||||
|
||||
|
|
@ -9009,6 +9015,7 @@ with pkgs;
|
|||
else if name == "uclibc" then uclibcCross
|
||||
else if name == "musl" then targetPackages.muslCross or muslCross
|
||||
else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
|
||||
else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries
|
||||
else if name == "libSystem" then darwin.xcode
|
||||
else throw "Unknown libc";
|
||||
|
||||
|
|
@ -15685,6 +15692,8 @@ with pkgs;
|
|||
|
||||
grass = callPackage ../applications/gis/grass { };
|
||||
|
||||
grepcidr = callPackage ../applications/search/grepcidr { };
|
||||
|
||||
grepm = callPackage ../applications/search/grepm { };
|
||||
|
||||
grip = callPackage ../applications/misc/grip {
|
||||
|
|
@ -21036,9 +21045,9 @@ with pkgs;
|
|||
staging = base.override { wineRelease = "staging"; };
|
||||
};
|
||||
|
||||
wine = winePackages.base;
|
||||
wine = winePackages.full;
|
||||
|
||||
wineStaging = lowPrio (winePackages.full.override {
|
||||
wine-staging = lowPrio (winePackages.full.override {
|
||||
wineRelease = "staging";
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ pkgs, darwin, stdenv, callPackage, callPackages, newScope }:
|
||||
{ buildPackages, pkgs, targetPackages
|
||||
, darwin, stdenv, callPackage, callPackages, newScope
|
||||
}:
|
||||
|
||||
let
|
||||
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
|
||||
|
|
@ -10,19 +12,23 @@ in
|
|||
|
||||
apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
|
||||
|
||||
binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
|
||||
inherit (darwin) cctools;
|
||||
inherit (pkgs) binutils-unwrapped;
|
||||
};
|
||||
|
||||
binutils = pkgs.wrapBintoolsWith {
|
||||
libc =
|
||||
if pkgs.targetPlatform != pkgs.hostPlatform
|
||||
then pkgs.libcCross
|
||||
else pkgs.stdenv.cc.libc;
|
||||
bintools = callPackage ../os-specific/darwin/binutils {
|
||||
inherit (darwin) cctools;
|
||||
};
|
||||
bintools = darwin.binutils-unwrapped;
|
||||
};
|
||||
|
||||
cctools = callPackage ../os-specific/darwin/cctools/port.nix {
|
||||
inherit (darwin) libobjc maloader;
|
||||
stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
|
||||
libcxxabi = pkgs.libcxxabi;
|
||||
xctoolchain = darwin.xcode.toolchain;
|
||||
};
|
||||
|
||||
|
|
@ -39,8 +45,10 @@ in
|
|||
|
||||
insert_dylib = callPackage ../os-specific/darwin/insert_dylib { };
|
||||
|
||||
ios-cross = callPackage ../os-specific/darwin/ios-cross {
|
||||
inherit (darwin) binutils;
|
||||
iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs {
|
||||
buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk;
|
||||
targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs;
|
||||
inherit (pkgs.llvmPackages) clang-unwrapped;
|
||||
};
|
||||
|
||||
libobjc = apple-source-releases.objc4;
|
||||
|
|
|
|||
Loading…
Reference in a new issue