Merge pull request #113674 from SuperSandro2000/fix-collection16
This commit is contained in:
Sandro
GitHub
commit
4b694d5e3d
@ -270,7 +270,7 @@ in
|
||||
drivers = mkOption {
|
||||
type = types.listOf types.path;
|
||||
default = [];
|
||||
example = literalExample "with pkgs; [ gutenprint hplip splix cups-googlecloudprint ]";
|
||||
example = literalExample "with pkgs; [ gutenprint hplip splix ]";
|
||||
description = ''
|
||||
CUPS drivers to use. Drivers provided by CUPS, cups-filters,
|
||||
Ghostscript and Samba are added unconditionally. If this list contains
|
||||
|
||||
@ -356,11 +356,11 @@ else {
|
||||
if ($suffix eq ".jpg") {
|
||||
$suffix = ".jpeg";
|
||||
}
|
||||
if ($backgroundColor) {
|
||||
$conf .= "
|
||||
background_color '$backgroundColor'
|
||||
";
|
||||
}
|
||||
if ($backgroundColor) {
|
||||
$conf .= "
|
||||
background_color '$backgroundColor'
|
||||
";
|
||||
}
|
||||
copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n";
|
||||
$conf .= "
|
||||
insmod " . substr($suffix, 1) . "
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
|
||||
, xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick
|
||||
, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }:
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3
|
||||
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
|
||||
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon
|
||||
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
|
||||
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
|
||||
}:
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib, buildGoModule, fetchurl
|
||||
, go, ncurses, notmuch, scdoc
|
||||
, python3, perl, w3m, dante
|
||||
, fetchFromGitHub
|
||||
, ncurses, notmuch, scdoc
|
||||
, python3, w3m, dante
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
|
||||
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which
|
||||
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
|
||||
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, runtimeShell, sqlite, zlib
|
||||
, glibcLocales
|
||||
, fetchpatch
|
||||
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgs, python3Packages, makeWrapper
|
||||
, enablePlayer ? true, libvlc ? null, qt5, lib }:
|
||||
{ stdenv, fetchurl, python3Packages, makeWrapper
|
||||
, enablePlayer ? true, libvlc, qt5, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tribler";
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ fetchurl, lib, stdenv, buildPackages
|
||||
, fetchpatch
|
||||
, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
|
||||
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
|
||||
, openssh, pcre2
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal
|
||||
{ stdenv, lib, nodejs, nodePackages, remarshal
|
||||
, ttfautohint-nox
|
||||
# Custom font set options.
|
||||
# See https://typeof.net/Iosevka/customizer
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, perl
|
||||
, perlPackages
|
||||
, inkscape
|
||||
, pngcrush
|
||||
, librsvg
|
||||
, targets ? [ "all" ]
|
||||
}:
|
||||
|
||||
@ -11,18 +11,10 @@
|
||||
, intltool
|
||||
, libxslt
|
||||
, gtk3
|
||||
, libnotify
|
||||
, libxkbfile
|
||||
, cinnamon-menus
|
||||
, libgnomekbd
|
||||
, libxklavier
|
||||
, networkmanager
|
||||
, libwacom
|
||||
, gnome3
|
||||
, libtool
|
||||
, wrapGAppsHook
|
||||
, tzdata
|
||||
, glibc
|
||||
, gobject-introspection
|
||||
, python3
|
||||
, pam
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, gettext
|
||||
, fetchurl
|
||||
, evolution-data-server
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
, gnome-color-manager
|
||||
, gnome-desktop
|
||||
, gnome-online-accounts
|
||||
, gnome-session
|
||||
, gnome-settings-daemon
|
||||
, gnome3
|
||||
, grilo
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
, systemd
|
||||
, libnma
|
||||
, tzdata
|
||||
, yelp
|
||||
, libgnomekbd
|
||||
, gsettings-desktop-schemas
|
||||
, gnome-tour
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
, adwaita-icon-theme
|
||||
, libgweather
|
||||
, gucharmap
|
||||
, tracker
|
||||
, polkit
|
||||
, gnome3
|
||||
}:
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
, wingpanel
|
||||
, orca
|
||||
, onboard
|
||||
, at-spi2-core
|
||||
, elementary-default-settings
|
||||
, elementary-settings-daemon
|
||||
, runtimeShell
|
||||
|
||||
@ -43,5 +43,7 @@ mkDerivation rec {
|
||||
license = with licenses; [ bsd3 lgpl3 gpl3 ];
|
||||
maintainers = with maintainers; [ lopsided98 ];
|
||||
platforms = platforms.all;
|
||||
# fatal error: 'qglviewer.h' file not found
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
, mock
|
||||
, pure-python-adb
|
||||
, pytestCheckHook
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, aniso8601
|
||||
, iso8601
|
||||
, graphql-core
|
||||
, graphql-relay
|
||||
, promise
|
||||
|
||||
@ -47,5 +47,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://gitlab.com/costrouc/lammps-cython";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ costrouc ];
|
||||
# fails import check
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, pkgs, buildPythonPackage, fetchFromGitHub, isPy3k
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
|
||||
, ipython
|
||||
, ipywidgets
|
||||
, numpy
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
, pyglet
|
||||
, pillow
|
||||
, pyrr
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, callPackage, isPy3k
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, hypothesis
|
||||
, setuptools_scm
|
||||
, six
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
, nbformat
|
||||
, sphinx
|
||||
, traitlets
|
||||
, python
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, wheel, watchdog, flake8
|
||||
{ lib, buildPythonPackage, fetchPypi, watchdog, flake8
|
||||
, pytest, pytestrunner, coverage, sphinx, twine }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
, tornado
|
||||
, ipython_genutils
|
||||
, traitlets
|
||||
, jupyter
|
||||
, jupyter_core
|
||||
, jupyter_client
|
||||
, nbformat
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
|
||||
@ -2,14 +2,11 @@
|
||||
, substituteAll
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, python3Packages
|
||||
, pkgs
|
||||
, joblib
|
||||
, segments
|
||||
, attrs
|
||||
, espeak-ng
|
||||
, pytestCheckHook
|
||||
, pytestrunner
|
||||
, pytestcov
|
||||
}:
|
||||
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, blas
|
||||
, catch2
|
||||
, cmake
|
||||
, conan
|
||||
, cython
|
||||
, fmt
|
||||
, muparserx
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, robotframework
|
||||
, moretools
|
||||
, pathpy
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
|
||||
{ stdenv, nix, perlPackages, buildEnv
|
||||
, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx
|
||||
, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
|
||||
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
|
||||
, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
|
||||
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
|
||||
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
|
||||
, migration ? false, patches ? []
|
||||
|
||||
@ -11,10 +11,6 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config autoconf ];
|
||||
buildInputs = [ fuse samba glib attr libsecret ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A FUSE FS for mounting Samba shares";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat
|
||||
{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat
|
||||
# batdiff, batgrep, and batwatch
|
||||
, coreutils
|
||||
, less
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib, stdenv
|
||||
, nixosTests
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, asciidoctor
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user