MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 00:08:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-12-21 12:01:23 +00:00 committed by GitHub
commit 0757d9c156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 524 additions and 219 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View file

@ -14,8 +14,13 @@
</itemizedlist>
<section xml:id="sec-release-22.05-highlights">
<title>Highlights</title>
<para>
</para>
<itemizedlist spacing="compact">
<listitem>
<para>
PHP 8.1 is now available
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-new-services">
<title>New Services</title>

2
nixos/doc/manual/release-notes/rl-2205.section.md
View file

@ -6,6 +6,8 @@ In addition to numerous new and upgraded packages, this release has the followin
## Highlights {#sec-release-22.05-highlights}
- PHP 8.1 is now available
## New Services {#sec-release-22.05-new-services}
- [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable).

1
nixos/tests/all-tests.nix
View file

@ -362,6 +362,7 @@ in
php = handleTest ./php {};
php74 = handleTest ./php { php = pkgs.php74; };
php80 = handleTest ./php { php = pkgs.php80; };
php81 = handleTest ./php { php = pkgs.php81; };
pinnwand = handleTest ./pinnwand.nix {};
plasma5 = handleTest ./plasma5.nix {};
plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {};

1
pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common
View file

@ -22,6 +22,7 @@
--enable-muxer=h263
--enable-muxer=h264
--enable-muxer=hevc
--enable-muxer=matroska
--enable-muxer=webm
--enable-muxer=ogg
--enable-muxer=pcm_s16be

1
pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches
View file

@ -3,3 +3,4 @@ change-RTCP-ratio.patch
rtp_ext_abs_send_time.patch
libopusdec-enable-FEC.patch
libopusenc-enable-FEC.patch
screen-sharing-x11-fix.patch

4
pkgs/applications/networking/instant-messengers/jami/default.nix
View file

@ -8,11 +8,11 @@
}:
rec {
version = "20211104.2.e80361d";
version = "20211213.2.37be4c3";
src = fetchzip {
url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";
sha256 = "1l48svppshh8mg7y1dymnh0rgwswy4qwdyl7qlg25mmh4y1li21f";
sha256 = "08abswvxwsxh6b0smb4l4cmymsbfiy7473b2sgvghj55w603prsc";
stripRoot = false;
extraPostFetch = ''

2
pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix
View file

@ -2,5 +2,5 @@
owner = "savoirfairelinux";
repo = "pjproject";
rev = "e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a";
sha256 = "sha256-6t+3b7pvvwi+VD05vxtujabEJmWmJTAeyD/Dapav10Y=";
sha256 = "0inpmyb6mhrzr0g309d6clkc99lddqdvyf9xajz0igvgp9pvgpza";
}

4
pkgs/desktops/gnome/core/epiphany/default.nix
View file

@ -41,11 +41,11 @@
stdenv.mkDerivation rec {
pname = "epiphany";
version = "41.2";
version = "41.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "Ud5KGB+nxKEs3DDMsWQ2ElwaFt+av44/pTP8gb8Q60w=";
sha256 = "ugEmjuVPMY39rC4B66OKP8lpQMHL9kDtJhOuKfi8ua0=";
};
patches = lib.optionals withPantheon [

4
pkgs/development/compilers/julia/1.6-bin.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "julia-bin";
version = "1.6.4";
version = "1.6.5";
src = {
x86_64-linux = fetchurl {
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
sha256 = "0ci1dd8g1pgpp6j1v971zg8xpw120hdjblf9zcyhgs4pfvj4l92j";
sha256 = "0b4fmcfd5q5wzvasmsfqq838rivpxn274n5y2kza4m3jakp27zmq";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

51
pkgs/development/interpreters/php/8.1.nix Normal file
View file

@ -0,0 +1,51 @@
{ callPackage, lib, stdenv, ... }@_args:
let
base = callPackage ./generic.nix (_args // {
version = "8.1.1";
sha256 = "sha256-j4vJytbNEk7cER99sKEJdF4vY4dwoQGzwiopU/eptA4=";
});
in
base.withExtensions ({ all, ... }: with all; ([
bcmath
calendar
curl
ctype
dom
exif
fileinfo
filter
ftp
gd
gettext
gmp
iconv
intl
ldap
mbstring
mysqli
mysqlnd
opcache
openssl
pcntl
pdo
pdo_mysql
pdo_odbc
pdo_pgsql
pdo_sqlite
pgsql
posix
readline
session
simplexml
sockets
soap
sodium
sqlite3
tokenizer
xmlreader
xmlwriter
zip
zlib
] ++ lib.optionals (!stdenv.isDarwin) [ imap ]))

12
pkgs/development/interpreters/php/fix-tokenizer-php81.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/ext/tokenizer/Makefile.frag b/ext/tokenizer/Makefile.frag
index 745cbfce91..07bace6022 100644
--- a/ext/tokenizer/Makefile.frag
+++ b/ext/tokenizer/Makefile.frag
@@ -1,5 +1,5 @@
-$(top_srcdir)/ext/tokenizer/tokenizer_data.c: $(top_srcdir)/Zend/zend_language_parser.y
+$(top_srcdir)/tokenizer_data.c: $(top_srcdir)/../../Zend/zend_language_parser.y
@if test ! -z "$(PHP)"; then \
$(PHP) $(srcdir)/tokenizer_data_gen.php; \
fi;
-$(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.c $(top_srcdir)/Zend/zend_language_scanner.c
+$(builddir)/tokenizer.lo: $(top_srcdir)/../../Zend/zend_language_parser.c $(top_srcdir)/../../Zend/zend_language_scanner.c

19
pkgs/development/libraries/crypto++/default.nix
View file

@ -5,30 +5,22 @@
stdenv.mkDerivation rec {
pname = "crypto++";
version = "8.4.0";
version = "8.6.0";
underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version;
src = fetchFromGitHub {
owner = "weidai11";
repo = "cryptopp";
rev = "CRYPTOPP_${underscoredVersion}";
sha256 = "1gwn8yh1mh41hkh6sgnhb9c3ygrdazd7645msl20i0zdvcp7f5w3";
hash = "sha256-a3TYaK34WvKEXN7LKAfGwQ3ZL6a3k/zMZyyVfnkQqO4=";
};
outputs = [ "out" "dev" ];
postPatch = ''
substituteInPlace GNUmakefile \
--replace "AR = libtool" "AR = ar" \
--replace "ARFLAGS = -static -o" "ARFLAGS = -cru"
# See https://github.com/weidai11/cryptopp/issues/1011
substituteInPlace GNUmakefile \
--replace "ZOPT = -O0" "ZOPT ="
'';
preConfigure = ''
sh TestScripts/configure.sh
--replace "AR = libtool" "AR = ar" \
--replace "ARFLAGS = -static -o" "ARFLAGS = -cru"
'';
makeFlags = [ "PREFIX=${placeholder "out"}" ];
@ -37,10 +29,11 @@ stdenv.mkDerivation rec {
++ lib.optional enableShared "shared"
++ [ "libcryptopp.pc" ];
enableParallelBuilding = true;
hardeningDisable = [ "fortify" ];
doCheck = true;
# built for checks but we don't install static lib into the nix store
# always built for checks but install static lib only when necessary
preInstall = lib.optionalString (!enableStatic) "rm libcryptopp.a";
installTargets = [ "install-lib" ];

8
pkgs/development/libraries/libmwaw/default.nix
View file

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="libmwaw";
version="0.3.20";
version="0.3.21";
name="${baseName}-${version}";
hash="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE=";
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.20/libmwaw-0.3.20.tar.xz";
sha256="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE=";
hash="sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw=";
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.21/libmwaw-0.3.21.tar.xz";
sha256="sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/libraries/simdjson/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
sha256 = "sha256-NpRpF+1tzPEjBo6i1GxACeAMDn+WEX8C80vInNffqug=";
sha256 = "sha256-WuqBR1/Iqly+Y8kJxTuZLTVkR3ltXdyr+/6J3zhBNkQ=";
};
nativeBuildInputs = [ cmake ];

56
pkgs/development/python-modules/automate-home/default.nix Normal file
View file

@ -0,0 +1,56 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
, APScheduler
, hiredis
, aioredis
, ephem
, pytz
, pyyaml
}:
buildPythonPackage rec {
pname = "automate-home";
version = "0.9.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-41qd+KPSrOrczkovwXht3irbcYlYehBZ1HZ44yZe4cM=";
};
propagatedBuildInputs = [
APScheduler
hiredis
aioredis
ephem
pytz
pyyaml
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
# Rename pyephem, https://github.com/majamassarini/automate-home/pull/3
substituteInPlace setup.py \
--replace "pyephem" "ephem" \
--replace "aioredis==1.3.1" "aioredis"
'';
pythonImportsCheck = [
"home"
];
meta = with lib; {
description = "Python module to automate (home) devices";
homepage = "https://github.com/majamassarini/automate-home";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/flux-led/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
version = "0.27.8";
version = "0.27.10";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = version;
sha256 = "sha256-3Yq8BmDBiHLu119pazX0vKaXd547PCezfpFqh9G/DtM=";
sha256 = "sha256-xHPP6QxPmlMAEdZ3t5RyDXKN51okwxBtaOZPTyONy5w=";
};
propagatedBuildInputs = [

50
pkgs/development/python-modules/gehomesdk/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ lib
, aiohttp
, bidict
, buildPythonPackage
, fetchPypi
, humanize
, lxml
, pythonOlder
, requests
, slixmpp
, websockets
}:
buildPythonPackage rec {
pname = "gehomesdk";
version = "0.4.22";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-3HErbW9/YD8Jd6zr5O2hjoLZ9x5P/vzZLjqPmSm09EM=";
};
propagatedBuildInputs = [
aiohttp
bidict
humanize
lxml
requests
slixmpp
websockets
];
# Tests are not shipped and source is not tagged
# https://github.com/simbaja/gehome/issues/32
doCheck = false;
pythonImportsCheck = [
"gehomesdk"
];
meta = with lib; {
description = "Python SDK for GE smart appliances";
homepage = "https://github.com/simbaja/gehome";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

53
pkgs/development/python-modules/gekitchen/default.nix Normal file
View file

@ -0,0 +1,53 @@
{ lib
, aiohttp
, bidict
, buildPythonPackage
, fetchFromGitHub
, humanize
, lxml
, pytestCheckHook
, pythonOlder
, requests
, slixmpp
, websockets
}:
buildPythonPackage rec {
pname = "gekitchen";
version = "0.2.19";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ajmarks";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eKGundh7j9LqFd71bx86rNBVu2iAcgLN25JfFa39+VA=";
};
propagatedBuildInputs = [
aiohttp
bidict
humanize
lxml
requests
slixmpp
websockets
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"gekitchen"
];
meta = with lib; {
description = "Python SDK for GE smart appliances";
homepage = "https://github.com/ajmarks/gekitchen";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/goodwe/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "goodwe";
version = "0.2.7";
version = "0.2.8";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "marcelblijleven";
repo = pname;
rev = "v${version}";
sha256 = "6/JAp7zK60+om4l14sLn+pUki0Q/5XwCJSawOf1q2q0=";
sha256 = "0ij87hyfv4c93nb4irpxax8p1i6swnm8b6ncs70s6z5sk7ipp663";
};
checkInputs = [

4
pkgs/development/python-modules/lightwave2/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "lightwave2";
version = "0.7.7";
version = "0.7.9";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-89REmMsZ79OsjhxAuxyTfRKy1+4cYDB9suiZLTXNntA=";
sha256 = "0cd36d7f7710afa7094fce422422196532d4fbccfa31bfcb642e1674a137900a";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/linkify-it-py/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "linkify-it-py";
version = "1.0.2";
version = "1.0.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "tsutsu3";
repo = pname;
rev = "v${version}";
hash = "sha256-i48B5qNufuhGp9a/46rWRgPawYkMA0ryRSyR+JhUmmw=";
hash = "sha256-1QqfqFdTEdZr02jQnmHmvw3fgnC/ktsfALyhtkGSXoY=";
};
propagatedBuildInputs = [ uc-micro-py ];

47
pkgs/development/python-modules/losant-rest/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, requests
, requests-mock
}:
buildPythonPackage rec {
pname = "losant-rest";
version = "1.15.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Losant";
repo = "losant-rest-python";
rev = "v${version}";
sha256 = "sha256-j8Vzr83pvl/AnXfA+nl5uRXf+y6ndKmQHM3bl306wFM=";
};
propagatedBuildInputs = [
requests
];
checkInputs = [
pytestCheckHook
requests-mock
];
pytestFlagsArray = [
"tests/losantrest_tests.py"
];
pythonImportsCheck = [
"losantrest"
];
meta = with lib; {
description = "Python module for consuming the Losant IoT Platform API";
homepage = "https://github.com/Losant/losant-rest-python";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/solax/default.nix
View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "solax";
version = "0.2.8";
version = "0.2.9";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-bOpDrbRbdsb4XgEksAQG4GE26XSTwGAECq9Fh//zoYc=";
sha256 = "e66db0c5d4ec840b047e574f0325ea01862d1f5563a844510541b35faa55f392";
};
nativeBuildInputs = [ setuptools-scm ];

6
pkgs/development/tools/kubie/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
version = "0.15.3";
version = "0.16.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
sha256 = "sha256-XkZbYQaQlRdsXo+4DTbLLYB59ya6DHimhZbdqfWXx1k=";
sha256 = "sha256-loVGMkB3p+xx7xRHdeSOcck+2vhV461VdNgUIpb/3O0=";
};
cargoSha256 = "sha256-xgqrQbd6tdTu4NkCWGv8UQe8m4wWlm3qJy/Slp7we68=";
cargoSha256 = "sha256-BLKcuumF72MPL408+fUS+7MiTYjvSRORKNP2s0I7McI=";
nativeBuildInputs = [ installShellFiles ];

46
pkgs/games/quantumminigolf/default.nix
View file

@ -1,40 +1,38 @@
{lib, stdenv, fetchurl, fftwSinglePrec, freetype, SDL, SDL_ttf}:
let
s = # Generated upstream information
rec {
baseName="quantumminigolf";
version="1.1.1";
name="${baseName}-${version}";
hash="16av7fk0irhi5nd7y9h9vhb0kf0dk12p6976ai3f60m99qdd8wk3";
url="mirror://sourceforge/project/quantumminigolf/quantumminigolf/1.1.1/quantumminigolf-1.1.1.src.tar.gz";
sha256="16av7fk0irhi5nd7y9h9vhb0kf0dk12p6976ai3f60m99qdd8wk3";
};
buildInputs = [
fftwSinglePrec freetype SDL SDL_ttf
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
{ lib, stdenv, fetchurl, fftwSinglePrec, freetype, SDL, SDL_ttf }:
stdenv.mkDerivation rec {
pname = "quantumminigolf";
version = "1.1.1";
src = fetchurl {
inherit (s) url sha256;
url = "mirror://sourceforge/project/quantumminigolf/quantumminigolf/${version}/quantumminigolf-${version}.src.tar.gz";
sha256 = "sha256-Y3LUGk6pAuNGVOYkc0WYDbgJFtwJJn+aLRHmCKY7W5k=";
};
buildInputs = [
fftwSinglePrec
freetype
SDL
SDL_ttf
];
preBuild = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL -I${SDL_ttf}/include/SDL"
sed -re 's@"(gfx|fonts|tracks)/@"'"$out"'/share/quantumminigolf/\1/@g' -i *.cpp
'';
installPhase = ''
mkdir -p "$out"/{share/doc,share/quantumminigolf,bin}
cp README THANKS LICENSE "$out/share/doc"
cp -r fonts gfx tracks "$out/share/quantumminigolf"
cp quantumminigolf "$out/bin"
'';
meta = {
inherit (s) version;
meta = with lib; {
description = "Quantum mechanics-based minigolf-like game";
license = lib.licenses.gpl2 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}

4
pkgs/games/quantumminigolf/default.upstream
View file

@ -1,4 +0,0 @@
url https://sourceforge.net/projects/quantumminigolf/files/quantumminigolf/
SF_version_dir
version_link '[.]tar[.][^.]+/download$'
SF_redirect

4
pkgs/misc/vscode-extensions/default.nix
View file

@ -617,8 +617,8 @@ let
mktplcRef = {
name = "prettier-vscode";
publisher = "esbenp";
version = "8.0.1";
sha256 = "017lqpmzjxq5f1zr49akcm9gfki0qq8v7pj7gks6a3szjdx16mnl";
version = "9.0.0";
sha256 = "1nak1hg46wxkl0kb0zhc343kq2f4nd5q1fqscb29jybd4qdb8lgn";
};
};

44
pkgs/os-specific/linux/conspy/default.nix
View file

@ -1,25 +1,21 @@
{lib, stdenv, fetchurl, autoconf, automake, ncurses}:
let
s = # Generated upstream information
rec {
baseName="conspy";
version="1.16";
name="${baseName}-${version}";
hash="02andak806vd04bgjlr0y0d2ddx7cazyf8nvca80vlh8x94gcppf";
url="mirror://sourceforge/project/conspy/conspy-1.16-1/conspy-1.16.tar.gz";
sha256="02andak806vd04bgjlr0y0d2ddx7cazyf8nvca80vlh8x94gcppf";
};
buildInputs = [
autoconf automake ncurses
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
{ lib, stdenv, fetchurl, autoconf, automake, ncurses }:
stdenv.mkDerivation rec {
pname = "conspy";
version = "1.16";
src = fetchurl {
inherit (s) url sha256;
url = "mirror://sourceforge/project/conspy/conspy-${version}-1/conspy-${version}.tar.gz";
sha256 = "02andak806vd04bgjlr0y0d2ddx7cazyf8nvca80vlh8x94gcppf";
curlOpts = " -A application/octet-stream ";
};
buildInputs = [
autoconf
automake
ncurses
];
preConfigure = ''
touch NEWS
echo "EPL 1.0" > COPYING
@ -27,11 +23,11 @@ stdenv.mkDerivation {
automake --add-missing
autoconf
'';
meta = {
inherit (s) version;
meta = with lib; {
description = "Linux text console viewer";
license = lib.licenses.epl10 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.epl10;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}

5
pkgs/os-specific/linux/conspy/default.upstream
View file

@ -1,5 +0,0 @@
url https://sourceforge.net/projects/conspy/files/
version_link 'conspy-[-0-9.]+/$'
version_link '[-0-9.]+[.]tar[.][a-z0-9]+/download$'
SF_redirect
version '.*-([-0-9.]+)[.]tar[.].*' '\1'

39
pkgs/os-specific/linux/forktty/default.nix
View file

@ -1,36 +1,29 @@
{lib, stdenv, fetchurl}:
let
s = # Generated upstream information
rec {
baseName="forktty";
version="1.3";
name="${baseName}-${version}";
hash="0nd55zdqly6nl98k9lc7j751x86cw9hayx1qn0725f22r1x3j5zb";
url="http://sunsite.unc.edu/pub/linux/utils/terminal/forktty-1.3.tgz";
sha256="0nd55zdqly6nl98k9lc7j751x86cw9hayx1qn0725f22r1x3j5zb";
};
buildInputs = [
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "forktty";
version = "1.3";
src = fetchurl {
inherit (s) url sha256;
url = "http://sunsite.unc.edu/pub/linux/utils/terminal/forktty-${version}.tgz";
sha256 = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk=";
};
preBuild = ''
sed -e s@/usr/bin/ginstall@install@g -i Makefile
'';
preInstall = ''
mkdir -p "$out/bin"
mkdir -p "$out/share/man/man8"
'';
makeFlags = [ "prefix=$(out)" "manprefix=$(out)/share/" ];
meta = {
inherit (s) version;
meta = with lib; {
description = "Tool to detach from controlling TTY and attach to another";
license = lib.licenses.gpl2 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}

2
pkgs/os-specific/linux/forktty/default.upstream
View file

@ -1,2 +0,0 @@
url http://sunsite.unc.edu/pub/linux/utils/terminal/
version_link 'forktty.*tgz'

6
pkgs/tools/archivers/zpaq/default.upstream
View file

@ -1,6 +0,0 @@
url http://mattmahoney.net/dc/zpaq.html
version_link 'zpaq[0-9]+[.]zip'
version "[^0-9]*([0-9]+)[^0-9]*" '\1'
name zpaq
attribute_name zpaq
minimize_overwrite

20
pkgs/tools/archivers/zpaq/zpaqd.nix
View file

@ -1,25 +1,17 @@
{ lib, stdenv, fetchurl, unzip }:
let
# Generated upstream information
s = rec {
baseName="zpaqd";
version="715";
name="${baseName}-${version}";
hash="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk";
url="http://mattmahoney.net/dc/zpaqd715.zip";
sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk";
};
compileFlags = lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ]
++ lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread"
++ lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT");
in
stdenv.mkDerivation {
inherit (s) name version;
stdenv.mkDerivation rec {
pname = "zpaqd";
version = "715";
src = fetchurl {
inherit (s) url sha256;
url = "http://mattmahoney.net/dc/zpaqd${version}.zip";
sha256 = "sha256-Mx87Zt0AASk0ZZCjyTzYbhlYJAXBlb59OpUWsqynyCA=";
};
sourceRoot = ".";
@ -41,7 +33,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "ZPAQ archive (de)compressor and algorithm development tool";
license = licenses.gpl3Plus ;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};

5
pkgs/tools/archivers/zpaq/zpaqd.upstream
View file

@ -1,5 +0,0 @@
url http://mattmahoney.net/dc/zpaqutil.html
version_link 'zpaqd[0-9]+[.]zip'
version "[^0-9]*([0-9]+)[^0-9]*" '\1'
name zpaqd
attribute_name zpaqd

4
pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "ibus-libpinyin";
version = "1.12.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "libpinyin";
repo = "ibus-libpinyin";
rev = version;
sha256 = "sha256-fEEiwRoGGFAki1DMQvGuzjz2NAjhExyH11l8KTwjjsI=";
sha256 = "sha256-tSbH4twU+paCZdmzVQMSSg3AzBNkK4nnmOfbvUzvZTk=";
};
nativeBuildInputs = [

15
pkgs/tools/misc/sfeed/default.nix
View file

@ -1,19 +1,26 @@
{ stdenv, lib, fetchgit }:
{ stdenv, lib, fetchgit, ncurses }:
stdenv.mkDerivation rec {
pname = "sfeed";
version = "1.0";
version = "1.1";
src = fetchgit {
url = "git://git.codemadness.org/sfeed";
rev = version;
sha256 = "sha256-pLKWq4KIiT6X37EUIOw5SBb1KWopnFcDO+iE++Uie5s=";
sha256 = "sha256-0z9PHni/ni4p4nfeStrZmFFHHtyqT8GYJWVWr5IzFKw=";
};
makeFlags = [ "RANLIB:=$(RANLIB)" ];
buildInputs = [ ncurses ];
makeFlags = [ "RANLIB:=$(RANLIB)" "SFEED_CURSES_LDFLAGS:=-lncurses" ]
# use macOS's strlcat() and strlcpy() instead of vendored ones
++ lib.optional stdenv.isDarwin "COMPATOBJ:=";
installFlags = [ "PREFIX=$(out)" ];
# otherwise does not find SIGWINCH
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
meta = with lib; {
homepage = "https://codemadness.org/sfeed-simple-feed-parser.html";
description = "A RSS and Atom parser (and some format programs)";

42
pkgs/tools/networking/badvpn/default.nix
View file

@ -1,39 +1,29 @@
{lib, stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}:
let
s = # Generated upstream information
rec {
baseName="badvpn";
version="1.999.130";
name="${baseName}-${version}";
hash="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z";
url="https://github.com/ambrop72/badvpn/archive/1.999.130.tar.gz";
sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z";
{ lib, stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false }:
stdenv.mkDerivation rec {
pname = "badvpn";
version = "1.999.130";
src = fetchurl {
url = "https://github.com/ambrop72/badvpn/archive/${version}.tar.gz";
sha256 = "sha256-v9S7/r1ydLzseSVYyaL9YOOc2S4EZzglreXQQVR2YQk=";
};
compileFlags = "-O3 ${lib.optionalString (!debug) "-DNDEBUG"}";
in
stdenv.mkDerivation {
inherit (s) name version;
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
openssl nss nspr
openssl
nss
nspr
];
src = fetchurl {
inherit (s) url sha256;
};
preConfigure = ''
find . -name '*.sh' -exec sed -e 's@#!/bin/sh@${stdenv.shell}@' -i '{}' ';'
find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
cmakeFlagsArray=("-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=${compileFlags}");
cmakeFlagsArray=("-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=-O3 ${lib.optionalString (!debug) "-DNDEBUG"}");
'';
meta = {
inherit (s) version;
meta = with lib; {
description = "A set of network-related (mostly VPN-related) tools";
license = lib.licenses.bsd3 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.bsd3;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}

3
pkgs/tools/networking/badvpn/default.upstream
View file

@ -1,3 +0,0 @@
url https://github.com/ambrop72/badvpn/releases
version_link '[0-9][.]tar[.][a-z0-9]+$'
version '.*/([0-9.]+)[.]tar[.].*' '\1'

34
pkgs/tools/networking/godspeed/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ lib
, buildGoModule
, fetchFromGitHub
, libpcap
}:
buildGoModule rec {
pname = "godspeed";
version = "unstable-2021-08-27";
src = fetchFromGitHub {
owner = "redcode-labs";
repo = "GodSpeed";
rev = "c02b184ab0fd304d1bd8cbe1566a3d3de727975e";
sha256 = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI=";
};
vendorSha256 = "sha256-MCr1ShhkxM9CeSmqqtgAW0qv0QaIPRSOzASj8gt2ZAg=";
buildInputs = [
libpcap
];
postFixup = ''
mv $out/bin/GodSpeed $out/bin/${pname}
'';
meta = with lib; {
description = "Manager for reverse shells";
homepage = "https://github.com/redcode-labs/GodSpeed";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members;
};
}

6
pkgs/tools/networking/hurl/default.nix
View file

@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "hurl";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "Orange-OpenSource";
repo = pname;
rev = version;
sha256 = "sha256-oa9J51Y6Q0nPxA9SdsEZy7F6EopS5xuh1yWyTD21mGI=";
sha256 = "sha256-avgi3Y5PRI/RZLYw10ifYV6eKKEBi349NYtYs07GS2k=";
};
nativeBuildInputs = [
@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
# Tests require network access to a test server
doCheck = false;
cargoSha256 = "sha256-CwChbp6Un9tgJu1vtfhcFclpbvGANLLEX3lwtTQPuSg=";
cargoSha256 = "sha256-GB+MnvWkXcdlJvaxtSItm3nGRyr8zWhxSq58smPk/aY=";
postInstall = ''
python ci/gen_manpage.py docs/hurl.md > hurl.1

36
pkgs/tools/networking/mailsend/default.nix
View file

@ -1,24 +1,17 @@
{lib, stdenv, fetchurl, openssl}:
let
s = # Generated upstream information
rec {
baseName="mailsend";
version="1.19";
name="${baseName}-${version}";
hash="1xwk6jvl5li8ddlik1lj88qswnyminp9wlf5cm8gg3n54szgcpjn";
url="https://github.com/muquit/mailsend/archive/1.19.tar.gz";
sha256="1xwk6jvl5li8ddlik1lj88qswnyminp9wlf5cm8gg3n54szgcpjn";
{ lib, stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
pname = "mailsend";
version = "1.19";
src = fetchurl {
url = "https://github.com/muquit/mailsend/archive/${version}.tar.gz";
sha256 = "sha256-Vl72vibFjvdQZcVRnq6N1VuuMUKShhlpayjSQrc0k/c=";
};
buildInputs = [
openssl
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
configureFlags = [
"--with-openssl=${openssl.dev}"
];
@ -29,12 +22,11 @@ stdenv.mkDerivation {
sha256 = "0vz373zcfl19inflybfjwshcq06rvhx0i5g0f4b021cxfhyb1sm0";
})
];
meta = {
inherit (s) version;
meta = with lib; {
description = "CLI email sending tool";
license = lib.licenses.bsd3 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.bsd3;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
homepage = "https://github.com/muquit/mailsend";
downloadPage = "https://github.com/muquit/mailsend/releases";
};

3
pkgs/tools/networking/mailsend/default.upstream
View file

@ -1,3 +0,0 @@
url "https://github.com/muquit/mailsend/releases"
ensure_choice
version '.*/([0-9][0-9.a-z]*)[.]tar[.].*' '\1'

29
pkgs/tools/networking/mqttui/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "mqttui";
version = "0.13.0";
src = fetchFromGitHub {
owner = "EdJoPaTo";
repo = pname;
rev = "v${version}";
sha256 = "sha256-taGpVLO9K5VmthWadstQcujcLHTb3fhEWDxKGd3Pj+E=";
};
cargoSha256 = "sha256-aAMDl8GZ+XqA4uBiDm2eHQsNFiqCrMBO66X0ruEjpJg=";
buildInputs = lib.optional stdenv.isDarwin Security;
meta = with lib; {
description = "Terminal client for MQTT";
homepage = "https://github.com/EdJoPaTo/mqttui";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

15
pkgs/tools/security/gitleaks/default.nix
View file

@ -5,26 +5,31 @@
buildGoModule rec {
pname = "gitleaks";
version = "7.6.1";
version = "8.2.3";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-52Wi3bQvKdHoJ1nVb4OVJ9wd8hDVF+6zlVSpsEai0Jw=";
sha256 = "sha256-COYVgn7fhmU0ZUhlnqxQ/5rf5aVhkcWeG199DFcE/w4=";
};
vendorSha256 = "sha256-86PspExE+T/IuCvpf6LAkWcCRlHPqP5VUbHAckEzALc=";
vendorSha256 = "sha256-cIwte59AdVOWMBUWE4gKZSHhU37HgEW4k0v+jUUyj1Q=";
ldflags = [
"-s" "-w" "-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}"
"-s"
"-w"
"-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}"
];
# With v8 the config tests are are blocking
doCheck = false;
meta = with lib; {
description = "Scan git repos (or files) for secrets";
longDescription = ''
Gitleaks is a SAST tool for detecting hardcoded secrets like passwords,
API keys, and tokens in git repos.
API keys and tokens in git repos.
'';
homepage = "https://github.com/zricethezav/gitleaks";
license = with licenses; [ mit ];

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

@ -999,6 +999,8 @@ with pkgs;
godns = callPackage ../tools/networking/godns { };
godspeed = callPackage ../tools/networking/godspeed { };
ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };
linux-router = callPackage ../tools/networking/linux-router { };
@ -13566,6 +13568,13 @@ with pkgs;
phpExtensions = php.extensions;
phpPackages = php.packages;
# Import PHP81 interpreter, extensions and packages
php81 = callPackage ../development/interpreters/php/8.1.nix {
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
};
php81Extensions = recurseIntoAttrs php81.extensions;
php81Packages = recurseIntoAttrs php81.packages;
# Import PHP80 interpreter, extensions and packages
php80 = callPackage ../development/interpreters/php/8.0.nix {
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
@ -18844,6 +18853,10 @@ with pkgs;
mqtt-bench = callPackage ../applications/misc/mqtt-bench {};
mqttui = callPackage ../tools/networking/mqttui {
inherit (darwin.apple_sdk.frameworks) Security;
};
msgpack = callPackage ../development/libraries/msgpack { };
msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool;

6
pkgs/top-level/php-packages.nix
View file

@ -547,7 +547,11 @@ lib.makeScope pkgs.newScope (self: with self; {
{ name = "sysvsem"; }
{ name = "sysvshm"; }
{ name = "tidy"; configureFlags = [ "--with-tidy=${html-tidy}" ]; doCheck = false; }
{ name = "tokenizer"; }
{
name = "tokenizer";
patches = lib.optional (lib.versionAtLeast php.version "8.1")
../development/interpreters/php/fix-tokenizer-php81.patch;
}
{
name = "wddx";
buildInputs = [ libxml2 ];

8
pkgs/top-level/python-packages.nix
View file

@ -758,6 +758,8 @@ in {
automat = callPackage ../development/python-modules/automat { };
automate-home = callPackage ../development/python-modules/automate-home { };
autopage = callPackage ../development/python-modules/autopage { };
autopep8 = callPackage ../development/python-modules/autopep8 { };
@ -3089,6 +3091,10 @@ in {
geeknote = callPackage ../development/python-modules/geeknote { };
gehomesdk = callPackage ../development/python-modules/gehomesdk { };
gekitchen = callPackage ../development/python-modules/gekitchen { };
gemfileparser = callPackage ../development/python-modules/gemfileparser { };
genanki = callPackage ../development/python-modules/genanki { };
@ -4648,6 +4654,8 @@ in {
loo-py = callPackage ../development/python-modules/loo-py { };
losant-rest = callPackage ../development/python-modules/losant-rest { };
lsassy = callPackage ../development/python-modules/lsassy { };
luddite = callPackage ../development/python-modules/luddite { };