Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-11-14 00:02:34 +00:00 committed by GitHub
commit b619a02d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 206 additions and 233 deletions

View File

@ -826,6 +826,7 @@
};
AndersonTorres = {
email = "torres.anderson.85@protonmail.com";
matrix = "@anderson_torres:matrix.org";
github = "AndersonTorres";
githubId = 5954806;
name = "Anderson Torres";
@ -4622,12 +4623,6 @@
githubId = 66178592;
name = "Pavel Zolotarevskiy";
};
flexw = {
email = "felix.weilbach@t-online.de";
github = "FlexW";
githubId = 19961516;
name = "Felix Weilbach";
};
fliegendewurst = {
email = "arne.keller@posteo.de";
github = "FliegendeWurst";

View File

@ -6,20 +6,20 @@
buildGoModule rec {
pname = "blocky";
version = "0.19";
version = "0.20";
src = fetchFromGitHub {
owner = "0xERR0R";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jOOakRuiNbdCGmbaQFuHcLsHhV26jaQY+1GgDj9ocs0=";
sha256 = "sha256-l2GhqJit/+WpNDICD/NUzCAGrKrTNHzEzgpF9k3+DLk=";
};
# needs network connection and fails at
# https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
doCheck = false;
vendorSha256 = "sha256-fsMBL9qyhIrV6eAsqpSaNniibMdYRVBnl2KCzStvMGQ=";
vendorSha256 = "sha256-CS8+tsE5dptG9gF46OFoJGzn1FnfjekXLTLrpwIQdFQ=";
ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ];

View File

@ -1,4 +1,15 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ buildGoModule
, coreutils
, fetchFromGitHub
, git
, installShellFiles
, kubectl
, kubernetes-helm
, lib
, makeWrapper
, yamale
, yamllint
}:
buildGoModule rec {
pname = "chart-testing";
@ -8,10 +19,10 @@ buildGoModule rec {
owner = "helm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-b8U7zVvzewSxqX7RG7+FMAVytW4s2apNxR3krNJuiro=";
hash = "sha256-b8U7zVvzewSxqX7RG7+FMAVytW4s2apNxR3krNJuiro=";
};
vendorSha256 = "sha256-z4hNGswxRMU40qkgwY3n516FiyaoeDaAE+CCla3TMkk=";
vendorHash = "sha256-z4hNGswxRMU40qkgwY3n516FiyaoeDaAE+CCla3TMkk=";
postPatch = ''
substituteInPlace pkg/config/config.go \
@ -26,7 +37,7 @@ buildGoModule rec {
"-X github.com/helm/chart-testing/v3/ct/cmd.BuildDate=19700101-00:00:00"
];
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ installShellFiles makeWrapper ];
postInstall = ''
install -Dm644 -t $out/etc/ct etc/chart_schema.yaml
@ -36,6 +47,15 @@ buildGoModule rec {
--bash <($out/bin/ct completion bash) \
--zsh <($out/bin/ct completion zsh) \
--fish <($out/bin/ct completion fish) \
wrapProgram $out/bin/ct --prefix PATH : ${lib.makeBinPath [
coreutils
git
kubectl
kubernetes-helm
yamale
yamllint
]}
'';
meta = with lib; {

View File

@ -5,7 +5,7 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.5.4";
version = "3.5.5";
format = "pyproject";
# Fetch from GitHub in order to use `requirements.in`
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-KANnZLNNDEo8pVWumFRR/Y67F1eS2JeDeX33nQ5YWlk=";
hash = "sha256-jyMjcFQXv9wGcvBU+Ki970HAgSQD57Zx3G9gf/mj25A=";
};
postPatch = ''

View File

@ -1,62 +0,0 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper
, gcc, nettools, iproute2, linuxHeaders }:
# NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";
# launch with "iked -f /etc/iked.conf"
# NOTE: my testings reveal that kernels 3.11.10 and 3.12.6 won't let the traffic through the tunnel,
# so I'm sticking with 3.4
stdenv.mkDerivation rec {
pname = "ike";
version = "2.2.1";
src = fetchurl {
url = "https://www.shrew.net/download/ike/${pname}-${version}-release.tgz";
sha256 = "0fhyr2psd93b0zf7yfb72q3nqnh65mymgq5jpjcsj9jv5kfr6l8y";
};
patches = [
# required for openssl 1.1.x compatibility
(fetchpatch {
name = "openssl-1.1.0.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/openssl-1.1.0.patch?h=ike&id=3a56735ddc26f750df4720f4baba0728bb4cb458";
sha256 = "1hw8q4xy858rivpjkq5288q3mc75d52bg4w3n30y99h05wik0h51";
})
];
nativeBuildInputs = [ cmake flex bison makeWrapper ];
buildInputs = [ openssl libedit qt4 nettools iproute2 ];
postPatch = ''
# fix build with bison3
sed -i 's/define "parser_class_name"/define parser_class_name/' source/iked/conf.parse.yy
'';
configurePhase = ''
mkdir -p $out/{bin,sbin,lib}
cmake -DQTGUI=YES -DETCDIR=$out/etc -DLIBDIR=$out/lib -DSBINDIR=$out/sbin -DBINDIR=$out/bin \
-DKRNINC="${linuxHeaders}/include/" -DTESTS=YES \
-DMANDIR=$out/man -DNATT=YES -DCMAKE_INSTALL_PREFIX:BOOL=$out
'';
buildPhase = ''
make
'';
installPhase = ''
make install
for file in "$out"/bin/* "$out"/sbin/*; do
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${lib.makeLibraryPath [ openssl gcc.cc stdenv.cc.libc libedit qt4 ]}"
done
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
homepage = "https://www.shrew.net/software";
description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems";
platforms = platforms.unix;
maintainers = [ ];
license = licenses.sleepycat;
};
}

View File

@ -7,16 +7,17 @@
makeDesktopItem,
gtk3,
openssl,
xdg-user-dirs
xdg-user-dirs,
keybinder3
}:
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.0.4";
version = "0.0.6.2";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz";
sha256 = "sha256-ke3cuRi+ZlBSWawg66cGrV928dOBp0EniNakitmgUso=";
sha256 = "sha256-LOrXGFctAaiz2z9M8ghrXsQ+qygwNPyYragmL/EjlDQ=";
};
nativeBuildInputs = [
@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
openssl
keybinder3
];
dontBuild = true;

View File

@ -33,7 +33,7 @@ assert withMPI -> trilinos.withMPI;
stdenv.mkDerivation rec {
pname = "xyce";
version = "7.4.0";
version = "7.6.0";
srcs = [
# useing fetchurl or fetchFromGitHub doesn't include the manuals
@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
(fetchgit {
url = "https://github.com/Xyce/Xyce.git";
rev = "Release-${version}";
sha256 = "sha256-sOHjQEo4FqlDseTtxFVdLa0SI/VAf2OkwQV7QSL7SNM=";
sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw=";
})
(fetchFromGitHub {
owner = "Xyce";
repo = "Xyce_Regression";
rev = "Release-${version}";
sha256 = "sha256-kSGUaFarOHDNJ8kA/TAGkmzicm9O7cfJ7mGFZcbqCZM=";
sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74=";
})
];

View File

@ -1,19 +1,20 @@
{ lib, stdenv, fetchFromGitHub, git, makeWrapper, which }:
{ lib, stdenv, fetchFromGitHub, git, makeWrapper, which, installShellFiles }:
stdenv.mkDerivation rec {
pname = "git-subrepo";
version = "0.4.1";
version = "0.4.5";
src = fetchFromGitHub {
owner = "ingydotnet";
repo = "git-subrepo";
rev = version;
sha256 = "0n10qnc8kyms6cv65k1n5xa9nnwpwbjn9h2cq47llxplawzqgrvp";
sha256 = "sha256-ZU5yYaiear5AjlBqtzabmMJNUa2ypeJKW3sQPIcyskM=";
};
nativeBuildInputs = [
makeWrapper
which
installShellFiles
];
buildInputs = [
@ -26,21 +27,9 @@ stdenv.mkDerivation rec {
"INSTALL_MAN=${placeholder "out"}/share/man/man1"
];
patches = [
# Allow zsh completion to work even though we aren't installing from a git
# clone. Also submitted upstream as
# https://github.com/ingydotnet/git-subrepo/pull/420
./zsh-completion.patch
];
postInstall = ''
ZSH_COMP_DIR="$out/share/zsh/vendor-completions"
mkdir -p "$ZSH_COMP_DIR"
cp share/zsh-completion/_git-subrepo "$ZSH_COMP_DIR/"
BASH_COMP_DIR="$out/share/bash-completion/completions"
mkdir -p "$BASH_COMP_DIR"
cp share/completion.bash "$BASH_COMP_DIR/git-subrepo"
installShellCompletion --bash --name git-subrepo.bash share/completion.bash
installShellCompletion --zsh share/zsh-completion/_git-subrepo
'';
postFixup = ''
@ -52,7 +41,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/ingydotnet/git-subrepo";
description = "Git submodule alternative";
license = licenses.mit;
platforms = platforms.unix ++ platforms.darwin;
maintainers = [ maintainers.ryantrinkle ];
platforms = platforms.unix;
maintainers = with maintainers; [ ryantrinkle ];
};
}

View File

@ -1,32 +0,0 @@
diff --git a/pkg/bin/generate-completion.pl b/pkg/bin/generate-completion.pl
index 85ae3b8..d3e423c 100644
--- a/pkg/bin/generate-completion.pl
+++ b/pkg/bin/generate-completion.pl
@@ -82,11 +82,6 @@ sub generate_zsh {
# DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
-if [[ -z $GIT_SUBREPO_ROOT ]]; then
- echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?'
- return 3
-fi
-
_git-subrepo() {
typeset -A opt_args
local curcontext="$curcontext" state line context
diff --git a/share/zsh-completion/_git-subrepo b/share/zsh-completion/_git-subrepo
index fc82be2..a8069d9 100644
--- a/share/zsh-completion/_git-subrepo
+++ b/share/zsh-completion/_git-subrepo
@@ -3,11 +3,6 @@
# DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
-if [[ -z $GIT_SUBREPO_ROOT ]]; then
- echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?'
- return 3
-fi
-
_git-subrepo() {
typeset -A opt_args
local curcontext="$curcontext" state line context

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "oak";
version = "0.2";
version = "0.3";
src = fetchFromGitHub {
owner = "thesephist";
repo = pname;
rev = "v${version}";
sha256 = "sha256-00UanINtrFyjQWiAw1ucB4eEODMr9+wT+99Zy2Oc1j4=";
sha256 = "sha256-DK5n8xK57CQiukyBt9+CFK1j8+nphP//T2jTXq64VH8=";
};
vendorSha256 = "sha256-iQtb3zNa57nB6x4InVPw7FCmW7XPw5yuz0OcfASXPD8=";

View File

@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
# have to link to static gcc lib on aarch64-linux explicitly
NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
buildPhase = ''
./build libraries all
./build man

View File

@ -61,7 +61,10 @@ let self = stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://gmplib.org/";
description = "GNU multiple precision arithmetic library";
license = licenses.gpl3Plus;
license = with licenses; [
lgpl3Only
gpl2Only
];
longDescription =
'' GMP is a free library for arbitrary precision arithmetic, operating

View File

@ -4,13 +4,15 @@
}:
stdenv.mkDerivation rec {
pname = "miniaudio";
version = "unstable-2020-04-20";
version = "0.11.11";
src = fetchFromGitHub {
owner = "mackron";
repo = "miniaudio";
rev = "4d813cfe23c28db165cce6785419fee9d2399766";
sha256 = "sha256-efZLZTmkLtvcysd25olDE/QqunU5YTYwSVmUZXPKGIY=";
rev = "a0dc1037f99a643ff5fad7272cd3d6461f2d63fa";
# upstream does not maintain tags:
# https://github.com/mackron/miniaudio/issues/273#issuecomment-783861269
hash = "sha256-jOvDZk76hDvZ1RQ9O34kVeW0n95BT9+BE6fNhdekI5s=";
};
installPhase = ''
@ -19,9 +21,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Single header audio playback and capture library written in C.";
description = "Single header audio playback and capture library written in C";
homepage = "https://github.com/mackron/miniaudio";
license = licenses.unlicense;
changelog = "https://github.com/mackron/miniaudio/blob/${src.rev}/CHANGES.md";
license = with licenses; [ unlicense /* or */ mit0 ];
maintainers = [ maintainers.jansol ];
platforms = platforms.all;
};

