Merge master into staging-next
This commit is contained in:
commit
0984deb2b8
|
@ -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 ];
|
||||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
propagatedBuildInputs = with pythonPackages; [ pyenchant regex ];
|
||||
|
||||
postFixup = ''
|
||||
buildPythonPath "$out"
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -268,7 +268,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"
|
||||
|
@ -288,6 +288,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
|
||||
'';
|
||||
|
||||
# Note on GPG support:
|
||||
|
|
|
@ -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 {}) ];
|
||||
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 // {
|
||||
|
|
|
@ -28977,7 +28977,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 {};
|
||||
|
|
|
@ -8705,8 +8705,13 @@ 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 = {
|
||||
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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue