Merge #129506: 'staging-next' branch
This commit is contained in:
Vladimír Čunát
commit
586a9e6bff
369 changed files with 1799 additions and 1449 deletions
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
Several versions of the Python interpreter are available on Nix, as well as a
|
||||
high amount of packages. The attribute `python3` refers to the default
|
||||
interpreter, which is currently CPython 3.8. The attribute `python` refers to
|
||||
interpreter, which is currently CPython 3.9. The attribute `python` refers to
|
||||
CPython 2.7 for backwards-compatibility. It is also possible to refer to
|
||||
specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to
|
||||
the default PyPy interpreter.
|
||||
|
|
@ -839,7 +839,7 @@ sets are
|
|||
and the aliases
|
||||
|
||||
* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
|
||||
* `pkgs.python3Packages` pointing to `pkgs.python38Packages`
|
||||
* `pkgs.python3Packages` pointing to `pkgs.python39Packages`
|
||||
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
|
||||
|
||||
#### `buildPythonPackage` function {#buildpythonpackage-function}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
</itemizedlist>
|
||||
<section xml:id="sec-release-21.11-highlights">
|
||||
<title>Highlights</title>
|
||||
<itemizedlist spacing="compact">
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
PHP now defaults to PHP 8.0, updated from 7.4.
|
||||
|
|
@ -26,6 +26,12 @@
|
|||
default runtime.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>python3</literal> now defaults to Python 3.9, updated
|
||||
from Python 3.8.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-new-services">
|
||||
|
|
@ -566,6 +572,14 @@
|
|||
<literal>rxvt-unicode</literal> explicitly.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>python3</literal> now defaults to Python 3.9. Python
|
||||
3.9 introduces many deprecation warnings, please look at the
|
||||
<link xlink:href="https://docs.python.org/3/whatsnew/3.9.html">What’s
|
||||
New In Python 3.9 post</link> for more information.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>claws-mail</literal> package now references the
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- PHP now defaults to PHP 8.0, updated from 7.4.
|
||||
- kOps now defaults to 1.21.0, which uses containerd as the default runtime.
|
||||
|
||||
- `python3` now defaults to Python 3.9, updated from Python 3.8.
|
||||
|
||||
## New Services {#sec-release-21.11-new-services}
|
||||
|
||||
- [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances).
|
||||
|
|
@ -141,6 +143,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly.
|
||||
|
||||
- `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information.
|
||||
|
||||
- The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package.
|
||||
|
||||
- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites).
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitLab, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "aacgain-1.9.0";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aacgain";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mulx";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, gnu-config, IOKit, Carbon }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cdparanoia-III-10.2";
|
||||
pname = "cdparanoia-III";
|
||||
version = "10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz";
|
||||
url = "https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${version}.src.tgz";
|
||||
sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,9 +19,10 @@
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "crip-3.9";
|
||||
pname = "crip";
|
||||
version = "3.9";
|
||||
src = fetchurl {
|
||||
url = "http://bach.dynet.com/crip/src/${name}.tar.gz";
|
||||
url = "http://bach.dynet.com/${pname}/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dirt-2018-01-01";
|
||||
pname = "dirt";
|
||||
version = "unstable-2018-01-01";
|
||||
src = fetchFromGitHub {
|
||||
repo = "Dirt";
|
||||
owner = "tidalcycles";
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gmu-0.10.1";
|
||||
pname = "gmu";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://wejp.k.vu/files/${name}.tar.gz";
|
||||
url = "https://wej.k.vu/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsa-lib, libxml2, lrdf }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jack-rack-1.4.7";
|
||||
pname = "jack-rack";
|
||||
version = "1.4.7";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, libjack2, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jackmeter-0.4";
|
||||
pname = "jackmeter";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.aelius.com/njh/jackmeter/${name}.tar.gz";
|
||||
url = "https://www.aelius.com/njh/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, libmikmod, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mikmod-3.2.8";
|
||||
pname = "mikmod";
|
||||
version = "3.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mikmod/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1k54p8pn3jinha0f2i23ad15pf1pamibzcxjrbzjbklpcz1ipc6v";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, unzip, mpg123 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mp3gain-1.6.2";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mp3gain";
|
||||
version = "1.6.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mp3gain/mp3gain-1_6_2-src.zip";
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${lib.replaceStrings ["."] ["_"] version}-src.zip";
|
||||
sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mp3info-0.8.5a";
|
||||
pname = "mp3info";
|
||||
version = "0.8.5a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/${name}.tgz";
|
||||
url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${pname}/${pname}-${version}.tgz";
|
||||
sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,10 +7,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mpg123-1.26.5";
|
||||
pname = "mpg123";
|
||||
version = "1.26.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-UCqX4Nk1vn432YczgCHY8wG641wohPKoPVnEtSRm7wY=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,10 +3,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nootka-1.4.7";
|
||||
pname = "nootka";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nootka/${name}-source.tar.bz2";
|
||||
url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2";
|
||||
sha256 = "1y9wlwri74v2z9dwbcfjs7xri54yra24vpwq19xi2lfv1nbs518x";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{lib, stdenv, fetchurl, libogg, libao, pkg-config, flac, opusfile, libopusenc}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opus-tools-0.2";
|
||||
pname = "opus-tools";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
|
||||
url = "https://downloads.xiph.org/releases/opus/${pname}-${version}.tar.gz";
|
||||
sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -29,10 +29,11 @@
|
|||
# handle that.
|
||||
|
||||
mkDerivation rec {
|
||||
name = "qmmp-1.4.4";
|
||||
pname = "qmmp";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
|
||||
url = "https://qmmp.ylsoftware.com/files/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tony-2.1.1";
|
||||
pname = "tony";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${name}.tar.gz";
|
||||
url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${pname}-${version}.tar.gz";
|
||||
sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
, lzo, libdvdread, pkg-config, x264, libmpeg2, xvidcore }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "transcode-1.1.7";
|
||||
pname = "transcode";
|
||||
version = "1.1.7";
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/france/transcode-tcforge/downloads/${name}.tar.bz2";
|
||||
url = "https://bitbucket.org/france/transcode-tcforge/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xmp-4.1.0";
|
||||
pname = "xmp";
|
||||
version = "4.1.0";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extended module player";
|
||||
|
|
@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, alsa-lib, libjack2, zita-alsa-pcmi, zita-resampler }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zita-ajbridge-0.8.4";
|
||||
pname = "zita-ajbridge";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
|
||||
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zita-at1-0.6.2";
|
||||
pname = "zita-at1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
|
||||
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0mxfn61zvhlq3r1mqipyqzjbanrfdkk8x4nxbz8nlbdk0bf3vfqr";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ python3Packages.buildPythonApplication rec {
|
|||
blinker
|
||||
natsort
|
||||
# extras_require
|
||||
boto
|
||||
brotli
|
||||
feedgenerator
|
||||
zopfli
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc
|
||||
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner
|
||||
, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam
|
||||
}:
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0q48fgh6gf3jicy4bk3kq18h9lhqfq9qz32ri6j9ffvbb8mcw64s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja scdoc wayland ];
|
||||
nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ];
|
||||
buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc
|
||||
, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config, scdoc, wayland-scanner
|
||||
, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -13,9 +14,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ];
|
||||
buildInputs = [
|
||||
wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers
|
||||
wayland wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -124,6 +124,18 @@ stdenv.mkDerivation rec {
|
|||
# This means `-accel hvf` is broken for now, on aarch64-darwin only.
|
||||
substituteInPlace meson.build \
|
||||
--replace 'if exe_sign' 'if false'
|
||||
|
||||
# glibc 2.33 compat fix: if `has_statx = true` is set, `tools/virtiofsd/passthrough_ll.c` will
|
||||
# rely on `stx_mnt_id`[1] which is not part of glibc's `statx`-struct definition.
|
||||
#
|
||||
# `has_statx` will be set to `true` if a simple C program which uses a few `statx`
|
||||
# consts & struct fields successfully compiles. It seems as this only builds on glibc-2.33
|
||||
# since most likely[2] and because of that, the problematic code-path will be used.
|
||||
#
|
||||
# [1] https://github.com/torvalds/linux/commit/fa2fcf4f1df1559a0a4ee0f46915b496cc2ebf60#diff-64bab5a0a3fcb55e1a6ad77b1dfab89d2c9c71a770a07ecf44e6b82aae76a03a
|
||||
# [2] https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=io/bits/statx-generic.h;h=c34697e3c1fd79cddd60db294302e461ed8db6e2;hp=7a09e94be2abb92d2df612090c132e686a24d764;hb=88a2cf6c4bab6e94a65e9c0db8813709372e9180;hpb=c4e4b2e149705559d28b16a9b47ba2f6142d6a6c
|
||||
substituteInPlace meson.build \
|
||||
--replace 'has_statx = cc.links(statx_test)' 'has_statx = false'
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config, wayland, scdoc, makeWrapper
|
||||
, wlroots, wayland-protocols, pixman, libxkbcommon
|
||||
, meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper
|
||||
, wlroots, wayland, wayland-protocols, pixman, libxkbcommon
|
||||
, systemd, libGL, libX11, mesa
|
||||
, xwayland ? null
|
||||
, nixosTests
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
wlroots wayland wayland-protocols pixman libxkbcommon
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg
|
||||
, meson, ninja, pkg-config, wayland, scdoc
|
||||
, libxkbcommon, pcre, json_c, dbus, libevdev
|
||||
, meson, ninja, pkg-config, wayland-scanner, scdoc
|
||||
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
|
||||
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
|
||||
, wlroots, wayland-protocols, libdrm
|
||||
, nixosTests
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config wayland scdoc
|
||||
meson ninja pkg-config wayland-scanner scdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, wlroots, pkg-config
|
||||
{ lib, stdenv, wlroots, pkg-config, wayland-scanner
|
||||
, libxkbcommon, pixman, udev, wayland, wayland-protocols
|
||||
}:
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
|||
|
||||
sourceRoot = "source/tinywl";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config wayland-scanner ];
|
||||
buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ];
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl";
|
||||
description = ''"minimum viable product" Wayland compositor based on wlroots.'';
|
||||
description = ''A "minimum viable product" Wayland compositor based on wlroots'';
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
license = licenses.cc0;
|
||||
inherit (wlroots.meta) platforms;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland
|
||||
, libGL, mesa, libxkbcommon, cairo, libxcb
|
||||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner
|
||||
, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
|
||||
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
|
||||
, colord, lcms2, pipewire ? null
|
||||
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
|
||||
buildInputs = [
|
||||
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
|
||||
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, icoutils }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "icon-conv-tools-0.0.0";
|
||||
pname = "icon-conv-tools";
|
||||
version = "0.0.0";
|
||||
|
||||
src = ./bin;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ stdenv, lib, coreutils }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libredirect-0";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libredirect";
|
||||
version = "0";
|
||||
|
||||
unpackPhase = ''
|
||||
cp ${./libredirect.c} libredirect.c
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "6.000";
|
||||
version = "6.001";
|
||||
in
|
||||
fetchzip rec {
|
||||
name = "charis-sil-${version}";
|
||||
|
|
@ -14,7 +14,7 @@ in
|
|||
unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
|
||||
'';
|
||||
|
||||
sha256 = "sha256-eMmC893rI42qzZVCI17i9XSAbQzXCK2fHVe5Pf1/VnM=";
|
||||
sha256 = "sha256-eKSOvYuTMpAnTk4sRiWFUDJrTsF+K5716ALCepaUU08=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://software.sil.org/charis";
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
|
||||
# left for compatibility
|
||||
|
||||
# compatibility
|
||||
# - openssl
|
||||
export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
|
||||
# - Haskell x509-system
|
||||
export SYSTEM_CERTIFICATE_PATH=@out@/etc/ssl/certs/ca-bundle.crt
|
||||
|
|
|
|||
|
|
@ -39,16 +39,16 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
gettext
|
||||
itstool
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
libxml2
|
||||
shared-mime-info
|
||||
];
|
||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) shared-mime-info;
|
||||
|
||||
buildInputs = [
|
||||
libxml2
|
||||
glib
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
mesonFlags = [
|
||||
"-Dupdate-mimedb=true"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
pname = "clang";
|
||||
inherit version;
|
||||
|
||||
src = fetch "clang" "1vd9rhhrd8ghdg111lac7w8by71y9l14yh5zxfijsm6lj4p4avp2";
|
||||
src = fetch "clang" "0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf";
|
||||
inherit clang-tools-extra_src;
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ in
|
|||
stdenv.mkDerivation {
|
||||
pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc";
|
||||
inherit version;
|
||||
src = fetch "compiler-rt" "0d444qihq9jhqnfv003cr704v363va72zl6qaw2algj1c85cva45";
|
||||
src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l";
|
||||
|
||||
nativeBuildInputs = [ cmake python3 llvm.dev ];
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
release_version = "12.0.0";
|
||||
release_version = "12.0.1";
|
||||
candidate = ""; # empty or "rcN"
|
||||
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
|
||||
version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
|
||||
|
|
@ -29,7 +29,7 @@ let
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
clang-tools-extra_src = fetch "clang-tools-extra" "0p3dzr0qa7mar83y66xa5m5apynf6ia0lsdsq6axwnm64ysy0hdd";
|
||||
clang-tools-extra_src = fetch "clang-tools-extra" "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5";
|
||||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
|||
pname = "libcxx";
|
||||
inherit version;
|
||||
|
||||
src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";
|
||||
src = fetch "libcxx" "05cx39ldlxchck454lgfly1xj0c7x65iyx4hqhiihrlg6p6qj854";
|
||||
|
||||
postUnpack = ''
|
||||
unpackFile ${libcxxabi.src}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
|||
pname = "libcxxabi";
|
||||
inherit version;
|
||||
|
||||
src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";
|
||||
src = fetch "libcxxabi" "1l4idd8npbkm168d26kqn529yv3npsd8f2dm8a7iwyknj7iyivw8";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "libunwind";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "1x8wpmsrsgnwj2v5ih52ylni7r6n8gzkcj6hx65zbxski2rablly";
|
||||
src = fetch pname "192ww6n81lj2mb9pj4043z79jp3cf58a9c2qrxjwm5c3a64n1shb";
|
||||
|
||||
postUnpack = ''
|
||||
unpackFile ${libcxx.src}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "lld";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "1zakyxk5bwnh7jarckcd4rbmzi58jgn2dbah5j5cwcyfyfbx9drc";
|
||||
src = fetch pname "0qg3fgc7wj34hdkqn21y03zcmsdd01szhhm1hfki63iifrm3y2v9";
|
||||
|
||||
patches = [
|
||||
./gnu-install-dirs.patch
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation (rec {
|
|||
pname = "lldb";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "1v85qyq3snk81vjmwq5q7xikyyqsfpqy2c4qmr81mps4avsw1g0l";
|
||||
src = fetch pname "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78";
|
||||
|
||||
patches = [
|
||||
./procfs.patch
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ in stdenv.mkDerivation (rec {
|
|||
pname = "llvm";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "0l4b79gwfvxild974aigcq1yigypjsk2j5p59syhl6ksd744gp29";
|
||||
polly_src = fetch "polly" "1ixl9yj526n8iqh9ckyiah2vzravs9d1akybqq7rvy32n9vgr6hd";
|
||||
src = fetch pname "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx";
|
||||
polly_src = fetch "polly" "1yfm9ixda4a2sx7ak5vswijx4ydk5lv1c1xh39xmd2kh299y4m12";
|
||||
|
||||
unpackPhase = ''
|
||||
unpackFile $src
|
||||
|
|
@ -84,6 +84,8 @@ in stdenv.mkDerivation (rec {
|
|||
substituteInPlace unittests/IR/CMakeLists.txt \
|
||||
--replace "PassBuilderCallbacksTest.cpp" ""
|
||||
rm unittests/IR/PassBuilderCallbacksTest.cpp
|
||||
# TODO: Fix failing tests:
|
||||
rm test/DebugInfo/X86/vla-multi.ll
|
||||
'' + optionalString stdenv.hostPlatform.isMusl ''
|
||||
patch -p1 -i ${../../TLI-musl.patch}
|
||||
substituteInPlace unittests/Support/CMakeLists.txt \
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "openmp";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "0z8n1wanby6aq3i7d91mgk72hb33zfl5blayk0a22cs7l8i706zb";
|
||||
src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, bison }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "hugs98-200609";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hugs98";
|
||||
version = "2006-09";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz";
|
||||
url = "https://www.haskell.org/hugs/downloads/${version}/hugs98-Sep2006.tar.gz";
|
||||
sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
diff --git a/hints/darwin.sh b/hints/darwin.sh
|
||||
index 0a91bc083c0..fdfbdd4a3b9 100644
|
||||
--- a/hints/darwin.sh
|
||||
+++ b/hints/darwin.sh
|
||||
@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
|
||||
# We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
|
||||
# capturing its value and adding it to the flags.
|
||||
case "$MACOSX_DEPLOYMENT_TARGET" in
|
||||
- 10.*)
|
||||
+ [1-9][0-9].*)
|
||||
add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
|
||||
add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
|
||||
;;
|
||||
@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
|
||||
|
||||
*** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
|
||||
***
|
||||
-*** Please either set it to 10.something, or to empty.
|
||||
+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
|
||||
|
||||
EOM
|
||||
exit 1
|
||||
@@ -327,7 +327,7 @@ EOM
|
||||
# "ProductVersion: 10.11" "10.11"
|
||||
prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
|
||||
case "$prodvers" in
|
||||
- 10.*)
|
||||
+ [1-9][0-9].*)
|
||||
add_macosx_version_min ccflags $prodvers
|
||||
add_macosx_version_min ldflags $prodvers
|
||||
;;
|
||||
@@ -342,11 +342,10 @@ EOM
|
||||
exit 1
|
||||
esac
|
||||
|
||||
- # The X in 10.X
|
||||
- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
|
||||
+ darwin_major=$(echo $osvers|awk -F. '{print $1}')
|
||||
|
||||
- # macOS (10.12) deprecated syscall().
|
||||
- if [ "$prodvers_minor" -ge 12 ]; then
|
||||
+ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
|
||||
+ if [ "$darwin_major" -ge 16 ]; then
|
||||
d_syscall='undef'
|
||||
# If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
|
||||
case "$MACOSX_DEPLOYMENT_TARGET" in
|
||||
|
|
@ -37,15 +37,11 @@ let
|
|||
patches =
|
||||
[
|
||||
# Do not look in /usr etc. for dependencies.
|
||||
(if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch
|
||||
else ./no-sys-dirs-5.31.patch)
|
||||
./no-sys-dirs-5.31.patch
|
||||
]
|
||||
++ optional stdenv.isSunOS ./ld-shared.patch
|
||||
++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
|
||||
++ optional crossCompiling ./MakeMaker-cross.patch
|
||||
# Backporting https://github.com/Perl/perl5/pull/17946, can be
|
||||
# removed if there's ever a 5.30.x release with it included.
|
||||
++ optional (versionOlder version "5.32.1") ./aarch64-darwin.patch;
|
||||
++ optional crossCompiling ./MakeMaker-cross.patch;
|
||||
|
||||
# This is not done for native builds because pwd may need to come from
|
||||
# bootstrap tools when building bootstrap perl.
|
||||
|
|
@ -196,14 +192,6 @@ let
|
|||
setupHook = ./setup-hook-cross.sh;
|
||||
});
|
||||
in {
|
||||
# Maint version
|
||||
perl530 = common {
|
||||
perl = pkgs.perl530;
|
||||
buildPerl = buildPackages.perl530;
|
||||
version = "5.30.3";
|
||||
sha256 = "0vs0wwwlw47sswxaflkk4hw0y45cmc7arxx788kwpbminy5lrq1j";
|
||||
};
|
||||
|
||||
# Maint version
|
||||
perl532 = common {
|
||||
perl = pkgs.perl532;
|
||||
|
|
@ -212,6 +200,14 @@ in {
|
|||
sha256 = "0b7brakq9xs4vavhg391as50nbhzryc7fy5i65r81bnq3j897dh3";
|
||||
};
|
||||
|
||||
# Maint version
|
||||
perl534 = common {
|
||||
perl = pkgs.perl534;
|
||||
buildPerl = buildPackages.perl534;
|
||||
version = "5.34.0";
|
||||
sha256 = "16mywn5afpv1mczv9dlc1w84rbgjgrr0pyr4c0hhb2wnif0zq7jm";
|
||||
};
|
||||
|
||||
# the latest Devel version
|
||||
perldevel = common {
|
||||
perl = pkgs.perldevel;
|
||||
|
|
|
|||
|
|
@ -1,251 +0,0 @@
|
|||
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
|
||||
--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200
|
||||
+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200
|
||||
@@ -106,15 +106,7 @@
|
||||
fi
|
||||
|
||||
: Proper PATH setting
|
||||
-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
|
||||
-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
|
||||
-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
|
||||
-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
|
||||
-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
|
||||
-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
|
||||
-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
|
||||
-paths="$paths /sbin /usr/sbin /usr/libexec"
|
||||
-paths="$paths /system/gnu_library/bin"
|
||||
+paths=''
|
||||
|
||||
for p in $paths
|
||||
do
|
||||
@@ -1337,8 +1329,7 @@
|
||||
archname=''
|
||||
: Possible local include directories to search.
|
||||
: Set locincpth to "" in a hint file to defeat local include searches.
|
||||
-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
|
||||
-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
|
||||
+locincpth=""
|
||||
:
|
||||
: no include file wanted by default
|
||||
inclwanted=''
|
||||
@@ -1349,17 +1340,12 @@
|
||||
|
||||
libnames=''
|
||||
: change the next line if compiling for Xenix/286 on Xenix/386
|
||||
-xlibpth='/usr/lib/386 /lib/386'
|
||||
+xlibpth=''
|
||||
: Possible local library directories to search.
|
||||
-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
|
||||
-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
|
||||
+loclibpth=""
|
||||
|
||||
: general looking path for locating libraries
|
||||
-glibpth="/lib /usr/lib $xlibpth"
|
||||
-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
|
||||
-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
|
||||
-test -f /shlib/libc.so && glibpth="/shlib $glibpth"
|
||||
-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
|
||||
+glibpth=""
|
||||
|
||||
: Private path used by Configure to find libraries. Its value
|
||||
: is prepended to libpth. This variable takes care of special
|
||||
@@ -1391,8 +1377,6 @@
|
||||
libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
|
||||
: We probably want to search /usr/shlib before most other libraries.
|
||||
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
|
||||
-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
|
||||
-glibpth="/usr/shlib $glibpth"
|
||||
: Do not use vfork unless overridden by a hint file.
|
||||
usevfork=false
|
||||
|
||||
@@ -2446,7 +2430,6 @@
|
||||
zip
|
||||
"
|
||||
pth=`echo $PATH | sed -e "s/$p_/ /g"`
|
||||
-pth="$pth $sysroot/lib $sysroot/usr/lib"
|
||||
for file in $loclist; do
|
||||
eval xxx=\$$file
|
||||
case "$xxx" in
|
||||
@@ -4936,7 +4919,7 @@
|
||||
: Set private lib path
|
||||
case "$plibpth" in
|
||||
'') if ./mips; then
|
||||
- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
|
||||
+ plibpth="$incpath/usr/lib"
|
||||
fi;;
|
||||
esac
|
||||
case "$libpth" in
|
||||
@@ -8600,13 +8583,8 @@
|
||||
echo " "
|
||||
case "$sysman" in
|
||||
'')
|
||||
- syspath='/usr/share/man/man1 /usr/man/man1'
|
||||
- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
|
||||
- syspath="$syspath /usr/man/u_man/man1"
|
||||
- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
|
||||
- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
|
||||
- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
|
||||
- sysman=`./loc . /usr/man/man1 $syspath`
|
||||
+ syspath=''
|
||||
+ sysman=''
|
||||
;;
|
||||
esac
|
||||
if $test -d "$sysman"; then
|
||||
@@ -19900,9 +19878,10 @@
|
||||
case "$full_ar" in
|
||||
'') full_ar=$ar ;;
|
||||
esac
|
||||
+full_ar=ar
|
||||
|
||||
: Store the full pathname to the sed program for use in the C program
|
||||
-full_sed=$sed
|
||||
+full_sed=sed
|
||||
|
||||
: see what type gids are declared as in the kernel
|
||||
echo " "
|
||||
Only in perl-5.20.0/: Configure.orig
|
||||
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL
|
||||
--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200
|
||||
+++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200
|
||||
@@ -134,12 +126,7 @@
|
||||
if ($dep =~ /(\S+errno\.h)/) {
|
||||
$file{$1} = 1;
|
||||
}
|
||||
- } elsif ($^O eq 'linux' &&
|
||||
- $Config{gccversion} ne '' &&
|
||||
- $Config{gccversion} !~ /intel/i &&
|
||||
- # might be using, say, Intel's icc
|
||||
- $linux_errno_h
|
||||
- ) {
|
||||
+ } elsif (0) {
|
||||
$file{$linux_errno_h} = 1;
|
||||
} elsif ($^O eq 'haiku') {
|
||||
# hidden in a special place
|
||||
Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
|
||||
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh
|
||||
--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100
|
||||
+++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200
|
||||
@@ -119,21 +119,21 @@
|
||||
objformat=`/usr/bin/objformat`
|
||||
if [ x$objformat = xaout ]; then
|
||||
if [ -e /usr/lib/aout ]; then
|
||||
- libpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||
- glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||
+ libpth=""
|
||||
+ glibpth=""
|
||||
fi
|
||||
lddlflags='-Bshareable'
|
||||
else
|
||||
- libpth="/usr/lib /usr/local/lib"
|
||||
- glibpth="/usr/lib /usr/local/lib"
|
||||
+ libpth=""
|
||||
+ glibpth=""
|
||||
ldflags="-Wl,-E "
|
||||
lddlflags="-shared "
|
||||
fi
|
||||
cccdlflags='-DPIC -fPIC'
|
||||
;;
|
||||
*)
|
||||
- libpth="/usr/lib /usr/local/lib"
|
||||
- glibpth="/usr/lib /usr/local/lib"
|
||||
+ libpth=""
|
||||
+ glibpth=""
|
||||
ldflags="-Wl,-E "
|
||||
lddlflags="-shared "
|
||||
cccdlflags='-DPIC -fPIC'
|
||||
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
|
||||
--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200
|
||||
+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200
|
||||
@@ -150,25 +150,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
|
||||
-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us
|
||||
-# where to look. We don't want gcc's own libraries, however, so we
|
||||
-# filter those out.
|
||||
-# This could be conditional on Unbuntu, but other distributions may
|
||||
-# follow suit, and this scheme seems to work even on rather old gcc's.
|
||||
-# This unconditionally uses gcc because even if the user is using another
|
||||
-# compiler, we still need to find the math library and friends, and I don't
|
||||
-# know how other compilers will cope with that situation.
|
||||
-# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
|
||||
-# we don't want its libraries. So we try to prefer the system gcc
|
||||
-# Still, as an escape hatch, allow Configure command line overrides to
|
||||
-# plibpth to bypass this check.
|
||||
-if [ -x /usr/bin/gcc ] ; then
|
||||
- gcc=/usr/bin/gcc
|
||||
-else
|
||||
- gcc=gcc
|
||||
-fi
|
||||
-
|
||||
case "$plibpth" in
|
||||
'') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
|
||||
cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
|
||||
@@ -178,32 +159,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-case "$libc" in
|
||||
-'')
|
||||
-# If you have glibc, then report the version for ./myconfig bug reporting.
|
||||
-# (Configure doesn't need to know the specific version since it just uses
|
||||
-# gcc to load the library for all tests.)
|
||||
-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they
|
||||
-# are insufficiently precise to distinguish things like
|
||||
-# libc-2.0.6 and libc-2.0.7.
|
||||
- for p in $plibpth
|
||||
- do
|
||||
- for trylib in libc.so.6 libc.so
|
||||
- do
|
||||
- if $test -e $p/$trylib; then
|
||||
- libc=`ls -l $p/$trylib | awk '{print $NF}'`
|
||||
- if $test "X$libc" != X; then
|
||||
- break
|
||||
- fi
|
||||
- fi
|
||||
- done
|
||||
- if $test "X$libc" != X; then
|
||||
- break
|
||||
- fi
|
||||
- done
|
||||
- ;;
|
||||
-esac
|
||||
-
|
||||
if ${sh:-/bin/sh} -c exit; then
|
||||
echo ''
|
||||
echo 'You appear to have a working bash. Good.'
|
||||
@@ -367,33 +322,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
|
||||
-# true libraries. The scripts cause binding against static
|
||||
-# version of -lgdbm which is a bad idea. So if we have 'nm'
|
||||
-# make sure it can read the file
|
||||
-# NI-S 2003/08/07
|
||||
-case "$nm" in
|
||||
- '') ;;
|
||||
- *)
|
||||
- for p in $plibpth
|
||||
- do
|
||||
- if $test -r $p/libndbm.so; then
|
||||
- if $nm $p/libndbm.so >/dev/null 2>&1 ; then
|
||||
- echo 'Your shared -lndbm seems to be a real library.'
|
||||
- _libndbm_real=1
|
||||
- break
|
||||
- fi
|
||||
- fi
|
||||
- done
|
||||
- if $test "X$_libndbm_real" = X; then
|
||||
- echo 'Your shared -lndbm is not a real library.'
|
||||
- set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
|
||||
- shift
|
||||
- libswanted="$*"
|
||||
- fi
|
||||
- ;;
|
||||
-esac
|
||||
-
|
||||
# Linux on Synology.
|
||||
if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
|
||||
# Tested on Synology DS213 and DS413
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
|
||||
|
||||
let
|
||||
sexpr_wasm_prototype = stdenv.mkDerivation {
|
||||
name = "sexpr_wasm_prototype";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WebAssembly";
|
||||
repo = "sexpr-wasm-prototype";
|
||||
rev = "1347a367c34876bfe92562f244a8c8b770372479";
|
||||
sha256 = "1v1mph5fp1rffhvh8bbx937gpjqjrdgm7yhffdxzdn4pih9d0grn";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
# set this to nonempty string to disable default cmake configure
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ clang python ];
|
||||
|
||||
buildPhase = "make clang-debug-no-tests";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp out/clang/Debug/no-tests/sexpr-wasm $out/bin
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "wasm-0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "proglodyte";
|
||||
repo = "wasm";
|
||||
rev = "650188eecaaf4b64f12b341986b4e89e5fdb3bbe";
|
||||
sha256 = "1f5mdl0l2448lx7h36b4bdr541a4q1wapn1kdwrd4z7s94n7a5gq";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
sed -i -e "s|sudo ||g" Makefile
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
export DESTDIR=$out
|
||||
export MKTEMPDIR=${coreutils}/bin
|
||||
export D8DIR=${v8}/bin
|
||||
export SWDIR=${sexpr_wasm_prototype}/bin
|
||||
make install
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "wasm runs WebAssembly from the command line";
|
||||
maintainers = with maintainers; [ proglodyte ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.asl20;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -39,6 +39,13 @@
|
|||
, includeSiteCustomize ? true
|
||||
, static ? stdenv.hostPlatform.isStatic
|
||||
, enableOptimizations ? false
|
||||
# enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility.
|
||||
# clang starts supporting `-fno-sematic-interposition` with version 10
|
||||
, enableNoSemanticInterposition ? (!stdenv.cc.isClang || (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "10"))
|
||||
# enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility.
|
||||
# enabling LTO on 32bit arch causes downstream packages to fail when linking
|
||||
# enabling LTO on *-darwin causes python3 to fail when linking.
|
||||
, enableLTO ? stdenv.is64bit && stdenv.isLinux
|
||||
, reproducibleBuild ? true
|
||||
, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
|
||||
}:
|
||||
|
|
@ -100,6 +107,8 @@ let
|
|||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
buildPackages.stdenv.cc
|
||||
pythonForBuild
|
||||
] ++ optionals (stdenv.cc.isClang && enableLTO) [
|
||||
stdenv.cc.cc.libllvm.out
|
||||
];
|
||||
|
||||
buildInputs = filter (p: p != null) ([
|
||||
|
|
@ -190,6 +199,10 @@ in with passthru; stdenv.mkDerivation {
|
|||
# (since it will do a futile invocation of gcc (!) to find
|
||||
# libuuid, slowing down program startup a lot).
|
||||
(./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch")
|
||||
# Make sure that the virtualenv activation scripts are
|
||||
# owner-writable, so venvs can be recreated without permission
|
||||
# errors.
|
||||
./virtualenv-permissions.patch
|
||||
] ++ optionals mimetypesSupport [
|
||||
# Make the mimetypes module refer to the right file
|
||||
./mimetypes.patch
|
||||
|
|
@ -274,6 +287,8 @@ in with passthru; stdenv.mkDerivation {
|
|||
"--with-system-ffi"
|
||||
] ++ optionals enableOptimizations [
|
||||
"--enable-optimizations"
|
||||
] ++ optionals enableLTO [
|
||||
"--with-lto"
|
||||
] ++ optionals (pythonOlder "3.7") [
|
||||
# This is unconditionally true starting in CPython 3.7.
|
||||
"--with-threads"
|
||||
|
|
@ -323,6 +338,17 @@ in with passthru; stdenv.mkDerivation {
|
|||
export DETERMINISTIC_BUILD=1;
|
||||
'' + optionalString stdenv.hostPlatform.isMusl ''
|
||||
export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
|
||||
'' +
|
||||
|
||||
# enableNoSemanticInterposition essentially sets that CFLAG -fno-semantic-interposition
|
||||
# which changes how symbols are looked up. This essentially means we can't override
|
||||
# libpython symbols via LD_PRELOAD anymore. This is common enough as every build
|
||||
# that uses --enable-optimizations has the same "issue".
|
||||
#
|
||||
# The Fedora wiki has a good article about their journey towards enabling this flag:
|
||||
# https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
|
||||
optionalString enableNoSemanticInterposition ''
|
||||
export CFLAGS_NODIST="-fno-semantic-interposition"
|
||||
'';
|
||||
|
||||
setupHook = python-setup-hook sitePackages;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
|
||||
index caa7285..ad666ac 100644
|
||||
--- a/Lib/venv/__init__.py
|
||||
+++ b/Lib/venv/__init__.py
|
||||
@@ -379,7 +379,7 @@ class EnvBuilder:
|
||||
if data is not None:
|
||||
with open(dstfile, 'wb') as f:
|
||||
f.write(data)
|
||||
- shutil.copymode(srcfile, dstfile)
|
||||
+ os.chmod(dstfile, 0o644)
|
||||
|
||||
|
||||
def create(env_dir, system_site_packages=False, clear=False,
|
||||
|
|
@ -118,14 +118,23 @@ with pkgs;
|
|||
};
|
||||
|
||||
sources = {
|
||||
"python38" = {
|
||||
python38 = {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "8";
|
||||
patch = "9";
|
||||
patch = "10";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "XjkfPsRdopVEGcqwvq79i+OIlepc4zV3w+wUlAxLlXI=";
|
||||
sha256 = "1n8rjb3jn0j8dvi1qn94rxayc9rh982d8wgkrjy41n1x15k4mwka";
|
||||
};
|
||||
python39 = {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "9";
|
||||
patch = "5";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -176,18 +185,11 @@ in {
|
|||
inherit passthruFun;
|
||||
} // sources.python38);
|
||||
|
||||
python39 = callPackage ./cpython {
|
||||
python39 = callPackage ./cpython ({
|
||||
self = python39;
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "9";
|
||||
patch = "4";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "Sw5mRKdvjfhkriSsUApRu/aL0Jj2oXPifTthzcqaoTQ=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
} // sources.python39);
|
||||
|
||||
python310 = callPackage ./cpython {
|
||||
self = python310;
|
||||
|
|
@ -195,9 +197,9 @@ in {
|
|||
major = "3";
|
||||
minor = "10";
|
||||
patch = "0";
|
||||
suffix = "a5";
|
||||
suffix = "b3";
|
||||
};
|
||||
sha256 = "BBjlfnA24hnx5rYwOyHnEfZM/Q/dsIlNjxnzev/8XU0=";
|
||||
sha256 = "05fc4mp2ysb372bzkwbn1b1z01bfldnaqig6rxmif58hs3aawrr2";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
@ -223,8 +225,9 @@ in {
|
|||
stripBytecode = true;
|
||||
includeSiteCustomize = false;
|
||||
enableOptimizations = false;
|
||||
enableLTO = false;
|
||||
mimetypesSupport = false;
|
||||
} // sources.python38)).overrideAttrs(old: {
|
||||
} // sources.python39)).overrideAttrs(old: {
|
||||
pname = "python3-minimal";
|
||||
meta = old.meta // {
|
||||
maintainers = [];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rascal-0.6.2";
|
||||
pname = "rascal";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://update.rascal-mpl.org/console/${name}.jar";
|
||||
url = "https://update.rascal-mpl.org/console/${pname}-${version}.jar";
|
||||
sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, unzip, xorg, libGLU, libGL }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "AntTweakBar-1.16";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "AntTweakBar";
|
||||
version = "1.16";
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ xorg.libX11 libGLU libGL ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip";
|
||||
url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_${lib.replaceStrings ["."] [""] version}.zip";
|
||||
sha256 = "0z3frxpzf54cjs07m6kg09p7nljhr7140f4pznwi7srwq4cvgkpv";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "NSPlist-713decf";
|
||||
pname = "NSPlist";
|
||||
version = "unstable-2017-04-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthewbauer";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "PlistCpp-11615d";
|
||||
pname = "PlistCpp";
|
||||
version = "unstable-11615d";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthewbauer";
|
||||
|
|
|
|||
|
|
@ -74,18 +74,18 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
# Fix drops of keyboard events for SDL_EnableUNICODE
|
||||
(fetchpatch {
|
||||
url = "http://hg.libsdl.org/SDL/raw-rev/0aade9c0203f";
|
||||
sha256 = "1y9izncjlqvk1mkz1pkl9lrk9s452cmg2izjjlqqrhbn8279xy50";
|
||||
url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch";
|
||||
sha256 = "0g458iv6pp9sikdch6ms8svz60lf5ks2q5wgid8s9rydhk98lpp5";
|
||||
})
|
||||
# Ignore insane joystick axis events
|
||||
(fetchpatch {
|
||||
url = "http://hg.libsdl.org/SDL/raw-rev/95abff7adcc2";
|
||||
sha256 = "0i8x0kx0pw12ld5bfxhyzs466y3c0n9dscw1ijhq1b96r72xyhqq";
|
||||
url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch";
|
||||
sha256 = "1b3473sawfdbkkxaqf1hg0vn37yk8hf655jhnjwdk296z4gclazh";
|
||||
})
|
||||
# https://bugzilla.libsdl.org/show_bug.cgi?id=1769
|
||||
(fetchpatch {
|
||||
url = "http://hg.libsdl.org/SDL/raw-rev/91ad7b43317a";
|
||||
sha256 = "15g537vbl2my4mfrjxfkcx9ri6bk2gjvaqj650rjdxwk2nkdkn4b";
|
||||
url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch";
|
||||
sha256 = "1k7y57b1zy5afib1g7w3in36n8cswbcrzdbrjpn5cb105rnb9vmp";
|
||||
})
|
||||
# Workaround X11 bug to allow changing gamma
|
||||
# Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
|
||||
|
|
@ -97,12 +97,12 @@ stdenv.mkDerivation rec {
|
|||
# Fix a build failure on OS X Mavericks
|
||||
# Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
|
||||
(fetchpatch {
|
||||
url = "http://hg.libsdl.org/SDL/raw-rev/e9466ead70e5";
|
||||
sha256 = "0mpwdi09h89df2wxqw87m1rdz7pr46k0w6alk691k8kwv970z6pl";
|
||||
url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch";
|
||||
sha256 = "0ckwling2ad27c9vxgp97ndjd098d6zbrydza8b9l77k8airj98c";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87";
|
||||
sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv";
|
||||
url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch";
|
||||
sha256 = "1by16firaxyr0hjvn35whsgcmq6bl0nwhnpjf75grjzsw9qvwyia";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-2887";
|
||||
url = "https://hg.libsdl.org/SDL_image/raw-diff/318484db0705/IMG_xcf.c";
|
||||
sha256 = "140dyszz9hkpgwjdiwp1b7jdd8f8l5d862xdaf3ml4cimga1h5kv";
|
||||
url = "https://github.com/libsdl-org/SDL_image/commit/e7723676825cd2b2ffef3316ec1879d7726618f2.patch";
|
||||
includes = [ "IMG_xcf.c" ];
|
||||
sha256 = "174ka2r95i29nlshzgp6x5vc68v7pi8lhzf33and2b1ms49g4jb7";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
, freetype, SDL, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "agg-2.5";
|
||||
pname = "agg";
|
||||
version = "2.5";
|
||||
src = fetchurl {
|
||||
url = "http://www.antigrain.com/${name}.tar.gz";
|
||||
url = "https://www.antigrain.com/${pname}-${version}.tar.gz";
|
||||
sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{lib, stdenv, fetchurl, unzip}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "amrnb-11.0.0.0";
|
||||
pname = "amrnb";
|
||||
version = "11.0.0.0";
|
||||
srcAmr = fetchurl {
|
||||
url = "http://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip";
|
||||
url = "https://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip";
|
||||
sha256 = "1wf8ih0hk7w20vdlnw7jb7w73v15hbxgbvmq4wq7h2ghn0j8ppr3";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@
|
|||
, pngquant
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "appstream-glib-0.7.18";
|
||||
pname = "appstream-glib";
|
||||
version = "0.7.18";
|
||||
|
||||
outputs = [ "out" "dev" "man" "installedTests" ];
|
||||
outputBin = "dev";
|
||||
|
|
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "hughsie";
|
||||
repo = "appstream-glib";
|
||||
rev = lib.replaceStrings [ "." "-" ] [ "_" "_" ] name;
|
||||
rev = "${lib.replaceStrings ["-"] ["_"] pname}-${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,10 +13,11 @@ assert ldapSupport -> openldap != null;
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apr-util-1.6.1";
|
||||
pname = "apr-util";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/apr/${name}.tar.bz2";
|
||||
url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0nq3s1yn13vplgl6qfm09f7n0wm08malff9s59bqf9nid9xjzqfk";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apr-1.7.0";
|
||||
pname = "apr";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/apr/${name}.tar.bz2";
|
||||
url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,11 +19,12 @@ let
|
|||
sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "argp-standalone-1.3";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "argp-standalone";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz";
|
||||
url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-${version}.tar.gz";
|
||||
sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "at-spi2-core";
|
||||
version = "2.40.1";
|
||||
version = "2.40.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0miqn8531czy9ffpxnsxsnk12w3d6sqjda3qyix8kns2xsjf6rlz";
|
||||
sha256 = "RNwXr5Q7D9GWxhweA7bBZpYDhcrpbMtelb3v/7aEn5g=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
|
||||
, fixDarwinDylibNames, gobject-introspection, gnome
|
||||
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -18,9 +17,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config gettext glib ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
|
||||
++ lib.optional withIntrospection gobject-introspection;
|
||||
nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# Required by atk.pc
|
||||
|
|
@ -34,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dintrospection=${lib.boolToString withIntrospection}"
|
||||
"-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -6,10 +6,11 @@
|
|||
# files.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "attr-2.4.48";
|
||||
pname = "attr";
|
||||
version = "2.4.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/attr/${name}.tar.gz";
|
||||
url = "mirror://savannah/attr/${pname}-${version}.tar.gz";
|
||||
sha256 = "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config }:
|
||||
|
||||
let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "boolstuff-0.1.16";
|
||||
pname = "boolstuff";
|
||||
version = "0.1.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${baseurl}/${name}.tar.gz";
|
||||
url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
|
||||
sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0";
|
||||
};
|
||||
|
||||
|
|
@ -14,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "Library for operations on boolean expression binary trees";
|
||||
homepage = "${baseurl}/boolstuff.html";
|
||||
homepage = "https://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html";
|
||||
license = "GPL";
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = lib.platforms.all;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, bison }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "buddy-2.4";
|
||||
pname = "buddy";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/buddy/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/buddy/${pname}-${version}.tar.gz";
|
||||
sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chmlib-0.40a";
|
||||
pname = "chmlib";
|
||||
version = "0.40a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jedwing";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ fetchurl, lib, stdenv, ppl, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cloog-ppl-0.15.11";
|
||||
pname = "cloog-ppl";
|
||||
version = "0.15.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gcc/infrastructure/${name}.tar.gz";
|
||||
url = "mirror://gcc/infrastructure/${pname}-${version}.tar.gz";
|
||||
sha256 = "0psdm0bn5gx60glfh955x5b3b23zqrd92idmjr0b00dlnb839mkw";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ fetchurl, lib, stdenv, gmp, isl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cloog-0.18.4";
|
||||
pname = "cloog";
|
||||
version = "0.18.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz";
|
||||
url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${pname}-${version}.tar.gz";
|
||||
sha256 = "03km1aqaiy3sbqc2f046ms9x0mlmacxlvs5rxsvjj8nf20vxynij";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,10 @@ let
|
|||
windir = "/cygdrive/c/WINDOWS";
|
||||
in
|
||||
{
|
||||
pkg = stdenv.mkDerivation {
|
||||
name = "dotnetfx-3.5";
|
||||
src = "${windir}/Microsoft.NET/Framework/v3.5";
|
||||
pkg = stdenv.mkDerivation rec {
|
||||
pname = "dotnetfx";
|
||||
version = "3.5";
|
||||
src = "${windir}/Microsoft.NET/Framework/v${version}";
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
ln -s $src/MSBuild.exe $out/bin
|
||||
|
|
|
|||
|
|
@ -4,9 +4,10 @@ let
|
|||
windir = "/cygdrive/c/WINDOWS";
|
||||
in
|
||||
{
|
||||
pkg = stdenv.mkDerivation {
|
||||
name = "dotnetfx-4.0";
|
||||
src = "${windir}/Microsoft.NET/Framework/v4.0.30319";
|
||||
pkg = stdenv.mkDerivation rec {
|
||||
pname = "dotnetfx";
|
||||
version = "4.0.30319";
|
||||
src = "${windir}/Microsoft.NET/Framework/v${version}";
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
ln -s $src/MSBuild.exe $out/bin
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "enet-1.3.17";
|
||||
pname = "enet";
|
||||
version = "1.3.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://enet.bespin.org/download/${name}.tar.gz";
|
||||
url = "http://enet.bespin.org/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,18 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "eventlog-0.2.12";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eventlog";
|
||||
version = "0.2.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.balabit.com/downloads/files/eventlog/0.2/eventlog_0.2.12.tar.gz";
|
||||
sha256 = "494dac8e01dc5ce323df2ad554d94874938dab51aa025987677b2bc6906a9c66";
|
||||
src = fetchFromGitHub {
|
||||
owner = "balabit";
|
||||
repo = "eventlog";
|
||||
rev = "a5c19163ba131f79452c6dfe4e31c2b4ce4be741";
|
||||
sha256 = "0a2za3hs7wzy14z7mfgldy1r9xdlqv97yli9wlm8xldr0amsx869";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = {
|
||||
description = "Syslog event logger library";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -27,6 +27,13 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs ./configure ./run.sh ./test-driver-wrapper.sh
|
||||
'';
|
||||
|
||||
# CMake files incorrectly calculate library path from dev prefix
|
||||
# https://github.com/libexpat/libexpat/issues/501
|
||||
postFixup = ''
|
||||
substituteInPlace $dev/lib/cmake/expat-${version}/expat-noconfig.cmake \
|
||||
--replace "$"'{_IMPORT_PREFIX}' $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://libexpat.github.io/";
|
||||
description = "A stream-oriented XML parser library written in C";
|
||||
|
|
|
|||
|
|
@ -14,12 +14,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "farstream-0.2.8";
|
||||
pname = "farstream";
|
||||
version = "0.2.8";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
|
||||
url = "https://www.freedesktop.org/software/farstream/releases/farstream/${pname}-${version}.tar.gz";
|
||||
sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, openssl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "fastpbkdf2-1.0.0";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fastpbkdf2";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ctz";
|
||||
repo = "fastpbkdf2";
|
||||
rev = "v1.0.0";
|
||||
rev = "v${version}";
|
||||
sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
# Darwin frameworks
|
||||
, Cocoa, CoreMedia, VideoToolbox
|
||||
, stdenv, lib
|
||||
, fetchpatch
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
|
|
@ -11,7 +12,18 @@ callPackage ./generic.nix (rec {
|
|||
sha256 = "03kxc29y8190k4y8s8qdpsghlbpmchv1m8iqygq2qn0vfm4ka2a2";
|
||||
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
|
||||
|
||||
/* Work around https://trac.ffmpeg.org/ticket/9242 */
|
||||
patches = lib.optional stdenv.isDarwin
|
||||
./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch;
|
||||
patches = [
|
||||
# Fix incorrect segment length in HLS child playlist with fmp4 segment format
|
||||
# FIXME remove in version 4.5
|
||||
# https://trac.ffmpeg.org/ticket/9193
|
||||
# https://trac.ffmpeg.org/ticket/9205
|
||||
(fetchpatch {
|
||||
name = "ffmpeg_fix_incorrect_segment_length_in_hls.patch";
|
||||
url = "https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=59032494e81a1a65c0b960aaae7ec4c2cc9db35a";
|
||||
sha256 = "03zz1lw51kkc3g3vh47xa5hfiz3g3g1rbrll3kcnslvwylmrqmy3";
|
||||
})
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Work around https://trac.ffmpeg.org/ticket/9242
|
||||
./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch
|
||||
];
|
||||
} // args)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, stdenv
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
|
|
@ -15,21 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fontconfig";
|
||||
version = "2.13.93";
|
||||
version = "2.13.94";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://fontconfig.org/release/${pname}-${version}.tar.xz";
|
||||
sha256 = "1850q4k80yxma5g3yxkvyv8i5a3xqzswwml8gjy3jmywx8qqd5pa";
|
||||
url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz";
|
||||
sha256 = "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with no docbook2html.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/60ce9b695ee9d1ac514a61f562e210d3278ba605.patch";
|
||||
sha256 = "0hfd2jdvsgackdp29dyzf5b1277pnbacihxqh9vdn63rr932ipra";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{stdenv, fetchurl, apacheAnt, unzip, sharutils, lib, jdk}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "freetts-1.2.2";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetts";
|
||||
version = "1.2.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip";
|
||||
url = "mirror://sourceforge/freetts/${pname}-${version}-src.zip";
|
||||
sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7";
|
||||
};
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "funambol-client-cpp-9.0.0";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "funambol-client-cpp";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/funambol/funambol-client-sdk-9.0.0.zip";
|
||||
url = "mirror://sourceforge/funambol/funambol-client-sdk-${version}.zip";
|
||||
sha256 = "1667gahz30i5r8kbv7w415z0hbgm6f6pln1137l5skapi1if6r73";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ lib, stdenv, fetchurl, libusb-compat-0_1 }:
|
||||
stdenv.mkDerivation {
|
||||
name = "garmintools-0.10";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "garmintools";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz";
|
||||
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/${pname}-${version}.tar.gz";
|
||||
sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz";
|
||||
};
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glew-2.2.0";
|
||||
pname = "glew";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/glew/${name}.tgz";
|
||||
url = "mirror://sourceforge/glew/${pname}-${version}.tgz";
|
||||
sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l";
|
||||
};
|
||||
|
||||
|
|
|
|||
Binary file not shown.
BIN
pkgs/development/libraries/glibc/2.33-master.patch.gz
Normal file
BIN
pkgs/development/libraries/glibc/2.33-master.patch.gz
Normal file
Binary file not shown.
|
|
@ -41,9 +41,9 @@
|
|||
} @ args:
|
||||
|
||||
let
|
||||
version = "2.32";
|
||||
patchSuffix = "-48";
|
||||
sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
|
||||
version = "2.33";
|
||||
patchSuffix = "-47";
|
||||
sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
|
||||
in
|
||||
|
||||
assert withLinuxHeaders -> linuxHeaders != null;
|
||||
|
|
@ -60,14 +60,14 @@ stdenv.mkDerivation ({
|
|||
patches =
|
||||
[
|
||||
/* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
|
||||
$ git fetch --all -p && git checkout origin/release/2.32/master && git describe
|
||||
glibc-2.32-48-g16949aeaa0
|
||||
$ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz
|
||||
$ git fetch --all -p && git checkout origin/release/2.33/master && git describe
|
||||
glibc-2.33-47-gb5711025bc
|
||||
$ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz
|
||||
|
||||
To compare the archive contents zdiff can be used.
|
||||
$ zdiff -u 2.32-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz
|
||||
$ zdiff -u 2.33-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz
|
||||
*/
|
||||
./2.32-master.patch.gz
|
||||
./2.33-master.patch.gz
|
||||
|
||||
/* Allow NixOS and Nix to handle the locale-archive. */
|
||||
./nix-locale-archive.patch
|
||||
|
|
@ -153,10 +153,15 @@ stdenv.mkDerivation ({
|
|||
"--enable-add-ons"
|
||||
"--sysconfdir=/etc"
|
||||
"--enable-stackguard-randomization"
|
||||
"--enable-static-pie"
|
||||
"--enable-bind-now"
|
||||
(lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include")
|
||||
(lib.enableFeature profilingLibraries "profile")
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isAarch64) [
|
||||
# This feature is currently supported on
|
||||
# i386, x86_64 and x32 with binutils 2.29 or later,
|
||||
# and on aarch64 with binutils 2.30 or later.
|
||||
# https://sourceware.org/glibc/wiki/PortStatus
|
||||
"--enable-static-pie"
|
||||
] ++ lib.optionals withLinuxHeaders [
|
||||
"--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
|
|
|
|||
|
|
@ -1,19 +1,8 @@
|
|||
diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c
|
||||
--- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500
|
||||
+++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500
|
||||
@@ -51,7 +51,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef LD_SO_CONF
|
||||
-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
|
||||
+# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
|
||||
#endif
|
||||
|
||||
/* Get libc version number. */
|
||||
diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile
|
||||
--- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500
|
||||
+++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500
|
||||
@@ -559,13 +559,13 @@
|
||||
diff --git a/elf/Makefile b/elf/Makefile
|
||||
index 5d666b1b..a5017e9c 100644
|
||||
--- a/elf/Makefile
|
||||
+++ b/elf/Makefile
|
||||
@@ -669,14 +669,14 @@ $(objpfx)sln: $(sln-modules:%=$(objpfx)%.o)
|
||||
|
||||
$(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
|
||||
|
||||
|
|
@ -26,16 +15,45 @@ diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile
|
|||
-CFLAGS-dl-cache.c += $(SYSCONF-FLAGS)
|
||||
-CFLAGS-cache.c += $(SYSCONF-FLAGS)
|
||||
-CFLAGS-rtld.c += $(SYSCONF-FLAGS)
|
||||
-CFLAGS-dl-usage.c += $(SYSCONF-FLAGS) \
|
||||
+CFLAGS-dl-cache.c += $(PREFIX-FLAGS)
|
||||
+CFLAGS-cache.c += $(PREFIX-FLAGS)
|
||||
+CFLAGS-rtld.c += $(PREFIX-FLAGS)
|
||||
+CFLAGS-dl-usage.c += $(PREFIX-FLAGS) \
|
||||
-D'RTLD="$(rtlddir)/$(rtld-installed-name)"'
|
||||
|
||||
cpp-srcs-left := $(all-rtld-routines:=.os)
|
||||
lib := rtld
|
||||
diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h
|
||||
--- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500
|
||||
+++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500
|
||||
@@ -28,7 +28,7 @@
|
||||
diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c
|
||||
index bef224b3..8e166b12 100644
|
||||
--- a/elf/dl-diagnostics.c
|
||||
+++ b/elf/dl-diagnostics.c
|
||||
@@ -205,7 +205,7 @@ print_paths (void)
|
||||
{
|
||||
_dl_diagnostics_print_labeled_string ("path.prefix", PREFIX);
|
||||
_dl_diagnostics_print_labeled_string ("path.rtld", RTLD);
|
||||
- _dl_diagnostics_print_labeled_string ("path.sysconfdir", SYSCONFDIR);
|
||||
+ _dl_diagnostics_print_labeled_string ("path.sysconfdir", PREFIX "/etc");
|
||||
|
||||
unsigned int index = 0;
|
||||
static const char *system_dirs = SYSTEM_DIRS "\0";
|
||||
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
|
||||
index 28ed637a..6f07b79a 100644
|
||||
--- a/elf/ldconfig.c
|
||||
+++ b/elf/ldconfig.c
|
||||
@@ -57,7 +57,7 @@
|
||||
#define TLS_HWCAP_BIT 63
|
||||
|
||||
#ifndef LD_SO_CONF
|
||||
-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
|
||||
+# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
|
||||
#endif
|
||||
|
||||
/* Get libc version number. */
|
||||
diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h
|
||||
index 964d50a4..2224d651 100644
|
||||
--- a/sysdeps/generic/dl-cache.h
|
||||
+++ b/sysdeps/generic/dl-cache.h
|
||||
@@ -35,7 +35,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef LD_SO_CACHE
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gnet-2.0.8";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnet";
|
||||
version = "2.0.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GNOME";
|
||||
repo = "gnet";
|
||||
rev = "GNET_2_0_8";
|
||||
rev = "GNET_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpgme";
|
||||
version = "1.15.1";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1bg13l5s8x9p1v0jyv29n84bay27pflindpzjsc9gj7i4wdkrg7f";
|
||||
sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -85,6 +85,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = with licenses; [ lgpl21Plus gpl3Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ fetchurl, lib, stdenv, libidn, libkrb5 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gsasl-1.10.0";
|
||||
pname = "gsasl";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gsasl/${name}.tar.gz";
|
||||
url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gsl-2.6";
|
||||
pname = "gsl";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gsl/${name}.tar.gz";
|
||||
sha256 = "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp";
|
||||
url = "mirror://gnu/gsl/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-77vzeF2g5TA4vnkHUAYotGYVLbw8FzqH3hteui4jYCs=";
|
||||
};
|
||||
|
||||
preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
|
||||
|
|
|
|||
|
|
@ -292,6 +292,8 @@ stdenv.mkDerivation rec {
|
|||
# `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
|
||||
# but its meson build system does not declare the dependency.
|
||||
"-Dapplemedia=disabled"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dintrospection=disabled"
|
||||
];
|
||||
|
||||
# Argument list too long
|
||||
|
|
|
|||
|
|
@ -105,6 +105,8 @@ stdenv.mkDerivation rec {
|
|||
"-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
|
||||
# See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
|
||||
"-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dintrospection=disabled"
|
||||
]
|
||||
++ lib.optional (!enableX11) "-Dx11=disabled"
|
||||
# TODO How to disable Wayland?
|
||||
|
|
|
|||
|
|
@ -76,6 +76,8 @@ stdenv.mkDerivation rec {
|
|||
"-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dintrospection=disabled"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it.
|
||||
"-Dlibunwind=disabled"
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dintrospection=disabled"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dintrospection=disabled"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
|
|||
mesonFlags = [
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dintrospection=disabled"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue