b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #132391 from SuperSandro2000/cleanup

Browse source
This commit is contained in:
Sandro 2021-08-02 10:14:12 +00:00 committed by GitHub
parent c8a731593b 42e7791556
commit 633a5a6af9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 116 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/graphics/renderdoc/default.nix
View file

@ -11,12 +11,11 @@ let
rev = "renderdoc-modified-7";
sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
};
pythonPackages = python3Packages;
cmakeBool = b: if b then "ON" else "OFF";
in
mkDerivation rec {
version = "1.15";
pname = "renderdoc";
version = "1.15";
src = fetchFromGitHub {
owner = "baldurk";
@ -27,9 +26,9 @@ mkDerivation rec {
buildInputs = [
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
] # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2])
] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2])
# TODO: figure out how to make cmake recognise pyside2
++ (lib.optional waylandSupport wayland);
++ lib.optional waylandSupport wayland;
nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];
@ -75,7 +74,7 @@ mkDerivation rec {
of any application using Vulkan, D3D11, OpenGL or D3D12 across
Windows 7 - 10, Linux or Android.
'';
maintainers = [maintainers.jansol];
platforms = ["i686-linux" "x86_64-linux"];
maintainers = [ maintainers.jansol ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

5
pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
View file

@ -2,13 +2,10 @@
, fetchurl
, appimageTools
, makeWrapper
, electron_13
, electron
, xorg
}:
let
electron = electron_13;
in
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
version = "2.8.9";

33
pkgs/applications/networking/mailreaders/notmuch/default.nix
View file

@ -9,16 +9,9 @@
, withEmacs ? true
}:
with lib;
stdenv.mkDerivation rec {
version = "0.32.2";
pname = "notmuch";
passthru = {
pythonSourceRoot = "${src.name}/bindings/python";
inherit version;
};
version = "0.32.2";
src = fetchurl {
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
@ -30,7 +23,7 @@ stdenv.mkDerivation rec {
doxygen # (optional) api docs
pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
texinfo # (optional) documentation -> doc/INSTALL
] ++ optional withEmacs emacs;
] ++ lib.optional withEmacs emacs;
buildInputs = [
gnupg # undefined dependencies
@ -41,12 +34,11 @@ stdenv.mkDerivation rec {
];
postPatch = ''
patchShebangs configure
patchShebangs test/
patchShebangs configure test/
substituteInPlace lib/Makefile.local \
--replace '-install_name $(libdir)' "-install_name $out/lib"
'' + optionalString withEmacs ''
'' + lib.optionalString withEmacs ''
substituteInPlace emacs/notmuch-emacs-mua \
--replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
--replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
@ -56,9 +48,9 @@ stdenv.mkDerivation rec {
"--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions"
"--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions"
"--infodir=${placeholder "info"}/share/info"
] ++ optional (!withEmacs) "--without-emacs"
++ optional (withEmacs) "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
++ optional (isNull ruby) "--without-ruby";
] ++ lib.optional (!withEmacs) "--without-emacs"
++ lib.optional withEmacs "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
++ lib.optional (isNull ruby) "--without-ruby";
# Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
# friends
@ -66,7 +58,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = [ "V=1" ];
outputs = [ "out" "man" "info" ] ++ lib.optional withEmacs "emacs";
preCheck = let
@ -78,7 +69,8 @@ stdenv.mkDerivation rec {
mkdir -p test/test-databases
ln -s ${test-database} test/test-databases/database-v1.tar.xz
'';
doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");
doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");
checkTarget = "test";
checkInputs = [
which dtach openssl bash
@ -93,7 +85,12 @@ stdenv.mkDerivation rec {
dontGzipMan = true; # already compressed
meta = {
passthru = {
pythonSourceRoot = "${src.name}/bindings/python";
inherit version;
};
meta = with lib; {
description = "Mail indexer";
homepage = "https://notmuchmail.org/";
license = licenses.gpl3Plus;

23
pkgs/development/compilers/ecl/default.nix
View file

@ -45,16 +45,10 @@ stdenv.mkDerivation {
configureFlags = [
(if threadSupport then "--enable-threads" else "--disable-threads")
"--with-gmp-prefix=${gmp.dev}"
"--with-libffi-prefix=${libffi.dev}"
]
++
(lib.optional useBoehmgc
"--with-libgc-prefix=${boehmgc.dev}")
++
(lib.optional (! noUnicode)
"--enable-unicode")
;
"--with-gmp-prefix=${lib.getDev gmp}"
"--with-libffi-prefix=${lib.getDev libffi}"
] ++ lib.optional useBoehmgc "--with-libgc-prefix=${lib.getDev boehmgc}"
++ lib.optional (!noUnicode) "--enable-unicode";
hardeningDisable = [ "format" ];
@ -67,13 +61,12 @@ stdenv.mkDerivation {
wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" ${ldArgs}
'';
meta = {
inherit (s) version;
meta = with lib; {
description = "Lisp implementation aiming to be small, fast and easy to embed";
homepage = "https://common-lisp.net/project/ecl/";
license = lib.licenses.mit ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.unix;
license = licenses.mit ;
maintainers = [ maintainers.raskin ];
platforms = platforms.unix;
changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${s.version}/CHANGELOG";
};
}

16
pkgs/development/coq-modules/QuickChick/default.nix
View file

@ -1,11 +1,11 @@
{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }:
with lib;
let recent = versions.isGe "8.7" coq.coq-version; in
let recent = lib.versions.isGe "8.7" coq.coq-version; in
mkCoqDerivation {
pname = "QuickChick";
owner = "QuickChick";
inherit version;
defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; }
@ -30,19 +30,19 @@ mkCoqDerivation {
release."20170512".sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg";
releaseRev = v: "v${v}";
preConfigure = optionalString recent
preConfigure = lib.optionalString recent
"substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
mlPlugin = true;
extraBuildInputs = optional recent coq.ocamlPackages.num;
extraBuildInputs = lib.optional recent coq.ocamlPackages.num;
propagatedBuildInputs = [ ssreflect ]
++ optionals recent [ coq-ext-lib simple-io ]
++ optional recent coq.ocamlPackages.ocamlbuild;
++ lib.optionals recent [ coq-ext-lib simple-io ]
++ lib.optional recent coq.ocamlPackages.ocamlbuild;
extraInstallFlags = [ "-f Makefile.coq" ];
enableParallelBuilding = false;
meta = {
meta = with lib; {
description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
maintainers = with maintainers; [ jwiegley ];
};

6
pkgs/development/coq-modules/interval/default.nix
View file

@ -1,11 +1,11 @@
{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }:
with lib; mkCoqDerivation rec {
mkCoqDerivation rec {
pname = "interval";
owner = "coqinterval";
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isGe "8.8" ; out = "4.3.0"; }
{ case = range "8.8" "8.12"; out = "4.0.0"; }
{ case = range "8.7" "8.11"; out = "3.4.2"; }
@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec {
nativeBuildInputs = [ which autoconf ];
propagatedBuildInputs = [ bignums coquelicot flocq ]
++ lib.optionals (versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ];
++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ];
useMelquiondRemake.logpath = "Interval";
mlPlugin = true;
enableParallelBuilding = true;

32
pkgs/development/libraries/grpc/default.nix
View file

@ -4,8 +4,9 @@
}:
stdenv.mkDerivation rec {
version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
@ -13,6 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1wa7n7mf20fnvxqw093kr7a4c7vilcmx9yl3hicnyfcd663jgqvd";
fetchSubmodules = true;
};
patches = [
# Fix build on armv6l (https://github.com/grpc/grpc/pull/21341)
(fetchpatch {
@ -27,19 +29,19 @@ stdenv.mkDerivation rec {
buildInputs = [ c-ares.cmake-config openssl protobuf ]
++ lib.optionals stdenv.isLinux [ libnsl ];
cmakeFlags =
[ "-DgRPC_ZLIB_PROVIDER=package"
"-DgRPC_CARES_PROVIDER=package"
"-DgRPC_RE2_PROVIDER=package"
"-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_ABSL_PROVIDER=package"
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DCMAKE_CXX_STANDARD=17"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"
];
cmakeFlags = [
"-DgRPC_ZLIB_PROVIDER=package"
"-DgRPC_CARES_PROVIDER=package"
"-DgRPC_RE2_PROVIDER=package"
"-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_ABSL_PROVIDER=package"
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DCMAKE_CXX_STANDARD=17"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"
];
# CMake creates a build directory by default, this conflicts with the
# basel BUILD file on case-insensitive filesystems.
@ -58,7 +60,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
license = licenses.asl20;
maintainers = [ maintainers.lnl7 maintainers.marsam ];
maintainers = with maintainers; [ lnl7 marsam ];
homepage = "https://grpc.io/";
platforms = platforms.all;
changelog = "https://github.com/grpc/grpc/releases/tag/v${version}";

7
pkgs/development/libraries/zchunk/default.nix
View file

@ -31,12 +31,7 @@ stdenv.mkDerivation rec {
zstd
] ++ lib.optional stdenv.isDarwin argp-standalone;
outputs = [
"out"
"lib"
"dev"
];
outputs = [ "out" "lib" "dev" ];
meta = with lib; {
homepage = "https://github.com/zchunk/zchunk";

2
pkgs/development/tools/ocaml/dune-release/default.nix
View file

@ -41,7 +41,7 @@ in buildDunePackage rec {
preCheck = ''
# it fails when it tries to reference "./make_check_deterministic.exe"
rm -fr tests/bin/check
rm -r tests/bin/check
'';
# tool specific env vars have been deprecated, use PATH

12
pkgs/misc/emulators/mgba/default.nix
View file

@ -9,6 +9,7 @@
, libedit
, libelf
, libzip
, copyDesktopItems
, makeDesktopItem
, minizip
, pkg-config
@ -48,8 +49,8 @@ stdenv.mkDerivation rec {
qttools
];
postInstall = let
desktopItem = makeDesktopItem {
desktopItems = [
(makeDesktopItem {
name = "mgba";
exec = "mgba-qt";
icon = "mgba";
@ -58,11 +59,8 @@ stdenv.mkDerivation rec {
genericName = "Game Boy Advance Emulator";
categories = "Game;Emulator;";
startupNotify = "false";
};
in
''
cp -r ${desktopItem}/share/applications $out/share
'';
})
];
meta = with lib; {
homepage = "https://mgba.io";

4
pkgs/servers/openafs/1.8/module.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
, kernel, glibc, perl, libtool_2, libkrb5 }:
with (import ./srcs.nix {
inherit fetchurl;
@ -55,7 +55,7 @@ in stdenv.mkDerivation {
homepage = "https://www.openafs.org";
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
maintainers = with maintainers; [ maggesi spacefrogg ];
broken = versionOlder kernel.version "3.18" || kernel.isHardened;
};
}

44
pkgs/tools/X11/keynav/default.nix
View file

@ -1,5 +1,18 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, xorgproto, libXtst, libXi, libXext
, libXinerama, libXrandr, glib, cairo, xdotool }:
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, libX11
, xorgproto
, libXtst
, libXi
, libXext
, libXinerama
, libXrandr
, glib
, cairo
, xdotool
}:
let release = "20180821"; in
stdenv.mkDerivation {
@ -14,21 +27,30 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr
glib cairo xdotool ];
buildInputs = [
libX11
xorgproto
libXtst
libXi
libXext
libXinerama
libXrandr
glib
cairo
xdotool
];
patchPhase = ''
postPatch = ''
echo >>VERSION MAJOR=0
echo >>VERSION RELEASE=${release}
echo >>VERSION REVISION=0
'';
installPhase =
''
mkdir -p $out/bin $out/share/keynav/doc
cp keynav $out/bin
cp keynavrc $out/share/keynav/doc
'';
installPhase = ''
mkdir -p $out/bin $out/share/keynav/doc
cp keynav $out/bin
cp keynavrc $out/share/keynav/doc
'';
meta = with lib; {
description = "Generate X11 mouse clicks from keyboard";

17
pkgs/tools/networking/ghostunnel/default.nix
View file

@ -1,8 +1,7 @@
{
buildGoModule,
fetchFromGitHub,
lib,
nixosTests,
{ buildGoModule
, fetchFromGitHub
, lib
, nixosTests
}:
buildGoModule rec {
@ -27,13 +26,15 @@ buildGoModule rec {
mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/
'';
passthru.tests = {
nixos = nixosTests.ghostunnel;
podman = nixosTests.podman-tls-ghostunnel;
};
meta = with lib; {
description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications";
homepage = "https://github.com/ghostunnel/ghostunnel#readme";
license = licenses.asl20;
maintainers = with maintainers; [ roberth ];
};
passthru.tests.nixos = nixosTests.ghostunnel;
passthru.tests.podman = nixosTests.podman-tls-ghostunnel;
}

11
pkgs/tools/networking/p2p/tahoe-lafs/default.nix
View file

@ -6,9 +6,8 @@
# some loss of functionality because of it.
python3Packages.buildPythonApplication rec {
version = "2021-07-09";
pname = "tahoe-lafs";
namePrefix = "";
version = "unstable-2021-07-09";
src = fetchFromGitHub {
owner = "tahoe-lafs";
@ -84,7 +83,7 @@ python3Packages.buildPythonApplication rec {
trial --rterrors allmydata
'';
meta = {
meta = with lib; {
description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system";
longDescription = ''
Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem.
@ -92,9 +91,9 @@ python3Packages.buildPythonApplication rec {
such a way that it remains available even when some of the peers
are unavailable, malfunctioning, or malicious.
'';
homepage = "http://tahoe-lafs.org/";
license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
homepage = "https://tahoe-lafs.org/";
license = [ licenses.gpl2Plus /* or */ "TGPPLv1+" ];
maintainers = with lib.maintainers; [ MostAwesomeDude ];
platforms = lib.platforms.gnu ++ lib.platforms.linux;
platforms = platforms.gnu ++ platforms.linux;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -32605,7 +32605,9 @@ in
btcdeb = callPackage ../applications/blockchains/btcdeb { };
jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };
jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron {
electron = electron_13;
};
zenstates = callPackage ../os-specific/linux/zenstates {};