Merge pull request #61657 from NixOS/staging-next

Staging next
This commit is contained in:
Frederik Rietdijk 2019-05-29 08:38:21 +00:00 committed by GitHub
commit 97aba37876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
86 changed files with 805 additions and 416 deletions

View File

@ -594,6 +594,7 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll
* `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
* `disabled` ? false: If `true`, package is not build for the particular Python interpreter version.
* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs.
* `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped programs.
* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`.
* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
@ -756,6 +757,7 @@ specified packages in its path.
* `extraLibs`: List of packages installed inside the environment.
* `postBuild`: Shell command executed after the build of environment.
* `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`).
* `permitUserSite`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped binaries in the environment.
#### `python.withPackages` function

View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch
++ [./fix_private_keyword.patch];
buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook;
nativeBuildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook;
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [
Carbon
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''\n
preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 '';
cp ${gnu-config}/config.sub configure.sub
cp ${gnu-config}/config.guess configure.guess
'';

View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "8.1.0675";
version = "8.1.1234";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
sha256 = "00nlh8f2rf0af3n434s0lp6idxlg4l7mi1lrlbz0xld9dsrzdmas";
sha256 = "1ywrgciwqh1kg93kfq54zh0gdxwzgy1h49wsjdsl6s4mfscmpwng";
};
enableParallelBuilding = true;

View File

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "glabels-${version}";
pname = "glabels";
version = "3.4.1";
src = fetchurl {
url = "mirror://gnome/sources/glabels/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q";
};
@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
meta = with stdenv.lib; {
description = "Create labels and business cards";
homepage = https://glabels.org/;

View File

@ -4,14 +4,12 @@
libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison,
flex, wrapGAppsHook, shared-mime-info }:
let
stdenv.mkDerivation rec {
pname = "gthumb";
version = "3.6.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rjb0bsjhn7nyl5jyjgrypvr6qdr9dc2g586j3lzan96a2vnpgy9";
};
@ -40,7 +38,7 @@ in stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/gthumb;
homepage = "https://wiki.gnome.org/Apps/Gthumb";
description = "Image browser and viewer for GNOME";
platforms = platforms.linux;
license = licenses.gpl2;

View File

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk
'';
makeFlags = [ "CC:=$(CC)" ];
meta = with stdenv.lib; {
description = "A generic, highly customizable, and efficient menu for the X Window System";
homepage = https://tools.suckless.org/dmenu;

View File

@ -4,10 +4,10 @@
let
gtkglarea = stdenv.mkDerivation rec {
name = "gtkglarea-${version}";
pname = "gtkglarea";
version = "2.1.0";
src = fetchurl {
url = "mirror://gnome/sources/gtkglarea/2.1/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf";
};
nativeBuildInputs = [ pkgconfig ];
@ -16,13 +16,13 @@ let
};
in stdenv.mkDerivation rec {
name = "fsv-${version}";
pname = "fsv";
version = "0.9-1";
src = fetchFromGitHub {
owner = "mcuelenaere";
repo = "fsv";
rev = name;
rev = "${pname}-${version}";
sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj";
};

View File

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "pdfmod-${version}";
pname = "pdfmod";
version = "0.9.1";
src = fetchurl {
url = "mirror://gnome/sources/pdfmod/0.9/pdfmod-${version}.tar.bz2";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9";
};
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/PdfMod;
homepage = "https://wiki.gnome.org/Attic/PdfMod";
description = "A simple application for modifying PDF documents";
platforms = platforms.all;
maintainers = with maintainers; [ obadz ];

View File

@ -5,10 +5,11 @@
, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
stdenv.mkDerivation rec {
name = "ekiga-4.0.1";
pname = "ekiga";
version = "4.0.1";
src = fetchurl {
url = "mirror://gnome/sources/ekiga/4.0/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b";
};
@ -52,17 +53,21 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
description = "VOIP/Videoconferencing app with full SIP and H.323 support";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
passthru = {
updateInfo = {
downloadPage = "mirror://gnome/sources/ekiga";
};
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
description = "VOIP/Videoconferencing app with full SIP and H.323 support";
homepage = "https://www.ekiga.org/";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
}

View File

@ -1,12 +1,20 @@
{ stdenv, fetchurl, itstool, libxml2, gettext }:
{ stdenv, fetchurl, itstool, libxml2, gettext, gnome3 }:
stdenv.mkDerivation {
name = "gnome-user-docs-3.2.2";
stdenv.mkDerivation rec {
pname = "gnome-user-docs";
version = "3.2.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-user-docs/3.2/gnome-user-docs-3.2.2.tar.xz;
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj";
};
nativeBuildInputs = [ itstool libxml2 gettext ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "gnome3.gnome-user-docs";
};
};
}

View File

@ -38,38 +38,25 @@ let
preBuild = "patchShebangs scripts";
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp build/*.ttf $out/share/fonts/truetype/
'';
installPhase = "install -m444 -Dt $out/share/fonts/truetype build/*.ttf";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1cxprzsr826d888ha4zxx28i9jfj1k74q9kfv3v2rf603460iha9";
inherit meta;
};
minimal = stdenv.mkDerivation {
name = "dejavu-fonts-minimal-${version}";
buildCommand = ''
install -D ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf $out/share/fonts/truetype/DejaVuSans.ttf
install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0ybsynp9904vmd3qv5b438swhx43m5q6gfih3i32iw33rks8nkpj";
inherit meta;
};
in stdenv.mkDerivation {
name = "dejavu-fonts-${version}";
buildCommand = ''
mkdir -p $out/share/fonts/truetype
cp ${full-ttf}/share/fonts/truetype/*.ttf $out/share/fonts/truetype/
install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/*.ttf
ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "15l93xm9mg2ziaxv4nqy2a4jaz54d05xf0hfz1h84bclzb882llh";
inherit meta;
passthru.minimal = minimal;
passthru = { inherit minimal full-ttf; };
}

View File

@ -14,20 +14,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ fontforge ];
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp -v $(find . -name '*.ttf') $out/share/fonts/truetype
mkdir -p $out/share/fonts/opentype
cp -v $(find . -name '*.otf') $out/share/fonts/opentype
mkdir -p "$out/doc/${name}"
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \;
install -m444 -Dt $out/share/doc/${name} LICENSE README
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "18brmw0h4hjq1m2l0abwc3zmib4rnfalpywdk68djm711zldxr76";
meta = with stdenv.lib; {
description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek";
longDescription = ''
@ -57,6 +48,5 @@ stdenv.mkDerivation rec {
license = licenses.ofl;
homepage = https://github.com/MihailJP/Inconsolata-LGC;
maintainers = with maintainers; [ avnik rht ];
platforms = platforms.linux;
};
}

View File

@ -31,23 +31,16 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
mkdir -p $out/share/fonts/{opentype,truetype,type1}/public
mkdir -p $out/share/texmf/fonts/{enc,map}
cp *.otf $out/share/fonts/opentype/public
cp *.ttf $out/share/fonts/truetype/public
cp *.pfb $out/share/fonts/type1/public
cp *.enc $out/share/texmf/fonts/enc
cp *.map $out/share/texmf/fonts/map
install -m444 -Dt $out/share/fonts/opentype/public *.otf
install -m444 -Dt $out/share/fonts/truetype/public *.ttf
install -m444 -Dt $out/share/fonts/type1/public *.pfb
install -m444 -Dt $out/share/texmf/fonts/enc *.enc
install -m444 -Dt $out/share/texmf/fonts/map *.map
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1mj0j0hkp8pn7jcs4pvcan6whba60bfd671g3vhx3s9kxwf7xjvr";
meta = with stdenv.lib; {
description = "Linux Libertine Fonts";
homepage = http://linuxlibertine.sf.net;
platforms = platforms.linux;
maintainers = [ maintainers.volth ];
license = licenses.ofl;
};

View File

@ -24,15 +24,10 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
mkdir -p $out/share/{doc,fonts/truetype}
cp -va _release/* $out/share/fonts/truetype
cp -va Readme.md $out/share/doc
install -m444 -Dt $out/share/fonts/truetype _release/*
install -m444 -Dt $out/share/doc Readme.md
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0lbipgygiva3gg1pqw07phpnnf0s6ka9vqdk1pw7bkybjw3f7wzm";
meta = with stdenv.lib; {
homepage = http://larsenwork.com/monoid;
description = "Customisable coding font with alternates, ligatures and contextual positioning";

View File

@ -4,7 +4,7 @@ let
inherit (python3.pkgs) fonttools;
common =
{ version, repo, sha256, nativeBuildInputs, postPatch ? null, outputHash }:
{ version, repo, sha256, nativeBuildInputs, postPatch ? null }:
stdenv.mkDerivation rec {
pname = "liberation-fonts";
inherit version;
@ -18,17 +18,15 @@ let
inherit nativeBuildInputs postPatch;
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
mkdir -p "$out/share/doc/${pname}-${version}"
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${pname}-${version}" || true
install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true
install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true
install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true
install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true
install -m444 -Dt $out/share/doc/${pname}-${version} README || true
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
inherit outputHash;
meta = with stdenv.lib; {
description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
longDescription = ''
@ -48,7 +46,6 @@ let
maintainers = [
maintainers.raskin
];
platforms = platforms.unix;
};
};
@ -58,7 +55,6 @@ in {
version = "1.07.5";
nativeBuildInputs = [ fontforge ];
sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
outputHash = "16jn17p22z2vip58aza2dfg1ri31ki6z3hsnmidfqfi7v8k83vq4";
};
liberation_ttf_v2 = common rec {
repo = "liberation-fonts";
@ -70,6 +66,5 @@ in {
'font = ttLib.TTFont(fontfile, recalcTimestamp=False)'
'';
sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa";
outputHash = "14c0c5n4vzd5y0hf9jkh48h12kkd8hlg94npbmv41j449g6wv6vn";
};
}

View File

@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
mkdir -p $out/share/fonts/rictydiminished-with-firacode
cp *.ttf $out/share/fonts/rictydiminished-with-firacode
install -m444 -Dt $out/share/fonts/rictydiminished-with-firacode *.ttf
'';
nativeBuildInputs = [
@ -35,10 +34,6 @@ stdenv.mkDerivation rec {
]))
];
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "09ldviapljn4bb1mcxap2pkz7cq3wr2k2qialbnav5y7ii82acd4";
meta = with stdenv.lib; {
homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode;
description = "The best Japanese programming font meets the awesone ligatures of Firacode";

View File

@ -1,9 +1,12 @@
{ lib, fetchzip }:
{ stdenv, fetchzip }:
let
pname = "ttf-bitstream-vera";
version = "1.10";
in
fetchzip rec {
name = "${pname}-${version}";
fetchzip {
name = "ttf-bitstream-vera-1.10";
url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
postFetch = ''
tar -xjf $downloadedFile --strip-components=1

View File

@ -8,25 +8,19 @@ stdenv.mkDerivation rec {
url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
};
nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
SDL SDL_image];
preConfigure = ''
patchShebangs .
'';
installPhase = ''
mkdir -p "$out/share/fonts"/{truetype,opentype,web,svg}
cp *.hex "$out/share/fonts/"
cp *.pcf "$out/share/fonts/"
cp *.ttf "$out/share/fonts/truetype"
cp *.otf "$out/share/fonts/opentype"
cp *.svg "$out/share/fonts/svg"
cp *.woff "$out/share/fonts/web"
install -m444 -Dt $out/share/fonts *.hex *.pcf
install -m444 -Dt $out/share/fonts/truetype *.ttf
install -m444 -Dt $out/share/fonts/opentype *.otf
install -m444 -Dt $out/share/fonts/svg *.svg
install -m444 -Dt $out/share/fonts/web *.woff
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "03zvczdka665zcyf9fjrnx434mwpr5q8396j34kjmc67w7nhc49r";
meta = {
inherit version;
description = ''Bitmapped character-art-friendly Unicode fonts'';
@ -34,7 +28,6 @@ stdenv.mkDerivation rec {
# version. The reduced version is public domain.
license = http://unifoundry.com/LICENSE.txt;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = http://pelulamu.net/unscii/;
};
}

View File

@ -22,14 +22,9 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
mkdir -p $out/share/fonts/opentype
cp *.otf $out/share/fonts/opentype
install -m444 -Dt $out/share/fonts/opentype *.otf
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "00xycmb9ka67j5s66nkng53y8q6362igisxz04zb58r2717jk50m";
meta = with stdenv.lib; {
homepage = https://github.com/khaledhosny/xits-math;
description = "OpenType implementation of STIX fonts with math support";

View File

@ -2,10 +2,11 @@
, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
stdenv.mkDerivation rec {
name = "gnome-nettool-3.8.1";
pname = "gnome-nettool";
version = "3.8.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
};
@ -17,8 +18,16 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ nmap inetutils ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "gnom3.gnome-nettool";
versionPolicy = "none";
};
};
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/gnome-network;
homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool";
description = "A collection of networking tools";
maintainers = gnome3.maintainers;
license = licenses.gpl2;

View File

@ -8,11 +8,11 @@ let
pname = "tracker-miners";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1xbjbd994jxhdan7227kzdnmiblfy0f1vnsws5l809ydgk58f0qr";
sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw";
};
nativeBuildInputs = [

View File

@ -6,7 +6,7 @@
let
pname = "tracker";
version = "2.2.1";
version = "2.2.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1zx2mlnsv6clgh0j50f0b94b7cf1al1j7bkcz8cr31a0fkkgkkhc";
sha256 = "1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6";
};
nativeBuildInputs = [

View File

@ -111,8 +111,6 @@ stdenv.mkDerivation rec {
cd ..
'';
dontStrip = true;
installPhase = ''
cd dmd
mkdir $out

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "orc-0.4.28";
name = "orc-0.4.29";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
sha256 = "bfcd7c6563b05672386c4eedfc4c0d4a0a12b4b4775b74ec6deb88fc2bcd83ce";
sha256 = "1cisbbn69p9c8vikn0nin14q0zscby5m8cyvzxyw2pjb2kwh32ag";
};
outputs = [ "out" "dev" ];

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook
, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll
, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, gnome3
}:
let

View File

@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchurl, buildPackages, callPackage
{ config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage
, enableThreading ? stdenv ? glibc, makeWrapper
}:
@ -23,7 +23,7 @@ let
libcLib = lib.getLib libc;
crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform;
common = { self, version, sha256 }: stdenv.mkDerivation (rec {
common = { perl, buildPerl, version, sha256 }: stdenv.mkDerivation (rec {
inherit version;
name = "perl-${version}";
@ -106,14 +106,14 @@ let
setupHook = ./setup-hook.sh;
passthru = rec {
interpreter = "${self}/bin/perl";
interpreter = "${perl}/bin/perl";
libPrefix = "lib/perl5/site_perl";
pkgs = callPackage ../../../top-level/perl-packages.nix {
perl = self;
inherit perl buildPerl;
overrides = config.perlPackageOverrides or (p: {}); # TODO: (self: super: {}) like in python
};
buildEnv = callPackage ./wrapper.nix {
perl = self;
inherit perl;
inherit (pkgs) requiredPerlModules;
};
withPackages = f: buildEnv.override { extraLibs = f pkgs; };
@ -190,17 +190,19 @@ let
# TODO merge setup hooks
setupHook = ./setup-hook-cross.sh;
});
in rec {
in {
# the latest Maint version
perl528 = common {
self = perl528;
perl = pkgs.perl528;
buildPerl = buildPackages.perl528;
version = "5.28.2";
sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da";
};
# the latest Devel version
perldevel = common {
self = perldevel;
perl = pkgs.perldevel;
buildPerl = buildPackages.perldevel;
version = "5.29.9";
sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm";
};

View File

@ -49,6 +49,9 @@
# Skip wrapping of python programs altogether
, dontWrapPythonPrograms ? false
# Skip setting the PYTHONNOUSERSITE environment variable in wrapped programs
, permitUserSite ? false
# Remove bytecode from bin folder.
# When a Python script has the extension `.py`, bytecode is generated
# Typically, executables in bin have no extension, so no bytecode is generated.

View File

@ -73,9 +73,12 @@ wrapPythonProgramsIn() {
# (see pkgs/build-support/setup-hooks/make-wrapper.sh)
local -a wrap_args=("$f"
--prefix PATH ':' "$program_PATH"
--set PYTHONNOUSERSITE "true"
)
if [ -z "$permitUserSite" ]; then
wrap_args+=(--set PYTHONNOUSERSITE "true")
fi
# Add any additional arguments provided by makeWrapperArgs
# argument to buildPythonPackage.
local -a user_args="($makeWrapperArgs)"

View File

@ -3,6 +3,7 @@
, extraOutputsToInstall ? []
, postBuild ? ""
, ignoreCollisions ? false
, permitUserSite ? false
, requiredPythonModules
# Wrap executables with the given argument.
, makeWrapperArgs ? []
@ -34,7 +35,7 @@ let
if [ -f "$prg" ]; then
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done

View File

@ -26,7 +26,10 @@ let
ver = version;
tag = ver.gitTag;
atLeast25 = lib.versionAtLeast ver.majMin "2.5";
baseruby = self.override { useRailsExpress = false; };
baseruby = self.override {
useRailsExpress = false;
docSupport = false;
};
self = lib.makeOverridable (
{ stdenv, buildPackages, lib
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
@ -35,7 +38,7 @@ let
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
, ncurses, readline, cursesSupport ? true
, groff, docSupport ? false
, groff, docSupport ? true
, libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true
, autoreconfHook, bison, autoconf
@ -58,6 +61,8 @@ let
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = if docSupport then "${groff}/bin/nroff" else null;
outputs = [ "out" ] ++ lib.optional docSupport "devdoc";
nativeBuildInputs = [ autoreconfHook bison ]
++ (op docSupport groff)
++ op (stdenv.buildPlatform != stdenv.hostPlatform) buildPackages.ruby;
@ -112,6 +117,10 @@ let
++ op (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-baseruby=${buildRuby}";
preConfigure = opString docSupport ''
configureFlagsArray+=("--with-ridir=$devdoc/share/ri")
'';
# fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
# mostly TZ- and patch-related tests
# TZ- failures are caused by nix sandboxing, I didn't investigate others
@ -141,12 +150,26 @@ let
addGemPath() {
addToSearchPath GEM_PATH \$1/${passthru.gemPath}
}
addRubyLibPath() {
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.targetPlatform.system}
}
addEnvHooks "$hostOffset" addGemPath
addEnvHooks "$hostOffset" addRubyLibPath
EOF
'' + opString useRailsExpress ''
rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
'' + opString docSupport ''
# Prevent the docs from being included in the closure
sed -i "s|\$(DESTDIR)$devdoc|\$(datarootdir)/\$(RI_BASE_NAME)|" $rbConfig
sed -i "s|'--with-ridir=$devdoc/share/ri'||" $rbConfig
# Add rbconfig shim so ri can find docs
mkdir -p $devdoc/lib/ruby/site_ruby
cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb
'' + opString useRailsExpress ''
# Prevent the baseruby from being included in the closure.
sed -i '/^ CONFIG\["BASERUBY"\]/d' $rbConfig
sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig

View File

@ -0,0 +1,25 @@
# This is a shim around whatever real rbconfig.rb is in the LOAD_PATH,
# so that RbConfig::CONFIG["ridir"] can be overridden to point to the
# custom location of the ri docs, without the main derivation having
# those docs in its closure.
MY_PATH = File.realpath(__FILE__)
candidates = $LOAD_PATH.map { |dir| File.join(dir, "rbconfig.rb") }
# First, drop everything _before_ this file in the LOAD_PATH, just on
# the off-chance somebody is composing shims like this for some reason.
candidates.drop_while { |c| !File.exist?(c) || File.realpath(c) != MY_PATH }
# Now, the wrapped rbconfig.rb is the next rbconfig.rb in the LOAD_PATH
# that isn't this same file. (Yes, duplicate LOAD_PATH entries are a
# thing we have to deal with.)
next_rbconfig = candidates.find { |c|
File.exist?(c) && File.realpath(c) != MY_PATH
}
# Load the wrapped rbconfig.rb
require next_rbconfig
# Now we have RbConfig, and can modify it for our own ends.
RbConfig::CONFIG["ridir"] = File.expand_path("../../../share/ri", __dir__)

View File

@ -1,15 +1,12 @@
{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }:
let
ver_maj = "1.12";
ver_min = "2";
in
stdenv.mkDerivation rec {
name = "cairomm-${ver_maj}.${ver_min}";
pname = "cairomm";
version = "1.12.2";
src = fetchurl {
url = "https://www.cairographics.org/releases/${name}.tar.gz";
url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz";
# gnome doesn't have the latest version ATM; beware: same name but different hash
# url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz";
#url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25";
};
@ -39,7 +36,7 @@ stdenv.mkDerivation rec {
when available (e.g., through the X Render Extension).
'';
homepage = http://cairographics.org/;
homepage = "https://www.cairographics.org/";
license = with licenses; [ lgpl2Plus mpl10 ];
platforms = platforms.unix;

View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
{ stdenv, fetchurl, buildPackages
, pkgconfig, expat, gettext, libiconv, dbus, glib
}:
stdenv.mkDerivation rec {
name = "dbus-glib-0.110";
@ -11,15 +13,15 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
nativeBuildInputs = [ pkgconfig gettext ];
nativeBuildInputs = [ pkgconfig gettext glib ];
buildInputs = [ expat libiconv ];
propagatedBuildInputs = [ dbus glib ];
preConfigure = ''
configureFlagsArray+=("--exec-prefix=$dev")
'';
configureFlags = [ "--exec-prefix=${placeholder "dev"}" ] ++
stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
"--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool";
doCheck = false;

View File

@ -1,34 +1,92 @@
{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool, gobject-introspection
, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus, libgee
, telepathy-glib, evolution-data-server, libsecret, db }:
{ fetchurl
, stdenv
, pkgconfig
, meson
, ninja
, glib
, gnome3
, nspr
, gettext
, gobject-introspection
, vala
, sqlite
, libxml2
, dbus-glib
, libsoup
, nss
, dbus
, libgee
, telepathy-glib
, evolution-data-server
, libsecret
, db
, python3
, python
, readline
, gtk3
}:
# TODO: enable more folks backends
stdenv.mkDerivation rec {
pname = "folks";
version = "0.11.4";
version = "0.12.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
sha256 = "0xfl6rnzhdbmw1q26xiq34cdiy7a9karpi2r7wyplnnz1zaz5a9w";
};
propagatedBuildInputs = [ glib libgee sqlite ];
buildInputs = [
dbus-glib telepathy-glib evolution-data-server
libsecret libxml2 libsoup nspr nss db
mesonFlags = [
# TODO: https://gitlab.gnome.org/GNOME/folks/issues/108
"-Ddocs=false"
];
checkInputs = [ dbus ];
nativeBuildInputs = [
gettext
gobject-introspection
gtk3
meson
ninja
pkgconfig
python
python3
vala
];
nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ];
buildInputs = [
db
dbus-glib
evolution-data-server
libsecret
libsoup
libxml2
nspr
nss
readline
telepathy-glib
];
configureFlags = [ "--disable-fatal-warnings" ];
propagatedBuildInputs = [
glib
libgee
sqlite
];
enableParallelBuilding = true;
checkInputs = [
dbus
];
postBuild = "rm -rf $out/share/gtk-doc";
# TODO: enable tests
# doCheck = true;
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
patchShebangs tests/tools/manager-file.py
'';
passthru = {
updateScript = gnome3.updateScript {
@ -37,11 +95,11 @@ stdenv.mkDerivation rec {
};
};
meta = {
meta = with stdenv.lib; {
description = "A library that aggregates people from multiple sources to create metacontacts";
homepage = https://wiki.gnome.org/Projects/Folks;
license = stdenv.lib.licenses.lgpl2Plus;
license = licenses.lgpl2Plus;
maintainers = gnome3.maintainers;
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
platforms = platforms.gnu ++ platforms.linux; # arbitrary choice
};
}

View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, gettext, gobject-introspection, pkgconfig
, meson, ninja, glibcLocales, git, vala, glib, zlib
, meson, ninja, glibcLocales, git, vala, glib, zlib, gnome3
}:
stdenv.mkDerivation rec {
name = "gcab-${version}";
pname = "gcab";
version = "1.2";
LC_ALL = "en_US.UTF-8";
src = fetchurl {
url = "mirror://gnome/sources/gcab/${version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "038h5kk41si2hc9d9169rrlvp8xgsxq27kri7hv2vr39gvz9cbas";
};
@ -22,10 +22,17 @@ stdenv.mkDerivation rec {
"-Dtests=false"
];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
meta = with stdenv.lib; {
platforms = platforms.linux;
license = licenses.lgpl21;
homepage = "https://wiki.gnome.org/msitools";
maintainers = [ maintainers.lethalman ];
};
}

View File

@ -3,14 +3,14 @@
let
pname = "glib-networking";
version = "2.60.1";
version = "2.60.2";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "14jx8ca7plgh196629ghj41gsaha0aza222g64093hjsm8pnn76p";
sha256 = "0cl74q7hvq4xqqc88vlzmfw1sh5n9hdh1yvn2v1vg9am1z8z68n0";
};
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs

View File

@ -46,7 +46,7 @@ let
'';
binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
version = "2.60.1";
version = "2.60.2";
in
stdenv.mkDerivation rec {
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0q2mkdvp20v6dvrhik8k5j875kj29hcfz346xi0624n6spsq9y49";
sha256 = "1nc0iyday7866hq0hb78h7lxa44an998lzis8jhgvp8a0rsm9w9f";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection }:
{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, gnome3 }:
stdenv.mkDerivation rec {
pname = "gnome-menus";
@ -17,9 +17,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ glib gobject-introspection ];
meta = {
homepage = https://www.gnome.org;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
meta = with stdenv.lib; {
homepage = "https://gitlab.gnome.org/GNOME/gnome-menus";
description = "Library that implements freedesktops's Desktop Menu Specification in GNOME";
platforms = stdenv.lib.platforms.linux;
license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.linux;
};
}

View File

@ -1,22 +1,28 @@
{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig }:
{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig, gnome3 }:
stdenv.mkDerivation rec {
majVersion = "1.0";
version = "${majVersion}.0";
name = "goocanvas-${version}";
pname = "goocanvas";
version = "1.0.0";
src = fetchurl {
url = "mirror://gnome/sources/goocanvas/${majVersion}/${name}.tar.bz2";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 cairo glib ];
meta = {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
meta = with stdenv.lib; {
description = "Canvas widget for GTK+ based on the the Cairo 2D library";
homepage = http://goocanvas.sourceforge.net/;
license = ["GPL" "LGPL"];
homepage = "https://wiki.gnome.org/Projects/GooCanvas";
license = licenses.lgpl2;
platforms = stdenv.lib.platforms.unix;
};
}

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "gssdp";
version = "1.2.0";
version = "1.2.1";
outputs = [ "out" "bin" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1l80znxzzpb2fmsrjf3hygi9gcxx5r405qrk5430nbsjgxafzjr2";
sha256 = "1lsn6mdkk8yb933n0c9dka89bixvwis09w5nh5wkcag2jsdbfmvb";
};
nativeBuildInputs = [

View File

@ -1,14 +1,10 @@
{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }:
let
ver_maj = "1.10";
ver_min = "0";
in
{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1, gnome3 }:
stdenv.mkDerivation rec {
name = "gstreamermm-${ver_maj}.${ver_min}";
pname = "gstreamermm";
version = "1.10.0";
src = fetchurl {
url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y";
};
@ -20,9 +16,16 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none"; # Unpredictable version stability
};
};
meta = with stdenv.lib; {
description = "C++ interface for GStreamer";
homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html;
homepage = "https://gstreamer.freedesktop.org/bindings/cplusplus.html";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];

View File

@ -1,4 +1,6 @@
{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintl }:
{ fetchurl, fetchpatch, stdenv, autoreconfHook
, perl, bison2, flex, pkgconfig, glib, libxml2, libintl
}:
stdenv.mkDerivation rec {
name = "gstreamer-0.10.36";
@ -13,12 +15,31 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig libintl ];
buildInputs = [ perl bison flex ];
nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison2 glib ];
propagatedBuildInputs = [ glib libxml2 ];
# See https://trac.macports.org/ticket/40783 for explanation of patch
patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
patches = [
(fetchpatch {
url = "https://github.com/GStreamer/common/commit/03a0e5736761a72d4ed880e8c485bbf9e4a8ea47.patch";
sha256 = "0rin3x01yy78ky3smmhbwlph18hhym18q4x9w6ddiqajg5lk4xhm";
extraPrefix = "common/";
stripLen = 1;
})
(fetchpatch {
url = "https://github.com/GStreamer/common/commit/8aadeaaa8a948d7ce62008789ab03e9aa514c2b9.patch";
sha256 = "0n2mqvq2al7jr2hflhz4l781i3jya5a9i725jvy508ambpgycz3x";
extraPrefix = "common/";
stripLen = 1;
})
(fetchpatch {
url = "https://github.com/GStreamer/common/commit/7bb2bcecda471a0d514a964365a78150f3ee5747.patch";
sha256 = "0famdj70m7wjvr1dpy7iywhrkqxmrshxz0rizz1bixgp42dvkhbq";
extraPrefix = "common/";
stripLen = 1;
})
] ++
# See https://trac.macports.org/ticket/40783 for explanation of patch
stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
postPatch = ''
sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in

View File

@ -84,10 +84,6 @@ stdenv.mkDerivation rec {
installFlags = "prefix=$(out)";
# Workaround for https://github.com/NixOS/nixpkgs/issues/40397
# Remove after update to binutils 2.31
dontStrip = true;
inherit atk cairo gdk_pixbuf librsvg pango;
inherit (gnome3) glib gtk3 gtksourceview libgda libpeas;
inherit (gst_all_1) gstreamer;

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }:
stdenv.mkDerivation rec {
name = "hyena-${version}";
pname = "hyena";
version = "0.5";
src = fetchurl {
url = "mirror://gnome/sources/hyena/${version}/hyena-${version}.tar.bz2" ;
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9";
};
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
inherit monoDLLFixer;
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Hyena;
homepage = "https://wiki.gnome.org/Attic/Hyena";
description = "A C# library which contains a hodge-podge of random stuff";
longDescription = ''
Hyena is a C# library used to make awesome applications. It contains a lot of random things,

View File

@ -8,13 +8,15 @@ stdenv.mkDerivation rec {
url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz";
sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb";
};
patchPhase = ''
for i in `find . -name \*.py`
do
sed -i -e "s|#!/usr/bin/env python|#!${python3}/bin/python|" $i
done
'';
buildInputs = [ gettext python3 ];
nativeBuildInputs = [ gettext python3 ];
meta = with stdenv.lib; {
homepage = https://salsa.debian.org/iso-codes-team/iso-codes;

View File

@ -3,13 +3,13 @@
, libXrender, libexif, autoreconfHook, fetchpatch }:
stdenv.mkDerivation rec {
name = "libgdiplus-5.6";
name = "libgdiplus-5.6.1";
src = fetchFromGitHub {
owner = "mono";
repo = "libgdiplus";
rev = "5.6";
sha256 = "11xr84kng74j3pd8sx74q80a71k6dw0a502qgibcxlyqh666lfb7";
rev = "5.6.1";
sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2";
};
NIX_LDFLAGS = "-lgif";

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig,
intltool }:
{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }:
stdenv.mkDerivation {
name = "libgnome-keyring-2.32.0";
stdenv.mkDerivation rec {
pname = "libgnome-keyring";
version = "2.32.0";
src = fetchurl {
url = mirror://gnome/sources/libgnome-keyring/2.32/libgnome-keyring-2.32.0.tar.bz2;
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n";
};
@ -16,6 +16,7 @@ stdenv.mkDerivation {
meta = {
inherit (glib.meta) platforms maintainers;
homepage = "https://wiki.gnome.org/Projects/GnomeKeyring";
license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
};
}

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgsf";
version = "1.14.45";
version = "1.14.46";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1yk91ccf7z9b8d8ac6vip3gc5c0pkwgabqy6l0pj0kf43l7jrg2w";
sha256 = "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa";
};
nativeBuildInputs = [ pkgconfig intltool libintl ];

View File

@ -27,11 +27,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-${version}";
version = "1.13.1";
version = "1.13.2";
src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
sha256 = "1as190kl5mnlpqab4qvkxnm4h8vz5cf22r0ai4cb2azfg3a8gm71";
sha256 = "0vbapc90m49n0z8w8w4v0qf1iiwaixw9h79jfmps9pj8hdls17qx";
};
outputs = [ "bin" "out" "dev" ];

View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, fetchpatch, cmake, nasm }:
stdenv.mkDerivation rec {
name = "libjpeg-turbo-${version}";
pname = "libjpeg-turbo";
version = "2.0.2";
src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c";
};
@ -17,18 +18,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake nasm ];
preConfigure = ''
cmakeFlagsArray+=(
"-DCMAKE_INSTALL_BINDIR=$bin/bin"
"-DENABLE_STATIC=0"
)
'';
cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" "-DENABLE_STATIC=0" ];
doCheck = true; # not cross;
checkTarget = "test";
preCheck = ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}:$LD_LIBRARY_PATH"
'';
doInstallCheck = true;
installCheckTarget = "test";
meta = with stdenv.lib; {
homepage = http://libjpeg-turbo.virtualgl.org/;

View File

@ -1,33 +1,34 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }:
stdenv.mkDerivation rec {
name = "libunique-1.1.6";
pname = "libunique";
version = "1.1.6";
src = fetchurl {
url = "mirror://gnome/sources/libunique/1.1/${name}.tar.bz2";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
};
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
# patches from Gentoo portage
# Patches from Gentoo portage
patches = [
./1.1.6-compiler-warnings.patch
./1.1.6-fix-test.patch
./1.1.6-G_CONST_RETURN.patch
./1.1.6-include-terminator.patch
]
++ [ ./gcc7-bug.patch ];
] ++ [ ./gcc7-bug.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib gtk2 dbus-glib ];
# don't make deprecated usages hard errors
# Don't make deprecated usages hard errors
preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""'';
doCheck = true;
meta = {
homepage = https://wiki.gnome.org/Attic/LibUnique;
homepage = "https://wiki.gnome.org/Attic/LibUnique";
description = "A library for writing single instance applications";
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.linux;

View File

@ -1,14 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }:
let
ver_maj = "2.31";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "libwnck-${ver_maj}.${ver_min}";
pname = "libwnck";
version = "2.31.0";
src = fetchurl {
url = "mirror://gnome/sources/libwnck/${ver_maj}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
};
@ -23,6 +20,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A library for creating task lists and pagers";
homepage = "https://gitlab.gnome.org/GNOME/libwnck";
license = stdenv.lib.licenses.lgpl21;
maintainers = with stdenv.lib.maintainers; [ johnazoidberg ];
};
}

View File

@ -1,12 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:
{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl, gnome3 }:
stdenv.mkDerivation rec {
name = "libxml++-${maj_ver}.${min_ver}";
maj_ver = "2.40";
min_ver = "1";
pname = "libxml++";
version = "2.40.1";
src = fetchurl {
url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a";
};
@ -16,8 +15,14 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libxml2 glibmm ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
homepage = http://libxmlplusplus.sourceforge.net/;
homepage = "http://libxmlplusplus.sourceforge.net/";
description = "C++ wrapper for the libxml2 XML parser library";
license = licenses.lgpl2Plus;
platforms = platforms.unix;

View File

@ -26,26 +26,26 @@
with stdenv.lib;
if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
throw "${stdenv.system}: unsupported platform for Mesa"
else
let
defaultGalliumDrivers =
optionals (elem "drm" eglPlatforms)
(if stdenv.isAarch32
then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"]
else if stdenv.isAarch64
then ["virgl" "nouveau" "vc4" ]
else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"]);
defaultDriDrivers =
optionals (elem "drm" eglPlatforms)
(if (stdenv.isAarch32 || stdenv.isAarch64)
then ["nouveau"]
else ["i915" "i965" "nouveau" "radeon" "r200"]);
defaultVulkanDrivers =
optionals stdenv.isLinux (if (stdenv.isAarch32 || stdenv.isAarch64)
then []
else ["intel"] ++ lib.optional enableRadv "radeon");
# platforms that have PCIe slots and thus can use most non-integrated GPUs
pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64;
defaultGalliumDrivers = optionals (elem "drm" eglPlatforms) ([ "virgl" ]
++ lib.optionals pciePlatform [ "r300" "r600" "radeonsi" ]
++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ]
++ lib.optionals stdenv.hostPlatform.isx86 [ "i915" "svga" ]
++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "vc4" ]
++ lib.optionals stdenv.hostPlatform.isAarch64 [ "freedreno" "etnaviv" "imx" ]
);
defaultDriDrivers = optionals (elem "drm" eglPlatforms) ([ ]
++ lib.optionals pciePlatform [ "radeon" "r200" ]
++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ]
++ lib.optionals stdenv.hostPlatform.isx86 [ "i915" "i965" ]);
defaultVulkanDrivers = optionals stdenv.hostPlatform.isLinux ([ ]
++ lib.optional stdenv.hostPlatform.isx86 "intel"
++ lib.optional enableRadv "radeon");
in
let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in

View File

@ -5,7 +5,7 @@ let
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
version = "3.42.1";
version = "3.44";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz";
sha256 = "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88";
sha256 = "1zvabgxlyvz3fnv4w89y4a5qkscjmm88naf929dgvvgfnrchwqm5";
};
buildInputs = [ perl zlib sqlite ]

View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ptlib, srtp, libtheora, speex
{ stdenv, fetchurl, pkgconfig, ptlib, srtp, libtheora, speex, gnome3
, ffmpeg, x264, cyrus_sasl, openldap, openssl, expat, unixODBC }:
stdenv.mkDerivation rec {
name = "opal-3.10.10";
pname = "opal";
version = "3.10.10";
src = fetchurl {
url = "mirror://gnome/sources/opal/3.10/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864";
};
@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
description = "VoIP library";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
homepage = "http://www.opalvoip.org/";
license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ];
};
@ -33,6 +35,9 @@ stdenv.mkDerivation rec {
updateInfo = {
downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/opal";
};
updateScript = gnome3.updateScript {
packageName = pname;
};
};
}

View File

@ -1,22 +1,36 @@
{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv
, libffi, libtasn1 }:
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which
, gettext, libffi, libiconv, libtasn1
}:
stdenv.mkDerivation rec {
name = "p11-kit-${version}";
version = "0.23.14";
pname = "p11-kit";
version = "0.23.15";
src = fetchFromGitHub {
owner = "p11-glue";
repo = "p11-kit";
repo = pname;
rev = version;
sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw";
sha256 = "0kf7zz2cvd6j09qkff3rl3wfisva82ia1z9h8bmy4ifwkv4yl9fv";
};
patches = [
(fetchpatch {
# https://github.com/p11-glue/p11-kit/issues/212
url = "https://github.com/p11-glue/p11-kit/commit/2a474e1fe8f4bd8b4ed7622e5cf3b2718a202562.patch";
sha256 = "13wi32hpzilvzxn57crn79h88q38jm2fzd5zxj4wnhv9dhwqr6lg";
})
(fetchpatch {
# https://github.com/p11-glue/p11-kit/issues/220
url = "https://github.com/p11-glue/p11-kit/commit/e2170b295992cb7fdf115227a78028ac3780619f.patch";
sha256 = "0433d8drfxaabsxwkkl4kr0jx8jr2l3a9ar11szipd9jwvrqnyr7";
})
];
outputs = [ "out" "dev"];
outputBin = "dev";
nativeBuildInputs = [ autoreconfHook which pkgconfig ];
buildInputs = [ libffi libtasn1 libiconv ];
nativeBuildInputs = [ autoreconfHook pkgconfig which ];
buildInputs = [ gettext libffi libiconv libtasn1 ];
autoreconfPhase = ''
NOCONFIGURE=1 ./autogen.sh
@ -26,16 +40,23 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--localstatedir=/var"
"--without-trust-paths"
];
]; # TODO: store trust anchors in a directory common to Nix and NixOS
enableParallelBuilding = true;
doCheck = true;
installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
doInstallCheck = false; # probably a bug in this derivation
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://p11-glue.freedesktop.org/;
description = "Library for loading and sharing PKCS#11 modules";
longDescription = ''
Provides a way to load and enumerate PKCS#11 modules.
Provides a standard configuration setup for installing
PKCS#11 modules in such a way that they're discoverable.
'';
homepage = https://p11-glue.github.io/p11-glue/p11-kit.html;
platforms = platforms.all;
license = licenses.mit;
license = licenses.bsd3;
};
}

View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, pango, libX11 }:
stdenv.mkDerivation rec {
name = "pangox-compat-0.0.2";
pname = "pangox-compat";
version = "0.0.2";
src = fetchurl {
url = "mirror://gnome/sources/pangox-compat/0.0/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m";
};
@ -13,8 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A compatibility library for pango>1.30.*";
homepage = https://www.pango.org/;
homepage = "https://gitlab.gnome.org/Archive/pangox-compat";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.unix;
};

View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, unixODBC
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, unixODBC, gnome3
, openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }:
stdenv.mkDerivation rec {
name = "ptlib-2.10.11";
pname = "ptlib";
version = "2.10.11";
src = fetchurl {
url = "mirror://gnome/sources/ptlib/2.10/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs";
};
@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Portable Tools from OPAL VoIP";
maintainers = [ maintainers.raskin ];
homepage = "http://www.opalvoip.org/";
platforms = platforms.linux;
license = with licenses; [ beerware bsdOriginal mpl10 ];
};
@ -45,5 +47,8 @@ stdenv.mkDerivation rec {
updateInfo = {
downloadPage = "http://ftp.gnome.org/sources/ptlib/";
};
updateScript = gnome3.updateScript {
packageName = pname;
};
};
}

View File

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" "doc" ];
patches = [ ./terminfo-dirs.patch ];
# Fix some wrong hardcoded paths
preConfigure = ''
sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure

View File

@ -0,0 +1,172 @@
commit c7aa0c07b6522fbbb47ef47bd22f47f1611e7423
Author: John E. Davis <jed@jedsoft.org>
Date: Wed Nov 28 00:46:28 2018 -0500
pre2.3.3-5: Added support for TERMINFO_DIRS env var
Modified: removed changes to changelog and version number.
diff --git a/src/sltermin.c b/src/sltermin.c
index a06d0e4..65d3bbc 100644
--- a/src/sltermin.c
+++ b/src/sltermin.c
@@ -133,6 +133,9 @@ static FILE *open_terminfo (char *file, SLterminfo_Type *h)
unsigned char buf[12];
int magic;
+#ifdef SLANG_UNTIC
+ (void) fprintf (stdout,"# Trying %s\n", file);
+#endif
/* Alan Cox reported a security problem here if the application using the
* library is setuid. So, I need to make sure open the file as a normal
* user. Unfortunately, there does not appear to be a portable way of
@@ -269,10 +272,73 @@ static char *read_string_table (FILE *fp, SLterminfo_Type *t)
* are implemented by multiple links to the same compiled file.
*/
+static FILE *try_open_tidir (SLterminfo_Type *ti, const char *tidir, const char *term)
+{
+ char file[1024];
+
+ if (sizeof (file) > strlen (tidir) + 5 + strlen (term))
+ {
+ FILE *fp;
+
+ sprintf (file, "%s/%c/%s", tidir, *term, term);
+ if (NULL != (fp = open_terminfo (file, ti)))
+ return fp;
+
+ sprintf (file, "%s/%02x/%s", tidir, (unsigned char)*term, term);
+ if (NULL != (fp = open_terminfo (file, ti)))
+ return fp;
+ }
+
+ return NULL;
+}
+
+static FILE *try_open_env (SLterminfo_Type *ti, const char *term, const char *envvar)
+{
+ char *tidir;
+
+ if (NULL == (tidir = _pSLsecure_getenv (envvar)))
+ return NULL;
+
+ return try_open_tidir (ti, tidir, term);
+}
+
+static FILE *try_open_home (SLterminfo_Type *ti, const char *term)
+{
+ char home_ti[1024];
+ char *env;
+
+ if (NULL == (env = _pSLsecure_getenv ("HOME")))
+ return NULL;
+
+ strncpy (home_ti, env, sizeof (home_ti) - 11);
+ home_ti [sizeof(home_ti) - 11] = 0;
+ strcat (home_ti, "/.terminfo");
+
+ return try_open_tidir (ti, home_ti, term);
+}
+
+static FILE *try_open_env_path (SLterminfo_Type *ti, const char *term, const char *envvar)
+{
+ char tidir[1024];
+ char *env;
+ unsigned int i;
+
+ if (NULL == (env = _pSLsecure_getenv (envvar)))
+ return NULL;
+
+ i = 0;
+ while (-1 != SLextract_list_element (env, i, ':', tidir, sizeof(tidir)))
+ {
+ FILE *fp = try_open_tidir (ti, tidir, term);
+ if (fp != NULL) return fp;
+ i++;
+ }
+
+ return NULL;
+}
+
static SLCONST char *Terminfo_Dirs [] =
{
- "", /* $TERMINFO */
- "", /* $HOME/.terminfo */
#ifdef MISC_TERMINFO_DIRS
MISC_TERMINFO_DIRS,
#endif
@@ -287,6 +353,23 @@ static SLCONST char *Terminfo_Dirs [] =
NULL,
};
+static FILE *try_open_hardcoded (SLterminfo_Type *ti, const char *term)
+{
+ const char *tidir, **tidirs;
+
+ tidirs = Terminfo_Dirs;
+ while (NULL != (tidir = *tidirs++))
+ {
+ FILE *fp;
+
+ if ((*tidir != 0)
+ && (NULL != (fp = try_open_tidir (ti, tidir, term))))
+ return fp;
+ }
+
+ return NULL;
+}
+
void _pSLtt_tifreeent (SLterminfo_Type *t)
{
if (t == NULL)
@@ -305,11 +388,7 @@ void _pSLtt_tifreeent (SLterminfo_Type *t)
SLterminfo_Type *_pSLtt_tigetent (SLCONST char *term)
{
- SLCONST char **tidirs, *tidir;
FILE *fp = NULL;
- char file[1024];
- static char home_ti [1024];
- char *env;
SLterminfo_Type *ti;
if (
@@ -341,33 +420,10 @@ SLterminfo_Type *_pSLtt_tigetent (SLCONST char *term)
/* If we are on a termcap based system, use termcap */
if (0 == tcap_getent (term, ti)) return ti;
- if (NULL != (env = _pSLsecure_getenv ("TERMINFO")))
- Terminfo_Dirs[0] = env;
-
- if (NULL != (env = _pSLsecure_getenv ("HOME")))
- {
- strncpy (home_ti, env, sizeof (home_ti) - 11);
- home_ti [sizeof(home_ti) - 11] = 0;
- strcat (home_ti, "/.terminfo");
- Terminfo_Dirs [1] = home_ti;
- }
-
- tidirs = Terminfo_Dirs;
- while (NULL != (tidir = *tidirs++))
- {
- if (*tidir == 0)
- continue;
-
- if (sizeof (file) > strlen (tidir) + 5 + strlen (term))
- {
- sprintf (file, "%s/%c/%s", tidir, *term, term);
- if (NULL != (fp = open_terminfo (file, ti)))
- break;
- sprintf (file, "%s/%02x/%s", tidir, (unsigned char)*term, term);
- if (NULL != (fp = open_terminfo (file, ti)))
- break;
- }
- }
+ fp = try_open_env_path (ti, term, "TERMINFO_DIRS");
+ if (fp == NULL) fp = try_open_env (ti, term, "TERMINFO");
+ if (fp == NULL) fp = try_open_home (ti, term);
+ if (fp == NULL) fp = try_open_hardcoded (ti, term);
#ifdef SLANG_UNTIC
fp_open_label:

View File

@ -22,7 +22,7 @@ preConfigure() {
fi
done
perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$perl/bin/perl\"
perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\"
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, perl, buildPackages, toPerlModule }:
{ lib, stdenv, perl, buildPerl, toPerlModule }:
{ nativeBuildInputs ? [], name, ... } @ attrs:
@ -37,6 +37,6 @@ toPerlModule(stdenv.mkDerivation (
name = "perl${perl.version}-${name}";
builder = ./builder.sh;
nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];
perl = buildPackages.perl;
fullperl = buildPerl;
}
))

View File

@ -4,18 +4,16 @@
buildPythonPackage rec {
pname = "pygtk";
version = "2.24.0";
name = pname + "-" + version;
disabled = isPy3k;
src = fetchurl {
url = "mirror://gnome/sources/pygtk/2.24/${name}.tar.bz2";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ]
++ stdenv.lib.optional (libglade != null) libglade;
buildInputs = stdenv.lib.optional (libglade != null) libglade;
propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
@ -50,6 +48,13 @@ buildPythonPackage rec {
rm $out/bin/pygtk-codegen-2.0
ln -s ${pygobject2}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0
ln -s ${pygobject2}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject2.version}.pth \
$out/lib/${python.libPrefix}/site-packages/${name}.pth
$out/lib/${python.libPrefix}/site-packages/${pname}-${version}.pth
'';
meta = with stdenv.lib; {
description = "GTK+-2 bindings";
homepage = "https://gitlab.gnome.org/Archive/pygtk";
platforms = platforms.all;
license = with licenses; [ lgpl21Plus ];
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "waf-${version}";
version = "2.0.14";
version = "2.0.15";
src = fetchFromGitLab {
owner = "ita1024";
repo = "waf";
rev = name;
sha256 = "006a4wb9i569pahs8ji86hrv58g2hm8xikgchnll3bdqgxllhnrs";
sha256 = "0i86dbn6l01n4h4rzyl4mvizqabbqn5w7fywh83z7fxpha13c3bz";
};
patches = [

View File

@ -1,12 +1,14 @@
{fetchurl, pkgconfig, libxml2Python, libxslt, intltool
{ stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool, gnome3
, python2Packages }:
python2Packages.buildPythonApplication {
name = "gnome-doc-utils-0.20.10";
python2Packages.buildPythonApplication rec {
pname = "gnome-doc-utils";
version = "0.20.10";
format = "other";
src = fetchurl {
url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz;
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
};
@ -20,4 +22,17 @@ python2Packages.buildPythonApplication {
'';
propagatedBuildInputs = [ libxml2Python ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
description = "Collection of documentation utilities for the GNOME project";
homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils";
license = with licenses; [ gpl2Plus lgpl2Plus ];
platforms = platforms.all;
};
}

View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which
, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool
, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3
, withDblatex ? false, dblatex
}:
stdenv.mkDerivation rec {
name = "gtk-doc-${version}";
pname = "gtk-doc";
version = "1.29";
src = fetchurl {
url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql";
};
@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-scrollkeeper" ];
# Make six available for binaries, python.withPackages creates a wrapper
# Make pygments available for binaries, python.withPackages creates a wrapper
# but scripts are not allowed in shebangs so we link it into sys.path.
postInstall = ''
ln -s ${python3.pkgs.six}/${python3.sitePackages}/* $out/share/gtk-doc/python/
ln -s ${python3.pkgs.pygments}/${python3.sitePackages}/* $out/share/gtk-doc/python/
'';
doCheck = false; # requires a lot of stuff
@ -38,11 +38,15 @@ stdenv.mkDerivation rec {
passthru = {
# Consumers are expected to copy the m4 files to their source tree, let them reuse the patch
respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch;
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
meta = with stdenv.lib; {
homepage = https://www.gtk.org/gtk-doc;
description = "Tools to extract documentation embedded in GTK+ and GNOME source code";
homepage = "https://www.gtk.org/gtk-doc";
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
};

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, bison, flex }:
{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }:
stdenv.mkDerivation rec {
name = "gob2-${minVer}.20";
minVer = "2.0";
pname = "gob2";
version = "2.0.20";
src = fetchurl {
url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428";
};
@ -13,9 +13,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib bison flex ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
meta = {
description = "Preprocessor for making GObjects with inline C code";
homepage = https://www.jirka.org/gob.html;
homepage = "https://www.jirka.org/gob.html";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};

View File

@ -1,17 +1,23 @@
{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2 }:
{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }:
stdenv.mkDerivation rec {
pname = "msitools";
version = "0.98";
name = "msitools-${version}";
src = fetchurl {
url = "mirror://gnome/sources/msitools/${version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
};
nativeBuildInputs = [ intltool pkgconfig ];
buildInputs = [ glib libgsf libuuid gcab bzip2 ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
description = "Set of programs to inspect and build Windows Installer (.MSI) files";
homepage = https://wiki.gnome.org/msitools;

View File

@ -1,24 +1,28 @@
{stdenv, fetchurl, libiconv, vanilla ? false }:
{ stdenv, fetchurl, libiconv, vanilla ? false }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "pkg-config-0.29.2";
pname = "pkg-config";
version = "0.29.2";
setupHook = ./setup-hook.sh;
src = fetchurl {
urls = [
"https://pkgconfig.freedesktop.org/releases/${name}.tar.gz"
"http://fossies.org/linux/misc/${name}.tar.gz"
];
url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz";
sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";
};
# Process Requires.private properly, see
# http://bugs.freedesktop.org/show_bug.cgi?id=4738.
# Process Requires.private properly, see
# http://bugs.freedesktop.org/show_bug.cgi?id=4738.
patches = optional (!vanilla) ./requires-private.patch
++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
# These three tests fail due to a (desired) behavior change from our ./requires-private.patch
postPatch = ''
rm -f check/check-requires-private check/check-gtk check/missing
'';
buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
configureFlags = [ "--with-internal-glib" ]
@ -31,7 +35,8 @@ stdenv.mkDerivation rec {
"ac_cv_func_posix_getgrgid_r=yes"
];
doCheck = false; # fails
enableParallelBuilding = true;
doCheck = true;
postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file
@ -41,5 +46,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
license = licenses.gpl2Plus;
};
}

View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
stdenv.mkDerivation {
name = "gtk-engine-murrine-0.98.2";
stdenv.mkDerivation rec {
pname = "gtk-engine-murrine";
version = "0.98.2";
src = fetchurl {
url = "mirror://gnome/sources/murrine/0.98/murrine-0.98.2.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
};
@ -13,6 +14,7 @@ stdenv.mkDerivation {
meta = {
description = "A very flexible theme engine";
homepage = "https://gitlab.gnome.org/Archive/murrine";
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
};

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "iproute2";
version = "5.0.0";
version = "5.1.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
sha256 = "1fi03lb8dqr8hq633gcqsf6228vsvysxms075j1yyl4nlc17616z";
sha256 = "1kvvrz5mlpjxqcm7vl6i8w6l1cb2amp6p5xyq006pgzafc49hnnw";
};
preConfigure = ''
@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ eelco fpletz ];
maintainers = with maintainers; [ primeos eelco fpletz ];
};
}

View File

@ -1,5 +1,5 @@
{ stdenv, file, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig
, pythonSupport ? true, swig ? null, python}:
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}:
stdenv.mkDerivation rec {
name = "libnl-${version}";

View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "v4l-utils-${version}";
version = "1.16.5";
version = "1.16.6";
src = fetchurl {
url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
sha256 = "06yz34ncrpxshs9w2nqz62xj4wm7hni1fvjnvjhifl1q20jj907d";
sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr";
};
outputs = [ "out" "dev" ];

View File

@ -101,6 +101,10 @@ let
wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
'';
doCheck = true;
# autodetection doesn't seem to able to find this, but it's there.
checkTarget = "check";
doInstallCheck = false; # needs a running daemon?
disallowedReferences = [ stdenv.cc ];
@ -157,41 +161,41 @@ let
in self: {
postgresql_9_4 = self.callPackage generic {
version = "9.4.21";
version = "9.4.22";
psqlSchema = "9.4";
sha256 = "01k0s3a7qy8639zsjp1bjbfnnymyl0rgyylrjbkm81m0779b8j80";
sha256 = "0sy66cl2nkqr1al66f3qy7zsyd3vjpjv0icqbda7bqq4j8mlrann";
this = self.postgresql_9_4;
inherit self;
};
postgresql_9_5 = self.callPackage generic {
version = "9.5.16";
version = "9.5.17";
psqlSchema = "9.5";
sha256 = "0cg10ri0475vg1c8k1sb5qi4i64hiv9k7crmg15qvvnwsjanqmx4";
sha256 = "01gp4d3ngl2809dl652md2n1q4nk27cdbl6i892gvwk901xf7yc8";
this = self.postgresql_9_5;
inherit self;
};
postgresql_9_6 = self.callPackage generic {
version = "9.6.12";
version = "9.6.13";
psqlSchema = "9.6";
sha256 = "114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f";
sha256 = "197964wb5pc5fx81a6mh9hlcrr9sgr3nqlpmljv6asi9aq0d5gpc";
this = self.postgresql_9_6;
inherit self;
};
postgresql_10 = self.callPackage generic {
version = "10.7";
version = "10.8";
psqlSchema = "10.0"; # should be 10, but changing it is invasive
sha256 = "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz";
sha256 = "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i";
this = self.postgresql_10;
inherit self;
};
postgresql_11 = self.callPackage generic {
version = "11.2";
version = "11.3";
psqlSchema = "11.1"; # should be 11, but changing it is invasive
sha256 = "01clq2lw0v83zh5dc89xdr3mmap0jr37kdkh401ph6f2177bjxi6";
sha256 = "0baj61ym7jnl195qcq4hq6225kfz6879j8zx3n148n92zj1f119a";
this = self.postgresql_11;
inherit self;
};

View File

@ -1430,7 +1430,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-0.4.0";
builder = ./builder.sh;
src = fetchurl {
@ -1438,12 +1438,12 @@ lib.makeScope newScope (self: with self; {
sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto }: stdenv.mkDerivation {
xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-cursor-0.1.3";
builder = ./builder.sh;
src = fetchurl {
@ -1451,12 +1451,12 @@ lib.makeScope newScope (self: with self; {
sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xorgproto }: stdenv.mkDerivation {
xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-errors-1.0";
builder = ./builder.sh;
src = fetchurl {
@ -1464,12 +1464,12 @@ lib.makeScope newScope (self: with self; {
sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xcbproto xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xcbproto xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutil, xorgproto }: stdenv.mkDerivation {
xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-image-0.4.0";
builder = ./builder.sh;
src = fetchurl {
@ -1477,12 +1477,12 @@ lib.makeScope newScope (self: with self; {
sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xcbutil xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xcbutil xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-keysyms-0.4.0";
builder = ./builder.sh;
src = fetchurl {
@ -1490,12 +1490,12 @@ lib.makeScope newScope (self: with self; {
sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-renderutil-0.3.9";
builder = ./builder.sh;
src = fetchurl {
@ -1503,12 +1503,12 @@ lib.makeScope newScope (self: with self; {
sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-wm-0.4.1";
builder = ./builder.sh;
src = fetchurl {
@ -1516,8 +1516,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

View File

@ -229,7 +229,8 @@ while (<>) {
push @nativeRequires, "gettext" if $file =~ /USE_GETTEXT/;
push @requires, "libxslt" if $pkg =~ /libxcb/;
push @requires, "gperf", "m4", "xorgproto" if $pkg =~ /xcbutil/;
push @nativeRequires, "m4" if $pkg =~ /xcbutil/;
push @requires, "gperf", "xorgproto" if $pkg =~ /xcbutil/;
print "REQUIRES $pkg => @requires\n";
print "NATIVE_REQUIRES $pkg => @nativeRequires\n";

View File

@ -198,6 +198,9 @@ self: super:
libXi = super.libXi.overrideAttrs (attrs: {
outputs = [ "out" "dev" "man" "doc" ];
propagatedBuildInputs = [ self.libXfixes ];
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"xorg_cv_malloc0_returns_null=no"
];
});
libXinerama = super.libXinerama.overrideAttrs (attrs: {

View File

@ -24,17 +24,17 @@ stdenv.mkDerivation rec {
./CVE-2016-3189.patch
];
postPatch = ''
sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
'';
outputs = [ "bin" "dev" "out" "man" ];
configureFlags =
stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "High-quality data compression program";
license = licenses.bsdOriginal;

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3
}:
stdenv.mkDerivation rec {
@ -12,10 +12,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools
pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
python3 python3.pkgs.setuptools
];
buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ];
buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python3 ];
# for python cross-compiling
_PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config;
postConfigure = ''
export LDSHARED="$LD -shared"
'';
# gcc bug with -O1 on ARM with gcc 4.8
# This should be fine on all platforms so apply universally

View File

@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ autoconf libpcap ncurses glib ];
nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs = [ libpcap ncurses glib ];
patches = [
./no-dns-resolution.patch

View File

@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit iputils kmod openconnect ethtool coreutils dbus;
inherit iputils kmod openconnect ethtool gnused dbus;
inherit (stdenv) shell;
})

View File

@ -19,7 +19,7 @@
ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
DRIVERS=="?*", GOTO="nm_drivers_end"
-PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @coreutils@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
LABEL="nm_drivers_end"
--- a/data/NetworkManager.service.in

View File

@ -1,13 +1,10 @@
{ stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }:
let
stdenv.mkDerivation rec {
pname = "polkit-gnome";
version = "0.105";
in stdenv.mkDerivation rec {
name = "polkit-gnome-${version}";
src = fetchurl {
url = "mirror://gnome/sources/polkit-gnome/${version}/${name}.tar.xz";
url = "mirror://gnome/sources/polkit-gnome/${version}/${pname}-${version}.tar.xz";
sha256 = "0sckmcbxyj6sbrnfc5p5lnw27ccghsid6v6wxq09mgxqcd4lk10p";
};
@ -20,12 +17,12 @@ in stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/etc/xdg/autostart
substituteAll ${./polkit-gnome-authentication-agent-1.desktop} $out/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
'';
'';
meta = {
homepage = https://hal.freedesktop.org/docs/PolicyKit/;
homepage = "https://gitlab.gnome.org/Archive/policykit-gnome";
description = "A dbus session bus service that is used to bring up authentication dialogs";
license = stdenv.lib.licenses.gpl2;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ phreedom ];
platforms = stdenv.lib.platforms.linux;
};

View File

@ -10626,12 +10626,10 @@ in
gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; });
callPackage = newScope { libav = pkgs.ffmpeg; };
});
gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {
bison = bison2;
};
gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { };
gst-plugins-base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;

View File

@ -6,7 +6,7 @@
be almost as much code as the function itself. */
{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides,
buildPackages}:
buildPerl}:
# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.2 or above
assert stdenv.lib.versionAtLeast perl.version "5.28.2";
@ -37,7 +37,7 @@ let
});
buildPerlPackage = callPackage ../development/perl-modules/generic {
inherit toPerlModule;
inherit buildPerl;
};
# Helper functions for packages that use Module::Build to build.
@ -14861,8 +14861,8 @@ let
# use native libraries from the host when running build commands
postConfigure = if cross then let
host_perl = buildPackages.perl;
host_self = buildPackages.perlPackages.TermReadKey;
host_perl = buildPerl;
host_self = buildPerl.pkgs.TermReadKey;
perl_lib = "${host_perl}/lib/perl5/${host_perl.version}";
self_lib = "${host_self}/lib/perl5/site_perl/${host_perl.version}";
in ''
@ -14871,7 +14871,7 @@ let
# TermReadKey uses itself in the build process
nativeBuildInputs = if cross then [
buildPackages.perlPackages.TermReadKey
buildPerl.pkgs.TermReadKey
] else [];
};