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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-10-09 00:03:29 +00:00 committed by GitHub
commit 130aa9ca68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 101 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/iwd.nix
View File

@ -67,5 +67,5 @@ in
};
};
meta.maintainers = with lib.maintainers; [ mic92 dtzWill ];
meta.maintainers = with lib.maintainers; [ dtzWill ];
}

13
pkgs/applications/editors/wxhexeditor/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext, openmp, Cocoa }:
stdenv.mkDerivation rec {
pname = "wxHexEditor";
@ -12,13 +12,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ wxGTK libtool python2 gettext ];
buildInputs = [ wxGTK libtool python2 gettext ]
++ lib.optionals stdenv.cc.isClang [ openmp ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
preConfigure = "patchShebangs .";
prePatch = ''
substituteInPlace Makefile --replace "/usr" "$out"
substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out"
'' + lib.optionalString stdenv.cc.isClang ''
substituteInPlace Makefile --replace "-lgomp" "-lomp"
'';
patches = [
@ -30,7 +34,7 @@ stdenv.mkDerivation rec {
./missing-semicolon.patch
];
makeFlags = [ "OPTFLAGS=-fopenmp" ];
makeFlags = lib.optionals stdenv.cc.isGNU [ "OPTFLAGS=-fopenmp" ];
meta = {
description = "Hex Editor / Disk Editor for Huge Files or Devices";
@ -46,6 +50,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.wxhexeditor.org/";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ wegank ];
};
}

6
pkgs/applications/networking/cluster/kubent/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubent";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "doitintl";
repo = "kube-no-trouble";
rev = "${version}";
sha256 = "0pwb9g1hhfqn3rl87fg6sf07m7aviadljb05bbnd241hhlcyslv6";
sha256 = "sha256-aXuBYfXQfg6IQE9cFFTBCPNmDg7IZYPAAeuAxCiU0ro=";
};
vendorSha256 = "1z4cvk936l7011fbimsgpw89yqzyikw9jb4184l37mnj9hl5wpcp";
vendorSha256 = "sha256-WQwWBcwhFZxXPFO6h+5Y8VDM4urJGfZ6AOvhRoaSbpk=";
ldflags = [
"-w" "-s"

6
pkgs/applications/networking/cluster/minikube/default.nix
View File

@ -12,9 +12,9 @@
buildGoModule rec {
pname = "minikube";
version = "1.27.0";
version = "1.27.1";
vendorSha256 = "sha256-wAjgeq//vRUDUyVNTsVIxLXhA6fzTrYvn4klAPAv7DE=";
vendorSha256 = "sha256-2sXWf+iK1v9gv2DXhmEs8xlIRF+6EM7Y6Otd6F89zGk=";
doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "sha256-Pn0F3363YJoOdWyoPy46HmIUwWr/I5TekalBp9hHg7I=";
sha256 = "sha256-GmvxKWHo0meiR1r5IlgI8jQRiDvmQafxTS9acv92EPk=";
};
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];

17
pkgs/applications/office/treesheets/default.nix
View File

@ -1,10 +1,12 @@
{ lib
, stdenv
, fetchFromGitHub
, wxGTK
, cmake
, ninja
, wrapGAppsHook
, makeWrapper
, wxGTK
, Cocoa
, unstableGitUpdater
}:
@ -23,14 +25,25 @@ stdenv.mkDerivation rec {
cmake
ninja
wrapGAppsHook
makeWrapper
];
buildInputs = [
wxGTK
] ++ lib.optionals stdenv.isDarwin [
Cocoa
];
NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\"";
postInstall = lib.optionalString stdenv.isDarwin ''
shopt -s extglob
mkdir -p $out/{share/treesheets,bin}
mv $out/!(share) $out/share/treesheets
makeWrapper $out/{share/treesheets,bin}/treesheets \
--chdir $out/share/treesheets
'';
passthru = {
updateScript = unstableGitUpdater { };
};
@ -49,7 +62,7 @@ stdenv.mkDerivation rec {
homepage = "https://strlen.com/treesheets/";
maintainers = with maintainers; [ obadz avery ];
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.zlib;
};
}

8
pkgs/applications/video/aegisub/default.nix
View File

@ -130,6 +130,12 @@ stdenv.mkDerivation rec {
./remove-bundled-luajit.patch
];
# error: unknown type name 'NSUInteger'
postPatch = ''
substituteInPlace src/dialog_colorpicker.cpp \
--replace "NSUInteger" "size_t"
'';
NIX_CFLAGS_COMPILE = "-I${luajit52}/include";
NIX_CFLAGS_LINK = "-L${luajit52}/lib";
@ -153,7 +159,7 @@ stdenv.mkDerivation rec {
# The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd
# softwares - so the resulting program will be GPL
license = licenses.bsd3;
maintainers = [ maintainers.AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres wegank ];
platforms = platforms.unix;
};
}

6
pkgs/applications/window-managers/leftwm/default.nix
View File

