Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
5a70f6da92
47 changed files with 346 additions and 207 deletions
|
|
@ -164,6 +164,7 @@ elsif (defined $expr) {
|
|||
my $algo = $fetch->{type};
|
||||
my $hash = $fetch->{hash};
|
||||
my $name = $fetch->{name};
|
||||
my $isPatch = $fetch->{isPatch};
|
||||
|
||||
if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) {
|
||||
$algo = $1;
|
||||
|
|
@ -189,6 +190,11 @@ elsif (defined $expr) {
|
|||
next;
|
||||
}
|
||||
|
||||
if ($isPatch) {
|
||||
print STDERR "skipping $url (support for patches is missing)\n";
|
||||
next;
|
||||
}
|
||||
|
||||
next if defined $exclude && $url =~ /$exclude/;
|
||||
|
||||
if (alreadyMirrored($algo, $hash)) {
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@ let
|
|||
operator = const [ ];
|
||||
});
|
||||
|
||||
urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies;
|
||||
urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; isPatch = (drv?postFetch && drv.postFetch != ""); type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies;
|
||||
|
||||
fetchurlDependencies =
|
||||
filter
|
||||
(drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat"
|
||||
&& drv.postFetch or "" == "" && (drv ? url || drv ? urls))
|
||||
&& (drv ? url || drv ? urls))
|
||||
dependencies;
|
||||
|
||||
dependencies = map (x: x.value) (genericClosure {
|
||||
|
|
|
|||
|
|
@ -172,6 +172,7 @@ in {
|
|||
documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };
|
||||
doh-proxy-rust = handleTest ./doh-proxy-rust.nix {};
|
||||
dokuwiki = handleTest ./dokuwiki.nix {};
|
||||
dolibarr = handleTest ./dolibarr.nix {};
|
||||
domination = handleTest ./domination.nix {};
|
||||
dovecot = handleTest ./dovecot.nix {};
|
||||
drbd = handleTest ./drbd.nix {};
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ in
|
|||
|
||||
client1 =
|
||||
{ pkgs, nodes, ... }:
|
||||
{ environment.systemPackages = [ pkgs.miniupnpc_2 pkgs.netcat ];
|
||||
{ environment.systemPackages = [ pkgs.miniupnpc pkgs.netcat ];
|
||||
virtualisation.vlans = [ 2 ];
|
||||
networking.defaultGateway = internalRouterAddress;
|
||||
networking.interfaces.eth1.ipv4.addresses = [
|
||||
|
|
@ -65,7 +65,7 @@ in
|
|||
|
||||
client2 =
|
||||
{ pkgs, ... }:
|
||||
{ environment.systemPackages = [ pkgs.miniupnpc_2 ];
|
||||
{ environment.systemPackages = [ pkgs.miniupnpc ];
|
||||
virtualisation.vlans = [ 1 ];
|
||||
networking.interfaces.eth1.ipv4.addresses = [
|
||||
{ address = externalClient2Address; prefixLength = 24; }
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, wrapQtAppsHook ? null
|
||||
, boost
|
||||
, libevent
|
||||
, miniupnpc_2
|
||||
, miniupnpc
|
||||
, zeromq
|
||||
, zlib
|
||||
, db53
|
||||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
|
||||
++ lib.optionals withGui [ wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ boost libevent miniupnpc_2 zeromq zlib ]
|
||||
buildInputs = [ boost libevent miniupnpc zeromq zlib ]
|
||||
++ lib.optionals withWallet [ db53 sqlite ]
|
||||
++ lib.optionals withGui [ qrencode qtbase qttools ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lnd";
|
||||
version = "0.15.2-beta";
|
||||
version = "0.15.4-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightningnetwork";
|
||||
repo = "lnd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C7BZ6awY2v5Uvvh12YEosoEQyJoetWzH/1wIQSVjtEk=";
|
||||
sha256 = "sha256-/PKW2Y6+PlWk88pC4DHFi1ZRqMfQzoO9MVLYZrB2UNc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rCdcPkgrFcDfLfF8wipFws7YTKEgotuVqVIJYLMOxbs=";
|
||||
vendorSha256 = "sha256-bUo0PhtOFhsZfhAXtRJMjfaLrAsOv3ksxsrPOlMNv48=";
|
||||
|
||||
subPackages = [ "cmd/lncli" "cmd/lnd" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitea, cmake, boost, miniupnpc_2, openssl, unbound
|
||||
{ lib, stdenv, fetchFromGitea, cmake, boost, miniupnpc, openssl, unbound
|
||||
, readline, libsodium, rapidjson
|
||||
}:
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc_2 openssl unbound rapidjson readline libsodium
|
||||
boost miniupnpc openssl unbound rapidjson readline libsodium
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, cmake
|
||||
, copyDesktopItems
|
||||
, ffmpeg
|
||||
, imagemagick
|
||||
, libedit
|
||||
|
|
@ -11,7 +10,6 @@
|
|||
, libepoxy
|
||||
, libzip
|
||||
, lua
|
||||
, makeDesktopItem
|
||||
, minizip
|
||||
, pkg-config
|
||||
, qtbase
|
||||
|
|
@ -33,7 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
|
@ -53,19 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
qttools
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "mgba";
|
||||
exec = "mgba-qt";
|
||||
icon = "mgba";
|
||||
comment = "A Game Boy Advance Emulator";
|
||||
desktopName = "mgba";
|
||||
genericName = "Game Boy Advance Emulator";
|
||||
categories = [ "Game" "Emulator" ];
|
||||
startupNotify = false;
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mgba.io";
|
||||
description = "A modern GBA emulator with a focus on accuracy";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, miniupnpc_2
|
||||
, miniupnpc
|
||||
, ffmpeg
|
||||
, enableSwftools ? false
|
||||
, swftools
|
||||
|
|
@ -108,7 +108,7 @@ python3Packages.buildPythonPackage rec {
|
|||
dontWrapQtApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg miniupnpc_2 ]})
|
||||
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg miniupnpc ]})
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vengi-tools";
|
||||
version = "0.0.21";
|
||||
version = "0.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgerhardy";
|
||||
repo = "vengi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-T9YBU/YhhOASdKnzLcwQGBLc4HcQspiOV9VRgotfq3c=";
|
||||
sha256 = "sha256-OlOnr1Spy8kdie9CyLVOQkY1+ib6Uwcd/xP5TSaZkYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fava";
|
||||
version = "1.23";
|
||||
version = "1.23.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-dwJKSQiuggnseEbALSrT051Me/z1jpj/BjuxN0v5dpU=";
|
||||
sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
|
||||
|
|
|
|||
35
pkgs/data/fonts/crimson-pro/default.nix
Normal file
35
pkgs/data/fonts/crimson-pro/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "crimson-pro";
|
||||
version = "unstable-2022-08-30";
|
||||
|
||||
outputs = [ "out" "woff2" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fonthausen";
|
||||
repo = "CrimsonPro";
|
||||
rev = "24e8f7bf59ec45d77c67879ad80d97e5f94c787b";
|
||||
hash = "sha256-3zFB1AMcC7eNEVA2Mx1OE8rLN9zPzexZ3FtER9wH5ss=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf
|
||||
install -m444 -Dt $out/share/fonts/opentype fonts/otf/*.otf
|
||||
install -m444 -Dt $woff2/share/fonts/woff2 fonts/webfonts/*.woff2
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Fonthausen/CrimsonPro";
|
||||
description = "A professionally produced redesign of Crimson by Jacques Le Bailly";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ncfavier ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "papirus-icon-theme";
|
||||
version = "20220910";
|
||||
version = "20221101";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ohZe7TCvbQcJmUyFY7DN6BgfAAqW1HhXi1UXXPh0t4Q=";
|
||||
sha256 = "sha256-MSH7yd5fizBtmkTNG3gMFxNpjVDKWsHM8wogPhBMkk8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 papirus-folders ];
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = lib.optionalString (!buildDocs) ''
|
||||
substituteInPlace Makefile --replace "all: binaries docs" "all: binaries"
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
substituteInPlace sysdefs.h --replace "x86_64" "aarch64"
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -1,22 +1,25 @@
|
|||
diff --git a/Configure b/Configure
|
||||
index f0ad787bc4..a48d2008c6 100755
|
||||
index a558e5ab1a..9a884f0b0f 100755
|
||||
--- a/Configure
|
||||
+++ b/Configure
|
||||
@@ -1688,17 +1688,6 @@ unless ($disabled{devcryptoeng}) {
|
||||
@@ -1714,20 +1714,6 @@ unless ($disabled{devcryptoeng}) {
|
||||
|
||||
unless ($disabled{ktls}) {
|
||||
$config{ktls}="";
|
||||
if ($target =~ m/^linux/) {
|
||||
- my $usr = "/usr/$config{cross_compile_prefix}";
|
||||
- chop($usr);
|
||||
- if ($config{cross_compile_prefix} eq "") {
|
||||
- $usr = "/usr";
|
||||
- }
|
||||
- my $minver = (4 << 16) + (13 << 8) + 0;
|
||||
- my @verstr = split(" ",`cat $usr/include/linux/version.h | grep LINUX_VERSION_CODE`);
|
||||
-
|
||||
- if ($verstr[2] < $minver) {
|
||||
- my $cc = $config{CROSS_COMPILE}.$config{CC};
|
||||
- if ($target =~ m/^linux/) {
|
||||
- system("printf '#include <sys/types.h>\n#include <linux/tls.h>' | $cc -E - >/dev/null 2>&1");
|
||||
- if ($? != 0) {
|
||||
- disable('too-old-kernel', 'ktls');
|
||||
- }
|
||||
} elsif ($target =~ m/^BSD/) {
|
||||
my $cc = $config{CROSS_COMPILE}.$config{CC};
|
||||
system("printf '#include <sys/types.h>\n#include <sys/ktls.h>' | $cc -E - >/dev/null 2>&1");
|
||||
- } elsif ($target =~ m/^BSD/) {
|
||||
- system("printf '#include <sys/types.h>\n#include <sys/ktls.h>' | $cc -E - >/dev/null 2>&1");
|
||||
- if ($? != 0) {
|
||||
- disable('too-old-freebsd', 'ktls');
|
||||
- }
|
||||
- } else {
|
||||
- disable('not-linux-or-freebsd', 'ktls');
|
||||
- }
|
||||
}
|
||||
|
||||
push @{$config{openssl_other_defines}}, "OPENSSL_NO_KTLS" if ($disabled{ktls});
|
||||
|
|
|
|||
|
|
@ -228,8 +228,8 @@ in {
|
|||
};
|
||||
|
||||
openssl_3 = common {
|
||||
version = "3.0.5";
|
||||
sha256 = "sha256-qn2Nm+9xrWUlxVuhHl9Dl4ic5Jwsk0nc6m0+TwsCSno=";
|
||||
version = "3.0.7";
|
||||
sha256 = "sha256-gwSdBComDmlvYkBqxcCL9wb9hDg/lFzyG9YentlcOW4=";
|
||||
patches = [
|
||||
./3.0/nix-ssl-cert-file.patch
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wJYGo87K9Ae2HoN/ZR3S0EiX2v68vs+Vb75nA+Csass=";
|
||||
hash = "sha256-b/bA1ClBdj25aPoniszqRtNih+qzJuLMiGkNoV1cv7c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
65
pkgs/development/python-modules/demetriek/default.nix
Normal file
65
pkgs/development/python-modules/demetriek/default.nix
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, awesomeversion
|
||||
, backoff
|
||||
, buildPythonPackage
|
||||
, pydantic
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, yarl
|
||||
, aresponses
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "demetriek";
|
||||
version = "0.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-demetriek";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-LCHHBcZgO9gw5jyaJiiS4lKyb0ut+PJvKTylIvIKHhc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Upstream doesn't set a version for the pyproject.toml
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "0.0.0" "${version}" \
|
||||
--replace "--cov" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
awesomeversion
|
||||
backoff
|
||||
pydantic
|
||||
yarl
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"demetriek"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for LaMetric TIME devices";
|
||||
homepage = "https://github.com/frenck/python-demetriek";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
24
pkgs/development/python-modules/gym-notices/default.nix
Normal file
24
pkgs/development/python-modules/gym-notices/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gym-notices";
|
||||
version = "0.0.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rSXiAEh8r6NpcoYl/gZOiK2hNGYYUmECZZtGQPK0uRE=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "gym_notices" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Notices for Python package Gym";
|
||||
homepage = "https://github.com/Farama-Foundation/gym-notices";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ billhuang ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -3,23 +3,27 @@
|
|||
, fetchFromGitHub
|
||||
, numpy
|
||||
, cloudpickle
|
||||
, gym-notices
|
||||
, importlib-metadata
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gym";
|
||||
version = "0.21.0";
|
||||
version = "0.26.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12b545xz0r2g4z5r7f8amxl7nm0lqymkzwcwhg1bni9h0sxwpv6c";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-uJgm8l1SxIRC5PV6BIH/ht/1ucGT5UaUhkFMdusejgA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cloudpickle
|
||||
numpy
|
||||
];
|
||||
gym-notices
|
||||
] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
|
||||
|
||||
# The test needs MuJoCo that is not free library.
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "1.3.44";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3OINNcdyZyhofGJDvAVyDLv/ylomM6LP4cEBkmeYwn4=";
|
||||
hash = "sha256-2m63OSVyhZgptBln+b65zX3609Liwq5V2a78UQThHyE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "readme-renderer";
|
||||
version = "37.2";
|
||||
version = "37.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "readme_renderer";
|
||||
inherit version;
|
||||
sha256 = "sha256-6K0lKTyY94HbwsWjajCZKTkACfkC+Z4XmMdhqvBKeSM=";
|
||||
sha256 = "sha256-zWUxht/HMFVlbwkPIn9csioEbX9xqEHfowX1XJpRMnM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pytz";
|
||||
version = "2022.5.0.0";
|
||||
version = "2022.6.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-DBY7FdPlmObMcHSpnKnscrJdwbRGrMEzuCdmevC3sJo=";
|
||||
sha256 = "sha256-0HgZY3TRJ36fmYTUk3PqBDzyxk1dXEkfvIbCWFV71G8=";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "danmar";
|
||||
repo = "cppcheck";
|
||||
rev = version;
|
||||
sha256 = "sha256-8vwuNK7qQg+pkUnWpEe8272BuHJUaidm8MoGsXVt1X8=";
|
||||
hash = "sha256-bKZOAGInks26NmzlKo1T8NREO9xoF8ZsssNDzyTJwlU=";
|
||||
};
|
||||
|
||||
buildInputs = [ pcre
|
||||
|
|
|
|||
31
pkgs/development/tools/bomber-go/default.nix
Normal file
31
pkgs/development/tools/bomber-go/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bomber-go";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devops-kung-fu";
|
||||
repo = "bomber";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-q30wTM8HQURDBUReQsXgKHI4m4sSdHbWPwUld0sAays=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tkjwnc5EquAuIfYKy8u6ZDFJPl/UTW6x7vvY1QTsBXg=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to scans Software Bill of Materials (SBOMs) for vulnerabilities";
|
||||
homepage = "https://github.com/devops-kung-fu/bomber";
|
||||
license = licenses.mpl20;
|
||||
mainProgram = "bomber";
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
sha256 = "sha256-vWSDnIzWPy3sMdbqJODeFsYTyEqSeh9FiuQBmyujENc=";
|
||||
sha256 = "sha256-J4bDI5bLiH9Gz8OlU5eHJRPsdahJ6uqfTwFGkoycsGA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopls";
|
||||
version = "0.9.5";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "tools";
|
||||
rev = "gopls/v${version}";
|
||||
sha256 = "sha256-kDO7Sxz2pqZZBG2eGAWyh9UTAoYLzkAn86qh9LdepoU=";
|
||||
sha256 = "sha256-bSy5aoIrYjMG6hlkDf4vyR6r2XpjKAOX0C6MitYeg8k=";
|
||||
};
|
||||
|
||||
modRoot = "gopls";
|
||||
vendorSha256 = "sha256-ny+gD3ZXp6ZncWJtpW9fprYojQBkIUL+FEKp/7K5rrU=";
|
||||
vendorSha256 = "sha256-UwHZRSH2amS1um9hi/MRs3nQiCXCl52+S7+hqc/Orqc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
31
pkgs/development/tools/legitify/default.nix
Normal file
31
pkgs/development/tools/legitify/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "legitify";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Legit-Labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Sr6P5S5+DqbP0ihCj97l84739/NRAlYJLnXp4B5gHNE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EJMXzWrOXFl7JFYBp/XAcHLcNyWCKbOBAyo/Yf2mh5s=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
"-X github.com/Legit-Labs/legitify/internal/version.Version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets";
|
||||
homepage = "https://github.com/Legit-Labs/legitify";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.32";
|
||||
version = "0.2.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fHGS05qlRSVTrjEx71hhVridbpbLVyaAOg3uMYIj0TU=";
|
||||
sha256 = "sha256-FNOZA4sb0IlKkLiE+uPOE5KJXlU7XbtHlmPJUMJbGNE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ctIKaThBIzaBw3/a0pat+G7Zb4Y2F7mk8VZWoM0XdyI=";
|
||||
vendorSha256 = "sha256-9ziHGZWHeYk0sxOxIFCnrLd1iqT9orgwE7eixvSMhlc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "yq-go";
|
||||
version = "4.29.1";
|
||||
version = "4.29.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aZMlWC6qtN2TvND18QO8Q3UicSNa9cZT/xPmia3V6FM=";
|
||||
sha256 = "sha256-ZHl0FTxWdoxHrbWx6mp5qR/l/FtC3bBkzGuR0T2NouA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s=";
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prismlauncher";
|
||||
version = "5.0";
|
||||
version = "5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrismLauncher";
|
||||
repo = "PrismLauncher";
|
||||
rev = version;
|
||||
sha256 = "sha256-oN+DpJ08N/ar5wLAahgpBV9DeHtMTwSrE7uOwT3A+Yo=";
|
||||
sha256 = "sha256-CZH2vINHoQy1hVfKloRrcoCDdXPQRnIylpClQJdOUrk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ghc_filesystem cmake file jdk wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "4.2.13";
|
||||
version = "4.2.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
sha256 = "sha256-xYYuToo+19qaVyWFKrgjsqVs78rHdX/hyZ/nXYlPFMU=";
|
||||
sha256 = "sha256-AViMFK3MwDbd+N1ycqcMAzzCVudnU/kZWcsqr5Wx31k=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -551,7 +551,7 @@ let
|
|||
CGROUP_RDMA = whenAtLeast "4.11" yes;
|
||||
|
||||
MEMCG = yes;
|
||||
MEMCG_SWAP = yes;
|
||||
MEMCG_SWAP = whenOlder "6.1" yes;
|
||||
|
||||
BLK_DEV_THROTTLING = yes;
|
||||
CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.0-rc5";
|
||||
version = "6.1-rc3";
|
||||
extraMeta.branch = lib.versions.majorMinor version;
|
||||
|
||||
# modDirVersion needs to be x.y.z, will always add .0
|
||||
|
|
@ -11,7 +11,7 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
hash = "sha256-GELU1ZEOM5gGUJxG54JoiI9qLQXJ2Cd/kyOLcp0AWgc=";
|
||||
hash = "sha256-qz863wvIe/JJjqSYoxxbt+2xTqgNNZJpAfWr8nG8wKk=";
|
||||
};
|
||||
|
||||
# Should the testing kernels ever be built on Hydra?
|
||||
|
|
|
|||
|
|
@ -1606,7 +1606,8 @@
|
|||
]; # missing inputs: lacrosse-view
|
||||
"lametric" = ps: with ps; [
|
||||
aiohttp-cors
|
||||
]; # missing inputs: demetriek
|
||||
demetriek
|
||||
];
|
||||
"landisgyr_heat_meter" = ps: with ps; [
|
||||
ultraheat-api
|
||||
];
|
||||
|
|
@ -3918,6 +3919,7 @@
|
|||
"konnected"
|
||||
"kraken"
|
||||
"kulersky"
|
||||
"lametric"
|
||||
"landisgyr_heat_meter"
|
||||
"lastfm"
|
||||
"launch_library"
|
||||
|
|
|
|||
|
|
@ -8,18 +8,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "libreddit";
|
||||
version = "0.22.9";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spikecodes";
|
||||
owner = "libreddit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xsWV3DWAFekWliFRdea2J+Mygl/58d92qTXJ7/4YVEg=";
|
||||
hash = "sha256-qO9AgEAm+wK8LAlUOYIKYTXJYT3yz65UWAFTf711+5w=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-eLfKfl7CYH2V9WJksLps6uAckQEPB5dFKBY2B6CMa/8=";
|
||||
cargoSha256 = "sha256-ApZLYKavYt1Zp7qvdbhBXPBj7qv/D/oZp5lK2sfWnDI=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
buildInputs = lib.optional stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) libreddit;
|
||||
|
|
@ -27,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Private front-end for Reddit";
|
||||
homepage = "https://github.com/spikecodes/libreddit";
|
||||
homepage = "https://github.com/libreddit/libreddit";
|
||||
license = with licenses; [ agpl3Only ];
|
||||
maintainers = with maintainers; [ fab jojosch ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolibarr";
|
||||
version = "16.0.0";
|
||||
version = "16.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dolibarr";
|
||||
repo = "dolibarr";
|
||||
rev = version;
|
||||
sha256 = "sha256-6BS1UHcfxiG1AXJSagxydtl5TU7tyZt21Q3geNmwkYY=";
|
||||
sha256 = "sha256-67Ox0DP4vfiz8GgD3nfa4FyB6Qrqkc2zt1iMS584CWs=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "apfsprogs";
|
||||
version = "unstable-2022-07-21";
|
||||
version = "unstable-2022-10-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-apfs";
|
||||
repo = "apfsprogs";
|
||||
rev = "8c5340bcc0a261ffe6e5ed85a1742fb60ee982f3";
|
||||
sha256 = "sha256-cDxXWfXl1VxdpKBcU00ULWlidzg6kQFG4AGEu5DBCaw=";
|
||||
rev = "e3d5eec21da31107457f868f7f37c48c6809b7fa";
|
||||
hash = "sha256-gxcsWLIs2+28SOLLeAP7iP6MaLE445CKTlD+gVE6V5g=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,27 +1,22 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
, aiohttp
|
||||
, aiofiles
|
||||
, biliass
|
||||
, dicttoxml
|
||||
, colorama
|
||||
, python3
|
||||
, ffmpeg
|
||||
, makeWrapper
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "yutto";
|
||||
version = "2.0.0b15";
|
||||
version = "2.0.0b16";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TOFApMwY2WRYg2H2N0PIjylYFKnTHdszdU+AFgLYYwc=";
|
||||
hash = "sha256-aGmayZGXmEyVuUKDKrgcYuPKsib/c5ou5CZ+Sag6Evk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,6 +37,10 @@ buildPythonApplication rec {
|
|||
|
||||
pythonImportsCheck = [ "yutto" ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Bilibili downloader";
|
||||
homepage = "https://github.com/yutto-dev/yutto";
|
||||
|
|
|
|||
|
|
@ -1,41 +1,35 @@
|
|||
{ lib, stdenv, fetchurl, which, cctools }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, which
|
||||
, cctools
|
||||
}:
|
||||
|
||||
let
|
||||
generic = { version, sha256 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "miniupnpc";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "miniupnpc";
|
||||
version = "2.2.4";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ];
|
||||
|
||||
patches = lib.optional stdenv.isFreeBSD ./freebsd.patch;
|
||||
|
||||
doCheck = !stdenv.isFreeBSD;
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
chmod +x "$out"/lib/libminiupnpc${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://miniupnp.tuxfamily.org/";
|
||||
description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
|
||||
platforms = with platforms; linux ++ freebsd ++ darwin;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
};
|
||||
in {
|
||||
miniupnpc_2 = generic {
|
||||
version = "2.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8";
|
||||
};
|
||||
miniupnpc_1 = generic {
|
||||
version = "1.9.20160209";
|
||||
sha256 = "0vsbv6a8by67alx4rxfsrxxsnmq74rqlavvvwiy56whxrkm728ap";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ];
|
||||
|
||||
patches = lib.optional stdenv.isFreeBSD ./freebsd.patch;
|
||||
|
||||
doCheck = !stdenv.isFreeBSD;
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
chmod +x "$out"/lib/libminiupnpc${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://miniupnp.tuxfamily.org/";
|
||||
description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
|
||||
platforms = with platforms; linux ++ freebsd ++ darwin;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,5 +48,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://github.com/ShellCode33/CredSLayer";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
# Upstream issue https://github.com/ShellCode33/CredSLayer/issues/16
|
||||
# This package works only with pyshark < 0.5
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pam, xmlsec }:
|
||||
{ lib, stdenv, fetchurl, nix-update-script, pam, xmlsec }:
|
||||
|
||||
let
|
||||
# TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream
|
||||
|
|
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru.updateScript = nix-update-script { attrPath = pname; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Components for building one-time password authentication systems";
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl git gnugrep nix
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
nixfile='default.nix'
|
||||
release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'
|
||||
attr='oath-toolkit'
|
||||
command='oathtool --version'
|
||||
|
||||
color() {
|
||||
printf '%s: \033[%sm%s\033[39m\n' "$0" "$1" "$2" >&2 || true
|
||||
}
|
||||
|
||||
color 32 "downloading $release_url..."
|
||||
if ! release_page=$(curl -Lf "$release_url"); then
|
||||
color 31 "cannot download release page"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
tarball_name=$(printf '%s\n' "$release_page" \
|
||||
| grep -Po '(?<=href=").*?\.tar\.gz(?=")' \
|
||||
| sort -n | tail -n1)
|
||||
tarball_version="${tarball_name%.tar.*}"
|
||||
tarball_version="${tarball_version##*-}"
|
||||
tarball_url="mirror://savannah${release_url#https://*/releases}$tarball_name"
|
||||
|
||||
color 32 "nix-prefetch-url $tarball_url..."
|
||||
if ! tarball_sha256=$(nix-prefetch-url --type sha256 "$tarball_url"); then
|
||||
color 31 "cannot prefetch $tarball_url"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
old_version=$(grep -Pom1 '(?<=version = ").*?(?=";)' "$nixfile")
|
||||
|
||||
version=$(printf 'version = "%s";\n' "$tarball_version")
|
||||
sha256=$(printf 'sha256 = "%s";\n' "$tarball_sha256")
|
||||
sed -e "s,version = .*,$version," -e "s,sha256 = .*,$sha256," -i "$nixfile"
|
||||
|
||||
if git diff --exit-code "$nixfile" > /dev/stderr; then
|
||||
printf '\n' >&2 || true
|
||||
color 32 "$tarball_version is up to date"
|
||||
else
|
||||
color 32 "running '$command' with nix-shell..."
|
||||
nix-shell -p "callPackage ./$nixfile {}" --run "$command"
|
||||
msg="$attr: $old_version -> $tarball_version"
|
||||
printf '\n' >&2 || true
|
||||
color 31 "$msg"
|
||||
git commit -m "$msg" "$nixfile"
|
||||
fi
|
||||
|
|
@ -236,7 +236,7 @@ in (buildEnv {
|
|||
faketime $(date --utc -d@$SOURCE_DATE_EPOCH --iso-8601=seconds) tex -ini -jobname=tex -progname=tex tex.ini
|
||||
cd -
|
||||
fi
|
||||
if [[ -d share/texmf-var/web2c/luahbtex ]]
|
||||
if [[ -f share/texmf-var/web2c/luahbtex/lualatex.fmt ]]
|
||||
then
|
||||
cd share/texmf-var/web2c/luahbtex
|
||||
faketime $(date --utc -d@$SOURCE_DATE_EPOCH --iso-8601=seconds) luahbtex -ini -jobname=lualatex -progname=lualatex lualatex.ini
|
||||
|
|
|
|||
|
|
@ -914,6 +914,7 @@ mapAliases ({
|
|||
minetestclient_4 = throw "minetestclient_4 has been removed from Nixpkgs; current version is available at minetest or minetestclient"; # added 2022-02-01
|
||||
minetestserver_4 = throw "minetestserver_4 has been removed from Nixpkgs; current version is available at minetestserver"; # added 2022-02-01
|
||||
minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14
|
||||
miniupnpc_1 = throw "miniupnpc_1 has been removed; current version is available at miniupnpc"; # Added 2022-10-30
|
||||
mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15
|
||||
mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22
|
||||
mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22
|
||||
|
|
|
|||
|
|
@ -5129,6 +5129,8 @@ with pkgs;
|
|||
|
||||
bogofilter = callPackage ../tools/misc/bogofilter { };
|
||||
|
||||
bomber-go = callPackage ../development/tools/bomber-go { };
|
||||
|
||||
bomutils = callPackage ../tools/archivers/bomutils { };
|
||||
|
||||
boofuzz= callPackage ../tools/security/boofuzz { };
|
||||
|
|
@ -9244,10 +9246,9 @@ with pkgs;
|
|||
|
||||
minissdpd = callPackage ../tools/networking/minissdpd { };
|
||||
|
||||
inherit (callPackage ../tools/networking/miniupnpc
|
||||
{ inherit (darwin) cctools; })
|
||||
miniupnpc_1 miniupnpc_2;
|
||||
miniupnpc = miniupnpc_1;
|
||||
miniupnpc = callPackage ../tools/networking/miniupnpc {
|
||||
inherit (darwin) cctools;
|
||||
};
|
||||
|
||||
miniupnpd = callPackage ../tools/networking/miniupnpd { };
|
||||
|
||||
|
|
@ -26070,6 +26071,8 @@ with pkgs;
|
|||
|
||||
crimson = callPackage ../data/fonts/crimson {};
|
||||
|
||||
crimson-pro = callPackage ../data/fonts/crimson-pro {};
|
||||
|
||||
dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {});
|
||||
|
||||
# solve collision for nix-env before https://github.com/NixOS/nix/pull/815
|
||||
|
|
@ -28791,7 +28794,7 @@ with pkgs;
|
|||
gum = callPackage ../applications/misc/gum { };
|
||||
|
||||
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
|
||||
inherit miniupnpc_2 swftools;
|
||||
inherit miniupnpc swftools;
|
||||
inherit (qt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
|
|
@ -29856,6 +29859,8 @@ with pkgs;
|
|||
|
||||
legit = callPackage ../applications/version-management/git-and-tools/legit { };
|
||||
|
||||
legitify = callPackage ../development/tools/legitify { };
|
||||
|
||||
lens = callPackage ../applications/networking/cluster/lens { };
|
||||
|
||||
leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
|
||||
|
|
@ -33205,7 +33210,7 @@ with pkgs;
|
|||
|
||||
ytmdl = callPackage ../tools/misc/ytmdl { };
|
||||
|
||||
yutto = with python3.pkgs; toPythonApplication yutto;
|
||||
yutto = callPackage ../tools/misc/yutto { };
|
||||
|
||||
yuview = libsForQt5.yuview;
|
||||
|
||||
|
|
@ -33300,21 +33305,18 @@ with pkgs;
|
|||
|
||||
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
|
||||
boost = boost17x;
|
||||
miniupnpc = miniupnpc_2;
|
||||
withGui = true;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
bitcoind = callPackage ../applications/blockchains/bitcoin {
|
||||
boost = boost17x;
|
||||
miniupnpc = miniupnpc_2;
|
||||
withGui = false;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots {
|
||||
boost = boost17x;
|
||||
miniupnpc = miniupnpc_2;
|
||||
withGui = false;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
|
@ -33402,13 +33404,11 @@ with pkgs;
|
|||
};
|
||||
|
||||
elements = libsForQt5.callPackage ../applications/blockchains/elements {
|
||||
miniupnpc = miniupnpc_2;
|
||||
withGui = true;
|
||||
boost = boost175;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
elementsd = callPackage ../applications/blockchains/elements {
|
||||
miniupnpc = miniupnpc_2;
|
||||
withGui = false;
|
||||
boost = boost175;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
|
|
@ -33567,7 +33567,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; };
|
||||
particl-core = callPackage ../applications/blockchains/particl-core { };
|
||||
|
||||
quorum = callPackage ../applications/blockchains/quorum { };
|
||||
|
||||
|
|
|
|||
|
|
@ -2277,6 +2277,8 @@ self: super: with self; {
|
|||
|
||||
deluge-client = callPackage ../development/python-modules/deluge-client { };
|
||||
|
||||
demetriek = callPackage ../development/python-modules/demetriek { };
|
||||
|
||||
demjson3 = callPackage ../development/python-modules/demjson3 { };
|
||||
|
||||
dendropy = callPackage ../development/python-modules/dendropy { };
|
||||
|
|
@ -4053,6 +4055,8 @@ self: super: with self; {
|
|||
|
||||
gym = callPackage ../development/python-modules/gym { };
|
||||
|
||||
gym-notices = callPackage ../development/python-modules/gym-notices { };
|
||||
|
||||
gyp = callPackage ../development/python-modules/gyp { };
|
||||
|
||||
h11 = callPackage ../development/python-modules/h11 { };
|
||||
|
|
@ -12130,8 +12134,6 @@ self: super: with self; {
|
|||
|
||||
yubico-client = callPackage ../development/python-modules/yubico-client { };
|
||||
|
||||
yutto = callPackage ../tools/misc/yutto { };
|
||||
|
||||
z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };
|
||||
|
||||
z3 = (toPythonModule (pkgs.z3.override {
|
||||
|
|
|
|||
Loading…
Reference in a new issue