Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove many unused inputs; amule, python27Packages.requests: mark broken; Revert "qemu: guard desktop file removal" #114768

Merged
merged 24 commits into from Mar 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0e3d110
pythonPackages.jq: disable tests, add pythonImportsCheck
SuperSandro2000 Feb 23, 2021
9c4b55a
ledger-live-desktop: remove unused inputs
SuperSandro2000 Feb 27, 2021
8b34b76
ripcord: remove unused inputs, format
SuperSandro2000 Feb 27, 2021
167da21
standardnotes: remove unused inputs
SuperSandro2000 Feb 27, 2021
c1a03f0
timeular: remove unused inputs, format
SuperSandro2000 Feb 27, 2021
1497f91
singularity: remove unused inputs
SuperSandro2000 Feb 27, 2021
aa99645
pythonPackages.gviz-api: clean up
SuperSandro2000 Feb 27, 2021
d1a7664
clipit: remove unused inputs
SuperSandro2000 Mar 1, 2021
88231ba
modem-manager-gui: remove unused inputs
SuperSandro2000 Mar 1, 2021
3fd94db
xfce4-taskmanager: remove unused inputs
SuperSandro2000 Mar 1, 2021
f170f85
libayatana-appindicator: remove stale substituteInPlace
SuperSandro2000 Mar 1, 2021
622b7e8
megasync: remove unused inputs
SuperSandro2000 Mar 1, 2021
2f6eae8
crypto++: remove unused inputs
SuperSandro2000 Mar 1, 2021
e7dd8ed
amule: remove unused inputs, cleanup
SuperSandro2000 Mar 1, 2021
4509c02
pythonPackages.powerline: remove unused inputs
SuperSandro2000 Mar 1, 2021
7ccf4d1
pantheon.elementary-session-settings: remove unused input
SuperSandro2000 Mar 1, 2021
bf0a2f9
pythonPackages.httpbin: remove unused input
SuperSandro2000 Mar 1, 2021
e103713
pythonPackages.johnnycanencrypt: remove unused input
SuperSandro2000 Mar 1, 2021
13a571d
pythonPackages.knack: remove unused input
SuperSandro2000 Mar 1, 2021
fb13141
pythonPackages.papis: remove unused input
SuperSandro2000 Mar 1, 2021
64dbd56
pythonPackages.pytest-vcr: remove unused input
SuperSandro2000 Mar 1, 2021
4bc50d5
amule: mark broken
SuperSandro2000 Mar 1, 2021
2d243e1
pythonPackages.requests: mark broken for python27
SuperSandro2000 Mar 1, 2021
4ad340f
Revert "qemu: guard desktop file removal"
SuperSandro2000 Mar 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,4 +1,4 @@
{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
{ lib, fetchurl, appimageTools, imagemagick }:

let
pname = "ledger-live-desktop";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/standardnotes/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }:
, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }:

let
version = "3.5.18";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/clipit/default.nix
@@ -1,4 +1,4 @@
{ fetchFromGitHub, fetchpatch, lib, stdenv
{ fetchFromGitHub, lib, stdenv
, autoreconfHook, intltool, pkg-config
, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }:

Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/megasync/default.nix
Expand Up @@ -6,7 +6,6 @@
, curl
, doxygen
, fetchFromGitHub
, fetchpatch
, ffmpeg_3
, libmediainfo
, libraw
Expand Down
@@ -1,7 +1,7 @@
{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools,
qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats,
autoPatchelfHook, desktop-file-utils, imagemagick, makeWrapper,
twemoji-color-font, xorg, libsodium, libopus, libGL, zlib, alsaLib }:
{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools
, qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats
, autoPatchelfHook, desktop-file-utils, imagemagick
, twemoji-color-font, xorg, libsodium, libopus, libGL, alsaLib }:

mkDerivation rec {
pname = "ripcord";
Expand All @@ -19,9 +19,9 @@ mkDerivation rec {
};

nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ];
buildInputs = [ libsodium libopus libGL alsaLib ] ++
[ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++
(with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]);
buildInputs = [ libsodium libopus libGL alsaLib ]
++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ]
++ (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]);

