Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-08-02 12:01:37 +00:00 committed by GitHub
commit 1093a01c99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 342 additions and 193 deletions

View File

@ -6339,6 +6339,12 @@
github = "JoshuaFern";
githubId = 4300747;
};
joshvanl = {
email = " me@joshvanl.dev ";
github = "joshvanl";
githubId = 15893072;
name = "Josh van Leeuwen";
};
jpas = {
name = "Jarrod Pas";
email = "jarrod@jarrodpas.com";

View File

@ -10,6 +10,7 @@ let
# Disable automatically generating desktop icon
noDesktopIcon=true
noBackup=${lib.boolToString cfg.noBackup}
noAuthentication=${lib.boolToString cfg.noAuthentication}
[Network]
# host setting is relevant only for web deployments - set the host on which the server will listen
@ -49,6 +50,14 @@ in
'';
};
noAuthentication = mkOption {
type = types.bool;
default = false;
description = ''
If set to true, no password is required to access the web frontend.
'';
};
host = mkOption {
type = types.str;
default = "127.0.0.1";

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libmt32emu";
version = "2.6.3";
version = "2.7.0";
src = fetchFromGitHub {
owner = "munt";
repo = "munt";
rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}";
sha256 = "0ncy55fj9l2s750clxjpv102hrgcndz4qba9w2sf8lwzgy6d1xmp";
sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs=";
};
outputs = [ "out" "dev" ];

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "rofi-emoji";
version = "2.3.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "Mange";
repo = pname;
rev = "v${version}";
sha256 = "sha256-y+WJYSiDXYvg+N3wok44hJ8Tuqrd3E63pZyiYx0NWXg=";
sha256 = "sha256-pYNeAz8MKBM3VSkQfP4hgTbEy9haGmBmPf/nu9tvKts=";
};
patches = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sdcv";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "Dushistov";
repo = "sdcv";
rev = "v${version}";
sha256 = "144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600";
sha256 = "sha256-i6odmnkoSqDIQAor7Dn26Gu+td9aeMIkwsngF7beBtE=";
};
hardeningDisable = [ "format" ];

View File

@ -2,20 +2,24 @@
buildGoModule rec {
pname = "cmctl";
version = "1.8.2";
version = "1.9.1";
src = fetchFromGitHub {
owner = "cert-manager";
repo = "cert-manager";
rev = "v${version}";
sha256 = "sha256-sfC1acnCrcQ4A1tXXcjh47Af6xeJqjdGXy0gK21ZSFg=";
hash = "sha256-Z1aJ18X4mfJPlCPBC7QgfdX5Tk4+PK8mYoJZhGwz9ec=";
};
vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI=";
vendorSha256 = "sha256-45+tZZAEHaLdTN1NQCueJVTx5x2IanwDl+Y9MELqdBE=";
subPackages = [ "cmd/ctl" ];
ldflags = [ "-s" "-w" ];
ldflags = [
"-s" "-w"
"-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build.name=cmctl"
"-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build/commands.registerCompletion=true"
];
nativeBuildInputs = [ installShellFiles ];
@ -28,11 +32,21 @@ buildGoModule rec {
'';
meta = with lib; {
description = "A CLI tool for managing Cert-Manager service on Kubernetes clusters";
description = "A CLI tool for managing cert-manager service on Kubernetes clusters";
longDescription = ''
cert-manager adds certificates and certificate issuers as resource types
in Kubernetes clusters, and simplifies the process of obtaining, renewing
and using those certificates.
It can issue certificates from a variety of supported sources, including
Let's Encrypt, HashiCorp Vault, and Venafi as well as private PKI, and it
ensures certificates remain valid and up to date, attempting to renew
certificates at an appropriate time before expiry.
'';
downloadPage = "https://github.com/cert-manager/cert-manager";
license = licenses.asl20;
homepage = "https://cert-manager.io/";
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ joshvanl superherointj ];
};
}

View File

@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.82.0.403";
version = "8.86.0.407";
rpath = lib.makeLibraryPath [
alsa-lib
@ -68,7 +68,7 @@ let
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
sha256 = "sha256-45aHb6BI0kUnJOlRsglyGdZ6+8sLmHZK3FN8nYpuHXM=";
sha256 = "sha256-46M0JYP5QBCTCRqLtNyrQsEc6PsK6WRssb55IkG6pu0=";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

View File

@ -5,21 +5,41 @@
, nixosTests
}:
python3.pkgs.buildPythonApplication rec {
let
inherit (pypkgs) makePythonPath;
pypkgs = (python3.override {
packageOverrides = self: super: {
# Use last available version of maestral that still supports PyQt5
# Remove this override when PyQt6 is available
maestral = super.maestral.overridePythonAttrs (old: rec {
version = "1.5.3";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "refs/tags/v${version}";
hash = "sha256-Uo3vcYez2qSq162SSKjoCkwygwR5awzDceIq8/h3dao=";
};
});
};
}).pkgs;
in
pypkgs.buildPythonApplication rec {
pname = "maestral-qt";
version = "1.5.3";
disabled = python3.pkgs.pythonOlder "3.6";
disabled = pypkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "v${version}";
rev = "refs/tags/v${version}";
sha256 = "sha256-zaG9Zwz9S/SVb7xDa7eXkjLNt1BhA1cQ3I18rVt+8uQ=";
};
format = "pyproject";
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = with pypkgs; [
click
markdown2
maestral
@ -36,8 +56,8 @@ python3.pkgs.buildPythonApplication rec {
"\${qtWrapperArgs[@]}"
# Add the installed directories to the python path so the daemon can find them
"--prefix" "PYTHONPATH" ":" "${lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}"
"--prefix" "PYTHONPATH" ":" "${python3.pkgs.maestral}/lib/${python3.libPrefix}/site-packages"
"--prefix PYTHONPATH : ${makePythonPath (pypkgs.requiredPythonModules pypkgs.maestral.propagatedBuildInputs)}"
"--prefix PYTHONPATH : ${makePythonPath [ pypkgs.maestral ]}"
];
# no tests
@ -50,7 +70,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "GUI front-end for maestral (an open-source Dropbox client) for Linux";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
maintainers = with maintainers; [ peterhoeg sfrijters ];
platforms = platforms.linux;
homepage = "https://maestral.app";
};

View File