@ -6,16 +6,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "sha256-AfE36u5xSfivkg+hmJ6ASh6zXmTnLOv5RFigkGzySng=";
sha256 = "sha256-4f9YOVkOXn7+TzTUZS2Lultgj9WhiOPUa/fHUeyLBUU=";
};
cargoSha256 = "sha256-MmxF1jt5VUZGbkEe858HBjAuHhgDY23MJJxpYQ4ckhs=";
cargoSha256 = "sha256-D00IFTELRlqeKQ7zheJKTvu5FBgYQXsZ+OnPnVzweC4=";
buildInputs = rpathLibs;

6
pkgs/data/icons/qogir-icon-theme/default.nix
View File

@ -13,18 +13,18 @@ let
pname = "qogir-icon-theme";
in
lib.checkListOfEnum "${pname}: color variants" [ "default" "dark" "all" ] colorVariants
lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] colorVariants
lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "all" ] themeVariants
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-07-20";
version = "2022-10-08";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "sha256-I+eojCTR3fXcp7v5Bdie9vstmJja9HB71aQSF5jLDD4=";
sha256 = "sha256-BZhZyPnmiS5mxJp4/QnE7bTynB/cZ0QsUKFMhyd/Ox4=";
};
nativeBuildInputs = [ gtk3 jdupes ];

4
pkgs/development/libraries/cosmopolitan/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cosmopolitan";
version = "2.1";
version = "2.1.1";
src = fetchFromGitHub {
owner = "jart";
repo = pname;
rev = version;
sha256 = "sha256-qi82iGw0Sj2pgV9O4rr/q7jyd1XG3MpTr69dXdAUH0Q=";
sha256 = "sha256-2Q4lutSIQ6tBwTy01lPSMepNAww9Kb7BwNyEcsSdWZ0=";
};
patches = [

14
pkgs/development/libraries/libressl/default.nix
View File

@ -102,4 +102,18 @@ in {
})
];
};
libressl_3_6 = generic {
version = "3.6.0";
hash = "sha256-GxLe/Lvb2+2oaSnkIQAK8PQjM63UgX/SbA2aGuxHhAQ=";
patches = [
# Fix endianness detection on aarch64-darwin, issue #181187
(fetchpatch {
name = "fix-endian-header-detection.patch";
url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch";
sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE=";
})
];
};
}

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pytrafikverket";
version = "0.2.0.1";
version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-RsB8b96aCIBM3aABOuuexB5fIo7H1Kq/XsGvV8b7/sA=";
hash = "sha256-LBOq1AvJrRmyWIe2w4dQbWvlRAJN6s2/lsJRI2LZK2o=";
};
propagatedBuildInputs = [

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sqlmap";
version = "1.6.9";
version = "1.6.10";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-azAhpt6Qo/arTYeJSeQdBnqOmg2m7h+1pTsV30/pAOc=";
sha256 = "sha256-gBDHRV+5N9dcsH/55I6AcguiJSIP57fUtQJ6sMGPzyg=";
};
postPatch = ''

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

@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "1.6.1";
version = "1.6.2";
pname = "strictyaml";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "688be16ee5d1a2f94aa4abdc6d881e8e254d173d724ac88725955fe66bdb63d4";
sha256 = "sha256-cM1VmA/ikp3AOJJMoI9o+WFIIjqHd4EPphbjR46+cco=";
};
postPatch = ''

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

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "sumo";
version = "2.3.4";
version = "2.3.5";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "SMTG-UCL";
repo = "sumo";
rev = "refs/tags/v${version}";
sha256 = "sha256-kgTTYCTq8jTNOmc92TRskbsOcnk6wTZgf0UfoctJ4M4=";
sha256 = "sha256-eGQOFTo/tg1aM/P1la3stE7RLxpACUdcJ7g1z3zSasc=";
};
nativeBuildInputs = [

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.28.11.1";
version = "2.28.11.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ArGAbFuZBO3Nh/opI2FkrqDmzcTZPqAgzWFe9ly0PWU=";
sha256 = "sha256-/c170UgTn7ju9yz0pBrHJzhyytnmraFLEf9d/e7mDtM=";
};
propagatedBuildInputs = [

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

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "types-tabulate";
version = "0.8.11";
version = "0.9.0.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-F6X6O1ykU4FXePyYZejs0BGLB7K5+v8+Kwb+RIF03V4=";
hash = "sha256-SnlHRxTOoVa80hhbub3dj7nT1SJ8jQp/Ib8hyvX2Dmc=";
};
# Module doesn't have tests

4
pkgs/development/tools/goresym/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "goresym";
version = "1.4";
version = "1.5";
src = fetchFromGitHub {
owner = "mandiant";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wb/qyMLhqNLpgOl9YFuByTxkUBK4GdhdWzAMcWjOG/U=";
sha256 = "sha256-j548FzbxrtJz2N5y9ItO6F+52vQ+2RVCFPUW1cqeJUA=";
};
subPackages = [ "." ];

6
pkgs/development/tools/jaq/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "jaq";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "01mf02";
repo = "jaq";
rev = "v${version}";
sha256 = "sha256-lTfpN+BnWMENRlSjR1+iGlGMTp4BBiMDvzFjvwRpuLQ=";
sha256 = "sha256-a2LJUWRQsUnwU0DZnO5T+geeVOBXPfsBptEMnO+jnFA=";
};
cargoSha256 = "sha256-z12ecgJJYKYc5kOLyjZU/MfBuBp7aJuEmDAGleiecz0=";
cargoSha256 = "sha256-IJqM9XuJSEZadYc38TnyVrszuL5noYktnlyVu7IBE5k=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

4
pkgs/development/tools/misc/cli11/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "cli11";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "CLIUtils";
repo = "CLI11";
rev = "v${version}";
sha256 = "sha256-emTIaoUyTINbAAn9tw1r3zLTQt58N8A1zoP+0y41yKo=";
sha256 = "sha256-J/hOgCDQPI0n2BGJK0+HIwlfNDVaZcxCC45uFAR7JUc=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/tools/ruff/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.60";
version = "0.0.61";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AHKH5S+3iu+BflHnsR8kuWZKaCoyQXMa300KrvEQg5c=";
sha256 = "sha256-Gmuf8vZMP74r3CtImmD9hCTPIxaMfHGXO0C/hGAyqb0=";
};
cargoSha256 = "sha256-SO6MXLqUrFWOXW63fR/RBP7XG2cy5jAKST0nLcEkIPA=";
cargoSha256 = "sha256-jSBTou8GekqHoTTXRrhCwCWA2tjU5woKKB0g63M2VGU=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

4
pkgs/servers/nosql/victoriametrics/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.81.2";
version = "1.82.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-wf/YQX7vrwiNWz1kjWLPSH00rB70HDW3bRuN1DUiP1Y=";
sha256 = "sha256-JIl2WeveDoAHzqJ2cqMxpWeNf4yQC9fIdfECOJywJ2A=";
};
vendorSha256 = null;

4
pkgs/tools/security/exploitdb/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-09-24";
version = "2022-10-07";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-QroDg06vAyeFeA2Gy0iFJ5bc277EkMV1Xz92c+xrUF0=";
hash = "sha256-gO2NCQSmaJA6Bg6LKBc0qVi147KzGp2MtXizpM0v1yQ=";
};
nativeBuildInputs = [

6
pkgs/tools/security/nuclei/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.7.7";
version = "2.7.8";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-61oq7h/e9aFCEwvrKRx1zyITw/X2obRsnyycO94tW0A=";
sha256 = "sha256-FIWhWW2jOQF4OztLov67+RuhDnpRyD7EN27Gcr4Wa90=";
};
vendorSha256 = "sha256-HZZutN6hG/wNBz1hy0S3kWd/LmaeAvn1NlB917xmCDo=";
vendorSha256 = "sha256-qIEKGnFURtfh8CdHSbAtEaQRrsjfpvwyK+uPmYNXpiA=";
modRoot = "./v2";
subPackages = [

6
pkgs/tools/typesetting/tectonic/default.nix
View File

@ -7,7 +7,7 @@
, harfbuzz
, openssl
, pkg-config
, makeWrapper
, makeBinaryWrapper
, biber
, icu
}:
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "awDVjJLwgpSMbwptmLhczaxB5HqvsdvEOUsLYb/zTUc=";
nativeBuildInputs = [ pkg-config makeWrapper ];
nativeBuildInputs = [ pkg-config makeBinaryWrapper ];
buildInputs = [ icu fontconfig harfbuzz openssl ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
# https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.7.0
postInstall = ''
wrapProgram $out/bin/tectonic \
--prefix PATH "${lib.getBin biber}/bin"
--prefix PATH : "${lib.getBin biber}/bin"
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace dist/appimage/tectonic.desktop \
--replace Exec=tectonic Exec=$out/bin/tectonic

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

@ -1146,7 +1146,7 @@ with pkgs;
aefs = callPackage ../tools/filesystems/aefs { };
aegisub = callPackage ../applications/video/aegisub ({
wxGTK = wxGTK31;
wxGTK = wxGTK32;
inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa;
} // (config.aegisub or {}));
@ -21256,9 +21256,10 @@ with pkgs;
inherit (callPackages ../development/libraries/libressl { })
libressl_3_4
libressl_3_5;
libressl_3_5
libressl_3_6;
libressl = libressl_3_5;
libressl = libressl_3_6;
boringssl = callPackage ../development/libraries/boringssl { };
@ -31970,7 +31971,8 @@ with pkgs;
tree = callPackage ../tools/system/tree {};
treesheets = callPackage ../applications/office/treesheets {
wxGTK = wxGTK31-gtk3;
wxGTK = wxGTK32;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
tremc = callPackage ../applications/networking/p2p/tremc { };
@ -32501,7 +32503,9 @@ with pkgs;
wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
wxhexeditor = callPackage ../applications/editors/wxhexeditor {
wxGTK = wxGTK31;
inherit (darwin.apple_sdk.frameworks) Cocoa;
inherit (llvmPackages) openmp;
wxGTK = wxGTK32;
};
xa = callPackage ../development/compilers/xa/xa.nix { };