mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Merge master into staging
This commit is contained in:
Frederik Rietdijk
commit
df587c7f2e
@ -6,7 +6,10 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.
|
||||
|
||||
This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade:
|
||||
|
||||
- If you are running NixOS, use `nixos-rebuild' to upgrade your system.
|
||||
- If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
|
||||
|
||||
- Alternatively, with Nix > 2.0 `nix upgrade-nix' can be used to imperatively
|
||||
upgrade Nix. You may use `nix-env --version' to check which version you have.
|
||||
|
||||
- If you installed Nix using the install script (https://nixos.org/nix/install),
|
||||
it is safe to upgrade by running it again:
|
||||
|
||||
@ -484,7 +484,7 @@ and in this case the `python35` interpreter is automatically used.
|
||||
|
||||
### Interpreters
|
||||
|
||||
Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as
|
||||
Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
|
||||
respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
|
||||
is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
|
||||
`python35`. The default interpreter, `python`, maps to `python2`.
|
||||
@ -533,6 +533,7 @@ sets are
|
||||
* `pkgs.python34Packages`
|
||||
* `pkgs.python35Packages`
|
||||
* `pkgs.python36Packages`
|
||||
* `pkgs.python37Packages`
|
||||
* `pkgs.pypyPackages`
|
||||
|
||||
and the aliases
|
||||
|
||||
@ -122,26 +122,31 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
|
||||
cc-by-nc-sa-20 = spdx {
|
||||
spdxId = "CC-BY-NC-SA-2.0";
|
||||
fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0";
|
||||
free = false;
|
||||
};
|
||||
|
||||
cc-by-nc-sa-25 = spdx {
|
||||
spdxId = "CC-BY-NC-SA-2.5";
|
||||
fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5";
|
||||
free = false;
|
||||
};
|
||||
|
||||
cc-by-nc-sa-30 = spdx {
|
||||
spdxId = "CC-BY-NC-SA-3.0";
|
||||
fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0";
|
||||
free = false;
|
||||
};
|
||||
|
||||
cc-by-nc-sa-40 = spdx {
|
||||
spdxId = "CC-BY-NC-SA-4.0";
|
||||
fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0";
|
||||
free = false;
|
||||
};
|
||||
|
||||
cc-by-nd-30 = spdx {
|
||||
spdxId = "CC-BY-ND-3.0";
|
||||
fullName = "Creative Commons Attribution-No Derivative Works v3.00";
|
||||
free = false;
|
||||
};
|
||||
|
||||
cc-by-sa-25 = spdx {
|
||||
@ -455,6 +460,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
|
||||
msrla = {
|
||||
fullName = "Microsoft Research License Agreement";
|
||||
url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
|
||||
free = false;
|
||||
};
|
||||
|
||||
ncsa = spdx {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -39,6 +39,8 @@ in
|
||||
environment.etc."npmrc".text = cfg.npmrc;
|
||||
|
||||
environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
|
||||
|
||||
environment.systemPackages = [ pkgs.nodePackages.npm ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -41,7 +41,9 @@ let
|
||||
|
||||
pgmanage = "pgmanage";
|
||||
|
||||
pgmanageOptions = {
|
||||
in {
|
||||
|
||||
options.services.pgmanage = {
|
||||
enable = mkEnableOption "PostgreSQL Administration for the web";
|
||||
|
||||
package = mkOption {
|
||||
@ -176,47 +178,29 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
in {
|
||||
|
||||
options.services.pgmanage = pgmanageOptions;
|
||||
|
||||
# This is deprecated and should be removed for NixOS-18.03.
|
||||
options.services.postage = pgmanageOptions;
|
||||
|
||||
config = mkMerge [
|
||||
{ assertions = [
|
||||
{ assertion = !config.services.postage.enable;
|
||||
message =
|
||||
"services.postage is deprecated in favour of pgmanage. " +
|
||||
"They have the same options so just substitute postage for pgmanage." ;
|
||||
}
|
||||
];
|
||||
}
|
||||
(mkIf cfg.enable {
|
||||
systemd.services.pgmanage = {
|
||||
description = "pgmanage - PostgreSQL Administration for the web";
|
||||
wants = [ "postgresql.service" ];
|
||||
after = [ "postgresql.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = pgmanage;
|
||||
Group = pgmanage;
|
||||
ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
|
||||
optionalString cfg.localOnly " --local-only=true";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.pgmanage = {
|
||||
description = "pgmanage - PostgreSQL Administration for the web";
|
||||
wants = [ "postgresql.service" ];
|
||||
after = [ "postgresql.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = pgmanage;
|
||||
Group = pgmanage;
|
||||
ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
|
||||
optionalString cfg.localOnly " --local-only=true";
|
||||
};
|
||||
users = {
|
||||
users."${pgmanage}" = {
|
||||
name = pgmanage;
|
||||
group = pgmanage;
|
||||
home = cfg.sqlRoot;
|
||||
createHome = true;
|
||||
};
|
||||
groups."${pgmanage}" = {
|
||||
name = pgmanage;
|
||||
};
|
||||
};
|
||||
users = {
|
||||
users."${pgmanage}" = {
|
||||
name = pgmanage;
|
||||
group = pgmanage;
|
||||
home = cfg.sqlRoot;
|
||||
createHome = true;
|
||||
};
|
||||
})
|
||||
];
|
||||
groups."${pgmanage}" = {
|
||||
name = pgmanage;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -109,7 +109,7 @@ in
|
||||
home = stateDir;
|
||||
};
|
||||
|
||||
systemd.services.timesyncd.enable = mkForce false;
|
||||
services.timesyncd.enable = mkForce false;
|
||||
|
||||
systemd.services.chronyd =
|
||||
{ description = "chrony NTP daemon";
|
||||
|
||||
@ -314,6 +314,7 @@ in rec {
|
||||
tests.influxdb = callTest tests/influxdb.nix {};
|
||||
tests.ipv6 = callTest tests/ipv6.nix {};
|
||||
tests.jenkins = callTest tests/jenkins.nix {};
|
||||
tests.ostree = callTest tests/ostree.nix {};
|
||||
tests.osquery = callTest tests/osquery.nix {};
|
||||
tests.plasma5 = callTest tests/plasma5.nix {};
|
||||
tests.plotinus = callTest tests/plotinus.nix {};
|
||||
|
||||
21
nixos/tests/ostree.nix
Normal file
21
nixos/tests/ostree.nix
Normal file
@ -0,0 +1,21 @@
|
||||
# run installed tests
|
||||
import ./make-test.nix ({ pkgs, lib, ... }: {
|
||||
name = "ostree";
|
||||
|
||||
meta = {
|
||||
maintainers = pkgs.ostree.meta.maintainers;
|
||||
};
|
||||
|
||||
# TODO: Wrap/patch the tests directly in the package
|
||||
machine = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ]))
|
||||
];
|
||||
|
||||
environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
$machine->succeed("gnome-desktop-testing-runner -d ${pkgs.ostree.installedTests}/share");
|
||||
'';
|
||||
})
|
||||
@ -21,6 +21,8 @@ in mkDerivation {
|
||||
sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh";
|
||||
};
|
||||
|
||||
patches = [ ./qt5_11.patch ];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
propagatedBuildInputs = [
|
||||
qca-qt5 qjson qtscript qtwebkit
|
||||
|
||||
11
pkgs/applications/audio/amarok/qt5_11.patch
Normal file
11
pkgs/applications/audio/amarok/qt5_11.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/src/aboutdialog/ExtendedAboutDialog.cpp
|
||||
+++ b/src/aboutdialog/ExtendedAboutDialog.cpp
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <QLayout>
|
||||
#include <QPushButton>
|
||||
#include <QScrollBar>
|
||||
+#include <QStyle>
|
||||
#include <QTabWidget>
|
||||
|
||||
#include <qapplication.h>
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.0.16";
|
||||
version = "4.0.17";
|
||||
pname = "fldigi";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
|
||||
sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7";
|
||||
sha256 = "1z8w0dxfc2nm1iy1vv18s5s88ys9vvbqawjvhsymxj56jqjzzp4q";
|
||||
};
|
||||
|
||||
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
|
||||
|
||||
@ -5,15 +5,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gpodder";
|
||||
version = "3.10.2";
|
||||
|
||||
version = "3.10.3";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gpodder";
|
||||
repo = "gpodder";
|
||||
rev = version;
|
||||
sha256 = "0nbhyh44cympslcf4miwc2n1gccm5ghjf9slg0r8xnpvg921jv04";
|
||||
sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l";
|
||||
};
|
||||
|
||||
postPatch = with stdenv.lib; ''
|
||||
|
||||
54
pkgs/applications/audio/snapcast/default.nix
Normal file
54
pkgs/applications/audio/snapcast/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
|
||||
, asio, alsaLib, avahi, libogg, libvorbis, flac }:
|
||||
|
||||
let
|
||||
|
||||
popl = stdenv.mkDerivation rec {
|
||||
name = "popl-${version}";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badaix";
|
||||
repo = "popl";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
};
|
||||
|
||||
aixlog = stdenv.mkDerivation rec {
|
||||
name = "aixlog-${version}";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badaix";
|
||||
repo = "aixlog";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "snapcast-${version}";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badaix";
|
||||
repo = "snapcast";
|
||||
rev = "v${version}";
|
||||
sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Synchronous multi-room audio player";
|
||||
homepage = https://github.com/badaix/snapcast;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
@ -14,8 +14,8 @@ let
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "7.0.7-35";
|
||||
sha256 = "1gn4frzxa1v712pcwwkmi0m2a6gbrg2564dbxxr7130zc66licpz";
|
||||
version = "7.0.8-2";
|
||||
sha256 = "06cpvvv8xikw5jm1pa2xxxlnsy743ham67yshpndn2x3fyf48267";
|
||||
patches = [];
|
||||
};
|
||||
in
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Plugins for KDE-based image applications";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
homepage = http://www.digikam.org;
|
||||
homepage = https://www.digikam.org;
|
||||
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
||||
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An open source Global Navigation Satellite Systems software-defined receiver";
|
||||
homepage = http://gnss-sdr.org/;
|
||||
homepage = https://gnss-sdr.org/;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -47,7 +47,11 @@ stdenv.mkDerivation rec {
|
||||
--replace "/usr/local/share/man" "../share/man"
|
||||
'';
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
|
||||
patches = [ ./darwin.patch ];
|
||||
|
||||
patches = [
|
||||
./darwin.patch
|
||||
./qt511.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DKEEPASSXC_BUILD_TYPE=Release"
|
||||
|
||||
15
pkgs/applications/misc/keepassx/qt511.patch
Normal file
15
pkgs/applications/misc/keepassx/qt511.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
|
||||
index 6fd65c1a..e99275b0 100644
|
||||
--- a/src/gui/entry/EditEntryWidget.cpp
|
||||
+++ b/src/gui/entry/EditEntryWidget.cpp
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <QMenu>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QTemporaryFile>
|
||||
+#include <QButtonGroup>
|
||||
#include <QMimeData>
|
||||
#include <QEvent>
|
||||
#include <QColorDialog>
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "A 2D CAD package based upon Qt";
|
||||
homepage = http://librecad.org;
|
||||
homepage = https://librecad.org;
|
||||
repositories.git = git://github.com/LibreCAD/LibreCAD.git;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
|
||||
@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://mupdf.com;
|
||||
homepage = https://mupdf.com;
|
||||
repositories.git = git://git.ghostscript.com/mupdf.git;
|
||||
description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
|
||||
license = licenses.agpl3Plus;
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://pcman.ptt.cc;
|
||||
homepage = https://pcman.ptt.cc;
|
||||
license = licenses.gpl2;
|
||||
description = "Telnet BBS browser with GTK+ interface";
|
||||
maintainers = [ maintainers.sifmelcara ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pgmanage-${version}";
|
||||
version = "10.1.1";
|
||||
version = "10.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgManage";
|
||||
repo = "pgManage";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc";
|
||||
sha256 = "105gmwkifq04qmp5kpgybwjyx01528r6m3x1pxbvnfyni8sf74qj";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -16,13 +16,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kubernetes-${version}";
|
||||
version = "1.10.4";
|
||||
version = "1.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "0q1llnqy83fkx3vhcfjyl3frd41h7g1cvl38lfhsz1z1v9av3bpd";
|
||||
sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2";
|
||||
};
|
||||
|
||||
# Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies
|
||||
|
||||
@ -1,7 +1,15 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu, docker-machine-kvm,
|
||||
gpgme, makeWrapper, hostPlatform, vmnet, python }:
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu
|
||||
, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig
|
||||
, docker-machine-kvm, docker-machine-kvm2
|
||||
, extraDrivers ? []
|
||||
}:
|
||||
|
||||
let binPath = stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ];
|
||||
let
|
||||
drivers = stdenv.lib.filter (d: d != null) (extraDrivers
|
||||
++ stdenv.lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]);
|
||||
|
||||
binPath = drivers
|
||||
++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]);
|
||||
|
||||
in buildGoPackage rec {
|
||||
pname = "minikube";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "gmailieer-${version}";
|
||||
version = "0.6";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gauteh";
|
||||
repo = "gmailieer";
|
||||
rev = "v${version}";
|
||||
sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76";
|
||||
sha256 = "1ixs5hip37hzcxwi2gsxp34r914f1wrl4r3swxqmzln3a15kngsk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Data AcQuisition library (DAQ), for packet I/O";
|
||||
homepage = http://www.snort.org;
|
||||
homepage = https://www.snort.org;
|
||||
maintainers = with stdenv.lib.maintainers; [ aycanirican ];
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
|
||||
@ -71,6 +71,8 @@ in with stdenv; mkDerivation rec {
|
||||
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
patches = [ ./qt5_11.patch ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://quassel-irc.org/;
|
||||
description = "Qt/KDE distributed IRC client suppporting a remote daemon";
|
||||
|
||||
72
pkgs/applications/networking/irc/quassel/qt5_11.patch
Normal file
72
pkgs/applications/networking/irc/quassel/qt5_11.patch
Normal file
@ -0,0 +1,72 @@
|
||||
From 92f4dca367c3a6f0536a1e0f3fbb44bb6ed4da62 Mon Sep 17 00:00:00 2001
|
||||
From: Manuel Nickschas <sputnick@quassel-irc.org>
|
||||
Date: Thu, 3 May 2018 23:19:34 +0200
|
||||
Subject: [PATCH] cmake: Fix build with Qt 5.11
|
||||
|
||||
Qt 5.11 removes the qt5_use_modules function, so add a copy. If
|
||||
present, the Qt-provided function will be used instead.
|
||||
|
||||
Closes GH-355.
|
||||
---
|
||||
cmake/QuasselMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 38 insertions(+)
|
||||
|
||||
diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
|
||||
index 652c0042..d77ba1cf 100644
|
||||
--- a/cmake/QuasselMacros.cmake
|
||||
+++ b/cmake/QuasselMacros.cmake
|
||||
@@ -5,6 +5,9 @@
|
||||
# The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
|
||||
# (C) 2005-2009 Kitware, Inc.
|
||||
#
|
||||
+# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
|
||||
+# (C) 2005-2011 Kitware, Inc.
|
||||
+#
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type)
|
||||
endforeach()
|
||||
endfunction()
|
||||
|
||||
+# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version.
|
||||
+# If present, the Qt-provided version will be used automatically instead.
|
||||
+function(qt5_use_modules _target _link_type)
|
||||
+ if (NOT TARGET ${_target})
|
||||
+ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
|
||||
+ endif()
|
||||
+ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
|
||||
+ set(_qt5_modules ${ARGN})
|
||||
+ set(_qt5_link_type ${_link_type})
|
||||
+ else()
|
||||
+ set(_qt5_modules ${_link_type} ${ARGN})
|
||||
+ endif()
|
||||
+
|
||||
+ if ("${_qt5_modules}" STREQUAL "")
|
||||
+ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
|
||||
+ endif()
|
||||
+ foreach(_module ${_qt5_modules})
|
||||
+ if (NOT Qt5${_module}_FOUND)
|
||||
+ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
|
||||
+ if (NOT Qt5${_module}_FOUND)
|
||||
+ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
|
||||
+ endif()
|
||||
+ endif()
|
||||
+ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
|
||||
+ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
|
||||
+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
|
||||
+ if (Qt5_POSITION_INDEPENDENT_CODE
|
||||
+ AND (CMAKE_VERSION VERSION_LESS 2.8.12
|
||||
+ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
|
||||
+ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
|
||||
+ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+endfunction()
|
||||
+
|
||||
# Some wrappers for simplifying dual-Qt support
|
||||
|
||||
function(qt_use_modules)
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "The user-friendly, lightweight, and fast email client";
|
||||
homepage = http://www.claws-mail.org/;
|
||||
homepage = https://www.claws-mail.org/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
|
||||
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A packet traffic generator and analyzer";
|
||||
homepage = http://ostinato.org;
|
||||
homepage = https://ostinato.org;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ rick68 ];
|
||||
platforms = with platforms; linux ++ darwin ++ cygwin;
|
||||
|
||||
@ -3,18 +3,20 @@ makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "x2goclient-${version}";
|
||||
version = "4.1.1.1";
|
||||
version = "4.1.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
|
||||
sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
|
||||
sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn";
|
||||
};
|
||||
|
||||
buildInputs = [ cups libssh libXpm nxproxy openldap openssh
|
||||
qtbase qtsvg qtx11extras qttools phonon ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
patchPhase = ''
|
||||
patches = [ ./qt511.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \
|
||||
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
|
||||
|
||||
15
pkgs/applications/networking/remote/x2goclient/qt511.patch
Normal file
15
pkgs/applications/networking/remote/x2goclient/qt511.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/src/printwidget.cpp b/src/printwidget.cpp
|
||||
index 58a8af7..131d340 100644
|
||||
--- a/src/printwidget.cpp
|
||||
+++ b/src/printwidget.cpp
|
||||
@@ -23,6 +23,7 @@
|
||||
#include "x2gosettings.h"
|
||||
#include "x2gologdebug.h"
|
||||
#include <QDir>
|
||||
+#include <QButtonGroup>
|
||||
#ifdef Q_OS_WIN
|
||||
#include "wapi.h"
|
||||
#endif
|
||||
--
|
||||
2.17.1
|
||||
|
||||
38
pkgs/applications/office/autokey/default.nix
Normal file
38
pkgs/applications/office/autokey/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection
|
||||
, gtksourceview, gnome3, libappindicator-gtk3, libnotify }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "autokey-${version}";
|
||||
version = "0.94.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "autokey";
|
||||
repo = "autokey";
|
||||
rev = "v${version}";
|
||||
sha256 = "1syxyciyxzs0khbfs9wjgj03q967p948kipw27j1031q0b5z3jxr";
|
||||
};
|
||||
|
||||
# Arch requires a similar work around—see
|
||||
# https://aur.archlinux.org/packages/autokey-py3/?comments=all
|
||||
patches = [ ./remove-requires-dbus-python.patch ];
|
||||
|
||||
# Tests appear to be broken with import errors within the project structure
|
||||
doCheck = false;
|
||||
|
||||
# Note: no dependencies included for Qt GUI because Qt ui is poorly
|
||||
# maintained—see https://github.com/autokey/autokey/issues/51
|
||||
|
||||
buildInputs = [ wrapGAppsHook gobjectIntrospection gnome3.gtksourceview
|
||||
libappindicator-gtk3 libnotify ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
dbus-python pyinotify xlib pygobject3 ];
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/autokey/autokey;
|
||||
description = "Desktop automation utility for Linux and X11";
|
||||
license = with lib.licenses; [ gpl3 ];
|
||||
maintainers = with lib.maintainers; [ pneumaticat ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -71,7 +71,7 @@
|
||||
'console_scripts': ['autokey-gtk=autokey.gtkui.__main__:main']
|
||||
},
|
||||
scripts=['autokey-qt', 'autokey-run', 'autokey-shell'],
|
||||
- install_requires=['dbus-python', 'pyinotify', 'python3-xlib'],
|
||||
+ install_requires=['pyinotify', 'python-xlib'],
|
||||
classifiers=[
|
||||
'Development Status :: 4 - Beta',
|
||||
'Intended Audience :: Developers',
|
||||
@ -23,6 +23,8 @@ mkDerivation rec {
|
||||
sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
|
||||
};
|
||||
|
||||
patches = [ ./qt5_11.patch ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
|
||||
|
||||
98
pkgs/applications/office/calligra/qt5_11.patch
Normal file
98
pkgs/applications/office/calligra/qt5_11.patch
Normal file
@ -0,0 +1,98 @@
|
||||
diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp
|
||||
index 0ffdcf6..cdca006 100644
|
||||
--- a/libs/widgets/KoCsvImportDialog.cpp
|
||||
+++ b/libs/widgets/KoCsvImportDialog.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "KoCsvImportDialog.h"
|
||||
|
||||
// Qt
|
||||
+#include <QButtonGroup>
|
||||
#include <QTextCodec>
|
||||
#include <QTextStream>
|
||||
|
||||
diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
|
||||
index f91555c..a3816f9 100644
|
||||
--- a/libs/widgets/KoPageLayoutWidget.cpp
|
||||
+++ b/libs/widgets/KoPageLayoutWidget.cpp
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
#include <KoUnit.h>
|
||||
|
||||
+#include <QButtonGroup>
|
||||
+
|
||||
class Q_DECL_HIDDEN KoPageLayoutWidget::Private
|
||||
{
|
||||
public:
|
||||
diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
|
||||
index c0d5136..d2a772e 100644
|
||||
--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
|
||||
+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
// Qt
|
||||
#include <QAbstractItemModel>
|
||||
+#include <QAction>
|
||||
|
||||
// Calligra
|
||||
#include <KoIcon.h>
|
||||
diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp
|
||||
index ed10919..8f52177 100644
|
||||
--- a/plugins/formulashape/FormulaToolWidget.cpp
|
||||
+++ b/plugins/formulashape/FormulaToolWidget.cpp
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <QWidgetAction>
|
||||
#include <QTableWidget>
|
||||
#include <QAction>
|
||||
+#include <QHeaderView>
|
||||
#include <QMenu>
|
||||
|
||||
FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
|
||||
diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
|
||||
index a0a9832..7d7db53 100644
|
||||
--- a/sheets/dialogs/LayoutDialog.cpp
|
||||
+++ b/sheets/dialogs/LayoutDialog.cpp
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <math.h>
|
||||
|
||||
#include <QIntValidator>
|
||||
+#include <QButtonGroup>
|
||||
#include <QCheckBox>
|
||||
#include <QFrame>
|
||||
#include <QLabel>
|
||||
diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
|
||||
index d64208c..bfddb3a 100644
|
||||
--- a/words/part/dialogs/KWAnchoringProperties.cpp
|
||||
+++ b/words/part/dialogs/KWAnchoringProperties.cpp
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
#include <kundo2command.h>
|
||||
|
||||
+#include <QButtonGroup>
|
||||
#include <QComboBox>
|
||||
|
||||
const int KWAnchoringProperties::vertRels[4][20] = {
|
||||
diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
|
||||
index e38599a..7e8b2d5 100644
|
||||
--- a/words/part/dialogs/KWRunAroundProperties.cpp
|
||||
+++ b/words/part/dialogs/KWRunAroundProperties.cpp
|
||||
@@ -28,6 +28,8 @@
|
||||
|
||||
#include <kundo2command.h>
|
||||
|
||||
+#include <QButtonGroup>
|
||||
+
|
||||
KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
|
||||
: m_state(state)
|
||||
{
|
||||
diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
|
||||
index ae743da..3007f91 100644
|
||||
--- a/stage/part/KPrPresentationTool.cpp
|
||||
+++ b/stage/part/KPrPresentationTool.cpp
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <QDesktopServices>
|
||||
#include <QUrl>
|
||||
#include <QDBusConnection>
|
||||
+#include <QFrame>
|
||||
|
||||
#include <KoShape.h>
|
||||
#include <KoShapeManager.h>
|
||||
@ -3,7 +3,7 @@
|
||||
rec {
|
||||
major = "6";
|
||||
minor = "0";
|
||||
patch = "4";
|
||||
patch = "5";
|
||||
tweak = "2";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
@ -12,6 +12,6 @@ rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "1xqh4l1nrvgara4ni9zk8pqywz3gbq4a8sw9v0ggxsch409zp0ch";
|
||||
sha256 = "16h60j7h9z48vfhhj22m64myksnrrgrnh0qc6i4bxgshmm8kkzdn";
|
||||
};
|
||||
}
|
||||
|
||||
@ -42,14 +42,14 @@ let
|
||||
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "0bjl3hdckd5bcgskh46xqna1hpxjjx0ycgpnilyk7j8l6407hpw6";
|
||||
sha256 = "1p8gb9jxv4n8ggksbfsqzdw5amxg575grxifsabhgjllpisjzrlr";
|
||||
};
|
||||
|
||||
# TODO: dictionaries
|
||||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "1z21bk5lwd5gxsyjdwh0fmgkys4lhnx7flbjd6dbn9d99paz1w6f";
|
||||
sha256 = "1dkzm766zi4msk6w35bvfk5b5bx1xyqg2wx58wklr5375kjv6ba9";
|
||||
};
|
||||
|
||||
};
|
||||
@ -264,10 +264,9 @@ in stdenv.mkDerivation rec {
|
||||
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
|
||||
librevenge libe-book libmwaw glm glew ncurses epoxy
|
||||
libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
|
||||
gdb
|
||||
]
|
||||
++ lib.optional kdeIntegration kdelibs4;
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
nativeBuildInputs = [ wrapGAppsHook gdb ];
|
||||
|
||||
passthru = {
|
||||
inherit srcs jdk;
|
||||
|
||||
@ -581,11 +581,11 @@
|
||||
md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
|
||||
url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
|
||||
sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34";
|
||||
md5 = "a084cd548b586552cb7d3ee51f1af969";
|
||||
md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
|
||||
name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
|
||||
url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
|
||||
sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769";
|
||||
md5 = "";
|
||||
md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
|
||||
}
|
||||
{
|
||||
name = "officeotron-0.7.4-master.jar";
|
||||
|
||||
@ -105,11 +105,11 @@
|
||||
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
|
||||
}
|
||||
{
|
||||
name = "curl-7.58.0.tar.gz";
|
||||
url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz";
|
||||
sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115";
|
||||
name = "curl-7.60.0.tar.gz";
|
||||
url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz";
|
||||
sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5";
|
||||
md5 = "";
|
||||
md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz";
|
||||
md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "libe-book-0.1.3.tar.xz";
|
||||
@ -455,11 +455,11 @@
|
||||
md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "language-subtag-registry-2017-12-14.tar.bz2";
|
||||
url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";
|
||||
sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362";
|
||||
name = "language-subtag-registry-2018-03-30.tar.bz2";
|
||||
url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";
|
||||
sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854";
|
||||
md5 = "";
|
||||
md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2";
|
||||
md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "JLanguageTool-1.7.0.tar.bz2";
|
||||
@ -623,11 +623,11 @@
|
||||
md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
|
||||
url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
|
||||
sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf";
|
||||
name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
|
||||
url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
|
||||
sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769";
|
||||
md5 = "";
|
||||
md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
|
||||
md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
|
||||
}
|
||||
{
|
||||
name = "officeotron-0.7.4-master.jar";
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
rec {
|
||||
major = "5";
|
||||
minor = "4";
|
||||
patch = "6";
|
||||
patch = "7";
|
||||
tweak = "2";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
@ -12,6 +12,6 @@ rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i";
|
||||
sha256 = "0s9s4nhp2whwxis54jbxrf1dwpnpl95b9781d1pdj4xk5z9v90fv";
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
|
||||
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
|
||||
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
|
||||
, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
|
||||
, defaultIconTheme, glib, ncurses, epoxy, gpgme
|
||||
, langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ]
|
||||
, withHelp ? true
|
||||
, kdeIntegration ? false
|
||||
@ -42,14 +42,14 @@ let
|
||||
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc";
|
||||
sha256 = "05ixmqbs3pkdpyqcwadz9i3wg797vimsm75rmfby7z71wc3frcyk";
|
||||
};
|
||||
|
||||
# TODO: dictionaries
|
||||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc";
|
||||
sha256 = "0ifyh4m8mwpkb16g6883ivk2s2qybr4s4s7pdjzp4cpx1nalzibl";
|
||||
};
|
||||
|
||||
};
|
||||
@ -238,6 +238,7 @@ in stdenv.mkDerivation rec {
|
||||
"--without-system-libstaroffice"
|
||||
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
|
||||
"--without-system-orcus"
|
||||
"--without-system-xmlsec"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
@ -258,12 +259,11 @@ in stdenv.mkDerivation rec {
|
||||
python3 sablotron sane-backends unzip vigra which zip zlib
|
||||
mdds bluez5 glibc libcmis libwps libabw libzmf libtool
|
||||
libxshmfence libatomic_ops graphite2 harfbuzz gpgme
|
||||
librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
|
||||
librevenge libe-book libmwaw glm glew ncurses epoxy
|
||||
libodfgen CoinMP librdf_rasqal defaultIconTheme
|
||||
gdb
|
||||
]
|
||||
++ lib.optional kdeIntegration kdelibs4;
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
nativeBuildInputs = [ wrapGAppsHook gdb ];
|
||||
|
||||
passthru = {
|
||||
inherit srcs jdk;
|
||||
|
||||
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "gravit-0.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gravit.slowchop.com/media/downloads/${name}.tgz";
|
||||
url = "https://gravit.slowchop.com/media/downloads/${name}.tgz";
|
||||
sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
|
||||
};
|
||||
|
||||
@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.mesaPlatforms;
|
||||
hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,25 +1,32 @@
|
||||
{ mkDerivation, lib, fetchurl
|
||||
{ mkDerivation, lib, fetchFromGitHub
|
||||
, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv
|
||||
, qtscript, qtserialport, qttools
|
||||
, qtmultimedia, qtlocation
|
||||
, qtmultimedia, qtlocation, makeWrapper, qtbase
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
name = "stellarium-${version}";
|
||||
version = "0.16.1";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/stellarium/${name}.tar.gz";
|
||||
sha256 = "087x6mbcn2yj8d3qi382vfkzgdwmanxzqi5l1x3iranxmx9c40dh";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stellarium";
|
||||
repo = "stellarium";
|
||||
rev = "v${version}";
|
||||
sha256 = "11rh4gan8bhqb2n6a94g773drbq4ffii7aqjwxv97r036579azb2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
||||
buildInputs = [
|
||||
freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools
|
||||
qtmultimedia qtlocation
|
||||
qtmultimedia qtlocation qtbase makeWrapper
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/stellarium \
|
||||
--prefix QT_PLUGIN_PATH : "${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free open-source planetarium";
|
||||
homepage = http://stellarium.org/;
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Linear logic programming system";
|
||||
homepage = http://github.com/clf/celf;
|
||||
homepage = https://github.com/clf/celf;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
that can be used for modelling, validation and verification of
|
||||
concurrent systems and protocols
|
||||
'';
|
||||
homepage = http://www.mcrl2.org/;
|
||||
homepage = https://www.mcrl2.org/;
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ moretea ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport;
|
||||
assert svnSupport -> perlSupport;
|
||||
|
||||
let
|
||||
version = "2.18.0";
|
||||
version = "2.17.1";
|
||||
svn = subversionClient.override { perlBindings = perlSupport; };
|
||||
in
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
|
||||
sha256 = "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
|
||||
@ -40,6 +40,7 @@ stdenv.mkDerivation {
|
||||
|
||||
patches = [
|
||||
./docbook2texi.patch
|
||||
./symlinks-in-bin.patch
|
||||
./git-sh-i18n.patch
|
||||
./ssh-path.patch
|
||||
./git-send-email-honor-PATH.patch
|
||||
@ -276,21 +277,10 @@ EOF
|
||||
|
||||
# XXX: I failed to understand why this one fails.
|
||||
# Could someone try to re-enable it on the next release ?
|
||||
# Tested to fail: 2.18.0
|
||||
disable_test t1700-split-index "null sha1"
|
||||
|
||||
# Tested to fail: 2.18.0
|
||||
disable_test t7005-editor "editor with a space"
|
||||
disable_test t7005-editor "core.editor with a space"
|
||||
|
||||
# Tested to fail: 2.18.0
|
||||
disable_test t9902-completion "sourcing the completion script clears cached --options"
|
||||
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
# Test fails (as of 2.17.0, musl 1.1.19)
|
||||
disable_test t3900-i18n-commit
|
||||
# Fails largely due to assumptions about BOM
|
||||
# Tested to fail: 2.18.0
|
||||
disable_test t0028-working-tree-encoding
|
||||
'';
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -2609,8 +2609,7 @@
|
||||
{ test "$$bindir/" = "$$execdir/" || \
|
||||
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
|
||||
$(RM) "$$execdir/$$p" && \
|
||||
- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
|
||||
- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
|
||||
+ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
|
||||
cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
|
||||
done; \
|
||||
} && \
|
||||
@ -12,11 +12,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gitkraken-${version}";
|
||||
version = "3.6.3";
|
||||
version = "3.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://release.gitkraken.com/linux/v${version}.deb";
|
||||
sha256 = "1bl4zz4k9whv5q6bkf6hyki26dkjhm19rzx2800zzadbrdgs7iz4";
|
||||
sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x";
|
||||
};
|
||||
|
||||
libPath = makeLibraryPath [
|
||||
|
||||
@ -1,19 +1,25 @@
|
||||
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
name = "streamlink-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "streamlink";
|
||||
repo = "streamlink";
|
||||
rev = "${version}";
|
||||
sha256 = "0r63fjp5qhnbp5kr4w2nn3gnj0wr0ik1pw1gyry8jl9rp2jq9db5";
|
||||
sha256 = "17i5j5a69d28abg13md2r2ycxgmd5h1pjy0pgca1zcqaqfq4v05x";
|
||||
};
|
||||
|
||||
checkInputs = with pythonPackages; [ pytest mock requests-mock ];
|
||||
postPatch = ''
|
||||
# Fix failing test. This can be removed after version 0.13.0, see:
|
||||
# https://github.com/streamlink/streamlink/commit/a27e1a2d8eec6eb23c6e1dc280c6afc1cd0b5b32
|
||||
substituteInPlace tests/test_plugin.py --replace "lambda: datetime" "datetime"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client ]) ++ [ rtmpdump ffmpeg ];
|
||||
checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
|
||||
|
||||
propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/streamlink/streamlink;
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus,
|
||||
systemd}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "spice-vdagent-0.17.0";
|
||||
name = "spice-vdagent-0.18.0";
|
||||
src = fetchurl {
|
||||
url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
|
||||
sha256 = "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi";
|
||||
sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace data/spice-vdagent.desktop --replace /usr $out
|
||||
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
- clock: time/date with configurable format
|
||||
- keyboard-layout
|
||||
'';
|
||||
homepage = http://github.com/PandorasFox/i3lock-color;
|
||||
homepage = https://github.com/PandorasFox/i3lock-color;
|
||||
maintainers = with maintainers; [ garbas malyn ];
|
||||
license = licenses.bsd3;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "i3status-rust-${version}";
|
||||
version = "0.9.0.2018-03-31";
|
||||
version = "0.9.0.2018-06-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = "i3status-rust";
|
||||
rev = "18f99299bcd5b63da4e315c8d78622c4bbf59c45";
|
||||
sha256 = "1pfcq3f724ri6jzchkgf96zd7lb5mc882r64ffx634gqf3n8ch41";
|
||||
rev = "fdca01e88a7ce9bf4de0f58a922de5131e33dd00";
|
||||
sha256 = "12dfvamf9a13b3fa7mqrwhjk3rl53463h03arqd8pvbch006hhqd";
|
||||
};
|
||||
|
||||
cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h";
|
||||
cargoSha256 = "01pwknfzkv49cip6asqd4pzkh9l42v06abyd9lb09ip5pkcs60lq";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
||||
@ -280,6 +280,10 @@ stdenv.mkDerivation {
|
||||
hardening_unsupported_flags+=" pic"
|
||||
''
|
||||
|
||||
+ optionalString targetPlatform.isMinGW ''
|
||||
hardening_unsupported_flags+=" stackprotector"
|
||||
''
|
||||
|
||||
+ ''
|
||||
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
|
||||
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
|
||||
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
to support various Chinese input methods, including those based on
|
||||
modern dialects or historical diasystems of the Chinese language.
|
||||
'';
|
||||
homepage = http://rime.im;
|
||||
homepage = https://rime.im;
|
||||
# Note that individual packages in this collection
|
||||
# may be released under different licenses
|
||||
license = licenses.gpl3;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mate-desktop-${version}";
|
||||
version = "1.20.3";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
|
||||
sha256 = "132z1wwmh5115cpgkx9w6hzkk87f1vh66paaf3b2d2qfci7myffs";
|
||||
sha256 = "0qd76p5zqgifiawkgv2casb9ll55j4qq4pfxgxj3j5zvjr3dgr47";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mate-icon-theme-${version}";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
|
||||
sha256 = "0lmsmsamgg1s6qrk19qwa76ld7x1k3pwhy4vs1ixn1as4iaaddk5";
|
||||
sha256 = "1xzlwmwz1jnksa4rs0smkxhqv3j50y78cf9y5g6aki9iw4dvhvva";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mate-terminal-${version}";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
|
||||
sha256 = "03366hs7mxazn6m6y53ppkb1din4jywljg0lx8zw101qg6car0az";
|
||||
sha256 = "0yfr857mpxy35zzdmicvd7mpwka8s1h0rqagfjqc2p1gv4a7ka97";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "A functional CLI language";
|
||||
homepage = http://fsharp.org/;
|
||||
homepage = https://fsharp.org/;
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
|
||||
platforms = with stdenv.lib.platforms; unix;
|
||||
|
||||
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "A functional CLI language";
|
||||
homepage = http://fsharp.org/;
|
||||
homepage = https://fsharp.org/;
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
|
||||
platforms = with stdenv.lib.platforms; unix;
|
||||
|
||||
@ -254,6 +254,9 @@ stdenv.mkDerivation ({
|
||||
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
|
||||
;
|
||||
|
||||
# TODO: Use optionalString with next rebuild.
|
||||
${if (stdenv.cc.isClang && langFortran) then "NIX_CFLAGS_COMPILE" else null} = "-Wno-unused-command-line-argument";
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
|
||||
|
||||
preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
, libffi, libiconv ? null, ncurses
|
||||
|
||||
, useLLVM ? !targetPlatform.isx86
|
||||
, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
, libffi, libiconv ? null, ncurses
|
||||
|
||||
, useLLVM ? !targetPlatform.isx86
|
||||
, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
|
||||
|
||||
let
|
||||
version = "1.2.41";
|
||||
version = "1.2.50";
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
name = "kotlin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "0p16xl2qhm7913abd06vvmsx956ny51jjfr6knkmrnk8y9r2g1xg";
|
||||
sha256 = "1abis73ij334vfwn9k4s9rsa1va7h31a9g97g84i2rrp7cq2q1mw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
||||
@ -13,7 +13,8 @@ let
|
||||
mv clang-tools-extra-* $sourceRoot/tools/extra
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake libxml2 llvm python ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libxml2 llvm python ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
@ -27,6 +28,8 @@ let
|
||||
postPatch = ''
|
||||
sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
|
||||
sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
|
||||
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp
|
||||
'';
|
||||
|
||||
outputs = [ "out" "lib" "python" ];
|
||||
|
||||
@ -17,15 +17,22 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# glibc 2.26 fix
|
||||
../../3.9/libc++/xlocale-glibc-2.26.patch
|
||||
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin ./darwin.patch
|
||||
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
../../libcxx-0001-musl-hacks.patch
|
||||
../../libcxx-max_align_t.patch
|
||||
];
|
||||
|
||||
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
|
||||
"-DLIBCXX_LIBCPPABI_VERSION=2"
|
||||
"-DLIBCXX_CXX_ABI=libcxxabi"
|
||||
];
|
||||
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -15,6 +15,9 @@ stdenv.mkDerivation {
|
||||
export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
export TRIPLE=x86_64-apple-darwin
|
||||
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
|
||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch}
|
||||
'';
|
||||
|
||||
installPhase = if stdenv.isDarwin
|
||||
|
||||
@ -36,8 +36,12 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
# Fix a segfault in llc
|
||||
# See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html
|
||||
patches = [ ./D17533-1.patch ] ++
|
||||
stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch];
|
||||
patches = [ ./D17533-1.patch ]
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) ./fix-llvm-config.patch
|
||||
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
../TLI-musl.patch
|
||||
../dynamiclibrary-musl.patch
|
||||
];
|
||||
|
||||
# hacky fix: New LLVM releases require a newer macOS SDK than
|
||||
# 10.9. This is a temporary measure until nixpkgs darwin support is
|
||||
@ -49,7 +53,7 @@ in stdenv.mkDerivation rec {
|
||||
--replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \
|
||||
--replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' ""
|
||||
''
|
||||
+ stdenv.lib.optionalString (stdenv ? glibc) ''
|
||||
+ ''
|
||||
(
|
||||
cd projects/compiler-rt
|
||||
patch -p1 < ${
|
||||
@ -81,6 +85,14 @@ in stdenv.mkDerivation rec {
|
||||
++ stdenv.lib.optionals ( isDarwin) [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
# Not yet supported
|
||||
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
|
||||
"-DCOMPILER_RT_BUILD_XRAY=OFF"
|
||||
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
|
||||
@ -29,6 +29,8 @@ let
|
||||
postPatch = ''
|
||||
sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
|
||||
sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
|
||||
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp
|
||||
'';
|
||||
|
||||
outputs = [ "out" "lib" "python" ];
|
||||
|
||||
@ -17,15 +17,21 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# glibc 2.26 fix
|
||||
./xlocale-glibc-2.26.patch
|
||||
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin ./darwin.patch
|
||||
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
../../libcxx-0001-musl-hacks.patch
|
||||
../../libcxx-max_align_t.patch
|
||||
];
|
||||
|
||||
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
|
||||
"-DLIBCXX_LIBCPPABI_VERSION=2"
|
||||
"-DLIBCXX_CXX_ABI=libcxxabi"
|
||||
];
|
||||
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
|
||||
"-DLIBCXX_LIBCPPABI_VERSION=2"
|
||||
"-DLIBCXX_CXX_ABI=libcxxabi"
|
||||
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -15,6 +15,9 @@ stdenv.mkDerivation {
|
||||
export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
export TRIPLE=x86_64-apple-darwin
|
||||
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
|
||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch}
|
||||
'';
|
||||
|
||||
installPhase = if stdenv.isDarwin
|
||||
|
||||
@ -62,7 +62,10 @@ in stdenv.mkDerivation rec {
|
||||
url = https://github.com/llvm-mirror/llvm/commit/5340b5b3d970069aebf3dde49d8964583742e01a.patch;
|
||||
sha256 = "095f8knplwqbc2p7rad1kq8633i34qynni9jna93an7kyc80wdxl";
|
||||
})
|
||||
];
|
||||
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
../TLI-musl.patch
|
||||
../dynamiclibrary-musl.patch
|
||||
];
|
||||
|
||||
postPatch = ""
|
||||
+ ''
|
||||
@ -91,7 +94,7 @@ in stdenv.mkDerivation rec {
|
||||
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
|
||||
patch -p1 < ./llvm-outputs.patch
|
||||
''
|
||||
+ stdenv.lib.optionalString (stdenv ? glibc) ''
|
||||
+ ''
|
||||
(
|
||||
cd projects/compiler-rt
|
||||
patch -p1 < ${
|
||||
@ -129,6 +132,14 @@ in stdenv.mkDerivation rec {
|
||||
] ++ stdenv.lib.optionals (buildPlatform != hostPlatform) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen"
|
||||
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
# Not yet supported
|
||||
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
|
||||
"-DCOMPILER_RT_BUILD_XRAY=OFF"
|
||||
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
./xlocale-glibc-2.26.patch
|
||||
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
../../libcxx-0001-musl-hacks.patch
|
||||
./max_align_t.patch
|
||||
../../libcxx-max_align_t.patch
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||
export TRIPLE=x86_64-apple-darwin
|
||||
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
|
||||
patch -p1 -d $(ls -d libcxx-*) -i ${./libc++/max_align_t.patch}
|
||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch}
|
||||
'';
|
||||
|
||||
installPhase = if stdenv.isDarwin
|
||||
|
||||
@ -83,7 +83,7 @@ in stdenv.mkDerivation (rec {
|
||||
patch -p0 < ${../aarch64.patch}
|
||||
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
patch -p1 -i ${../TLI-musl.patch}
|
||||
patch -p1 -i ${./dynamiclibrary-musl.patch}
|
||||
patch -p1 -i ${../dynamiclibrary-musl.patch}
|
||||
patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
|
||||
'';
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.nasm.us/;
|
||||
homepage = https://www.nasm.us/;
|
||||
description = "An 80x86 and x86-64 assembler designed for portability and modularity";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ pSub willibutz ];
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A high-level dynamically typed programming language";
|
||||
homepage = http://nekovm.org;
|
||||
homepage = https://nekovm.org;
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.marcweber ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "07";
|
||||
patch_version = "0+beta2";
|
||||
sha256 = "0rrvl47kq982z2ns7cnasmlbj60mpmza2zyhl1kh45c5a3n7692n";
|
||||
patch_version = "0+rc1";
|
||||
sha256 = "0ggzh078k68na2mahj3nrqkl57i1iv9aymlz8mmlcd8hbvp1fcn8";
|
||||
|
||||
# If the executable is stripped it does not work
|
||||
dontStrip = true;
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://opendylan.org;
|
||||
homepage = https://opendylan.org;
|
||||
description = "A multi-paradigm functional and object-oriented programming language";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation {
|
||||
postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin";
|
||||
|
||||
meta = {
|
||||
homepage = http://opendylan.org;
|
||||
homepage = https://opendylan.org;
|
||||
description = "A multi-paradigm functional and object-oriented programming language";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@ -353,7 +353,7 @@ in {
|
||||
};
|
||||
|
||||
php72 = generic {
|
||||
version = "7.2.6";
|
||||
sha256 = "1hzj1z6v1ij4f4zjl1giix9qinf20wyn9gf8s29x5fc0va53wpdf";
|
||||
version = "7.2.7";
|
||||
sha256 = "18ymjqy8vpmwlzzfrxvaz2nsn8n66rmg40pwiy6x2kdgjrd6g0fc";
|
||||
};
|
||||
}
|
||||
|
||||
@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://picolisp.com/;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin; # times out
|
||||
maintainers = with maintainers; [ raskin tohl ];
|
||||
};
|
||||
|
||||
|
||||
178
pkgs/development/interpreters/python/cpython/3.7/default.nix
Normal file
178
pkgs/development/interpreters/python/cpython/3.7/default.nix
Normal file
@ -0,0 +1,178 @@
|
||||
{ stdenv, fetchurl, fetchpatch
|
||||
, glibc
|
||||
, bzip2
|
||||
, expat
|
||||
, libffi
|
||||
, gdbm
|
||||
, lzma
|
||||
, ncurses
|
||||
, openssl
|
||||
, readline
|
||||
, sqlite
|
||||
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
|
||||
, zlib
|
||||
, callPackage
|
||||
, self
|
||||
, CF, configd
|
||||
, python-setup-hook
|
||||
# For the Python package set
|
||||
, pkgs, packageOverrides ? (self: super: {})
|
||||
}:
|
||||
|
||||
assert x11Support -> tcl != null
|
||||
&& tk != null
|
||||
&& xproto != null
|
||||
&& libX11 != null;
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
majorVersion = "3.7";
|
||||
minorVersion = "0";
|
||||
minorVersionSuffix = "rc1";
|
||||
pythonVersion = majorVersion;
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "python${majorVersion}";
|
||||
sitePackages = "lib/${libPrefix}/site-packages";
|
||||
|
||||
buildInputs = filter (p: p != null) [
|
||||
zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
|
||||
++ optionals x11Support [ tcl tk libX11 xproto ]
|
||||
++ optionals stdenv.isDarwin [ CF configd ];
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "python3-${version}";
|
||||
pythonVersion = majorVersion;
|
||||
inherit majorVersion version;
|
||||
|
||||
inherit buildInputs;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
|
||||
sha256 = "1dqb1in7xlvq7959pvvxpm50nz5jk7ifxza2x4hfvqr31jvbkky9";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
||||
# Determinism: We fix the hashes of str, bytes and datetime objects.
|
||||
PYTHONHASHSEED=0;
|
||||
|
||||
prePatch = optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
|
||||
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./no-ldconfig.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
'' + optionalString (x11Support && (tix != null)) ''
|
||||
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}";
|
||||
LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}";
|
||||
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
|
||||
|
||||
configureFlags = [
|
||||
"--enable-shared"
|
||||
"--with-threads"
|
||||
"--without-ensurepip"
|
||||
"--with-system-expat"
|
||||
"--with-system-ffi"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
for i in /usr /sw /opt /pkg; do # improve purity
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
done
|
||||
${optionalString stdenv.isDarwin ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.6
|
||||
''}
|
||||
'';
|
||||
|
||||
setupHook = python-setup-hook sitePackages;
|
||||
|
||||
postInstall = ''
|
||||
# needed for some packages, especially packages that backport functionality
|
||||
# to 2.x from 3.x
|
||||
for item in $out/lib/python${majorVersion}/test/*; do
|
||||
if [[ "$item" != */test_support.py*
|
||||
&& "$item" != */test/support
|
||||
&& "$item" != */test/libregrtest
|
||||
&& "$item" != */test/regrtest.py* ]]; then
|
||||
rm -rf "$item"
|
||||
else
|
||||
echo $item
|
||||
fi
|
||||
done
|
||||
touch $out/lib/python${majorVersion}/test/__init__.py
|
||||
|
||||
ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
|
||||
paxmark E $out/bin/python${majorVersion}
|
||||
|
||||
# Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
|
||||
echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
|
||||
|
||||
# Determinism: Windows installers were not deterministic.
|
||||
# We're also not interested in building Windows installers.
|
||||
find "$out" -name 'wininst*.exe' | xargs -r rm -f
|
||||
|
||||
# Use Python3 as default python
|
||||
ln -s "$out/bin/idle3" "$out/bin/idle"
|
||||
ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
|
||||
ln -s "$out/bin/python3" "$out/bin/python"
|
||||
ln -s "$out/bin/python3-config" "$out/bin/python-config"
|
||||
ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
|
||||
|
||||
# Get rid of retained dependencies on -dev packages, and remove
|
||||
# some $TMPDIR references to improve binary reproducibility.
|
||||
# Note that the .pyc file of _sysconfigdata.py should be regenerated!
|
||||
for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do
|
||||
sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
|
||||
done
|
||||
|
||||
# Determinism: rebuild all bytecode
|
||||
# We exclude lib2to3 because that's Python 2 code which fails
|
||||
# We rebuild three times, once for each optimization level
|
||||
# Python 3.7 implements PEP 552, introducing support for deterministic bytecode.
|
||||
# This is automatically used when `SOURCE_DATE_EPOCH` is set.
|
||||
find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i -
|
||||
find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i -
|
||||
find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
|
||||
'';
|
||||
|
||||
passthru = let
|
||||
pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
|
||||
in rec {
|
||||
inherit libPrefix sitePackages x11Support;
|
||||
executable = "${libPrefix}m";
|
||||
buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
|
||||
withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
|
||||
pkgs = pythonPackages;
|
||||
isPy3 = true;
|
||||
isPy37 = true;
|
||||
is_py3k = true; # deprecated
|
||||
interpreter = "${self}/bin/${executable}";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://python.org;
|
||||
description = "A high-level dynamically-typed programming language";
|
||||
longDescription = ''
|
||||
Python is a remarkably powerful dynamic programming language that
|
||||
is used in a wide variety of application domains. Some of its key
|
||||
distinguishing features include: clear, readable syntax; strong
|
||||
introspection capabilities; intuitive object orientation; natural
|
||||
expression of procedural code; full modularity, supporting
|
||||
hierarchical packages; exception-based error handling; and very
|
||||
high level dynamic data types.
|
||||
'';
|
||||
license = licenses.psfl;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ fridh kragniz ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,100 @@
|
||||
From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
|
||||
From: Frederik Rietdijk <fridh@fridh.nl>
|
||||
Date: Mon, 28 Aug 2017 09:24:06 +0200
|
||||
Subject: [PATCH] Don't use ldconfig
|
||||
|
||||
---
|
||||
Lib/ctypes/util.py | 70 ++----------------------------------------------------
|
||||
1 file changed, 2 insertions(+), 68 deletions(-)
|
||||
|
||||
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
|
||||
index 5e8b31a854..7b45ce6c15 100644
|
||||
--- a/Lib/ctypes/util.py
|
||||
+++ b/Lib/ctypes/util.py
|
||||
@@ -94,46 +94,7 @@ elif os.name == "posix":
|
||||
import re, tempfile
|
||||
|
||||
def _findLib_gcc(name):
|
||||
- # Run GCC's linker with the -t (aka --trace) option and examine the
|
||||
- # library name it prints out. The GCC command will fail because we
|
||||
- # haven't supplied a proper program with main(), but that does not
|
||||
- # matter.
|
||||
- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
|
||||
-
|
||||
- c_compiler = shutil.which('gcc')
|
||||
- if not c_compiler:
|
||||
- c_compiler = shutil.which('cc')
|
||||
- if not c_compiler:
|
||||
- # No C compiler available, give up
|
||||
- return None
|
||||
-
|
||||
- temp = tempfile.NamedTemporaryFile()
|
||||
- try:
|
||||
- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
|
||||
-
|
||||
- env = dict(os.environ)
|
||||
- env['LC_ALL'] = 'C'
|
||||
- env['LANG'] = 'C'
|
||||
- try:
|
||||
- proc = subprocess.Popen(args,
|
||||
- stdout=subprocess.PIPE,
|
||||
- stderr=subprocess.STDOUT,
|
||||
- env=env)
|
||||
- except OSError: # E.g. bad executable
|
||||
- return None
|
||||
- with proc:
|
||||
- trace = proc.stdout.read()
|
||||
- finally:
|
||||
- try:
|
||||
- temp.close()
|
||||
- except FileNotFoundError:
|
||||
- # Raised if the file was already removed, which is the normal
|
||||
- # behaviour of GCC if linking fails
|
||||
- pass
|
||||
- res = re.search(expr, trace)
|
||||
- if not res:
|
||||
- return None
|
||||
- return os.fsdecode(res.group(0))
|
||||
+ return None
|
||||
|
||||
|
||||
if sys.platform == "sunos5":
|
||||
@@ -255,34 +216,7 @@ elif os.name == "posix":
|
||||
else:
|
||||
|
||||
def _findSoname_ldconfig(name):
|
||||
- import struct
|
||||
- if struct.calcsize('l') == 4:
|
||||
- machine = os.uname().machine + '-32'
|
||||
- else:
|
||||
- machine = os.uname().machine + '-64'
|
||||
- mach_map = {
|
||||
- 'x86_64-64': 'libc6,x86-64',
|
||||
- 'ppc64-64': 'libc6,64bit',
|
||||
- 'sparc64-64': 'libc6,64bit',
|
||||
- 's390x-64': 'libc6,64bit',
|
||||
- 'ia64-64': 'libc6,IA-64',
|
||||
- }
|
||||
- abi_type = mach_map.get(machine, 'libc6')
|
||||
-
|
||||
- # XXX assuming GLIBC's ldconfig (with option -p)
|
||||
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
|
||||
- regex = os.fsencode(regex % (re.escape(name), abi_type))
|
||||
- try:
|
||||
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
|
||||
- stdin=subprocess.DEVNULL,
|
||||
- stderr=subprocess.DEVNULL,
|
||||
- stdout=subprocess.PIPE,
|
||||
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
|
||||
- res = re.search(regex, p.stdout.read())
|
||||
- if res:
|
||||
- return os.fsdecode(res.group(1))
|
||||
- except OSError:
|
||||
- pass
|
||||
+ return None
|
||||
|
||||
def _findLib_ld(name):
|
||||
# See issue #9998 for why this is needed
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "Xaw3d-1.6.2";
|
||||
name = "Xaw3d-1.6.3";
|
||||
src = fetchurl {
|
||||
url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2;
|
||||
sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp";
|
||||
url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
|
||||
sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [imake gccmakedep libXpm libXp bison flex];
|
||||
|
||||
@ -23,6 +23,7 @@ agda.mkDerivation (self: rec {
|
||||
description = "A standard library for use with the Agda compiler";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ jwiegley fuuzetsu mudri ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A game programming library";
|
||||
homepage = http://liballeg.org/;
|
||||
homepage = https://liballeg.org/;
|
||||
license = licenses.zlib;
|
||||
maintainers = [ maintainers.raskin ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A game programming library";
|
||||
homepage = http://liballeg.org/;
|
||||
homepage = https://liballeg.org/;
|
||||
license = licenses.free; # giftware
|
||||
maintainers = [ maintainers.raskin ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
else throw "Unsupported system!";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "aws-sdk-cpp-${version}";
|
||||
version = "1.4.65";
|
||||
version = "1.4.70";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = "0266d2gar9wi0p4plapcp4bms93nn61rdvpd8ik5h6hgqvdb3fl2";
|
||||
sha256 = "09yybp1nh3w6m3cychx44vvplsy27rxjs948g5gs5qdcgdyx0yx0";
|
||||
};
|
||||
|
||||
# FIXME: might be nice to put different APIs in different outputs
|
||||
|
||||
@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_66_0.html
|
||||
sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
|
||||
};
|
||||
|
||||
toolset = if stdenv.cc.isClang then "clang" else null;
|
||||
})
|
||||
|
||||
@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_66_0.html
|
||||
sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba";
|
||||
};
|
||||
|
||||
toolset = if stdenv.cc.isClang then "clang" else null;
|
||||
})
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
|
||||
, which
|
||||
, buildPackages, buildPlatform, hostPlatform
|
||||
, toolset ? /**/ if stdenv.cc.isClang then "clang"
|
||||
else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross"
|
||||
, toolset ? /**/ if stdenv.cc.isClang then "clang"
|
||||
else null
|
||||
, enableRelease ? true
|
||||
, enableDebug ? false
|
||||
@ -58,16 +57,26 @@ let
|
||||
"link=${link}"
|
||||
"-sEXPAT_INCLUDE=${expat.dev}/include"
|
||||
"-sEXPAT_LIBPATH=${expat.out}/lib"
|
||||
|
||||
# TODO: make this unconditional
|
||||
] ++ optionals (hostPlatform != buildPlatform) [
|
||||
"address-model=${toString hostPlatform.parsed.cpu.bits}"
|
||||
"architecture=${toString hostPlatform.parsed.cpu.family}"
|
||||
"binary-format=${toString hostPlatform.parsed.kernel.execFormat.name}"
|
||||
"target-os=${toString hostPlatform.parsed.kernel.name}"
|
||||
|
||||
# adapted from table in boost manual
|
||||
# https://www.boost.org/doc/libs/1_66_0/libs/context/doc/html/context/architectures.html
|
||||
"abi=${if hostPlatform.parsed.cpu.family == "arm" then "aapcs"
|
||||
else if hostPlatform.isWindows then "ms"
|
||||
else if hostPlatform.isMips then "o32"
|
||||
else "sysv"}"
|
||||
] ++ optional (link != "static") "runtime-link=${runtime-link}"
|
||||
++ optional (variant == "release") "debug-symbols=off"
|
||||
++ optional (toolset != null) "toolset=${toolset}"
|
||||
++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam"
|
||||
++ optionals (hostPlatform.libc == "msvcrt") [
|
||||
"target-os=windows"
|
||||
"threadapi=win32"
|
||||
"binary-format=pe"
|
||||
"address-model=${toString hostPlatform.parsed.cpu.bits}"
|
||||
"architecture=x86"
|
||||
]);
|
||||
|
||||
in
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description =
|
||||
"Collection of open-source libraries for high level network programming";
|
||||
homepage = http://cpp-netlib.org;
|
||||
homepage = https://cpp-netlib.org;
|
||||
license = licenses.boost;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A D-Bus API for the dLeyna services";
|
||||
homepage = http://01.org/dleyna;
|
||||
homepage = https://01.org/dleyna;
|
||||
maintainers = [ maintainers.jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21;
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Library of utility functions that are used by the higher level dLeyna";
|
||||
homepage = http://01.org/dleyna;
|
||||
homepage = https://01.org/dleyna;
|
||||
maintainers = [ maintainers.jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21;
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Library to discover and manipulate Digital Media Renderers";
|
||||
homepage = http://01.org/dleyna;
|
||||
homepage = https://01.org/dleyna;
|
||||
maintainers = [ maintainers.jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21;
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Library to discover, browse and manipulate Digital Media Servers";
|
||||
homepage = http://01.org/dleyna;
|
||||
homepage = https://01.org/dleyna;
|
||||
maintainers = [ maintainers.jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user