public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114768 from SuperSandro2000/fix-collection19

Browse Source
This commit is contained in:
Sandro 2021-03-02 16:59:03 +01:00 committed by GitHub
commit c1d529dbb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: { lib, fetchurl, appimageTools, imagemagick }:
let let
pname = "ledger-live-desktop"; pname = "ledger-live-desktop";

2
pkgs/applications/editors/standardnotes/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }: , fetchurl, libsecret, gtk3, gsettings-desktop-schemas }:
let let
version = "3.5.18"; version = "3.5.18";

2
pkgs/applications/misc/clipit/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, fetchpatch, lib, stdenv { fetchFromGitHub, lib, stdenv
, autoreconfHook, intltool, pkg-config , autoreconfHook, intltool, pkg-config
, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: , gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }:

1
pkgs/applications/misc/megasync/default.nix
View File

@ -6,7 +6,6 @@
, curl , curl
, doxygen , doxygen
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, ffmpeg_3 , ffmpeg_3
, libmediainfo , libmediainfo
, libraw , libraw

16
pkgs/applications/networking/instant-messengers/ripcord/default.nix
View File

@ -1,7 +1,7 @@
{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools, { lib, mkDerivation, fetchurl, makeFontsConf, appimageTools
qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats, , qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats
autoPatchelfHook, desktop-file-utils, imagemagick, makeWrapper, , autoPatchelfHook, desktop-file-utils, imagemagick
twemoji-color-font, xorg, libsodium, libopus, libGL, zlib, alsaLib }: , twemoji-color-font, xorg, libsodium, libopus, libGL, alsaLib }:
mkDerivation rec { mkDerivation rec {
pname = "ripcord"; pname = "ripcord";
@ -19,9 +19,9 @@ mkDerivation rec {
}; };
nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ]; nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ];
buildInputs = [ libsodium libopus libGL alsaLib ] ++ buildInputs = [ libsodium libopus libGL alsaLib ]
[ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++ ++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ]
(with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]); ++ (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]);
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
fontDirectories = [ twemoji-color-font ]; fontDirectories = [ twemoji-color-font ];
@ -60,10 +60,8 @@ mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Desktop chat client for Slack and Discord"; description = "Desktop chat client for Slack and Discord";
homepage = "https://cancel.fm/ripcord/"; homepage = "https://cancel.fm/ripcord/";
# See: https://cancel.fm/ripcord/shareware-redistribution/ # See: https://cancel.fm/ripcord/shareware-redistribution/
license = licenses.unfreeRedistributable; license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ infinisil ]; maintainers = with maintainers; [ infinisil ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };

1
pkgs/applications/networking/modem-manager-gui/default.nix
View File

@ -10,7 +10,6 @@
, itstool , itstool
, libayatana-appindicator-gtk3 , libayatana-appindicator-gtk3
, perlPackages , perlPackages
, glibcLocales
, meson , meson
, ninja , ninja
}: }:

11
pkgs/applications/office/timeular/default.nix
View File

@ -1,8 +1,7 @@
{ { lib
lib, , fetchurl
fetchurl, , appimageTools
appimageTools, , libsecret
libsecret
}: }:
let let
@ -37,7 +36,7 @@ in appimageTools.wrapType2 rec {
Assign an activity to each side and flip to start tracking your time. Assign an activity to each side and flip to start tracking your time.
The desktop app tell you where every minute of your day is spent. The desktop app tell you where every minute of your day is spent.
''; '';
homepage = https://timeular.com; homepage = "https://timeular.com";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ ktor ]; maintainers = with maintainers; [ ktor ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];

2
pkgs/applications/virtualization/qemu/default.nix
View File

@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
# the .desktop is both invalid and pointless # the .desktop is both invalid and pointless
test -e $out/share/applications/qemu.desktop && rm -f $out/share/applications/qemu.desktop rm -f $out/share/applications/qemu.desktop
# copy qemu-ga (guest agent) to separate output # copy qemu-ga (guest agent) to separate output
mkdir -p $ga/bin mkdir -p $ga/bin

1
pkgs/applications/virtualization/singularity/default.nix
View File

@ -5,7 +5,6 @@
, openssl , openssl
, libuuid , libuuid
, coreutils , coreutils
, go
, which , which
, makeWrapper , makeWrapper
, cryptsetup , cryptsetup

1
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View File

@ -1,7 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, nix-update-script , nix-update-script
, substituteAll
, desktop-file-utils , desktop-file-utils
, pkg-config , pkg-config
, writeScript , writeScript

2
pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
View File

@ -1,4 +1,4 @@
{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }: { mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
mkXfceDerivation { mkXfceDerivation {
category = "apps"; category = "apps";

2
pkgs/development/libraries/crypto++/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, nasm, which { lib, stdenv, fetchFromGitHub
, enableStatic ? stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic
, enableShared ? !enableStatic , enableShared ? !enableStatic
}: }:

5
pkgs/development/libraries/libayatana-appindicator/default.nix
View File

@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk"; sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk";
}; };
prePatch = ''
substituteInPlace configure.ac \
--replace "codegendir pygtk-2.0" "codegendir pygobject-2.0"
'';
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ]; nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ];
buildInputs = buildInputs =