View File

@ -46439,6 +46439,9 @@ in {
});
systems = [ "magicl" ];
lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "abstract-classes" pkgs) (getAttr "interface" pkgs) (getAttr "policy-cond" pkgs) ];
meta = {
broken = true;
};
};
magicl-examples = {
pname = "magicl-examples";

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.160";
version = "0.6.170";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-F6MQqIYyBSURU7R6RmlGai57Ajf6Ks4o0zfFi7LzE+g=";
sha256 = "sha256-chcxXTTsUqs0YtqeHbSHyj0F+R+T59msAwMGDIVNWis=";
};
vendorSha256 = "sha256-cNwfK1LpguRfM/ORebU6v+JLIxDJdT5y+zM3KmEamEw=";
vendorSha256 = "sha256-1cQd/gxXFB1VagTICvxCjtqCUlPHL4NCuW6u2AeE/WM=";
CGO_ENABLED = 0;
subPackages = [ "." ];

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aioridwell";
version = "2022.10.0";
version = "2022.11.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,8 +25,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
hash = "sha256-cc5l72QHcyCBFZtw3F9EFFtmz58NnZ9gkDTcFZFlL4E=";
rev = "refs/tags/${version}";
hash = "sha256-KxT3Se27b+XoTETXCljOVGVmEuXcpYxOhIBs1xAdtZ8=";
};
nativeBuildInputs = [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "asyncpg";
version = "0.26.0";
version = "0.27.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-d+aEok/uF7o+SHypgtAlntF7rhr2gAb0zyhLI7og6iw=";
hash = "sha256-cgmG2aRwXdikD98XIDb1rnhyJQNqfrRucExFqo9iwFQ=";
};
# sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495

View File

@ -4,16 +4,20 @@
, msrest
, azure-common
, msrestazure
, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-batch";
version = "12.0.0";
version = "13.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-GpseF4mEp79JWvZ7zOUfDbHkqKlXr7KeM1VKFKlnTes=";
hash = "sha256-6Sld5wQE0nbtoN0iU9djl0Oavl2PGMH8oZnEm41q4wo=";
};
propagatedBuildInputs = [
@ -22,10 +26,12 @@ buildPythonPackage rec {
azure-common
];
# has no tests
# Module has no tests
doCheck = false;
pythonImportsCheck = [ "azure.batch" ];
pythonImportsCheck = [
"azure.batch"
];
meta = with lib; {
description = "This is the Microsoft Azure Batch Client Library";

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "miniaudio";
version = "1.53";
version = "1.54";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "irmen";
repo = "pyminiaudio";
rev = "refs/tags/v${version}";
sha256 = "sha256-TB4V41GN48Q2ocsDM1uIyRziY+y8njRNoPxZpTqk+Tk=";
hash = "sha256-Xy1O9/oeEM0fjuipCFxL2nknH6/bEVGIraByOlQ/CHs=";
};
buildInputs = lib.optionals stdenv.isDarwin [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "mypy-protobuf";
version = "3.3.0";
version = "3.4.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JPOwrssGZW6YP1jgfHMqkFd7nXrz4QZvwrZju/A3Akg=";
sha256 = "sha256-fXWgeWUbEFB2d2o1pUBeP6dzuKFnEY8bcS5EPppsGKI=";
};
propagatedBuildInputs = [

View File

@ -26,14 +26,14 @@
buildPythonPackage rec {
pname = "nbclassic";
version = "0.4.7";
version = "0.4.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-HgRwWDtVCJxCeUDtMbioZv/vfMqxAUlOQJ7+Wse6mJc=";
hash = "sha256-x02KUA+OBY1GtXakHlvGQHEeEDLPdUHd5fc+pJSX4oM=";
};
propagatedBuildInputs = [

View File

@ -12,11 +12,12 @@
buildPythonPackage rec {
pname = "nbsphinx";
version = "0.8.9";
version = "0.8.10";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-St6GsqQfj0Hv0+qZ2uhMM2j+i6P4N9UMiBXOlCTFmU8=";
sha256 = "sha256-qNaARviquRbilAubOBm9PvndzoaKo4hF6jZmRcq7YlQ=";
};
propagatedBuildInputs = [

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "nextcord";
version = "2.2.0";
version = "2.3.2";
format = "setuptools";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "nextcord";
repo = "nextcord";
rev = "refs/tags/v${version}";
hash = "sha256-2VlmcldbW+BfQRzOjCsh6r29qzwD+SG8H8arbTDg94k=";
hash = "sha256-ZflCOTqNhalBhxDkee3UwusiVA+ShtfabP0slE28/UQ=";
};
patches = [

View File

@ -2,19 +2,25 @@
buildPythonPackage rec {
pname = "pdftools.pdfposter";
version = "0.8";
version = "0.8.1";
format = "setuptools";
propagatedBuildInputs = [ pypdf2 ];
src = fetchPypi {
inherit pname version;
sha256 = "sha256-SYEn54kpO6KQ8ywpgu0+3uL+Ilr1hsfSornWrs2EBqQ=";
sha256 = "sha256-yWFtHgVKAWs4dRlSk8t8cB2KBJeBOa0Frh3BLR9txS0=";
};
pythonImportsCheck = [
"pdftools.pdfposter"
"pdftools.pdfposter.cmd"
];
meta = with lib; {
description = "Split large pages of a PDF into smaller ones for poster printing";
homepage = "https://pdfposter.readthedocs.io";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ wamserma ];
};
}

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "persistent";
version = "4.9.1";
version = "4.9.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-pfkeAJD5OS/TJNl/TCpjbJI5lYKCOM2i4/vMaxu8RoY=";
hash = "sha256-8j6yXqRbvKa/YgSwKKCn6qFz0ngdaP9XzVhhzBoNDtA=";
};
nativeBuildInputs = [

View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "10.0.0";
version = "11.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-dhFc4QCvWrb4gYdMaNlaCRaRrWsuUY+leTkoEhFHHds=";
hash = "sha256-TgSdhBcXxV8bNeKb1v8WVBRknm9qi6iRjWxdW5JZeew=";
};
propagatedBuildInputs = [

View File

@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "plexapi";
version = "4.13.0";
version = "4.13.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = "refs/tags/${version}";
sha256 = "sha256-lFVXWkT6cg0JlFWz5AquEXC6icwTU3bNHMDfKEy/3rQ=";
hash = "sha256-py3UmKie96FR8klf97zsYxUkrQisO7/cnWUgKxgB+tQ=";
};
propagatedBuildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.192.0";
version = "0.193.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "sha256-Eqn90vA48PKea2Qrj7sN1hWoU31KzAr7xbfF8Fwi9uw=";
sha256 = "sha256-YmBk8bFGcBDTMgqzTpRPHtYAJfFWCr/AjXkdp2KoX/c=";
};
makeFlags = [ "FLOW_RELEASE=1" ];

View File

@ -3,6 +3,8 @@
, fetchFromGitHub
, buildPackages
, pkg-config
, meson
, ninja
, libusb-compat-0_1
, readline
, libewf
@ -19,74 +21,68 @@
, python3
, ruby
, lua
, lz4
, capstone
, useX11 ? false
, rubyBindings ? false
, pythonBindings ? false
, luaBindings ? false
}:
let
# FIXME: Compare revision with https://github.com/radareorg/radare2/blob/master/libr/asm/arch/arm/v35arm64/Makefile#L20
# FIXME: Compare revision with
# https://github.com/radareorg/radare2/blob/master/libr/asm/arch/arm/v35arm64/Makefile#L26-L27
arm64 = fetchFromGitHub {
owner = "radareorg";
repo = "vector35-arch-arm64";
rev = "9ab2b0bedde459dc86e079718333de4a63bbbacb";
sha256 = "sha256-2KLtjgCqHzBBlo9ImZ8WJ1bsWy/kdJCjCFxlLE+HxoI=";
rev = "c9e7242972837ac11fc94db05fabcb801a8269c9";
hash = "sha256-HFQj23GlLAyyzMGnPq40XaPv5qPDHdDlQOo0Hprc9Cs=";
};
armv7 = fetchFromGitHub {
owner = "radareorg";
repo = "vector35-arch-armv7";
rev = "dde39f69ffea19fc37e681874b12cb4707bc4f30";
sha256 = "sha256-bnWQc0dScM9rhIdzf+iVXvMqYWq/bguEAUQPaZRgdlU=";
hash = "sha256-bnWQc0dScM9rhIdzf+iVXvMqYWq/bguEAUQPaZRgdlU=";
};
in
stdenv.mkDerivation rec {
pname = "radare2";
version = "5.7.2";
version = "5.7.8";
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
rev = version;
sha256 = "sha256-TZeW+9buJvCOudHsLTMITFpRUlmNpo71efc3xswJoPw=";
hash = "sha256-+/9SeILuDCUaYwPhhN6z3vQFicd1Bh8N/yicZTybR5o=";
};
preBuild = ''
cp -r ${arm64} libr/asm/arch/arm/v35arm64/arch-arm64
chmod -R +w libr/asm/arch/arm/v35arm64/arch-arm64
cp -r ${arm64} ../libr/asm/arch/arm/v35arm64/arch-arm64
chmod -R +w ../libr/asm/arch/arm/v35arm64/arch-arm64
cp -r ${armv7} libr/asm/arch/arm/v35arm64/arch-armv7
chmod -R +w libr/asm/arch/arm/v35arm64/arch-armv7
cp -r ${armv7} ../libr/asm/arch/arm/v35arm64/arch-armv7
chmod -R +w ../libr/asm/arch/arm/v35arm64/arch-armv7
'';
postFixup = lib.optionalString stdenv.isDarwin ''
for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib $out/lib/libr_anal.${version}.dylib; do
install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $file
done
install_name_tool -add_rpath $out/lib $out/lib/libr_io.${version}.dylib
'';
WITHOUT_PULL = "1";
makeFlags = [
"GITTAP=${version}"
"RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib"
"CC=${stdenv.cc.targetPrefix}cc"
"HOST_CC=${stdenv.cc.targetPrefix}cc"
];
configureFlags = [
"--with-sysmagic"
"--with-syszip"
"--with-sysxxhash"
"--with-syscapstone"
"--with-openssl"
mesonFlags = [
"-Duse_sys_capstone=true"
"-Duse_sys_magic=true"
"-Duse_sys_zip=true"
"-Duse_sys_xxhash=true"
"-Duse_sys_lz4=true"
"-Dr2_gittap=${version}"
];
enableParallelBuilding = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config ];
strictDeps = true;
nativeBuildInputs = [ pkg-config meson ninja python3 ];
buildInputs = [
capstone
file
@ -97,9 +93,9 @@ stdenv.mkDerivation rec {
zlib
openssl
libuv
lz4
] ++ lib.optionals useX11 [ gtkdialog vte gtk2 ]
++ lib.optionals rubyBindings [ ruby ]
++ lib.optionals pythonBindings [ python3 ]
++ lib.optionals luaBindings [ lua ];
propagatedBuildInputs = [
@ -110,10 +106,10 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
description = "unix-like reverse engineering framework and commandline tools";
homepage = "https://radare.org/";
description = "UNIX-like reverse engineering framework and command-line tools";
homepage = "https://radare.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ raskin makefu mic92 arkivm ];
maintainers = with maintainers; [ azahi raskin makefu mic92 arkivm ];
platforms = platforms.unix;
};
}

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mold";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "rui314";
repo = pname;
rev = "v${version}";
hash = "sha256-IXXyZZw1Tp/s9YkPR5Y+A6LpvaRo+XfA8UJBtt5Bjmg=";
hash = "sha256-hSDGVS3Q0LJ7HZPz6/kSRK+9XejETra5FloeEMrkdLg=";
};
nativeBuildInputs = [ cmake ninja ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "okteto";
version = "2.8.2";
version = "2.9.0";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
sha256 = "sha256-UJaPGnS0VK0FK2EJFUEh5mCMaLw5vX9V4sOYOgDWENk=";
hash = "sha256-bcuGxz5Cn67SzGq+0fFR9ERnW829H4nKV2M+3/xu7s4=";
};
vendorSha256 = "sha256-/oR8R0/GC6cgCqXinCRH5x93qgRPeQmxHgZZGshrDr4=";
vendorHash = "sha256-/oR8R0/GC6cgCqXinCRH5x93qgRPeQmxHgZZGshrDr4=";
postPatch = ''
# Disable some tests that need file system & network access.

