Merge pull request #114768 from SuperSandro2000/fix-collection19
This commit is contained in:
Sandro
GitHub
commit
c1d529dbb1
@ -1,4 +1,4 @@
|
||||
{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
|
||||
{ lib, fetchurl, appimageTools, imagemagick }:
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ fetchFromGitHub, fetchpatch, lib, stdenv
|
||||
{ fetchFromGitHub, lib, stdenv
|
||||
, autoreconfHook, intltool, pkg-config
|
||||
, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }:
|
||||
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, curl
|
||||
, doxygen
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ffmpeg_3
|
||||
, libmediainfo
|
||||
, libraw
|
||||
|
||||
@ -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";
|
||||
@ -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 ];
|
||||
@ -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" ];
|
||||
};
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
, itstool
|
||||
, libayatana-appindicator-gtk3
|
||||
, perlPackages
|
||||
, glibcLocales
|
||||
, meson
|
||||
, ninja
|
||||
}:
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
libsecret
|
||||
{ lib
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
, libsecret
|
||||
}:
|
||||
|
||||
let
|
||||
@ -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" ];
|
||||
|
||||
@ -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
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, openssl
|
||||
, libuuid
|
||||
, coreutils
|
||||
, go
|
||||
, which
|
||||
, makeWrapper
|
||||
, cryptsetup
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, desktop-file-utils
|
||||
, pkg-config
|
||||
, writeScript
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
|
||||
{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nasm, which
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, enableShared ? !enableStatic
|
||||
}:
|
||||
|
||||
@ -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 =
|
||||
|
||||
@ -8,8 +8,7 @@ buildPythonPackage rec {
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "wheel";
|
||||
inherit pname version format;
|
||||
sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg";
|
||||
};
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, flask
|
||||
, flask-limiter
|
||||
, markupsafe
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, rustPlatform
|
||||
, llvmPackages
|
||||
, pkg-config
|
||||
, maturin
|
||||
, pcsclite
|
||||
, nettle
|
||||
, requests
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, argcomplete
|
||||
, colorama
|
||||
, jmespath
|
||||
, knack
|
||||
, pygments
|
||||
, pyyaml
|
||||
, six
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, socat
|
||||
, psutil
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pytest
|
||||
, vcrpy
|
||||
}:
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, urllib3
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@ -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";
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user