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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar 2019-12-01 01:44:03 +01:00
commit a4bbc84e16
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
52 changed files with 300 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/languages-frameworks/gnome.xml
View File

@ -74,7 +74,7 @@
preFixup = '' preFixup = ''
for f in $(find $out/bin/ $out/libexec/ -type f -executable); do for f in $(find $out/bin/ $out/libexec/ -type f -executable); do
wrapProgram "$f" \ wrapProgram "$f" \
--prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$out/share" \ --prefix XDG_DATA_DIRS : "$out/share" \
--prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
--prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
@ -102,7 +102,7 @@ preFixup = ''
</listitem> </listitem>
<listitem xml:id="ssec-gnome-hooks-dconf"> <listitem xml:id="ssec-gnome-hooks-dconf">
<para> <para>
<package>gnome3.dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable. <package>dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable.
</para> </para>
</listitem> </listitem>
<listitem xml:id="ssec-gnome-hooks-hicolor-icon-theme"> <listitem xml:id="ssec-gnome-hooks-hicolor-icon-theme">

1
nixos/modules/config/no-x-libs.nix
View File

@ -35,6 +35,7 @@ with lib;
networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
gobject-introspection = super.gobject-introspection.override { x11Support = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; };
polkit = super.polkit.override { withGnome = false; };
})); }));
}; };
} }

2
nixos/modules/i18n/input-method/ibus.nix
View File

@ -55,7 +55,7 @@ in
# Without dconf enabled it is impossible to use IBus # Without dconf enabled it is impossible to use IBus
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnome3.dconf ibusAutostart dconf ibusAutostart
]; ];
environment.variables = { environment.variables = {

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

@ -32,13 +32,13 @@ in
environment.etc = optionals (cfg.profiles != {}) environment.etc = optionals (cfg.profiles != {})
(mapAttrsToList mkDconfProfile cfg.profiles); (mapAttrsToList mkDconfProfile cfg.profiles);
services.dbus.packages = [ pkgs.gnome3.dconf ]; services.dbus.packages = [ pkgs.dconf ];
# For dconf executable # For dconf executable
environment.systemPackages = [ pkgs.gnome3.dconf ]; environment.systemPackages = [ pkgs.dconf ];
# Needed for unwrapped applications # Needed for unwrapped applications
environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.gnome3.dconf.lib}/lib/gio/modules" ]; environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];
}; };
} }

2
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -281,7 +281,7 @@ in
customDconfDb = pkgs.stdenv.mkDerivation { customDconfDb = pkgs.stdenv.mkDerivation {
name = "gdm-dconf-db"; name = "gdm-dconf-db";
buildCommand = '' buildCommand = ''
${pkgs.gnome3.dconf}/bin/dconf compile $out ${customDconf}/dconf ${pkgs.dconf}/bin/dconf compile $out ${customDconf}/dconf
''; '';
}; };
in pkgs.stdenv.mkDerivation { in pkgs.stdenv.mkDerivation {

13
pkgs/applications/audio/spotify-tui/default.nix
View File

@ -1,21 +1,22 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }: { stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, python3, libxcb, AppKit, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "spotify-tui"; pname = "spotify-tui";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Rigellute"; owner = "Rigellute";
repo = "spotify-tui"; repo = "spotify-tui";
rev = "v${version}"; rev = "v${version}";
sha256 = "1bbh9df4gfgb5pqavgvmy8fqnr2j5rbqbanv0y31j4i0kv2wrh6a"; sha256 = "10wrlfi50lsf6qjsi9qklw2mk2fbf0jib7f841v842l9k9zw0hrg";
}; };
cargoSha256 = "1rb4dl9zn3xx2yrapx5cfsli93ggmdq8w9fqi8cy8giyja1mnqfl"; cargoSha256 = "140m3pryvbc96xvl5ymz68msrx93rmvvy0y8skvc40yxwl401inc";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig python3 ];
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ stdenv.lib.optional stdenv.isDarwin Security; ++ stdenv.lib.optional stdenv.isLinux libxcb
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Spotify for the terminal written in Rust"; description = "Spotify for the terminal written in Rust";

4
pkgs/applications/editors/jucipp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm, { stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
gtksourceviewmm gtksourceviewmm
llvmPackages.clang.cc llvmPackages.clang.cc
llvmPackages.lldb llvmPackages.lldb
gnome3.dconf dconf
]; ];

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

@ -33,11 +33,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gthumb"; pname = "gthumb";
version = "3.8.1"; version = "3.8.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb"; sha256 = "15wqks35ks5dm7zj046dfd45vvrilan2ayfy2sxiprv7q74cip2q";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/applications/misc/onboard/default.nix
View File

@ -7,7 +7,7 @@
, bash , bash
, glib , glib
, glibcLocales , glibcLocales
, gnome3 , dconf
, gobject-introspection , gobject-introspection
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gtk3 , gtk3
@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [ buildInputs = [
bash bash
glib glib
gnome3.dconf dconf
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
hunspell hunspell
@ -89,7 +89,7 @@ python3.pkgs.buildPythonApplication rec {
]; ];
propagatedUserEnvPkgs = [ propagatedUserEnvPkgs = [
gnome3.dconf dconf
]; ];
checkInputs = [ checkInputs = [

3
pkgs/applications/misc/plank/default.nix
View File

@ -3,6 +3,7 @@
, vala , vala
, atk , atk
, cairo , cairo
, dconf
, glib , glib
, gnome3 , gnome3
, gtk3 , gtk3
@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf gdk-pixbuf
glib glib
gnome-menus gnome-menus
gnome3.dconf dconf
gtk3 gtk3
libX11 libX11
libXfixes libXfixes

4
pkgs/applications/misc/tilix/default.nix
View File

@ -6,7 +6,7 @@
, python3 , python3
, pkgconfig , pkgconfig
, dmd , dmd
, gnome3 , dconf
, dbus , dbus
, gsettings-desktop-schemas , gsettings-desktop-schemas
, desktop-file-utils , desktop-file-utils
@ -47,7 +47,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
dbus dbus
gettext gettext
gnome3.dconf dconf
gsettings-desktop-schemas gsettings-desktop-schemas
gtkd gtkd
libsecret libsecret

4
pkgs/applications/networking/cawbird/default.nix
View File

@ -11,7 +11,7 @@
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
, gnome3 , dconf
, gst_all_1 , gst_all_1
, wrapGAppsHook , wrapGAppsHook
, gobject-introspection , gobject-introspection
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
sqlite sqlite
libsoup libsoup
gettext gettext
gnome3.dconf dconf
gspell gspell
glib-networking glib-networking
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [

6
pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: { stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-idle"; pname = "telepathy-idle";
@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib dconf) makeWrapper ];
preFixup = '' preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \ wrapProgram "$out/libexec/telepathy-idle" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
''; '';
meta = { meta = {

4
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
, gnome3, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
project = "telepathy-logger"; project = "telepathy-logger";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
wrapProgram "$out/libexec/telepathy-logger" \ wrapProgram "$out/libexec/telepathy-logger" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
''; '';

4
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, pkgconfig , pkgconfig
, gnome3 , dconf
, telepathy-glib , telepathy-glib
, python3 , python3
, libxslt , libxslt
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
wrapProgram "$lib/libexec/mission-control-5" \ wrapProgram "$lib/libexec/mission-control-5" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
''; '';

9
pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig { stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig
, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib }: , intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk"; sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk";
}; };
patches = [
(fetchpatch {
url = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/0f5cc8a9942e220ea0f7d0b17db4a78d094e3b65.patch";
sha256 = "195rsjpbc0gzmr9bycvq4mra7abp3hd9by3a5vvcmxsh5ipikycf";
})
];
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
nativeBuildInputs= [ nativeBuildInputs= [

3
pkgs/applications/networking/remote/citrix-workspace/default.nix
View File

@ -9,6 +9,7 @@
, makeDesktopItem , makeDesktopItem
, tzdata , tzdata
, cacert , cacert
, dconf
, glib , glib
, gtk2 , gtk2
, atk , atk
@ -137,7 +138,7 @@ let
gdk-pixbuf gdk-pixbuf
cairo cairo
pango pango
gnome3.dconf dconf
xorg.libX11 xorg.libX11
xorg.libXext xorg.libXext
xorg.libXrender xorg.libXrender

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

@ -5,6 +5,7 @@
, cups , cups
, dbus-glib , dbus-glib
, dbus , dbus
, dconf
, fontconfig , fontconfig
, freetype , freetype
, gdk-pixbuf , gdk-pixbuf
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
sha256 = "1dgxzprpb8f5wpmvlvkxix0xxckfgjsi3wfcy9mb221a17cv0029"; sha256 = "1dgxzprpb8f5wpmvlvkxix0xxckfgjsi3wfcy9mb221a17cv0029";
}; };
buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme dconf ];
phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];

4
pkgs/applications/science/biology/kallisto/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kallisto"; pname = "kallisto";
version = "0.46.0"; version = "0.46.1";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "kallisto"; repo = "kallisto";
owner = "pachterlab"; owner = "pachterlab";
rev = "v${version}"; rev = "v${version}";
sha256 = "09vgdqwpigl4x3sdw5vjfyknsllkli339mh8xapbf7ldm0jldfn9"; sha256 = "09ldgy70wziw51ma4a3b7vyrphzf2v1cnq1j5r1wwgfmx8fgbh2z";
}; };
nativeBuildInputs = [ autoconf cmake ]; nativeBuildInputs = [ autoconf cmake ];

4
pkgs/applications/science/electronics/gtkwave/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtkwave"; pname = "gtkwave";
version = "3.3.102"; version = "3.3.103";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz";
sha256 = "1izyfx6b1n9nr08c7q0gkgcf0q04bb4qz92ckwh74n5l5nwprfw0"; sha256 = "1xzaxqbabj4sb4n10yki5acglx3736pwl3kwlq4k7i96rzvsn9f3";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

4
pkgs/applications/science/electronics/verilator/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "verilator"; pname = "verilator";
version = "4.020"; version = "4.022";
src = fetchurl { src = fetchurl {
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
sha256 = "06n3vds762vza4byrav0j3kp3aivvadndkgw7nirvasclp19zmxb"; sha256 = "1sj0qzl387pl2ygii3ssx35c3m601nb07j16lqj5zcxzhcg62i9p";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

5
pkgs/applications/science/math/pspp/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl { stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
, pkgconfig, gtksourceview, pango, gettext , pkgconfig, gtksourceview, pango, gettext, dconf
, makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
, gnome3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,7 +25,7 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$out/share" \ --prefix XDG_DATA_DIRS : "$out/share" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
''; '';
meta = { meta = {

4
pkgs/applications/search/catfish/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, file, which, intltool, gobject-introspection, { stdenv, fetchurl, file, which, intltool, gobject-introspection,
findutils, xdg_utils, gnome3, gtk3, pythonPackages, findutils, xdg_utils, dconf, gtk3, pythonPackages,
wrapGAppsHook wrapGAppsHook
}: }:
@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
gnome3.dconf dconf
pythonPackages.pyxdg pythonPackages.pyxdg
pythonPackages.ptyprocess pythonPackages.ptyprocess
pythonPackages.pycairo pythonPackages.pycairo

4
pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3, gnome3, glib, deepin-gtk-theme, { stdenv, fetchFromGitHub, python3, dconf, glib, deepin-gtk-theme,
deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }: deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome3.dconf dconf
deepin-gtk-theme deepin-gtk-theme
deepin-icon-theme deepin-icon-theme
deepin-sound-theme deepin-sound-theme

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3 { stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3, dconf
, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: , libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
let let
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
gettext docbook_xsl libxml2 gobject-introspection python3 gettext docbook_xsl libxml2 gobject-introspection python3
]; ];
buildInputs = [ glib gtk3 gnome3.dconf ]; buildInputs = [ glib gtk3 dconf ];
postPatch = '' postPatch = ''
chmod +x meson_post_install.py chmod +x meson_post_install.py

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
, accountsservice, libX11, gnome3, systemd, autoreconfHook , accountsservice, libX11, gnome3, systemd, autoreconfHook, dconf
, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth , gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }: , librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
"--with-udevdir=$(out)/lib/udev" "--with-udevdir=$(out)/lib/udev"
]; ];
nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ]; nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool dconf ];
buildInputs = [ buildInputs = [
glib accountsservice systemd glib accountsservice systemd
gobject-introspection libX11 gtk3 gobject-introspection libX11 gtk3

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

@ -35,7 +35,6 @@ lib.makeScope pkgs.newScope (self: with self; {
caribou = callPackage ./core/caribou { }; caribou = callPackage ./core/caribou { };
dconf = callPackage ./core/dconf { };
dconf-editor = callPackage ./core/dconf-editor { }; dconf-editor = callPackage ./core/dconf-editor { };
empathy = callPackage ./core/empathy { }; empathy = callPackage ./core/empathy { };
@ -359,4 +358,6 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) gjs; # added 2019-01-05 inherit (pkgs) gjs; # added 2019-01-05
inherit (pkgs) yelp-tools; # added 2019-11-20 inherit (pkgs) yelp-tools; # added 2019-11-20
inherit (pkgs) dconf; # added 2019-11-30
}) })

7
pkgs/desktops/gnome-3/extensions/caffeine/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-caffeine"; pname = "gnome-shell-extension-caffeine";
version = "unstable-2019-04-02"; version = "33";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eonpatapon"; owner = "eonpatapon";
repo = "gnome-shell-extension-caffeine"; repo = "gnome-shell-extension-caffeine";
rev = "a6b37dee108cddf50a0f0a19f0101854a75bf173"; rev = "v${version}";
sha256 = "1j3q12j36v97551sjb0c8qc8zr7a7gmxibygczryfdfmwjzp6icl"; sha256 = "1v74xfk7csgc4kw1fg75brmhk2aby3d453ksnmj4k8ivyxkzxmfg";
}; };
uuid = "caffeine@patapon.info"; uuid = "caffeine@patapon.info";
@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ eperuffo ]; maintainers = with maintainers; [ eperuffo ];
homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine; homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine;
broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
}; };
} }

4
pkgs/desktops/mate/mate-control-center/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook desktop-file-utils, dconf, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
librsvg librsvg
libappindicator-gtk3 libappindicator-gtk3
gtk3 gtk3
gnome3.dconf dconf
hicolor-icon-theme hicolor-icon-theme
mate.mate-desktop mate.mate-desktop
mate.libmatekbd mate.libmatekbd

4
pkgs/desktops/mate/mate-desktop/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-desktop"; pname = "mate-desktop";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome3.dconf dconf
gtk3 gtk3
isocodes isocodes
]; ];

4
pkgs/desktops/mate/mate-panel/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-panel"; pname = "mate-panel";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
librsvg librsvg
libxml2 libxml2
gtk3 gtk3
gnome3.dconf dconf
mate.libmateweather mate.libmateweather
mate.mate-desktop mate.mate-desktop
mate.mate-menus mate.mate-menus

4
pkgs/desktops/mate/mate-settings-daemon/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, { stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier,
libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
wrapGAppsHook, fetchpatch, autoreconfHook }: wrapGAppsHook, fetchpatch, autoreconfHook }:
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nss nss
polkit polkit
gtk3 gtk3
gnome3.dconf dconf
mate.mate-desktop mate.mate-desktop
mate.libmatekbd mate.libmatekbd
mate.libmatemixer mate.libmatemixer

4
pkgs/desktops/mate/mate-terminal/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-terminal"; pname = "mate-terminal";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
vte vte
gtk3 gtk3
gnome3.dconf dconf
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

5
pkgs/desktops/xfce/default.nix
View File

@ -3,8 +3,6 @@
lib.makeScope pkgs.newScope (self: with self; { lib.makeScope pkgs.newScope (self: with self; {
#### NixOS support #### NixOS support
inherit (pkgs.gnome3) dconf;
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
@ -217,4 +215,7 @@ lib.makeScope pkgs.newScope (self: with self; {
thunar-bare = thunar.override { thunar-bare = thunar.override {
thunarPlugins = []; thunarPlugins = [];
}; };
# added 2019-11-30
inherit (pkgs) dconf;
}) })

4
pkgs/development/compilers/intel-graphics-compiler/default.nix
View File

@ -24,13 +24,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "intel-graphics-compiler"; pname = "intel-graphics-compiler";
version = "1.0.2714.1"; version = "1.0.2878";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "intel-graphics-compiler"; repo = "intel-graphics-compiler";
rev = "igc-${version}"; rev = "igc-${version}";
sha256 = "0ys03sv08fg8q06lb6k5088xirnwms4nzazxp3kbdjm973n7imxc"; sha256 = "0rgij1013fy2x2szfchy3z6390mjfqw3nz4zprcb5v2v6mpvcj4l";
}; };
nativeBuildInputs = [ clang cmake bison flex llvm python ]; nativeBuildInputs = [ clang cmake bison flex llvm python ];

30
pkgs/development/interpreters/jimtcl/default.nix
View File

@ -5,35 +5,53 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "jimtcl"; pname = "jimtcl";
version = "0.78"; version = "0.79";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "msteveb"; owner = "msteveb";
repo = "jimtcl"; repo = "jimtcl";
rev = version; rev = version;
sha256 = "1nrjxjfh69i35ig8sxdlal4ydd3cl0x68c05s6svnf1y2i1bl23j"; sha256 = "1k88hz0v3bi19xdvlp0i9nsx38imzwpjh632w7326zwbv2wldf0h";
}; };
buildInputs = [ nativeBuildInputs = [
sqlite readline asciidoc SDL SDL_gfx asciidoc
]; ];
NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ]; buildInputs = [
sqlite readline SDL SDL_gfx
];
configureFlags = [ configureFlags = [
"--shared"
"--with-ext=oo" "--with-ext=oo"
"--with-ext=tree" "--with-ext=tree"
"--with-ext=binary" "--with-ext=binary"
"--with-ext=sqlite3" "--with-ext=sqlite3"
"--with-ext=readline" "--with-ext=readline"
"--with-ext=sdl" "--with-ext=sdl"
"--with-ext=json"
"--enable-utf8" "--enable-utf8"
"--ipv6" "--ipv6"
]; ];
NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ];
enableParallelBuilding = true;
doCheck = true;
preCheck = ''
# test exec2-3.2 fails depending on platform or sandboxing (?)
rm tests/exec2.test
'';
postInstall = ''
ln -sr $out/lib/libjim.so.${version} $out/lib/libjim.so
'';
meta = { meta = {
description = "An open source small-footprint implementation of the Tcl programming language"; description = "An open source small-footprint implementation of the Tcl programming language";
homepage = http://jim.tcl.tk/; homepage = "http://jim.tcl.tk/";
license = stdenv.lib.licenses.bsd2; license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ]; maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ];

3
pkgs/development/libraries/at-spi2-core/default.nix
View File