View File

@ -0,0 +1,29 @@
{ lib, stdenv, fetchFromGitHub, perl, jq }:
stdenv.mkDerivation rec {
pname = "zsv";
version = "unstable-2022-11-12";
src = fetchFromGitHub {
owner = "liquidaty";
repo = "zsv";
rev = "058a990e2086e639d1e11ed8b2ae81b03e4bfcac";
sha256 = "sha256-V1wkwNSpMsSpaL/j4z4TN59W1+Xn6MYMEWBdwdtTz+s=";
};
nativeBuildInputs = [ perl ];
buildInputs = [ jq ];
configureFlags = [
"--jq-prefix=${jq.lib}"
];
meta = with lib; {
description = "World's fastest (simd) CSV parser, with an extensible CLI";
homepage = "https://github.com/liquidaty/zsv";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
platforms = platforms.all;
};
}

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "fheroes2";
version = "0.9.20";
version = "0.9.21";
src = fetchFromGitHub {
owner = "ihhub";
repo = "fheroes2";
rev = version;
sha256 = "sha256-IF8ESbMDvermghBGLMq+GdE67Hg5XedX0REGGnWQhRA=";
sha256 = "sha256-b4OAuwMgVgZUdLWJp6Rv/+1X+rPcG7piIBk8SlEXoUY=";
};
buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "barrage";
version = "1.0.5";
version = "1.0.6";
src = fetchurl {
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
hash = "sha256-p4iXq2qM9tU9QJO7irriBN36OiLFyrnnYiDkmH3naQQ=";
hash = "sha256-nFkkzT5AjcPfXsdxwvEsk4+RX9Py1mVqADvuoxE4Ha4=";
};
buildInputs = [

View File

@ -7,16 +7,22 @@
rustPlatform.buildRustPackage rec {
pname = "qdrant";
version = "0.9.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "qdrant";
repo = "qdrant";
rev = "refs/tags/v${version}";
sha256 = "sha256-rOIWiSpAqIUf2V9BMMTZqF/urz754pZV4yHav26dxqY=";
sha256 = "sha256-MT2k4k/g97iXVUCz1dYJdL+JBCLKTWqE2u2Yiuvd/nw=";
};
cargoSha256 = "sha256-ovHxtOYlzVsALw/4bhL9EcFXaKr6Bg/D0w6OPMCLZoQ=";
cargoSha256 = "sha256-86F7B+SKaAxu7c3kyYurI5jPnnbvtdD0jouNCzT0A50=";
prePatch = lib.optionalString stdenv.isAarch64 ''
substituteInPlace .cargo/config.toml \
--replace "[target.aarch64-unknown-linux-gnu]" "" \
--replace "linker = \"aarch64-linux-gnu-gcc\"" ""
'';
nativeBuildInputs = [ protobuf rustPlatform.bindgenHook ];

View File

@ -32,7 +32,7 @@
let
pname = "vector";
version = "0.25.0";
version = "0.25.1";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -41,10 +41,10 @@ rustPlatform.buildRustPackage {
owner = "vectordotdev";
repo = pname;
rev = "v${version}";
hash = "sha256-2hCgHf7iBPl9BQITXyUDwgAz/i2HhXT4eczWrExCUDk=";
hash = "sha256-7iYiSO966o0M9M0ijGCpuRVRgus+tURLBN9S5lPDRb8=";
};
cargoHash = "sha256-E23m8/XCEXeEpz1itIzCit9RpoB1/PRrYVWxt+VVfxA=";
cargoHash = "sha256-EqK6r/pFFKmnpPPUhqdC3bztYQZ+2w7u7V8Rj+9oWII=";
nativeBuildInputs = [ pkg-config cmake perl ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];

View File

@ -3,7 +3,7 @@
, lib
, makeWrapper
, autoPatchelfHook
, openjdk11
, openjdk17
, pam
, makeDesktopItem
, icoutils
@ -24,12 +24,12 @@ let
in stdenv.mkDerivation rec {
pname = "ghidra";
version = "10.1.5";
versiondate = "20220726";
version = "10.2.1";
versiondate = "20221110";
src = fetchzip {
url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip";
sha256 = "sha256-HjsbOTI+mHSmgFREGuUXKT7gbSSk2Gw/sLzP6eAkUX8=";
sha256 = "sha256-04EZQnSuYtcseamlNBjpm8+9wD5r1WsBseix6yr057k=";
};
nativeBuildInputs = [
@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
ln -s "${pkg_path}/ghidraRun" "$out/bin/ghidra"
wrapProgram "${pkg_path}/support/launch.sh" \
--prefix PATH : ${lib.makeBinPath [ openjdk11 ]}
--prefix PATH : ${lib.makeBinPath [ openjdk17 ]}
'';
meta = with lib; {

View File

@ -628,6 +628,7 @@ mapAliases ({
icu59 = throw "icu59 has been removed, use a more recent version instead"; # Added 2022-05-14
icu65 = throw "icu65 has been removed, use a more recent version instead"; # Added 2022-05-14
idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22
ike = throw "ike has been removed, because it was unmaintained"; # Added 2022-05-26
imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15
imagemagick7Big = imagemagickBig; # Added 2021-02-22
imagemagick7 = imagemagick; # Added 2021-02-22

View File

@ -13252,6 +13252,8 @@ with pkgs;
cmake = buildPackages.cmakeMinimal;
};
zsv = callPackage ../development/tools/zsv { };
zsync = callPackage ../tools/compression/zsync { };
zxing = callPackage ../tools/graphics/zxing {};
@ -18271,7 +18273,11 @@ with pkgs;
else callPackage ../os-specific/linux/bionic-prebuilt { };
bobcat = callPackage ../development/libraries/bobcat { };
bobcat = callPackage ../development/libraries/bobcat
(lib.optionalAttrs (with stdenv.hostPlatform; isAarch64 && isLinux) {
# C++20 is required, aarch64-linux has gcc 9 by default
stdenv = gcc10Stdenv;
});
boehmgc = callPackage ../development/libraries/boehm-gc { };
@ -29496,8 +29502,6 @@ with pkgs;
stdenv = gccStdenv;
};
ike = callPackage ../applications/networking/ike { };
ikiwiki = callPackage ../applications/misc/ikiwiki {
python = python3;
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick;