mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
537fbd1326
|
|
@ -86,6 +86,7 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1,
|
|||
rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
|
||||
readline,,,,,,
|
||||
say,https://github.com/Olivine-Labs/say.git,,,,,
|
||||
serpent,,,,,,lockejan
|
||||
sqlite,,,,,,
|
||||
std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
|
||||
std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 72.
|
|
|
@ -49,12 +49,14 @@ in
|
|||
|
||||
tlsCertificate = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/var/host.cert";
|
||||
description = lib.mdDoc "Path to server TLS certificate.";
|
||||
};
|
||||
|
||||
tlsCertificateKey = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/var/host.key";
|
||||
description = lib.mdDoc "Path to server TLS certificate key.";
|
||||
};
|
||||
|
|
@ -97,6 +99,16 @@ in
|
|||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = (cfg.tlsCertificate != null) == (cfg.tlsCertificateKey != null);
|
||||
message = ''
|
||||
services.soju.tlsCertificate and services.soju.tlsCertificateKey
|
||||
must both be specified to enable TLS.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.soju = {
|
||||
description = "soju IRC bouncer";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.167.5";
|
||||
version = "1.168.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-sCqzVXBB2BClepD6+mrHw3GmFh17W0RVp4yTuNO4M3w=";
|
||||
sha256 = "sha256-/06eZ79Zeq6jtcfq+lOcumBgP59bqCX/Km7k21FroSc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.07.22",
|
||||
"sha256": "sha256-Uw5opguC49FjnklL6RTgxCz+9BwBDJDjqsUXS1sWs9M="
|
||||
"rev": "2022.07.27",
|
||||
"sha256": "sha256-SGozuk0pvp0+PwAFbGG+QMUhQ2A6mXKr31u10WIveh0="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
|||
|
|
@ -1680,6 +1680,22 @@ let
|
|||
|
||||
ms-vscode.cpptools = callPackage ./cpptools { };
|
||||
|
||||
ms-vscode.PowerShell = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "PowerShell";
|
||||
publisher = "ms-vscode";
|
||||
version = "2022.7.2";
|
||||
sha256 = "sha256-YL90dRmOvfbizT+hfkNu267JtG122LTMS9MHCfaMzkk=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "A Visual Studio Code extension for PowerShell language support";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell";
|
||||
homepage = "https://github.com/PowerShell/vscode-powershell";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rhoriguchi ];
|
||||
};
|
||||
};
|
||||
|
||||
ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { };
|
||||
|
||||
ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension {
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-44";
|
||||
version = "7.1.0-45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
hash = "sha256-vJGZ47l8nSRnINWHsw562zsQ14fSR5SObr/SO+/40yw=";
|
||||
hash = "sha256-fiygwb15dbMyTZ62iWbhWaHpdmoK4rKeb46v0sojgpc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lscolors";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-TGraX1H9grqTm3kQ3NLET2EnD9pzdiblEfMt+g5Szkc=";
|
||||
sha256 = "sha256-RU5DhrfB4XlrI4fHUw0/88Ib6H6xvDlRwUNPPwgVKE0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-OAQaazT4ChmTokw5yFKaGxwAXJklNgPWaegJVsCkOaA=";
|
||||
cargoSha256 = "sha256-COWvR7B9tXGuPaD311bFzuoqkISDlIOD6GDQdFa6wT4=";
|
||||
|
||||
# setid is not allowed in the sandbox
|
||||
checkFlags = [ "--skip=tests::style_for_setid" ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "4.2.12";
|
||||
version = "4.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
|
||||
sha256 = "sha256-B9V3dw5A52yPoNfROI3+wAql+Y0hY4T3sTm9uN70TQQ=";
|
||||
sha256 = "sha256-SUvj9YP7hIgF003caPsx5AWnMYr38y/XRf6TRm0tMAo=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, gumbo
|
||||
, harfbuzz
|
||||
, jbig2dec
|
||||
, mujs
|
||||
, mupdf
|
||||
, openjpeg
|
||||
, qt3d
|
||||
|
|
@ -15,29 +16,25 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sioyek";
|
||||
version = "1.2.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahrm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G4iZi6xTJjWZN0T3lO0jPquxJ3p8Mc0ewmjJEKcGJ34=";
|
||||
sha256 = "sha256-F71JXgYaWAye+nlSrZvGjJ4ucvHTx3tPZHRC5QI4QiU=";
|
||||
};
|
||||
|
||||
buildInputs = [ gumbo harfbuzz jbig2dec mupdf openjpeg qt3d qtbase ];
|
||||
buildInputs = [ gumbo harfbuzz jbig2dec mupdf mujs openjpeg qt3d qtbase ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles wrapQtAppsHook qmake ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pdf_viewer_build_config.pro \
|
||||
--replace "-lmupdf-threads" "-lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg"
|
||||
substituteInPlace pdf_viewer/main.cpp \
|
||||
--replace "/usr/share/sioyek" "$out/share" \
|
||||
--replace "/etc/sioyek" "$out/etc"
|
||||
'';
|
||||
|
||||
qmakeFlags = "DEFINES+=\"LINUX_STANDARD_PATHS\" pdf_viewer_build_config.pro";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 tutorial.pdf $out/share/tutorial.pdf
|
||||
cp -r pdf_viewer/shaders $out/share/
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.14.1";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
sha256 = "sha256-Y8Bo2niIyvBE3BPpnSanFrR8ZHIUdG7iKSOyD6YadIM=";
|
||||
sha256 = "sha256-1E4YtGSiHXG7G60Rng1t4OvgLvn9tjYahCkrFnlfLyw=";
|
||||
};
|
||||
vendorSha256 = "sha256-MnSOWJwTOQmHnABRYNJwU9kOr7g51rkUaERksupBTb4=";
|
||||
vendorSha256 = "sha256-S0297wgoqhPD9+nyzPEytpfppA91PWo1q4B7L8CHKLs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,20 @@
|
|||
{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:
|
||||
let
|
||||
ver = "1.2.331.0";
|
||||
source =
|
||||
if stdenv.isDarwin then {
|
||||
url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";
|
||||
sha256 = "0gr6frdn9jvxnkymkcpvgkqw4z2sac9jdf5qj4hzakq1zkfviazf";
|
||||
} else {
|
||||
url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";
|
||||
sha256 = "sha256-xWnY89dslkGhRTh9llRFkuUqYIjHQNt+TLnkPQr3u1Q=";
|
||||
};
|
||||
source = {
|
||||
url = rec {
|
||||
"x86_64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";
|
||||
"aarch64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_arm64/session-manager-plugin.deb";
|
||||
"x86_64-darwin" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";
|
||||
"aarch64-darwin" = x86_64-darwin;
|
||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
sha256 = rec {
|
||||
"x86_64-linux" = "sha256-xWnY89dslkGhRTh9llRFkuUqYIjHQNt+TLnkPQr3u1Q=";
|
||||
"aarch64-linux" = "sha256-QE6+EjLoydTPuLitG6fALXAtvIkfyoFuWij8Z2HT6+Q=";
|
||||
"x86_64-darwin" = "0gr6frdn9jvxnkymkcpvgkqw4z2sac9jdf5qj4hzakq1zkfviazf";
|
||||
"aarch64-darwin" = x86_64-darwin;
|
||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -35,10 +41,9 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage =
|
||||
"https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html";
|
||||
homepage = "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html";
|
||||
description = "Amazon SSM Session Manager Plugin";
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ mbaillie ];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.5.3";
|
||||
version = "3.5.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ mkDerivation rec {
|
|||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J6ukQ29DpCgmX9MF+evWXAy3usl0xB/xv4inBPS8nQI=";
|
||||
sha256 = "sha256-ennKNUuoyhpVfG1XPzJKrop0i77BAB3C2MNqZPOXNkc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
, uhd
|
||||
, soapysdr
|
||||
, libbladeRF
|
||||
, zeromq
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
|
|||
uhd
|
||||
soapysdr
|
||||
libbladeRF
|
||||
zeromq
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
# tests require `bgzip` from the htslib package
|
||||
checkInputs = [ htslib ];
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
buildInputs = [ zlib ncurses htslib ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{lib, stdenv, fetchurl, cmake, libGLU, libGL, qt5, boost}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "201707";
|
||||
version = "202206";
|
||||
build_nr = "1";
|
||||
pname = "mcrl2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz";
|
||||
sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
|
||||
sha256 = "KoLt8IU/vCdYqzJukNuaZfl8bWiOKB0UxWHEdQj3buU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jujutsu";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinvonz";
|
||||
repo = "jj";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BOT2pKcOSOha28fba62X+GgILcplhkMWhZo7Q0gGTQ8=";
|
||||
sha256 = "sha256-G8Y8ooi3aX6v/Ied62eSfo6PvXbZtx455bF0wVkZN30=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-uvR+WXX2iIWFhcPYpOoOS1WBvOXuhTmgVVT2446c6XE=";
|
||||
cargoSha256 = "sha256-7nWrwpv3xAffKiaUsnoA+h6ledjgG9tQeQ69WNl6e8o=";
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,12 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = null;
|
||||
|
||||
ldflags = [
|
||||
"-w" "-s"
|
||||
"-X github.com/docker/buildx/version.Package=github.com/docker/buildx"
|
||||
"-X github.com/docker/buildx/version.Version=v${version}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -D $GOPATH/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -88,6 +88,8 @@ let
|
|||
/lib32
|
||||
/usr/lib/i386-linux-gnu
|
||||
/usr/lib32
|
||||
/run/opengl-driver/lib
|
||||
/run/opengl-driver-32/lib
|
||||
EOF
|
||||
ldconfig &> /dev/null
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -50,7 +50,8 @@ let
|
|||
];
|
||||
|
||||
ldconfig = writeShellScriptBin "ldconfig" ''
|
||||
exec ${pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@"
|
||||
# due to a glibc bug, 64-bit ldconfig complains about patchelf'd 32-bit libraries, so we're using 32-bit ldconfig
|
||||
exec ${pkgsi686Linux.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@"
|
||||
'';
|
||||
etcProfile = writeText "profile" ''
|
||||
export PS1='${name}-chrootenv:\u@\h:\w\$ '
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unihan-database";
|
||||
version = "12.1.0";
|
||||
version = "14.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.unicode.org/Public/zipped/${version}/Unihan.zip";
|
||||
sha256 = "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf";
|
||||
hash = "sha256-KuRRmyuCzU0VN5wX5Xv7EsM8D1TaSXfeA7KwS88RhS0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xa";
|
||||
version = "2.3.12";
|
||||
version = "2.3.13";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"
|
||||
"https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-+P0VNgEtZ2/Gy/zdapF5PlZMibbvdH+NuPRnwXj7BwQ=";
|
||||
hash = "sha256-qUd68VC2yKkc09QeHPjJ31UtODMmSVV2gwJxykRnvYY=";
|
||||
};
|
||||
|
||||
checkInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, cln, fetchurl, gmp, swig, pkg-config
|
||||
, readline, libantlr3c, boost, jdk8, autoreconfHook
|
||||
, python3, antlr3_4
|
||||
, libantlr3c, boost, autoreconfHook
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -13,13 +13,12 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ gmp readline swig libantlr3c antlr3_4 boost jdk8 python3 ]
|
||||
buildInputs = [ gmp swig libantlr3c boost python3 ]
|
||||
++ lib.optionals stdenv.isLinux [ cln ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-language-bindings=c,c++,java"
|
||||
"--enable-language-bindings=c"
|
||||
"--enable-gpl"
|
||||
"--with-readline"
|
||||
"--with-boost=${boost.dev}"
|
||||
] ++ lib.optionals stdenv.isLinux [ "--with-cln" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }:
|
||||
{ lib, stdenv, gcc10StdenvCompat, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }:
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
|
@ -10,7 +10,9 @@ let
|
|||
};
|
||||
meta.broken = false;
|
||||
});
|
||||
cvc4 = pkgs.callPackage ./cvc4.nix {};
|
||||
cvc4 = pkgs.callPackage ./cvc4.nix {
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
in
|
||||
|
||||
mkCoqDerivation {
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yabasic";
|
||||
version = "2.90.1";
|
||||
version = "2.90.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-9LqiwS3Udql3YZoufo3spVpE46me3McI8L08TpNJpJo=";
|
||||
hash = "sha256-ff5j0cJ1i2HWIsYjwzx5FFtZfchWsGRF2AZtbDXrNJw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -49,8 +49,11 @@
|
|||
, alsa-lib ? null # Alsa in/output support
|
||||
#, avisynth ? null # Support for reading AviSynth scripts
|
||||
, bzip2 ? null
|
||||
, clang ? null
|
||||
, celt ? null # CELT decoder
|
||||
#, crystalhd ? null # Broadcom CrystalHD hardware acceleration
|
||||
, cuda ? !stdenv.isDarwin && !stdenv.isAarch64 # Dynamically linked CUDA
|
||||
, cuda-llvm ? !stdenv.isDarwin && !stdenv.isAarch64 # LLVM-based CUDA compilation
|
||||
, dav1d ? null # AV1 decoder (focused on speed and correctness)
|
||||
#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support
|
||||
, fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder
|
||||
|
|
@ -331,6 +334,8 @@ stdenv.mkDerivation rec {
|
|||
#(enableFeature avisynth "avisynth")
|
||||
(enableFeature (bzip2 != null) "bzlib")
|
||||
(enableFeature (celt != null) "libcelt")
|
||||
(enableFeature cuda "cuda")
|
||||
(enableFeature (clang != null && cuda-llvm) "cuda-llvm")
|
||||
#(enableFeature crystalhd "crystalhd")
|
||||
(enableFeature (dav1d != null) "libdav1d")
|
||||
#(enableFeature decklinkExtlib "decklink")
|
||||
|
|
@ -451,6 +456,7 @@ stdenv.mkDerivation rec {
|
|||
++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ]
|
||||
++ optional (isLinux && !isAarch64 && libmfx != null) libmfx
|
||||
++ optional (nvdec || nvenc) nv-codec-headers
|
||||
++ optional cuda-llvm clang
|
||||
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
|
||||
MediaToolbox VideoDecodeAcceleration
|
||||
libiconv ];
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-2lBBC48Z/X53WwDR/g26Z/xeEVHe0pkVjcJd2tw/qKk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
(substituteAll {
|
||||
src = ./bubblewrap-paths.patch;
|
||||
bubblewrap_bin = "${bubblewrap}/bin/bwrap";
|
||||
|
|
@ -58,14 +58,15 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
bubblewrap
|
||||
xkeyboard_config
|
||||
libxkbcommon # for xkbregistry
|
||||
isocodes
|
||||
wayland
|
||||
gtk3
|
||||
gtk4
|
||||
glib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
bubblewrap
|
||||
wayland
|
||||
libseccomp
|
||||
systemd
|
||||
];
|
||||
|
|
@ -79,6 +80,9 @@ stdenv.mkDerivation rec {
|
|||
"-Ddesktop_docs=false"
|
||||
"-Ddate_in_gnome_version=false"
|
||||
"-Dgnome_distributor=NixOS"
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
"-Dsystemd=disabled"
|
||||
"-Dudev=disabled"
|
||||
];
|
||||
|
||||
separateDebugInfo = stdenv.isLinux;
|
||||
|
|
@ -93,7 +97,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Library with common API for various GNOME modules";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@
|
|||
sha256 = "sha256-zr1WuTkOBAVk7JkpDT52rfGGOaXEqiPFIGmJUDPhI/w=";
|
||||
};
|
||||
|
||||
configureFlags = old.configureFlags ++ [
|
||||
"--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
for file in $(cat debian/patches/series); do
|
||||
patch -p1 < debian/patches/$file
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lib2geom";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "inkscape";
|
||||
repo = "lib2geom";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-u9pbpwVzAXzrM2/tQnd1B6Jo9Fzg6UZBr9AtUsNMfQ0=";
|
||||
sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
, gnome
|
||||
, gsettings-desktop-schemas
|
||||
, xvfb-run
|
||||
, AppKit
|
||||
, Foundation
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -48,11 +50,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
] ++ lib.optionals (!doCheck) [
|
||||
"-Dtests=false"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fribidi
|
||||
gobject-introspection
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
Foundation
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -61,10 +68,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
checkInputs = [
|
||||
gnome.adwaita-icon-theme
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
xvfb-run
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Tests had to be disabled on Darwin because they fail with the same error as https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264947 on Hydra:
|
||||
#
|
||||
# In file included from ../tests/test-style-manager.c:10:
|
||||
# ../src/adw-settings-private.h:16:10: fatal error: 'adw-enums-private.h' file not found
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
|
@ -81,7 +93,7 @@ stdenv.mkDerivation rec {
|
|||
# Tests need a cache directory
|
||||
"HOME=$TMPDIR"
|
||||
)
|
||||
env "''${testEnvironment[@]}" xvfb-run \
|
||||
env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.isDarwin) "xvfb-run"} \
|
||||
meson test --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
|
|
@ -102,6 +114,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://gitlab.gnome.org/GNOME/libadwaita";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = teams.gnome.members ++ (with maintainers; [ dotlambda ]);
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcdada";
|
||||
version = "0.3.5";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msune";
|
||||
repo = "libcdada";
|
||||
rev = "v${version}";
|
||||
sha256 = "0vcsf3s4fbw2w33jjc8b509kc0xb6ld58l8wfxgqwjqx5icfg1ps";
|
||||
sha256 = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,18 @@
|
|||
, libwebpmuxSupport ? true # Build libwebpmux
|
||||
, libwebpdemuxSupport ? true # Build libwebpdemux
|
||||
, libwebpdecoderSupport ? true # Build libwebpdecoder
|
||||
|
||||
# for passthru.tests
|
||||
, freeimage
|
||||
, gd
|
||||
, graphicsmagick
|
||||
, haskellPackages
|
||||
, imagemagick
|
||||
, imlib2
|
||||
, libjxl
|
||||
, opencv
|
||||
, python3
|
||||
, vips
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -51,6 +63,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit freeimage gd graphicsmagick imagemagick imlib2 libjxl opencv vips;
|
||||
inherit (python3.pkgs) pillow imread;
|
||||
haskell-webp = haskellPackages.webp;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools and library for the WebP image format";
|
||||
homepage = "https://developers.google.com/speed/webp/";
|
||||
|
|
|
|||
|
|
@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Ignore broken test, likely not causing huge breakage
|
||||
# (https://github.com/canonical/raft/issues/292)
|
||||
postPatch = ''
|
||||
substituteInPlace test/integration/test_uv_tcp_connect.c --replace \
|
||||
"TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, 0, NULL)" \
|
||||
"TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, MUNIT_TEST_OPTION_TODO, NULL)"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace configure --replace /usr/bin/ " "
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tkrzw";
|
||||
version = "1.0.21";
|
||||
version = "1.0.24";
|
||||
# TODO: defeat multi-output reference cycles
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz";
|
||||
hash = "sha256-1g3sIRXxYtD8XGVNpbn4HLTCi+xl2yfJklbUouMQcHs=";
|
||||
hash = "sha256-G7SVKgU4b8I5iwAlGHL/w8z0fhI+Awe3V6aqFsOnUrA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zchunk";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zchunk";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4=";
|
||||
hash = "sha256-/gtkw020pybUDUeYydXgJ4PLvdOqZ0RbrLOfNMDaCmA=";
|
||||
};
|
||||
|
||||
# unbreak on darwin by finding argp-standalone, based on the patch from
|
||||
|
|
|
|||
|
|
@ -2546,6 +2546,39 @@ buildLuarocksPackage {
|
|||
};
|
||||
}) {};
|
||||
|
||||
serpent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit, lua
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "serpent";
|
||||
version = "0.30-2";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/serpent-0.30-2.rockspec";
|
||||
sha256 = "0v83lr9ars1n0djbh7np8jjqdhhaw0pdy2nkcqzqrhv27rzv494n";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/pkulchenko/serpent",
|
||||
"rev": "d78683597606c6e13a1fed039bc91d86eb8f600f",
|
||||
"date": "2017-09-01T21:35:14-07:00",
|
||||
"path": "/nix/store/z6df44n3p07n4bia7s514vgngbkbpnap-serpent",
|
||||
"sha256": "0q80yfrgqgr01qprf0hrp284ngb7fbcq1v9rbzmdkhbm9lpgy8v8",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
'') ["date" "path"]) ;
|
||||
|
||||
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/pkulchenko/serpent";
|
||||
description = "Lua serializer and pretty printer";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
sqlite = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit, luv
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, chardet
|
||||
, docker
|
||||
, entrypoints
|
||||
, escapism
|
||||
|
|
@ -30,6 +31,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
chardet
|
||||
docker
|
||||
entrypoints
|
||||
escapism
|
||||
|
|
|
|||
|
|
@ -35,6 +35,6 @@ buildPythonPackage rec {
|
|||
description = "Reference implementation of SLIP-0039";
|
||||
homepage = "https://github.com/trezor/python-shamir-mnemonic";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ _1000101 prusnak ];
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,6 +80,6 @@ buildPythonPackage rec {
|
|||
description = "Python library for communicating with Trezor Hardware Wallet";
|
||||
homepage = "https://github.com/trezor/trezor-firmware/tree/master/python";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ np prusnak mmahut _1000101 ];
|
||||
maintainers = with maintainers; [ np prusnak mmahut ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubepug";
|
||||
version = "1.3.2";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rikatz";
|
||||
repo = "kubepug";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cjL718xTgtYev/lYL24vwZcB+joY3wIY4ixRCwAHQ4E=";
|
||||
sha256 = "sha256-BljDmyueGtQztdHnix4YP+zvhor1+ofahQ8971/o1xY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0hynxj3q4aa1gx3w4ak56z6j5iplxi2hzqzsjkgz20fy34nfd41s";
|
||||
vendorSha256 = "sha256-SZckJDFYGsjYEzpJOZ1BE0gNLqn4so23OcOUnPo6zdU=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}"
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "skopeo";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "containers";
|
||||
repo = "skopeo";
|
||||
sha256 = "sha256-oNTGFoz/5KaxniA0+HfyGAFIt42a8YLdI3eeARWx2uA=";
|
||||
sha256 = "sha256-F2kIFBsLhjV8Ecof05Ii5TzneEUdl9dmCZ2NhOABdmc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lpairs2";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-35KYDnPWOjNPu9wz9AWvSBAo1tdVDo7I2TNxtxE5RRg=";
|
||||
hash = "sha256-swe/cB9RqxHSNSShiryJ8XfwZk2X6qIDxFURbwNOd58=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pam_gnupg";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cruegge";
|
||||
repo = "pam-gnupg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NDl6MsvIDAXkaLqXt7Wa0T7aulT31P5Z/d/Vb+ILya0=";
|
||||
sha256 = "sha256-6I9a841qohA42lhOgZf/hharnjkthuB8lRptPDxUgMI=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -13,6 +13,20 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-cpY+lYM/nAX3nUaFknrRAavxDk8UDzJkoqFjJ1/KWeg=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.themesPath=${placeholder "out"}/share/alps/themes"
|
||||
"-X git.sr.ht/~migadu/alps.PluginDir=${placeholder "out"}/share/alps/plugins"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace plugin.go --replace "const PluginDir" "var PluginDir"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/alps"
|
||||
cp -r themes plugins "$out/share/alps/"
|
||||
'';
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
|
||||
{ lib, buildGoPackage, fetchFromGitHub, nixosTests, stdenv }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "etcd";
|
||||
|
|
@ -31,5 +31,6 @@ buildGoPackage rec {
|
|||
license = licenses.asl20;
|
||||
homepage = "https://etcd.io/";
|
||||
maintainers = with maintainers; [ offline zowoq ];
|
||||
broken = stdenv.isDarwin; # outdated golang.org/x/sys
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "9.0.5";
|
||||
version = "9.0.6";
|
||||
|
||||
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
|
||||
|
||||
|
|
@ -10,12 +10,12 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-TYT1eJ9jg82GFunYofPMCWuHB60qFg1lWTH2iapyUlc=";
|
||||
sha256 = "sha256-at9JvFLP2xGIFQODHw8zi3kEqIKJ8SBwBbcjVLVeYRc=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "sha256-NljayyDOVazm5OyQw+XlHJgW0caC4TSmR56QwTTWrlw=";
|
||||
sha256 = "sha256-92gWk5G6zLmesS0r5QRePdsVYJ9CFS/i0rsT8HOK1Js=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8=";
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.27.2.5929-a806c5905";
|
||||
version = "1.28.0.5999-97678ded3";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "0xm8bjmmybmyv1nbip8n23pd61lnvr41rsxa12cb9j6bg4nbka3x";
|
||||
sha256 = "sha256-irHHEkbdRabzcNiemcFeFoDmB7LZqhFYMe+zVpMv5JQ=";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "15wjy59ga5y93y09l5mbi20rqw63v61xv7x831iinhp96v5ixq00";
|
||||
sha256 = "sha256-RxD0wLZ/Uw0niKZdAfEhDxnf2jZapbrjSjH3XerfTsM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "soft-serve";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "soft-serve";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uzjcLLWo+67ayaSjAvk2ktBO3s1z0jDyGRj+Q9F6UVQ=";
|
||||
sha256 = "sha256-W/2MNiECzwgRv3jJG0To8vsQjQs8amaEP+dgig6JnOg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AQwd4N4uYEDCsrlxrrGiXAqLcsSA/2MBydHEnH1j+Do=";
|
||||
vendorSha256 = "sha256-98YT0UiVX+ONP+Vgsxf0UWOLF0VV4glEOfHYkGwB3Dg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wishlist";
|
||||
version = "0.5.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "wishlist";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J9Wd2CyQo8vzfE2jXQzbNA+oihG71F3ZQmEW/r0a72I=1";
|
||||
sha256 = "sha256-Q2/F4/bPhPmwkbc7dulx4jubwdwiwVWMNBclO2qf8rU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5+wuavHLXwjtvwA9tSpdF2Zd8tw5FklzvaTeCZlA4WQ=";
|
||||
vendorSha256 = "sha256-gmLPMar3ICZ14uxahQPkruKUoZbnvYAdu5IfO2pNEXM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sec";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simple-evcorr";
|
||||
repo = "sec";
|
||||
rev = version;
|
||||
sha256 = "sha256-WYSlIRhDBIDaza92VqCQcdMNicuRUX2IKY5CJyhswdI=";
|
||||
sha256 = "sha256-DKbh6q0opf749tbGsDMVuI5G2UV7faCHUfddH3SGOpo=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
|
|
|||
54
pkgs/tools/filesystems/kdiskmark/default.nix
Normal file
54
pkgs/tools/filesystems/kdiskmark/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qttools
|
||||
, fio
|
||||
, cmake
|
||||
, kauth
|
||||
, extra-cmake-modules
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kdiskmark";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonmagon";
|
||||
repo = "kdiskmark";
|
||||
rev = version;
|
||||
sha256 = "sha256-9ufRxEbqwcRs+m/YW8D3+1USCJNZEaOUZRec7gvgmtA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
extra-cmake-modules
|
||||
kauth
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# so that kdiskmark can be used as unpriviledged user even on non-kde
|
||||
# (where kauth is not in environment.systemPackages)
|
||||
ln -s ${kauth}/share/dbus-1/system.d/org.kde.kf5auth.conf $out/share/dbus-1/system.d/00-kdiskmark-needs-org.kde.kf5auth.conf
|
||||
'';
|
||||
|
||||
qtWrapperArgs =
|
||||
[ "--prefix" "PATH" ":" (lib.makeBinPath [ fio ]) ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "HDD and SSD benchmark tool with a friendly graphical user interface";
|
||||
longDescription = ''
|
||||
If kdiskmark is not run as root it can rely on polkit to get the necessary
|
||||
privileges. In this case you must install it with `environment.systemPackages`
|
||||
on NixOS, nix-env will not work.
|
||||
'';
|
||||
homepage = "https://github.com/JonMagon/KDiskMark";
|
||||
maintainers = [ maintainers.symphorien ];
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkBasalt";
|
||||
version = "0.3.2.5";
|
||||
version = "0.3.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DadSchoorse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1UHxPtpmkDNOJwKXVlRN2lpvRm4XPHNwxOBpEikXxqA=";
|
||||
sha256 = "sha256-wk/bmbwdE1sBZPlD+EqXfQWDITIfCelTpoFBtNtZV8Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glslang meson ninja pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
|
|
@ -41,13 +42,13 @@ let
|
|||
]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ostree";
|
||||
version = "2022.2";
|
||||
version = "2022.5";
|
||||
|
||||
outputs = [ "out" "dev" "man" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
|
||||
sha256 = "sha256-duL1tXhNjLaG6QvjL87LtWxsaoJOA3ShpoILV3EDZ2s=";
|
||||
sha256 = "sha256-kUxNmTvBEdfdMK6XIbb/6KtW6x/W6BsJewn0AMwbBT8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -40,13 +40,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpm-ostree";
|
||||
version = "2022.3";
|
||||
version = "2022.12";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-ERDaCLj/qvyzAxmpUfFsCx9fsDjlhQ19PRyUTVZ2Z2w=";
|
||||
sha256 = "sha256-kl9TwrvrIdF/R4NIVXUP2WYDflwB6BE+0j9Rum9jTXY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tendermint";
|
||||
version = "0.35.2";
|
||||
version = "0.35.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tendermint";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QCCDZ0zsAqV7tvlBeyTpN5iz/jBc50oBgrmUB/R5wCY=";
|
||||
sha256 = "sha256-3tggW+M3vZChDT1g77W5M3hchEN6pTSVvkrZda6ZTCY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-h4sNfV8B+WGgfVPDmWVNek7fQo5qZ3+VGkx4VSw4QF8=";
|
||||
vendorSha256 = "sha256-/enY0qERFzAIJNcuw1djRGoAcmtz7R5Ikvlts0f7rLc=";
|
||||
|
||||
subPackages = [ "cmd/tendermint" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.5.12";
|
||||
version = "5.5.13";
|
||||
pname = "whois";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfc1036";
|
||||
repo = "whois";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UJy71VKEKPYfRXZB2lJiy6Ua6BkGW9Uz0zXciZC4oJE=";
|
||||
sha256 = "sha256-Qd1tPRKbiTNmsOdawxQhJO1ykEA1VdAAXeBPPVlXwvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl gettext pkg-config ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-07-27";
|
||||
version = "2022-08-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4GVlnr7ga+1xOb9cFKNeb0HELj8A8NgxwsKTnNpWqJI=";
|
||||
hash = "sha256-7wXM4xYuhxdjLvqVeXBnJEr1Pqj28p7YQ1jRbGbOAOA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,44 +1,52 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, qtbase
|
||||
, qttools
|
||||
, radare2
|
||||
, wrapQtAppsHook
|
||||
, zip
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
# TODO MacOS support.
|
||||
# TODO Build and install translations.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iaito";
|
||||
version = "5.7.0";
|
||||
version = "5.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-qEJTsS669eEwo2iiuybN72O5oopCaGEkju8+ekjw2zk=";
|
||||
sha256 = "sha256-5/G5wfdc6aua90XLP3B7Ruy8F3NTXzWfQE6yVDZ0rX8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qttools wrapQtAppsHook zip ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config python3 qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ radare2 qtbase ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "git submodule update --init" ""
|
||||
postUnpack = ''
|
||||
sourceRoot=$sourceRoot/src
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${radare2}/include/libr" "-I${radare2}/include/libr/sdb" ];
|
||||
# TODO Fix version checking and version information for r2.
|
||||
# Version checking always fails due to values being empty strings for some
|
||||
# reason. Meanwhile, we can safely assume that radare2's runtime and
|
||||
# compile-time implementations are the same and remove this check.
|
||||
patches = [ ./remove-broken-version-check.patch ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 build/iaito $out/bin/iaito
|
||||
install -Dm644 $src/src/org.radare.iaito.appdata.xml $out/share/metainfo/org.radare.iaito.appdata.xml
|
||||
install -Dm644 $src/src/org.radare.iaito.desktop $out/share/applications/org.radare.iaito.desktop
|
||||
install -Dm644 $src/src/img/iaito-o.svg $out/share/pixmaps/iaito-o.svg
|
||||
install -m755 -Dt $out/bin iaito
|
||||
install -m644 -Dt $out/share/metainfo $src/src/org.radare.iaito.appdata.xml
|
||||
install -m644 -Dt $out/share/applications $src/src/org.radare.iaito.desktop
|
||||
install -m644 -Dt $out/share/pixmaps $src/src/img/iaito-o.svg
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
@ -48,14 +56,15 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Official frontend of radare2";
|
||||
description = "An official graphical interface of radare2";
|
||||
longDescription = ''
|
||||
The official graphical interface for radare2, a libre reverse engineering
|
||||
framework.
|
||||
iaito is the official graphical interface of radare2. It's the
|
||||
continuation of Cutter for radare2 after the Rizin fork.
|
||||
'';
|
||||
homepage = "https://github.com/radareorg/iaito";
|
||||
homepage = "https://radare.org/n/iaito.html";
|
||||
changelog = "https://github.com/radareorg/iaito/releases/tag/${src.rev}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
54
pkgs/tools/security/iaito/remove-broken-version-check.patch
Normal file
54
pkgs/tools/security/iaito/remove-broken-version-check.patch
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
diff --git i/IaitoApplication.cpp w/IaitoApplication.cpp
|
||||
index 25b6a4e7..4cbde5c4 100644
|
||||
--- i/IaitoApplication.cpp
|
||||
+++ w/IaitoApplication.cpp
|
||||
@@ -33,27 +33,6 @@
|
||||
#include <R2GhidraDecompiler.h>
|
||||
#endif
|
||||
|
||||
-static bool versionCheck() {
|
||||
- // Check r2 version
|
||||
- QString a = r_core_version (); // runtime library version
|
||||
- QString b = "" R2_GITTAP; // compiled version
|
||||
- QStringList la = a.split(".");
|
||||
- QStringList lb = b.split(".");
|
||||
- if (la.size() < 2 && lb.size() < 2) {
|
||||
- eprintf ("Invalid version string somwhere\n");
|
||||
- return false;
|
||||
- }
|
||||
- if (la.at(0) != lb.at(0)) {
|
||||
- eprintf ("Major version differs\n");
|
||||
- return false;
|
||||
- }
|
||||
- if (la.at(1) != lb.at(1)) {
|
||||
- eprintf ("Minor version differs\n");
|
||||
- return false;
|
||||
- }
|
||||
- return true;
|
||||
-}
|
||||
-
|
||||
IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc, argv)
|
||||
{
|
||||
// Setup application information
|
||||
@@ -101,21 +80,6 @@ IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc,
|
||||
std::exit(1);
|
||||
}
|
||||
|
||||
- if (!versionCheck ()) {
|
||||
- QMessageBox msg;
|
||||
- msg.setIcon(QMessageBox::Critical);
|
||||
- msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
|
||||
- msg.setWindowTitle(QObject::tr("Version mismatch!"));
|
||||
- QString localVersion = r_core_version ();
|
||||
- QString r2version = R2_GITTAP;
|
||||
- msg.setText(QString(
|
||||
- QObject::tr("The version used to compile Iaito (%1) does not match the binary version of radare2 (%2). This could result in unexpected behaviour. Are you sure you want to continue?")).arg(
|
||||
- localVersion, r2version));
|
||||
- if (msg.exec() == QMessageBox::No) {
|
||||
- std::exit(1);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
#ifdef IAITO_ENABLE_PYTHON
|
||||
// Init python
|
||||
if (!clOptions.pythonHome.isEmpty()) {
|
||||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vault";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U/oRUalDYJ8ChrknfUKcXOqWeml8y869SIWRDMVbpAo=";
|
||||
sha256 = "sha256-dEIrTz24zBN6axl8bPdc4N9iebE7YBF0mGUSAbHx9Ug=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qnvmLimuOkJiH1ct1a7WCYh/bcgQ5XY5GzgVbrQyr/0=";
|
||||
vendorSha256 = "sha256-/EXrOS7kBxu6LtwTMipVJfjrJH7RuIwqD5LHH3yDADQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vault-bin";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
|
|||
aarch64-darwin = "darwin_arm64";
|
||||
};
|
||||
sha256 = selectSystem {
|
||||
x86_64-linux = "sha256-3oxIjILjl85GAl/YwTRrXunWY7UmPtOuG0wxA7wrzp0=";
|
||||
aarch64-linux = "sha256-PiIibaFPBBTWPLVIWmCXqR51+HujoQmVOsm8AJTNr9s=";
|
||||
i686-linux = "sha256-t3myhfPUe/28BlSIoxNbjmYykHlet5mWxOLuyNcu4o4=";
|
||||
x86_64-darwin = "sha256-nPcKir2NcsXnQ6RG6TrioLC4jT9Pn7NssNjjDnw+fAY=";
|
||||
aarch64-darwin = "sha256-yJJXmoR4Re1iIbSI6+VwOGP3FZvlJcumjxXM+PfPZm4=";
|
||||
x86_64-linux = "sha256-mh/O9X4yOEspZ3Z+N22Wt8PeNee9U7U4R8laS7PCrhI=";
|
||||
aarch64-linux = "sha256-9LybdftRdc9NYxYzPwojYdYxu1DbtVjG0nlT88oxX9E=";
|
||||
i686-linux = "sha256-nPnWzxv5AVfOrGJxnFImZacUeKRZ0+Gyesf5TiRvz/0=";
|
||||
x86_64-darwin = "sha256-kOT1Vs2LxCih/GewL66tVI5t50eKU/ejT9ccSjp7ar8=";
|
||||
aarch64-darwin = "sha256-UkuZAFzT3pjg7q7NJ4+DaAk0syAVf6N512bxwLuQHHE=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.14.0";
|
||||
version = "5.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a0H/OqIHgutuW1egqlhMy5mX2FMYxmAwCbhecCrXuOU=";
|
||||
sha256 = "sha256-XfBmxAuhGt5SYl4D8pf+FnB3R5Hg/G72r4pYgIrL2mg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc=";
|
||||
vendorSha256 = "sha256-w+nOoEtEtRjXakrVV3aLj+clhyqgL5cJ6iu689cJeKs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,19 +9,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "way-displays";
|
||||
version = "1.5.3";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-courtis";
|
||||
repo = "way-displays";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-5A0qZRpWw3Deo9cGqGULpQMoPCVh85cWE/wJ5XSbVJk=";
|
||||
sha256 = "sha256-wrfRSJaVz0GjYxuIDvJ+16aaz+kRTtv0q5jN2IG4Uco=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/cfg.cpp --replace "\"/etc" "\"$out/etc"
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -35,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
libinput
|
||||
];
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC="];
|
||||
makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC= ROOT_ETC=$(out)/etc"];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/alex-courtis/way-displays";
|
||||
|
|
|
|||
|
|
@ -7736,6 +7736,8 @@ with pkgs;
|
|||
|
||||
kdigger = callPackage ../tools/security/kdigger { };
|
||||
|
||||
kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { };
|
||||
|
||||
keepalived = callPackage ../tools/networking/keepalived { };
|
||||
|
||||
kexec-tools = callPackage ../os-specific/linux/kexec-tools { };
|
||||
|
|
@ -18636,7 +18638,9 @@ with pkgs;
|
|||
|
||||
libad9361 = callPackage ../development/libraries/libad9361 { };
|
||||
|
||||
libadwaita = callPackage ../development/libraries/libadwaita { };
|
||||
libadwaita = callPackage ../development/libraries/libadwaita {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation;
|
||||
};
|
||||
|
||||
libaec = callPackage ../development/libraries/libaec { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue