JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into master

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-04-30 15:50:24 +02:00 committed by GitHub
commit fd2bd6e433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
240 changed files with 2635 additions and 787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/systems/default.nix
View File

@ -30,6 +30,7 @@ rec {
libc = libc =
/**/ if final.isDarwin then "libSystem" /**/ if final.isDarwin then "libSystem"
else if final.isMinGW then "msvcrt" else if final.isMinGW then "msvcrt"
else if final.isWasi then "wasilibc"
else if final.isMusl then "musl" else if final.isMusl then "musl"
else if final.isUClibc then "uclibc" else if final.isUClibc then "uclibc"
else if final.isAndroid then "bionic" else if final.isAndroid then "bionic"
@ -62,7 +63,7 @@ rec {
"netbsd" = "NetBSD"; "netbsd" = "NetBSD";
"freebsd" = "FreeBSD"; "freebsd" = "FreeBSD";
"openbsd" = "OpenBSD"; "openbsd" = "OpenBSD";
"wasm" = "Wasm"; "wasi" = "Wasi";
}.${final.parsed.kernel.name} or null; }.${final.parsed.kernel.name} or null;
# uname -p # uname -p
@ -114,8 +115,8 @@ rec {
then "${wine}/bin/${wine-name}" then "${wine}/bin/${wine-name}"
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
then "${qemu-user}/bin/qemu-${final.qemuArch}" then "${qemu-user}/bin/qemu-${final.qemuArch}"
else if final.isWasm else if final.isWasi
then "${pkgs.v8}/bin/d8" then "${pkgs.wasmtime}/bin/wasmtime"
else throw "Don't know how to run ${final.config} executables."; else throw "Don't know how to run ${final.config} executables.";
} // mapAttrs (n: v: v final.parsed) inspect.predicates } // mapAttrs (n: v: v final.parsed) inspect.predicates

3
lib/systems/doubles.nix
View File

@ -17,6 +17,8 @@ let
"x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
"x86_64-windows" "i686-windows" "x86_64-windows" "i686-windows"
"wasm64-wasi" "wasm32-wasi"
]; ];
allParsed = map parse.mkSystemFromString all; allParsed = map parse.mkSystemFromString all;
@ -45,6 +47,7 @@ in rec {
netbsd = filterDoubles predicates.isNetBSD; netbsd = filterDoubles predicates.isNetBSD;
openbsd = filterDoubles predicates.isOpenBSD; openbsd = filterDoubles predicates.isOpenBSD;
unix = filterDoubles predicates.isUnix; unix = filterDoubles predicates.isUnix;
wasi = filterDoubles predicates.isWasi;
windows = filterDoubles predicates.isWindows; windows = filterDoubles predicates.isWindows;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"];

14
lib/systems/examples.nix
View File

@ -116,7 +116,7 @@ rec {
config = "aarch64-none-elf"; config = "aarch64-none-elf";
libc = "newlib"; libc = "newlib";
}; };
aarch64be-embedded = { aarch64be-embedded = {
config = "aarch64_be-none-elf"; config = "aarch64_be-none-elf";
libc = "newlib"; libc = "newlib";
@ -126,7 +126,7 @@ rec {
config = "powerpc-none-eabi"; config = "powerpc-none-eabi";
libc = "newlib"; libc = "newlib";
}; };
ppcle-embedded = { ppcle-embedded = {
config = "powerpcle-none-eabi"; config = "powerpcle-none-eabi";
libc = "newlib"; libc = "newlib";
@ -211,4 +211,14 @@ rec {
config = "x86_64-unknown-netbsd"; config = "x86_64-unknown-netbsd";
libc = "nblibc"; libc = "nblibc";
}; };
#
# WASM
#
wasi32 = {
config = "wasm32-unknown-wasi";
useLLVM = true;
};
} }

1
lib/systems/for-meta.nix
View File

@ -32,6 +32,7 @@ in rec {
openbsd = [ patterns.isOpenBSD ]; openbsd = [ patterns.isOpenBSD ];
unix = patterns.isUnix; # Actually a list unix = patterns.isUnix; # Actually a list
windows = [ patterns.isWindows ]; windows = [ patterns.isWindows ];
wasi = [ patterns.isWasi ];
inherit (lib.systems.doubles) mesaPlatforms; inherit (lib.systems.doubles) mesaPlatforms;
} }

1
lib/systems/inspect.nix
View File

@ -43,6 +43,7 @@ rec {
isWindows = { kernel = kernels.windows; }; isWindows = { kernel = kernels.windows; };
isCygwin = { kernel = kernels.windows; abi = abis.cygnus; }; isCygwin = { kernel = kernels.windows; abi = abis.cygnus; };
isMinGW = { kernel = kernels.windows; abi = abis.gnu; }; isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
isWasi = { kernel = kernels.wasi; };
isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];

38
lib/systems/parse.nix
View File

@ -69,24 +69,24 @@ rec {
cpuTypes = with significantBytes; setTypes types.openCpuType { cpuTypes = with significantBytes; setTypes types.openCpuType {
arm = { bits = 32; significantByte = littleEndian; family = "arm"; }; arm = { bits = 32; significantByte = littleEndian; family = "arm"; };
armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; }; armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; arch = "armv5t"; };
armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; }; armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6-m"; };
armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; }; armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6"; };
armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-a"; };
armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-r"; };
armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-m"; };
armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7"; };
armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-m"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; }; aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; }; aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
i386 = { bits = 32; significantByte = littleEndian; family = "x86"; }; i386 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i386"; };
i486 = { bits = 32; significantByte = littleEndian; family = "x86"; }; i486 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i486"; };
i586 = { bits = 32; significantByte = littleEndian; family = "x86"; }; i586 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i586"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i686"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; arch = "x86-64"; };
mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
@ -226,6 +226,7 @@ rec {
elf = {}; elf = {};
macho = {}; macho = {};
pe = {}; pe = {};
wasm = {};
unknown = {}; unknown = {};
}; };
@ -268,6 +269,7 @@ rec {
none = { execFormat = unknown; families = { }; }; none = { execFormat = unknown; families = { }; };
openbsd = { execFormat = elf; families = { inherit bsd; }; }; openbsd = { execFormat = elf; families = { inherit bsd; }; };
solaris = { execFormat = elf; families = { }; }; solaris = { execFormat = elf; families = { }; };
wasi = { execFormat = wasm; families = { }; };
windows = { execFormat = pe; families = { }; }; windows = { execFormat = pe; families = { }; };
} // { # aliases } // { # aliases
# 'darwin' is the kernel for all of them. We choose macOS by default. # 'darwin' is the kernel for all of them. We choose macOS by default.
@ -376,6 +378,8 @@ rec {
then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; } then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; }
else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; } then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; }
else if (elemAt l 2 == "wasi")
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "wasi"; }
else if hasPrefix "netbsd" (elemAt l 2) else if hasPrefix "netbsd" (elemAt l 2)
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"]) else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])

2
lib/tests/systems.nix
View File

@ -12,7 +12,7 @@ let
expected = lib.sort lib.lessThan y; expected = lib.sort lib.lessThan y;
}; };
in with lib.systems.doubles; lib.runTests { in with lib.systems.doubles; lib.runTests {
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ windows); testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows);
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ];

2
nixos/modules/programs/dconf.nix
View File

@ -38,7 +38,7 @@ in
"${pkgs.gnome3.dconf.lib}/lib/gio/modules"; "${pkgs.gnome3.dconf.lib}/lib/gio/modules";
# https://github.com/NixOS/nixpkgs/pull/31891 # https://github.com/NixOS/nixpkgs/pull/31891
#environment.variables.XDG_DATA_DIRS = optional cfg.enable #environment.variables.XDG_DATA_DIRS = optional cfg.enable
# "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; # "$(echo ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
}; };
} }

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -18,7 +18,7 @@ let
nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; }
'' ''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas cp -rf ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages} ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}

4
pkgs/applications/audio/radiotray-ng/default.nix
View File

@ -10,7 +10,7 @@
# GUI/Desktop # GUI/Desktop
, dbus , dbus
, glibmm , glibmm
, gnome3 , gsettings-desktop-schemas
, hicolor-icon-theme , hicolor-icon-theme
, libappindicator-gtk3 , libappindicator-gtk3
, libnotify , libnotify
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl curl
boost jsoncpp libbsd pcre boost jsoncpp libbsd pcre
glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify glibmm hicolor-icon-theme gsettings-desktop-schemas libappindicator-gtk3 libnotify
libxdg_basedir libxdg_basedir
lsb-release lsb-release
wxGTK wxGTK

4
pkgs/applications/audio/sonata/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook { stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook
, python3Packages, gnome3, gtk3, gobject-introspection}: , python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }:
let let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2; inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
@ -20,7 +20,7 @@ in buildPythonApplication rec {
buildInputs = [ buildInputs = [
intltool wrapGAppsHook intltool wrapGAppsHook
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
postPatch = '' postPatch = ''

4
pkgs/applications/audio/sound-juicer/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero { stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero
, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
, wrapGAppsHook }: , gsettings-desktop-schemas, wrapGAppsHook }:
let let
pname = "sound-juicer"; pname = "sound-juicer";
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec{
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [ buildInputs = [
glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
gst_all_1.gst-libav gst_all_1.gst-libav

4
pkgs/applications/graphics/glabels/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook { stdenv, fetchurl, barcode, gnome3, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme , intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
buildInputs = [ buildInputs = [
barcode gtk3 gtk-doc gnome3.yelp-tools barcode gtk3 gtk-doc gnome3.yelp-tools
gnome3.gnome-common gnome3.gsettings-desktop-schemas gnome3.gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool itstool libxml2 librsvg libe-book libtool
hicolor-icon-theme hicolor-icon-theme
]; ];

3
pkgs/applications/graphics/shotwell/default.nix
View File

@ -32,6 +32,7 @@
, itstool , itstool
, libgdata , libgdata
, libchamplain , libchamplain
, gsettings-desktop-schemas
, python3 , python3
}: }:
@ -73,7 +74,7 @@ stdenv.mkDerivation rec {
libgee libgee
libgudev libgudev
gexiv2 gexiv2
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
libraw libraw
json-glib json-glib
glib glib

3
pkgs/applications/misc/notify-osd-customizable/default.nix
View File

@ -8,6 +8,7 @@
, libwnck3 , libwnck3
, makeWrapper , makeWrapper
, pkgconfig , pkgconfig
, gsettings-desktop-schemas
}: }:
let baseURI = "https://launchpad.net/~leolik/+archive/leolik"; let baseURI = "https://launchpad.net/~leolik/+archive/leolik";
@ -26,7 +27,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
glib libwnck3 libnotify dbus-glib makeWrapper glib libwnck3 libnotify dbus-glib makeWrapper
gnome3.gsettings-desktop-schemas gnome3.gnome-common gsettings-desktop-schemas gnome3.gnome-common
libtool libtool
]; ];

4
pkgs/applications/misc/notify-osd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }: { stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "notify-osd-${version}"; name = "notify-osd-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
glib libwnck3 libnotify dbus-glib makeWrapper glib libwnck3 libnotify dbus-glib makeWrapper
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
configureFlags = [ "--libexecdir=$(out)/bin" ]; configureFlags = [ "--libexecdir=$(out)/bin" ];

4
pkgs/applications/misc/xmr-stak/default.nix
View File

@ -12,13 +12,13 @@ in
stdenv'.mkDerivation rec { stdenv'.mkDerivation rec {
name = "xmr-stak-${version}"; name = "xmr-stak-${version}";
version = "2.10.1"; version = "2.10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fireice-uk"; owner = "fireice-uk";
repo = "xmr-stak"; repo = "xmr-stak";
rev = "${version}"; rev = "${version}";
sha256 = "0381r4nr5cx0zv3dhsvld4ibpp5gq911815h03v92688za3swhng"; sha256 = "0f3cs0jw0yn8lbcm43m34dnvvgr4qpb8wa176vh4whk7bbjkw7lz";
}; };
NIX_CFLAGS_COMPILE = "-O3"; NIX_CFLAGS_COMPILE = "-O3";

4
pkgs/applications/misc/xmrig/proxy.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xmrig-proxy-${version}"; name = "xmrig-proxy-${version}";
version = "2.14.0"; version = "2.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xmrig"; owner = "xmrig";
repo = "xmrig-proxy"; repo = "xmrig-proxy";
rev = "v${version}"; rev = "v${version}";
sha256 = "0yw9g18blrwncy1ya9iwbfx8l7bs0v6nmnkk71bxz4zj9d8dkal3"; sha256 = "1sw00qz4yg8cwmm3s64bqr3lki6bxmlsi4ankyy2l4dx1vs9kf6r";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/applications/networking/syncthing-gtk/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3
, bcrypt, gobject-introspection }: , bcrypt, gobject-introspection, gsettings-desktop-schemas }:
buildPythonApplication rec { buildPythonApplication rec {
version = "0.9.4"; version = "0.9.4";
@ -24,7 +24,7 @@ buildPythonApplication rec {
gtk3 librsvg libappindicator-gtk3 gtk3 librsvg libappindicator-gtk3
libnotify gnome3.adwaita-icon-theme libnotify gnome3.adwaita-icon-theme
# Schemas with proxy configuration # Schemas with proxy configuration
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/applications/office/zotero/default.nix
View File

@ -36,11 +36,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zotero-${version}"; name = "zotero-${version}";
version = "5.0.60"; version = "5.0.66";
src = fetchurl { src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "0753xk95shhxma4dvdxrj2q6y81z8lianxg7jnab9m17fb67jy2d"; sha256 = "1dpcwpag95a4r46z03a3gqklis0q7nzqgjg34qfxxxb2lr7s1lsm";
}; };
buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];

4
pkgs/applications/video/pitivi/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
, python3Packages, gst_all_1, gtk3 , python3Packages, gst_all_1, gtk3
, gobject-introspection, librsvg, gnome3, libnotify, gsound , gobject-introspection, librsvg, gnome3, libnotify, gsound
, meson, ninja , meson, ninja, gsettings-desktop-schemas
}: }:
let let
@ -49,7 +49,7 @@ in python3Packages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libnotify gsettings-desktop-schemas libnotify
gst-transcoder gst-transcoder
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gst-editing-services gstreamer gst-editing-services

3
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -191,7 +191,8 @@ stdenv.mkDerivation {
else if targetPlatform.isAvr then "avr" else if targetPlatform.isAvr then "avr"
else if targetPlatform.isAlpha then "alpha" else if targetPlatform.isAlpha then "alpha"
else throw "unknown emulation for platform: ${targetPlatform.config}"; else throw "unknown emulation for platform: ${targetPlatform.config}";
in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); in if targetPlatform.useLLVM or false then ""
else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
strictDeps = true; strictDeps = true;
depsTargetTargetPropagated = extraPackages; depsTargetTargetPropagated = extraPackages;

5
pkgs/build-support/cc-wrapper/add-flags.sh
View File

@ -6,6 +6,7 @@
var_templates_list=( var_templates_list=(
NIX+CFLAGS_COMPILE NIX+CFLAGS_COMPILE
NIX+CFLAGS_COMPILE_BEFORE
NIX+CFLAGS_LINK NIX+CFLAGS_LINK
NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_COMPILE
NIX+CXXSTDLIB_LINK NIX+CXXSTDLIB_LINK
@ -43,5 +44,9 @@ if [ -e @out@/nix-support/cc-ldflags ]; then
NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)"
fi fi
if [ -e @out@/nix-support/cc-cflags-before ]; then
NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE="$(< @out@/nix-support/cc-cflags-before) $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE"
fi
# That way forked processes will not extend these environment variables again. # That way forked processes will not extend these environment variables again.
export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1 export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1

2
pkgs/build-support/cc-wrapper/cc-wrapper.sh
View File

@ -135,7 +135,7 @@ source @out@/nix-support/add-hardening.sh
# Add the flags for the C compiler proper. # Add the flags for the C compiler proper.
extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE) extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE)
extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"}) extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE)
if [ "$dontLink" != 1 ]; then if [ "$dontLink" != 1 ]; then

72
pkgs/build-support/cc-wrapper/default.nix
View File