@ -10,6 +10,7 @@
, dbus , dbus
, glib , glib
, dconf
, libX11 , libX11
, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case , libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
, libXi , libXi
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
# Cannot use wrapGAppsHook'due to a dependency cycle # Cannot use wrapGAppsHook'due to a dependency cycle
wrapProgram $out/libexec/at-spi-bus-launcher \ wrapProgram $out/libexec/at-spi-bus-launcher \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
''; '';

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

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, hicolor-icon-theme, fuse, nixosTests , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse, nixosTests
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }: , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, dconf, gsettings-desktop-schemas, librsvg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flatpak"; pname = "flatpak";
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp bubblewrap bzip2 dbus dconf glib gpgme json-glib libarchive libcap libseccomp
libsoup lzma ostree polkit python3 systemd xorg.libXau fuse libsoup lzma ostree polkit python3 systemd xorg.libXau fuse
gsettings-desktop-schemas glib-networking gsettings-desktop-schemas glib-networking
librsvg # for flatpak-validate-icon librsvg # for flatpak-validate-icon

108
pkgs/development/python-modules/rpy2/2.nix Normal file
View File

@ -0,0 +1,108 @@
{ lib
, python
, buildPythonPackage
, fetchPypi
, isPyPy
, isPy27
, readline
, R
, rWrapper
, rPackages
, pcre
, lzma
, bzip2
, zlib
, icu
, singledispatch
, six
, jinja2
, pytz
, numpy
, pytest
, mock
, extraRPackages ? []
}:
buildPythonPackage rec {
version = "2.8.6"; # python2 support dropped in 2.9.x
pname = "rpy2";
disabled = isPyPy;
src = fetchPypi {
inherit version pname;
sha256 = "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80";
};
buildInputs = [
readline
R
pcre
lzma
bzip2
zlib
icu
] ++ (with rPackages; [
# packages expected by the test framework
ggplot2
dplyr
RSQLite
broom
DBI
dbplyr
hexbin
lme4
tidyr
# is in upstream's `requires` although it shouldn't be -- this is easier than patching it away
pytest
]) ++ extraRPackages ++ rWrapper.recommendedPackages;
nativeBuildInputs = [
R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly)
];
patches = [
# R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
# This patch sets R_LIBS_SITE when rpy2 is imported.
./r-libs-site.patch
];
postPatch = ''
substituteInPlace ${ if isPy27 then "rpy/rinterface/__init__.py" else "rpy2/rinterface_lib/embedded.py" } --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
'';
doPatchelf = false; # fails because of "missing filename"
patchelfPhase = "";
propagatedBuildInputs = [
singledispatch
six
jinja2
pytz
numpy
];
checkInputs = [
pytest
mock
];
# One remaining test failure caused by different unicode encoding.
# https://bitbucket.org/rpy2/rpy2/issues/488
doCheck = false;
checkPhase = ''
${python.interpreter} -m 'rpy2'
'';
# For some reason libreadline.so is not found. Curiously `ldd _rinterface.so | grep readline` shows two readline entries:
# libreadline.so.6 => not found
# libreadline.so.6 => /nix/store/z2zhmrg6jcrn5iq2779mav0nnq4vm2q6-readline-6.3p08/lib/libreadline.so.6 (0x00007f333ac43000)
# There must be a better way to fix this, but I don't know it.
postFixup = ''
patchelf --add-needed ${readline}/lib/libreadline.so "$out/${python.sitePackages}/rpy2/rinterface/"_rinterface*.so
'';
meta = {
homepage = http://rpy.sourceforge.net/rpy2;
description = "Python interface to R";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ joelmo ];
};
}

56
pkgs/development/python-modules/rpy2/default.nix
View File

@ -3,8 +3,6 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, isPyPy , isPyPy
, isPy27
, readline
, R , R
, rWrapper , rWrapper
, rPackages , rPackages
@ -13,38 +11,38 @@
, bzip2 , bzip2
, zlib , zlib
, icu , icu
, singledispatch , ipython
, six
, jinja2 , jinja2
, pytz , pytz
, pandas
, numpy , numpy
, cffi
, tzlocal
, simplegeneric
, pytest , pytest
, mock
, extraRPackages ? [] , extraRPackages ? []
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = if isPy27 then version = "3.2.2";
"2.8.6" # python2 support dropped in 2.9.x
else
"2.9.5";
pname = "rpy2"; pname = "rpy2";
disabled = isPyPy; disabled = isPyPy;
src = fetchPypi { src = fetchPypi {
inherit version pname; inherit version pname;
sha256 = if isPy27 then sha256 = "0b3jpn9x7m2pccriyzgfsdb68qp6nq4ffhvjy1q2ar8wdxvmf5xp";
"162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80" # 2.8.x
else
"1nrj8pgyxrwrfdrxzb4j3z1adjwjx1mr8d1n5cmrz4nhlzy8w7xr"; # 2.9.x
}; };
buildInputs = [ buildInputs = [
readline
R R
pcre pcre
lzma lzma
bzip2 bzip2
zlib zlib
icu icu
# is in the upstream `requires` although it shouldn't be -- this is easier than patching it away
pytest
] ++ (with rPackages; [ ] ++ (with rPackages; [
# packages expected by the test framework # packages expected by the test framework
ggplot2 ggplot2
@ -58,6 +56,10 @@ buildPythonPackage rec {
tidyr tidyr
]) ++ extraRPackages ++ rWrapper.recommendedPackages; ]) ++ extraRPackages ++ rWrapper.recommendedPackages;
checkPhase = ''
pytest
'';
nativeBuildInputs = [ nativeBuildInputs = [
R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly) R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly)
]; ];
@ -65,38 +67,26 @@ buildPythonPackage rec {
patches = [ patches = [
# R_LIBS_SITE is used by the nix r package to point to the installed R libraries. # R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
# This patch sets R_LIBS_SITE when rpy2 is imported. # This patch sets R_LIBS_SITE when rpy2 is imported.
./r-libs-site.patch ./rpy2-3.x-r-libs-site.patch
]; ];
postPatch = '' postPatch = ''
substituteInPlace rpy/rinterface/__init__.py --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE" substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
singledispatch ipython
six
jinja2 jinja2
pytz pytz
pandas
numpy numpy
cffi
tzlocal
simplegeneric
]; ];
checkInputs = [ checkInputs = [
pytest pytest
mock
]; ];
# One remaining test failure caused by different unicode encoding.
# https://bitbucket.org/rpy2/rpy2/issues/488
doCheck = false;
checkPhase = ''
${python.interpreter} -m 'rpy2.tests'
'';
# For some reason libreadline.so is not found. Curiously `ldd _rinterface.so | grep readline` shows two readline entries:
# libreadline.so.6 => not found
# libreadline.so.6 => /nix/store/z2zhmrg6jcrn5iq2779mav0nnq4vm2q6-readline-6.3p08/lib/libreadline.so.6 (0x00007f333ac43000)
# There must be a better way to fix this, but I don't know it.
postFixup = ''
patchelf --add-needed ${readline}/lib/libreadline.so "$out/${python.sitePackages}/rpy2/rinterface/"_rinterface*.so
'';
meta = { meta = {
homepage = http://rpy.sourceforge.net/rpy2; homepage = http://rpy.sourceforge.net/rpy2;

21
pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/rpy2/rinterface_lib/embedded.py b/rpy2/rinterface_lib/embedded.py
index cc32b6d..3969ad0 100644
--- a/rpy2/rinterface_lib/embedded.py
+++ b/rpy2/rinterface_lib/embedded.py
@@ -113,6 +113,16 @@ def _initr(interactive: bool = True,
if isinitialized():
return None
os.environ['R_HOME'] = openrlib.R_HOME
+
+ # path to libraries
+ existing = os.environ.get('R_LIBS_SITE')
+ if existing is not None:
+ prefix = existing + ':'
+ else:
+ prefix = ''
+ additional = '@NIX_R_LIBS_SITE@'
+ os.environ['R_LIBS_SITE'] = prefix + additional
+
options_c = [ffi.new('char[]', o.encode('ASCII')) for o in _options]
n_options = len(options_c)
n_options_c = ffi.cast('int', n_options)

1
pkgs/development/tools/analysis/rr/default.nix
View File

@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto
]; ];
propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_C_FLAGS_RELEASE:STRING=" "-DCMAKE_C_FLAGS_RELEASE:STRING="
"-DCMAKE_CXX_FLAGS_RELEASE:STRING=" "-DCMAKE_CXX_FLAGS_RELEASE:STRING="

6
pkgs/servers/http/jetty/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jetty"; pname = "jetty";
version = "9.4.22.v20191022"; version = "9.4.24.v20191120";
src = fetchurl { src = fetchurl {
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
name = "jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz";
sha256 = "1a5av6ygsmjwbnlax7f7l58d7hlw3xm0cpk5ml7mb54vrlrcb7hv"; sha256 = "072vr8gfly2xdwxx1c771yymf145l8nv0j31liwqrih8zqvvhsd4";
}; };
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A Web server and javax.servlet container"; description = "A Web server and javax.servlet container";
homepage = http://www.eclipse.org/jetty/; homepage = "https://www.eclipse.org/jetty/";
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ]; license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
}; };

4
pkgs/servers/pulseaudio/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook { lib, stdenv, fetchurl, pkgconfig, autoreconfHook
, libsndfile, libtool, makeWrapper, perlPackages , libsndfile, libtool, makeWrapper, perlPackages
, xorg, libcap, alsaLib, glib, gnome3 , xorg, libcap, alsaLib, glib, dconf
, avahi, libjack2, libasyncns, lirc, dbus , avahi, libjack2, libasyncns, lirc, dbus
, sbc, bluez5, udev, openssl, fftwFloat , sbc, bluez5, udev, openssl, fftwFloat
, speexdsp, systemd, webrtc-audio-processing , speexdsp, systemd, webrtc-audio-processing
@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
preFixup = lib.optionalString stdenv.isLinux '' preFixup = lib.optionalString stdenv.isLinux ''
wrapProgram $out/libexec/pulse/gsettings-helper \ wrapProgram $out/libexec/pulse/gsettings-helper \
--prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
--prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
''; '';
meta = { meta = {

6
pkgs/tools/graphics/luxcorerender/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre
, bison, flex, libpthreadstubs, libX11 , bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings-desktop-schemas, glib , embree2, makeWrapper, gsettings-desktop-schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
# needed for XDG_ICON_DIRS # needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
makeWrapper makeWrapper
(stdenv.lib.getLib gnome3.dconf) (stdenv.lib.getLib dconf)
] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];
cmakeFlags = [ cmakeFlags = [
@ -66,7 +66,7 @@ in stdenv.mkDerivation {
wrapProgram "$out/bin/luxcoreui" \ wrapProgram "$out/bin/luxcoreui" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/tools/misc/hyperfine/default.nix
View File

@ -4,22 +4,22 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "hyperfine"; pname = "hyperfine";
version = "1.8.0"; version = "1.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sharkdp"; owner = "sharkdp";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "12bj5xifnpj5yni563b6b33lzmkgm7j1wk0c9859zw59b33ifd1l"; sha256 = "0jx2lqhayp14c51dfvgmqrmmadyvxf0p4dsn770ndqpzv66rh6zb";
}; };
cargoSha256 = "1ias944wg55njjnap7w02b87bvb502vzkpjvsb704q5i9sr8hjry"; cargoSha256 = "0sqmqfig40ragjx3jvwrng6hqz8l1zbmxzq470lk66x0gy4gziag";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security; buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Command-line benchmarking tool"; description = "Command-line benchmarking tool";
homepage = https://github.com/sharkdp/hyperfine; homepage = "https://github.com/sharkdp/hyperfine";
license = with licenses; [ asl20 /* or */ mit ]; license = with licenses; [ asl20 /* or */ mit ];
maintainers = [ maintainers.thoughtpolice ]; maintainers = [ maintainers.thoughtpolice ];
platforms = platforms.all; platforms = platforms.all;

6
pkgs/tools/misc/topgrade/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "topgrade"; pname = "topgrade";
version = "3.4.0"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "r-darwish"; owner = "r-darwish";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "14p7lpdp85ay5p2r9npm2adp9njcssi47mb1fh2iyn8lp51d22bi"; sha256 = "15w1qi38dsx573nadqpvarxx63xla53w775fwkdds2iyspaljsg6";
}; };
cargoSha256 = "07h8d8fm20dp9xcz9vic63xnx2rbvanf2ivks1jiv32iy0kgz74p"; cargoSha256 = "0xhrgs2rpkgjzgsipq5rb3fmqwvxrl2wi0fly1xaa6p304k1710m";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Upgrade all the things"; description = "Upgrade all the things";

8
pkgs/tools/networking/gnirehtet/default.nix
View File

@ -1,12 +1,12 @@
{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}: {stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}:
let let
version = "2.3"; version = "2.4";
apk = stdenv.mkDerivation { apk = stdenv.mkDerivation {
pname = "gnirehtet.apk"; pname = "gnirehtet.apk";
inherit version; inherit version;
src = fetchzip { src = fetchzip {
url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz"; sha256 = "13gsh5982v961j86j5y71pgas94g2d1v1fgnbslbqw4h69fbf48g";
}; };
installPhase = '' installPhase = ''
mkdir $out mkdir $out
@ -22,10 +22,10 @@ rustPlatform.buildRustPackage {
owner = "Genymobile"; owner = "Genymobile";
repo = "gnirehtet"; repo = "gnirehtet";
rev = "v${version}"; rev = "v${version}";
sha256 = "118ig42qzr2xyra7r8zfxq38xidaxfc98ja9836jwnn9fgbigczr"; sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl";
}; };
sourceRoot = "source/relay-rust"; sourceRoot = "source/relay-rust";
cargoSha256 = "1500lfwbfnc0k2hn7r1n629fq11zfqm3fg13dddmhchq4i3sqkfb"; cargoSha256 = "1l1cirhmfkpa466vksynlhwggsfiahws7cpsxydrc414l415l283";
patchFlags = [ "-p2" ]; patchFlags = [ "-p2" ];
patches = [ patches = [

4
pkgs/tools/networking/uget/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, { stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null libappindicator-gtk3, gst_all_1, gtk3, dconf, wrapGAppsHook, aria2 ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
libnotify libnotify
libappindicator-gtk3 libappindicator-gtk3
gtk3 gtk3
(stdenv.lib.getLib gnome3.dconf) (stdenv.lib.getLib dconf)
] ]
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])
++ (stdenv.lib.optional (aria2 != null) aria2); ++ (stdenv.lib.optional (aria2 != null) aria2);

33
pkgs/top-level/all-packages.nix
View File

