mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-29 03:10:19 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -4302,6 +4302,15 @@
|
||||
githubId = 34766150;
|
||||
name = "datafoo";
|
||||
};
|
||||
DataHearth = {
|
||||
email = "dev@antoine-langlois.net";
|
||||
github = "DataHearth";
|
||||
githubId = 28595242;
|
||||
name = "DataHearth";
|
||||
keys = [{
|
||||
fingerprint = "A129 2547 0298 BFEE 7EE0 92B3 946E 2D0C 410C 7B3D";
|
||||
}];
|
||||
};
|
||||
davegallant = {
|
||||
name = "Dave Gallant";
|
||||
email = "davegallant@gmail.com";
|
||||
@@ -5323,6 +5332,12 @@
|
||||
githubId = 7875;
|
||||
name = "Rommel Martinez";
|
||||
};
|
||||
ecklf = {
|
||||
email = "ecklf@icloud.com";
|
||||
github = "ecklf";
|
||||
githubId = 8146736;
|
||||
name = "Florentin Eckl";
|
||||
};
|
||||
eclairevoyant = {
|
||||
github = "eclairevoyant";
|
||||
githubId = 848000;
|
||||
@@ -18336,6 +18351,13 @@
|
||||
githubId = 2666479;
|
||||
name = "Y Nguyen";
|
||||
};
|
||||
superherointj = {
|
||||
email = "sergiomarcelo@yandex.com";
|
||||
github = "superherointj";
|
||||
githubId = 5861043;
|
||||
matrix = "@superherointj:matrix.org";
|
||||
name = "Sérgio Marcelo";
|
||||
};
|
||||
SuperSandro2000 = {
|
||||
email = "sandro.jaeckel@gmail.com";
|
||||
matrix = "@sandro:supersandro.de";
|
||||
|
||||
@@ -17,14 +17,11 @@ let
|
||||
lib.mapAttrs (_: toString) cfg.extraConfig
|
||||
);
|
||||
|
||||
manage =
|
||||
let
|
||||
setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);
|
||||
in
|
||||
pkgs.writeShellScript "manage" ''
|
||||
${setupEnv}
|
||||
exec ${pkg}/bin/tandoor-recipes "$@"
|
||||
'';
|
||||
manage = pkgs.writeShellScript "manage" ''
|
||||
set -o allexport # Export the following env vars
|
||||
${lib.toShellVars env}
|
||||
exec ${pkg}/bin/tandoor-recipes "$@"
|
||||
'';
|
||||
in
|
||||
{
|
||||
meta.maintainers = with maintainers; [ ambroisie ];
|
||||
|
||||
@@ -12,17 +12,14 @@ let
|
||||
lib.mapAttrs (_: toString) cfg.settings
|
||||
);
|
||||
|
||||
manage =
|
||||
let
|
||||
setupEnv = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: val: "export ${name}=${lib.escapeShellArg val}") env);
|
||||
in
|
||||
pkgs.writeShellScript "manage" ''
|
||||
${setupEnv}
|
||||
eval "$(${config.systemd.package}/bin/systemctl show -pUID,MainPID photoprism.service | ${pkgs.gnused}/bin/sed "s/UID/ServiceUID/")"
|
||||
exec ${pkgs.util-linux}/bin/nsenter \
|
||||
-t $MainPID -m -S $ServiceUID -G $ServiceUID --wdns=${cfg.storagePath} \
|
||||
${cfg.package}/bin/photoprism "$@"
|
||||
'';
|
||||
manage = pkgs.writeShellScript "manage" ''
|
||||
set -o allexport # Export the following env vars
|
||||
${lib.toShellVars env}
|
||||
eval "$(${config.systemd.package}/bin/systemctl show -pUID,MainPID photoprism.service | ${pkgs.gnused}/bin/sed "s/UID/ServiceUID/")"
|
||||
exec ${pkgs.util-linux}/bin/nsenter \
|
||||
-t $MainPID -m -S $ServiceUID -G $ServiceUID --wdns=${cfg.storagePath} \
|
||||
${cfg.package}/bin/photoprism "$@"
|
||||
'';
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ stunkymonkey ];
|
||||
|
||||
@@ -98,6 +98,23 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
aaron-bond.better-comments = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "better-comments";
|
||||
publisher = "aaron-bond";
|
||||
version = "3.0.2";
|
||||
sha256 = "850980f0f5a37f635deb4bf9100baaa83f0b204bbbb25acdb3c96e73778f8197";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/aaron-bond.better-comments/changelog";
|
||||
description = "Improve your code commenting by annotating with alert, informational, TODOs, and more!";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=aaron-bond.better-comments";
|
||||
homepage = "https://github.com/aaron-bond/better-comments";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.DataHearth ];
|
||||
};
|
||||
};
|
||||
|
||||
adpyke.codesnap = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "codesnap";
|
||||
|
||||
@@ -16,7 +16,8 @@
|
||||
, libxkbcommon
|
||||
, libGLU
|
||||
, wayland
|
||||
, withBackends ? [ "freeimage" "libtiff" "libjpeg" "libpng" "librsvg" "libnsgif" "libheif" ]
|
||||
# "libnsgif" is disabled until https://todo.sr.ht/~exec64/imv/55 is solved
|
||||
, withBackends ? [ "freeimage" "libtiff" "libjpeg" "libpng" "librsvg" "libheif" ]
|
||||
, freeimage
|
||||
, libtiff
|
||||
, libjpeg_turbo
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "jetbrains-toolbox";
|
||||
version = "2.1.3.18901";
|
||||
version = "2.2.1.19765";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
|
||||
sha256 = "sha256-XZEpzzFm0DA6iiPGOKbmsuNlpIlt7Qa2A+jEqU6GqgE=";
|
||||
sha256 = "sha256-53CsE1hmtys5hNY2V+tskgwKg9jDLrEsYF6iY2fJGHU=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "owmods-cli";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ow-mods";
|
||||
repo = "ow-mod-man";
|
||||
rev = "cli_v${version}";
|
||||
hash = "sha256-hvzKTJKjO7MafvnrpG9ZkCz1ePr9NCo54zaRRkRCc60=";
|
||||
hash = "sha256-AfqpLL3cGZLKW5/BE6SaBe4S8GzYM2GKUZU8mFH5uX4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-db6wZs7OVPoESl4RnvOtmaM07FgKmko3nyf1CXzyJHA=";
|
||||
cargoHash = "sha256-PhdfpiUgeOB13ROgzPBYM+sBLGMP+RtV9j9ebo8PpJU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
enableGuile ? false, guile ? null
|
||||
, enablePython ? false, python ? null
|
||||
, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
|
||||
, fetchpatch
|
||||
# re-add javascript support when upstream supports modern spidermonkey
|
||||
}:
|
||||
|
||||
@@ -14,24 +13,15 @@ assert enablePython -> python != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elinks";
|
||||
version = "0.16.1.1";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rkd77";
|
||||
repo = "felinks";
|
||||
repo = "elinks";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u6QGhfi+uWeIzSUFuYHAH3Xu0Fky0yw2h4NOKgYFLsM=";
|
||||
hash = "sha256-JeUiMHAqSZxxBe8DplzmzHzsY6KqoBqba0y8GDwaR0Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build bug with perl 5.38.0. Backport of https://github.com/rkd77/elinks/pull/243 by gentoo:
|
||||
# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfefaa456bd69bc14e3a1c2c6c1b0cc19c6b0869
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch?id=dfefaa456bd69bc14e3a1c2c6c1b0cc19c6b0869";
|
||||
hash = "sha256-bHP9bc/l7VEw7oXlkSUQhhuq8rT2QTahh9SM7ZJgK5w=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses libX11 bzip2 zlib brotli zstd xz
|
||||
openssl libidn tre expat libev
|
||||
@@ -64,8 +54,8 @@ stdenv.mkDerivation rec {
|
||||
;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Full-featured text-mode web browser (package based on the fork felinks)";
|
||||
homepage = "https://github.com/rkd77/felinks";
|
||||
description = "Full-featured text-mode web browser";
|
||||
homepage = "https://github.com/rkd77/elinks";
|
||||
license = licenses.gpl2;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ iblech gebner ];
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "links2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${finalAttrs.meta.homepage}/download/links-${finalAttrs.version}.tar.bz2";
|
||||
url = "http://links.twibright.com/download/links-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-IqqWwLOOGm+PftnXpBZ6R/w3JGCXdZ72BZ7Pj56teZg=";
|
||||
};
|
||||
|
||||
|
||||
@@ -5,12 +5,14 @@
|
||||
, check
|
||||
, curl
|
||||
, expat
|
||||
, gperf
|
||||
, gtk2
|
||||
, gtk3
|
||||
, libXcursor
|
||||
, libXrandr
|
||||
, libidn
|
||||
, libjpeg
|
||||
, libjxl
|
||||
, libpng
|
||||
, libwebp
|
||||
, libxml2
|
||||
@@ -44,11 +46,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf";
|
||||
version = "3.10";
|
||||
version = "3.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=";
|
||||
hash = "sha256-wopiau/uQo0FOxP4i1xECSIkWXZSLRLq8TfP0y0gHLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -63,10 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
check
|
||||
curl
|
||||
gperf
|
||||
libXcursor
|
||||
libXrandr
|
||||
libidn
|
||||
libjpeg
|
||||
libjxl
|
||||
libpng
|
||||
libwebp
|
||||
libxml2
|
||||
@@ -103,8 +107,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
env.CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
|
||||
|
||||
patchPhase = lib.optionalString stdenv.cc.isClang ''
|
||||
runHook prePatch
|
||||
|
||||
substituteInPlace Makefile \
|
||||
--replace-warn '--trace' '-t' \
|
||||
--replace-warn '-Wimplicit-fallthrough=3' '-Wimplicit-fallthrough'
|
||||
|
||||
runHook postPatch
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
cat <<EOF > Makefile.conf
|
||||
cat <<EOF > Makefile.config
|
||||
override NETSURF_GTK_RES_PATH := $out/share/
|
||||
override NETSURF_USE_GRESOURCE := YES
|
||||
EOF
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf-libcss";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/libcss-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=";
|
||||
hash = "sha256-LfIVu+w01R1gwaBLAbLfTV0Y9RDx86evS4DN21ZxFU4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=implicit-fallthrough"
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
"-Wno-error=${if stdenv.cc.isGNU then "maybe-uninitialized" else "uninitialized"}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf-libdom";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/libdom-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";
|
||||
hash = "sha256-0F5FrxZUcBTCsKOuzzZw+hPUGfUFs/X8esihSR/DDzw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, gperf
|
||||
, perl
|
||||
, pkg-config
|
||||
, buildsystem
|
||||
@@ -9,16 +10,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf-libhubbub";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/libhubbub-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=";
|
||||
hash = "sha256-isHm9fPUjAUUHVk5FxlTQpDFnNAp78JJ60/brBAs1aU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
gperf
|
||||
perl
|
||||
buildsystem
|
||||
libparserutils
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf-libnsbmp";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/libnsbmp-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8=";
|
||||
hash = "sha256-VAenaCoSK6qqWhW1BSkOLTffVME8Xt70sJ0SyGLYIpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf-libnsgif";
|
||||
version = "0.2.1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/libnsgif-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks=";
|
||||
hash = "sha256-YBTIQvYUVNL1oPgkPXqNe96bfaPM/cotNGx8CyxMBhs=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf-libnsutils";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/libnsutils-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA=";
|
||||
hash = "sha256-VpS0Um5FjtAAQTzmAnWJy+EKJXp+zwZaAUIdxymd6pI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -3,20 +3,22 @@
|
||||
, fetchurl
|
||||
, perl
|
||||
, buildsystem
|
||||
, iconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf-libparserutils";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/libparserutils-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g=";
|
||||
hash = "sha256-MX7VxxjxeSe1chl0uuXeMsP9bQVdsTGtMbQxKgMu0Tk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
perl
|
||||
buildsystem
|
||||
iconv
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf-libsvgtiny";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/libsvgtiny-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E=";
|
||||
hash = "sha256-w1cifwLoP7KnaxK5ARkaCCIp2x8Ac2Lo8xx1RRDCoBw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "24.2.1";
|
||||
sha256 = "1flbjsa2wj35zgiq4vgb2bqvjvxmpla6fnrlkwnh2l10w4i2n5sl";
|
||||
vendorHash = "sha256-1DyqtUSMzVahy8yzX8HAnCe3UI5Z1Pht5XQaMS2i9mw=";
|
||||
version = "24.2.2";
|
||||
sha256 = "1q6lgmasqa9z7hi0ajcjwj24wrqs74v9vy247hq40y5naaqj07j8";
|
||||
vendorHash = "sha256-ImICopQkBLvSyy/KPmnd4JYeVIPlbzIUFAY4g2iqICI=";
|
||||
}
|
||||
|
||||
@@ -81,9 +81,9 @@ rec {
|
||||
|
||||
nomad_1_7 = generic {
|
||||
buildGoModule = buildGo121Module;
|
||||
version = "1.7.4";
|
||||
sha256 = "sha256-iyY899W/uwP/wQcarKufSpJdXRAtwDxT6yw5vrB6Xmk=";
|
||||
vendorHash = "sha256-yPf19IRTq+LAaoHsEFVuPJLapFxH3o16y0PbYW0ehiw=";
|
||||
version = "1.7.5";
|
||||
sha256 = "sha256-uwPAmmxxlPp5NuuCUTv5VykX+q2vbA0yCRoblrJPP1g=";
|
||||
vendorHash = "sha256-xu1odCHUO3cv0ldXj3T8aM+fqPzc4r1gyFWsiuyzOpU=";
|
||||
license = lib.licenses.bsl11;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -25,22 +25,21 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "newsflash";
|
||||
version = "3.0.2";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "news-flash";
|
||||
repo = "news_flash_gtk";
|
||||
rev = "refs/tags/v.${finalAttrs.version}";
|
||||
sha256 = "sha256-tJKr2bGkdpEb+25eN0ZfHhEDl5Zdf8fdaC/rNMbH8Ws=";
|
||||
hash = "sha256-ivdrbGtNa4/o+tXBQF9Ef17iNEUVFNPEXw1XpYxmRoQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"news-flash-2.3.0-alpha.0" = "sha256-H0osT7IrPbQ3RQYJZE7J+n7u4UCT86LAybUF3vvIXkA=";
|
||||
"news-flash-2.3.0-alpha.0" = "sha256-7x/Q/aR+h7zkZYNXaDz9qQ7Ve4Hqz17dIY6wWGMlH74=";
|
||||
"newsblur_api-0.2.0" = "sha256-eysCB19znQF8mRwQ64nSp6KuvJ1Trot4g4WCdQDedo8=";
|
||||
"article_scraper-2.0.0" = "sha256-FnOmrZyYewOuU8Au7fhmSJHN7UPCx/CxBV8UtSHattU=";
|
||||
"commafeed_api-0.1.0" = "sha256-69UAmyUm0WG3qPoWZw4PekXh1RjIP5l3dx3gjWfxJDQ=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 1d7089c..1952e7f 100644
|
||||
index e554ddd7..55a5048a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -58,8 +58,8 @@ meson.add_dist_script(
|
||||
@@ -56,10 +56,3 @@ meson.add_dist_script(
|
||||
subdir('data')
|
||||
subdir('po')
|
||||
subdir('src')
|
||||
|
||||
gnome.post_install(
|
||||
-
|
||||
-gnome.post_install(
|
||||
- gtk_update_icon_cache: true,
|
||||
+ gtk_update_icon_cache: false,
|
||||
glib_compile_schemas: false,
|
||||
- glib_compile_schemas: false,
|
||||
- update_desktop_database: true,
|
||||
+ update_desktop_database: false,
|
||||
)
|
||||
-)
|
||||
-
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.4.10";
|
||||
version = "1.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-dR9YJJBBxvnJkD42+MwIql3B1dlA6WUSLJ//lW22mmc=";
|
||||
hash = "sha256-vjxbWOaUanYXalGVDgX+sjsrz5Cn1yGBkBs9B8VGrDQ=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "chirp";
|
||||
version = "unstable-2023-06-02";
|
||||
version = "unstable-2024-02-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "72789c3652c332dc68ba694f8f8f005913fe5c95";
|
||||
hash = "sha256-WQwCX7h9BFLdYOBVVntxQ6g4t3j7QLfNmlHVLzlRh7U=";
|
||||
rev = "902043a937ee3611744f2a4e35cd902c7b0a8d0b";
|
||||
hash = "sha256-oDUtR1xD73rfBRKkbE1f68siO/4oxoLxw16w1qa9fEo=";
|
||||
};
|
||||
buildInputs = [
|
||||
glib
|
||||
|
||||
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
|
||||
rev = version;
|
||||
sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87";
|
||||
};
|
||||
patches = [
|
||||
# Fix missing type declaration
|
||||
# due to undeterminisitic compilation
|
||||
# of circularly dependent headers
|
||||
./stdint.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream fix for gcc-13 support:
|
||||
@@ -34,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple Theorem Prover";
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ McSinyx ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
||||
16
pkgs/applications/science/logic/stp/stdint.patch
Normal file
16
pkgs/applications/science/logic/stp/stdint.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
diff --git a/include/stp/AST/ASTNode.h b/include/stp/AST/ASTNode.h
|
||||
index 91acd726182c..0a17db23ffbf 100644
|
||||
--- a/include/stp/AST/ASTNode.h
|
||||
+++ b/include/stp/AST/ASTNode.h
|
||||
@@ -24,9 +24,10 @@ THE SOFTWARE.
|
||||
#ifndef ASTNODE_H
|
||||
#define ASTNODE_H
|
||||
|
||||
+#include "stp/AST/ASTInternal.h"
|
||||
#include "stp/AST/NodeFactory/HashingNodeFactory.h"
|
||||
+#include "stp/AST/UsefulDefs.h"
|
||||
#include "stp/Util/Attributes.h"
|
||||
-#include "ASTInternal.h"
|
||||
#include "stp/Globals/Globals.h"
|
||||
|
||||
namespace stp
|
||||
@@ -1,32 +1,22 @@
|
||||
{ lib, rustPlatform, fetchgit, fetchpatch
|
||||
{ lib, rustPlatform, fetchgit
|
||||
, pkg-config, protobuf, python3, wayland-scanner
|
||||
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "120.0";
|
||||
version = "121.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "0a9d1cb8be29e49c355ea8b18cd58506dbbaf6e5";
|
||||
sha256 = "BbCcsxJU25VgWVday4rGPXaJSuAWebNGo3MiYPIBBto=";
|
||||
rev = "1e7125327a29b7b7a0593caf339d382728c55cf6";
|
||||
sha256 = "Rjs46TtOhFZxqnEyqa4IyrRs7HnDZ/DJZ9DPEe7Oux0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "test-page-size-fix.patch";
|
||||
url = "https://chromium.googlesource.com/crosvm/crosvm/+/d9bc6e99ff5ac31d7d88b684c938af01a0872fc1%5E%21/?format=TEXT";
|
||||
decode = "base64 -d";
|
||||
includes = [ "src/crosvm/config.rs" ];
|
||||
hash = "sha256-3gfNzp0WhtNr+8CWSISCJau208EMIo3RJhM+4SyeV3o=";
|
||||
})
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-YXfKZeRL3gfWztf36lVNbCCwUqW+0w3q7X7v0arCrvk=";
|
||||
cargoHash = "sha256-7nfeg/q8baLvB0CoRWKU60TRfLAaRkeRxGojPvKpOLs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, dtc, pkgsCross }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, dtc, pkgsCross }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spike";
|
||||
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-4D2Fezej0ioOOupw3kgMT5VLs+/jXQjwvek6v0AVMzI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fesvr-fix-compilation-with-gcc-13.patch";
|
||||
url = "https://github.com/riscv-software-src/riscv-isa-sim/commit/0a7bb5403d0290cea8b2356179d92e4c61ffd51d.patch";
|
||||
hash = "sha256-JUMTbGawvLkoOWKkruzLzUFQytVR3wqTlGu/eegRFEE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ dtc ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -33,11 +33,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apt";
|
||||
version = "2.7.10";
|
||||
version = "2.7.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-VUZsSEqmQJesIPU4tK4ELn9i5hFiBUGNEepPySIdgH4=";
|
||||
hash = "sha256-ZD5skWsyQSmGc5yStEwijMmQv0c/ikHWm5m1RdEMMqc=";
|
||||
};
|
||||
|
||||
# cycle detection; lib can't be split
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
let
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
in
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "fangfrisch";
|
||||
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication {
|
||||
owner = "rseichter";
|
||||
repo = "fangfrisch";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-s55W5/ppwr008ZIjDgQa90N+Ax9cwnvc+mXRetFdy+4=";
|
||||
hash = "sha256-lZDChg7og98LY20IaafVGM487F/anrVIBB39dp2r2g0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
24
pkgs/by-name/js/jsoncons/package.nix
Normal file
24
pkgs/by-name/js/jsoncons/package.nix
Normal file
@@ -0,0 +1,24 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jsoncons";
|
||||
version = "0.173.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielaparker";
|
||||
repo = "jsoncons";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Mf3kvfYAcwNrwbvGyMP6PQmk5e5Mz7b0qCZ6yi95ksk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A C++, header-only library for constructing JSON and JSON-like data formats";
|
||||
homepage = "https://danielaparker.github.io/jsoncons/";
|
||||
changelog = "https://github.com/danielaparker/jsoncons/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
30
pkgs/by-name/pl/plow/package.nix
Normal file
30
pkgs/by-name/pl/plow/package.nix
Normal file
@@ -0,0 +1,30 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, plow }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "plow";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "six-ddc";
|
||||
repo = "plow";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TynFq7e4MtZlA5SmGMybhmCVw67yHYgZWffQjuyhTDA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t2lBPyCn8bu9hLsWmaCGir9egbX0mQR+8kB0RfY7nHE=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = plow;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-performance HTTP benchmarking tool that includes a real-time web UI and terminal display";
|
||||
homepage = "https://github.com/six-ddc/plow";
|
||||
changelog = "https://github.com/six-ddc/plow/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ecklf ];
|
||||
mainProgram = "plow";
|
||||
};
|
||||
}
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.15";
|
||||
hash = "sha256-UMPiILeqY6hXFiM8kC60TMCkZn7QuDNXIq4jkbE1Xno=";
|
||||
version = "8.2.16";
|
||||
hash = "sha256-JljBuJNatrU6fyCTVGAnYasHBm5mkgvEcriBX9G0P3E=";
|
||||
});
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.3.2";
|
||||
hash = "sha256-WCs8g3qNlS7//idKXklwbEOojBYoMMKow1gIn+dEkoQ=";
|
||||
version = "8.3.3";
|
||||
hash = "sha256-qvthO6eVlKI/5yL46QrUczAGEL+A50uKpS2pysLcTio=";
|
||||
});
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
|
||||
@@ -203,9 +203,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# https://bugreports.qt.io/browse/QTBUG-97568
|
||||
postPatch = ''
|
||||
substituteInPlace src/corelib/CMakeLists.txt --replace /bin/ls ${coreutils}/bin/ls
|
||||
substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${coreutils}/bin/ls"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace cmake/QtAutoDetect.cmake --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
|
||||
substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
|
||||
'';
|
||||
|
||||
fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
# Python bits:
|
||||
, buildPythonPackage
|
||||
, pytest
|
||||
@@ -25,6 +26,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/NixOS/nixpkgs/issues/288478
|
||||
(fetchpatch {
|
||||
name = "set-default-encoding.patch";
|
||||
url = "https://github.com/joeyespo/grip/commit/2784eb2c1515f1cdb1554d049d48b3bff0f42085.patch";
|
||||
hash = "sha256-veVJKJtt8mP1jmseRD7pNR3JgIxX1alYHyQok/rBpiQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytest responses ];
|
||||
|
||||
propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ];
|
||||
|
||||
@@ -5,23 +5,32 @@
|
||||
, which
|
||||
, pythonOlder
|
||||
, unittestCheckHook
|
||||
, sphinxHook
|
||||
, sphinx-argparse
|
||||
, parameterized
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nix-prefetch-github";
|
||||
version = "7.0.0";
|
||||
format = "setuptools";
|
||||
version = "7.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
outputs = [ "out" "man" ];
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seppeljordan";
|
||||
repo = "nix-prefetch-github";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oIR2iEiOBQ1VKouJTLqEiWWNzrMSJcnxK+m/j9Ia/m8=";
|
||||
hash = "sha256-eQd/MNlnuzXzgFzvwUMchvHoIvkIrbpGKV7iknO14Cc=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook git which ];
|
||||
nativeBuildInputs = [ sphinxHook sphinx-argparse setuptools ];
|
||||
nativeCheckInputs = [ unittestCheckHook git which parameterized ];
|
||||
|
||||
sphinxBuilders = [ "man" ];
|
||||
sphinxRoot = "docs";
|
||||
|
||||
# ignore tests which are impure
|
||||
DISABLED_TESTS = "network requires_nix_build";
|
||||
|
||||
@@ -3,14 +3,16 @@
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, cython
|
||||
, cython_3
|
||||
, poetry-core
|
||||
, setuptools
|
||||
, numpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylibjpeg-libjpeg";
|
||||
version = "1.3.4";
|
||||
format = "setuptools";
|
||||
version = "2.02";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -18,12 +20,14 @@ buildPythonPackage rec {
|
||||
owner = "pydicom";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VmqeoMU8riLpWyC+yKqq56TkruxOie6pjbg+ozivpBk=";
|
||||
hash = "sha256-mGwku19Xe605fF3UU59712rYp+s/pP79lBRl79fhhTI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
cython_3
|
||||
poetry-core
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, flit-core
|
||||
, setuptools
|
||||
, numpy
|
||||
, pydicom
|
||||
@@ -31,7 +32,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylibjpeg";
|
||||
version = "1.4.0";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -40,10 +41,10 @@ buildPythonPackage rec {
|
||||
owner = "pydicom";
|
||||
repo = "pylibjpeg";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Px1DyYDkKAUdYo+ZxZ1w7TkPzWN++styiFl02iQOvyQ=";
|
||||
hash = "sha256-qGtrphsBBVieGS/8rdymbsjLMU/QEd7zFNAANN8bD+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.4";
|
||||
format = "setuptools";
|
||||
buildPythonPackage {
|
||||
pname = "python-editor";
|
||||
version = "1.0.4-unstable-2023-10-11";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fmoo";
|
||||
repo = "python-editor";
|
||||
rev = "c6cd09069371781b2b9381839849a524d25db07f";
|
||||
hash = "sha256-TjfY7ustZaNPmndHPVwmQ8zkYPmDs/C5SNJl1zXjprc=";
|
||||
};
|
||||
|
||||
# No proper tests
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
, cryptography
|
||||
, cssselect
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, glibcLocales
|
||||
, installShellFiles
|
||||
, itemadapter
|
||||
@@ -22,6 +21,7 @@
|
||||
, pythonOlder
|
||||
, queuelib
|
||||
, service-identity
|
||||
, setuptools
|
||||
, sybil
|
||||
, testfixtures
|
||||
, tldextract
|
||||
@@ -32,31 +32,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrapy";
|
||||
version = "2.11.0";
|
||||
format = "setuptools";
|
||||
version = "2.11.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Scrapy";
|
||||
hash = "sha256-PL3tzgw/DgSC1hvi10WGg758188UsO5q37rduA9bNqU=";
|
||||
hash = "sha256-czoDnHQj5StpvygQtTMgk9TkKoSEYDWcB7Auz/j3Pr4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compatiblity with Twisted>=23.8. Remove with the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scrapy/scrapy/commit/aa95ada42cdf570f840f55c463375f8a81b303f8.patch";
|
||||
hash = "sha256-LuhA5BqtjSUgkotplvUCtvGNYOTrl0MJRCXiSBMDFzY=";
|
||||
excludes = [
|
||||
"tests/CrawlerProcess/sleeping.py"
|
||||
"tests/test_crawler.py"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, pkgs # for passthru.plugins
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, libusb-compat-0_1
|
||||
@@ -47,12 +48,21 @@ let rizin = stdenv.mkDerivation rec {
|
||||
"-Dportable=true"
|
||||
];
|
||||
|
||||
# Normally, Rizin only looks for files in the install prefix. With
|
||||
# portable=true, it instead looks for files in relation to the parent
|
||||
# of the directory of the binary file specified in /proc/self/exe,
|
||||
# caching it. This patch replaces the entire logic to only look at
|
||||
# the env var NIX_RZ_PREFIX
|
||||
patches = [ ./librz-wrapper-support.patch ];
|
||||
patches = [
|
||||
# Normally, Rizin only looks for files in the install prefix. With
|
||||
# portable=true, it instead looks for files in relation to the parent
|
||||
# of the directory of the binary file specified in /proc/self/exe,
|
||||
# caching it. This patch replaces the entire logic to only look at
|
||||
# the env var NIX_RZ_PREFIX
|
||||
./librz-wrapper-support.patch
|
||||
# Fix tree-sitter 0.20.9 build failure: https://github.com/rizinorg/rizin/pull/4165
|
||||
(fetchpatch {
|
||||
name = "tree-sitter-0.20.9.patch";
|
||||
url = "https://github.com/rizinorg/rizin/commit/1bb08712dbc9e062bb439a65dcebeb4221ded699.patch";
|
||||
hash = "sha256-mE0eQAFhyxX5bwrz+S1IVl6HNV9ITQ+tRRvGLLif5VI=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pet";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knqyf263";
|
||||
repo = "pet";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+SjeQJXWoyNVb9AUB0BlXUJpHYRLhvVjteZypjV0FtE=";
|
||||
sha256 = "sha256-upBncIJvgTvBj/PB3b7LnxY+yDnFfeNZdL97GwGxCqA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-A3VHpSJc6NJz8ojg6iSnQlIXbf9m1JCzg9Vnoie0ffU=";
|
||||
|
||||
@@ -42,12 +42,12 @@
|
||||
"6.1": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.1.76-hardened1.patch",
|
||||
"sha256": "1hybya6kxcy90cnc7m1gzykbbarqmbybmgrsbanb3gvlbvjghizx",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.76-hardened1/linux-hardened-6.1.76-hardened1.patch"
|
||||
"name": "linux-hardened-6.1.77-hardened1.patch",
|
||||
"sha256": "0gi7sahy24158hsfx6yhlzxg152ipn918nzg6nv4633b7vg6g90f",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.77-hardened1/linux-hardened-6.1.77-hardened1.patch"
|
||||
},
|
||||
"sha256": "1zdi4xbk7zyiab7x8z12xqg72zaw3j61slvrbwjfx6pzh47cr005",
|
||||
"version": "6.1.76"
|
||||
"sha256": "07grng6rrgpy6c3465hwqhn3gcdam1c8rwya30vgpk8nfxbfqm1v",
|
||||
"version": "6.1.77"
|
||||
},
|
||||
"6.5": {
|
||||
"patch": {
|
||||
@@ -62,21 +62,21 @@
|
||||
"6.6": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.6.15-hardened1.patch",
|
||||
"sha256": "0yj821zaqxhk4yk1fgv1l5kcqsl05nvq8l6djbvhs0nnlmfd85yf",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.15-hardened1/linux-hardened-6.6.15-hardened1.patch"
|
||||
"name": "linux-hardened-6.6.16-hardened1.patch",
|
||||
"sha256": "04k340nilrlarsh47gpdj5qzcy2h8z4nkr5945j40qa7nkj58ncd",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.16-hardened1/linux-hardened-6.6.16-hardened1.patch"
|
||||
},
|
||||
"sha256": "1ajzby6isqji1xlp660m4qj2i2xs003vsjp1jspziwl7hrzhqadb",
|
||||
"version": "6.6.15"
|
||||
"sha256": "0c5a9agdr27bwd1z6790whczb858z8i34hhn548lzbdylfamf7dj",
|
||||
"version": "6.6.16"
|
||||
},
|
||||
"6.7": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.7.3-hardened1.patch",
|
||||
"sha256": "03jdch5fx6ly0haa2jrbjzyjnfv66dh1gkbhy1y79v3ylr4x29x4",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.7.3-hardened1/linux-hardened-6.7.3-hardened1.patch"
|
||||
"name": "linux-hardened-6.7.4-hardened1.patch",
|
||||
"sha256": "1g3waasdsba65rgb6f58drj5qd61b0072hfmzl783jphj8iq045x",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.7.4-hardened1/linux-hardened-6.7.4-hardened1.patch"
|
||||
},
|
||||
"sha256": "0i1bfkawyp917d9v3qa5nqzspzr3ixx7scbfl8x4lms74xjqrw5p",
|
||||
"version": "6.7.3"
|
||||
"sha256": "036nk3h7vqzd7gnxan2173kpss5qm2pci1lvd58gh90azigrz3gn",
|
||||
"version": "6.7.4"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
pname = "angie-console-light";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.angie.software/files/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-Teg+EPl4IvmScTTX3F3rdM6qZ3ztFkMks9oo2B1xHTs=";
|
||||
hash = "sha256-bwnVwhcPyEXGzvpXj2bC1WUGtNbBlHpqZibApKtESq8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}@args:
|
||||
|
||||
callPackage ../nginx/generic.nix args rec {
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
pname = if withQuic then "angieQuic" else "angie";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.angie.software/files/angie-${version}.tar.gz";
|
||||
hash = "sha256-gaQsPwoxtt6oVSDX1JCWvyUwDQaNprya79CCwu4z8b4=";
|
||||
hash = "sha256-g6PyuyulnltnZJWiZ01iYG1k6Lz5nO+gneb8M4q3WHo=";
|
||||
};
|
||||
|
||||
configureFlags = lib.optional withQuic [
|
||||
|
||||
@@ -32,7 +32,7 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "10.3.1";
|
||||
version = "10.3.3";
|
||||
|
||||
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ];
|
||||
|
||||
@@ -40,7 +40,7 @@ buildGoModule rec {
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UPIq7BWTlT0omt/SM5+vkfOHvsdcx/ikkjcW9X8pcw0=";
|
||||
hash = "sha256-uAfHcW9j+al8IIH2N6X5wssQmSXqJjVQzwERBCxGxVE=";
|
||||
};
|
||||
|
||||
offlineCache = stdenv.mkDerivation {
|
||||
@@ -72,7 +72,7 @@ buildGoModule rec {
|
||||
|
||||
disallowedRequisites = [ offlineCache ];
|
||||
|
||||
vendorHash = "sha256-Gf2A22d7/8xU/ld7kveqGonVKGFCArGNansPRGhfyXM=";
|
||||
vendorHash = "sha256-nGv/DBNnQ4AOJtrsYIGLCrV1xNmBN0dDf6u46R3TAHo=";
|
||||
|
||||
nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ];
|
||||
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, openldap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adtool";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gp2x.org/adtool/${pname}-${version}.tar.gz";
|
||||
sha256 = "1awmpjamrwivi69i0j2fyrziy9s096ckviqd9c4llc3990mfsn4n";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"sysconfdir=$(out)/etc"
|
||||
];
|
||||
|
||||
buildInputs = [ openldap ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: ../../src/lib/libactive_directory.a(active_directory.o):/build/adtool-1.3.3/src/lib/active_directory.h:31:
|
||||
# multiple definition of `system_config_file'; adtool.o:/build/adtool-1.3.3/src/tools/../../src/lib/active_directory.h:31: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/doc/adtool
|
||||
mv $out/etc/* $out/share/doc/adtool
|
||||
rmdir $out/etc
|
||||
'';
|
||||
|
||||
# It requires an LDAP server for tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Active Directory administration utility for Unix";
|
||||
homepage = "https://gp2x.org/adtool";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
broken = true; # does not link against recent libldap versions and unmaintained since 2017
|
||||
};
|
||||
}
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.84.0";
|
||||
version = "0.84.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = "qovery-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2cG/aG1WXNmXqoJ+N2vmq2SBfIeCI1hac8y2vLy7Dyk=";
|
||||
hash = "sha256-Dq62LXa0hZrpfQ7WQuCelLxWS7Lhn6SH61cNTsYI/mw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XG0dOEpu+NoQmklsukxev1gc2OsZc7fLEkv0AGwkh7o=";
|
||||
|
||||
@@ -1,15 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, makeBinaryWrapper
|
||||
, jre
|
||||
, graphviz
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2024.1";
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plantuml";
|
||||
version = "1.2024.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
|
||||
sha256 = "sha256-lXo8eU6IX4JQFfhNUM2h6fi0HkShiwLsjMRTNbwLYwk=";
|
||||
url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
|
||||
hash = "sha256-23EKdS1Z7beuyovgab8ELA1rCAn2Zl83YPmSZ83EBdw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
buildCommand = ''
|
||||
install -Dm644 $src $out/lib/plantuml.jar
|
||||
@@ -19,18 +27,22 @@ stdenv.mkDerivation rec {
|
||||
--argv0 plantuml \
|
||||
--set GRAPHVIZ_DOT ${graphviz}/bin/dot \
|
||||
--add-flags "-jar $out/lib/plantuml.jar"
|
||||
|
||||
$out/bin/plantuml -help
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
doInstallCheck = true;
|
||||
postCheckInstall = ''
|
||||
$out/bin/plantuml -help
|
||||
$out/bin/plantuml -testdot
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Draw UML diagrams using a simple and human readable text description";
|
||||
homepage = "https://plantuml.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
# "plantuml -license" says GPLv3 or later
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ bjornfor Mogria ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "plantuml";
|
||||
maintainers = with lib.maintainers; [ bjornfor Mogria ];
|
||||
platforms = lib.platforms.unix;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -19,7 +19,10 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -27,13 +27,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "telepresence2";
|
||||
version = "2.17.0";
|
||||
version = "2.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telepresenceio";
|
||||
repo = "telepresence";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wmoOBoMjPCNJGg86Cl2V4izZQDiZjNzwErvWMYY1MGk=";
|
||||
hash = "sha256-zk6HyZfYeJecJgdMU3qnXIKDYuvnu5yjSZtVvKem4uI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -47,7 +47,7 @@ buildGoModule rec {
|
||||
export CGO_ENABLED=0
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-rTlMd56iBSBLTRYJlKHWmYyyeBtNk2WQ3hrPJl9dMYI=";
|
||||
vendorHash = "sha256-wvzrnwzkV4SXsiZfIrowMF0G7qFdjEVrF77vM81rxLs=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"
|
||||
|
||||
@@ -58,6 +58,7 @@ mapAliases ({
|
||||
|
||||
AusweisApp2 = ausweisapp; # Added 2023-11-08
|
||||
a4term = a4; # Added 2023-10-06
|
||||
adtool = throw "'adtool' has been removed, as it was broken and unmaintained";
|
||||
aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03
|
||||
airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19
|
||||
alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28
|
||||
|
||||
@@ -18141,8 +18141,6 @@ with pkgs;
|
||||
|
||||
adreaper = callPackage ../tools/security/adreaper { };
|
||||
|
||||
adtool = callPackage ../tools/admin/adtool { };
|
||||
|
||||
aeron = callPackage ../servers/aeron { };
|
||||
|
||||
inherit (callPackage ../development/tools/alloy { })
|
||||
@@ -35088,7 +35086,7 @@ with pkgs;
|
||||
|
||||
spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { };
|
||||
|
||||
spike = pin-to-gcc12-if-gcc13 (callPackage ../applications/virtualization/spike { });
|
||||
spike = callPackage ../applications/virtualization/spike { };
|
||||
|
||||
tensorman = callPackage ../tools/misc/tensorman { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user