@ -2,10 +2,10 @@
let
pname = "raven-reader";
version = "1.0.73";
version = "1.0.74";
src = fetchurl {
url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage";
sha256 = "sha256-wU99+nDXHGMad94qszw5uThKckk1ToUvjNrIf/yTeTM=";
sha256 = "sha256-BwJK0V19aLpTRa/7wzlWdALiJrOhfejCkKCGrZyA5EQ=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };

View File

@ -1,18 +1,8 @@
{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, libxshmfence, wrapGAppsHook }:
{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, copyDesktopItems, libxshmfence, wrapGAppsHook }:
let
description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases";
desktopItem = makeDesktopItem {
name = "Trilium";
exec = "trilium";
icon = "trilium";
comment = description;
desktopName = "Trilium Notes";
categories = [ "Office" ];
};
meta = with lib; {
inherit description;
metaCommon = with lib; {
description = "Hierarchical note taking application with focus on building large personal knowledge bases";
homepage = "https://github.com/zadam/trilium";
license = licenses.agpl3Plus;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
@ -20,24 +10,22 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
version = "0.51.2";
version = "0.53.2";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "17bqcnpvflpi5dlz9m294diwd6as5wha5jcv9a3qvhh4pq0nyr4z";
};
desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
desktopSource.sha256 = "0sjljyn7x0kv1692wccdjsll8h49r9lyqbrfnz4cn147xinclyw4";
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "0jjvg75a4va5d81x8dvpzmzax7p0bqd7psv0alkkl13m91gai6ig";
};
serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
serverSource.sha256 = "0y5xjf4r0c2hw2ch4ml55fq1nlmgnakq4zh3ch8sdgzm86nchavb";
in {
trilium-desktop = stdenv.mkDerivation rec {
pname = "trilium-desktop";
inherit version;
inherit meta;
meta = metaCommon // {
mainProgram = "trilium";
};
src = fetchurl desktopSource;
@ -45,21 +33,32 @@ in {
autoPatchelfHook
makeWrapper
wrapGAppsHook
copyDesktopItems
];
buildInputs = atomEnv.packages ++ [ gtk3 libxshmfence ];
buildInputs = atomEnv.packages ++ [ libxshmfence ];
desktopItems = [
(makeDesktopItem {
name = "Trilium";
exec = "trilium";
icon = "trilium";
comment = meta.description;
desktopName = "Trilium Notes";
categories = [ "Office" ];
})
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/share/trilium
mkdir -p $out/share/{applications,icons/hicolor/128x128/apps}
mkdir -p $out/share/icons/hicolor/128x128/apps
cp -r ./* $out/share/trilium
ln -s $out/share/trilium/trilium $out/bin/trilium
ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png
cp ${desktopItem}/share/applications/* $out/share/applications
runHook postInstall
'';
@ -69,13 +68,15 @@ in {
'';
dontStrip = true;
passthru.updateScript = ./update.sh;
};
trilium-server = stdenv.mkDerivation rec {
pname = "trilium-server";
inherit version;
inherit meta;
meta = metaCommon;
src = fetchurl serverSource;

View File

@ -0,0 +1,18 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p coreutils curl jq
set -euo pipefail
cd $(dirname "${BASH_SOURCE[0]}")
version=$(curl -s --show-error "https://api.github.com/repos/zadam/trilium/releases/latest" | jq -r '.tag_name' | tail -c +2)
sha256_linux64=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz)
sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz)
setKV () {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
}
setKV version $version
setKV desktopSource.sha256 $sha256_linux64
setKV serverSource.sha256 $sha256_linux64_server

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnuastro";
version = "0.17";
version = "0.18";
src = fetchurl {
url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz";
sha256 = "sha256-xBvtM8wkDOqXg/Q2dNfPR0R0ZgRm4QiPJZoLDKivaPU=";
sha256 = "sha256-bKfiLhQFERdMbwL9+UitCL8/dB/k6YKNjBzfKnCtWec=";
};
nativeBuildInputs = [ libtool ];

View File

@ -35,11 +35,11 @@
mkDerivation rec {
pname = "recoll";
version = "1.32.0";
version = "1.32.5";
src = fetchurl {
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-4kt6g5MVZTyYLSH7q2z72nzAsU6fatC0vTebEKhSA6E=";
sha256 = "sha256-UvRpJkapN9nXHy3TY7SVdZ/sy8f3QCHkg3/FM0oP9VY=";
};
configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ]

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "sakura";
version = "3.8.4";
version = "3.8.5";
src = fetchFromGitHub {
owner = "dabisu";
repo = pname;
rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-Sqo1gyCvCMlEv1rYqw6P3Dmu10osi/KqB7/WlgTTNAc=";
hash = "sha256-eMGhPkfhpPHMg69J+XgK/ssJjwRSFgd/a64lAYi7hd0=";
};
nativeBuildInputs = [

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hut";
version = "0.1.0";
version = "0.2.0";
src = fetchFromSourcehut {
owner = "~emersion";
repo = "hut";
rev = "v${version}";
sha256 = "sha256-2YUrDPulpLQQGw31nEasHoQ/AppECg7acwwqu6JDT5U=";
sha256 = "sha256-g9KbOtZaBAgy/iBBh/Tv5ULJNnNzwzZpA6DOynl+dnk=";
};
vendorSha256 = "sha256-EmokL3JlyM6C5/NOarCAJuqNsDO2tgHwqQdv0rAk+Xk=";
vendorSha256 = "sha256-vuAx8B34Za+GEtekFOUaY07hBk3O2OaJ1JmulbIhwbs=";
nativeBuildInputs = [
scdoc

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ustreamer";
version = "4.11";
version = "5.17";
src = fetchFromGitHub {
owner = "pikvm";
repo = "ustreamer";
rev = "v${version}";
sha256 = "sha256-MTzlhnnDVZzS3lnYe3P/Hi6pi6f4B0+ejmDwV0f9juI=";
sha256 = "sha256-l0O7iuqXJTGcODPk0BzWXr8GbJJOcAeAHyo147WMnjk=";
};
buildInputs = [ libbsd libevent libjpeg ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.8.0";
version = "2.9.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
sha256 = "sha256-EayVmFBlUrBr9xJKebJ+lBdiylub/upzd34ecBPkO8Q=";
sha256 = "sha256-CbYlu7dOpHGceGLFkI3p494SNlFL3JyBv+/yy0PRkPY=";
};
vendorSha256 = "sha256-7sJIzY1fXwMe8cowv7bThOOUd/7cLYPed6RFal2XKHk=";
vendorSha256 = "sha256-9ec34jpDA7MUoAhWZMGCmXkOi/iK9mdJpFZ1qu9QgrU=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

View File

@ -1,16 +1,32 @@
{ lib, stdenvNoCC, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }:
{ lib
, stdenvNoCC
, fetchFromGitHub
, breeze-icons
, gtk3
, gnome-icon-theme
, hicolor-icon-theme
, mint-x-icons
, pantheon
, jdupes
}:
stdenvNoCC.mkDerivation rec {
pname = "BeautyLine";
version = "0.0.1";
version = "0.0.4";
src = fetchzip {
name = "${pname}-${version}";
url = "https://github.com/gvolpe/BeautyLine/releases/download/${version}/BeautyLine.tar.gz";
sha256 = "030bjk333fr9wm1nc740q8i31rfsgf3vg6cvz36xnvavx3q363l7";
src = fetchFromGitHub {
owner = "gvolpe";
repo = pname;
rev = version;
sparseCheckout = ''
BeautyLine-V3
'';
sha256 = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk=";
};
nativeBuildInputs = [ gtk3 ];
sourceRoot = "${src.name}/BeautyLine-V3";
nativeBuildInputs = [ jdupes gtk3 ];
# ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point)
propagatedBuildInputs = [
@ -23,10 +39,19 @@ stdenvNoCC.mkDerivation rec {
dontDropIconThemeCache = true;
dontPatchELF = true;
dontRewriteSymlinks = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons/${pname}
cp -r * $out/share/icons/${pname}/
gtk-update-icon-cache $out/share/icons/${pname}
jdupes --link-soft --recurse $out/share
runHook postInstall
'';
meta = with lib; {

View File

@ -12,13 +12,13 @@ let
in
stdenv.mkDerivation rec {
pname = "flat-remix-gnome";
version = "20220524";
version = "20220622";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
hash = "sha256-m7Er6F0VWcdV3+oUPfhJJq80oaht15hBFtg7JQgZJI8=";
hash = "sha256-fm1YOKI6TLkCnkkPZkp8I0xWkNrZt4sVktYZyD5foKU=";
};
nativeBuildInputs = [ glib fake-dconf ];

View File

@ -6,6 +6,7 @@
, arpa2cm
, doxygen
, e2fsprogs
, graphviz
, lmdb
, openssl
, pkg-config
@ -14,19 +15,20 @@
stdenv.mkDerivation rec {
pname = "arpa2common";
version = "2.2.14";
version = "2.2.18";
src = fetchFromGitLab {
owner = "arpa2";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LWsWoHRdLWRSF9JaEwrw+CXm5Azgh7zNeq0a8Z/hijQ=";
sha256 = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg=";
};
nativeBuildInputs = [
cmake
arpa2cm
doxygen
graphviz
pkg-config
];

View File

@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "coeurl";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitLab {
domain = "nheko.im";
owner = "nheko-reborn";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0=";
sha256 = "sha256-+FIxi019+jnjpo4NhBQ4tb3ObLrEStMN5YD+MrTLa2E=";
};
nativeBuildInputs = [ ninja pkg-config meson ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libgbinder";
version = "1.1.19";
version = "1.1.25";
src = fetchFromGitHub {
owner = "mer-hybris";
repo = pname;
rev = version;
sha256 = "sha256-HTmNoTGyFtOXRy7Y/ZnEgTa2GW6/+TeZxZo7c7ksNtc=";
sha256 = "sha256-yr9FJd1+yJdP3vXHbuaaL5UmXGnKxR319LzXs76LBwk=";
};
outputs = [ "out" "dev" ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libxc";
version = "5.2.2";
version = "5.2.3";
src = fetchFromGitLab {
owner = "libxc";
repo = "libxc";
rev = version;
sha256 = "113sk7hxjpfbz3nrgjsc7bi6zrlwb3qq5s6h0zh37hz9bd1brq54";
sha256 = "sha256-PuLpwhyyht+kkPUTrJTH+VTY5WuOhi2mIUDrFqubF+w=";
};
nativeBuildInputs = [ perl cmake gfortran ];

View File

@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
pname = "lief";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "lief-project";
repo = "LIEF";
rev = version;
sha256 = "sha256-ONU/geAkqVf8SDIi9dUvHxbJkmykHMCe2UVgUyRk0gg=";
sha256 = "sha256-IQqPwTNFHLOr8iwg8IhXpuiyg2rIdFuVDzwT39eA6/c=";
};
outputs = [ "out" "py" ];

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1cbbH411kn2OnxLWXQvmae0JW4HzXnEHYnucQEVAslk=";
sha256 = "sha256-REAN5TW0miWXI3HFxtW3znTKTrhsBbNqu1VfjC2w0no=";
};
outputs = [ "out" "dev" "doc" ];

View File

@ -1,50 +1,57 @@
{ lib, stdenv, fetchFromGitHub, python3Packages, hexio
, cmake, bash, arpa2cm, git, asn2quickder }:
{ lib
, stdenv
, fetchFromGitLab
, python3
, cmake
, doxygen
, graphviz
, quickmem
, arpa2common
, arpa2cm
, ensureNewerSourcesForZipFilesHook
}:
stdenv.mkDerivation rec {
pname = "quickder";
version = "1.3.0";
version = "1.7.1";
src = fetchFromGitHub {
sha256 = "15lxv8vcjnsjxg7ywcac5p6mj5vf5pxq1219yap653ci4f1liqfr";
rev = "version-${version}";
owner = "vanrein";
src = fetchFromGitLab {
owner = "arpa2";
repo = "quick-der";
rev = "v${version}";
sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
};
nativeBuildInputs = [ cmake ];
buildInputs = with python3Packages; [
arpa2cm
asn1ate
hexio
pyparsing
python
six
asn1ate
asn2quickder
nativeBuildInputs = [
cmake
doxygen
graphviz
ensureNewerSourcesForZipFilesHook
];
buildInputs = [
arpa2cm
arpa2common
(python3.withPackages (ps: with ps; [
asn1ate
colored
pyparsing
setuptools
six
]))
quickmem
];
postPatch = ''
substituteInPlace ./CMakeLists.txt \
--replace "get_version_from_git" "set (Quick-DER_VERSION 1.2) #"
substituteInPlace ./CMakeLists.txt \
--replace \$\{ARPA2CM_TOOLCHAIN_DIR} "$out/share/ARPA2CM/toolchain/"
patchShebangs python/scripts/
substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>='
'';
cmakeFlags = [
"-DNO_TESTING=ON"
"-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/"
];
preConfigure = ''
export PREFIX=$out
'';
doCheck = true;
meta = with lib; {
description = "Quick (and Easy) DER, a Library for parsing ASN.1";
homepage = "https://github.com/vanrein/quick-der";
homepage = "https://gitlab.com/arpa2/quick-der/";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ leenaars ];

View File

@ -0,0 +1,42 @@
{ lib
, stdenv
, fetchFromGitLab
, cmake
, doxygen
, graphviz
, arpa2common
, arpa2cm
}:
stdenv.mkDerivation rec {
pname = "quickmem";
version = "0.3.0";
src = fetchFromGitLab {
owner = "arpa2";
repo = "Quick-MEM";
rev = "v${version}";
sha256 = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc=";
};
nativeBuildInputs = [
cmake
doxygen
graphviz
];
buildInputs = [
arpa2cm
arpa2common
];
doCheck = true;
meta = with lib; {
description = "Memory pooling for ARPA2 projects";
homepage = "https://gitlab.com/arpa2/Quick-MEM/";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ leungbk ];
};
}

View File

@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport;
stdenv.mkDerivation rec {
pname = "petsc";
version = "3.17.0";
version = "3.17.3";
src = fetchurl {
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
sha256 = "sha256-ltWspoThzhQliRpiDSeHc8JWEcsUQWWpOxdTEjjqr4o=";
sha256 = "sha256-XCSt5eSzLMBJNboNsdr+SNYzvrqqMKMDPx5YeI03h18=";
};
mpiSupport = !withp4est || p4est.mpiSupport;

View File

@ -4,13 +4,13 @@ with lib;
gnustep.stdenv.mkDerivation rec {
pname = "sope";
version = "5.5.1";
version = "5.7.0";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOPE-${version}";
sha256 = "sha256-w78YO5EQWtEiySOm9NpPbaMChbJppNBoZNOBs9fibbM=";
sha256 = "sha256-mS685NOB6IN3a5tE3yr+VUq55Ouc5af9aJ2wTfGsAlo=";
};
hardeningDisable = [ "format" ];

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "termcolor";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "ikalnytskyi";
repo = "termcolor";
rev = "v${version}";
sha256 = "sha256-W0hB+lFJ2sm7DsbOzITOtjJuntSM55BfwUunOOS4RcA=";
sha256 = "sha256-2RXQ8sn2VNhQ2WZfwCCeQuM6x6C+sLA6ulAaFtaDMZw=";
};
nativeBuildInputs = [ cmake ];

View File

@ -90,7 +90,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Open-source Dropbox client for macOS and Linux";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
maintainers = with maintainers; [ peterhoeg sfrijters ];
platforms = platforms.unix;
homepage = "https://maestral.app";
};

View File

@ -4,10 +4,13 @@
, pythonOlder
# Python dependencies
, numpy
, openpyxl
, pandas
, pandas-stubs
, requests
, scikit-learn
, tenacity
, tqdm
, wandb
@ -18,7 +21,7 @@
buildPythonPackage rec {
pname = "openai";
version = "0.20.0";
version = "0.22.0";
disabled = pythonOlder "3.7.1";
@ -27,14 +30,17 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
rev = "v${version}";
sha256 = "sha256-kG7gsLAOoBCt7pxViO1Zhil2FGHigPEMJfBjdIp2th8=";
sha256 = "sha256-4FKFcUiY17hEiOGFP1fPBtcvcM19hFrHXX3ZLxgdJHI=";
};
propagatedBuildInputs = [
numpy
openpyxl
pandas
pandas-stubs
requests
scikit-learn
tenacity
tqdm
wandb
];

View File

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "xml2rfc";
version = "3.13.0";
version = "3.13.1";
disabled = pythonOlder "3.6";
@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "ietf-tools";
repo = "xml2rfc";
rev = "refs/tags/v${version}";
sha256 = "sha256-z+OVlqIuLP6D5qvS4VxJFjjLiYKH7pDKqYCrvv9FHJ4=";
sha256 = "sha256-DRHhcMPLBr1SM6e3BCB8gfvadd8CeMIOsPT+uzcET+4=";
};
postPatch = ''

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
version = "1.26.3";
version = "1.27.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
hash = "sha256-E18iy2cQmdiZwB6mWp0wohS+Iea2WxEB+zf2d+rAXUc=";
hash = "sha256-9RMSSgpYAmQgIAy4pJRk3tKwx+unaFmSNgXdKK3HYTU=";
};
ldflags = [
@ -22,7 +22,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
vendorSha256 = "sha256-l4eIqWqDV3j/KgXuN5gnKmXa49m4uuYhoiFOdXrl/8o=";
vendorSha256 = "sha256-o3TGEsYtd7RVGcw7guhqpbKMFkiRBpvCFUeIhnKKIeQ=";
subPackages = [
"cmd/tfsec"

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "arpa2cm";
version = "0.9.0";
version = "1.0.4";
src = fetchFromGitLab {
sha256 = "sha256-1z0fH8vZJiPkY/C654us9s2BULM1tlvvYcszNqk34yI=";
rev = "v${version}";
repo = pname;
owner = "arpa2";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk=";
};
nativeBuildInputs = [ cmake ];

View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "conftest";
version = "0.33.2";
version = "0.34.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "v${version}";
sha256 = "sha256-/iSkgICZghnMgpV/Bz3OCTcfJuLmeIsip8Nx2uwVMNw=";
sha256 = "sha256-w9rqfmNEvp6yYXBl5CVeifgrP35dL+pYBgRs3vP1W4I=";
};
vendorSha256 = "sha256-U7BqGlQ5PRbUGvTTMgSo3hcf269GIowEGh87yoWmxqM=";
vendorSha256 = "sha256-NcizXQ4wQnA1ZdT74tVbuIbFwgEp5qJfoGnHmMC7kkI=";
ldflags = [
"-s"

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "uncrustify";
version = "0.75.0";
version = "0.75.1";
src = fetchFromGitHub {
owner = "uncrustify";
repo = "uncrustify";
rev = "uncrustify-${version}";
sha256 = "sha256-UbcQvNnuN2VX60O9wXTksrijgrSGzYCseq0tGUtJ9Mg=";
sha256 = "sha256-wLzj/KcqXlcTsOJo7T166jLcWi1KNLmgblIqqkj7/9c=";
};
nativeBuildInputs = [ cmake python3 ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sslmate";
version = "1.9.0";
version = "1.9.1";
src = fetchurl {
url = "https://packages.sslmate.com/other/${pname}-${version}.tar.gz";
sha256 = "sha256-PkASJIRJH1kXjegOFMz36QzqT+qUBWslx/iavjFoW5g=";
sha256 = "sha256-F5szGn1cbw7R3lHMocM7as1RS/uaBqKCsvOxA+rXDOc=";
};
makeFlags = [ "PREFIX=$(out)" ];

View File

@ -4,31 +4,31 @@ let
aarch64-darwin = {
arch = "aarch64";
shortName = "darwin";
sha256 = "80304f6cf43c6be3db0303bdcb4de4995ace1a394ac6068bbe1e2b6fba32b2e5";
sha256 = "c82547d96125bf93ae76dafe203cae5f7cd50d041bfb1cf972f9f0232a0d1cc1";
};
aarch64-linux = {
arch = "aarch64";
shortName = "linux";
sha256 = "6b22b6221014fed9e6b6cb432505424e618ef095b2060945ad119cd8f2155fae";
sha256 = "3430f3ff456ee86ddb607a46ee937c9c1a02b8e4d2546de52b4493878f66afb8";
};
x86_64-darwin = {
arch = "x64";
shortName = "darwin";
sha256 = "33f4c420467af85584ba444606651a0352906c9135d952b266bb6da100ef95bf";
sha256 = "51fb5f29b5f00207ede11c892ccf5bb3ab437b77e7420e1c18b7fc91e02e2494";
};
x86_64-linux = {
arch = "x64";
shortName = "linux";
sha256 = "524a2d7e51ddda4786799552ae1c18ab8e6173bb30f158f26cae899a7e74f22f";
sha256 = "89fe00713a4e0e9f77d8842c5e07f771bd743271746fcb755c5d98cb5c00456e";
};
};
dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
in
stdenvNoCC.mkDerivation rec {
version = "0.1.5";
version = "0.1.6";
pname = "bun";
src = fetchurl {

View File

@ -39,7 +39,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/linux-apfs/linux-apfs-rw";
license = licenses.gpl2Only;
platforms = platforms.linux;
broken = kernel.kernelOlder "4.9";
broken = kernel.kernelOlder "4.9" || kernel.kernelAtLeast "5.19";
maintainers = with maintainers; [ Luflosi ];
};
}

View File

@ -32,6 +32,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
license = with licenses; [ gpl2Plus mit ];
platforms = platforms.linux;
broken = kernel.kernelAtLeast "5.19";
maintainers = with maintainers; [ nickcao ];
};
}

View File

@ -107,7 +107,5 @@ buildGoModule {
homepage = "https://github.com/namecoin/ncdns";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ rnhmjoj ];
# module github.com/btcsuite/btcd@latest found (v0.23.1), but does not contain package github.com/btcsuite/btcd/btcec
broken = true;
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pg_tileserv";
version = "1.0.8";
version = "1.0.9";
src = fetchFromGitHub {
owner = "CrunchyData";
repo = pname;
rev = "v${version}";
sha256 = "07xj807cbggnh8k7d2i7h326p4wjb8sz5ng0hbdnznvyc4sb2cdw";
sha256 = "sha256-pNm802DJu5t+Y9QZU6wDUcAVpJTZ4SxDK0J61wzuuRE=";
};
vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E=";
vendorSha256 = "sha256-iw9bIh1Ngj5IGhrZwmSPciyaAR73msZ283TB0ibwt+c=";
ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ];

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "ser2net";
version = "4.3.5";
version = "4.3.7";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
hash = "sha256-B0O3Vcb+aM1qSQNrTFV9dY7j4CGOYFkGKfyMgt7PwIM=";
hash = "sha256-5/gdKueqWKEhHDho+q719J6lQt4XG9JExWef5/Y3y1s=";
};
passthru = {

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rush";
version = "2.2";
version = "2.3";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-ld5TdpF7siprQCbhE4oxYhH40x3QZ5NCQlD3zRaNmM0=";
sha256 = "sha256-57gBYfZsKdK1moXBC52KgxKv/MIeQK6tDu+fznXLZ+Y=";
};
strictDeps = true;

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "ddcutil";
version = "1.2.2";
version = "1.3.0";
src = fetchFromGitHub {
owner = "rockowitz";
repo = "ddcutil";
rev = "v${version}";
sha256 = "0hbd2ybpqmm96icg387vr57dqkdbc20vyimqjq5yx0sdlp4ikzi7";
sha256 = "sha256-Di/feEQOHNhU3y/HwXQoOnu+gPQYP2Oedf1CPt8gHJ0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View File

@ -1,25 +1,26 @@
{ lib, python3Packages, fetchFromGitHub }:
{ lib, buildPythonPackage, fetchFromGitHub, typing-extensions, setuptools }:
python3Packages.buildPythonPackage rec {
buildPythonPackage rec {
pname = "HyFetch";
version = "1.1.2";
version = "1.3.0";
src = fetchFromGitHub {
repo = "hyfetch";
owner = "hykilpikonna";
rev = "92623417f90f0cf006c0dd2adcf3f24f4308fe0c";
sha256 = "sha256-26L2qt+RarRf3+L6+mMy/ZJNVBVirKs5oEclEsImtC0=";
rev = version;
sha256 = "sha256-8Mp3MV9HVzXzT/W6F/lD34tT0uOgqyydg31PlR3sMUA=";
};
propagatedBuildInputs = with python3Packages; [
# TODO: Remove with next release bump since it has been fixed upstream (hykilpikonna/hyfetch@d797a8c)
postPatch = ''
chmod +x neofetch
'';
propagatedBuildInputs = [
typing-extensions
setuptools
];
preCheck = ''
rm -rf hyfetch/color_scale_numpy.py
'';
meta = with lib; {
description = "neofetch with pride flags <3";
longDescription = ''
@ -34,9 +35,6 @@ python3Packages.buildPythonPackage rec {
homepage = "https://github.com/hykilpikonna/HyFetch";
license = licenses.mit;
mainProgram = "hyfetch";
maintainers = [
maintainers.yisuidenghua
];
maintainers = with maintainers; [ yisuidenghua ];
};
}

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "sfeed";
version = "1.4";
version = "1.5";
src = fetchgit {
url = "git://git.codemadness.org/sfeed";
rev = version;
sha256 = "sha256-fn+PE0WwBdllsO1gXbM2Ftdrl8ua/v50Ny4C/J4OK8Q=";
sha256 = "sha256-OF6xVzvTMbe8Yo64MIg7Cs91XtTBD5GtwAKUbQGYffA=";
};
buildInputs = [ ncurses ];

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "siege";
version = "4.1.3";
version = "4.1.4";
src = fetchurl {
url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz";
hash = "sha256-IlC8qPylOfGk5Mvluomv0yxHObL7xgx8phaNmngveQo=";
hash = "sha256-zkPfnH9rCBqE52CxaEMlGUebrrRXtHTAl6/6W0UqRcs=";
};
NIX_LDFLAGS = lib.optionalString stdenv.isLinux [

View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "snowflake";
version = "2.2.0";
version = "2.3.0";
src = fetchgit {
url = "https://git.torproject.org/pluggable-transports/${pname}";
rev = "v${version}";
sha256 = "0iazamrfixv6yxc5m49adm97biq93pn6hwwpbh8yq558hrc6bh70";
sha256 = "sha256-LQ9QIdj3id6bEzAItMGc3pJFylNP4har79VKUa9qo20=";
};
vendorSha256 = "1v7cpg3kny0vqmdbgcc7i61wi5gx5wvrv0hmjykjrqgrvyq764c1";
vendorSha256 = "sha256-a2Ng+D1I0v5odChM6XVVnNwea/0SOTOmdm2dqKaSU3s=";
meta = with lib; {
description = "System to defeat internet censorship";

View File

@ -6,11 +6,11 @@ in
stdenv.mkDerivation rec {
pname = "spoofer";
version = "1.4.7";
version = "1.4.8";
src = fetchurl {
url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-6ov1dZbxmBRIhfIzUaxiaHUeiU6SbNKhiQX1W4lmhD8=";
sha256 = "sha256-npSBC4uE22AF14vR2xPX9MEwflDCiCTifgYpxav9MXw=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "telepresence2";
version = "2.5.4";
version = "2.6.4";
src = fetchFromGitHub {
owner = "telepresenceio";
repo = "telepresence";
rev = "v${version}";
sha256 = "sha256-v6E1v89cVL4N8eKJ5pKU6BwQWZF5lLs4VLGhUS5J1rA=";
sha256 = "sha256-AZW58L0971GVnvafecHfVg3MWr/xGHi4ptycXcV63Fg=";
};
# The Helm chart is go:embed'ed as a tarball in the binary.
@ -21,7 +21,7 @@ buildGoModule rec {
go run ./build-aux/package_embedded_chart/main.go ${src.rev}
'';
vendorSha256 = "sha256-RDXP7faijMujAV19l9NmI4xk0Js6DE5YZoHRo2GHyoU=";
vendorSha256 = "sha256-aa40+6cjpA6/bqpFiqayCkX0PBToPmsp99ykv6e7Huc=";
ldflags = [
"-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tinyssh";
version = "20220311";
version = "20220801";
src = fetchFromGitHub {
owner = "janmojzis";
repo = "tinyssh";
rev = version;
sha256 = "sha256-+lmPPc2UsNtOfuheWEZHAzmKBilNQ3kNh8ixzDnRjRc=";
sha256 = "sha256-y01Uq7SyIsFX3KL3V+fF6x3ukrUTuijxwwhPBE3ehI0=";
};
preConfigure = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jsvc";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz";
sha256 = "sha256-UzzXb+MRPVNTE8HYsB/yPK9rq8zGmbGmi0RGk3zER0s=";
sha256 = "sha256-SSc3ocubCfBjZtyUHpCE6rDkF7UtAAWsUIa9fQ1gHts=";
};
buildInputs = [ commonsDaemon ];

View File

@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "seehecht";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "annaaurora";
repo = "seehecht";
rev = "v${version}";
sha256 = "sha256-x5zZEDaBmWpyvY+sKuiK4L+hc85prxCueWYUNMi9ty0=";
sha256 = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0=";
};
cargoSha256 = "sha256-mWGmMtUYeM97SM+/jtOzkAe1usuZT4yOI6PAbiGKe7M=";
cargoSha256 = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA=";
postInstall = ''
ln -s $out/bin/seh $out/bin/seehecht

View File

@ -20784,6 +20784,8 @@ with pkgs;
quickder = callPackage ../development/libraries/quickder {};
quickmem = callPackage ../development/libraries/quickmem {};
quicksynergy = callPackage ../applications/misc/quicksynergy { };
quill = callPackage ../tools/security/quill {
@ -34844,7 +34846,7 @@ with pkgs;
hplipWithPlugin = hplip.override { withPlugin = true; };
hyfetch = callPackage ../tools/misc/hyfetch { };
hyfetch = python3Packages.callPackage ../tools/misc/hyfetch { };
hyperfine = callPackage ../tools/misc/hyperfine {
inherit (darwin.apple_sdk.frameworks) Security;