@ -63,6 +63,25 @@ let
then import ../expand-response-params { inherit (buildPackages) stdenv; } then import ../expand-response-params { inherit (buildPackages) stdenv; }
else ""; else "";
# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
isGccArchSupported = arch:
if cc.isGNU or false then
{ skylake = versionAtLeast ccVersion "6.0";
skylake-avx512 = versionAtLeast ccVersion "6.0";
cannonlake = versionAtLeast ccVersion "8.0";
icelake-client = versionAtLeast ccVersion "8.0";
icelake-server = versionAtLeast ccVersion "8.0";
knm = versionAtLeast ccVersion "8.0";
}.${arch} or true
else if cc.isClang or false then
{ cannonlake = versionAtLeast ccVersion "5.0";
icelake-client = versionAtLeast ccVersion "7.0";
icelake-server = versionAtLeast ccVersion "7.0";
knm = versionAtLeast ccVersion "7.0";
}.${arch} or true
else
false;
in in
# Ensure bintools matches # Ensure bintools matches
@ -279,23 +298,56 @@ stdenv.mkDerivation {
export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}" export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}"
'' ''
# Machine flags. These are necessary to support
# TODO: We should make a way to support miscellaneous machine
# flags and other gcc flags as well.
# Always add -march based on cpu in triple. Sometimes there is a
# discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
# that case.
+ optionalString ((targetPlatform ? platform.gcc.arch) &&
isGccArchSupported targetPlatform.platform.gcc.arch) ''
echo "-march=${targetPlatform.platform.gcc.arch}" >> $out/nix-support/cc-cflags-before
''
# -mcpu is not very useful. You should use mtune and march
# instead. It’s provided here for backwards compatibility.
+ optionalString (targetPlatform ? platform.gcc.cpu) ''
echo "-mcpu=${targetPlatform.platform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
''
# -mfloat-abi only matters on arm32 but we set it here
# unconditionally just in case. If the abi specifically sets hard
# vs. soft floats we use it here.
+ optionalString (targetPlatform ? platform.gcc.float-abi) ''
echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
''
+ optionalString (targetPlatform ? platform.gcc.fpu) ''
echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
''
+ optionalString (targetPlatform ? platform.gcc.mode) ''
echo "-mmode=${targetPlatform.platform.gcc.mode}" >> $out/nix-support/cc-cflags-before
''
+ optionalString (targetPlatform ? platform.gcc.tune &&
isGccArchSupported targetPlatform.platform.gcc.tune) ''
echo "-mtune=${targetPlatform.platform.gcc.tune}" >> $out/nix-support/cc-cflags-before
''
# TODO: categorize these and figure out a better place for them
+ optionalString hostPlatform.isCygwin '' + optionalString hostPlatform.isCygwin ''
hardening_unsupported_flags+=" pic" hardening_unsupported_flags+=" pic"
'' '' + optionalString targetPlatform.isMinGW ''
+ optionalString targetPlatform.isMinGW ''
hardening_unsupported_flags+=" stackprotector" hardening_unsupported_flags+=" stackprotector"
'' '' + optionalString targetPlatform.isAvr ''
+ optionalString targetPlatform.isAvr ''
hardening_unsupported_flags+=" stackprotector pic" hardening_unsupported_flags+=" stackprotector pic"
'' '' + optionalString (targetPlatform.libc == "newlib") ''
hardening_unsupported_flags+=" stackprotector fortify pie pic"
+ optionalString targetPlatform.isNetBSD '' '' + optionalString targetPlatform.isNetBSD ''
hardening_unsupported_flags+=" stackprotector fortify" hardening_unsupported_flags+=" stackprotector fortify"
'' ''
+ optionalString (targetPlatform.libc == "newlib") '' + optionalString targetPlatform.isWasm ''
hardening_unsupported_flags+=" stackprotector fortify pie pic" hardening_unsupported_flags+=" stackprotector fortify pie pic"
'' ''

21
pkgs/build-support/libredirect/libredirect.c
View File

@ -91,6 +91,20 @@ int open64(const char * path, int flags, ...)
return open64_real(rewrite(path, buf), flags, mode); return open64_real(rewrite(path, buf), flags, mode);
} }
int openat(int dirfd, const char * path, int flags, ...)
{
int (*openat_real) (int, const char *, int, mode_t) = dlsym(RTLD_NEXT, "openat");
mode_t mode = 0;
if (flags & O_CREAT) {
va_list ap;
va_start(ap, flags);
mode = va_arg(ap, mode_t);
va_end(ap);
}
char buf[PATH_MAX];
return openat_real(dirfd, rewrite(path, buf), flags, mode);
}
FILE * fopen(const char * path, const char * mode) FILE * fopen(const char * path, const char * mode)
{ {
FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen"); FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen");
@ -152,3 +166,10 @@ int execv(const char *path, char *const argv[])
char buf[PATH_MAX]; char buf[PATH_MAX];
return execv_real(rewrite(path, buf), argv); return execv_real(rewrite(path, buf), argv);
} }
void *dlopen(const char *filename, int flag)
{
void * (*__dlopen_real) (const char *, int) = dlsym(RTLD_NEXT, "dlopen");
char buf[PATH_MAX];
return __dlopen_real(rewrite(filename, buf), flag);
}

4
pkgs/desktops/gnome-3/apps/glade/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, intltool, fetchurl, python3 { stdenv, intltool, fetchurl, python3
, pkgconfig, gtk3, glib, gobject-introspection , pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, libxml2, docbook_xsl , wrapGAppsHook, itstool, libxml2, docbook_xsl
, gnome3, gdk_pixbuf, libxslt }: , gnome3, gdk_pixbuf, libxslt, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glade-${version}"; name = "glade-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib libxml2 python3 python3.pkgs.pygobject3 gtk3 glib libxml2 python3 python3.pkgs.pygobject3
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme gdk_pixbuf gnome3.adwaita-icon-theme
]; ];

4
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
View File

@ -4,7 +4,7 @@
, gnome-desktop, libzapojit, libgepub , gnome-desktop, libzapojit, libgepub
, gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42 , gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
, gobject-introspection, inkscape, poppler_utils , gobject-introspection, inkscape, poppler_utils
, desktop-file-utils, wrapGAppsHook, python3 }: , desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-documents-${version}"; name = "gnome-documents-${version}";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
inkscape poppler_utils # building getting started inkscape poppler_utils # building getting started
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas gtk3 glib gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme evince gdk_pixbuf gnome3.adwaita-icon-theme evince
libsoup webkitgtk gjs gobject-introspection libsoup webkitgtk gjs gobject-introspection
tracker tracker-miners libgdata tracker tracker-miners libgdata

4
pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils
, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3 }: , gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-logs-${version}"; name = "gnome-logs-${version}";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
libxml2 libxslt docbook_xsl docbook_xml_dtd_43 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
]; ];
buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
postPatch = '' postPatch = ''
chmod +x meson_post_install.py chmod +x meson_post_install.py

4
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3 { stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3
, gobject-introspection, gdk_pixbuf, librsvg, libgweather , gobject-introspection, gdk_pixbuf, librsvg, libgweather
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup, gsettings-desktop-schemas
, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }: , webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
let let
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
gtk3 geoclue2 gjs libgee folks gfbgraph gtk3 geoclue2 gjs libgee folks gfbgraph
geocode-glib libchamplain libsoup geocode-glib libchamplain libsoup
gdk_pixbuf librsvg libgweather gdk_pixbuf librsvg libgweather
gnome3.gsettings-desktop-schemas evolution-data-server gsettings-desktop-schemas evolution-data-server
gnome-online-accounts gnome3.adwaita-icon-theme gnome-online-accounts gnome3.adwaita-icon-theme
webkitgtk webkitgtk
]; ];

4
pkgs/desktops/gnome-3/apps/gnome-music/default.nix
View File

@ -2,7 +2,7 @@
, libxml2, python3, libnotify, wrapGAppsHook, libmediaart , libxml2, python3, libnotify, wrapGAppsHook, libmediaart
, gobject-introspection, gnome-online-accounts, grilo, grilo-plugins , gobject-introspection, gnome-online-accounts, grilo, grilo-plugins
, pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib , pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib
, itstool, gnome3, gst_all_1, libdazzle, libsoup }: , itstool, gnome3, gst_all_1, libdazzle, libsoup, gsettings-desktop-schemas }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "gnome-music"; pname = "gnome-music";
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
gtk3 glib libmediaart gnome-online-accounts gobject-introspection gtk3 glib libmediaart gnome-online-accounts gobject-introspection
gdk_pixbuf gnome3.adwaita-icon-theme python3 gdk_pixbuf gnome3.adwaita-icon-theme python3
grilo grilo-plugins libnotify libdazzle libsoup grilo grilo-plugins libnotify libdazzle libsoup
gnome3.gsettings-desktop-schemas tracker gsettings-desktop-schemas tracker
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
]; ];
propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python pygobject3 ]; propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python pygobject3 ];

4
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
View File

@ -2,7 +2,7 @@
, wrapGAppsHook, itstool, desktop-file-utils, python3 , wrapGAppsHook, itstool, desktop-file-utils, python3
, glib, gtk3, evolution-data-server , glib, gtk3, evolution-data-server
, libuuid, webkitgtk, zeitgeist , libuuid, webkitgtk, zeitgeist
, gnome3, libxml2 }: , gnome3, libxml2, gsettings-desktop-schemas }:
let let
version = "3.32.1"; version = "3.32.1";
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib gtk3 libuuid webkitgtk gnome3.tracker glib gtk3 libuuid webkitgtk gnome3.tracker
gnome3.gnome-online-accounts zeitgeist gnome3.gnome-online-accounts zeitgeist
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
evolution-data-server evolution-data-server
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];

4
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
View File

@ -4,7 +4,7 @@
, grilo, gnome-online-accounts , grilo, gnome-online-accounts
, desktop-file-utils, wrapGAppsHook , desktop-file-utils, wrapGAppsHook
, gnome3, gdk_pixbuf, gexiv2, geocode-glib , gnome3, gdk_pixbuf, gexiv2, geocode-glib
, dleyna-renderer, dbus, meson, ninja, python3 }: , dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }:
let let
pname = "gnome-photos"; pname = "gnome-photos";
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gegl babl libgdata libdazzle gtk3 glib gegl babl libgdata libdazzle
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme gdk_pixbuf gnome3.adwaita-icon-theme
gfbgraph grilo-plugins grilo gfbgraph grilo-plugins grilo
gnome-online-accounts tracker gnome-online-accounts tracker

4
pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection
, libgweather, meson, ninja, geoclue2, gnome-desktop, python3 }: , libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-weather-${version}"; name = "gnome-weather-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
buildInputs = [ buildInputs = [
gtk3 gjs gobject-introspection gnome-desktop gtk3 gjs gobject-introspection gnome-desktop
libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas
]; ];
postPatch = '' postPatch = ''

4
pkgs/desktops/gnome-3/apps/polari/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme { stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme
, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
, pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib , pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib
, gnome3, wrapGAppsHook, telepathy-logger, gspell }: , gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }:
let let
pname = "polari"; pname = "polari";
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas gtk3 glib adwaita-icon-theme gsettings-desktop-schemas
telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup
]; ];

4
pkgs/desktops/gnome-3/apps/seahorse/default.nix
View File

@ -2,7 +2,7 @@
, pkgconfig, gtk3, glib, gobject-introspection , pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, gnupg, libsoup , wrapGAppsHook, itstool, gnupg, libsoup
, gnome3, gpgme, python3, openldap, gcr , gnome3, gpgme, python3, openldap, gcr
, libsecret, avahi, p11-kit, openssh }: , libsecret, avahi, p11-kit, openssh, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "seahorse"; pname = "seahorse";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gcr gtk3 glib gcr
gnome3.gsettings-desktop-schemas gnupg gsettings-desktop-schemas gnupg
gnome3.adwaita-icon-theme gpgme gnome3.adwaita-icon-theme gpgme
libsecret avahi libsoup p11-kit libsecret avahi libsoup p11-kit
openssh openldap libpwquality openssh openldap libpwquality

4
pkgs/desktops/gnome-3/core/empathy/default.nix
View File

@ -6,7 +6,7 @@
, telepathy-logger, libnotify, clutter, libsoup, gnutls , telepathy-logger, libnotify, clutter, libsoup, gnutls
, evolution-data-server, yelp-xsl , evolution-data-server, yelp-xsl
, libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info , libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info
, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee , wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee, gsettings-desktop-schemas
, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gcr libsecret libpulseaudio gdk_pixbuf gcr libsecret libpulseaudio gdk_pixbuf
libnotify clutter libsoup gnutls libgee p11-kit libnotify clutter libsoup gnutls libgee p11-kit
libcanberra-gtk3 telepathy-farstream farstream libcanberra-gtk3 telepathy-farstream farstream
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme gsettings-desktop-schemas
librsvg librsvg
# Spell-checking # Spell-checking
enchant isocodes enchant isocodes

4
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3 }: , gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }:
let let
pname = "gnome-bluetooth"; pname = "gnome-bluetooth";
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
glib gtk3 udev libnotify libcanberra-gtk3 glib gtk3 udev libnotify libcanberra-gtk3
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme gsettings-desktop-schemas
]; ];
mesonFlags = [ mesonFlags = [

4
pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3
, gnome3, mpfr, gmp, libsoup, libmpc }: , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-calculator-${version}"; name = "gnome-calculator-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 glib libxml2 gtksourceview4 mpfr gmp gtk3 glib libxml2 gtksourceview4 mpfr gmp
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libsoup libmpc gsettings-desktop-schemas libsoup libmpc
]; ];
doCheck = true; doCheck = true;

4
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
View File

@ -2,7 +2,7 @@
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese , pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib , wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
, vala, meson, ninja, libhandy }: , vala, meson, ninja, libhandy, gsettings-desktop-schemas }:
let let
version = "3.32"; version = "3.32";
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas gtk3 glib evolution-data-server gsettings-desktop-schemas
folks gnome-desktop telepathy-glib libhandy folks gnome-desktop telepathy-glib libhandy
libxml2 gnome-online-accounts cheese libxml2 gnome-online-accounts cheese
gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib

4
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch
, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: , libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-desktop-${version}"; name = "gnome-desktop-${version}";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
gtk3 glib libseccomp gtk3 glib libseccomp
]; ];
propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ gsettings-desktop-schemas ];
patches = [ patches = [
(substituteAll { (substituteAll {

4
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt { stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt
, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
, gnome3, gtk3, glib }: , gnome3, gtk3, glib, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-dictionary-${version}"; name = "gnome-dictionary-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43
]; ];
buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {

4
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
, itstool, gnome3, libxml2 , itstool, gnome3, libxml2, gsettings-desktop-schemas
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
udisks2 gnome3.adwaita-icon-theme udisks2 gnome3.adwaita-icon-theme
gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas gnome3.gnome-settings-daemon gsettings-desktop-schemas
]; ];
postPatch = '' postPatch = ''

4
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3
, gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils
, gnome3 }: , gnome3, gsettings-desktop-schemas }:
let let
pname = "gnome-screenshot"; pname = "gnome-screenshot";
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
passthru = { passthru = {

6
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret { fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou , libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
@ -10,7 +10,7 @@
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
let let
pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] );
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "gnome-shell-${version}"; name = "gnome-shell-${version}";
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
sassc desktop-file-utils libxslt.bin sassc desktop-file-utils libxslt.bin python3
]; ];
buildInputs = [ buildInputs = [
systemd caribou systemd caribou

4
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit { stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit
, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 , bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3
, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-system-monitor-${version}"; name = "gnome-system-monitor-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg
gnome3.gsettings-desktop-schemas systemd gsettings-desktop-schemas systemd
]; ];
postPatch = '' postPatch = ''

4
pkgs/desktops/gnome-3/core/nautilus/default.nix
View File

@ -2,7 +2,7 @@
, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
, substituteAll, bubblewrap, gst_all_1 , substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas
}: }:
let let
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme gsettings-desktop-schemas
]; ];
propagatedBuildInputs = [ gnome-autoar ]; propagatedBuildInputs = [ gnome-autoar ];

5
pkgs/desktops/gnome-3/default.nix
View File

@ -84,7 +84,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gjs = callPackage ./core/gjs { }; gjs = callPackage ./core/gjs { };
glib-networking = pkgs.glib-networking.override { glib-networking = pkgs.glib-networking.override {
inherit gsettings-desktop-schemas; inherit (pkgs) gsettings-desktop-schemas;
}; };
gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
@ -145,8 +145,6 @@ lib.makeScope pkgs.newScope (self: with self; {
grilo-plugins = callPackage ./core/grilo-plugins { }; grilo-plugins = callPackage ./core/grilo-plugins { };
gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { };
gucharmap = callPackage ./core/gucharmap { }; gucharmap = callPackage ./core/gucharmap { };
gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
@ -395,6 +393,7 @@ lib.makeScope pkgs.newScope (self: with self; {
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
defaultIconTheme = adwaita-icon-theme; defaultIconTheme = adwaita-icon-theme;
gtk = gtk3; gtk = gtk3;
gtkmm = gtkmm3; gtkmm = gtkmm3;

4
pkgs/desktops/gnome-3/devtools/anjuta/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
gdl, libgda, gtksourceview, gdl, libgda, gtksourceview, gsettings-desktop-schemas,
itstool, python3, ncurses, makeWrapper }: itstool, python3, ncurses, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
flex bison gtk3 libxml2 gnome3.gjs gdl flex bison gtk3 libxml2 gnome3.gjs gdl
libgda gtksourceview libgda gtksourceview
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
preFixup = '' preFixup = ''

4
pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, meson, ninja, gettext, fetchurl { stdenv, meson, ninja, gettext, fetchurl
, pkgconfig, gtk3, glib, libsoup , pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas
, itstool, libxml2, python3Packages , itstool, libxml2, python3Packages
, gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }: , gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas gtk3 glib gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme gdk_pixbuf gnome3.adwaita-icon-theme
libnotify gnome3.gnome-shell python3Packages.pygobject3 libnotify gnome3.gnome-shell python3Packages.pygobject3
libsoup gnome3.gnome-settings-daemon gnome3.nautilus libsoup gnome3.gnome-settings-daemon gnome3.nautilus

4
pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool { stdenv, fetchurl, pkgconfig, gtk3, intltool
, gnome3, enchant, isocodes }: , gnome3, enchant, isocodes, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkhtml-${version}"; name = "gtkhtml-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas ]; gsettings-desktop-schemas ];
propagatedBuildInputs = [ enchant isocodes ]; propagatedBuildInputs = [ enchant isocodes ];

6
pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas { stdenv, runCommand, mutter, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas
, extraGSettingsOverrides ? "" , extraGSettingsOverrides ? ""
, extraGSettingsOverridePackages ? [] , extraGSettingsOverridePackages ? []
}: }:
@ -9,7 +9,7 @@ let
elementary-settings-daemon elementary-settings-daemon
epiphany epiphany
gala gala
gnome3.mutter mutter
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
plank plank
@ -23,7 +23,7 @@ with stdenv.lib;
runCommand "elementary-gsettings-desktop-schemas" {} runCommand "elementary-gsettings-desktop-schemas" {}
'' ''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas cp -rf ${gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages} ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages}