@ -456,7 +456,7 @@ in
findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
wrapGAppsHook = makeSetupHook { wrapGAppsHook = makeSetupHook {
deps = lib.optional (!stdenv.isDarwin) gnome3.dconf.lib ++ [ gtk3 librsvg makeWrapper ]; deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [ gtk3 librsvg makeWrapper ];
} ../build-support/setup-hooks/wrap-gapps-hook.sh; } ../build-support/setup-hooks/wrap-gapps-hook.sh;
separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
@ -1512,6 +1512,8 @@ in
datovka = libsForQt5.callPackage ../applications/networking/datovka { }; datovka = libsForQt5.callPackage ../applications/networking/datovka { };
dconf = callPackage ../development/libraries/dconf { };
ddar = callPackage ../tools/backup/ddar { }; ddar = callPackage ../tools/backup/ddar { };
ddate = callPackage ../tools/misc/ddate { }; ddate = callPackage ../tools/misc/ddate { };
@ -2438,9 +2440,7 @@ in
libkkc = callPackage ../tools/inputmethods/libkkc { }; libkkc = callPackage ../tools/inputmethods/libkkc { };
ibus = callPackage ../tools/inputmethods/ibus { ibus = callPackage ../tools/inputmethods/ibus { };
inherit (gnome3) dconf;
};
ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
@ -2461,9 +2461,7 @@ in
protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
}; };
table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };
inherit (gnome3) dconf;
};
table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese { table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese {
ibus-table = ibus-engines.table; ibus-table = ibus-engines.table;
@ -2482,9 +2480,7 @@ in
}; };
}; };
ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { };
inherit (gnome3) dconf;
};
interception-tools = callPackage ../tools/inputmethods/interception-tools { }; interception-tools = callPackage ../tools/inputmethods/interception-tools { };
interception-tools-plugins = { interception-tools-plugins = {
@ -13586,11 +13582,11 @@ in
inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
bison = bison2; # error: too few arguments to function 'int yylex(... bison = bison2; # error: too few arguments to function 'int yylex(...
inherit cups; inherit cups;
inherit dconf;
inherit harfbuzz; inherit harfbuzz;
inherit libGL; inherit libGL;
inherit perl; inherit perl;
inherit gtk3; inherit gtk3;
inherit (gnome3) dconf;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
inherit llvmPackages_5; inherit llvmPackages_5;
}); });
@ -19025,9 +19021,7 @@ in
gmrun = callPackage ../applications/misc/gmrun {}; gmrun = callPackage ../applications/misc/gmrun {};
gnucash = callPackage ../applications/office/gnucash { gnucash = callPackage ../applications/office/gnucash { };
inherit (gnome3) dconf;
};
goffice = callPackage ../development/libraries/goffice { }; goffice = callPackage ../development/libraries/goffice { };
@ -19748,9 +19742,7 @@ in
lifelines = callPackage ../applications/misc/lifelines { }; lifelines = callPackage ../applications/misc/lifelines { };
liferea = callPackage ../applications/networking/newsreaders/liferea { liferea = callPackage ../applications/networking/newsreaders/liferea { };
inherit (gnome3) dconf;
};
lightworks = callPackage ../applications/video/lightworks { lightworks = callPackage ../applications/video/lightworks {
portaudio = portaudio2014; portaudio = portaudio2014;
@ -20786,9 +20778,7 @@ in
quantomatic = callPackage ../applications/science/physics/quantomatic { }; quantomatic = callPackage ../applications/science/physics/quantomatic { };
quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };
inherit (gnome3) dconf;
};
quasselClient = quassel.override { quasselClient = quassel.override {
monolithic = false; monolithic = false;
@ -21063,7 +21053,7 @@ in
split2flac = callPackage ../applications/audio/split2flac { }; split2flac = callPackage ../applications/audio/split2flac { };
spotify-tui = callPackage ../applications/audio/spotify-tui { spotify-tui = callPackage ../applications/audio/spotify-tui {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) AppKit Security;
}; };
squishyball = callPackage ../applications/audio/squishyball { squishyball = callPackage ../applications/audio/squishyball {
@ -21660,7 +21650,6 @@ in
virt-what = callPackage ../applications/virtualization/virt-what { }; virt-what = callPackage ../applications/virtualization/virt-what { };
virt-manager = callPackage ../applications/virtualization/virt-manager { virt-manager = callPackage ../applications/virtualization/virt-manager {
dconf = gnome3.dconf;
system-libvirt = libvirt; system-libvirt = libvirt;
}; };

4
pkgs/top-level/python-packages.nix
View File

@ -5042,7 +5042,9 @@ in {
rpmfluff = callPackage ../development/python-modules/rpmfluff {}; rpmfluff = callPackage ../development/python-modules/rpmfluff {};
rpy2 = callPackage ../development/python-modules/rpy2 {}; rpy2 = if isPy3k
then callPackage ../development/python-modules/rpy2 { }
else callPackage ../development/python-modules/rpy2/2.nix { };
rtslib = callPackage ../development/python-modules/rtslib {}; rtslib = callPackage ../development/python-modules/rtslib {};