jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-27 12:20:00 +00:00 committed by GitHub
commit 2a38839b78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 126 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/hardware/trezord.nix
View File

@ -48,7 +48,7 @@ in {
systemd.services.trezord = {
description = "Trezor Bridge";
after = [ "systemd-udev-settle.service" "network.target" ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = [];
serviceConfig = {

2
pkgs/applications/editors/emacs/generic.nix
View File

@ -136,7 +136,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
"--with-gif=no" "--with-tiff=no" ])
++ lib.optional withXwidgets "--with-xwidgets"
++ lib.optional nativeComp "--with-nativecomp"
++ lib.optional nativeComp "--with-native-compilation"
++ lib.optional withImageMagick "--with-imagemagick"
;

2
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -92,7 +92,6 @@ stdenv.mkDerivation {
libPath = lib.makeLibraryPath
[ stdenv.cc.cc
alsaLib
(lib.getDev alsaLib)
atk
cairo
curl
@ -128,7 +127,6 @@ stdenv.mkDerivation {
pango
libheimdal
libpulseaudio
(lib.getDev libpulseaudio)
systemd
ffmpeg
] + ":" + lib.makeSearchPathOutput "lib" "lib64" [

5
pkgs/applications/science/logic/z3/default.nix
View File

@ -57,9 +57,14 @@ stdenv.mkDerivation rec {
mkdir -p $python/lib
mv $lib/lib/python* $python/lib/
ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary}
'' + optionalString javaBindings ''
mkdir -p $java/share/java
mv com.microsoft.z3.jar $java/share/java
moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java"
'';
outputs = [ "out" "lib" "dev" "python" ]
++ optional javaBindings "java"
++ optional ocamlBindings "ocaml";
meta = with lib; {

31
pkgs/applications/window-managers/bspwm/unstable.nix
View File

@ -1,31 +0,0 @@
{ stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }:
stdenv.mkDerivation {
name = "bspwm-unstable-2016-09-30";
src = fetchFromGitHub {
owner = "baskerville";
repo = "bspwm";
rev = "8664c007e44de162c1597fd7e163635b274fb747";
sha256 = "0clvpz32z38i8kr10hqlifa661szpfn93c63m2aq2h4dwmr44slz";
};
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
buildPhase = ''
make PREFIX=$out
'';
installPhase = ''
make PREFIX=$out install
'';
meta = {
description = "A tiling window manager based on binary space partitioning (git version)";
homepage = "https://github.com/baskerville/bspwm";
maintainers = [ lib.maintainers.meisternu lib.maintainers.epitrochoid ];
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
};
}

8
pkgs/development/compilers/nim/default.nix
View File

@ -4,10 +4,10 @@
, pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }:
let
version = "1.4.2";
version = "1.4.4";
src = fetchurl {
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
sha256 = "0q8i56343b69f1bh48a8vxkqman9i2kscyj0lf017n3xfy1pb903";
sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd";
};
meta = with lib; {
@ -156,13 +156,13 @@ let
nimble-unwrapped = stdenv.mkDerivation rec {
pname = "nimble-unwrapped";
version = "0.12.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nimble";
rev = "v" + version;
sha256 = "0vx0mdk31n00dr2rhiip6f4x7aa3z3mnblnmwk7f65ixd5hayq6y";
sha256 = "1idb4r0kjbqv16r6bgmxlr13w2vgq5332hmnc8pjbxiyfwm075x8";
};
nativeBuildInputs = [ nim-unwrapped ];

1
pkgs/development/interpreters/python/default.nix
View File

@ -191,6 +191,7 @@ in {
# Minimal versions of Python (built without optional dependencies)
python3Minimal = (python38.override {
self = python3Minimal;
pythonAttr = "python3Minimal";
# strip down that python version as much as possible
openssl = null;
readline = null;

4
pkgs/development/php-packages/box/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "box";
version = "2.7.5";
@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin

12
pkgs/development/php-packages/composer/2.0.nix
View File

@ -1,29 +1,29 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
version = "2.0.9";
version = "2.0.11";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "sha256-JPqlvIB+OZ8y6aIaM/u1sGht+ciFDvq+LAR8LM+5+cw=";
sha256 = "sha256-6r8pFwcglqlGeRk3YlATGeYh4rNppKElaywn9OaYRHc=";
};
dontUnpack = true;
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/composer/composer.phar
makeWrapper ${php}/bin/php $out/bin/composer \
--add-flags "$out/libexec/composer/composer.phar" \
--prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
--prefix PATH : ${lib.makeBinPath [ unzip ]}
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "Dependency Manager for PHP";
license = licenses.mit;
homepage = "https://getcomposer.org/";

8
pkgs/development/php-packages/composer/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
version = "1.10.15";
@ -13,17 +13,17 @@ mkDerivation {
dontUnpack = true;
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/composer/composer.phar
makeWrapper ${php}/bin/php $out/bin/composer \
--add-flags "$out/libexec/composer/composer.phar" \
--prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
--prefix PATH : ${lib.makeBinPath [ unzip ]}
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "Dependency Manager for PHP";
license = licenses.mit;
homepage = "https://getcomposer.org/";

10
pkgs/development/php-packages/couchbase/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, lib, pkgs, php }:
{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php }:
let
pname = "couchbase";
version = "2.6.2";
@ -6,7 +6,7 @@ in
buildPecl {
inherit pname version;
src = pkgs.fetchFromGitHub {
src = fetchFromGitHub {
owner = "couchbase";
repo = "php-couchbase";
rev = "v${version}";
@ -16,12 +16,12 @@ buildPecl {
configureFlags = [ "--with-couchbase" ];
broken = lib.versionAtLeast php.version "8.0";
buildInputs = with pkgs; [ libcouchbase zlib ];
buildInputs = [ libcouchbase zlib ];
internalDeps = [] ++ lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ];
peclDeps = [ php.extensions.igbinary ];
patches = [
(pkgs.writeText "php-couchbase.patch" ''
(writeText "php-couchbase.patch" ''
--- a/config.m4
+++ b/config.m4
@@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then
@ -29,7 +29,7 @@ buildPecl {
else
AC_MSG_CHECKING(for libcouchbase in default path)
- for i in /usr/local /usr; do
+ for i in ${pkgs.libcouchbase}; do
+ for i in ${libcouchbase}; do
if test -r $i/include/libcouchbase/couchbase.h; then
LIBCOUCHBASE_DIR=$i
AC_MSG_RESULT(found in $i)

10
pkgs/development/php-packages/event/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, lib, pkgs, php }:
{ buildPecl, lib, php, pkg-config, openssl, libevent }:
buildPecl {
pname = "event";
@ -6,7 +6,7 @@ buildPecl {
sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq";
configureFlags = [
"--with-event-libevent-dir=${pkgs.libevent.dev}"
"--with-event-libevent-dir=${libevent.dev}"
"--with-event-core"
"--with-event-extra"
"--with-event-pthreads"
@ -18,11 +18,11 @@ buildPecl {
':'
'';
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = with pkgs; [ openssl libevent ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl libevent ];
internalDeps = [ php.extensions.sockets ];
meta = with pkgs.lib; {
meta = with lib; {
description = ''
This is an extension to efficiently schedule I/O, time and signal based
events using the best I/O notification mechanism available for specific platform.

6
pkgs/development/php-packages/imagick/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, fetchpatch, lib, pkgs, pcre' }:
{ buildPecl, fetchpatch, lib, imagemagick7, pkg-config, pcre' }:
buildPecl {
pname = "imagick";
@ -19,8 +19,8 @@ buildPecl {
})
];
configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ];
nativeBuildInputs = [ pkgs.pkg-config ];
configureFlags = [ "--with-imagick=${imagemagick7.dev}" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre' ];
meta.maintainers = lib.teams.php.members;

8
pkgs/development/php-packages/maxminddb/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, lib, pkgs }:
{ buildPecl, lib, fetchFromGitHub, libmaxminddb }:
let
pname = "maxminddb";
version = "1.10.0";
@ -6,17 +6,17 @@ in
buildPecl {
inherit pname version;
src = pkgs.fetchFromGitHub {
src = fetchFromGitHub {
owner = "maxmind";
repo = "MaxMind-DB-Reader-php";
rev = "v${version}";
sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ=";
};
buildInputs = [ pkgs.libmaxminddb ];
buildInputs = [ libmaxminddb ];
sourceRoot = "source/ext";
meta = with pkgs.lib; {
meta = with lib; {
description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members;

10
pkgs/development/php-packages/memcached/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, lib, fetchgit, php, pkgs }:
{ buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }:
let
pname = "memcached";
version = "3.1.5";
@ -19,12 +19,12 @@ buildPecl {
];
configureFlags = [
"--with-zlib-dir=${pkgs.zlib.dev}"
"--with-libmemcached-dir=${pkgs.libmemcached}"
"--with-zlib-dir=${zlib.dev}"
"--with-libmemcached-dir=${libmemcached}"
];
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = with pkgs; [ cyrus_sasl zlib ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ cyrus_sasl zlib ];
meta.maintainers = lib.teams.php.members;
}

9
pkgs/development/php-packages/mongodb/default.nix
View File

@ -1,4 +1,5 @@
{ buildPecl, lib, pkgs, pcre' }:
{ stdenv, buildPecl, lib, pcre', pkg-config, cyrus_sasl, icu64
, openssl, snappy, zlib, darwin }:
buildPecl {
pname = "mongodb";
@ -6,15 +7,15 @@ buildPecl {
version = "1.9.0";
sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs";
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = with pkgs; [
nativeBuildInputs = [ pkg-config ];
buildInputs = [
cyrus_sasl
icu64
openssl
snappy
zlib
pcre'
] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security;
] ++ lib.optionals (stdenv.isDarwin) darwin.apple_sdk.frameworks.Security;
meta.maintainers = lib.teams.php.members;
}

8
pkgs/development/php-packages/oci8/default.nix
View File

@ -1,14 +1,14 @@
{ buildPecl, lib, pkgs, version, sha256 }:
{ buildPecl, lib, version, sha256, oracle-instantclient }:
buildPecl {
pname = "oci8";
inherit version sha256;
buildInputs = [ pkgs.oracle-instantclient ];
configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
buildInputs = [ oracle-instantclient ];
configureFlags = [ "--with-oci8=shared,instantclient,${oracle-instantclient.lib}/lib" ];
postPatch = ''
sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4
sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4
'';
meta.maintainers = lib.teams.php.members;

8
pkgs/development/php-packages/pdlib/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, lib, pkgs }:
{ buildPecl, fetchFromGitHub, lib, pkg-config, dlib }:
let
pname = "pdlib";
version = "1.0.2";
@ -6,15 +6,15 @@ in
buildPecl {
inherit pname version;
src = pkgs.fetchFromGitHub {
src = fetchFromGitHub {
owner = "goodspb";
repo = "pdlib";
rev = "v${version}";
sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i";
};
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ (pkgs.dlib.override { guiSupport = true; }) ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ (dlib.override { guiSupport = true; }) ];
meta = with lib; {
description = "A PHP extension for Dlib";

4
pkgs/development/php-packages/pdo_sqlsrv/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, lib, pkgs, php }:
{ stdenv, buildPecl, lib, libiconv, unixODBC, php }:
buildPecl {
pname = "pdo_sqlsrv";
@ -8,7 +8,7 @@ buildPecl {
internalDeps = [ php.extensions.pdo ];
buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];
buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
meta.maintainers = lib.teams.php.members;
}

6
pkgs/development/php-packages/php-cs-fixer/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "php-cs-fixer";
version = "2.18.2";
@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar"
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "A tool to automatically fix PHP coding standards issues";
license = licenses.mit;
homepage = "http://cs.sensiolabs.org/";

6
pkgs/development/php-packages/php-parallel-lint/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchFromGitHub, pkgs, lib, php }:
{ mkDerivation, fetchFromGitHub, makeWrapper, lib, php }:
let
pname = "php-parallel-lint";
version = "1.0.0";
@ -14,7 +14,7 @@ mkDerivation {
};
nativeBuildInputs = [
pkgs.makeWrapper
makeWrapper
php.packages.composer
php.packages.box
];
@ -31,7 +31,7 @@ mkDerivation {
--add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar"
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "Tool to check syntax of PHP files faster than serial check with fancier output";
license = licenses.bsd2;
homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint";

8
pkgs/development/php-packages/php_excel/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, fetchurl, lib, pkgs }:
{ buildPecl, fetchurl, lib, libxl }:
let
pname = "php_excel";
phpVersion = "php7";
@ -12,12 +12,12 @@ buildPecl {
sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n";
};
buildInputs = with pkgs; [ libxl ];
buildInputs = [ libxl ];
configureFlags = [
"--with-excel"
"--with-libxl-incdir=${pkgs.libxl}/include_c"
"--with-libxl-libdir=${pkgs.libxl}/lib"
"--with-libxl-incdir=${libxl}/include_c"
"--with-libxl-libdir=${libxl}/lib"
];
meta.maintainers = lib.teams.php.members;

6
pkgs/development/php-packages/phpcbf/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, lib, php, makeWrapper }:
let
pname = "phpcbf";
version = "3.5.8";
@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/phpcbf/phpcbf.phar"
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "PHP coding standard beautifier and fixer";
license = licenses.bsd3;
homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";

6
pkgs/development/php-packages/phpcs/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpcs";
version = "3.5.8";
@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/phpcs/phpcs.phar"
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "PHP coding standard tool";
license = licenses.bsd3;
homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";

8
pkgs/development/php-packages/phpmd/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpmd";
version = "2.8.2";
@ -8,13 +8,13 @@ in
mkDerivation {
inherit pname version;
src = pkgs.fetchurl {
src = fetchurl {
url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar";
sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb";
};
phases = [ "installPhase" ];
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@ -23,7 +23,7 @@ mkDerivation {
--add-flags "$out/libexec/phpmd/phpmd.phar"
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "PHP code quality analyzer";
license = licenses.bsd3;
homepage = "https://phpmd.org/";

8
pkgs/development/php-packages/phpstan/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpstan";
version = "0.12.78";
@ -6,13 +6,13 @@ in
mkDerivation {
inherit pname version;
src = pkgs.fetchurl {
src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "sha256-YPCh6HAVuFf2rJhUj/uzfqkWKN+Jd2iPfugSiTh65zc=";
};
phases = [ "installPhase" ];
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/phpstan/phpstan.phar"
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "PHP Static Analysis Tool";
longDescription = ''
PHPStan focuses on finding errors in your code without actually

6
pkgs/development/php-packages/psalm/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "psalm";
version = "4.6.1";
@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/psalm/psalm.phar"
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "A static analysis tool for finding errors in PHP applications";
license = licenses.mit;
homepage = "https://github.com/vimeo/psalm";

6
pkgs/development/php-packages/psysh/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "psysh";
version = "0.10.4";
@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@ -21,7 +21,7 @@ mkDerivation {
wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}"
'';
meta = with pkgs.lib; {
meta = with lib; {
description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP.";
license = licenses.mit;
homepage = "https://psysh.org/";

6
pkgs/development/php-packages/rdkafka/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, lib, pkgs, pcre' }:
{ buildPecl, lib, rdkafka, pcre' }:
buildPecl {
pname = "rdkafka";
@ -6,11 +6,11 @@ buildPecl {
version = "5.0.0";
sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs=";
buildInputs = [ pkgs.rdkafka pcre' ];
buildInputs = [ rdkafka pcre' ];
postPhpize = ''
substituteInPlace configure \
--replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}'
--replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${rdkafka}'
'';
meta = with lib; {

8
pkgs/development/php-packages/smbclient/default.nix
View File

@ -1,14 +1,14 @@
{ buildPecl, lib, pkgs }:
{ buildPecl, lib, samba, pkg-config }:
buildPecl {
pname = "smbclient";
version = "1.0.5";
sha256 = "sha256-cNvTa1qzYrlhuX4oNehXt+XKqmqfonyomW/usQdQQO0=";
# TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66
LIBSMBCLIENT_INCDIR = "${pkgs.samba.dev}/include/samba-4.0";
LIBSMBCLIENT_INCDIR = "${samba.dev}/include/samba-4.0";
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.samba ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ samba ];
meta.maintainers = lib.teams.php.members;
}

8
pkgs/development/php-packages/sqlsrv/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, lib, pkgs }:
{ stdenv, buildPecl, lib, unixODBC, libiconv }:
buildPecl {
pname = "sqlsrv";
@ -7,10 +7,8 @@ buildPecl {
sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a";
buildInputs = [
pkgs.unixODBC
] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
pkgs.libiconv
];
unixODBC
] ++ lib.optionals stdenv.isDarwin [ libiconv ];
meta.maintainers = lib.teams.php.members;
}

6
pkgs/development/php-packages/yaml/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, lib, pkgs }:
{ buildPecl, lib, pkg-config, libyaml }:
buildPecl {
pname = "yaml";
@ -6,9 +6,9 @@ buildPecl {
version = "2.2.1";
sha256 = "sha256-4XrQTnUuJf0Jm93S350m3+8YPI0AxBebydei4cl9eBk=";
configureFlags = [ "--with-yaml=${pkgs.libyaml}" ];
configureFlags = [ "--with-yaml=${libyaml}" ];
nativeBuildInputs = [ pkgs.pkg-config ];
nativeBuildInputs = [ pkg-config ];
meta.maintainers = lib.teams.php.members;
}

4
pkgs/development/python-modules/adafruit-platformdetect/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Adafruit-PlatformDetect";
version = "3.1.1";
version = "3.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JcqDuTzR2sffEbmhJHRPJggLruc9lKQ4aO/Ab88yo/I=";
sha256 = "a14c642b1f6849e57b5c442e81e809c9e1e3a0bcfebfd54b15a9f9fd273f9611";
};
nativeBuildInputs = [ setuptools-scm ];

6
pkgs/development/python-modules/censys/default.nix
View File

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "censys";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "censys";
repo = "censys-python";
rev = "v${version}";
sha256 = "0vvd13g48i4alnqil98zc09zi5kv6l2s3kdfyg5syjxvq4lfd476";
rev = version;
sha256 = "06jwk0ps80fjzbsy24qn5bsggfpgn4ccjzjz65cdh0ap1mfvh5jf";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/libversion/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libversion";
version = "1.2.1";
version = "1.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1";
sha256 = "cf9ef702d0bc750f0ad44a2cffe8ebd83cd356b92cc25f767846509f84ea7e73";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/python-modules/slack-sdk/default.nix
View File

@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.3.0";
version = "3.4.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
sha256 = "0nr1avxycvjnvg1n8r09xi4sc5h6i4b64pzfgq14l55dgi5sv1rx";
sha256 = "sha256-WlHVorltN8Apq0MZUStPlJZKbBFSbnAoIBQUZYGdDiY=";
};
propagatedBuildInputs = [

1
pkgs/os-specific/linux/wpa_supplicant/default.nix
View File

@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
})
# P2P: Fix a corner case in peer addition based on PD Request (https://w1.fi/security/2021-1/)
(fetchurl {
name = "CVE-2021-27803.patch";
url = "https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch";
sha256 = "04cnds7hmbqc44jasabjvrdnh66i5hwvk2h2m5z94pmgbzncyh3z";
})

6
pkgs/shells/zsh/zsh-fzf-tab/default.nix
View File

@ -4,13 +4,13 @@ let
INSTALL_PATH="${placeholder "out"}/share/fzf-tab";
in stdenv.mkDerivation rec {
pname = "zsh-fzf-tab";
version = "unstable-2021-01-24";
version = "unstable-2021-02-14";
src = fetchFromGitHub {
owner = "Aloxaf";
repo = "fzf-tab";
rev = "78b4cefb27dc2bef5e4c9ac3bf2bd28413620fcd";
sha256 = "1f5m7vf7wxzczis2nzvhgqaqnphhp3a0wv8b612m7g4fnvk3lnkn";
rev = "8cebb8f01ca57076c3c7cd66365270d989bcaa89";
sha256 = "119m84g2c4z9xdr22j401p09n3cpiyj61dw5m7xkm6309nd7zz0a";
};
buildInputs = [ ncurses ];

2
pkgs/tools/system/monit/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
homepage = "http://mmonit.com/monit/";
description = "Monitoring system";
license = lib.licenses.agpl3;
maintainers = with lib.maintainers; [ raskin wmertens ];
maintainers = with lib.maintainers; [ raskin wmertens ryantm ];
platforms = with lib.platforms; linux;
};
}

8
pkgs/top-level/all-packages.nix
View File

@ -11431,38 +11431,46 @@ in
# These are for compatibility and should not be used inside Nixpkgs.
pythonFull = python.override {
self = pythonFull;
pythonAttr = "pythonFull";
x11Support = true;
};
python2Full = python2.override {
self = python2Full;
pythonAttr = "python2Full";
x11Support = true;
};
python27Full = python27.override {
self = python27Full;
pythonAttr = "python27Full";
x11Support = true;
};
python3Full = python3.override {
self = python3Full;
pythonAttr = "python3Full";
bluezSupport = true;
x11Support = true;
};
python36Full = python36.override {
self = python36Full;
pythonAttr = "python36Full";
bluezSupport = true;
x11Support = true;
};
python37Full = python37.override {
self = python37Full;
pythonAttr = "python37Full";
bluezSupport = true;
x11Support = true;
};
python38Full = python38.override {
self = python38Full;
pythonAttr = "python38Full";
bluezSupport = true;
x11Support = true;
};
python39Full = python39.override {
self = python39Full;
pythonAttr = "python39Full";
bluezSupport = true;
x11Support = true;
};