diff options
Diffstat (limited to 'pkgs')
27 files changed, 292 insertions, 90 deletions
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index a45853ad98f32..1d91f561c044b 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,31 +1,86 @@ -{ lib, stdenv, fetchFromGitHub -, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl -, bc, coreutils, which, libsndfile, flac, libogg, libvorbis, libopus, pkg-config, libxcb, cmake, gnutls, libtasn1, p11-kit +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, which +, alsa-lib +, curl +, faust +, flac +, gnutls +, libjack2 +, libmicrohttpd +, libmpg123 +, libogg +, libopus +, libsndfile +, libtasn1 +, libvorbis +, libxcb +, llvm +, p11-kit +, qrencode +, qt5 }: stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.16"; + version = "2.5.17"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-O3IWx6Ht/xcb8NFxI7Biwck3dIHbxyof/zDgYDdzozY="; + hash = "sha256-RqtdDkP63l/30sL5PDocvpar5TI4LdKfeeliSNeOHog="; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook cmake ]; + patches = [ + # move mutex initialization outside assert call + # https://github.com/grame-cncm/faustlive/pull/59 + (fetchpatch { + name = "initalize-mutexes.patch"; + url = "https://github.com/grame-cncm/faustlive/commit/fdd46b12202def9731b9ed2f6363287af16be892.patch"; + hash = "sha256-yH95Y4Jbqgs8siE9rtutmu5C2sNZwQMJzCgDYqNBDj4="; + }) + ]; - buildInputs = [ - llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl - bc coreutils which libsndfile flac libogg libvorbis libopus libxcb gnutls libtasn1 p11-kit + strictDeps = true; + + nativeBuildInputs = [ + cmake + faust + llvm + pkg-config + qt5.wrapQtAppsHook + which ]; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ + alsa-lib + curl + faust + flac + gnutls + libjack2 + libmicrohttpd + libmpg123 + libogg + libopus + libsndfile + libtasn1 + libvorbis + libxcb + llvm + p11-kit + qrencode + qt5.qtbase + ]; - postInstall = '' - wrapProgram $out/bin/FaustLive --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmicrohttpd libsndfile faust llvm_10 ]}" - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" + ]; postPatch = "cd Build"; diff --git a/pkgs/applications/blockchains/btcd/default.nix b/pkgs/applications/blockchains/btcd/default.nix index ea4a120bcab73..a5bdc2bb98463 100644 --- a/pkgs/applications/blockchains/btcd/default.nix +++ b/pkgs/applications/blockchains/btcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "btcd"; - version = "0.23.4"; + version = "0.24.0"; src = fetchFromGitHub { owner = "btcsuite"; repo = pname; rev = "v${version}"; - hash = "sha256-X1kfr6jrVArm0HK0XiN/93OPxqPo8J4U+qglJAf23+A="; + hash = "sha256-TLnJZW2CkvAqPTnJKfBY41siHtdZ+HRABsc+4vnQ9/w="; }; - vendorHash = "sha256-3w8rb0sfAIFCXqPXOKb4QwoLd7WsbFv3phu/rJCEjeY="; + vendorHash = "sha256-quJEpSDltXhJcgI9H707p3HeLj1uuLzaMplT+YXzh/4="; subPackages = [ "." "cmd/*" ]; diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 0207d3fa13e0c..2fef95222b5a5 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -1,26 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, help2man +, gzip +, vtk_9 +, autoPatchelfHook +, libX11 +, libGL +, Cocoa +, OpenGL +}: stdenv.mkDerivation rec { pname = "f3d"; - version = "2.2.1"; + version = "2.3.0"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "f3d-app"; repo = "f3d"; rev = "refs/tags/v${version}"; - hash = "sha256-3Pg8uvrUGPKPmsn24q5HPMg9dgvukAXBgSVTW0NiCME="; + hash = "sha256-pr2xuCy5yoUuj2cjkTh3Xwpg3g7zBspjErEi5luRD6Y="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + help2man + gzip + # https://github.com/f3d-app/f3d/pull/1217 + autoPatchelfHook + ]; buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; - # conflict between VTK and Nixpkgs; - # see https://github.com/NixOS/nixpkgs/issues/89167 cmakeFlags = [ + # conflict between VTK and Nixpkgs; + # see https://github.com/NixOS/nixpkgs/issues/89167 "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_BINDIR=bin" + + "-DF3D_LINUX_GENERATE_MAN=ON" ]; meta = with lib; { @@ -28,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://f3d-app.github.io/f3d"; changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + maintainers = with maintainers; [ bcdarwin pbsds ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 461c83695d5c7..7e84cf7c7c17f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.7.2", - "repo_hash": "sha256-YIwZkmTVmxXlZ07lCUco9VEbylMvE92LQdFOeZXWB2M=", + "version": "16.7.4", + "repo_hash": "sha256-rUEr9G/5T4yWnNY69I+IpjsVOSmfdL0j0u6et4jkIt8=", "yarn_hash": "1qxz2p969qg7kzyvhwxws5zwdw986gdq9gxllzi58c5c56jz49zf", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.7.2-ee", + "rev": "v16.7.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.7.2", - "GITLAB_PAGES_VERSION": "16.7.2", + "GITALY_SERVER_VERSION": "16.7.4", + "GITLAB_PAGES_VERSION": "16.7.4", "GITLAB_SHELL_VERSION": "14.32.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.5.0", - "GITLAB_WORKHORSE_VERSION": "16.7.2" + "GITLAB_WORKHORSE_VERSION": "16.7.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c2f295b3b589b..754f8027100f1 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.7.2"; + version = "16.7.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,7 +18,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-3R7x8eaUJqJ1mKlQ4kYThKyaSfSaow7lGx5EfNo+GNY="; + hash = "sha256-4wdMwLsJiQzaZ8PhQz7gYj+dzA+92NFPm0twMdr65qA="; }; vendorHash = "sha256-btWHZMy1aBSsUVs30IqrdBCO79XQvTMXxkxYURF2Nqs="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 94867f855133a..7a3d358de61ec 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.7.2"; + version = "16.7.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-rUSZDsQt6faNES3ibzo7fJqpzEmXRbbTXOkhOn7jggA="; + hash = "sha256-6OPpfn+nylTUp7rNI8NqipbHmLmaV0ezE1qrQqHcuqw="; }; vendorHash = "sha256-NMky8v0YmN2pSeKJ7G0+DWAZvUx2JlwFbqPHvciYroM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b3dec6385c28e..c05ced41045d5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.7.2"; + version = "16.7.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1dc000c3f41e6..6bda73ead26a7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -53,11 +53,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.1.4"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs="; + hash = "sha256-F23W0L3MTHGpQXLRLdt6Oy6OINY45dsmE4Flo4K+Lb0="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ebdf09fd8379a..6b590182d9e79 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -236,6 +236,12 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; + longDescription = '' + VirtualBox is an x86 and AMD64/Intel64 virtualization product for enterprise and home use. + + To install on NixOS, please use the option `virtualisation.virtualbox.host.enable = true`. + Please also check other options under `virtualisation.virtualbox`. + ''; sourceProvenance = with lib.sourceTypes; [ fromSource binaryNativeCode diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix new file mode 100644 index 0000000000000..40376c646e676 --- /dev/null +++ b/pkgs/by-name/aw/await/package.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "await"; + version = "0.999"; + + src = fetchFromGitHub { + owner = "slavaGanzin"; + repo = "await"; + rev = "v${version}"; + hash = "sha256-z178TKA0x6UnpBQaA8dig2FLeJKGxPndfvwtmylAD90="; + }; + + buildPhase = '' + runHook preBuild + $CC await.c -o await -l pthread + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 await -t $out/bin + install -Dm444 LICENSE -t $out/share/licenses/await + install -Dm444 README.md -t $out/share/doc/await + + runHook postInstall + ''; + + meta = with lib; { + description = "Small binary that runs a list of commands in parallel and awaits termination"; + homepage = "https://await-cli.app"; + license = licenses.mit; + maintainers = with maintainers; [ chewblacka ]; + platforms = platforms.all; + mainProgram = "await"; + }; +} diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index e4e346f8c39f5..c14846d67ca06 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Embeddable, replicated and fault tolerant SQL engine"; homepage = "https://github.com/cowsql/cowsql"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ adamcstephens ]; + maintainers = teams.lxc.members; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/in/incus-unwrapped/package.nix b/pkgs/by-name/in/incus-unwrapped/package.nix index 4c256481bfc35..43bf65bef83e7 100644 --- a/pkgs/by-name/in/incus-unwrapped/package.nix +++ b/pkgs/by-name/in/incus-unwrapped/package.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "incus-unwrapped"; - version = "0.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxc"; repo = "incus"; - rev = "refs/tags/incus-${version}"; - hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo="; + rev = "refs/tags/v${version}"; + hash = "sha256-crWepf5j3Gd1lhya2DGIh/to7l+AnjKJPR+qUd9WOzw="; }; - vendorHash = "sha256-4fxQHtvRULTyKJTGdo42qwWQUSIWqbqOO1Wf8daBP/s="; + vendorHash = "sha256-YfUvkN1qUS3FFKb1wysg40WcJA8fT9SGDChSdT+xnkc="; postPatch = '' substituteInPlace internal/usbid/load.go \ @@ -36,6 +36,7 @@ buildGoModule rec { "cmd/incus-agent" "cmd/incus-migrate" "cmd/lxd-to-incus" + "test/mini-oidc" ]; nativeBuildInputs = [ @@ -84,7 +85,7 @@ buildGoModule rec { updateScript = nix-update-script { extraArgs = [ - "-vr" "incus-\(.*\)" + "-vr" "v\(.*\)" ]; }; }; @@ -94,7 +95,7 @@ buildGoModule rec { homepage = "https://linuxcontainers.org/incus"; changelog = "https://github.com/lxc/incus/releases/tag/incus-${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adamcstephens ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index e02876407a7b2..d4a9ef55c611d 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -11,19 +11,27 @@ , attr , bash , btrfs-progs +, cdrkit , criu , dnsmasq +, e2fsprogs +, getent , gnutar , gptfdisk , gzip , iproute2 , iptables +, kmod +, lvm2 +, minio +, nftables , OVMF , qemu_kvm , qemu-utils , rsync , spice-gtk , squashfsTools +, thin-provisioning-tools , util-linux , virtiofsd , xz @@ -34,17 +42,25 @@ let attr bash btrfs-progs + cdrkit criu dnsmasq + e2fsprogs + getent gnutar gptfdisk gzip iproute2 iptables + kmod + lvm2 + minio + nftables qemu_kvm qemu-utils rsync squashfsTools + thin-provisioning-tools util-linux virtiofsd xz diff --git a/pkgs/by-name/lx/lxd-to-incus/package.nix b/pkgs/by-name/lx/lxd-to-incus/package.nix index 8e58ede27c009..3c3bdca55f1f0 100644 --- a/pkgs/by-name/lx/lxd-to-incus/package.nix +++ b/pkgs/by-name/lx/lxd-to-incus/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { description = "LXD to Incus migration tool"; homepage = "https://linuxcontainers.org/incus"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adamcstephens ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/po/powersploit/package.nix b/pkgs/by-name/po/powersploit/package.nix new file mode 100644 index 0000000000000..8e33c26ae7383 --- /dev/null +++ b/pkgs/by-name/po/powersploit/package.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation { + pname = "powersploit"; + version = "3.0.0-unstable-2020-08-22"; + + src = fetchFromGitHub { + owner = "PowerShellMafia"; + repo = "PowerSploit"; + rev = "d943001a7defb5e0d1657085a77a0e78609be58f"; + hash = "sha256-xVMCB8siyYc8JI7vjlUdO93jI3Qh054F/4CCZyGe75c="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/powersploit + cp -a * $out/share/powersploit + find $out/share -type f -exec chmod -x {} \; + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/PowerShellMafia/PowerSploit/releases/"; + description = "A PowerShell Post-Exploitation Framework"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ shard7 ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + }; +} diff --git a/pkgs/by-name/ra/raft-cowsql/package.nix b/pkgs/by-name/ra/raft-cowsql/package.nix index f4e94d8f4106c..307c3ea8117e1 100644 --- a/pkgs/by-name/ra/raft-cowsql/package.nix +++ b/pkgs/by-name/ra/raft-cowsql/package.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cowsql/raft"; license = licenses.lgpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens ]; + maintainers = teams.lxc.members; }; } diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/data/themes/sweet/default.nix index 3ffa3caf8ba8e..308392a2450b8 100644 --- a/pkgs/data/themes/sweet/default.nix +++ b/pkgs/data/themes/sweet/default.nix @@ -1,29 +1,62 @@ -{ lib, stdenv, fetchurl, unzip, gtk-engine-murrine }: +{ lib +, stdenvNoCC +, fetchurl +, unzip +, gtk-engine-murrine +}: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sweet"; - version = "3.0"; + version = "4.0"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar-Blue.zip"; - sha256 = "sha256-6ZrjH5L7Yox7riR+2I7vVbFoG4k7xHGyOq1OnkllyiY"; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark-v40.zip"; + hash = "sha256-w4jN6PSUNCuqeRQ5wInb5deMTtfpKOa7lj9pN+b/0hU="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar.zip"; - sha256 = "sha256-FAbf682YJCCt8NKSdFoaFLwxLDU1aCcTgNdlybZtPMo="; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark.zip"; + hash = "sha256-2hb2FHWyGSowRdUnrWMJENlqRtSr2CrPtDe3DSZlP8M="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Dark.zip"; - sha256 = "sha256-t6fczOnKwi4B9hSFhHQaQ533o7MFL+7HPtUJ/p2CIXM="; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-v40.zip"; + hash = "sha256-4B0O9hOI9xtzj2gOX354DxtQyiahK5ezr6q6VBpxOJQ="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-mars.zip"; - sha256 = "sha256-QGkkpUqkxGPM1DXrvToB3taajk7vK3rqibQF2M4N9i0="; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue.zip"; + hash = "sha256-8Aw7CsHRflHoeL/DhpxgxDATaAFm+MTMjeZe9Qg8J8o="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet.zip"; - sha256 = "sha256-1qVC2n7ypN1BFuSzBpbY7QzJUzF1anYNAVcMkNpGTMM"; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-v40.zip"; + hash = "sha256-Ih8/d4qHBAaDDHUIdzw7J6jGu5Zg6KTPffEs+jh0VkM="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar.zip"; + hash = "sha256-WdawPwNRW1uVNFIiP7bSQxvcWQtD/i8b4oLplPbPLyU="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark-v40.zip"; + hash = "sha256-5vnTneWP5uRFeL6PjuP61OglbNL6+lLGPHmrLeqyk2w="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark.zip"; + hash = "sha256-EmXM2/IG82KKm5npl2KLTryhu7Y/5KLKnPv1JxYm0Z4="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars-v40.zip"; + hash = "sha256-5t9NsxmbjDg7Nf/BSnbdZhx1wl6PQxXYxKuhlNnIPO4="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars.zip"; + hash = "sha256-ZX7Z9gTMVUjFVtdN+FWuHAkV+Yk8vk7D23gr27efpNM="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-v40.zip"; + hash = "sha256-NHSFgj5iybwzcYw0JyMWijhVXSEvhbMhj1KcvTsHpS4="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet.zip"; + hash = "sha256-R2ULcqjOQ9aPO4c2o5ow81icZGKxA5Qvq7G5XGGC2Og="; }) ]; @@ -44,8 +77,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Light and dark colorful Gtk3.20+ theme"; homepage = "https://github.com/EliverLara/Sweet"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fuzen ]; - platforms = platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fuzen d3vil0p3r ]; + platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 1bf86800df893..ff379c1a78b3f 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko adamcstephens ]; + maintainers = teams.lxc.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 2e1163e5f59c9..e01934b1d7311 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/canonical/raft"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ wucke13 adamcstephens ]; + maintainers = teams.lxc.members; }; } diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 1e6098aa637ae..5e3a73febe9b8 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -5,13 +5,13 @@ tcl.mkTclDerivation rec { pname = "tclx"; - version = "8.6.2"; + version = "8.6.3"; src = fetchFromGitHub { owner = "flightaware"; repo = "tclx"; rev = "v${version}"; - hash = "sha256-ZYJcaVBM5DQWBFYAcW6fx+ENMWJwHzTOUKYPkLsd6o8="; + hash = "sha256-bzLF6qOF9o24joWnGR7B4S+Doj7zv9iTh/mo50iFbUs="; }; # required in order for tclx to properly detect tclx.tcl at runtime diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 49f16db002f3b..4192de0cfeab6 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -6,7 +6,6 @@ , libcap ? null, systemd ? null }: -with lib; stdenv.mkDerivation rec { pname = "lxc"; version = "4.0.12"; @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { "--disable-api-docs" "--with-init-script=none" "--with-distro=nixos" # just to be sure it is "unknown" - ] ++ optional (libapparmor != null) "--enable-apparmor" - ++ optional (libselinux != null) "--enable-selinux" - ++ optional (libseccomp != null) "--enable-seccomp" - ++ optional (libcap != null) "--enable-capabilities" + ] ++ lib.optional (libapparmor != null) "--enable-apparmor" + ++ lib.optional (libselinux != null) "--enable-selinux" + ++ lib.optional (libseccomp != null) "--enable-seccomp" + ++ lib.optional (libcap != null) "--enable-capabilities" ++ [ "--disable-examples" "--enable-python" @@ -90,7 +89,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; - license = licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; longDescription = '' LXC is the userspace control package for Linux Containers, a @@ -100,7 +99,7 @@ stdenv.mkDerivation rec { mechanisms to Linux’s existing process management infrastructure. ''; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxc.members; }; } diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 96477c5f44268..28777d36e6beb 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -2,7 +2,6 @@ , util-linux, makeWrapper , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: -with lib; stdenv.mkDerivation rec { pname = "lxcfs"; version = "4.0.12"; @@ -48,8 +47,8 @@ stdenv.mkDerivation rec { description = "FUSE filesystem for LXC"; homepage = "https://linuxcontainers.org/lxcfs"; changelog = "https://linuxcontainers.org/lxcfs/news/"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxc.members; }; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d4301258dc846..41695ac1a8525 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -55,14 +55,14 @@ in { ''; nextcloud26 = generic { - version = "26.0.10"; - hash = "sha256-yArkYMxOmvfQsJd6TJJX+t22a/V5OW9nwHfgLZsmlIw="; + version = "26.0.11"; + hash = "sha256-Vc0QCCy495oYeRnpWaYwc4Nf4D/ko4VsODoKcS7YADA="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.5"; - hash = "sha256-O1NMmOdrf+2Mo5NMrUGbEK9YViWfMTvsIs06e/pu+WE="; + version = "27.1.6"; + hash = "sha256-rntyt/xSWsSXmMLeaml6TP8ls0ly1p1GmVmIXTNRvvo="; packages = nextcloud27Packages; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 13589edd6bdc8..29534b092d9fa 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -87,7 +87,7 @@ buildGoModule rec { homepage = "https://ubuntu.com/lxd"; changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; license = licenses.asl20; - maintainers = with maintainers; [ marsam adamcstephens ]; + maintainers = teams.lxc.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/tools/admin/lxd/ui.nix index b0582ef999691..15fdd49604b8c 100644 --- a/pkgs/tools/admin/lxd/ui.nix +++ b/pkgs/tools/admin/lxd/ui.nix @@ -35,7 +35,7 @@ mkYarnPackage rec { description = "Web user interface for LXD."; homepage = "https://github.com/canonical/lxd-ui"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/shim/default.nix b/pkgs/tools/misc/shim/default.nix index 0989a37454ca7..0b8f6dbe5a9f6 100644 --- a/pkgs/tools/misc/shim/default.nix +++ b/pkgs/tools/misc/shim/default.nix @@ -12,13 +12,13 @@ let }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "shim"; - version = "15.7"; + version = "15.8"; src = fetchFromGitHub { owner = "rhboot"; repo = pname; rev = version; - hash = "sha256-CfUuq0anbXlCVo9r9NIb76oJzDqaPMIhL9cmXK1iqXo="; + hash = "sha256-xnr9HBfYP035C7p2YTRZasx5SF4a2ZkOl9IpsVduNm4="; fetchSubmodules = true; }; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index a1a0cfde0fe73..e4ee89965ca78 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -63,12 +63,12 @@ buildGoModule rec { wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${lib.makeBinPath bins} ''; - meta = with lib; { + meta = { description = "System container image builder for LXC and LXD"; homepage = "https://github.com/lxc/distrobuilder"; - license = licenses.asl20; - maintainers = with maintainers; [ megheaiulian ]; - platforms = platforms.linux; + license = lib.licenses.asl20; + maintainers = lib.teams.lxc.members; + platforms = lib.platforms.linux; mainProgram = "distrobuilder"; }; } |