git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'staging-next' into staging
commita4bbc84e166f0eda8bf1f254afd27b155cf5180e authorJan Tojnar <jtojnar@gmail.com> dateSun 1 Dec 2019, 01:44 (7 years ago) parent03be1ad75c88b5
52 files changed+300−158
doc/languages-frameworks/gnome.xml+2−2 nixos/modules/config/no-x-libs.nix+1 nixos/modules/i18n/input-method/ibus.nix+1−1 nixos/modules/programs/dconf.nix+3−3 nixos/modules/services/x11/display-managers/gdm.nix+1−1 pkgs/applications/audio/spotify-tui/default.nix+7−6 pkgs/applications/editors/jucipp/default.nix+2−2 pkgs/applications/graphics/gthumb/default.nix+2−2 pkgs/applications/misc/onboard/default.nix+3−3 pkgs/applications/misc/plank/default.nix+2−1 pkgs/applications/misc/tilix/default.nix+2−2 pkgs/applications/networking/cawbird/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix+3−3 pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix+2−2 pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix+8−1 pkgs/applications/networking/remote/citrix-workspace/default.nix+2−1 pkgs/applications/office/zotero/default.nix+2−1 pkgs/applications/science/biology/kallisto/default.nix+2−2 pkgs/applications/science/electronics/gtkwave/default.nix+2−2 pkgs/applications/science/electronics/verilator/default.nix+2−2 pkgs/applications/science/math/pspp/default.nix+2−3 pkgs/applications/search/catfish/default.nix+2−2 pkgs/desktops/deepin/deepin-desktop-schemas/default.nix+2−2 pkgs/desktops/gnome-3/core/dconf-editor/default.nix+2−2 pkgs/desktops/gnome-3/core/gdm/default.nix+2−2 pkgs/desktops/gnome-3/default.nix+2−1 pkgs/desktops/gnome-3/extensions/caffeine/default.nix+3−4 pkgs/desktops/mate/mate-control-center/default.nix+2−2 pkgs/desktops/mate/mate-desktop/default.nix+2−2 pkgs/desktops/mate/mate-panel/default.nix+2−2 pkgs/desktops/mate/mate-settings-daemon/default.nix+2−2 pkgs/desktops/mate/mate-terminal/default.nix+2−2 pkgs/desktops/xfce/default.nix+3−2 pkgs/development/compilers/intel-graphics-compiler/default.nix+2−2 pkgs/development/interpreters/jimtcl/default.nix+24−6 pkgs/development/libraries/at-spi2-core/default.nix+2−1 pkgs/desktops/gnome-3/core/dconf/default.nix → pkgs/development/libraries/dconf/default.nix pkgs/development/libraries/flatpak/default.nix+2−2 pkgs/development/python-modules/rpy2/2.nix+108 pkgs/development/python-modules/rpy2/default.nix+23−33 pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch+21 pkgs/development/tools/analysis/rr/default.nix+1 pkgs/servers/http/jetty/default.nix+3−3 pkgs/servers/pulseaudio/default.nix+2−2 pkgs/tools/graphics/luxcorerender/default.nix+3−3 pkgs/tools/misc/hyperfine/default.nix+4−4 pkgs/tools/misc/topgrade/default.nix+3−3 pkgs/tools/networking/gnirehtet/default.nix+4−4 pkgs/tools/networking/uget/default.nix+2−2 pkgs/top-level/all-packages.nix+12−23 pkgs/top-level/python-packages.nix+3−1
doc/languages-frameworks/gnome.xml+2−2
@@ -74,7 +74,7 @@
7474preFixup = ''
7575 for f in $(find $out/bin/ $out/libexec/ -type f -executable); do
7676 wrapProgram "$f" \
77− --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \
77+ --prefix GIO_EXTRA_MODULES : "${getLib dconf}/lib/gio/modules" \
7878 --prefix XDG_DATA_DIRS : "$out/share" \
7979 --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
8080 --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
@@ -102,7 +102,7 @@ preFixup = ''
102102 </listitem>
103103 <listitem xml:id="ssec-gnome-hooks-dconf">
104104 <para>
105− <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.
105+ <package>dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable.
106106 </para>
107107 </listitem>
108108 <listitem xml:id="ssec-gnome-hooks-hicolor-icon-theme">
nixos/modules/config/no-x-libs.nix+1
@@ -35,6 +35,7 @@ with lib;
3535 networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
3636 networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
3737 gobject-introspection = super.gobject-introspection.override { x11Support = false; };
38+ polkit = super.polkit.override { withGnome = false; };
3839 }));
3940 };
4041}
nixos/modules/i18n/input-method/ibus.nix+1−1
@@ -55,7 +55,7 @@ in
5555
5656 # Without dconf enabled it is impossible to use IBus
5757 environment.systemPackages = with pkgs; [
58− gnome3.dconf ibusAutostart
58+ dconf ibusAutostart
5959 ];
6060
6161 environment.variables = {
nixos/modules/programs/dconf.nix+3−3
@@ -32,13 +32,13 @@ in
3232 environment.etc = optionals (cfg.profiles != {})
3333 (mapAttrsToList mkDconfProfile cfg.profiles);
3434
35− services.dbus.packages = [ pkgs.gnome3.dconf ];
35+ services.dbus.packages = [ pkgs.dconf ];
3636
3737 # For dconf executable
38− environment.systemPackages = [ pkgs.gnome3.dconf ];
38+ environment.systemPackages = [ pkgs.dconf ];
3939
4040 # Needed for unwrapped applications
41− environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.gnome3.dconf.lib}/lib/gio/modules" ];
41+ environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];
4242 };
4343
4444}
nixos/modules/services/x11/display-managers/gdm.nix+1−1
@@ -281,7 +281,7 @@ in
281281 customDconfDb = pkgs.stdenv.mkDerivation {
282282 name = "gdm-dconf-db";
283283 buildCommand = ''
284− ${pkgs.gnome3.dconf}/bin/dconf compile $out ${customDconf}/dconf
284+ ${pkgs.dconf}/bin/dconf compile $out ${customDconf}/dconf
285285 '';
286286 };
287287 in pkgs.stdenv.mkDerivation {
pkgs/applications/audio/spotify-tui/default.nix+7−6
@@ -1,21 +1,22 @@
1−{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }:
1+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, python3, libxcb, AppKit, Security }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "spotify-tui";
5− version = "0.9.0";
5+ version = "0.10.0";
66
77 src = fetchFromGitHub {
88 owner = "Rigellute";
99 repo = "spotify-tui";
1010 rev = "v${version}";
11− sha256 = "1bbh9df4gfgb5pqavgvmy8fqnr2j5rbqbanv0y31j4i0kv2wrh6a";
11+ sha256 = "10wrlfi50lsf6qjsi9qklw2mk2fbf0jib7f841v842l9k9zw0hrg";
1212 };
1313
14− cargoSha256 = "1rb4dl9zn3xx2yrapx5cfsli93ggmdq8w9fqi8cy8giyja1mnqfl";
14+ cargoSha256 = "140m3pryvbc96xvl5ymz68msrx93rmvvy0y8skvc40yxwl401inc";
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkgconfig python3 ];
1717 buildInputs = [ openssl ]
18− ++ stdenv.lib.optional stdenv.isDarwin Security;
18+ ++ stdenv.lib.optional stdenv.isLinux libxcb
19+ ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
1920
2021 meta = with stdenv.lib; {
2122 description = "Spotify for the terminal written in Rust";
pkgs/applications/editors/jucipp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm,
1+{ stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm,
22 boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
33 libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
44 coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 gtksourceviewmm
4545 llvmPackages.clang.cc
4646 llvmPackages.lldb
47− gnome3.dconf
47+ dconf
4848 ];
4949
5050
pkgs/applications/graphics/gthumb/default.nix+2−2
@@ -33,11 +33,11 @@
3333
3434stdenv.mkDerivation rec {
3535 pname = "gthumb";
36− version = "3.8.1";
36+ version = "3.8.2";
3737
3838 src = fetchurl {
3939 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
40− sha256 = "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb";
40+ sha256 = "15wqks35ks5dm7zj046dfd45vvrilan2ayfy2sxiprv7q74cip2q";
4141 };
4242
4343 nativeBuildInputs = [
pkgs/applications/misc/onboard/default.nix+3−3
@@ -7,7 +7,7 @@
77, bash
88, glib
99, glibcLocales
10−, gnome3
10+, dconf
1111, gobject-introspection
1212, gsettings-desktop-schemas
1313, gtk3
@@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication rec {
6666 buildInputs = [
6767 bash
6868 glib
69− gnome3.dconf
69+ dconf
7070 gsettings-desktop-schemas
7171 gtk3
7272 hunspell
@@ -89,7 +89,7 @@ python3.pkgs.buildPythonApplication rec {
8989 ];
9090
9191 propagatedUserEnvPkgs = [
92− gnome3.dconf
92+ dconf
9393 ];
9494
9595 checkInputs = [
pkgs/applications/misc/plank/default.nix+2−1
@@ -3,6 +3,7 @@
33, vala
44, atk
55, cairo
6+, dconf
67, glib
78, gnome3
89, gtk3
@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
5152 gdk-pixbuf
5253 glib
5354 gnome-menus
54− gnome3.dconf
55+ dconf
5556 gtk3
5657 libX11
5758 libXfixes
pkgs/applications/misc/tilix/default.nix+2−2
@@ -6,7 +6,7 @@
66, python3
77, pkgconfig
88, dmd
9−, gnome3
9+, dconf
1010, dbus
1111, gsettings-desktop-schemas
1212, desktop-file-utils
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
4747 buildInputs = [
4848 dbus
4949 gettext
50− gnome3.dconf
50+ dconf
5151 gsettings-desktop-schemas
5252 gtkd
5353 libsecret
pkgs/applications/networking/cawbird/default.nix+2−2
@@ -11,7 +11,7 @@
1111, meson
1212, ninja
1313, pkgconfig
14−, gnome3
14+, dconf
1515, gst_all_1
1616, wrapGAppsHook
1717, gobject-introspection
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 sqlite
4848 libsoup
4949 gettext
50− gnome3.dconf
50+ dconf
5151 gspell
5252 glib-networking
5353 ] ++ (with gst_all_1; [
pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
1+{ stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pname = "telepathy-idle";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
13− buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ];
13+ buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib dconf) makeWrapper ];
1414
1515 preFixup = ''
1616 wrapProgram "$out/libexec/telepathy-idle" \
17− --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
17+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
1818 '';
1919
2020 meta = {
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
2−, gnome3, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
2+, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
33
44stdenv.mkDerivation rec {
55 project = "telepathy-logger";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 preFixup = ''
2424 wrapProgram "$out/libexec/telepathy-logger" \
25− --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
25+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
2626 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
2727 '';
2828
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, pkgconfig
4−, gnome3
4+, dconf
55, telepathy-glib
66, python3
77, libxslt
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939
4040 preFixup = ''
4141 wrapProgram "$lib/libexec/mission-control-5" \
42− --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
42+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
4343 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
4444 '';
4545
pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix+8−1
@@ -1,5 +1,5 @@
11{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig
2−, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib }:
2+, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }:
33
44
55stdenv.mkDerivation rec {
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
1313 sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk";
1414 };
1515
16+ patches = [
17+ (fetchpatch {
18+ url = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/0f5cc8a9942e220ea0f7d0b17db4a78d094e3b65.patch";
19+ sha256 = "195rsjpbc0gzmr9bycvq4mra7abp3hd9by3a5vvcmxsh5ipikycf";
20+ })
21+ ];
22+
1623 preConfigure = "./autogen.sh";
1724
1825 nativeBuildInputs= [
pkgs/applications/networking/remote/citrix-workspace/default.nix+2−1
@@ -9,6 +9,7 @@
99, makeDesktopItem
1010, tzdata
1111, cacert
12+, dconf
1213, glib
1314, gtk2
1415, atk
@@ -137,7 +138,7 @@ let
137138 gdk-pixbuf
138139 cairo
139140 pango
140− gnome3.dconf
141+ dconf
141142 xorg.libX11
142143 xorg.libXext
143144 xorg.libXrender
pkgs/applications/office/zotero/default.nix+2−1
@@ -5,6 +5,7 @@
55, cups
66, dbus-glib
77, dbus
8+, dconf
89, fontconfig
910, freetype
1011, gdk-pixbuf
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
4142 sha256 = "1dgxzprpb8f5wpmvlvkxix0xxckfgjsi3wfcy9mb221a17cv0029";
4243 };
4344
44− buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
45+ buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme dconf ];
4546
4647 phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
4748
pkgs/applications/science/biology/kallisto/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "kallisto";
5− version = "0.46.0";
5+ version = "0.46.1";
66
77 src = fetchFromGitHub {
88 repo = "kallisto";
99 owner = "pachterlab";
1010 rev = "v${version}";
11− sha256 = "09vgdqwpigl4x3sdw5vjfyknsllkli339mh8xapbf7ldm0jldfn9";
11+ sha256 = "09ldgy70wziw51ma4a3b7vyrphzf2v1cnq1j5r1wwgfmx8fgbh2z";
1212 };
1313
1414 nativeBuildInputs = [ autoconf cmake ];
pkgs/applications/science/electronics/gtkwave/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "gtkwave";
5− version = "3.3.102";
5+ version = "3.3.103";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz";
9− sha256 = "1izyfx6b1n9nr08c7q0gkgcf0q04bb4qz92ckwh74n5l5nwprfw0";
9+ sha256 = "1xzaxqbabj4sb4n10yki5acglx3736pwl3kwlq4k7i96rzvsn9f3";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
pkgs/applications/science/electronics/verilator/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "verilator";
5− version = "4.020";
5+ version = "4.022";
66
77 src = fetchurl {
88 url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
9− sha256 = "06n3vds762vza4byrav0j3kp3aivvadndkgw7nirvasclp19zmxb";
9+ sha256 = "1sj0qzl387pl2ygii3ssx35c3m601nb07j16lqj5zcxzhcg62i9p";
1010 };
1111
1212 enableParallelBuilding = true;
pkgs/applications/science/math/pspp/default.nix+2−3
@@ -1,7 +1,6 @@
11{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
2−, pkgconfig, gtksourceview, pango, gettext
2+, pkgconfig, gtksourceview, pango, gettext, dconf
33, makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
4−, gnome3
54}:
65
76stdenv.mkDerivation rec {
@@ -26,7 +25,7 @@ stdenv.mkDerivation rec {
2625 --prefix XDG_DATA_DIRS : "$out/share" \
2726 --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
2827 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
29− --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
28+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
3029 '';
3130
3231 meta = {
pkgs/applications/search/catfish/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, file, which, intltool, gobject-introspection,
2− findutils, xdg_utils, gnome3, gtk3, pythonPackages,
2+ findutils, xdg_utils, dconf, gtk3, pythonPackages,
33 wrapGAppsHook
44}:
55
@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
2525
2626 buildInputs = [
2727 gtk3
28− gnome3.dconf
28+ dconf
2929 pythonPackages.pyxdg
3030 pythonPackages.ptyprocess
3131 pythonPackages.pycairo
pkgs/desktops/deepin/deepin-desktop-schemas/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python3, gnome3, glib, deepin-gtk-theme,
1+{ stdenv, fetchFromGitHub, python3, dconf, glib, deepin-gtk-theme,
22 deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }:
33
44stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 ];
2020
2121 buildInputs = [
22− gnome3.dconf
22+ dconf
2323 deepin-gtk-theme
2424 deepin-icon-theme
2525 deepin-sound-theme
pkgs/desktops/gnome-3/core/dconf-editor/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3
1+{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3, dconf
22, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
33
44let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
1717 gettext docbook_xsl libxml2 gobject-introspection python3
1818 ];
1919
20− buildInputs = [ glib gtk3 gnome3.dconf ];
20+ buildInputs = [ glib gtk3 dconf ];
2121
2222 postPatch = ''
2323 chmod +x meson_post_install.py
pkgs/desktops/gnome-3/core/gdm/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
2−, accountsservice, libX11, gnome3, systemd, autoreconfHook
2+, accountsservice, libX11, gnome3, systemd, autoreconfHook, dconf
33, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
44, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:
55
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 "--with-udevdir=$(out)/lib/udev"
4444 ];
4545
46− nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ];
46+ nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool dconf ];
4747 buildInputs = [
4848 glib accountsservice systemd
4949 gobject-introspection libX11 gtk3
pkgs/desktops/gnome-3/default.nix+2−1
@@ -35,7 +35,6 @@ lib.makeScope pkgs.newScope (self: with self; {
3535
3636 caribou = callPackage ./core/caribou { };
3737
38− dconf = callPackage ./core/dconf { };
3938 dconf-editor = callPackage ./core/dconf-editor { };
4039
4140 empathy = callPackage ./core/empathy { };
@@ -359,4 +358,6 @@ lib.makeScope pkgs.newScope (self: with self; {
359358 inherit (pkgs) gjs; # added 2019-01-05
360359
361360 inherit (pkgs) yelp-tools; # added 2019-11-20
361+
362+ inherit (pkgs) dconf; # added 2019-11-30
362363})
pkgs/desktops/gnome-3/extensions/caffeine/default.nix+3−4
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-caffeine";
5− version = "unstable-2019-04-02";
5+ version = "33";
66
77 src = fetchFromGitHub {
88 owner = "eonpatapon";
99 repo = "gnome-shell-extension-caffeine";
10− rev = "a6b37dee108cddf50a0f0a19f0101854a75bf173";
11− sha256 = "1j3q12j36v97551sjb0c8qc8zr7a7gmxibygczryfdfmwjzp6icl";
10+ rev = "v${version}";
11+ sha256 = "1v74xfk7csgc4kw1fg75brmhk2aby3d453ksnmj4k8ivyxkzxmfg";
1212 };
1313
1414 uuid = "caffeine@patapon.info";
@@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
3232 license = licenses.gpl2;
3333 maintainers = with maintainers; [ eperuffo ];
3434 homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine;
35− broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
3635 };
3736}
pkgs/desktops/mate/mate-control-center/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
22 libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
3− desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
3+ desktop-file-utils, dconf, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
44}:
55
66stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 librsvg
2929 libappindicator-gtk3
3030 gtk3
31− gnome3.dconf
31+ dconf
3232 hicolor-icon-theme
3333 mate.mate-desktop
3434 mate.libmatekbd
pkgs/desktops/mate/mate-desktop/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "mate-desktop";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 ];
1717
1818 buildInputs = [
19− gnome3.dconf
19+ dconf
2020 gtk3
2121 isocodes
2222 ];
pkgs/desktops/mate/mate-panel/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "mate-panel";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 librsvg
2424 libxml2
2525 gtk3
26− gnome3.dconf
26+ dconf
2727 mate.libmateweather
2828 mate.mate-desktop
2929 mate.mate-menus
pkgs/desktops/mate/mate-settings-daemon/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier,
2− libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate,
2+ libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
33 pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
44 wrapGAppsHook, fetchpatch, autoreconfHook }:
55
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 nss
3636 polkit
3737 gtk3
38− gnome3.dconf
38+ dconf
3939 mate.mate-desktop
4040 mate.libmatekbd
4141 mate.libmatemixer
pkgs/desktops/mate/mate-terminal/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "mate-terminal";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 vte
2020 gtk3
21− gnome3.dconf
21+ dconf
2222 ];
2323
2424 nativeBuildInputs = [
pkgs/desktops/xfce/default.nix+3−2
@@ -3,8 +3,6 @@
33lib.makeScope pkgs.newScope (self: with self; {
44 #### NixOS support
55
6− inherit (pkgs.gnome3) dconf;
7−
86 mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
97
108 automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
@@ -217,4 +215,7 @@ lib.makeScope pkgs.newScope (self: with self; {
217215 thunar-bare = thunar.override {
218216 thunarPlugins = [];
219217 };
218+
219+ # added 2019-11-30
220+ inherit (pkgs) dconf;
220221})
pkgs/development/compilers/intel-graphics-compiler/default.nix+2−2
@@ -24,13 +24,13 @@ in
2424
2525stdenv.mkDerivation rec {
2626 pname = "intel-graphics-compiler";
27− version = "1.0.2714.1";
27+ version = "1.0.2878";
2828
2929 src = fetchFromGitHub {
3030 owner = "intel";
3131 repo = "intel-graphics-compiler";
3232 rev = "igc-${version}";
33− sha256 = "0ys03sv08fg8q06lb6k5088xirnwms4nzazxp3kbdjm973n7imxc";
33+ sha256 = "0rgij1013fy2x2szfchy3z6390mjfqw3nz4zprcb5v2v6mpvcj4l";
3434 };
3535
3636 nativeBuildInputs = [ clang cmake bison flex llvm python ];
pkgs/development/interpreters/jimtcl/default.nix+24−6
@@ -5,35 +5,53 @@ let
55
66in stdenv.mkDerivation rec {
77 pname = "jimtcl";
8− version = "0.78";
8+ version = "0.79";
99
1010 src = fetchFromGitHub {
1111 owner = "msteveb";
1212 repo = "jimtcl";
1313 rev = version;
14− sha256 = "1nrjxjfh69i35ig8sxdlal4ydd3cl0x68c05s6svnf1y2i1bl23j";
14+ sha256 = "1k88hz0v3bi19xdvlp0i9nsx38imzwpjh632w7326zwbv2wldf0h";
1515 };
1616
17− buildInputs = [
18− sqlite readline asciidoc SDL SDL_gfx
17+ nativeBuildInputs = [
18+ asciidoc
1919 ];
2020
21− NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ];
21+ buildInputs = [
22+ sqlite readline SDL SDL_gfx
23+ ];
2224
2325 configureFlags = [
26+ "--shared"
2427 "--with-ext=oo"
2528 "--with-ext=tree"
2629 "--with-ext=binary"
2730 "--with-ext=sqlite3"
2831 "--with-ext=readline"
2932 "--with-ext=sdl"
33+ "--with-ext=json"
3034 "--enable-utf8"
3135 "--ipv6"
3236 ];
3337
38+ NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ];
39+
40+ enableParallelBuilding = true;
41+
42+ doCheck = true;
43+ preCheck = ''
44+ # test exec2-3.2 fails depending on platform or sandboxing (?)
45+ rm tests/exec2.test
46+ '';
47+
48+ postInstall = ''
49+ ln -sr $out/lib/libjim.so.${version} $out/lib/libjim.so
50+ '';
51+
3452 meta = {
3553 description = "An open source small-footprint implementation of the Tcl programming language";
36− homepage = http://jim.tcl.tk/;
54+ homepage = "http://jim.tcl.tk/";
3755 license = stdenv.lib.licenses.bsd2;
3856 platforms = stdenv.lib.platforms.all;
3957 maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ];
pkgs/development/libraries/at-spi2-core/default.nix+2−1
@@ -10,6 +10,7 @@
1010
1111, dbus
1212, glib
13+, dconf
1314, libX11
1415, 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
1516, libXi
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
4849 postFixup = ''
4950 # Cannot use wrapGAppsHook'due to a dependency cycle
5051 wrapProgram $out/libexec/at-spi-bus-launcher \
51− --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
52+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
5253 --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
5354 '';
5455
pkgs/desktops/gnome-3/core/dconf/default.nix → pkgs/development/libraries/dconf/default.nixrenamed

The content is the same.

pkgs/development/libraries/flatpak/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
22, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
33, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse, nixosTests
4−, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }:
4+, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, dconf, gsettings-desktop-schemas, librsvg }:
55
66stdenv.mkDerivation rec {
77 pname = "flatpak";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242 ];
4343
4444 buildInputs = [
45− bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
45+ bubblewrap bzip2 dbus dconf glib gpgme json-glib libarchive libcap libseccomp
4646 libsoup lzma ostree polkit python3 systemd xorg.libXau fuse
4747 gsettings-desktop-schemas glib-networking
4848 librsvg # for flatpak-validate-icon
pkgs/development/python-modules/rpy2/2.nixnew file+108
@@ -0,0 +1,108 @@
1+{ lib
2+, python
3+, buildPythonPackage
4+, fetchPypi
5+, isPyPy
6+, isPy27
7+, readline
8+, R
9+, rWrapper
10+, rPackages
11+, pcre
12+, lzma
13+, bzip2
14+, zlib
15+, icu
16+, singledispatch
17+, six
18+, jinja2
19+, pytz
20+, numpy
21+, pytest
22+, mock
23+, extraRPackages ? []
24+}:
25+
26+buildPythonPackage rec {
27+ version = "2.8.6"; # python2 support dropped in 2.9.x
28+ pname = "rpy2";
29+ disabled = isPyPy;
30+ src = fetchPypi {
31+ inherit version pname;
32+ sha256 = "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80";
33+ };
34+ buildInputs = [
35+ readline
36+ R
37+ pcre
38+ lzma
39+ bzip2
40+ zlib
41+ icu
42+ ] ++ (with rPackages; [
43+ # packages expected by the test framework
44+ ggplot2
45+ dplyr
46+ RSQLite
47+ broom
48+ DBI
49+ dbplyr
50+ hexbin
51+ lme4
52+ tidyr
53+
54+ # is in upstream's `requires` although it shouldn't be -- this is easier than patching it away
55+ pytest
56+ ]) ++ extraRPackages ++ rWrapper.recommendedPackages;
57+
58+ nativeBuildInputs = [
59+ R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly)
60+ ];
61+
62+ patches = [
63+ # R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
64+ # This patch sets R_LIBS_SITE when rpy2 is imported.
65+ ./r-libs-site.patch
66+ ];
67+ postPatch = ''
68+ substituteInPlace ${ if isPy27 then "rpy/rinterface/__init__.py" else "rpy2/rinterface_lib/embedded.py" } --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
69+ '';
70+
71+ doPatchelf = false; # fails because of "missing filename"
72+ patchelfPhase = "";
73+
74+ propagatedBuildInputs = [
75+ singledispatch
76+ six
77+ jinja2
78+ pytz
79+ numpy
80+ ];
81+
82+ checkInputs = [
83+ pytest
84+ mock
85+ ];
86+ # One remaining test failure caused by different unicode encoding.
87+ # https://bitbucket.org/rpy2/rpy2/issues/488
88+ doCheck = false;
89+ checkPhase = ''
90+ ${python.interpreter} -m 'rpy2'
91+ '';
92+
93+ # For some reason libreadline.so is not found. Curiously `ldd _rinterface.so | grep readline` shows two readline entries:
94+ # libreadline.so.6 => not found
95+ # libreadline.so.6 => /nix/store/z2zhmrg6jcrn5iq2779mav0nnq4vm2q6-readline-6.3p08/lib/libreadline.so.6 (0x00007f333ac43000)
96+ # There must be a better way to fix this, but I don't know it.
97+ postFixup = ''
98+ patchelf --add-needed ${readline}/lib/libreadline.so "$out/${python.sitePackages}/rpy2/rinterface/"_rinterface*.so
99+ '';
100+
101+ meta = {
102+ homepage = http://rpy.sourceforge.net/rpy2;
103+ description = "Python interface to R";
104+ license = lib.licenses.gpl2Plus;
105+ platforms = lib.platforms.unix;
106+ maintainers = with lib.maintainers; [ joelmo ];
107+ };
108+ }
pkgs/development/python-modules/rpy2/default.nix+23−33
@@ -3,8 +3,6 @@
33, buildPythonPackage
44, fetchPypi
55, isPyPy
6−, isPy27
7−, readline
86, R
97, rWrapper
108, rPackages
@@ -13,38 +11,38 @@
1311, bzip2
1412, zlib
1513, icu
16−, singledispatch
17−, six
14+, ipython
1815, jinja2
1916, pytz
17+, pandas
2018, numpy
19+, cffi
20+, tzlocal
21+, simplegeneric
2122, pytest
22−, mock
2323, extraRPackages ? []
2424}:
2525
2626buildPythonPackage rec {
27− version = if isPy27 then
28− "2.8.6" # python2 support dropped in 2.9.x
29− else
30− "2.9.5";
27+ version = "3.2.2";
3128 pname = "rpy2";
29+
3230 disabled = isPyPy;
3331 src = fetchPypi {
3432 inherit version pname;
35− sha256 = if isPy27 then
36− "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80" # 2.8.x
37− else
38− "1nrj8pgyxrwrfdrxzb4j3z1adjwjx1mr8d1n5cmrz4nhlzy8w7xr"; # 2.9.x
33+ sha256 = "0b3jpn9x7m2pccriyzgfsdb68qp6nq4ffhvjy1q2ar8wdxvmf5xp";
3934 };
35+
4036 buildInputs = [
41− readline
4237 R
4338 pcre
4439 lzma
4540 bzip2
4641 zlib
4742 icu
43+
44+ # is in the upstream `requires` although it shouldn't be -- this is easier than patching it away
45+ pytest
4846 ] ++ (with rPackages; [
4947 # packages expected by the test framework
5048 ggplot2
@@ -58,6 +56,10 @@ buildPythonPackage rec {
5856 tidyr
5957 ]) ++ extraRPackages ++ rWrapper.recommendedPackages;
6058
59+ checkPhase = ''
60+ pytest
61+ '';
62+
6163 nativeBuildInputs = [
6264 R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly)
6365 ];
@@ -65,38 +67,26 @@ buildPythonPackage rec {
6567 patches = [
6668 # R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
6769 # This patch sets R_LIBS_SITE when rpy2 is imported.
68− ./r-libs-site.patch
70+ ./rpy2-3.x-r-libs-site.patch
6971 ];
7072 postPatch = ''
71− substituteInPlace rpy/rinterface/__init__.py --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
73+ substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
7274 '';
7375
7476 propagatedBuildInputs = [
75− singledispatch
76− six
77+ ipython
7778 jinja2
7879 pytz
80+ pandas
7981 numpy
82+ cffi
83+ tzlocal
84+ simplegeneric
8085 ];
8186
8287 checkInputs = [
8388 pytest
84− mock
8589 ];
86− # One remaining test failure caused by different unicode encoding.
87− # https://bitbucket.org/rpy2/rpy2/issues/488
88− doCheck = false;
89− checkPhase = ''
90− ${python.interpreter} -m 'rpy2.tests'
91− '';
92−
93− # For some reason libreadline.so is not found. Curiously `ldd _rinterface.so | grep readline` shows two readline entries:
94− # libreadline.so.6 => not found
95− # libreadline.so.6 => /nix/store/z2zhmrg6jcrn5iq2779mav0nnq4vm2q6-readline-6.3p08/lib/libreadline.so.6 (0x00007f333ac43000)
96− # There must be a better way to fix this, but I don't know it.
97− postFixup = ''
98− patchelf --add-needed ${readline}/lib/libreadline.so "$out/${python.sitePackages}/rpy2/rinterface/"_rinterface*.so
99− '';
10090
10191 meta = {
10292 homepage = http://rpy.sourceforge.net/rpy2;
pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patchnew file+21
@@ -0,0 +1,21 @@
1+diff --git a/rpy2/rinterface_lib/embedded.py b/rpy2/rinterface_lib/embedded.py
2+index cc32b6d..3969ad0 100644
3+--- a/rpy2/rinterface_lib/embedded.py
4++++ b/rpy2/rinterface_lib/embedded.py
5+@@ -113,6 +113,16 @@ def _initr(interactive: bool = True,
6+ if isinitialized():
7+ return None
8+ os.environ['R_HOME'] = openrlib.R_HOME
9++
10++ # path to libraries
11++ existing = os.environ.get('R_LIBS_SITE')
12++ if existing is not None:
13++ prefix = existing + ':'
14++ else:
15++ prefix = ''
16++ additional = '@NIX_R_LIBS_SITE@'
17++ os.environ['R_LIBS_SITE'] = prefix + additional
18++
19+ options_c = [ffi.new('char[]', o.encode('ASCII')) for o in _options]
20+ n_options = len(options_c)
21+ n_options_c = ffi.cast('int', n_options)
pkgs/development/tools/analysis/rr/default.nix+1
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
2525 buildInputs = [
2626 cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto
2727 ];
28+ propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime
2829 cmakeFlags = [
2930 "-DCMAKE_C_FLAGS_RELEASE:STRING="
3031 "-DCMAKE_CXX_FLAGS_RELEASE:STRING="
pkgs/servers/http/jetty/default.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "jetty";
5− version = "9.4.22.v20191022";
5+ version = "9.4.24.v20191120";
66 src = fetchurl {
77 url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
88 name = "jetty-distribution-${version}.tar.gz";
9− sha256 = "1a5av6ygsmjwbnlax7f7l58d7hlw3xm0cpk5ml7mb54vrlrcb7hv";
9+ sha256 = "072vr8gfly2xdwxx1c771yymf145l8nv0j31liwqrih8zqvvhsd4";
1010 };
1111
1212 phases = [ "unpackPhase" "installPhase" ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 meta = {
2020 description = "A Web server and javax.servlet container";
21− homepage = http://www.eclipse.org/jetty/;
21+ homepage = "https://www.eclipse.org/jetty/";
2222 platforms = stdenv.lib.platforms.all;
2323 license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
2424 };
pkgs/servers/pulseaudio/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook
22, libsndfile, libtool, makeWrapper, perlPackages
3−, xorg, libcap, alsaLib, glib, gnome3
3+, xorg, libcap, alsaLib, glib, dconf
44, avahi, libjack2, libasyncns, lirc, dbus
55, sbc, bluez5, udev, openssl, fftwFloat
66, speexdsp, systemd, webrtc-audio-processing
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
113113 preFixup = lib.optionalString stdenv.isLinux ''
114114 wrapProgram $out/libexec/pulse/gsettings-helper \
115115 --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
116− --prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules"
116+ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
117117 '';
118118
119119 meta = {
pkgs/tools/graphics/luxcorerender/default.nix+3−3
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
22, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
33, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
4−, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre
4+, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre
55, bison, flex, libpthreadstubs, libX11
66, embree2, makeWrapper, gsettings-desktop-schemas, glib
77, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@@ -35,7 +35,7 @@ in stdenv.mkDerivation {
3535 # needed for XDG_ICON_DIRS
3636 gnome3.adwaita-icon-theme
3737 makeWrapper
38− (stdenv.lib.getLib gnome3.dconf)
38+ (stdenv.lib.getLib dconf)
3939 ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];
4040
4141 cmakeFlags = [
@@ -66,7 +66,7 @@ in stdenv.mkDerivation {
6666 wrapProgram "$out/bin/luxcoreui" \
6767 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
6868 --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \
69− --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
69+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
7070 '';
7171
7272 meta = with stdenv.lib; {
pkgs/tools/misc/hyperfine/default.nix+4−4
@@ -4,22 +4,22 @@
44
55rustPlatform.buildRustPackage rec {
66 pname = "hyperfine";
7− version = "1.8.0";
7+ version = "1.9.0";
88
99 src = fetchFromGitHub {
1010 owner = "sharkdp";
1111 repo = pname;
1212 rev = "refs/tags/v${version}";
13− sha256 = "12bj5xifnpj5yni563b6b33lzmkgm7j1wk0c9859zw59b33ifd1l";
13+ sha256 = "0jx2lqhayp14c51dfvgmqrmmadyvxf0p4dsn770ndqpzv66rh6zb";
1414 };
1515
16− cargoSha256 = "1ias944wg55njjnap7w02b87bvb502vzkpjvsb704q5i9sr8hjry";
16+ cargoSha256 = "0sqmqfig40ragjx3jvwrng6hqz8l1zbmxzq470lk66x0gy4gziag";
1717
1818 buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
1919
2020 meta = with stdenv.lib; {
2121 description = "Command-line benchmarking tool";
22− homepage = https://github.com/sharkdp/hyperfine;
22+ homepage = "https://github.com/sharkdp/hyperfine";
2323 license = with licenses; [ asl20 /* or */ mit ];
2424 maintainers = [ maintainers.thoughtpolice ];
2525 platforms = platforms.all;
pkgs/tools/misc/topgrade/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "topgrade";
5− version = "3.4.0";
5+ version = "3.5.0";
66
77 src = fetchFromGitHub {
88 owner = "r-darwish";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "14p7lpdp85ay5p2r9npm2adp9njcssi47mb1fh2iyn8lp51d22bi";
11+ sha256 = "15w1qi38dsx573nadqpvarxx63xla53w775fwkdds2iyspaljsg6";
1212 };
1313
14− cargoSha256 = "07h8d8fm20dp9xcz9vic63xnx2rbvanf2ivks1jiv32iy0kgz74p";
14+ cargoSha256 = "0xhrgs2rpkgjzgsipq5rb3fmqwvxrl2wi0fly1xaa6p304k1710m";
1515
1616 meta = with stdenv.lib; {
1717 description = "Upgrade all the things";
pkgs/tools/networking/gnirehtet/default.nix+4−4
@@ -1,12 +1,12 @@
11{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}:
22let
3−version = "2.3";
3+version = "2.4";
44apk = stdenv.mkDerivation {
55 pname = "gnirehtet.apk";
66 inherit version;
77 src = fetchzip {
88 url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
9− sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz";
9+ sha256 = "13gsh5982v961j86j5y71pgas94g2d1v1fgnbslbqw4h69fbf48g";
1010 };
1111 installPhase = ''
1212 mkdir $out
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage {
2222 owner = "Genymobile";
2323 repo = "gnirehtet";
2424 rev = "v${version}";
25− sha256 = "118ig42qzr2xyra7r8zfxq38xidaxfc98ja9836jwnn9fgbigczr";
25+ sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl";
2626 };
2727 sourceRoot = "source/relay-rust";
28− cargoSha256 = "1500lfwbfnc0k2hn7r1n629fq11zfqm3fg13dddmhchq4i3sqkfb";
28+ cargoSha256 = "1l1cirhmfkpa466vksynlhwggsfiahws7cpsxydrc414l415l283";
2929
3030 patchFlags = [ "-p2" ];
3131 patches = [
pkgs/tools/networking/uget/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
2− libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null
2+ libappindicator-gtk3, gst_all_1, gtk3, dconf, wrapGAppsHook, aria2 ? null
33}:
44
55stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 libnotify
2424 libappindicator-gtk3
2525 gtk3
26− (stdenv.lib.getLib gnome3.dconf)
26+ (stdenv.lib.getLib dconf)
2727 ]
2828 ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])
2929 ++ (stdenv.lib.optional (aria2 != null) aria2);
pkgs/top-level/all-packages.nix+12−23
@@ -456,7 +456,7 @@ in
456456 findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
457457
458458 wrapGAppsHook = makeSetupHook {
459− deps = lib.optional (!stdenv.isDarwin) gnome3.dconf.lib ++ [ gtk3 librsvg makeWrapper ];
459+ deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [ gtk3 librsvg makeWrapper ];
460460 } ../build-support/setup-hooks/wrap-gapps-hook.sh;
461461
462462 separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
@@ -1512,6 +1512,8 @@ in
15121512
15131513 datovka = libsForQt5.callPackage ../applications/networking/datovka { };
15141514
1515+ dconf = callPackage ../development/libraries/dconf { };
1516+
15151517 ddar = callPackage ../tools/backup/ddar { };
15161518
15171519 ddate = callPackage ../tools/misc/ddate { };
@@ -2438,9 +2440,7 @@ in
24382440
24392441 libkkc = callPackage ../tools/inputmethods/libkkc { };
24402442
2441− ibus = callPackage ../tools/inputmethods/ibus {
2442− inherit (gnome3) dconf;
2443− };
2443+ ibus = callPackage ../tools/inputmethods/ibus { };
24442444
24452445 ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
24462446
@@ -2461,9 +2461,7 @@ in
24612461 protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
24622462 };
24632463
2464− table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
2465− inherit (gnome3) dconf;
2466− };
2464+ table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };
24672465
24682466 table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese {
24692467 ibus-table = ibus-engines.table;
@@ -2482,9 +2480,7 @@ in
24822480 };
24832481 };
24842482
2485− ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix {
2486− inherit (gnome3) dconf;
2487− };
2483+ ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { };
24882484
24892485 interception-tools = callPackage ../tools/inputmethods/interception-tools { };
24902486 interception-tools-plugins = {
@@ -13586,11 +13582,11 @@ in
1358613582 inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
1358713583 bison = bison2; # error: too few arguments to function 'int yylex(...
1358813584 inherit cups;
13585+ inherit dconf;
1358913586 inherit harfbuzz;
1359013587 inherit libGL;
1359113588 inherit perl;
1359213589 inherit gtk3;
13593− inherit (gnome3) dconf;
1359413590 inherit (gst_all_1) gstreamer gst-plugins-base;
1359513591 inherit llvmPackages_5;
1359613592 });
@@ -19025,9 +19021,7 @@ in
1902519021
1902619022 gmrun = callPackage ../applications/misc/gmrun {};
1902719023
19028− gnucash = callPackage ../applications/office/gnucash {
19029− inherit (gnome3) dconf;
19030− };
19024+ gnucash = callPackage ../applications/office/gnucash { };
1903119025
1903219026 goffice = callPackage ../development/libraries/goffice { };
1903319027
@@ -19748,9 +19742,7 @@ in
1974819742
1974919743 lifelines = callPackage ../applications/misc/lifelines { };
1975019744
19751− liferea = callPackage ../applications/networking/newsreaders/liferea {
19752− inherit (gnome3) dconf;
19753− };
19745+ liferea = callPackage ../applications/networking/newsreaders/liferea { };
1975419746
1975519747 lightworks = callPackage ../applications/video/lightworks {
1975619748 portaudio = portaudio2014;
@@ -19888,7 +19880,7 @@ in
1988819880 };
1988919881
1989019882 matchbox = callPackage ../applications/window-managers/matchbox { };
19891−
19883+
1989219884 matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli {
1989319885 inherit (python3Packages) buildPythonApplication buildPythonPackage
1989419886 pygobject3 pytestrunner requests responses pytest python-olm
@@ -20786,9 +20778,7 @@ in
2078620778
2078720779 quantomatic = callPackage ../applications/science/physics/quantomatic { };
2078820780
20789− quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
20790− inherit (gnome3) dconf;
20791− };
20781+ quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };
2079220782
2079320783 quasselClient = quassel.override {
2079420784 monolithic = false;
@@ -21063,7 +21053,7 @@ in
2106321053 split2flac = callPackage ../applications/audio/split2flac { };
2106421054
2106521055 spotify-tui = callPackage ../applications/audio/spotify-tui {
21066− inherit (darwin.apple_sdk.frameworks) Security;
21056+ inherit (darwin.apple_sdk.frameworks) AppKit Security;
2106721057 };
2106821058
2106921059 squishyball = callPackage ../applications/audio/squishyball {
@@ -21660,7 +21650,6 @@ in
2166021650 virt-what = callPackage ../applications/virtualization/virt-what { };
2166121651
2166221652 virt-manager = callPackage ../applications/virtualization/virt-manager {
21663− dconf = gnome3.dconf;
2166421653 system-libvirt = libvirt;
2166521654 };
2166621655
pkgs/top-level/python-packages.nix+3−1
@@ -5042,7 +5042,9 @@ in {
50425042
50435043 rpmfluff = callPackage ../development/python-modules/rpmfluff {};
50445044
5045− rpy2 = callPackage ../development/python-modules/rpy2 {};
5045+ rpy2 = if isPy3k
5046+ then callPackage ../development/python-modules/rpy2 { }
5047+ else callPackage ../development/python-modules/rpy2/2.nix { };
50465048
50475049 rtslib = callPackage ../development/python-modules/rtslib {};
50485050