21
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
View File

@ -90,26 +90,7 @@ rec {
echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags
echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags
'' '';
+ lib.optionalString stdenv.targetPlatform.isAarch32 (let
p = stdenv.targetPlatform.platform.gcc or {}
// stdenv.targetPlatform.parsed.abi;
flags = lib.concatLists [
(lib.optional (p ? arch) "-march=${p.arch}")
(lib.optional (p ? cpu) "-mcpu=${p.cpu}")
(lib.optional (p ? abi) "-mabi=${p.abi}")
(lib.optional (p ? fpu) "-mfpu=${p.fpu}")
(lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}")
(lib.optional (p ? mode) "-mmode=${p.mode}")
];
in ''
sed -E -i \
$out/bin/${stdenv.targetPlatform.config}-cc \
$out/bin/${stdenv.targetPlatform.config}-c++ \
$out/bin/${stdenv.targetPlatform.config}-clang \
$out/bin/${stdenv.targetPlatform.config}-clang++ \
-e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|'
'');
}; };
# Bionic lib C and other libraries. # Bionic lib C and other libraries.

2
pkgs/development/compilers/gcc/common/platform-flags.nix
View File

@ -4,7 +4,7 @@ let
p = targetPlatform.platform.gcc or {} p = targetPlatform.platform.gcc or {}
// targetPlatform.parsed.abi; // targetPlatform.parsed.abi;
in lib.concatLists [ in lib.concatLists [
(lib.optional (p ? arch) "--with-arch=${p.arch}") (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64
(lib.optional (p ? cpu) "--with-cpu=${p.cpu}") (lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
(lib.optional (p ? abi) "--with-abi=${p.abi}") (lib.optional (p ? abi) "--with-abi=${p.abi}")
(lib.optional (p ? fpu) "--with-fpu=${p.fpu}") (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")

4
pkgs/development/compilers/llvm/8/compiler-rt.nix
View File

@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
"-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
''; '';
# Hack around weird upsream RPATH bug # Hack around weird upsream RPATH bug
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib" ln -s "$out/lib"/*/* "$out/lib"
'' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o

4
pkgs/development/compilers/llvm/8/default.nix
View File

@ -97,13 +97,17 @@ let
targetLlvmLibraries.libcxx targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt targetLlvmLibraries.compiler-rt
] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
targetLlvmLibraries.libunwind targetLlvmLibraries.libunwind
]; ];
extraBuildCommands = '' extraBuildCommands = ''
echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
echo "-fno-exceptions" >> $out/nix-support/cc-cflags
'' + mkExtraBuildCommands cc; '' + mkExtraBuildCommands cc;
}; };

17
pkgs/development/compilers/llvm/8/libc++/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version
, enableShared ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libc++-${version}"; name = "libc++-${version}";
@ -22,7 +23,8 @@ stdenv.mkDerivation rec {
'' + lib.optionalString stdenv.hostPlatform.isMusl '' '' + lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py patchShebangs utils/cat_files.py
''; '';
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
@ -30,8 +32,13 @@ stdenv.mkDerivation rec {
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
"-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_LIBCPPABI_VERSION=2"
"-DLIBCXX_CXX_ABI=libcxxabi" "-DLIBCXX_CXX_ABI=libcxxabi"
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"; ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
"-DLIBCXX_ENABLE_THREADS=OFF"
"-DLIBCXX_ENABLE_FILESYSTEM=OFF"
"-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
enableParallelBuilding = true; enableParallelBuilding = true;
@ -46,6 +53,6 @@ stdenv.mkDerivation rec {
homepage = http://libcxx.llvm.org/; homepage = http://libcxx.llvm.org/;
description = "A new implementation of the C++ standard library, targeting C++11"; description = "A new implementation of the C++ standard library, targeting C++11";
license = with stdenv.lib.licenses; [ ncsa mit ]; license = with stdenv.lib.licenses; [ ncsa mit ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.all;
}; };
} }

19
pkgs/development/compilers/llvm/8/libc++abi.nix
View File

@ -1,4 +1,5 @@
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: { stdenv, cmake, fetch, libcxx, libunwind, llvm, version
, enableShared ? true }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libc++abi-${version}"; name = "libc++abi-${version}";
@ -6,13 +7,20 @@ stdenv.mkDerivation {
src = fetch "libcxxabi" "1k875f977ybdkpdnr9105wa6hccy9qvpd9xd42n75h7p56bdxmn2"; src = fetch "libcxxabi" "1k875f977ybdkpdnr9105wa6hccy9qvpd9xd42n75h7p56bdxmn2";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLLVM_ENABLE_LIBCXX=ON" "-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXXABI_ENABLE_THREADS=OFF"
"-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
] ++ stdenv.lib.optionals (!enableShared) [
"-DLIBCXXABI_ENABLE_SHARED=OFF"
]; ];
patches = [ ./libcxxabi-no-threads.patch ];
postUnpack = '' postUnpack = ''
unpackFile ${libcxx.src} unpackFile ${libcxx.src}
unpackFile ${llvm.src} unpackFile ${llvm.src}
@ -21,6 +29,8 @@ stdenv.mkDerivation {
export TRIPLE=x86_64-apple-darwin export TRIPLE=x86_64-apple-darwin
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
'' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
''; '';
installPhase = if stdenv.isDarwin installPhase = if stdenv.isDarwin
@ -39,8 +49,9 @@ stdenv.mkDerivation {
else '' else ''
install -d -m 755 $out/include $out/lib install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib install -m 644 lib/libc++abi.a $out/lib
install -m 644 lib/libc++abi.so.1.0 $out/lib
install -m 644 ../include/cxxabi.h $out/include install -m 644 ../include/cxxabi.h $out/include
'' + stdenv.lib.optionalString enableShared ''
install -m 644 lib/libc++abi.so.1.0 $out/lib
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
''; '';
@ -50,6 +61,6 @@ stdenv.mkDerivation {
description = "A new implementation of low level support for a standard C++ library"; description = "A new implementation of low level support for a standard C++ library";
license = with stdenv.lib.licenses; [ ncsa mit ]; license = with stdenv.lib.licenses; [ ncsa mit ];
maintainers = with stdenv.lib.maintainers; [ vlstill ]; maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.all;
}; };
} }

12
pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4138acf..41b4763 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS)
" is also set to ON.")
endif()
add_definitions(-D_LIBCXXABI_HAS_NO_THREADS)
+ add_definitions(-D_LIBCPP_HAS_NO_THREADS)
endif()
if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)

16
pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
index 15497d405e0..33f7f18193a 100644
--- a/cmake/modules/HandleLLVMOptions.cmake
+++ b/cmake/modules/HandleLLVMOptions.cmake
@@ -127,7 +127,10 @@ else(WIN32)
set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)
endif()
else(FUCHSIA OR UNIX)
- MESSAGE(SEND_ERROR "Unable to determine platform")
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi")
+ else()
+ MESSAGE(SEND_ERROR "Unable to determine platform")
+ endif()
endif(FUCHSIA OR UNIX)
endif(WIN32)

8
pkgs/development/interpreters/perl/default.nix
View File

