Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-17 06:22:23 +00:00 committed by GitHub
commit 3ff6965554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
154 changed files with 1062 additions and 1089 deletions

View file

@ -169,6 +169,18 @@
})
```
- Unnecessary string conversions should be avoided. Do
```nix
rev = version;
```
instead of
```nix
rev = "${version}";
```
- Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.
- The top-level `lib` must be used in the master and 21.05 branch over its alias `stdenv.lib` as it now causes evaluation errors when aliases are disabled which is the case for ofborg.

View file

@ -3709,12 +3709,6 @@
githubId = 1447245;
name = "Robin Gloster";
};
gnidorah = {
email = "gnidorah@users.noreply.github.com";
github = "gnidorah";
githubId = 12064730;
name = "gnidorah";
};
gnxlxnxx = {
email = "gnxlxnxx@web.de";
github = "gnxlxnxx";
@ -7019,12 +7013,6 @@
githubId = 1222539;
name = "Roman Naumann";
};
nand0p = {
email = "nando@hex7.com";
github = "nand0p";
githubId = 1916245;
name = "Fernando Jose Pando";
};
nasirhm = {
email = "nasirhussainm14@gmail.com";
github = "nasirhm";
@ -7707,12 +7695,6 @@
githubId = 152312;
name = "Periklis Tsirakidis";
};
pesterhazy = {
email = "pesterhazy@gmail.com";
github = "pesterhazy";
githubId = 106328;
name = "Paulus Esterhazy";
};
petabyteboy = {
email = "milan@petabyte.dev";
github = "petabyteboy";

View file

@ -144,5 +144,5 @@ in {
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
};
meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];
meta.maintainers = with lib.maintainers; [ primeos colemickens ];
}

View file

@ -290,5 +290,5 @@ in {
];
meta.maintainers = [ maintainers.gnidorah ];
meta.maintainers = [ ];
}

View file

@ -283,5 +283,5 @@ in {
'')
];
meta.maintainers = with lib.maintainers; [ nand0p mic92 lopsided98 ];
meta.maintainers = with lib.maintainers; [ mic92 lopsided98 ];
}

View file

@ -191,6 +191,6 @@ in {
};
};
meta.maintainers = with lib.maintainers; [ nand0p ];
meta.maintainers = with lib.maintainers; [ ];
}

View file

@ -48,5 +48,5 @@ in {
};
meta.maintainers = with maintainers; [ gnidorah ];
meta.maintainers = with maintainers; [ ];
}

View file

@ -42,5 +42,5 @@ in {
};
meta.maintainers = with maintainers; [ gnidorah ];
meta.maintainers = with maintainers; [ ];
}

View file

@ -54,6 +54,6 @@ in
};
meta.maintainers = with maintainers; [ gnidorah ];
meta.maintainers = with maintainers; [ ];
}

View file

@ -63,5 +63,5 @@ in
};
};
meta.maintainers = with lib.maintainers; [ gnidorah ];
meta.maintainers = with lib.maintainers; [ ];
}

View file

@ -141,5 +141,5 @@ in
};
};
meta.maintainers = with maintainers; [ gnidorah ];
meta.maintainers = with maintainers; [ ];
}

View file

@ -54,5 +54,5 @@ in {
};
meta.maintainers = with lib.maintainers; [ nand0p ];
meta.maintainers = with lib.maintainers; [ ];
}

View file

@ -154,9 +154,9 @@ let
${optionalString (cfg.recommendedProxySettings) ''
proxy_redirect off;
proxy_connect_timeout 60;
proxy_send_timeout 60;
proxy_read_timeout 60;
proxy_connect_timeout ${cfg.proxyTimeout};
proxy_send_timeout ${cfg.proxyTimeout};
proxy_read_timeout ${cfg.proxyTimeout};
proxy_http_version 1.1;
include ${recommendedProxyConfig};
''}
@ -401,6 +401,15 @@ in
";
};
proxyTimeout = mkOption {
type = types.str;
default = "60s";
example = "20s";
description = "
Change the proxy related timeouts in recommendedProxySettings.
";
};
package = mkOption {
default = pkgs.nginxStable;
defaultText = "pkgs.nginxStable";

View file

@ -89,6 +89,6 @@ in
};
meta.maintainers = with maintainers; [ gnidorah ];
meta.maintainers = with maintainers; [ ];
}

View file

@ -68,5 +68,5 @@ in {
}];
};
meta.maintainers = [ maintainers.gnidorah ];
meta.maintainers = [ ];
}

View file

@ -82,5 +82,5 @@ in {
};
};
meta.maintainers = with maintainers; [ gnidorah ];
meta.maintainers = with maintainers; [ ];
}

View file

@ -109,5 +109,5 @@ import ./make-test-python.nix {
bbworker.fail("nc -z bbmaster 8011")
'';
meta.maintainers = with pkgs.lib.maintainers; [ nand0p ];
meta.maintainers = with pkgs.lib.maintainers; [ ];
} {}

View file

@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
homepage = src.meta.homepage;
license = licenses.boost;
platforms = platforms.linux;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
};
}

View file

@ -56,7 +56,7 @@ in stdenv.mkDerivation {
description = "Convert MIDI Files to Piano Sheet Music for two hands";
homepage = "http://midisheetmusic.com";
license = licenses.gpl2;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
platforms = platforms.linux;
};
}

View file

@ -33,6 +33,6 @@ in mkDerivation rec {
homepage = "http://munt.sourceforge.net/";
license = with licenses; [ lgpl21 gpl3 ];
platforms = platforms.linux;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
};
}

View file

@ -25,7 +25,7 @@ in stdenv.mkDerivation {
description = "A cross-platform command-line based module file player";
homepage = "https://lib.openmpt.org/libopenmpt/";
license = licenses.bsd3;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

View file

@ -19,7 +19,7 @@ in stdenv.mkDerivation {
description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API";
homepage = "http://zakalwe.fi/uade/";
license = licenses.gpl2;
maintainers = [ lib.maintainers.gnidorah ];
platforms = lib.platforms.unix;
maintainers = [ ];
platforms = platforms.unix;
};
}

View file

@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "pika-backup";
version = "0.2.3";
version = "0.3.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "pika-backup";
rev = "v${version}";
sha256 = "sha256-jy22eyuzM2y7vByT3TOlAUuTKtPepkB9iiHQT1YGQ88=";
sha256 = "sha256-k9kl6cSohWx+MB/9jyVcTgpv02gsVwAk5KDSNqQrmzI=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1ndcpgw18w3l5f7vv5vw8lxhgd5y1zxfarwnyfx13m7kcv8m3vyj";
sha256 = "0r6nbffik5j82bi82cmc00b17xv9m7xn3w3sarzwfxz0h43lal8a";
};
patches = [

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation {
pname = "scite";
version = "4.0.5";
version = "5.0.2";
src = fetchurl {
url = "https://www.scintilla.org/scite405.tgz";
sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2";
url = "https://www.scintilla.org/scite502.tgz";
sha256 = "00n2gr915f7kvp2250dzn6n0p6lhr6qdlm1m7y2xi6qrrky0bpan";
};
nativeBuildInputs = [ pkg-config ];
@ -14,6 +14,8 @@ stdenv.mkDerivation {
sourceRoot = "scintilla/gtk";
buildPhase = ''
make
cd ../../lexilla/src
make
cd ../../scite/gtk
make prefix=$out/

View file

@ -63,6 +63,6 @@ in stdenv.mkDerivation rec {
homepage = "https://sourceforge.net/projects/lazpaint/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
};
}

View file

@ -1,24 +1,21 @@
{ lib
, unstableGitUpdater
, buildGoModule
, fetchFromGitHub
}:
buildGoModule {
pname = "meme";
version = "unstable-2020-05-28";
buildGoModule rec {
pname = "meme-image-generator";
version = "1.0.1";
src = fetchFromGitHub {
owner = "nomad-software";
repo = "meme";
rev = "33a8b7d0de6996294a0464a605dacc17b26a6b02";
sha256 = "05h8d6pjszhr49xqg02nw94hm95kb7w1i7nw8jxi582fxxm2qbnm";
rev = "v${version}";
sha256 = "089r0v5az2d2njn0s3d3wd0861pcs4slg6zl0rj4cm1k5cj8yd1k";
};
vendorSha256 = null;
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
description = "A command line utility for creating image macro style memes";
homepage = "https://github.com/nomad-software/meme";

View file

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/JustArchiNET/ArchiSteamFarm";
license = licenses.asl20;
platforms = dotnetCorePackages.aspnetcore_3_1.meta.platforms;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
hydraPlatforms = [];
};
}

View file

@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
homepage = src.meta.homepage;
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
};
}

View file

@ -49,7 +49,7 @@ in bundlerApp {
homepage = "https://jekyllrb.com/";
#changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown";
license = licenses.mit;
maintainers = with maintainers; [ pesterhazy ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

View file

@ -2,17 +2,18 @@
stdenv.mkDerivation rec {
pname = "plasma-applet-volumewin7mixer";
version = "25";
version = "26";
src = fetchFromGitHub {
owner = "Zren";
repo = "plasma-applet-volumewin7mixer";
rev = "v${version}";
sha256 = "1nvz0a06qb3pfk8dfh5n5vgf3psd6k0j3vms9pskr511qsxw0dfi";
sha256 = "sha256-VMOUNtAURTHDuJBOGz2N0+3VzxBmVNC1O8dVuyUZAa4=";
};
# Adds the CMakeLists.txt not provided by upstream
patches = [ ./cmake.patch ];
postPatch = "rm build ";
postPatch = "rm build";
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ plasma-framework kwindowsystem plasma-pa ];

View file

@ -51,7 +51,7 @@ mkDerivation {
description = "Graphical disk usage analyzer";
homepage = src.meta.homepage;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

View file

@ -1,19 +1,17 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }:
{ lib, stdenv, rustPlatform, fetchCrate, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.8.4";
version = "0.9.1";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = pname;
rev = "v${version}";
sha256 = "00kmmdwwf9cll25bkszgin2021ggf9b28jlcpicin5kgw4iwlhkj";
src = fetchCrate {
inherit pname version;
sha256 = "0ca6r0xkcdg1ha0n79kzxqh2ks5q3l3hgylqqy62vk51c6yrjx9x";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "1j43vwb885h355wdmjijz1qpkqn1dmb93hwi6vc035vkbbxs1g4r";
cargoSha256 = "1c29dakcff130fvavgq2kpy2ncpgxkil2mi14q2m9jpsrvhqcdvk";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";

View file

@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.119";
version = "0.0.121";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "0bzrilag7mjfhr84l956xisbaz8mmkmqizg22f9gabgcv85vwzsi";
sha256 = "0s85nh31wv39adawfmllp128n0wgyisbi604n0cngzi28rdw7bph";
};
};
}.${branch}

View file

@ -3,15 +3,15 @@
mkFranzDerivation rec {
pname = "ferdi";
name = "Ferdi";
version = "5.5.0";
version = "5.6.0-beta.5";
src = fetchurl {
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
sha256 = "0i24vcnq4iz5amqmn2fgk92ff9x9y7fg8jhc3g6ksvmcfly7af3k";
sha256 = "sha256-fDUzYir53OQ3O4o9eG70sGD+FJ0/4SDNsTfh97WFRnQ=";
};
meta = with lib; {
description = "Combine your favorite messaging services into one application";
homepage = "https://getferdi.com/";
license = licenses.free;
license = licenses.asl20;
maintainers = [ maintainers.davidtwco ];
platforms = [ "x86_64-linux" ];
hydraPlatforms = [ ];

View file

@ -23,6 +23,7 @@
, udev
, libnotify
, xdg-utils
, mesa
}:
# Helper function for building a derivation for Franz and forks.
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
libXtst
libXScrnSaver
]) ++ [
mesa #libgbm
gtk3
atk
glib

View file

@ -21,7 +21,7 @@ in mkRambox rec {
description = "Free and Open Source messaging and emailing app that combines common web applications into one";
homepage = "https://rambox.pro";
license = licenses.mit;
maintainers = with maintainers; [ gnidorah ma27 ];
maintainers = with maintainers; [ ma27 ];
platforms = ["i686-linux" "x86_64-linux"];
hydraPlatforms = [];
};

View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }:
stdenv.mkDerivation rec {
{ lib, stdenv, fetchFromGitHub, python, unzip, wxPython, wrapPython, tor }:
stdenv.mkDerivation rec {
pname = "torchat";
version = "0.9.9.553";
src = fetchurl {
url = "https://github.com/prof7bit/TorChat/archive/${version}.tar.gz";
sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0";
src = fetchFromGitHub {
owner = "prof7bit";
repo = "TorChat";
rev = version;
sha256 = "2LHG9qxZDo5rV6wsputdRo2Y1aHs+irMwt1ucFnXQE0=";
};
nativeBuildInputs = [ unzip ];

View file

@ -25,7 +25,7 @@ let
description = "Simple and Convenient Messaging App for VK";
homepage = "https://vk.com/messenger";
license = licenses.unfree;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
};

View file

@ -2,12 +2,12 @@
let
pname = "ssb-patchwork";
version = "3.18.0";
version = "3.18.1";
name = "Patchwork-${version}";
src = fetchurl {
url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage";
sha256 = "1sb9q1qj5mj4cf8d9dsc498mg8a1ri2y0p9qbh44i8ykby8jkgjc";
sha256 = "F8n6LLbgkg3z55lSY60T+pn2lra8aPt6Ztepw1gf2rI=";
};
binary = appimageTools.wrapType2 {
@ -47,7 +47,7 @@ in
'';
homepage = "https://www.scuttlebutt.nz/";
license = licenses.agpl3;
maintainers = with maintainers; [ asymmetric ninjatrappeur ];
maintainers = with maintainers; [ asymmetric ninjatrappeur cyplo ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -33,7 +33,7 @@ in mkDerivation {
description = "Smart manager for information collecting";
homepage = "https://webhamster.ru/site/page/index/articles/projectcode/138";
license = licenses.gpl3;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
platforms = platforms.linux;
};
}

View file

@ -33,6 +33,9 @@ in stdenv.mkDerivation rec {
# Force OpenMPI to use g++ in PATH.
OMPI_CXX = "g++";
# Uses some deprecated tensorflow functions
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
buildInputs = [ openblas opencv3 libzip boost protobuf mpi ]
++ lib.optional cudaSupport cudatoolkit
++ lib.optional cudnnSupport cudnn;
@ -40,7 +43,7 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--with-opencv=${opencv3}"
"--with-libzip=${libzip.dev}"
"--with-openblas=${openblas}"
"--with-openblas=${openblas.dev}"
"--with-boost=${boost.dev}"
"--with-protobuf=${protobuf}"
"--with-mpi=${mpi}"

View file

@ -22,6 +22,6 @@ in buildEnv {
++ [ "${git}/share/gitweb" ];
meta = git.meta // {
maintainers = with lib.maintainers; [ gnidorah ];
maintainers = with lib.maintainers; [ ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python2Packages, makeWrapper, unzip
{ lib, stdenv, fetchurl, python2Packages, makeWrapper
, guiSupport ? false, tk ? null
, ApplicationServices
, mercurialSrc ? fetchurl rec {
@ -21,7 +21,7 @@ in python2Packages.buildPythonApplication {
inherit python; # pass it so that the same version can be used in hg2git
nativeBuildInputs = [ makeWrapper unzip ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];

View file

@ -45,7 +45,7 @@ let
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "v${kodiVersion}";
rev = "${kodiVersion}-${rel}";
sha256 = "0jh67vw3983lnfgqzqfislawwbpq0vxxk1ljsg7mar06mlwfxb7h";
};

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.gnome-look.org/p/1231025";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
hydraPlatforms = [];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "theme-jade1";
version = "1.12";
version = "1.13";
src = fetchurl {
url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz";
sha256 = "1pawdfyvpbvhb6fa27rgjp49vlbmix9pq192wjlv2wgq7v4ip9y8";
sha256 = "04a9c56w4hm8lwa8hzy5lwj4yli19gzy5wp5iinsm61qas9xgy69";
};
sourceRoot = ".";

View file

@ -25,6 +25,6 @@ mkDerivation rec {
homepage = "https://github.com/repos-holder/kdecoration2-kde2";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
};
}

View file

@ -64,6 +64,6 @@ mkDerivation rec {
description = "Widget styles for Qt5/Plasma 5 and gtk2";
platforms = platforms.linux;
license = licenses.lgpl21Plus;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
};
}

View file

@ -75,7 +75,7 @@ EOF
description = "Common Desktop Environment";
homepage = "https://sourceforge.net/projects/cdesktopenv/";
license = licenses.lgpl2;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, fetchHex, stdenv, rebar3WithPlugins, lib }:
{ fetchFromGitHub, fetchHex, stdenv, erlang, rebar3WithPlugins, lib }:
let
version = "0.15.0";
owner = "erlang-ls";
@ -7,7 +7,7 @@ let
in stdenv.mkDerivation {
inherit version;
pname = "erlang-ls";
buildInputs = [ (rebar3WithPlugins { }) ];
buildInputs = [ erlang (rebar3WithPlugins { }) ];
src = fetchFromGitHub {
inherit owner repo;
sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg";

View file

@ -22,9 +22,9 @@ let
sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
};
nativeBuildInputs = [ pkg-config autoconf ];
nativeBuildInputs = [ pkg-config autoconf unzip zip file which ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
cpio perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [

View file

@ -94,7 +94,7 @@ in stdenv.mkDerivation {
with dynamic web pages, prototyping embedded systems).
'';
maintainers = with maintainers; [ kkallio gnidorah ];
maintainers = with maintainers; [ kkallio ];
platforms = platforms.linux;
};
}

View file

@ -1,78 +0,0 @@
{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
, cln ? null, gmp ? null
}:
# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS
assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0";
assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
let
jsoncppVersion = "1.9.4";
jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz";
jsoncpp = fetchzip {
url = jsoncppUrl;
sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
};
in
gccStdenv.mkDerivation rec {
pname = "solc";
version = "0.7.4";
# upstream suggests avoid using archive generated by github
src = fetchzip {
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg";
};
postPatch = ''
substituteInPlace cmake/jsoncpp.cmake \
--replace "${jsoncppUrl}" ${jsoncpp}
'';
cmakeFlags = [
"-DBoost_USE_STATIC_LIBS=OFF"
] ++ lib.optionals (!z3Support) [
"-DUSE_Z3=OFF"
] ++ lib.optionals (!cvc4Support) [
"-DUSE_CVC4=OFF"
];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ]
++ lib.optionals z3Support [ z3 ]
++ lib.optionals cvc4Support [ cvc4 cln gmp ];
checkInputs = [ ncurses python3 ];
# Test fails on darwin for unclear reason
doCheck = gccStdenv.hostPlatform.isLinux;
checkPhase = ''
while IFS= read -r -d ''' dir
do
LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir
export LD_LIBRARY_PATH
done < <(find . -type d -print0)
pushd ..
# IPC tests need aleth avaliable, so we disable it
sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do
patchShebangs "$i"
done
TERM=xterm ./scripts/tests.sh
popd
'';
meta = with lib; {
description = "Compiler for Ethereum smart contract language Solidity";
homepage = "https://github.com/ethereum/solidity";
license = licenses.gpl3;
platforms = with platforms; linux; # darwin is currently broken
maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
inherit version;
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ace";
version = "7.0.1";
version = "7.0.2";
src = fetchurl {
url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
sha256 = "sha256-5nH5a0tBOcGfA07eeh9EjH0vgT3gTRWYHXoeO+QFQjQ=";
sha256 = "sha256-IftPSQOrZOqMLHHlUFEFa3WcvsqN5kdS5rSlGE8ETC4=";
};
enableParallelBuilding = true;

View file

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto";
homepage = "https://github.com/ethereum/ethash";
platforms = platforms.unix;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
license = licenses.asl20;
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib
, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
, libiconv, libxml2
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
};
nativeBuildInputs = [ unzip ];
buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
++ (with python2Packages; [ python numpy wrapPython ])

View file

@ -16,6 +16,6 @@ stdenv.mkDerivation {
description = "Original Bluecurve engine from Red Hat's artwork package";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.gnidorah ];
maintainers = [ ];
};
}

View file

@ -1,10 +1,10 @@
{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
{ lib, mkDerivation, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
mkDerivation rec {
version = "unstable-20-06-26";
pname = "herqq";
nativeBuildInputs = [ qmake unzip ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtmultimedia ];
outputs = [ "out" "dev" ];

View file

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Hot patching executables on Linux using .so file injection";
homepage = src.meta.homepage;
license = licenses.bsd3;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
platforms = ["i686-linux" "x86_64-linux"];
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }:
let
common = import ./common.nix { inherit fetchzip; };
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib
'';
nativeBuildInputs = [ unzip ];
buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];
meta = {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
let
common = import ./common.nix { inherit fetchzip; };
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"-DIRRLICHT_BUILD_TOOLS=OFF"
];
nativeBuildInputs = [ cmake unzip ];
nativeBuildInputs = [ cmake ];
buildInputs = [ OpenGL Cocoa IOKit ];
meta = {

View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
inherit version;
homepage = "https://github.com/open-source-parsers/jsoncpp";
description = "A C++ library for interacting with JSON";
maintainers = with maintainers; [ ttuegel cpages nand0p ];
maintainers = with maintainers; [ ttuegel cpages ];
license = licenses.mit;
platforms = platforms.all;
};

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation {
description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
homepage = "https://github.com/tomba/kmsxx";
license = licenses.mpl20;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
broken = true; # marked broken 2021-03-26
};

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
{ lib, stdenv, fetchFromGitHub, libX11, cmake, ois, freetype, libuuid,
boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
let
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
};
nativeBuildInputs = [ cmake pkg-config unzip ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libX11 ois freetype libuuid boost ]
++ (if withOgre then [ ogre ] else [ libGL libGLU ]);

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
{ lib, stdenv, fetchFromGitHub, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
stdenv.mkDerivation {
pname = "openexrid-unstable";
@ -25,7 +25,6 @@ stdenv.mkDerivation {
-I${openfx.dev}/include/OpenFX
'';
nativeBuildInputs = [ unzip ];
buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ];
enableParallelBuilding = true;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, unzip }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "openfx";
@ -11,8 +11,6 @@ stdenv.mkDerivation {
sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
};
nativeBuildInputs = [ unzip ];
outputs = [ "dev" "out" ];
enableParallelBuilding = true;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
stdenv.mkDerivation rec
{
@ -14,7 +14,6 @@ stdenv.mkDerivation rec
outputs = [ "out" ];
nativeBuildInputs = [ unzip ];
buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
setSourceRoot = ''

View file

@ -83,13 +83,13 @@ stdenv.mkDerivation rec {
cmake
autoPatchelfHook
addOpenGLRunpath
unzip
];
buildInputs = [
git
protobuf
opencv
unzip
python
tbb
shellcheck

View file

@ -123,7 +123,7 @@ in stdenv.mkDerivation {
'';
license = licenses.unfree;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ pesterhazy flokli ];
maintainers = with maintainers; [ flokli ];
hydraPlatforms = [];
};
}

View file

@ -31,7 +31,7 @@ mkDerivation {
description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique";
homepage = "http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/";
license = licenses.lgpl21;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
platforms = platforms.linux;
};
}

View file

@ -22,7 +22,7 @@ let
inherit description homepage;
downloadPage = http://sqlite.org/download.html;
license = licenses.publicDomain;
maintainers = with maintainers; [ pesterhazy johnazoidberg ];
maintainers = with maintainers; [ johnazoidberg ];
platforms = platforms.unix;
};
};

View file

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "apprise";
version = "0.9.1";
version = "0.9.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-FW5gt35yoXVr2+hiGBDJ/5jFFfIpn2Z9sDN8acoO4FI=";
sha256 = "sha256-yKzpyJHUIkVYVwrL6oCPMd+QSVML2czWmQHCemXWAMQ=";
};
nativeBuildInputs = [ Babel installShellFiles ];

View file

@ -34,6 +34,6 @@ buildPythonPackage rec {
homepage = "https://github.com/PyCQA/astroid";
license = licenses.lgpl2;
platforms = platforms.all;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -35,6 +35,6 @@ buildPythonPackage rec {
homepage = "https://github.com/PyCQA/astroid";
license = licenses.lgpl21Plus;
platforms = platforms.all;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -73,6 +73,6 @@ buildPythonPackage rec {
description = "WebSocket and WAMP in Python for Twisted and asyncio";
homepage = "https://crossbar.io/autobahn";
license = licenses.mit;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -101,7 +101,7 @@ let
meta = with lib; {
homepage = "https://buildbot.net/";
description = "An open-source continuous integration framework for automating software build, test, and release processes";
maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
maintainers = with maintainers; [ ryansydnor lopsided98 ];
license = licenses.gpl2;
};
};

View file

@ -25,7 +25,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://buildbot.net/";
description = "Buildbot Packaging Helper";
maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
maintainers = with maintainers; [ ryansydnor lopsided98 ];
license = licenses.gpl2;
};
}

View file

@ -23,7 +23,7 @@
meta = with lib; {
homepage = "https://buildbot.net/";
description = "Buildbot UI";
maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
maintainers = with maintainers; [ ryansydnor lopsided98 ];
license = licenses.gpl2;
};
};
@ -45,7 +45,7 @@
meta = with lib; {
homepage = "https://buildbot.net/";
description = "Buildbot Console View Plugin";
maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
maintainers = with maintainers; [ ryansydnor lopsided98 ];
license = licenses.gpl2;
};
};
@ -67,7 +67,7 @@
meta = with lib; {
homepage = "https://buildbot.net/";
description = "Buildbot Waterfall View Plugin";
maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
maintainers = with maintainers; [ ryansydnor lopsided98 ];
license = licenses.gpl2;
};
};
@ -89,7 +89,7 @@
meta = with lib; {
homepage = "https://buildbot.net/";
description = "Buildbot Grid View Plugin";
maintainers = with maintainers; [ nand0p lopsided98 ];
maintainers = with maintainers; [ lopsided98 ];
license = licenses.gpl2;
};
};

View file

@ -26,7 +26,7 @@ buildPythonPackage (rec {
meta = with lib; {
homepage = "https://buildbot.net/";
description = "Buildbot Worker Daemon";
maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
maintainers = with maintainers; [ ryansydnor lopsided98 ];
license = licenses.gpl2;
};
})

View file

@ -18,6 +18,6 @@ buildPythonPackage rec {
homepage = "https://github.com/nir0s/distro";
description = "Linux Distribution - a Linux OS platform information API.";
license = licenses.asl20;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -37,7 +37,7 @@ buildPythonPackage rec {
description = "Distributed Python deployment and communication";
license = licenses.mit;
homepage = "https://execnet.readthedocs.io/";
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -13,6 +13,6 @@ buildPythonPackage rec {
homepage = "https://github.com/twisted/treq";
description = "Incremental is a small library that versions your Python projects";
license = licenses.mit;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -38,6 +38,6 @@ in buildPythonPackage rec {
description = "A Python utility / library to sort Python imports";
homepage = "https://github.com/timothycrosley/isort";
license = licenses.mit;
maintainers = with maintainers; [ couchemar nand0p ];
maintainers = with maintainers; [ couchemar ];
};
}

View file

@ -72,6 +72,6 @@ in buildPythonPackage rec {
description = "A Python utility / library to sort Python imports";
homepage = "https://github.com/PyCQA/isort";
license = licenses.mit;
maintainers = with maintainers; [ couchemar nand0p ];
maintainers = with maintainers; [ couchemar ];
};
}

View file

@ -20,7 +20,7 @@ buildPythonPackage rec {
description = "An implementation of JSON Reference for Python";
homepage = "https://github.com/gazpachoking/jsonref";
license = licenses.mit;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}

View file

@ -13,6 +13,6 @@ buildPythonPackage rec {
homepage = "https://github.com/MarkCWirt/MIDIUtil";
description = "A pure python library for creating multi-track MIDI files";
license = licenses.mit;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
};
}

View file

@ -15,6 +15,6 @@ buildPythonPackage rec {
homepage = "https://github.com/LEW21/pydbus";
description = "Pythonic DBus library";
license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ gnidorah ];
maintainers = with lib.maintainers; [ ];
};
}

View file

@ -46,6 +46,6 @@ buildPythonPackage rec {
description = "A bug and style checker for Python";
platforms = platforms.all;
license = licenses.gpl1Plus;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -67,6 +67,6 @@ buildPythonPackage rec {
homepage = "https://pylint.pycqa.org/";
description = "A bug and style checker for Python";
license = licenses.gpl1Plus;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -16,6 +16,6 @@ buildPythonPackage rec {
homepage = "http://das.nasophon.de/pysmf/";
description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf.";
license = licenses.bsd2;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
};
}

View file

@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "Thin-wrapper around the mock package for easier use with py.test.";
homepage = "https://github.com/pytest-dev/pytest-mock";
license = licenses.mit;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -28,6 +28,6 @@ buildPythonPackage rec {
description = "Thin-wrapper around the mock package for easier use with pytest";
homepage = "https://github.com/pytest-dev/pytest-mock";
license = with licenses; [ mit ];
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "Extensible server fixures for py.test";
homepage = "https://github.com/manahl/pytest-plugins";
license = licenses.mit;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

View file

@ -29,6 +29,6 @@ in buildPythonPackage rec {
homepage = "https://github.com/Vayn/python-fontconfig";
description = "Python binding for Fontconfig";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ gnidorah ];
maintainers = with lib.maintainers; [ ];
};
}

View file

@ -1,5 +1,4 @@
{ lib, buildPythonPackage, fetchPypi
, unzip }:
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "python-simple-hipchat";
@ -10,8 +9,6 @@ buildPythonPackage rec {
sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
};
nativeBuildInputs = [ unzip ];
meta = with lib; {
description = "Easy peasy wrapper for HipChat's v1 API";
homepage = "https://github.com/kurttheviking/simple-hipchat-py";

View file

@ -16,7 +16,7 @@ buildPythonPackage rec {
description = "A Python RAML parser.";
homepage = "https://ramlfications.readthedocs.org";
license = licenses.asl20;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};

View file

@ -32,7 +32,7 @@ buildPythonPackage rec {
description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit.";
homepage = "https://github.com/rutsky/setuptools-trial";
license = licenses.bsd2;
maintainers = with maintainers; [ ryansydnor nand0p ];
maintainers = with maintainers; [ ryansydnor ];
};
}

View file

@ -24,7 +24,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Sphinx extension to include jinja templates in documentation";
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
license = licenses.mit;
};
}

View file

@ -77,6 +77,6 @@ buildPythonPackage rec {
description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";
homepage = "http://sphinx.pocoo.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ nand0p ];
maintainers = with lib.maintainers; [ ];
};
}

View file

@ -84,6 +84,6 @@ buildPythonPackage rec {
'';
homepage = "https://www.sphinx-doc.org";
license = licenses.bsd3;
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
};
}

Some files were not shown because too many files have changed in this diff Show more