From b8b2f3cbbbaf330511d56ca85ec56e3a3f0215e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 Mar 2019 15:47:50 -0700 Subject: lxtask: 0.1.8 -> 0.1.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lxtask/versions --- pkgs/desktops/lxde/core/lxtask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index ad4b89165fa..ca601531b68 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lxtask-${version}"; - version = "0.1.8"; + version = "0.1.9"; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "0h7g1fdngv939z1d05nzs86dplww5a3bpm0isxd7p1bjby047d6z"; + sha256 = "0cv4hx5dg01hbyi5p10pl78n0a40xajpq4wx9c7886pkmpq8isj1"; }; nativeBuildInputs = [ pkgconfig intltool ]; -- cgit 1.4.1 From 2bc525350aac8421e3f54a44ab599730a65dfb51 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 14 Mar 2019 13:25:29 +0000 Subject: treewide: `stdenv.config` -> `config` That attribute does not exist. --- pkgs/desktops/mate/libmatemixer/default.nix | 4 ++-- pkgs/desktops/mate/mate-settings-daemon/default.nix | 5 +++-- pkgs/development/libraries/glib/default.nix | 4 ++-- pkgs/development/libraries/librdf/default.nix | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 8bf0d9bec18..0a0b353bb93 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, mate +{ config, stdenv, fetchurl, pkgconfig, intltool, glib, mate , alsaSupport ? stdenv.isLinux, alsaLib -, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio +, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false }: diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 2be518bcc5e..480304fcb1c 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook -, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio +{ config, stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier +, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook +, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e0255be666e..4c7c51dbdff 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales +{ config, stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null , buildPackages # this is just for tests (not in the closure of any regular package) -, doCheck ? stdenv.config.doCheckByDefault or false +, doCheck ? config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info , darwin diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 41047796662..39fb68fd246 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook +{ config, stdenv, fetchurl, pkgconfig, autoreconfHook , librdf_raptor2, ladspaH, openssl, zlib -, doCheck ? stdenv.config.doCheckByDefault or false, ladspaPlugins +, doCheck ? config.doCheckByDefault or false, ladspaPlugins }: stdenv.mkDerivation rec { -- cgit 1.4.1 From 5b2d2abd3cf53b7081314c0327d6cf627d3f704f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 18 Mar 2019 22:32:34 -0400 Subject: pantheon.elementary-code: 3.1.0 -> 3.1.1 https://github.com/elementary/code/releases/tag/3.1.1 --- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 7b6ee323091..438144613c4 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "code"; - version = "3.1.0"; + version = "3.1.1"; name = "elementary-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "04clzms1gw7dr611kr8bhca2dww0x65186al4sjqmln4g12ry1gx"; + sha256 = "0l469fi5vbcazwfhy320nr8wrzz96jbrqn4hag0kdm16wvf5x1yc"; }; passthru = { -- cgit 1.4.1 From 735b047ead5662c0d46c82a8aa64bf3f73a69d6b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 18 Mar 2019 22:33:32 -0400 Subject: pantheon.switchboard-plug-security-privacy: 2.2.0 -> 2.2.1 https://github.com/elementary/switchboard-plug-security-privacy/releases/tag/2.2.1 --- .../pantheon/apps/switchboard-plugs/security-privacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 4060e071789..089777e399a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0f1idh36hlgmdva5jn0xnj2b6gbic0asnj3b7j283gyziibm3pxa"; + sha256 = "0k2bq7l0m7qfpy1mkb3qvsinqd8n4lp0vwz3x64wlgfn2qipm1fn"; }; passthru = { -- cgit 1.4.1 From 201de89641f0a2f62021a27187fa412b5915a122 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 18 Mar 2019 22:35:17 -0400 Subject: pantheon.wingpanel: 2.2.2 -> 2.2.3 --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index c34beab7600..405e2d93425 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1knkqh9q6yp7qf27zi6ki20fq4w0ia2hklvv84ivfmfa0irz0j6r"; + sha256 = "1kd1w3mxysg33niryrz5yp6fdayzjpg73ihvq7dlasj8ls5d0qyj"; }; passthru = { @@ -42,11 +42,6 @@ stdenv.mkDerivation rec { patches = [ ./indicators.patch - # Fix wingpanel potentially overlapping windows: https://github.com/elementary/wingpanel/pull/198 - (fetchpatch { - url = "https://github.com/elementary/wingpanel/commit/fc1b8ea3d6cfc5d6e4034af177eecd4542a59833.patch"; - sha256 = "0w5z56di5lxwg9vb96f9y4r2q05znwpn814m2w12l3impf5xsdqs"; - }) ]; postPatch = '' -- cgit 1.4.1 From d04c4ff1c29869e414a89dd2d93aa14e1832fb17 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 18 Mar 2019 23:32:08 -0400 Subject: pantheon.contractor: add wrapGAppsHook Probably got tossed out somehow. --- pkgs/desktops/pantheon/services/contractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index a979b134195..d7d3cdb0312 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "contractor"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dbus - gobject-introspection meson ninja pkgconfig python3 vala + wrapGAppsHook ]; buildInputs = [ -- cgit 1.4.1