fontsConf = makeFontsConf {
fontDirectories = [ twemoji-color-font ];
Expand Down Expand Up @@ -60,10 +60,8 @@ mkDerivation rec {
meta = with lib; {
description = "Desktop chat client for Slack and Discord";
homepage = "https://cancel.fm/ripcord/";

# See: https://cancel.fm/ripcord/shareware-redistribution/
license = licenses.unfreeRedistributable;

maintainers = with maintainers; [ infinisil ];
platforms = [ "x86_64-linux" ];
};
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/networking/modem-manager-gui/default.nix
Expand Up @@ -10,7 +10,6 @@
, itstool
, libayatana-appindicator-gtk3
, perlPackages
, glibcLocales
, meson
, ninja
}:
Expand Down
11 changes: 5 additions & 6 deletions pkgs/applications/office/timeular/default.nix
@@ -1,8 +1,7 @@
{
lib,
fetchurl,
appimageTools,
libsecret
{ lib
, fetchurl
, appimageTools
, libsecret
}:

let
Expand Down Expand Up @@ -37,7 +36,7 @@ in appimageTools.wrapType2 rec {
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.
'';
homepage = https://timeular.com;
homepage = "https://timeular.com";
license = licenses.unfree;
maintainers = with maintainers; [ ktor ];
platforms = [ "x86_64-linux" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/qemu/default.nix
Expand Up @@ -147,7 +147,7 @@ stdenv.mkDerivation rec {

postFixup = ''
# 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
mkdir -p $ga/bin
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/virtualization/singularity/default.nix
Expand Up @@ -5,7 +5,6 @@
, openssl
, libuuid
, coreutils
, go
, which
, makeWrapper
, cryptsetup
Expand Down
@@ -1,7 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, nix-update-script
, substituteAll
, desktop-file-utils
, pkg-config
, writeScript
Expand Down
@@ -1,4 +1,4 @@
{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:

mkXfceDerivation {
category = "apps";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/crypto++/default.nix
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, nasm, which
{ lib, stdenv, fetchFromGitHub
, enableStatic ? stdenv.hostPlatform.isStatic
, enableShared ? !enableStatic
}:
Expand Down
Expand Up @@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
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 ];

buildInputs =
Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/gviz-api/default.nix
Expand Up @@ -8,8 +8,7 @@ buildPythonPackage rec {
format = "wheel";

src = fetchPypi {
inherit pname version;
format = "wheel";
inherit pname version format;
sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg";
};

Expand Down
1 change: 0 additions & 1 deletion pkgs/development/python-modules/httpbin/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, flask
, flask-limiter
, markupsafe
Expand Down
Expand Up @@ -5,7 +5,6 @@
, rustPlatform
, llvmPackages
, pkg-config
, maturin
, pcsclite
, nettle
, requests
Expand Down
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/jq/default.nix
Expand Up @@ -8,10 +8,15 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e";
};

patches = [ ./jq-py-setup.patch ];

buildInputs = [ jq ];

# no tests executed
doCheck = false;
pythonImportsCheck = [ "jq" ];

meta = {
description = "Python bindings for jq, the flexible JSON processor";
homepage = "https://github.com/mwilliamson/jq.py";
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/python-modules/knack/default.nix
Expand Up @@ -4,7 +4,6 @@
, argcomplete
, colorama
, jmespath
, knack
, pygments
, pyyaml
, six
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/papis/default.nix
Expand Up @@ -3,7 +3,7 @@
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, click, python-slugify, habanero, isbnlib, typing-extensions
, prompt_toolkit, pygments, stevedore, tqdm, lxml
, python-doi, isPy3k, pythonOlder, pytestcov
, python-doi, isPy3k, pytestcov
#, optional, dependencies
, whoosh, pytest
, stdenv
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/python-modules/powerline/default.nix
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, python
, buildPythonPackage
, socat
, psutil
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/python-modules/pytest-vcr/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pytest
, vcrpy
}:
Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/requests/default.nix
Expand Up @@ -8,6 +8,7 @@
, pytest-xdist
, pytestCheckHook
, urllib3
, isPy27
}:

buildPythonPackage rec {
Expand Down Expand Up @@ -55,5 +56,7 @@ buildPythonPackage rec {
homepage = "http://docs.python-requests.org/en/latest/";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
# AttributeError: 'KeywordMapping' object has no attribute 'get'
broken = isPy27;
};
}
9 changes: 4 additions & 5 deletions pkgs/tools/networking/p2p/amule/default.nix
Expand Up @@ -2,11 +2,8 @@
, enableDaemon ? false # build amule daemon
, httpServer ? false # build web interface for the daemon
, client ? false # build amule remote gui
, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
, autoreconfHook, pkg-config, makeWrapper, libX11 ? null }:

assert httpServer -> libpng != null;
assert client -> libX11 != null;
, fetchFromGitHub, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng
, autoreconfHook, pkg-config, makeWrapper, libX11 }:

stdenv.mkDerivation rec {
pname = "amule";
Expand Down Expand Up @@ -78,5 +75,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ phreedom ];
platforms = platforms.unix;
# Could not find crypto++ installation or sources.
broken = true;
};
}