3
pkgs/development/python-modules/gviz-api/default.nix
View File

@ -8,8 +8,7 @@ buildPythonPackage rec {
format = "wheel"; format = "wheel";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version format;
format = "wheel";
sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg"; sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg";
}; };

1
pkgs/development/python-modules/httpbin/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, fetchpatch
, flask , flask
, flask-limiter , flask-limiter
, markupsafe , markupsafe

1
pkgs/development/python-modules/johnnycanencrypt/default.nix
View File

@ -5,7 +5,6 @@
, rustPlatform , rustPlatform
, llvmPackages , llvmPackages
, pkg-config , pkg-config
, maturin
, pcsclite , pcsclite
, nettle , nettle
, requests , requests

5
pkgs/development/python-modules/jq/default.nix
View File

@ -8,10 +8,15 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e"; sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e";
}; };
patches = [ ./jq-py-setup.patch ]; patches = [ ./jq-py-setup.patch ];
buildInputs = [ jq ]; buildInputs = [ jq ];
# no tests executed
doCheck = false;
pythonImportsCheck = [ "jq" ];
meta = { meta = {
description = "Python bindings for jq, the flexible JSON processor"; description = "Python bindings for jq, the flexible JSON processor";
homepage = "https://github.com/mwilliamson/jq.py"; homepage = "https://github.com/mwilliamson/jq.py";

1
pkgs/development/python-modules/knack/default.nix
View File

@ -4,7 +4,6 @@
, argcomplete , argcomplete
, colorama , colorama
, jmespath , jmespath
, knack
, pygments , pygments
, pyyaml , pyyaml
, six , six

2
pkgs/development/python-modules/papis/default.nix
View File

@ -3,7 +3,7 @@
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, click, python-slugify, habanero, isbnlib, typing-extensions , click, python-slugify, habanero, isbnlib, typing-extensions
, prompt_toolkit, pygments, stevedore, tqdm, lxml , prompt_toolkit, pygments, stevedore, tqdm, lxml
, python-doi, isPy3k, pythonOlder, pytestcov , python-doi, isPy3k, pytestcov
#, optional, dependencies #, optional, dependencies
, whoosh, pytest , whoosh, pytest
, stdenv , stdenv

1
pkgs/development/python-modules/powerline/default.nix
View File

@ -1,6 +1,5 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, python
, buildPythonPackage , buildPythonPackage
, socat , socat
, psutil , psutil

1
pkgs/development/python-modules/pytest-vcr/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pytestCheckHook
, pytest , pytest
, vcrpy , vcrpy
}: }:

3
pkgs/development/python-modules/requests/default.nix
View File

@ -8,6 +8,7 @@
, pytest-xdist , pytest-xdist
, pytestCheckHook , pytestCheckHook
, urllib3 , urllib3
, isPy27
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -55,5 +56,7 @@ buildPythonPackage rec {
homepage = "http://docs.python-requests.org/en/latest/"; homepage = "http://docs.python-requests.org/en/latest/";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
# AttributeError: 'KeywordMapping' object has no attribute 'get'
broken = isPy27;
}; };
} }

9
pkgs/tools/networking/p2p/amule/default.nix
View File

@ -2,11 +2,8 @@
, enableDaemon ? false # build amule daemon , enableDaemon ? false # build amule daemon
, httpServer ? false # build web interface for the daemon , httpServer ? false # build web interface for the daemon
, client ? false # build amule remote gui , client ? false # build amule remote gui
, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null , fetchFromGitHub, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng
, autoreconfHook, pkg-config, makeWrapper, libX11 ? null }: , autoreconfHook, pkg-config, makeWrapper, libX11 }:
assert httpServer -> libpng != null;
assert client -> libX11 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "amule"; pname = "amule";
@ -78,5 +75,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ phreedom ]; maintainers = with maintainers; [ phreedom ];
platforms = platforms.unix; platforms = platforms.unix;
# Could not find crypto++ installation or sources.
broken = true;
}; };
} }