From d701e78d96c5ce0da4ea61088abaaaed41385319 Mon Sep 17 00:00:00 2001 From: Lev Livnev Date: Wed, 4 Sep 2019 19:09:17 +0100 Subject: [PATCH 01/14] perlPackages.GlibObjectIntrospection: needs cairo to build test libs --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 316be153152..17d97c1fb07 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7817,6 +7817,7 @@ let url = mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.048.tar.gz; sha256 = "01dx5w6r4nl3rgnz7wvgvqfaa48xmzy90p95d5k6315q44610kx6"; }; + checkInputs = [ pkgs.cairo ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; meta = { description = "Dynamically create Perl language bindings"; From 0256aa00616a11434e5f75040509ed0a0e79e191 Mon Sep 17 00:00:00 2001 From: Lev Livnev Date: Sat, 29 Feb 2020 17:43:51 +0000 Subject: [PATCH 02/14] perlPackages.GlibObjectIntrospection: mark as broken --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 17d97c1fb07..907a7aab1ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7820,6 +7820,10 @@ let checkInputs = [ pkgs.cairo ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; meta = { + broken = true; # TODO: tests failing because "failed to load libregress.so" + # see https://github.com/NixOS/nixpkgs/pull/68115 + # and https://github.com/NixOS/nixpkgs/issues/68116 + # adding pkgs.gnome3.gjs does not fix it description = "Dynamically create Perl language bindings"; license = stdenv.lib.licenses.lgpl2Plus; }; From e3f022fa216c59291c4d0cd7f1b3e8d0fec6189f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 10 Aug 2020 16:07:19 -0700 Subject: [PATCH 03/14] mwic: Fix Python wrapping Fixes this error when mwic is installed with nix-env: $ mwic Traceback (most recent call last): File "/home/anders/.nix-profile/bin/mwic", line 30, in import lib.cli # pylint: disable=wrong-import-position File "/nix/store/zn9jli2v7znh6w6rpkjp6w0iz3na79yz-mwic-0.7.8/share/mwic/lib/cli.py", line 32, in import enchant.tokenize ModuleNotFoundError: No module named 'enchant' Signed-off-by: Anders Kaseorg --- pkgs/applications/misc/mwic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 3be02e7c41c..dffc27bd40b 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with pythonPackages; [ pyenchant regex ]; postFixup = '' - buildPythonPath "$out" + wrapPythonPrograms ''; meta = with stdenv.lib; { From 042d09241d3e55a7c376a33613cb9ae738c6a240 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Sep 2020 13:36:57 +0000 Subject: [PATCH 04/14] papirus-icon-theme: 20200801 -> 20200901 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 9227ceb4915..0f4d0d1d90c 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200801"; + version = "20200901"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0w9ks8izxv7mkh82fnclfcdf6mif991dsbbnxsqmcbvljrmjval2"; + sha256 = "00khqbd7jz97q1kd43kkm6yaa40ml36rh04s76sgbm58srs66v3c"; }; nativeBuildInputs = [ From 86b85c079cbcba504927f75199842a64ca1e9cf1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Sep 2020 15:10:16 +0000 Subject: [PATCH 05/14] qbec: 0.12.1 -> 0.12.2 --- pkgs/applications/networking/cluster/qbec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 508e0b656d6..18a753ca3ca 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "1g90z155nhcblr48qypw8qw3l8g4dz33iflv4cg4xrhwjp8dfbv9"; + sha256 = "10bf9ja44n1gzhb5znqbmr1xjc87akrsdyxfvrz4f5bd3p1fh6j0"; }; - vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; + vendorSha256 = "0xkmccm6cyw1p5mah7psbpfsfaw8f09r1a2k4iksfggrn9mimaam"; doCheck = false; From 17af5377cfd3babab06d5ff82d0bf3485b475a7f Mon Sep 17 00:00:00 2001 From: dukc Date: Sat, 28 Nov 2020 19:21:28 +0200 Subject: [PATCH 06/14] dub: 1.14.0 -> 1.23.0 --- .../tools/build-managers/dub/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 44c91e93609..2668eca4569 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "dub"; - version = "1.14.0"; + version = "1.23.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "070kfkyrkr98y1hbhcf85842c0x7l95w1ambrkdgajpb6kcmpf84"; + sha256 = "06a4whsl1m600k096nwif83n7za3vr7pj1xwapncy5fcad1gmady"; }; postUnpack = '' @@ -41,18 +41,25 @@ stdenv.mkDerivation rec { export HOME=$TMP rm -rf test/issue502-root-import - rm test/issue990-download-optional-selected.sh - rm test/timeout.sh rm test/issue674-concurrent-dub.sh rm test/issue672-upgrade-optional.sh + rm test/issue990-download-optional-selected.sh + rm test/issue877-auto-fetch-package-on-run.sh + rm test/issue1037-better-dependency-messages.sh + rm test/issue1040-run-with-ver.sh + rm test/issue1416-maven-repo-pkg-supplier.sh + rm test/issue1180-local-cache-broken.sh rm test/issue1574-addcommand.sh rm test/issue1524-maven-upgrade-dependency-tree.sh - rm test/issue1416-maven-repo-pkg-supplier.sh - rm test/issue1037-better-dependency-messages.sh - rm test/interactive-remove.sh + rm test/issue1773-lint.sh + + rm test/ddox.sh rm test/fetchzip.sh rm test/feat663-search.sh - rm test/ddox.sh + rm -rf test/git-dependency + rm test/interactive-remove.sh + rm test/timeout.sh + rm test/version-spec.sh rm test/0-init-multi.sh rm test/0-init-multi-json.sh From 52d952a69df9d6b2a1ed3dcd37ccb8220895dc70 Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Wed, 16 Dec 2020 10:59:15 +0100 Subject: [PATCH 07/14] thunderbird: fix missing icon issue --- .../networking/mailreaders/thunderbird/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 58eae867487..e5d9d8932f2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -266,7 +266,7 @@ stdenv.mkDerivation rec { genericName = "Mail Reader"; name = "thunderbird"; exec = "thunderbird %U"; - icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; + icon = "thunderbird"; mimeType = lib.concatStringsSep ";" [ # Email "x-scheme-handler/mailto" @@ -286,6 +286,7 @@ stdenv.mkDerivation rec { postInstall = '' # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl + install -Dm 444 $out/lib/thunderbird/chrome/icons/default/default256.png $out/share/icons/hicolor/256x256/apps/thunderbird.png ''; preFixup = '' From e8cc6535cc197272739600772f50a5cb2860d18c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 27 Dec 2020 21:41:39 +0100 Subject: [PATCH 08/14] cataclysm-dda: 0.E-2 -> 0.E-3 --- pkgs/games/cataclysm-dda/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 076a33a9e89..4210a216694 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -10,13 +10,13 @@ let }; self = common.overrideAttrs (common: rec { - version = "0.E-2"; + version = "0.E-3"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; rev = version; - sha256 = "15l6w6lxays7qmsv0ci2ry53asb9an9dh7l7fc13256k085qcg68"; + sha256 = "qhHtsm5cM0ct/7qXev0SiLInO2jqs2odxhWndLfRDIE="; }; passthru = common.passthru // { From 544225d8d105b65e13d41c83b01dfbde653472a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 28 Dec 2020 22:06:57 +0100 Subject: [PATCH 09/14] vdrPlugins: Use callPackage Avoid callPackages to propagate vdr changes to vdrPlugins. See also issue #107614 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb160d2b492..3162f318fd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28872,7 +28872,7 @@ in ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; vdr = callPackage ../applications/video/vdr { }; - vdrPlugins = recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }); + vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { }); wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; chrome-export = callPackage ../tools/misc/chrome-export {}; From 28136138a69a3a5ab04b42a9533843fa9d5e1b0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 28 Dec 2020 21:44:13 +0100 Subject: [PATCH 10/14] gitAndTools.gitstatus: 1.4.3 -> 1.4.4 --- .../version-management/git-and-tools/gitstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index a99ff3c2e08..bb312215c68 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "0skpi22plzb9r9cgqfnjzpaz856q9f4n0gd5i97nv8bfny8hl30z"; + sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; From 72c33c3b620a3e6b23e1ebc2c7492664f802dee2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 29 Dec 2020 00:13:42 +0100 Subject: [PATCH 11/14] gitAndTools.gitstatus: clarify license is gpl3Only --- .../version-management/git-and-tools/gitstatus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index bb312215c68..a6ca3126d5c 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "10x faster implementation of `git status` command"; homepage = "https://github.com/romkatv/gitstatus"; - license = [ licenses.gpl3 ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ mmlb hexa ]; }; } From 71f9181fc766ed4ea1043035d4ed63d1bd0f0cbc Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 16 Nov 2020 20:52:43 -0600 Subject: [PATCH 12/14] upwork: 5.4.7.1 -> 5.4.9.6 --- pkgs/applications/misc/upwork/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 5d4247f3869..18c2bc129cc 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.4.7.1"; + version = "5.4.9.6"; src = fetchurl { - url = "https://updates-desktopapp.upwork.com/binaries/v5_4_7_1_81f361962c74427d/${pname}_5.4.7.1_amd64.deb"; - sha256 = "c443724d37bca942ca126b8b207846a5adb94a92ff9490370f2fe055feee347b"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_4_9_6_2565cdd0547940a2/${pname}_${version}_amd64.deb"; + sha256 = "ff6246b3b4a1ed79cc9bca2934652fefb40bdac4b7e95997f3a46e354ce52456"; }; dontWrapGApps = true; From e19c62785fc000c71d07af7b76f5dfde3a47031d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 28 Dec 2020 22:14:00 -0300 Subject: [PATCH 13/14] variety: 0.7.2-96-g3afe3ab -> 0.8.5 --- pkgs/applications/misc/variety/default.nix | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 4241f915329..2366d04b9ca 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -1,31 +1,28 @@ -{ - fehSupport ? false, feh -, imagemagickSupport ? true, imagemagick -, stdenv -, lib +{ stdenv, lib, fetchFromGitHub , python37Packages -, fetchFromGitHub +, fehSupport ? false, feh +, imagemagickSupport ? true, imagemagick , intltool , gtk3 , gexiv2 , libnotify -, wrapGAppsHook , gobject-introspection , hicolor-icon-theme , librsvg +, wrapGAppsHook }: with python37Packages; buildPythonApplication rec { pname = "variety"; - version = "0.7.2-96-g3afe3ab"; + version = "0.8.5"; src = fetchFromGitHub { owner = "varietywalls"; repo = "variety"; - rev = "3afe3abf725e5db2aec0db575a17c9907ab20de1"; - sha256 = "10vw0202dwrwi497nsbq077v4qd3qn5b8cmkfcsgbvvjwlz7ldm5"; + rev = version; + sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M="; }; nativeBuildInputs = [ intltool wrapGAppsHook ]; @@ -43,31 +40,43 @@ buildPythonApplication rec { --replace /bin/bash ${stdenv.shell} ''; - propagatedBuildInputs = - [ gtk3 - gexiv2 - libnotify - beautifulsoup4 - lxml - pycairo - pygobject3 - configobj - pillow - setuptools - requests - httplib2 - dbus-python - gobject-introspection - hicolor-icon-theme - librsvg - ] - ++ lib.optional fehSupport feh + propagatedBuildInputs = [ + beautifulsoup4 + configobj + dbus-python + gexiv2 + gobject-introspection + gtk3 + hicolor-icon-theme + httplib2 + libnotify + librsvg + lxml + pillow + pycairo + pygobject3 + requests + setuptools + ] ++ lib.optional fehSupport feh ++ lib.optional imagemagickSupport imagemagick; meta = with lib; { - description = "A wallpaper manager for Linux systems. It supports numerous desktops and wallpaper sources, including local files and online services: Flickr, Wallhaven, Unsplash, and more"; homepage = "https://github.com/varietywalls/variety"; + description = "A wallpaper manager for Linux systems"; + longDescription = '' + Variety is a wallpaper manager for Linux systems. It supports numerous + desktops and wallpaper sources, including local files and online services: + Flickr, Wallhaven, Unsplash, and more. + + Where supported, Variety sits as a tray icon to allow easy pausing and + resuming. Otherwise, its desktop entry menu provides a similar set of + options. + + Variety also includes a range of image effects, such as oil painting and + blur, as well as options to layer quotes and a clock onto the background. + ''; license = licenses.gpl3; - maintainers = [ maintainers.zfnmxt ]; + maintainers = with maintainers; [ AndersonTorres zfnmxt ]; + platforms = with platforms; linux; }; } From b5b4f5ebf5dd4ee73eef6f6ca059d20d1fc8db09 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 29 Dec 2020 01:39:25 +0000 Subject: [PATCH 14/14] gallery-dl: 1.16.0 -> 1.16.1 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 906c458fbaf..398cec3a2bb 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.16.0"; + version = "1.16.1"; src = fetchPypi { inherit pname version; - sha256 = "35df7605a21a05c3290f4324289fd6f584029f4135a8220dec7d490c4e742a1c"; + sha256 = "51d789aac43013e25c1fad553f214cb1f43b1ae02e0651b640f102c5b9280aea"; }; propagatedBuildInputs = [ requests ];