@ -171,11 +171,11 @@ let
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
}; };
} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
crossVersion = "276849e62f472c1b241d9e7b38a28e4cc9f98563"; # Dez 02, 2018 crossVersion = "9e4051cd28b7b3afb162776f5627c7abe4c7b9ea"; # Apr 21, 2019
perl-cross-src = fetchurl { perl-cross-src = fetchurl {
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
sha256 = "1fpr1m9lgkwdp1vmdr0s6gvmcpd0m8q6jwn024bkczc2h37bdynd"; sha256 = "0dj99w2dicbp3c3wn0k32785pc4c68iqnlyxswnza6mhw6wvl9v7";
}; };
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@ -194,8 +194,8 @@ in rec {
# the latest Maint version # the latest Maint version
perl528 = common { perl528 = common {
self = perl528; self = perl528;
version = "5.28.1"; version = "5.28.2";
sha256 = "0iy3as4hnbjfyws4in3j9d6zhhjxgl5m95i5n9jy2bnzcpz8bgry"; sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da";
}; };
# the latest Devel version # the latest Devel version

1481
pkgs/development/interpreters/wasmtime/cargo-lock.patch Normal file
View File

File diff suppressed because it is too large Load Diff

31
pkgs/development/interpreters/wasmtime/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }:
rustPlatform.buildRustPackage rec {
name = "wasmtime-${version}";
version = "0.1.0";
src = fetchFromGitHub {
owner = "CraneStation";
repo = "wasmtime";
rev = "07a6ca8f4e1136ecd9f4af8d1f03a01aade60407";
sha256 = "1cq6nz90kaf023mcyblca90bpvbzhq8xjq01laa28v7r50lagcn5";
fetchSubmodules = true;
};
cargoSha256 = "17k8n5xar4pvvi4prhm6c51vlim9xqwkkhysbnss299mm3fyh36h";
cargoPatches = [ ./cargo-lock.patch ];
nativeBuildInputs = [ python cmake clang ];
buildInputs = [ llvmPackages.libclang ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
meta = with lib; {
description = "Standalone JIT-style runtime for WebAsssembly, using Cranelift";
homepage = https://github.com/CraneStation/wasmtime;
license = licenses.asl20;
maintainers = [ maintainers.matthewbauer ];
platforms = platforms.unix;
};
}

9
pkgs/development/libraries/cairo/default.nix
View File

@ -1,7 +1,8 @@
{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv { config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv
, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , libintl, expat, zlib, libpng, pixman, fontconfig, freetype
, x11Support? !stdenv.isDarwin, libXext, libXrender
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12 , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
, libGLSupported , libGLSupported
, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips)
, libGL ? null # libGLU_combined is no longer a big dependency , libGL ? null # libGLU_combined is no longer a big dependency
@ -52,8 +53,8 @@ in stdenv.mkDerivation rec {
Carbon Carbon
]); ]);
propagatedBuildInputs = propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ]
with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ] ++ optionals x11Support [ libXext libXrender ]
++ optionals xcbSupport [ libxcb xcbutil ] ++ optionals xcbSupport [ libxcb xcbutil ]
++ optional gobjectSupport glib ++ optional gobjectSupport glib
++ optional glSupport libGL ++ optional glSupport libGL

7
pkgs/development/libraries/cracklib/default.nix
View File

@ -1,5 +1,5 @@
let version = "2.9.7"; in let version = "2.9.7"; in
{ stdenv, fetchurl, zlib, gettext { stdenv, lib, buildPackages, fetchurl, zlib, gettext
, wordlists ? [ (fetchurl { , wordlists ? [ (fetchurl {
url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz";
sha256 = "12fk8w06q628v754l357cf8kfjna98wj09qybpqr892az3x4a33z"; sha256 = "12fk8w06q628v754l357cf8kfjna98wj09qybpqr892az3x4a33z";
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py"; sha256 = "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py";
}; };
nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib;
buildInputs = [ zlib gettext ]; buildInputs = [ zlib gettext ];
postPatch = '' postPatch = ''
@ -25,12 +26,12 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
make dict make dict-local
''; '';
doInstallCheck = true; doInstallCheck = true;
installCheckTarget = "test"; installCheckTarget = "test";
meta = with stdenv.lib; { meta = with lib; {
homepage = https://github.com/cracklib/cracklib; homepage = https://github.com/cracklib/cracklib;
description = "A library for checking the strength of passwords"; description = "A library for checking the strength of passwords";
license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists

4
pkgs/development/libraries/flatpak/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3 }: , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flatpak"; pname = "flatpak";
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
libsoup lzma ostree polkit python3 systemd xorg.libXau libsoup lzma ostree polkit python3 systemd xorg.libXau
gnome3.gsettings-desktop-schemas glib-networking gsettings-desktop-schemas glib-networking
]; ];
checkInputs = [ valgrind ]; checkInputs = [ valgrind ];

3
pkgs/development/libraries/gmp/6.x.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, m4, cxx ? !stdenv.hostPlatform.useAndroidPrebuilt { stdenv, fetchurl, m4
, cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm
, buildPackages , buildPackages
, withStatic ? false }: , withStatic ? false }:

8
pkgs/development/libraries/gnu-config/default.nix
View File

@ -1,21 +1,21 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
let let
rev = "b75cdc942a6172f63b34faf642b8c797239f6776"; rev = "a8d79c3130da83c7cacd6fee31b9acc53799c406";
# Don't use fetchgit as this is needed during Aarch64 bootstrapping # Don't use fetchgit as this is needed during Aarch64 bootstrapping
configGuess = fetchurl { configGuess = fetchurl {
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv"; sha256 = "0qbq49gr2cmf4gzrjvrmpwxxgzl3vap1xm902xa8pkcqdvriq0qw";
}; };
configSub = fetchurl { configSub = fetchurl {
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc"; sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnu-config-${version}"; name = "gnu-config-${version}";
version = "2016-12-31"; version = "2019-04-15";
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out

0
pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix → pkgs/development/libraries/gsettings-desktop-schemas/default.nix
View File

4
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes
, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi
, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook , xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook, gsettings-desktop-schemas
, x11Support ? stdenv.isLinux , x11Support ? stdenv.isLinux
, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols
, xineramaSupport ? stdenv.isLinux , xineramaSupport ? stdenv.isLinux
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxkbcommon epoxy json-glib isocodes ] buildInputs = [ libxkbcommon epoxy json-glib isocodes ]
++ optional stdenv.isDarwin AppKit; ++ optional stdenv.isDarwin AppKit;
propagatedBuildInputs = with xorg; with stdenv.lib; propagatedBuildInputs = with xorg; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas fribidi [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gsettings-desktop-schemas fribidi
libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed
++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ]

14
pkgs/development/libraries/http-parser/default.nix
View File

@ -1,13 +1,15 @@
{ stdenv, fetchurl }: { stdenv, fetchFromGitHub }:
let let
version = "2.9.1"; version = "2.9.2";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "http-parser-${version}"; name = "http-parser-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; owner = "nodejs";
sha256 = "08fypqh3jkwvlznvmwwwir53ffg2xcxy0v8bjz6wxjlb41qhf8ik"; repo = "http-parser";
rev = "v${version}";
sha256 = "1qs6x3n2nrcj1wiik5pg5i16inykf7rcfdfdy7rwyzf40pvdl3c2";
}; };
NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_CFLAGS_COMPILE = "-Wno-error";
@ -19,7 +21,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An HTTP message parser written in C"; description = "An HTTP message parser written in C";
homepage = https://github.com/joyent/http-parser; homepage = https://github.com/nodejs/http-parser;
maintainers = with maintainers; [ matthewbauer ]; maintainers = with maintainers; [ matthewbauer ];
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix;

18
pkgs/development/libraries/libpng/default.nix
View File

@ -3,31 +3,21 @@
assert zlib != null; assert zlib != null;
let let
patchVersion = "1.6.36"; patchVersion = "1.6.37";
patch_src = fetchurl { patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
sha256 = "03ywdwaq1k3pfslvbs2b33z3pdmazz6yp8g56mzafacvfgd367wc"; sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2";
}; };
whenPatched = stdenv.lib.optionalString apngSupport; whenPatched = stdenv.lib.optionalString apngSupport;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "libpng" + whenPatched "-apng" + "-${version}"; name = "libpng" + whenPatched "-apng" + "-${version}";
version = "1.6.36"; version = "1.6.37";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc"; sha256 = "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh";
}; };
patches = [
(fetchurl { # https://github.com/glennrp/libpng/issues/266
url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch";
sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n";
})
(fetchurl { # https://github.com/glennrp/libpng/issues/275
url = "https://salsa.debian.org/debian/libpng1.6/raw/853d1977/debian/patches/CVE-2019-7317.patch";
sha256 = "0c8qc176mqh08kcxlnx40rzdggchihkrlzqw6qg6lf0c9ygkf55k";
})
];
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];

4
pkgs/development/libraries/libseccomp/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libseccomp-${version}"; name = "libseccomp-${version}";
version = "2.4.0"; version = "2.4.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
sha256 = "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f"; sha256 = "1s06h2cgk0xxwmhwj72z33bllafc1xqnxzk2yyra2rmg959778qw";
}; };
outputs = [ "out" "lib" "dev" "man" ]; outputs = [ "out" "lib" "dev" "man" ];

27
pkgs/development/libraries/libuv/default.nix
View File

@ -17,11 +17,10 @@ stdenv.mkDerivation rec {
"spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
"getaddrinfo_fail" "getaddrinfo_fail_sync" "getaddrinfo_fail" "getaddrinfo_fail_sync"
"threadpool_multiple_event_loops" # times out on slow machines "threadpool_multiple_event_loops" # times out on slow machines
] ] ++ stdenv.lib.optionals stdenv.isDarwin [
# Sometimes: timeout (no output), failed uv_listen. Someone # Sometimes: timeout (no output), failed uv_listen. Someone
# should report these failures to libuv team. There tests should # should report these failures to libuv team. There tests should
# be much more robust. # be much more robust.
++ stdenv.lib.optionals stdenv.isDarwin [
"process_title" "emfile" "poll_duplex" "poll_unidirectional" "process_title" "emfile" "poll_duplex" "poll_unidirectional"
"ipc_listen_before_write" "ipc_listen_after_write" "ipc_tcp_connection" "ipc_listen_before_write" "ipc_listen_after_write" "ipc_tcp_connection"
"tcp_alloc_cb_fail" "tcp_ping_pong" "tcp_ref3" "tcp_ref4" "tcp_alloc_cb_fail" "tcp_ping_pong" "tcp_ref3" "tcp_ref4"
@ -34,11 +33,16 @@ stdenv.mkDerivation rec {
"multiple_listen" "delayed_accept" "multiple_listen" "delayed_accept"
"shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack"
"tty_pty" "condvar_5" "tty_pty" "condvar_5"
] ++ stdenv.lib.optionals stdenv.isAarch32 [ # Tests that fail when sandboxing is enabled.
# I observe this test failing with some regularity on ARMv7: "fs_event_close_in_callback" "fs_event_watch_dir"
# https://github.com/libuv/libuv/issues/1871 "fs_event_watch_dir_recursive" "fs_event_watch_file"
"shutdown_close_pipe" "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path"
]; "process_priority" "udp_create_early_bad_bind"
] ++ stdenv.lib.optionals stdenv.isAarch32 [
# I observe this test failing with some regularity on ARMv7:
# https://github.com/libuv/libuv/issues/1871
"shutdown_close_pipe"
];
tdRegexp = lib.concatStringsSep "\\|" toDisable; tdRegexp = lib.concatStringsSep "\\|" toDisable;
in lib.optionalString doCheck '' in lib.optionalString doCheck ''
sed '/${tdRegexp}/d' -i test/test-list.h sed '/${tdRegexp}/d' -i test/test-list.h
@ -55,6 +59,9 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
meta = with lib; { meta = with lib; {
description = "A multi-platform support library with a focus on asynchronous I/O"; description = "A multi-platform support library with a focus on asynchronous I/O";
homepage = https://github.com/libuv/libuv; homepage = https://github.com/libuv/libuv;

4
pkgs/development/libraries/nghttp2/default.nix
View File

@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nghttp2"; pname = "nghttp2";
version = "1.37.0"; version = "1.38.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "1bi3aw096kd51abazvv6ilplz6gjbm84yr3mzxklbhysv38y6xl2"; sha256 = "156r3myrglkmrdv4zh151g9zcr7b92zjn15wx5i9ypw0naanjc4g";
}; };
outputs = [ "bin" "out" "dev" "lib" ]; outputs = [ "bin" "out" "dev" "lib" ];

6
pkgs/development/libraries/pango/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz { stdenv, fetchurl, pkgconfig, cairo, harfbuzz
, libintl, gobject-introspection, darwin, fribidi, gnome3 , libintl, gobject-introspection, darwin, fribidi, gnome3
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
, meson, ninja, glib , meson, ninja, glib
, x11Support? !stdenv.isDarwin, libXft
}: }:
with stdenv.lib; with stdenv.lib;
@ -32,7 +33,8 @@ in stdenv.mkDerivation rec {
CoreGraphics CoreGraphics
CoreText CoreText
]); ]);
propagatedBuildInputs = [ cairo glib libXft libintl ]; propagatedBuildInputs = [ cairo glib libintl ] ++
optional x11Support libXft;
patches = [ patches = [
(fetchurl { (fetchurl {

29
pkgs/development/libraries/wasilibc/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, lib }:
stdenv.mkDerivation {
name = "wasilibc-20190413";
src = fetchFromGitHub {
owner = "CraneStation";
repo = "wasi-sysroot";
rev = "079d7bda78bc0ad8f69c1594444b54786545ce57";
sha256 = "09s906bc9485wzkgibnpfh0mii7jkldzr1a6g8k7ch0si8rshi5r";
};
makeFlags = [
"WASM_CC=${stdenv.cc.targetPrefix}cc"
"WASM_NM=${stdenv.cc.targetPrefix}nm"
"WASM_AR=${stdenv.cc.targetPrefix}ar"
"INSTALL_DIR=${placeholder "out"}"
];
postInstall = ''
mv $out/lib/*/* $out/lib
ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports
'';
meta = {
description = "WASI libc implementation for WebAssembly";
homepage = "https://wasi.dev";
platforms = lib.platforms.wasi;
maintainers = [ lib.maintainers.matthewbauer ];
};
}

4
pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3 }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk"; pname = "xdg-desktop-portal-gtk";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ];
buildInputs = [ glib gtk3 gnome3.gsettings-desktop-schemas ]; buildInputs = [ glib gtk3 gsettings-desktop-schemas ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Desktop integration portals for sandboxed apps"; description = "Desktop integration portals for sandboxed apps";

4
pkgs/development/perl-modules/BerkeleyDB/default.nix
View File

@ -1,11 +1,11 @@
{buildPerlPackage, fetchurl, db}: {buildPerlPackage, fetchurl, db}:
buildPerlPackage rec { buildPerlPackage rec {
name = "BerkeleyDB-0.55"; name = "BerkeleyDB-0.61";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
sha256 = "0kz40wqr7qwag43qnmkpri03cjnqwzb0kj0vc9aw9yz2qx0y2a3g"; sha256 = "0l65v301cz6a9dxcw6a4ps2mnr5zq358yn81favap6i092krggiz";
}; };
preConfigure = '' preConfigure = ''

4
pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, buildPerlPackage, zlib, stdenv }: { fetchurl, buildPerlPackage, zlib, stdenv }:
buildPerlPackage rec { buildPerlPackage rec {
name = "Compress-Raw-Zlib-2.081"; name = "Compress-Raw-Zlib-2.086";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
sha256 = "06rsm9ahp20xfyvd3jc69sd0k8vqysryxc6apzdbn96jbcsdwmp1"; sha256 = "0va93wc968p4l2ql0k349bz189l2vbs09bpn865cvc36amqxwv9z";
}; };
preConfigure = '' preConfigure = ''

6
pkgs/development/perl-modules/DBD-SQLite/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, buildPerlPackage, perl, DBI, sqlite }: { stdenv, fetchurl, buildPerlPackage, perl, DBI, sqlite }:
buildPerlPackage rec { buildPerlPackage rec {
name = "DBD-SQLite-1.58"; name = "DBD-SQLite-1.62";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.58.tar.gz; url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.62.tar.gz;
sha256 = "0fqx386jgs9mmrknr7smmzapf07izgivza7x08lfm39ks2cxs83i"; sha256 = "0p78ri1q6xpc1i98i6mlriv8n66iz8r5r11dlsknjm4y58rfz0mx";
}; };
propagatedBuildInputs = [ DBI ]; propagatedBuildInputs = [ DBI ];

10
pkgs/development/perl-modules/DBD-mysql/default.nix
View File

@ -1,14 +1,14 @@
{ fetchurl, buildPerlPackage, DBI, mysql }: { fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:
buildPerlPackage rec { buildPerlPackage rec {
name = "DBD-mysql-4.046"; name = "DBD-mysql-4.050";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; url = "mirror://cpan/authors/id/D/DV/DVEEDEN/${name}.tar.gz";
sha256 = "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1"; sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g";
}; };
buildInputs = [ mysql.connector-c ] ; buildInputs = [ mysql.connector-c DevelChecklib ] ;
propagatedBuildInputs = [ DBI ]; propagatedBuildInputs = [ DBI ];
doCheck = false; doCheck = false;

4
pkgs/development/perl-modules/DB_File/default.nix
View File

@ -1,11 +1,11 @@
{fetchurl, buildPerlPackage, db}: {fetchurl, buildPerlPackage, db}:
buildPerlPackage rec { buildPerlPackage rec {
name = "DB_File-1.842"; name = "DB_File-1.851";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
sha256 = "0w2d99vs9qarng2f9fpg3gchfdzy6an13507jhclcl8wv183h5hg"; sha256 = "1j276mng1nwxxdxnb3my427s5lb6zlnssizcnxricnvaa170kdv8";
}; };
preConfigure = '' preConfigure = ''

4
pkgs/development/python-modules/Cython/default.nix
View File

@ -26,11 +26,11 @@ let
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "Cython"; pname = "Cython";
version = "0.29.5"; version = "0.29.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9d5290d749099a8e446422adfb0aa2142c711284800fb1eb70f595101e32cbf1"; sha256 = "55d081162191b7c11c7bfcb7c68e913827dfd5de6ecdbab1b99dab190586c1e8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/Mako/default.nix
View File

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Mako"; pname = "Mako";
version = "1.0.7"; version = "1.0.9";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"; sha256 = "0728c404877cd4ca72c409c0ea372dc5f3b53fa1ad2bb434e1d216c0444ff1fd";
}; };
checkInputs = [ markupsafe nose mock pytest_3 ]; checkInputs = [ markupsafe nose mock pytest_3 ];

4
pkgs/development/python-modules/absl-py/default.nix
View File

@ -8,11 +8,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "absl-py"; pname = "absl-py";
version = "0.7.0"; version = "0.7.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "8718189e4bd6013bf79910b9d1cb0a76aecad8ce664f78e1144980fabdd2cd23"; sha256 = "b943d1c567743ed0455878fcd60bc28ac9fae38d129d1ccfad58079da00b8951";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/agate-sql/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "agate-sql"; pname = "agate-sql";
version = "0.5.3"; version = "0.5.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "877b7b85adb5f0325455bba8d50a1623fa32af33680b554feca7c756a15ad9b4"; sha256 = "9277490ba8b8e7c747a9ae3671f52fe486784b48d4a14e78ca197fb0e36f281b";
}; };
propagatedBuildInputs = [ agate sqlalchemy ]; propagatedBuildInputs = [ agate sqlalchemy ];

4
pkgs/development/python-modules/aioconsole/default.nix
View File

@ -10,11 +10,11 @@
# wrapped to be able to find aioconsole and any other packages. # wrapped to be able to find aioconsole and any other packages.
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioconsole"; pname = "aioconsole";
version = "0.1.13"; version = "0.1.14";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "8b9898f0f6539bdce3bc3720d75189e21813f1a7f8350228fc7fd54bf7327d0f"; sha256 = "f1ddd04050d9be5e93e223a4e9367433436d245f8fe70905f4124bfde2cd3cdd";
}; };
# hardcodes a test dependency on an old version of pytest-asyncio # hardcodes a test dependency on an old version of pytest-asyncio

4
pkgs/development/python-modules/alembic/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "alembic"; pname = "alembic";
version = "1.0.7"; version = "1.0.9";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "16505782b229007ae905ef9e0ae6e880fddafa406f086ac7d442c1aaf712f8c2"; sha256 = "40b9a619aa5f25ea1e1508adcda88b33704ef28e02c9cfa6471e5c772ecf0829";
}; };
buildInputs = [ pytest pytestcov mock coverage ]; buildInputs = [ pytest pytestcov mock coverage ];

4
pkgs/development/python-modules/ansible-runner/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-runner"; pname = "ansible-runner";
version = "1.3.0"; version = "1.3.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1zys65vq0jqyzdmchaydzsvlf0ysw2y58sapjq6wzc6yw6pdyigz"; sha256 = "6e4d8256351228c00fe68697e7f5ad2a2e0fd4085084b913eda22735023bb891";
}; };
checkInputs = [ pytest mock ]; checkInputs = [ pytest mock ];

4
pkgs/development/python-modules/argcomplete/default.nix
View File

@ -3,11 +3,11 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "argcomplete"; pname = "argcomplete";
version = "1.9.4"; version = "1.9.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "06c8a54ffaa6bfc9006314498742ec8843601206a3b94212f82657673662ecf1"; sha256 = "94423d1a56cdec2ef47699e02c9a48cf8827b9c4465b836c0cefb30afe85e59a";
}; };
doCheck = false; # bash-completion test fails with "compgen: command not found". doCheck = false; # bash-completion test fails with "compgen: command not found".

6
pkgs/development/python-modules/astroid/1.6.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "astroid"; pname = "astroid";
version = "1.6.5"; version = "1.6.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0fir4b67sm7shcacah9n61pvq313m523jb4q80sycrh3p8nmi6zw"; sha256 = "d25869fc7f44f1d9fb7d24fd7ea0639656f5355fc3089cd1f3d18c6ec6b124c7";
}; };
# From astroid/__pkginfo__.py # From astroid/__pkginfo__.py
@ -26,7 +26,7 @@ buildPythonPackage rec {
checkPhase = '' checkPhase = ''
# test_builtin_help is broken # test_builtin_help is broken
pytest -k "not test_builtin_help" astroid pytest -k "not test_builtin_help and not test_namespace_and_file_mismatch and not test_namespace_package_pth_support and not test_nested_namespace_import" astroid
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/astropy-helpers/default.nix
View File

@ -6,7 +6,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "astropy-helpers"; pname = "astropy-helpers";
version = "3.1"; version = "3.1.1";
disabled = !isPy3k; disabled = !isPy3k;
@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "37caf1f21bfdf653f7bb9f5b070dc1bb59cd70c0e09f9c5742401f57400a6e52"; sha256 = "214cc37cffd7a21e573c4543e47b5289b07b2b77511627802d9778a4c96a5caf";
}; };
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/atomman/default.nix
View File

@ -13,12 +13,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.2.4"; version = "1.2.5";
pname = "atomman"; pname = "atomman";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c204d52cdfb2a7cc4d7d2c4f7a89c215a9fd63b92495a83adf25ae4e820cea3e"; sha256 = "10eca8c6fc890f2ee2e30f65178c618175529e9998be449e276f7c3d1dce0e95";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

4
pkgs/development/python-modules/autopep8/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "autopep8"; pname = "autopep8";
version = "1.4.3"; version = "1.4.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "33d2b5325b7e1afb4240814fe982eea3a92ebea712869bfd08b3c0393404248c"; sha256 = "4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee";
}; };
propagatedBuildInputs = [ pycodestyle ]; propagatedBuildInputs = [ pycodestyle ];

4
pkgs/development/python-modules/awkward/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "awkward"; pname = "awkward";
version = "0.8.14"; version = "0.8.15";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1mf8ddxn7bdlhic5xcd8nvskp3cmyv8vk2hz52hb7faixsgvgj18"; sha256 = "0d1ae42babfe7fdde324eea685c71ecc638132b2015ffa22687d52d36dc1c78b";
}; };
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];

4
pkgs/development/python-modules/bootstrapped-pip/default.nix
View File

@ -9,9 +9,9 @@ let
}; };
setuptools_source = fetchPypi { setuptools_source = fetchPypi {
pname = "setuptools"; pname = "setuptools";
version = "40.8.0"; version = "41.0.0";
format = "wheel"; format = "wheel";
sha256 = "e8496c0079f3ac30052ffe69b679bd876c5265686127a3159cfa415669b7f9ab"; sha256 = "e67486071cd5cdeba783bd0b64f5f30784ff855b35071c8670551fd7fc52d4a1";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

4
pkgs/development/python-modules/cffi/default.nix
View File

@ -2,11 +2,11 @@
if isPyPy then null else buildPythonPackage rec { if isPyPy then null else buildPythonPackage rec {
pname = "cffi"; pname = "cffi";
version = "1.12.1"; version = "1.12.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033"; sha256 = "e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

4
pkgs/development/python-modules/chainmap/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "chainmap"; pname = "chainmap";
version = "1.0.2"; version = "1.0.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0"; sha256 = "e42aaa4b3e2f66102a11bfd563069704bfbfd84fdcb517b564effd736bf53cd9";
}; };
# Requires tox # Requires tox

4
pkgs/development/python-modules/chameleon/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Chameleon"; pname = "Chameleon";
version = "3.6"; version = "3.6.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0141kfwx553q73wzfl624pppmbhh7fpzvaj5pbj21pqlk2rhfx75"; sha256 = "850f74f756bcb99423dd2658b99f448b09f09ccc2c60c0a2d6dec52294d7f9ed";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

Some files were not shown because too many files have changed in this diff Show More