Merge master into staging-next
This commit is contained in:
commit
31febba022
49 changed files with 159 additions and 135 deletions
7
.github/CODEOWNERS
vendored
7
.github/CODEOWNERS
vendored
|
@ -268,13 +268,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
|||
/pkgs/development/php-packages @aanderse @drupol @etu @globin @ma27 @talyz
|
||||
/pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz
|
||||
|
||||
# Podman, CRI-O modules and related
|
||||
/nixos/modules/virtualisation/containers.nix @adisbladis
|
||||
/nixos/modules/virtualisation/cri-o.nix @adisbladis
|
||||
/nixos/modules/virtualisation/podman @adisbladis
|
||||
/nixos/tests/cri-o.nix @adisbladis
|
||||
/nixos/tests/podman @adisbladis
|
||||
|
||||
# Docker tools
|
||||
/pkgs/build-support/docker @roberth
|
||||
/nixos/tests/docker-tools* @roberth
|
||||
|
|
|
@ -104,6 +104,7 @@ in mkLicense lset) ({
|
|||
};
|
||||
|
||||
arphicpl = {
|
||||
spdxId = "Arphic-1999";
|
||||
fullName = "Arphic Public License";
|
||||
url = "https://www.freedesktop.org/wiki/Arphic_Public_License/";
|
||||
};
|
||||
|
@ -236,6 +237,7 @@ in mkLicense lset) ({
|
|||
};
|
||||
|
||||
cal10 = {
|
||||
spdxId = "CAL-1.0";
|
||||
fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)";
|
||||
url = "https://opensource.org/licenses/CAL-1.0";
|
||||
};
|
||||
|
@ -429,6 +431,7 @@ in mkLicense lset) ({
|
|||
};
|
||||
|
||||
elastic20 = {
|
||||
spdxId = "Elastic-2.0";
|
||||
fullName = "Elastic License 2.0";
|
||||
url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt";
|
||||
free = false;
|
||||
|
@ -598,6 +601,7 @@ in mkLicense lset) ({
|
|||
|
||||
# Intel's license, seems free
|
||||
iasl = {
|
||||
spdxId = "Intel-ACPI";
|
||||
fullName = "iASL";
|
||||
url = "https://old.calculate-linux.org/packages/licenses/iASL";
|
||||
};
|
||||
|
@ -609,7 +613,7 @@ in mkLicense lset) ({
|
|||
|
||||
imagemagick = {
|
||||
fullName = "ImageMagick License";
|
||||
spdxId = "imagemagick";
|
||||
spdxId = "ImageMagick";
|
||||
};
|
||||
|
||||
imlib2 = {
|
||||
|
@ -803,6 +807,7 @@ in mkLicense lset) ({
|
|||
};
|
||||
|
||||
miros = {
|
||||
spdxId = "MirOS";
|
||||
fullName = "MirOS License";
|
||||
url = "https://opensource.org/licenses/MirOS";
|
||||
};
|
||||
|
@ -1138,6 +1143,7 @@ in mkLicense lset) ({
|
|||
};
|
||||
|
||||
upl = {
|
||||
spdxId = "UPL-1.0";
|
||||
fullName = "Universal Permissive License";
|
||||
url = "https://oss.oracle.com/licenses/upl/";
|
||||
};
|
||||
|
@ -1194,6 +1200,7 @@ in mkLicense lset) ({
|
|||
};
|
||||
|
||||
xfig = {
|
||||
spdxId = "Xfig";
|
||||
fullName = "xfig";
|
||||
url = "https://mcj.sourceforge.net/authors.html#xfig";
|
||||
};
|
||||
|
|
|
@ -767,7 +767,6 @@ with lib.maintainers; {
|
|||
|
||||
podman = {
|
||||
members = [
|
||||
adisbladis
|
||||
saschagrunert
|
||||
vdemeester
|
||||
];
|
||||
|
|
|
@ -522,11 +522,16 @@ let format' = format; in let
|
|||
chmod 0644 $efiVars
|
||||
'';
|
||||
|
||||
createHydraBuildProducts = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo "file ${format}-image $out/${filename}" >> $out/nix-support/hydra-build-products
|
||||
'';
|
||||
|
||||
buildImage = pkgs.vmTools.runInLinuxVM (
|
||||
pkgs.runCommand name {
|
||||
preVM = prepareImage + lib.optionalString touchEFIVars createEFIVars;
|
||||
buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ];
|
||||
postVM = moveOrConvertImage + postVM;
|
||||
postVM = moveOrConvertImage + createHydraBuildProducts + postVM;
|
||||
QEMU_OPTS =
|
||||
concatStringsSep " " (lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}"
|
||||
++ lib.optionals touchEFIVars [
|
||||
|
@ -616,5 +621,5 @@ let format' = format; in let
|
|||
in
|
||||
if onlyNixStore then
|
||||
pkgs.runCommand name {}
|
||||
(prepareImage + moveOrConvertImage + postVM)
|
||||
(prepareImage + moveOrConvertImage + createHydraBuildProducts + postVM)
|
||||
else buildImage
|
||||
|
|
|
@ -317,6 +317,7 @@ in {
|
|||
freetube = discoverTests (import ./freetube.nix);
|
||||
freshrss-sqlite = handleTest ./freshrss-sqlite.nix {};
|
||||
freshrss-pgsql = handleTest ./freshrss-pgsql.nix {};
|
||||
freshrss-http-auth = handleTest ./freshrss-http-auth.nix {};
|
||||
frigate = handleTest ./frigate.nix {};
|
||||
frp = handleTest ./frp.nix {};
|
||||
frr = handleTest ./frr.nix {};
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
let
|
||||
pname = "codux";
|
||||
version = "15.16.1";
|
||||
version = "15.16.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
|
||||
sha256 = "sha256-vc0lnYGOgb1uKAQlj6xc8mbSfJ6apGNSlyDRX3qHeTM=";
|
||||
sha256 = "sha256-GKn8T3MEh+MnOqUnxruTqbnfxUcjGh6EAt+6LHTNCiY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
|
|
@ -59,8 +59,6 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
autoconf-archive
|
||||
] ++ lib.optionals enableOpusfile [
|
||||
# configure.ac uses pkg-config only to locate libopusfile
|
||||
pkg-config
|
||||
];
|
||||
|
||||
|
|
|
@ -168,5 +168,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
mainProgram = "bambu-studio";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
24
pkgs/applications/misc/bambu-studio/orca-slicer.nix
Normal file
24
pkgs/applications/misc/bambu-studio/orca-slicer.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }:
|
||||
let
|
||||
orca-slicer = bambu-studio.overrideAttrs (finalAttrs: previousAttrs: {
|
||||
version = "1.8.1";
|
||||
pname = "orca-slicer";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoftFever";
|
||||
repo = "OrcaSlicer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3aIVi7Wsit4vpFrGdqe7DUEC6HieWAXCdAADVtB5HKc=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc";
|
||||
homepage = "https://github.com/SoftFever/OrcaSlicer";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ zhaofengli ovlach pinpox ];
|
||||
mainProgram = "orca-slicer";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
});
|
||||
in
|
||||
orca-slicer
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flashprint";
|
||||
version = "5.8.1";
|
||||
version = "5.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-X5CsJmJa3qGQxdZ1xg3xoVnIaChzxZ/GaLZFqBE2dIk=";
|
||||
hash = "sha256-6vBEthQD0HM2D+l+2dwWmdU+XPJpcvZQM+2GMuaf5Pw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ];
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, pkgsBuildBuild
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kaniko";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "kaniko";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iSiVRbq6ohAXAWhHUUFUG/6rjlsmgYmy9VAzx76JIt0=";
|
||||
hash = "sha256-YxOuZb1R9Orm3RTnZyzi54VzQbbmE+lO+4osvG97pwE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubefirst";
|
||||
version = "2.3.6";
|
||||
version = "2.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubefirst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PFI7sBLcDIxes7fJnT1sgJbRITyoYptpupfOd6lisjs=";
|
||||
hash = "sha256-oJWQ5u85uQrHnf3VxY0vJwgGePxB4pg+LD0gofYIB1g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-blMKBgSBRCVlXu8n3wcd2iMkBTALe2gPxy0Z4uwxUWI=";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubevpn";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KubeNetworks";
|
||||
repo = "kubevpn";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KHOqVVB1QjhhPUopeZd/A/htanmIoLCNhtnWrqyEN2A=";
|
||||
sha256 = "sha256-n65z7L82qQE4Xao5W99zIkXGEx2BFM4n/6C1cuTJXsk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
versions =
|
||||
if stdenv.isLinux then {
|
||||
stable = "0.0.38";
|
||||
stable = "0.0.39";
|
||||
ptb = "0.0.61";
|
||||
canary = "0.0.224";
|
||||
development = "0.0.1";
|
||||
|
@ -17,7 +17,7 @@ let
|
|||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-0i3xtArA/5LDyGiNQ/FjV3tU7Jzs8E6ZRuSUFNEJyDo=";
|
||||
hash = "sha256-KZLKBzd9hdOQkp7mN0rUZ8TbMvH2G0/AfwHPLAlDpug=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
|
|
|
@ -1,44 +1,22 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript
|
||||
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip
|
||||
, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils
|
||||
, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils, copyDesktopItems
|
||||
, pulseaudio }:
|
||||
|
||||
let
|
||||
description = "Desktop sharing application, providing remote support and online meetings";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "AnyDesk";
|
||||
exec = "@out@/bin/anydesk %u";
|
||||
icon = "anydesk";
|
||||
desktopName = "AnyDesk";
|
||||
genericName = description;
|
||||
categories = [ "Network" ];
|
||||
startupNotify = false;
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "anydesk";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz"
|
||||
"https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz"
|
||||
"https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
|
||||
"https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz"
|
||||
];
|
||||
hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = genericUpdater {
|
||||
versionLister = writeShellScript "anydesk-versionLister" ''
|
||||
curl -s https://anydesk.com/en/downloads/linux \
|
||||
| grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \
|
||||
| uniq \
|
||||
| sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g'
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
|
||||
gnome2.gtkglext libGLU libGL minizip freetype
|
||||
|
@ -48,7 +26,19 @@ in stdenv.mkDerivation rec {
|
|||
libXrandr libXtst libXt libICE libSM libXrender
|
||||
]);
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "AnyDesk";
|
||||
exec = "${placeholder "out"}/bin/anydesk %u";
|
||||
icon = "anydesk";
|
||||
desktopName = "AnyDesk";
|
||||
genericName = description;
|
||||
categories = [ "Network" ];
|
||||
startupNotify = false;
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
@ -57,7 +47,6 @@ in stdenv.mkDerivation rec {
|
|||
install -m755 anydesk $out/bin/anydesk
|
||||
cp copyright README $out/share/doc/anydesk
|
||||
cp -r icons/hicolor/* $out/share/icons/hicolor/
|
||||
cp ${desktopItem}/share/applications/*.desktop $out/share/applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
@ -75,11 +64,19 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
wrapProgram $out/bin/anydesk \
|
||||
--prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]}
|
||||
|
||||
substituteInPlace $out/share/applications/*.desktop \
|
||||
--subst-var out
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = genericUpdater {
|
||||
versionLister = writeShellScript "anydesk-versionLister" ''
|
||||
curl -s https://anydesk.com/en/downloads/linux \
|
||||
| grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \
|
||||
| uniq \
|
||||
| sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g'
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
inherit description;
|
||||
homepage = "https://www.anydesk.com";
|
||||
|
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uCWdDmHzNx1vkZFttQZLD4YfXoXz5VZQfir9sGOoDhw=";
|
||||
hash = "sha256-2TqlBlbMhBqe8WqoyYLJ9B82sAy3MdoaYvvk+XB5CdQ=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "droidcam";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aramg";
|
||||
repo = "droidcam";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NdVnls1DvcaI/bVrc5gN96+KQZDgt0M8zkNn93QJYG0=";
|
||||
sha256 = "sha256-NZ6sKLE/Sq4VBJSf7iG0CgdVwmU8JXQH/utbobBEFi0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cntr";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "cntr";
|
||||
rev = version;
|
||||
sha256 = "sha256-z+0bSxoLJTK4e5xS4CHZ2hNUI56Ci1gbWJsRcN6ZqZA=";
|
||||
sha256 = "sha256-eDozoYN2iOFUY/w7Gjki4nnASyZo4V/YGPjdX2xjNGY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-3e5wDne6Idu+kDinHPcAKHfH/d4DrGg90GkiMbyF280=";
|
||||
cargoHash = "sha256-UZrVZBdaiIrMajePKWXDZI+Z+nXTGadNKmoa3gdfzp4=";
|
||||
|
||||
passthru.tests = nixosTests.cntr;
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages
|
||||
, pixman, vde2, alsa-lib, texinfo, flex
|
||||
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool
|
||||
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson
|
||||
, sigtool
|
||||
, makeWrapper, removeReferencesTo
|
||||
, attr, libcap, libcap_ng, socat, libslirp
|
||||
, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet
|
||||
|
@ -53,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
+ lib.optionalString hostCpuOnly "-host-cpu-only"
|
||||
+ lib.optionalString nixosTestRunner "-for-vm-tests"
|
||||
+ lib.optionalString toolsOnly "-utils";
|
||||
version = "8.1.3";
|
||||
version = "8.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs=";
|
||||
hash = "sha256-vwDS+hIBDfiwrekzcd71jmMssypr/cX1oP+Oah+xvzI=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ]
|
||||
|
@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper removeReferencesTo
|
||||
pkg-config flex bison meson ninja
|
||||
pkg-config flex bison dtc meson ninja
|
||||
|
||||
# Don't change this to python3 and python3.pkgs.*, breaks cross-compilation
|
||||
python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme
|
||||
|
|
|
@ -23,13 +23,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "xdg-desktop-portal-hyprland";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=";
|
||||
hash = "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -22,5 +22,6 @@ buildGoModule rec {
|
|||
changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ terlar ];
|
||||
mainProgram = "pacproxy";
|
||||
};
|
||||
}
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "spleen";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
|
||||
hash = "sha256-N9kJrWaQN9eeNoOVJu9UN2+jcEbHqRWxV+X0DXNJLuA=";
|
||||
hash = "sha256-+TDrAolKoG61CuqqELAEICVNcjIPoow6QPFXqMKUN1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ xorg.mkfontscale ];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin";
|
||||
version = "1.9.20";
|
||||
version = "1.9.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "sha256-Faiiglt0zPbETgTpdnLbgC0t91zi+7Y+8FOb865QBvA=";
|
||||
sha256 = "1rn3rabwyqqhs6xgyfwl326hrzpfpc3qqd2nzwbchck5a09r5cw8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin-native";
|
||||
version = "1.9.20";
|
||||
version = "1.9.22";
|
||||
|
||||
src = let
|
||||
getArch = {
|
||||
|
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
|
|||
"https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";
|
||||
|
||||
getHash = arch: {
|
||||
"macos-aarch64" = "sha256-Yw6IO8pj0C9XHfzVshcovkoFBUXJ3KixhGoybBRFL2U=";
|
||||
"macos-x86_64" = "sha256-mnDi8dMCDzGsdPdD1dw4YMBxAfo5FvwDJVU/ew70z9U=";
|
||||
"linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw=";
|
||||
"macos-aarch64" = "1pf81rplikbp194pjrm2la101iz8vz3jv55109nipd26xghc15ca";
|
||||
"macos-x86_64" = "1r7dmk8cc7f3iwaxamlnlcjl4mbvx443nwvsp8141a21ibrvrmx9";
|
||||
"linux-x86_64" = "1m77qld44gbarjxm99gsdscncx4v0cf6ca3h9bdh2m7d3i4adc62";
|
||||
}.${arch};
|
||||
in
|
||||
fetchurl {
|
||||
|
|
|
@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetds";
|
||||
version = "1.4.8";
|
||||
version = "1.4.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-KzXaLxxmxUrE9uQD2zpKuYOhLpi4a7xMgiZxaf+Tq2k=";
|
||||
hash = "sha256-x+ryJr3LHNwbIhaWUyzNJfTk53VCZaKXd6NAAIS95pg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "httplib";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhirose";
|
||||
repo = "cpp-httplib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JfxeXHo34MKtAkMO3pNWiPorh3f8s4SVrdAaydVYdrY=";
|
||||
hash = "sha256-53EBZTpz0INtjVSmjvg7XOQf0Bs2ADVe2//+nK6xRyE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jaraco-logging";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "jaraco.logging";
|
||||
inherit version;
|
||||
hash = "sha256-X8ssPxI1HU1QN1trYPOJnFg3sjLxotj/y6/17NK3M+c=";
|
||||
hash = "sha256-9KfPusuGqDTCiGwBo7UrxM3icowdlxfEnU3OHWJI8Hs=";
|
||||
};
|
||||
|
||||
pythonNamespaces = [
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatv";
|
||||
version = "0.14.4";
|
||||
version = "0.14.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
|||
owner = "postlund";
|
||||
repo = "pyatv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-w3WOlZFfuCmekUsr8msi2LXTm6j8/Bk49L3MiYF7lOM=";
|
||||
hash = "sha256-Uykj9MIUFcZyTWOBjUhL9+qItbnpwtuTd2Cx5jI7Wtw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyenphase";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "pyenphase";
|
||||
repo = "pyenphase";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XhcCNp7iA7wTd5ldoCO9QC7o3kmL3jIlumjg8Y5mkVQ=";
|
||||
hash = "sha256-4vKfgpCo28btFCTbj7xge7bDImafbOWsabhdMJK5p3Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage {
|
||||
pname = "remotezip";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -17,8 +17,8 @@ buildPythonPackage {
|
|||
repo = "python-remotezip";
|
||||
# upstream does not tag releases, determined with git blame
|
||||
# pypi archive lacks files for tests
|
||||
rev = "da62e115bdb2071ad08a8c91f7ae48f2c1827e0c";
|
||||
hash = "sha256-su4dlV8KZuewf/yGdTnGHK9hNLHwGe10ditmFcne4Us=";
|
||||
rev = "3723724d6d877d3166d52f4528ffa7bd5bf6627f";
|
||||
hash = "sha256-iYxHW8RdLFrpjkcEvpfF/NWBnw7Dd5cx2ghpof2XFn4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stdlibs";
|
||||
version = "2023.11.2";
|
||||
version = "2023.12.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "omnilib";
|
||||
repo = "stdlibs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-084px8p+pOHonSiOvi/BklaccudSlw9URtCaalWlI0o=";
|
||||
hash = "sha256-1Av10FNJkCC2XGNx1LDqd0GwiNPIDPXPFatW8+2XoaI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "4.0.6";
|
||||
version = "4.0.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wbcNtIErAOS2IHKNa+EfSEmxZulQ2TarBdO8SmtefU0=";
|
||||
hash = "sha256-FvMFC1h3gu61jZPSPmxYHQmxnxYKmtYAecc/0IT9E8I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ttls";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "jschlyter";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7w+VFxqv1htN5rKvMbcBV6uYqT3PT0ocv3S9Om2Ol3k=";
|
||||
hash = "sha256-i9vJr7uTpkUZ9WiL0BGidIgCdG87k8JnmZuPqt6qLQE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bacon";
|
||||
version = "2.13.0";
|
||||
version = "2.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KFBb5poogtFnYePu9E5XBE0sKKev2Fuxaqj5ypscuqA=";
|
||||
hash = "sha256-fhAKTZk+51KYjEnVWNLwpUWx+Quj3tmvmIvULQTbGf8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OA8068ISy2WoC34Q0ANrWX27ESErntCfZ5IrO8Lvm10=";
|
||||
cargoHash = "sha256-eBWmb6YaGZX31K3jKNKXgTGOOQm/WiSupckkpi49dWI=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-workspaces";
|
||||
version = "0.2.44";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-5r5XRb/RWHv0Am58VPOxe+QSKn2QT4JZYp5LjTh20KM=";
|
||||
hash = "sha256-1wNoMVfouuPRGFGB6XIhgeeWgknxMctrBl5Vfco6qug=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-p+7CWvspYk1LRO2s8Sstlven/2edNe+JYFQHaDFlGkM=";
|
||||
cargoHash = "sha256-OJGqIo6mYqXjmQb/2CVVTskecYZretw+K46Fvbu/PcQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, sqlite
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "mini-media-player";
|
||||
version = "1.16.6";
|
||||
version = "1.16.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kalkih";
|
||||
repo = "mini-media-player";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1cC9dyZ9+7dXSL/dmFD0HV7SgsBW2zA7a+eOKVwbzg8=";
|
||||
hash = "sha256-mBxK/Y+gesaJwPYHB4P8FCkyfoV9lwC8jAzPZJV+B+M=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/7roW1xkZmGuB/8nFaQz0Yeuai6yJ+cH7Uqa/zxfa5w=";
|
||||
npmDepsHash = "sha256-kuEgX5PX7RKhaJPzx+GW37TiSISvz+51tKGacvAMlfg=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
@ -16,20 +16,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "evcc";
|
||||
version = "0.122.1";
|
||||
version = "0.123.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-mD4D2DVai9KV7/RYFmcY7iOGVQGRpwg+rTfNsP8OpCY=";
|
||||
hash = "sha256-jqlGjDwi+QGh5gmYVoSlxQjyKvNrE9nmSfh1cOlwnoM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-B4gR9sXpGuVv3x6sktFSPlbhq5n5aD5d7ksz67X5nY8=";
|
||||
vendorHash = "sha256-rhGMN5v+JzNg1p2GptomDDtqS7M4EafROXXy185qtmU=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-KTMUZOW56vPGoJviKRJWM9UL28gXL0L3j4ZmUzSeavU=";
|
||||
hash = "sha256-a3AyqQ8GYP3g9KGbjtLHjHBrJGHg2sNjAQlMUa26pOY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -42,13 +42,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nanomq";
|
||||
version = "0.18.2";
|
||||
version = "0.20.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emqx";
|
||||
repo = "nanomq";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-XGJBBuRSL3InXUMGxOttdbt0zmI1APFlc4IvwC2up8g=";
|
||||
hash = "sha256-VCKlXQ7qvBab+wRDnJ6EUA5qaQ36gTFfuerN1GU6sW0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -71,7 +71,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
|||
"-DNNG_ENABLE_TLS=ON"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type";
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-implicit-function-declaration -Wno-error=implicit-int";
|
||||
|
||||
# disabled by default - not 100% reliable and making nanomq depend on
|
||||
# mosquitto would annoy people
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ buildGoModule
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "FreshRSS";
|
||||
version = "1.22.1";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreshRSS";
|
||||
repo = "FreshRSS";
|
||||
rev = version;
|
||||
hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU=";
|
||||
hash = "sha256-X7MYPn1OFmzMWGGlZZ67EHEaRJRKGrdnw6nCzuUfbgU=";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fits-cloudctl";
|
||||
version = "0.12.11";
|
||||
version = "0.12.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fi-ts";
|
||||
repo = "cloudctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rp5iMp6Ah2JESpY8mdwez25D9GghoIMUqMNst72z2fM=";
|
||||
sha256 = "sha256-jNs1I6aVmyHbVghO30r6+gVg0vVLqHpddX1KVX1Xh+s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3RowPOLtEDxXFcb2KizuVP3O0uTwkuUQ8UB2AFPaVVE=";
|
||||
vendorHash = "sha256-NR5Jw4zCYRg6xc9priCVNH+9wOVWx3bmstc3nkQDmv8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line client for FI-TS Finance Cloud Native services";
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "granted";
|
||||
version = "0.20.3";
|
||||
version = "0.20.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-fate";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U8j1IxeBcm9aEJ8LtIxNPdz5mqkSGQ6Ldn7F3HomvGE=";
|
||||
sha256 = "sha256-s1hPyvpk78MgEK+t5r9iFNHBXDnnNLNoAy0jUB9X8wU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HRZKvs3q79Q94TYvdIx2NQU49MmS2PD1lRndcV0Ys/o=";
|
||||
|
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "hsd";
|
||||
version = "6.0.0";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "handshake-org";
|
||||
repo = "hsd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4dWCCybhcdrkLFqUVTajRMnhzNgjpXUN2a+TNIi+Dqo=";
|
||||
hash = "sha256-T57kDEQwHIyW7xVXrzjJdUcocST9ks4x3JR8yytH8P4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZbBu9hnRsC9LrHozny3OlHhgcDbp6ACjXRV4UHneHQc=";
|
||||
npmDepsHash = "sha256-EBrCuRckBg42k6ZUoB25xObv3lULnSPNJ2nO9l/TWvA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ligolo-ng";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tnpitsecurity";
|
||||
repo = "ligolo-ng";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bv611kvjyXvWVkWpymQn4NLtDAYuXnNi1c3yT3t3p+8=";
|
||||
hash = "sha256-T+SBGAE+hzHzrYLTm6t7NGh78B1/84TMiT1odGSPtKo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MEG1p8PJinFOPIU9+9cxtU9FweCgVMYX8KojQ3ZhKKs=";
|
||||
vendorHash = "sha256-QEGF12yJ+CQjIHx6kOwsykVhelp5npnglk7mIbOeIpI=";
|
||||
|
||||
postConfigure = ''
|
||||
export CGO_ENABLED=0
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
let
|
||||
pname = "buttercup-desktop";
|
||||
version = "2.24.3";
|
||||
version = "2.24.4";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage";
|
||||
sha256 = "sha256-ZSKsxlxP2jNUxEeF2Lfuj2yW0KqHozjPoioq4t0uzfo=";
|
||||
sha256 = "sha256-c5MLj/1OSjGsySCENeJqEhubxl2y7uDhnOBAtLGy92I=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname src version; };
|
||||
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "gtop";
|
||||
version = "1.1.3";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aksakalli";
|
||||
repo = "gtop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7jcfJOdy3PKT6+07iaZnjWnlPLk9BhPn8LApk23E8l4=";
|
||||
hash = "sha256-FKbaUV28d0JH9tmTSJBFYQrM5iensnIpcXUFFvXDMe4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-CUfoVkG74C7HpcO3T9HmwbxHsYAgW1vYBAgNvx2av0k=";
|
||||
npmDepsHash = "sha256-QKMLFalaOQjhgVkv8lIDnKyH7+GOqOKIl3zoLwrHIF4=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
@ -1090,8 +1090,6 @@ with pkgs;
|
|||
|
||||
packr = callPackage ../development/libraries/packr { };
|
||||
|
||||
pacproxy = callPackage ../tools/networking/pacproxy { };
|
||||
|
||||
pacup = callPackage ../tools/package-management/pacup { };
|
||||
|
||||
patcher9x = callPackage ../development/tools/patcher9x { };
|
||||
|
@ -22446,7 +22444,7 @@ with pkgs;
|
|||
libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };
|
||||
|
||||
libao = callPackage ../development/libraries/libao {
|
||||
usePulseAudio = config.pulseaudio or stdenv.isLinux;
|
||||
usePulseAudio = config.pulseaudio or lib.meta.availableOn stdenv.hostPlatform libpulseaudio;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
|
||||
};
|
||||
|
||||
|
@ -35485,6 +35483,8 @@ with pkgs;
|
|||
};
|
||||
};
|
||||
|
||||
orca-slicer = callPackage ../applications/misc/bambu-studio/orca-slicer.nix {};
|
||||
|
||||
snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };
|
||||
|
||||
robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
|
||||
|
|
Loading…
Reference in a new issue