colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-03-17 12:02:22 +00:00 committed by GitHub
parent d8c7cd0119 c222aba0b8
commit 83409a8a66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
133 changed files with 1334 additions and 1095 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/backport.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs
uses: korthout/backport-action@08bafb375e6e9a9a2b53a744b987e5d81a133191 # v2.1.1
uses: korthout/backport-action@e8161d6a0dbfa2651b7daa76cbb75bc7c925bbf3 # v2.4.1
with:
# Config README: https://github.com/korthout/backport-action#backport-action
copy_labels_pattern: 'severity:\ssecurity'

5
maintainers/maintainer-list.nix
View File

@ -6653,6 +6653,11 @@
githubId = 46672819;
name = "Frido Friedemann";
};
friedrichaltheide = {
github = "friedrichaltheide";
githubId = 11352905;
name = "Friedrich Altheide";
};
frlan = {
email = "frank@frank.uvena.de";
github = "frlan";

2
nixos/modules/services/databases/postgresql.md
View File

@ -277,7 +277,7 @@ self: super: {
Here's a recipe on how to override a particular plugin through an overlay:
```
self: super: {
postgresql_15 = super.postgresql_15.override { this = self.postgresql_15; } // {
postgresql_15 = super.postgresql_15// {
pkgs = super.postgresql_15.pkgs // {
pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: {
name = "pg_repack-v20181024";

2
nixos/modules/services/databases/postgresql.nix
View File

@ -14,7 +14,7 @@ let
# package = pkgs.postgresql_<major>;
# };
# works.
base = if cfg.enableJIT && !cfg.package.jitSupport then cfg.package.withJIT else cfg.package;
base = if cfg.enableJIT then cfg.package.withJIT else cfg.package;
in
if cfg.extraPlugins == []
then base

2
nixos/modules/services/desktop-managers/plasma6.nix
View File

@ -215,7 +215,7 @@ in {
serif = ["Noto Serif"];
};
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services.

2
nixos/modules/services/x11/desktop-managers/deepin.nix
View File

@ -66,7 +66,7 @@ in
services.upower.enable = mkDefault config.powerManagement.enable;
networking.networkmanager.enable = mkDefault true;
programs.dconf.enable = mkDefault true;
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
fonts.packages = with pkgs; [ noto-fonts ];
xdg.mime.enable = true;

2
nixos/modules/services/x11/desktop-managers/lxqt.nix
View File

@ -62,7 +62,7 @@ in
# Link some extra directories in /run/current-system/software/share
environment.pathsToLink = [ "/share" ];
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
# virtual file systems support for PCManFM-QT
services.gvfs.enable = true;

2
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -336,7 +336,7 @@ in
serif = [ "Noto Serif" ];
};
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services.

2
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -131,7 +131,7 @@ in
xfdesktop
] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
programs.xfconf.enable = true;
programs.thunar.enable = true;

4
pkgs/applications/audio/jacktrip/default.nix
View File

@ -11,7 +11,7 @@
}:
stdenv.mkDerivation rec {
version = "2.2.2";
version = "2.2.3";
pname = "jacktrip";
src = fetchFromGitHub {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
repo = "jacktrip";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-idfetMiMqjl9Qrun4hlFhQaGWcvasgjojTts+0F3GGE=";
sha256 = "sha256-uUmaTqUiih4nVt4Cba77WDt4xGQixsBe3WNavBDanx0=";
};
preConfigure = ''

12
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -8593,6 +8593,18 @@ final: prev:
meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
};
outline-nvim = buildVimPlugin {
pname = "outline.nvim";
version = "2024-01-22";
src = fetchFromGitHub {
owner = "hedyhli";
repo = "outline.nvim";
rev = "a8d40aecb799196303ff3521c0e31c87bba57198";
sha256 = "1xhqrgjj37d1wq7vrcw9vwmrvzl5a3vyz4k0dglvgjq5z2g5zb0x";
};
meta.homepage = "https://github.com/hedyhli/outline.nvim/";
};
overseer-nvim = buildVimPlugin {
pname = "overseer.nvim";
version = "2024-03-07";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -722,6 +722,7 @@ https://github.com/salkin-mada/openscad.nvim/,HEAD,
https://github.com/nvim-orgmode/orgmode/,,
https://github.com/rgroli/other.nvim/,HEAD,
https://github.com/jmbuhr/otter.nvim/,,
https://github.com/hedyhli/outline.nvim/,HEAD,
https://github.com/stevearc/overseer.nvim/,HEAD,
https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,
https://github.com/vuki656/package-info.nvim/,,

6
pkgs/applications/graphics/oculante/default.nix
View File

@ -22,16 +22,16 @@
rustPlatform.buildRustPackage rec {
pname = "oculante";
version = "0.8.13";
version = "0.8.16";
src = fetchFromGitHub {
owner = "woelper";
repo = "oculante";
rev = version;
hash = "sha256-RbRvV3OkRZXc0n7qGzqbBtbU81wFc+/Ohg9pbVqdsw4=";
hash = "sha256-C8USTDW5C+mjj/fr242is/42RpmUvcK3lUeaq0/BSGA=";
};
cargoHash = "sha256-qt4bHCHpiP6yOce9hquVVlLFF906ADwhss4xAP9E0fA=";
cargoHash = "sha256-w8k0QG509PRHHB1e4WThYnM6R0PwWMbSBxs2B0zQ0ww=";
nativeBuildInputs = [
cmake

4
pkgs/applications/misc/calibre/default.nix
View File

@ -32,11 +32,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "calibre";
version = "7.6.0";
version = "7.7.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-fD2kTwH692x6Nm93NrUQvmbcXiX9hHBpo4wvUvBqLAM=";
hash = "sha256-+kz3Fz1RDQ+ROgv7y0WNAWvIESKvHKID8UnSeCh8yA4=";
};
patches = [

4
pkgs/applications/misc/corectrl/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec{
pname = "corectrl";
version = "1.3.10";
version = "1.3.11";
src = fetchFromGitLab {
owner = "corectrl";
repo = "corectrl";
rev = "v${version}";
sha256 = "sha256-fN4dX0Ya2DvPEkuwtKIw1zT+JEbC2zyJKtcGwLVdAUs=";
sha256 = "sha256-yca9qzYJlOQak6IMNewgUe+KSUUypj/lLUGGw6R90Ws=";
};
patches = [
./polkit-dir.patch

4
pkgs/applications/misc/pure-maps/default.nix
View File

@ -6,13 +6,13 @@
mkDerivation rec {
pname = "pure-maps";
version = "3.2.1";
version = "3.3.0";
src = fetchFromGitHub {
owner = "rinigus";
repo = "pure-maps";
rev = version;
hash = "sha256-AZt0JcNegHkUkWy+NW5CNLZfxjjFyKWBrhLJgSTv3to=";
hash = "sha256-TeFolD3jXRdLGfXdy+QcwtOcQQVUB5fn8PwoYfRLaPQ=";
fetchSubmodules = true;
};

4
pkgs/applications/networking/calls/default.nix
View File

@ -34,7 +34,7 @@
stdenv.mkDerivation rec {
pname = "calls";
version = "45.0";
version = "46.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-NIQFKVpZSxY2QOb73WfYsCzMQwB9XySoADCL7IlmGe8=";
hash = "sha256-ZUVMK0Ex77EQKTGM0gBDHt8W9l4rHspihYduMcwMGho=";
};
outputs = [ "out" "devdoc" ];

6
pkgs/applications/networking/cluster/atmos/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atmos";
version = "1.65.0";
version = "1.66.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KhWi5zxPyBe0xJuJjTROwFIyMPqgUvDeRRIOVowKVxc=";
sha256 = "sha256-8cEJw4gCyh3aosck70vdLVYGOL3zR0AOpAMNv/j6rEM=";
};
vendorHash = "sha256-imMIxEmMdW8nAsQC4q7TID+c7J8LbdtAWFj8qvPGtyA=";
vendorHash = "sha256-k03pRrUzHvVjKt6w40JEiJTvbwhKa/0rjkZQsnmfe68=";
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];

6
pkgs/applications/networking/cluster/popeye/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "popeye";
version = "0.20.5";
version = "0.21.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "derailed";
repo = "popeye";
sha256 = "sha256-e3ANhF2g1YpCipnHej2ZegoAq20MOyTIjxgNMs3qGbk=";
sha256 = "sha256-wEOmG15h3YRO/MmMj5QZxmc0itZJeIQs3LuB3GXWWQw=";
};
ldflags = [
@ -17,7 +17,7 @@ buildGoModule rec {
"-X github.com/derailed/popeye/cmd.commit=${version}"
];
vendorHash = "sha256-lRm3cS+VYP9vptr6ixmkni7DpNnexrhyccKDV7TWKg0=";
vendorHash = "sha256-qrw/7fauMVb3Ai5E5MXL84yXHcReJZZ1oioB/Cv32Is=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/compactor/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "dns-stats";
repo = pname;
repo = "compactor";
rev = version;
fetchSubmodules = true;
hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tools to capture DNS traffic and record it in C-DNS files";
homepage = "https://dns-stats.org/";
changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt";
changelog = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt";
license = licenses.mpl20;
maintainers = with maintainers; [ fdns ];
platforms = platforms.unix;

16
pkgs/applications/networking/gns3/default.nix
View File

@ -12,25 +12,25 @@ in {
guiStable = mkGui {
channel = "stable";
version = "2.2.45";
hash = "sha256-SMnhPz5zTPtidy/BIvauDM60WgDLG+NIr9rdUrQhz0A=";
version = "2.2.46";
hash = "sha256-i/Eq66dYDGR4RLJ76ZlKruhU0KC9KlMMf8Wb91ZoyY0=";
};
guiPreview = mkGui {
channel = "stable";
version = "2.2.45";
hash = "sha256-SMnhPz5zTPtidy/BIvauDM60WgDLG+NIr9rdUrQhz0A=";
version = "2.2.46";
hash = "sha256-i/Eq66dYDGR4RLJ76ZlKruhU0KC9KlMMf8Wb91ZoyY0=";
};
serverStable = mkServer {
channel = "stable";
version = "2.2.45";
hash = "sha256-1GwhZEPfRW1e+enJipy7YOnA4QzeqZ7aCG92GrsZhms=";
version = "2.2.46";
hash = "sha256-A6rAhc/EGvbqVdg1jXxNX3bKQLcGurqa7hKh9LvH+es=";
};
serverPreview = mkServer {
channel = "stable";
version = "2.2.45";
hash = "sha256-1GwhZEPfRW1e+enJipy7YOnA4QzeqZ7aCG92GrsZhms=";
version = "2.2.46";
hash = "sha256-A6rAhc/EGvbqVdg1jXxNX3bKQLcGurqa7hKh9LvH+es=";
};
}

2
pkgs/applications/networking/gns3/gui.nix
View File

@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
inherit hash;
owner = "GNS3";
repo = pname;
rev = "v${version}";
rev = "refs/tags/v${version}";
};
nativeBuildInputs = with python3.pkgs; [

6
pkgs/applications/networking/syncthing/default.nix
View File

@ -13,16 +13,16 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
version = "1.27.2";
version = "1.27.4";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
hash = "sha256-CDOWN2b7DCRqhbJmiz4zp+q03GwmuVKv1MZT3NaO7lI=";
hash = "sha256-TXkZJAN72Qa3Mo2TYvCHNOl3BWfRxu78XXHW48Jjj0M=";
};
vendorHash = "sha256-3MWVx0N17YgvFira56gvqMJlR1o/udtmWBn9oEVEp04=";
vendorHash = "sha256-ALdmETpEmvA3bTfBRK6LaO7bnlH03fljX1P7rqzskG4=";
nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when

4
pkgs/applications/networking/xpipe/default.nix
View File

@ -33,14 +33,14 @@ let
}.${system} or throwSystem;
hash = {
x86_64-linux = "sha256-MtSpyPj2PX8K2e4ZLAmvn0T5bJvPtBbzmn6/cTXGlbc=";
x86_64-linux = "sha256-5AxEkGmThLEEw1XGrWuabRcVgYH8OT2cXxyeFrYeBOI=";
}.${system} or throwSystem;
displayname = "XPipe";
in stdenvNoCC.mkDerivation rec {
pname = "xpipe";
version = "8.0.1";
version = "8.3";
src = fetchzip {
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

4
pkgs/applications/science/biology/mafft/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mafft";
version = "7.520";
version = "7.525";
src = fetchFromGitLab {
owner = "sysimm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-H+EcKahJWwidAx+IUT4uCZEty+S8hUeMSB8VbTu5SmQ=";
sha256 = "sha256-ckBmvFssYAmYcBHAEftjQqBV0MB0theGfemaPx3XUws=";
};
preBuild = ''

4
pkgs/applications/science/math/getdp/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "getdp";
version = "3.5.0";
version = "3.6.0";
src = fetchurl {
url = "http://getdp.info/src/getdp-${version}-source.tgz";
sha256 = "sha256-C/dsSe+puIQBpFfBL3qr2XWXrUnvYy0/uTCKqOpDe9w=";
sha256 = "sha256-N1cb72W77Dr+TzeHpLgv5FuFb+SJqyGcfn+kOfEvZgA=";
};
inherit (petsc) mpiSupport;

6
pkgs/applications/version-management/delta/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.16.5";
version = "0.17.0";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
hash = "sha256-W6XtfXfOP8QfQ0t5hquFdYvCO9muE50N1fQsNtnOzfM=";
hash = "sha256-r0ED9o2UP91fe6Bng5ioJra5S1bg+UEXMLeSQPkMswI=";
};
cargoHash = "sha256-SNKbgEyelJCHKCaBRfCGc3RECGABtZzMC2rCbhzqZtU=";
cargoHash = "sha256-3CxRNhcjfDK/xUuM3w+GwqE0+X6WT92/LGj/qRp0TwA=";
nativeBuildInputs = [
installShellFiles

2
pkgs/applications/virtualization/singularity/generic.nix
View File

@ -300,7 +300,7 @@ in
let
unwrapped = writeShellScriptBin "apptainer-cuda-saxpy"
''
${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.tests.image-saxpy} saxpy
${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.gpuChecks.image-saxpy} saxpy
'';
in
runCommand "run-apptainer-cuda-saxpy"

2
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -281,7 +281,7 @@ in stdenv.mkDerivation {
];
license = licenses.gpl2;
homepage = "https://www.virtualbox.org/";
maintainers = with maintainers; [ sander ];
maintainers = with maintainers; [ sander friedrichaltheide ];
platforms = [ "x86_64-linux" ];
mainProgram = "VirtualBox";
};

2
pkgs/applications/virtualization/virtualbox/extpack.nix
View File

@ -19,7 +19,7 @@ fetchurl rec {
description = "Oracle Extension pack for VirtualBox";
license = licenses.virtualbox-puel;
homepage = "https://www.virtualbox.org/";
maintainers = with maintainers; [ sander ];
maintainers = with maintainers; [ sander friedrichaltheide ];
platforms = [ "x86_64-linux" ];
};
}

2
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
'';
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = "GPL";
maintainers = [ lib.maintainers.sander ];
maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ];
platforms = [ "i686-linux" "x86_64-linux" ];
broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10");
};

4
pkgs/applications/window-managers/evilwm/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "evilwm";
version = "1.4.2";
version = "1.4.3";
src = fetchurl {
url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz";
sha256 = "sha256-QhLW2QywBbLMiIFLyFN3NrSVCrWCZLu2W4gHrGO9xLk=";
sha256 = "sha256-1ZRbILEskdskEvrA29o/ucPsjeu44bEJg4mSsrG75dQ=";
};
buildInputs = [

8
pkgs/build-support/cc-wrapper/default.nix
View File

@ -53,6 +53,10 @@
, gccForLibs ? if useCcForLibs then cc else null
, fortify-headers ? null
, includeFortifyHeaders ? null
# https://github.com/NixOS/nixpkgs/issues/295322
# should -march flag be used
, disableMarch ? false
}:
assert nativeTools -> !propagateDoc && nativePrefix != "";
@ -629,7 +633,7 @@ stdenv.mkDerivation {
# TODO: aarch64-darwin has mcpu incompatible with gcc
+ optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) &&
isGccArchSupported targetPlatform.gcc.arch) ''
isGccArchSupported targetPlatform.gcc.arch && !disableMarch) ''
echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
''
@ -725,7 +729,7 @@ stdenv.mkDerivation {
+ optionalString isClang ''
# Escape twice: once for this script, once for the one it gets substituted into.
export march=${escapeShellArg
(optionalString (targetPlatform ? gcc.arch)
(optionalString (targetPlatform ? gcc.arch && !disableMarch)
(escapeShellArg "-march=${targetPlatform.gcc.arch}"))}
export defaultTarget=${targetPlatform.config}
substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh

25
pkgs/applications/emulators/fs-uae/launcher.nix → pkgs/by-name/fs/fsuae-launcher/package.nix
View File

@ -1,33 +1,35 @@
{ lib
, stdenv
, fetchurl
, gettext
, python3
, wrapQtAppsHook
, fsuae
, gettext
, python3Packages
, stdenv
, libsForQt5
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fs-uae-launcher";
version = "3.1.68";
version = "3.1.70";
src = fetchurl {
url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz";
hash = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA=";
hash = "sha256-yvJ8sa44V13SEUJ6C9SgS+N2ZFH5+20TTL2ICY9A36c=";
};
nativeBuildInputs = [
gettext
python3
wrapQtAppsHook
python3Packages.python
libsForQt5.wrapQtAppsHook
];
buildInputs = with python3.pkgs; [
buildInputs = with python3Packages; [
pyqt5
requests
setuptools
];
strictDeps = true;
makeFlags = [ "prefix=$(out)" ];
dontWrapQtApps = true;
@ -47,8 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://fs-uae.net";
description = "Graphical front-end for the FS-UAE emulator";
license = lib.licenses.gpl2Plus;
mainProgram = "fs-uae-launcher";
maintainers = with lib.maintainers; [ sander AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = with lib.systems.inspect;
patternLogicalAnd patterns.isx86 patterns.isLinux;
};
})

12
pkgs/applications/emulators/fs-uae/default.nix → pkgs/by-name/fs/fsuae/package.nix
View File

@ -1,8 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, SDL2
, autoreconfHook
, fetchFromGitHub
, freetype
, gettext
, glib
@ -13,6 +12,7 @@
, lua
, openal
, pkg-config
, stdenv
, zip
, zlib
}:
@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs:{
nativeBuildInputs = [
autoreconfHook
pkg-config
zip
];
buildInputs = [
@ -44,10 +45,11 @@ stdenv.mkDerivation (finalAttrs:{
libmpeg2
lua
openal
zip
zlib
];
strictDeps = true;
meta = {
homepage = "https://fs-uae.net";
description = "An accurate, customizable Amiga Emulator";
@ -58,7 +60,9 @@ stdenv.mkDerivation (finalAttrs:{
Amigas.
'';
license = lib.licenses.gpl2Plus;
mainProgram = "fs-uae";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = with lib.systems.inspect;
patternLogicalAnd patterns.isx86 patterns.isLinux;
};
})

6
pkgs/by-name/hu/hugo/package.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.123.8";
version = "0.124.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
rev = "refs/tags/v${version}";
hash = "sha256-sL/LiQwbn3nD2eDFNuAbDHRGemTiBhTfb5IaugYL9dM=";
hash = "sha256-LLjIKkNtrnnpIUjdJZJlrsyP4O634/B+cyn8DEYfRdk=";
};
vendorHash = "sha256-V7YRrC+6fOIjXOu7E0kIOZZt++4oFLPhmHeWmOVU3Xw=";
vendorHash = "sha256-xl3X9AjlDcmjMExHvzgMp2mXJnt3jae6WNQSklHWKPQ=";
doCheck = false;

6
pkgs/by-name/ig/igir/package.nix
View File

@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "igir";
version = "2.5.0";
version = "2.5.2";
src = fetchFromGitHub {
owner = "emmercm";
repo = "igir";
rev = "v${version}";
hash = "sha256-7gK3NTjirlaraUWGixDdeQrCip9W3X/18mbzXYOizRs=";
hash = "sha256-z70oPKUTVKWQ/BME2ourQZWNmFYRTvSRs+2mKVfoIh8=";
};
npmDepsHash = "sha256-2X0zCCHKFps3fN5X7rnOdD//D7RU9m4V9cyr3CgoXOE=";
npmDepsHash = "sha256-lTqAUtUv0WmS/TUkPZQyCOYhY5BFz4ZCXqJN5I6l/cI=";
# I have no clue why I have to do this
postPatch = ''

63
pkgs/by-name/pe/perf_data_converter/package.nix Normal file
View File

@ -0,0 +1,63 @@
{
lib,
stdenv,
buildBazelPackage,
fetchFromGitHub,
fetchpatch,
bazel_6,
jdk,
elfutils,
libcap,
}:
buildBazelPackage rec {
pname = "perf_data_converter";
version = "0-unstable-2024-03-12";
src = fetchFromGitHub {
owner = "google";
repo = "perf_data_converter";
rev = "e1cfe1e7e5d8cf3b728a166bf02d4227c82801eb";
hash = "sha256-Y3tBLH2jf1f28o6RK2inq9FulKc66qcqwKmxYdFC5tA=";
};
bazel = bazel_6;
bazelFlags = [
"--java_runtime_version=local_jdk"
"--tool_java_runtime_version=local_jdk"
];
fetchAttrs = {
sha256 = "sha256-IauQ4zEn9YHppLgW+4XjPv4N5IZlEkp//tE/Dy7k28s=";
};
nativeBuildInputs = [ jdk ];
buildInputs = [
elfutils
libcap
];
removeRulesCC = false;
bazelBuildFlags = [ "-c opt" ];
bazelTargets = [ "src:perf_to_profile" ];
bazelTestTargets = [ "src:all" ];
buildAttrs = {
installPhase = ''
runHook preInstall
install -Dm555 -t "$out/bin" bazel-bin/src/perf_to_profile
runHook postInstall
'';
};
meta = with lib; {
description = "Tool to convert Linux perf files to the profile.proto format used by pprof";
homepage = "https://github.com/google/perf_data_converter";
license = licenses.bsd3;
maintainers = with maintainers; [ hzeller ];
platforms = platforms.linux;
};
}

4
pkgs/by-name/sr/srm-cuarzo/package.nix
View File

@ -14,9 +14,9 @@
}:
stdenv.mkDerivation (self: {
pname = "srm-cuarzo";
version = "0.5.4-1";
version = "0.5.5-1";
rev = "v${self.version}";
hash = "sha256-nmYMhX3XtyIyv6Kxi7s+ahkOHfnuLcjpwSU58HcPNeU=";
hash = "sha256-4aeKzvhfVmimz4Df7wnyZESAZa7RMjYUqbhFhqPJ59o=";
src = fetchFromGitHub {
inherit (self) rev hash;

4
pkgs/by-name/ws/wslu/package.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "wslu";
version = "4.1.1";
version = "4.1.2";
src = fetchFromGitHub {
owner = "wslutilities";
repo = "wslu";
rev = "v${version}";
hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc=";
hash = "sha256-rmNGKayg8Y872yICilveMpDFBLkDZ6Ox8rqtWrK2om8=";
};
nativeBuildInputs = [ copyDesktopItems ];

4
pkgs/desktops/gnome/extensions/unite/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
version = "77";
version = "78";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
hash = "sha256-5PClGWOxqwTVaqBySu5I+qavaV1vcKHUvoYJ3Qgcq2o=";
hash = "sha256-4fOCgStMPzUg2QxYeX6tU/WUaGOn1YUyheZp6YNeODA=";
};
passthru = {

6
pkgs/desktops/pantheon/apps/appcenter/default.nix
View File

@ -24,15 +24,15 @@
stdenv.mkDerivation rec {
pname = "appcenter";
version = "7.4.0-unstable-2023-12-04";
version = "7.4.0-unstable-2024-02-07";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
# Add support for AppStream 1.0.
# https://github.com/elementary/appcenter/pull/2099
rev = "d93e135a0b0c9a6e0fbad18fe90d46425823a42c";
hash = "sha256-b7xux6MuvYZFxufQ5T7DoDNBlsJ/fDR0aUY2Hk/xJoY=";
rev = "fce55d9373bfb82953191b32e276a2129ffcb8c1";
hash = "sha256-7VYiE1RkaqN1Yg4pFUBs6k8QjoljYFDgQ9jCTLG3uyk=";
};
nativeBuildInputs = [

8
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View File

@ -13,6 +13,7 @@
, elementary-default-settings
, gnome-settings-daemon
, runtimeShell
, systemd
, writeText
, meson
, ninja
@ -90,13 +91,13 @@ in
stdenv.mkDerivation rec {
pname = "elementary-session-settings";
version = "6.0.0";
version = "6.0.0-unstable-2023-09-05";
src = fetchFromGitHub {
owner = "elementary";
repo = "session-settings";
rev = version;
sha256 = "1faglpa7q3a4335gnd074a3lnsdspyjdnskgy4bfnf6xmwjx7kjx";
rev = "3476c89bbb66564a72c6495ac0c61f8f9ed7a3ec";
sha256 = "sha256-Z1qW6m0XDkB92ZZVKx98JOMXiBDbGpQ0cAXgWdqK27c=";
};
nativeBuildInputs = [
@ -111,6 +112,7 @@ stdenv.mkDerivation rec {
gnome-settings-daemon
onboard
orca
systemd
];
mesonFlags = [

4
pkgs/development/compilers/ciao/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "ciao";
version = "1.22.0-m7";
version = "1.23.0-m1";
src = fetchFromGitHub {
owner = "ciao-lang";
repo = "ciao";
rev = "v${version}";
sha256 = "sha256-5LX+NVDAtdffQeLTD4Camp5aNm0K3Cwmavh7OF5XcZU=";
sha256 = "sha256-JMHln0nYveEEfEr4AMyrEL9KlCDiqV53BWRNMUL8nN0=";
};
configurePhase = ''

10
pkgs/development/compilers/swift/default.nix
View File

@ -25,9 +25,13 @@ let
#
# The following selects the correct Clang version, matching the version
# used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`.
clang = if pkgs.stdenv.isDarwin
clang = let
# https://github.com/NixOS/nixpkgs/issues/295322
clangNoMarch = swiftLlvmPackages.clang.override { disableMarch = true; };
in
if pkgs.stdenv.isDarwin
then
swiftLlvmPackages.clang.override rec {
clangNoMarch.override rec {
libc = apple_sdk.Libsystem;
bintools = pkgs.bintools.override { inherit libc; };
# Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the
@ -37,7 +41,7 @@ let
inherit (llvmPackages) libcxx;
}
else
swiftLlvmPackages.clang;
clangNoMarch;
# Overrides that create a useful environment for swift packages, allowing
# packaging with `swiftPackages.callPackage`. These are similar to

4
pkgs/development/interpreters/wazero/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "wazero";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "tetratelabs";
repo = "wazero";
rev = "v${version}";
hash = "sha256-s01NoliiS8SqoHUjEUUsFcK82nt3xQgmAQZdrEtrOS0=";
hash = "sha256-TBGRO+5PHPna2dNSeNktxALEc6TvJzV+kEiynYqvhgY=";
};
vendorHash = null;

4
pkgs/development/interpreters/yaegi/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "yaegi";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "traefik";
repo = "yaegi";
rev = "v${version}";
hash = "sha256-ZV1HidHJvwum18QIIwQiCcRcitZdHk5+FxkPs6YgDac=";
hash = "sha256-AplNd9+Z+bVC4/2aFKwhabMvumF9IPcSX8X8H0z/ADA=";
};
vendorHash = null;

10
pkgs/development/libraries/libdicom/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, uthash
, meson
, ninja
@ -19,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-9n0Gp9+fmTM/shgWC8zpwt1pic9BrvDubOt7f+ZDMeE=";
};
patches = [
(fetchpatch {
name = "CVE-2024-24793.CVE-2024-24794.patch";
url = "https://github.com/ImagingDataCommons/libdicom/commit/3661aa4cdbe9c39f67d38ae87520f9e3ed50ab16.patch";
excludes = [ "CHANGELOG.md" ];
hash = "sha256-/KTp0nKYk6jX4phNHY+nzjEptUBHKM2JkOftS5vHsEw=";
})
];
buildInputs = [ uthash ];
nativeBuildInputs = [ meson ninja pkg-config ]

17
pkgs/development/libraries/libtins/default.nix
View File

@ -1,26 +1,19 @@
{ boost, cmake, fetchFromGitHub, fetchpatch, gtest, libpcap, openssl, lib, stdenv }:
{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }:
stdenv.mkDerivation rec {
pname = "libtins";
version = "4.4";
version = "4.5";
src = fetchFromGitHub {
owner = "mfontanini";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw=";
sha256 = "sha256-zL4C2Cgs9Y3NebL8MPQBO5j8Bm6xhl8ZggQBPJLRn0o=";
};
patches = [
# Pull gcc-13 fixes:
# https://github.com/mfontanini/libtins/pull/496
# TODO: remove when upgrade to the next version.
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/mfontanini/libtins/commit/812be7966d445ec56e88eab512f8fd2d57152427.patch";
hash = "sha256-5RCFPe95r1CBrAocjTPR2SvUlgaGa1aBc8RazyxUj3M=";
})
# Required for gtest 1.13+.
# Required for gtest 1.13+, see also upstream report at:
# https://github.com/mfontanini/libtins/issues/529
./0001-force-cpp-14.patch
];

57
pkgs/development/php-packages/ioncube-loader/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ stdenv
, lib
, fetchzip
, php
}:
let
phpVersion = lib.versions.majorMinor php.version;
variant = {
"aarch64-darwin" = {
url = "https://web.archive.org/web/20240209234707/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_dar_arm64.tar.gz";
sha256 = "sha256-J6+bOXX9uRdrGouMAxt7nROjjfH4P2txb1hmPoHUmdM=";
prefix = "dar";
};
"aarch64-linux" = {
url = "https://web.archive.org/web/20240209234617/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_aarch64.tar.gz";
sha256 = "sha256-oOO4zr0CssxVGIUIfmAujILqOfQf8dJPADkr03a8HAs=";
prefix = "lin";
};
"x86_64-linux" = {
url = "https://web.archive.org/web/20240209052345if_/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz";
sha256 = "sha256-rsXKgxKHldBKDjJTsOdJP4SxfxLmMPDY+GizBpuDeyw=";
prefix = "lin";
};
"x86_64-darwin" = {
url = "https://web.archive.org/web/20240209234406/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_mac_x86-64.tar.gz";
sha256 = "sha256-bz2hQOaFbXePa8MhAZHESpZMRjjBH51IgvbR2EfBYMg=";
prefix = "mac";
};
};
in
stdenv.mkDerivation {
version = "13.0.2";
pname = "ioncube-loader";
extensionName = "ioncube-loader";
src = fetchzip {
url = variant.${stdenv.hostPlatform.system}.url;
sha256 = variant.${stdenv.hostPlatform.system}.sha256;
};
installPhase = ''
mkdir -p $out/lib/php/extensions
cp $src/ioncube_loader_${variant.${stdenv.hostPlatform.system}.prefix}_${phpVersion}.so $out/lib/php/extensions/ioncube-loader.so
'';
meta = with lib; {
description = "Use ionCube-encoded files on a web server";
changelog = "https://www.ioncube.com/loaders.php";
homepage = "https://www.ioncube.com";
sourceProvenance = [ sourceTypes.binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ neverbehave ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}

4
pkgs/development/python-modules/aiodhcpwatcher/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "aiodhcpwatcher";
version = "0.8.0";
version = "0.8.1";
pyproject = true;
src = fetchFromGitHub {
owner = "bdraco";
repo = "aiodhcpwatcher";
rev = "v${version}";
hash = "sha256-zZigXYUDSbXjlH810CgLa56xWYKcStBeKUbgsZ5WjOw=";
hash = "sha256-t0roU91WblymcY69ieRq9zjlCq+gdJ0eDCkIoNQNjsc=";
};
postPatch = ''

4
pkgs/development/python-modules/airthings-ble/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "airthings-ble";
version = "0.7.0";
version = "0.7.1";
pyproject = true;
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "vincegio";
repo = "airthings-ble";
rev = "refs/tags/${version}";
hash = "sha256-A7Nrg0O+WVoHP+m8pz6idnNcxulwPYmMt9DfhKTHG24=";
hash = "sha256-BeOrGRVxvfQR1xqIpOp4tOTvlqTKCZHUjVKDqVjVnYM=";
};
postPatch = ''

20
pkgs/development/python-modules/atenpdu/default.nix
View File

@ -2,28 +2,33 @@
, buildPythonPackage
, fetchPypi
, async-timeout
, pysnmplib
, pysnmp-lextudio
, pythonOlder
, poetry-core
}:
buildPythonPackage rec {
pname = "atenpdu";
version = "0.6.1";
format = "setuptools";
version = "0.6.2";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.";
src = fetchPypi {
inherit pname version;
hash = "sha256-Of7tQJNqaLDgO8nie6rSd1saMbauXJBp8vWfXYAziEE=";
hash = "sha256-KzRoE4tE/tQkKYroq5PbWKREmEl8AwbIOg3IHRZZtsQ=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
async-timeout
pysnmplib
pysnmp-lextudio
];
# Project has no test
# Module has no test
doCheck = false;
pythonImportsCheck = [
@ -33,6 +38,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python interface to control ATEN PE PDUs";
homepage = "https://github.com/mtdcr/pductl";
changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/cffsubr/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "cffsubr";
version = "0.3.0";
version = "0.2.9.post1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-d0UVC9uBZ5+s3RHB87hwlsT029SVfo/Ou4jEVoeVLvs=";
hash = "sha256-azFBLc9JyPqEZkvahn4u3cVbb+b6aW/yU8TxOp/y/Fw=";
};
patches = [

56
pkgs/development/python-modules/debugpy/default.nix
View File

@ -5,15 +5,17 @@
, fetchFromGitHub
, substituteAll
, gdb
, django
, flask
, gevent
, psutil
, pytest-timeout
, pytest-xdist
, lldb
, pytestCheckHook
, pytest-xdist
, pytest-timeout
, importlib-metadata
, psutil
, django
, requests
, llvmPackages
, gevent
, numpy
, flask
}:
buildPythonPackage rec {
@ -21,7 +23,7 @@ buildPythonPackage rec {
version = "1.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "microsoft";
@ -46,6 +48,12 @@ buildPythonPackage rec {
# To avoid this issue, debugpy should be installed using python.withPackages:
# python.withPackages (ps: with ps; [ debugpy ])
./fix-test-pythonpath.patch
# Attach pid tests are disabled by default on windows & macos,
# but are also flaky on linux:
# - https://github.com/NixOS/nixpkgs/issues/262000
# - https://github.com/NixOS/nixpkgs/issues/251045
./skip-attach-pid-tests.patch
] ++ lib.optionals stdenv.isLinux [
# Hard code GDB path (used to attach to process)
(substituteAll {
@ -56,7 +64,7 @@ buildPythonPackage rec {
# Hard code LLDB path (used to attach to process)
(substituteAll {
src = ./hardcode-lldb.patch;
inherit (llvmPackages) lldb;
inherit lldb;
})
];
@ -66,24 +74,31 @@ buildPythonPackage rec {
set -x
cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process
rm *.so *.dylib *.dll *.exe *.pdb
${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{
$CXX linux_and_mac/attach.cpp -Ilinux_and_mac -std=c++11 -fPIC -nostartfiles ${{
"x86_64-linux" = "-shared -o attach_linux_amd64.so";
"i686-linux" = "-shared -o attach_linux_x86.so";
"aarch64-linux" = "-shared -o attach_linux_arm64.so";
"x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86_64.dylib";
"i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86.dylib";
"aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_arm64.dylib";
"x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_x86_64.dylib";
"i686-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_x86.dylib";
"aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_arm64.dylib";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}
)'';
nativeCheckInputs = [
## Used to run the tests:
pytestCheckHook
pytest-xdist
pytest-timeout
## Used by test helpers:
importlib-metadata
psutil
## Used in Python code that is run/debugged by the tests:
django
flask
gevent
psutil
pytest-timeout
pytest-xdist
pytestCheckHook
numpy
requests
];
@ -107,13 +122,6 @@ buildPythonPackage rec {
# Fixes hanging tests on Darwin
__darwinAllowLocalNetworking = true;
disabledTests = [
# testsuite gets stuck at this one
"test_attach_pid_client"
];
# TODO? https://github.com/NixOS/nixpkgs/issues/262000
doCheck = !stdenv.isLinux;
pythonImportsCheck = [
"debugpy"
];

6
pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch
View File

@ -1,12 +1,12 @@
diff --git a/tests/debug/session.py b/tests/debug/session.py
index 7dacc1f9..f303e20a 100644
index d0921956..459c89c0 100644
--- a/tests/debug/session.py
+++ b/tests/debug/session.py
@@ -631,6 +631,7 @@ class Session(object):
@@ -704,6 +704,7 @@ class Session(object):
if "PYTHONPATH" in self.config.env:
# If specified, launcher will use it in lieu of PYTHONPATH it inherited
# from the adapter when spawning debuggee, so we need to adjust again.
+ self.config.env.prepend_to("PYTHONPATH", os.environ["PYTHONPATH"])
self.config.env.prepend_to("PYTHONPATH", DEBUGGEE_PYTHONPATH.strpath)
return self._request_start("launch")
# Adapter is going to start listening for server and spawn the launcher at

4
pkgs/development/python-modules/debugpy/hardcode-gdb.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
index ed43e370..d3d6669a 100644
index 85f3353b..56fab577 100644
--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
@@ -404,7 +404,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
@@ -410,7 +410,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
is_debug = 0
# Note that the space in the beginning of each line in the multi-line is important!
cmd = [

4
pkgs/development/python-modules/debugpy/hardcode-lldb.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
index d3d6669a..2ded8d9c 100644
index 56fab577..989ede03 100644
--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
@@ -494,7 +494,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d
@@ -500,7 +500,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d
is_debug = 0
# Note that the space in the beginning of each line in the multi-line is important!
cmd = [

2
pkgs/development/python-modules/debugpy/hardcode-version.patch
View File

@ -1,5 +1,5 @@
diff --git a/setup.py b/setup.py
index 3abc811b..91354604 100644
index 1bfba237..414bb4d5 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,6 @@ import sys

27
pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/tests/debug/runners.py b/tests/debug/runners.py
index dc60d0ae..cf4a06a3 100644
--- a/tests/debug/runners.py
+++ b/tests/debug/runners.py
@@ -163,7 +163,7 @@ def _attach_common_config(session, target, cwd):
@_runner
@contextlib.contextmanager
def attach_pid(session, target, cwd=None, wait=True):
- if wait and not sys.platform.startswith("linux"):
+ if wait:
pytest.skip("https://github.com/microsoft/ptvsd/issues/1926")
log.info("Attaching {0} to {1} by PID.", session, target)
diff --git a/tests/debugpy/test_attach.py b/tests/debugpy/test_attach.py
index afabc1ac..2fff3982 100644
--- a/tests/debugpy/test_attach.py
+++ b/tests/debugpy/test_attach.py
@@ -151,8 +151,7 @@ def test_reattach(pyfile, target, run):
@pytest.mark.parametrize("pid_type", ["int", "str"])
-@pytest.mark.skipif(
- not sys.platform.startswith("linux"),
+@pytest.mark.skip(
reason="https://github.com/microsoft/debugpy/issues/311",
)
def test_attach_pid_client(pyfile, target, pid_type):

6
pkgs/development/python-modules/diffimg/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, pillow
, unittestCheckHook
, pythonAtLeast
}:
buildPythonPackage rec {
@ -21,7 +22,10 @@ buildPythonPackage rec {
# fix offered to upstream https://github.com/nicolashahn/diffimg/pull/6
postPatch = ''
substituteInPlace diffimg/test.py \
--replace "from diff import diff" "from diffimg.diff import diff"
--replace-warn "from diff import diff" "from diffimg.diff import diff"
'' + lib.optionalString (pythonAtLeast "3.12") ''
substituteInPlace diffimg/test.py \
--replace-warn "3503192421617232" "3503192421617233"
'';
propagatedBuildInputs = [

4
pkgs/development/python-modules/fake-useragent/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "fake-useragent";
version = "1.5.0";
version = "1.5.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fake-useragent";
repo = "fake-useragent";
rev = "refs/tags/${version}";
hash = "sha256-EzSofIHNwn7GPhnTNbo/451szB759w5T8poXj8XVNUU=";
hash = "sha256-BDXJJeT29GWkN9DoVl8sxXFpV/eMqu3mqlvMr2lzJM8=";
};
postPatch = ''

2
pkgs/development/python-modules/gpy/default.nix
View File

@ -14,7 +14,7 @@
}:
buildPythonPackage rec {
pname = "GPy";
pname = "gpy";
version = "1.13.0";
pyproject = true;

31
pkgs/development/python-modules/jsonformatter/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, setuptools
}:
buildPythonPackage rec {
pname = "jsonformatter";
version = "0.3.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "MyColorfulDays";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-oK419J/MIxRT+1j/5Yklj1F+4d3wuMXR8IVqJAMKPNw=";
};
nativeBuildInputs = [ setuptools ];
pythonImportsCheck = [
"jsonformatter"
];
meta = with lib; {
description = "jsonformatter is a formatter for python output json log, e.g. output LogStash needed log";
homepage = "https://github.com/MyColorfulDays/jsonformatter";
license = licenses.bsd2;
maintainers = with maintainers; [ gador ];
};
}

4
pkgs/development/python-modules/litellm/default.nix
View File

@ -33,7 +33,7 @@
buildPythonPackage rec {
pname = "litellm";
version = "1.31.14";
version = "1.32.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -42,7 +42,7 @@ buildPythonPackage rec {
owner = "BerriAI";
repo = "litellm";
rev = "refs/tags/v${version}";
hash = "sha256-/K8LhKr7TpOPk1CMqNoFJCF+C0N6A8pDkBmS6JZ0sb0=";
hash = "sha256-qIEAtgfzTiUK+HzsocIH3L7z0Wfah3C4GByaA89wvso=";
};
postPatch = ''

4
pkgs/development/python-modules/paste/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "paste";
version = "3.7.1";
version = "3.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cdent";
repo = "paste";
rev = "refs/tags/${version}";
hash = "sha256-xp8FU4MR79/leBSJvSk8J2GdWW32AW2I5i3Y6DsRPLw=";
hash = "sha256-T9VG91Y8hap1nt3FkuCGsv8nglWNlRajvsvljXexH3Y=";
};
postPatch = ''

2
pkgs/development/python-modules/pipx/default.nix
View File

@ -3,6 +3,7 @@
, buildPythonPackage
, fetchFromGitHub
, hatchling
, hatch-vcs
, importlib-metadata
, packaging
, pip
@ -29,6 +30,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
hatchling
hatch-vcs
];
propagatedBuildInputs = [

2
pkgs/development/python-modules/pylint/default.nix
View File

@ -96,6 +96,8 @@ buildPythonPackage rec {
"test_save_and_load_not_a_linter_stats"
# Truncated string expectation mismatch
"test_truncated_compare"
# Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483
"test_functional"
# AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')]
"test_functional_relation_extraction"
] ++ lib.optionals stdenv.isDarwin [

8
pkgs/development/python-modules/pysnmp-lextudio/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pysnmp-lextudio";
version = "6.0.6";
version = "6.0.11";
pyproject = true;
src = fetchFromGitHub {
owner = "lextudio";
repo = "pysnmp";
rev = "v${version}";
hash = "sha256-Mbzpe2wVoW4m7hnfsdcSO/8uOgWl5f1sLLqvdpQP2gU=";
rev = "refs/tags/v${version}";
hash = "sha256-h/FxiGjBZqO82omkVqz+fws398Iz1EkHbZPMYIzG+t0=";
};
nativeBuildInputs = [
@ -57,6 +57,8 @@ buildPythonPackage rec {
# pysnmp.smi.error.MibNotFoundError
"test_send_v3_trap_notification"
"test_addAsn1MibSource"
"test_v1_walk"
"test_v2_walk"
];
pythonImportsCheck = [

12
pkgs/development/python-modules/python-lsp-black/default.nix
View File

@ -7,6 +7,7 @@
, python-lsp-server
, setuptools
, tomli
, fetchpatch
}:
buildPythonPackage rec {
@ -22,6 +23,17 @@ buildPythonPackage rec {
hash = "sha256-nV6mePSWzfPW2RwXg/mxgzfT9wD95mmTuPnPEro1kEY=";
};
patches =
/** fix test failure with black<24.2.0;
remove this patch once python-lsp-black>2.0.0 */
lib.optional
(with lib; (versionOlder version "2.0.1") && (versionAtLeast black.version "24.2.0"))
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/python-lsp/python-lsp-black/pull/56.patch";
hash = "sha256-38bYU27+xtA8Kq3appXTkNnkG5/XgrUJ2nQ5+yuSU2U=";
})
++ [ ];
nativeBuildInputs = [
setuptools
];

4
pkgs/development/python-modules/pyunifiprotect/default.nix
View File

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "pyunifiprotect";
version = "4.23.4";
version = "5.0.1";
pyproject = true;
disabled = pythonOlder "3.9";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "briis";
repo = "pyunifiprotect";
rev = "refs/tags/v${version}";
hash = "sha256-sBdu4XJkEtHf6dlHgJKFQvONp1x89NiS2EgxMiJFX7A=";
hash = "sha256-19Ne8Jk0O1DjFVr286wpn9gdheNXOHHrIE9EgQNNB4w=";
};
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;

6
pkgs/development/python-modules/rich-pixels/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "rich-pixels";
version = "3.0.0";
version = "2.2.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "darrenburns";
repo = "rich-pixels";
rev = "refs/tags/${version}";
hash = "sha256-73CEtK/p4JVOtJgP7CNyee9vEJXaxaAj/kHjWIGETeQ=";
rev = version;
hash = "sha256-fbpnHEfBPWLSYhgETqKbdmmzt7Lu/4oKgetjgNvv04c=";
};
patches = [

4
pkgs/development/python-modules/rq/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "rq";
version = "1.16";
version = "1.15.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "rq";
repo = "rq";
rev = "refs/tags/v${version}";
hash = "sha256-2jseFyq4BpVLc7t1Y/O8olC6IM5A4VEI8Fkrb94dyn8=";
hash = "sha256-cymNXFI+6YEVw2Pc7u6+vroC0428oW7BTLxyBgPqLng=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/s3fs/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "s3fs";
version = "2024.2.0";
version = "2024.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+AZPUirQiLVrBDBHyCVzSEfAJp3xnyYTyVbUwg3hW2I=";
hash = "sha256-pmMjXIrbfmu8RadSksk5Ww+9WAuzlK3EztnorUvYZNo=";
};
postPatch = ''

8
pkgs/development/tools/biome/default.nix
View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "biome";
version = "1.5.3";
version = "1.6.1";
src = fetchFromGitHub {
owner = "biomejs";
repo = "biome";
rev = "cli/v${version}";
hash = "sha256-70LHsmS01ssD4yCbHfBouV+NyhMIlBbX0jcHFu8aLMw=";
hash = "sha256-JApGz2vDGU1IFmhyaT1noCRIP0YoucVvHq395/CJ1zA=";
};
cargoHash = "sha256-wf6X6aY1O9EABQ6sDNAb3XsVrC0lgUtpgoieiPZ7r3k=";
cargoHash = "sha256-4m2xtj3FHd8DTS3BeUMVoo8Pzjkol96B6tvNyzqPhEo=";
nativeBuildInputs = [
pkg-config
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p=biome_cli" ];
cargoTestFlags = cargoBuildFlags ++
# skip a broken test from v1.5.3 release
# skip a broken test from v1.6.1 release
# this will be removed on the next version
[ "-- --skip=diagnostics::test::termination_diagnostic_size" ];

4
pkgs/development/tools/clj-kondo/default.nix
View File

@ -3,12 +3,12 @@
buildGraalvmNativeImage rec {
pname = "clj-kondo";
version = "2024.02.12";
version = "2024.03.13";
src = fetchurl {
url =
"https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-up98q1/GWP9wZP95lHNE1z2xhzGzb8ZyTeuhP7a+qHw=";
sha256 = "sha256-4V0YtGRbSzebxGYkoyCJEA4e1vtYWNbIHyXOlTfvGTU=";
};
graalvmDrv = graalvmCEPackages.graalvm-ce;

6
pkgs/development/tools/goa/default.nix
View File

@ -5,15 +5,15 @@
buildGoModule rec {
pname = "goa";
version = "3.15.0";
version = "3.15.2";
src = fetchFromGitHub {
owner = "goadesign";
repo = "goa";
rev = "v${version}";
hash = "sha256-F5ynJn3uuKSNZYZy+S6OV0AGv9HMpp4oo7lacQ+q3bw=";
hash = "sha256-jzhvElHOBzekW3cyXf7wJG+8E1GObWVtPbBw18/dpCk=";
};
vendorHash = "sha256-SvNuSSLL/zj7rg+k0wNiJazQgZBWrUrpGgumbADkHQY=";
vendorHash = "sha256-Z31hTOMmxFM0zmHoZRJaIz7ka2adV0crdhou6EudDWw=";
subPackages = [ "cmd/goa" ];

4
pkgs/development/tools/jbang/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec {
version = "0.114.0";
version = "0.115.0";
pname = "jbang";
src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
sha256 = "sha256-pLikm68JPG42XE5LCU/PB5rTUywWoQxtmHXYBDPASNE=";
sha256 = "sha256-JTyMX3120h+xtXnkTW313zc7OkWMB4DayeRW6hNc4/A=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/tools/minizinc/ide.nix
View File

@ -5,13 +5,13 @@ let
in
stdenv.mkDerivation rec {
pname = "minizinc-ide";
version = "2.8.2";
version = "2.8.3";
src = fetchFromGitHub {
owner = "MiniZinc";
repo = "MiniZincIDE";
rev = version;
hash = "sha256-3L/hulNI7e2wE9gMt2h3mS0ubHZ4kcVpwALCmWQtv7A=";
hash = "sha256-/x4mWjAk24s6Ax22Q15WUPLLwm7YrzwaoMIINjQr5zU=";
fetchSubmodules = true;
};

6
pkgs/development/tools/misc/terser/default.nix
View File

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "terser";
version = "5.28.1";
version = "5.29.1";
src = fetchFromGitHub {
owner = "terser";
repo = "terser";
rev = "v${version}";
hash = "sha256-iThO12jPzwCyfi69Z0YpttRxhVnSVirKbttN6R5iqRg=";
hash = "sha256-1E5sXNKekkxv40FwGBR20LEWbM63SyKOZ7h1pcCqLKA=";
};
npmDepsHash = "sha256-CptJkwC0A03v2CeYSCKXq7fOhPdLWPrVJYpayzKbdkQ=";
npmDepsHash = "sha256-X37hDDyi0eEWdVoy3vU6+efXgEaLRK81LjfDEWqSFC0=";
meta = with lib; {
description = "JavaScript parser, mangler and compressor toolkit for ES6+";

8
pkgs/development/tools/misc/texlab/default.nix
View File

@ -15,16 +15,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "5.13.0";
version = "5.13.1";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "texlab";
rev = "refs/tags/v${version}";
hash = "sha256-k/Hfl9SZxjdNLzvGrMMu/DPQpXsW21FC/WvJbz1IhSY=";
hash = "sha256-fmtNalpOOPEiMO5zDD6m01cDfFuaLQsYPk6cc7yvjog=";
};
cargoHash = "sha256-tM/y1A/aCkcpU/1nZfUrNYDI0jiGn8qzvmP244tEJac=";
cargoHash = "sha256-5ojXplzkBwchnSZLkwR5jz8WgyEA14Y1iVQ+Q19U8Tg=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
# generate the man page
postInstall = lib.optionalString (!isCross) ''
# TexLab builds man page separately in CI:
# https://github.com/latex-lsp/texlab/blob/v5.13.0/.github/workflows/publish.yml#L117-L121
# https://github.com/latex-lsp/texlab/blob/v5.13.1/.github/workflows/publish.yml#L117-L121
help2man --no-info "$out/bin/texlab" > texlab.1
installManPage texlab.1
'';

4
pkgs/development/tools/mold/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "mold";
version = "2.4.1";
version = "2.30.0";
src = fetchFromGitHub {
owner = "rui314";
repo = "mold";
rev = "v${version}";
hash = "sha256-wwlpYAWP8sAsEkTq0w3s2jAWGayW3v9QcaVRKWHTlGE=";
hash = "sha256-VVgJDKf21V7Mkfalh8tJ0Tx73VG1ong+8C6uPC23154=";
};
nativeBuildInputs = [

6
pkgs/development/tools/oxlint/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "oxlint";
version = "0.2.12";
version = "0.2.13";
src = fetchFromGitHub {
owner = "web-infra-dev";
repo = "oxc";
rev = "oxlint_v${version}";
hash = "sha256-uI+zzRRsRaO3OpDhhrp4VW7mHjwmOENHkPl5htYJ2dA=";
hash = "sha256-R6RKAOmLjPO1vsM/YMQZpggO98GtecNb+nUf3jC2/+o=";
};
cargoHash = "sha256-FV79CORqCXj24CCgGLKew5/tpnjMgVEek0cL2FTFq1A=";
cargoHash = "sha256-+bbTPbCKWN+iJkbtDfEE2CuRdLJNAIoAB0+sSd0kgR4=";
buildInputs = [
rust-jemalloc-sys

1
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
View File

@ -92,6 +92,7 @@
tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json;
tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json;
tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json;
tree-sitter-talon = lib.importJSON ./tree-sitter-talon.json;
tree-sitter-templ = lib.importJSON ./tree-sitter-templ.json;
tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json;
tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json;

12
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json Normal file
View File

@ -0,0 +1,12 @@
{
"url": "https://github.com/wenkokke/tree-sitter-talon",
"rev": "dafc9fabf7acc1a46d51cce379cec00c07661aa7",
"date": "2023-11-05T13:07:41+00:00",
"path": "/nix/store/df67djinw8sjwf6lbfv6gdckxckv0y65-tree-sitter-talon",
"sha256": "1clmmb3pgvc54fsp83f2jmz6n21pmmjkb15yk9bfqlkzdm12sirw",
"hash": "sha256-PEctQm1/UuxWmr6ENWWtNwhrfpXCDXS1I4Xtd8eqlbI=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

4
pkgs/development/tools/parsing/tree-sitter/update.nix
View File

@ -157,6 +157,10 @@ let
repo = "tree-sitter-sql";
branch = "gh-pages";
};
"tree-sitter-talon" = {
orga = "wenkokke";
repo = "tree-sitter-talon";
};
"tree-sitter-typst" = {
orga = "uben0";
repo = "tree-sitter-typst";

4
pkgs/development/tools/quick-lint-js/default.nix
View File

@ -1,13 +1,13 @@
{ buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }:
let
version = "3.1.0";
version = "3.2.0";
src = fetchFromGitHub {
owner = "quick-lint";
repo = "quick-lint-js";
rev = version;
hash = "sha256-bgyjpFYGU+uZLVBJ3gpl8UOrRzvz+7qibQD2RllSY38=";
hash = "sha256-L2LCRm1Fsg+xRdPc8YmgxDnuXJo92nxs862ewzObZ3I=";
};
quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation {

4
pkgs/games/naev/default.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "naev";
version = "0.11.3";
version = "0.11.4";
src = fetchFromGitHub {
owner = "naev";
repo = "naev";
rev = "v${version}";
sha256 = "sha256-2n7i5qCFdpjBpjeMv6aCd0zyD4c60FciHmSafbArnms=";
sha256 = "sha256-Cyun9BxIcv5V3HbMuFEhbYZnAuneTUwztc+ZlNaTp70=";
fetchSubmodules = true;
};

100
pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch
View File

@ -1,100 +0,0 @@
diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
index c23afce4..12ac12f4 100644
--- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
+++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
@@ -365,13 +365,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 2FEA0CFF2490381A00EEF3AD;
- remoteInfo = "MoltenVKSPIRVToMSLConverter-tvOS";
- };
2FEA0D1B249040CA00EEF3AD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
@@ -400,27 +393,6 @@
remoteGlobalIDString = A93903C71C57E9ED00FE90DC;
remoteInfo = "MVKSPIRVToMSLConverter-macOS";
};
- A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = A93903B81C57E9D700FE90DC;
- remoteInfo = "MVKSPIRVToMSLConverter-iOS";
- };
- A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = A9092A8C1A81717B00051823;
- remoteInfo = MoltenVKShaderConverter;
- };
- DCA2CEAE2A45DFD400FB75B6 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = DCFD7F6F2A45BDA0007BBBF7;
- remoteInfo = "MoltenVKShaderConverter-xrOS";
- };
DCBC41212A45DB1000F49BD1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
@@ -1019,7 +998,6 @@
buildRules = (
);
dependencies = (
- 2F21D82F24983488009BEA5F /* PBXTargetDependency */,
);
name = "MoltenVK-tvOS";
productName = MoltenVK;
@@ -1039,7 +1017,6 @@
buildRules = (
);
dependencies = (
- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */,
);
name = "MoltenVK-iOS";
productName = MoltenVK;
@@ -1059,7 +1036,6 @@
buildRules = (
);
dependencies = (
- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */,
);
name = "MoltenVK-macOS";
productName = MoltenVK;
@@ -1476,29 +1452,6 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 2F21D82F24983488009BEA5F /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "MoltenVKSPIRVToMSLConverter-tvOS";
- targetProxy = 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */;
- };
- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "MVKSPIRVToMSLConverter-iOS";
- targetProxy = A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */;
- };
- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = MoltenVKShaderConverter;
- targetProxy = A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */;
- };
- DCA2CEAF2A45DFD400FB75B6 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "MoltenVKShaderConverter-xrOS";
- targetProxy = DCA2CEAE2A45DFD400FB75B6 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin XCBuildConfiguration section */
2FEA0AB824902F9F00EEF3AD /* Debug */ = {
isa = XCBuildConfiguration;

84
pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch
View File

@ -1,84 +0,0 @@
diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
index c7842b63..d55f73ed 100644
--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
+++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 54;
+ objectVersion = 48;
objects = {
/* Begin PBXBuildFile section */
@@ -33,9 +33,6 @@
A920A8AC251B75B70076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
A920A8AD251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
A920A8AE251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
A925B71B1C78DEB2006E7ECD /* libMoltenVKShaderConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; };
A928C9191D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; };
A928C91A1D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; };
@@ -55,12 +52,6 @@
A97CC7411C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A97CC73E1C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp */; };
A98149681FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; };
A98149691FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; };
- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
A9A14E332244388700C080F3 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A14E322244388700C080F3 /* Metal.framework */; };
A9B51BDD225E98BB00AC74D2 /* MVKOSExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B51BDB225E98BB00AC74D2 /* MVKOSExtensions.mm */; };
A9F042B21FB4D060009FCCB8 /* MVKCommonEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F042AA1FB4D060009FCCB8 /* MVKCommonEnvironment.h */; };
@@ -115,9 +106,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -134,9 +122,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -144,9 +129,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -313,7 +295,7 @@
A925B71D1C78DEBF006E7ECD /* PBXTargetDependency */,
);
name = MoltenVKShaderConverter;
- productName = MetalGLShaderConverterTool;
+ productName = MoltenVKShaderConverter;
productReference = A964BD5F1C57EFBD00D930D8 /* MoltenVKShaderConverter */;
productType = "com.apple.product-type.tool";
};
@@ -349,7 +331,7 @@
dependencies = (
);
name = "MoltenVKShaderConverter-macOS";
- productName = "MetalGLShaderConverter-macOS";
+ productName = MoltenVKShaderConverter;
productReference = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */;
productType = "com.apple.product-type.library.static";
};

230
pkgs/os-specific/darwin/moltenvk/default.nix
View File

@ -1,26 +1,31 @@
{ lib
, overrideCC
, stdenv
, fetchFromGitHub
, gitUpdater
, cctools
, sigtool
, cereal
, libcxx
, glslang
, spirv-cross
, spirv-headers
, spirv-tools
, vulkan-headers
, xcbuild
, AppKit
, Foundation
, Libsystem
, MacOSX-SDK
, Metal
, QuartzCore
{
lib,
stdenv,
fetchFromGitHub,
gitUpdater,
cereal,
libcxx,
glslang,
simd,
spirv-cross,
spirv-headers,
spirv-tools,
vulkan-headers,
xcbuild,
AppKit,
Foundation,
Metal,
QuartzCore,
# MoltenVK supports using private APIs to implement some Vulkan functionality.
# Applications that use private APIs can’t be distributed on the App Store,
# but that’s not really a concern for nixpkgs, so use them by default.
# See: https://github.com/KhronosGroup/MoltenVK/blob/main/README.md#metal_private_api
enablePrivateAPIUsage ? true,
}:
let
inherit (stdenv.hostPlatform) isStatic;
in
stdenv.mkDerivation (finalAttrs: {
pname = "MoltenVK";
version = "1.2.7";
@ -32,15 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
QuartzCore
cereal
glslang
simd
spirv-cross
spirv-headers
spirv-tools
vulkan-headers
];
nativeBuildInputs = [ cctools sigtool xcbuild ];
nativeBuildInputs = [ xcbuild ];
outputs = [ "out" "bin" "dev" ];
outputs = [
"out"
"bin"
"dev"
];
src = fetchFromGitHub {
owner = "KhronosGroup";
@ -49,106 +59,142 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-0+S/kueV+AEVt+oFnh4cgcDRVtEbUH1QiHFPhGhimCA=";
};
patches = [
# Fix the Xcode projects to play nicely with `xcbuild`.
./MoltenVKShaderConverter.xcodeproj.patch
./MoltenVK.xcodeproj.patch
];
postPatch = ''
# Move `mvkGitRevDerived.h` to a stable location
substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \
--replace-fail '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \
--replace-fail '$(git rev-parse HEAD)' ${finalAttrs.src.rev}
# Use the SPIRV-Cross packaged in nixpkgs instead of one built specifically for MoltenVK.
substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \
--replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
# Modify MoltenVK Xcode projects to build with xcbuild and dependencies from nixpkgs.
for proj in MoltenVK MoltenVKShaderConverter; do
# Remove xcframework dependencies from the Xcode projects. The basic format is:
# (children|files) = (
# DCFD7F822A45BDA0007BBBF7 /* SPIRVCross.xcframework in Frameworks */,
# etc
# )
# This regex will only remove lines matching `xcframework` that are in these blocks
# to avoid accidentally corrupting the project.
sed -E -e '/(children|files) = /,/;/{/xcframework/d}' \
-i "$proj/$proj.xcodeproj/project.pbxproj"
# Ensure the namespace used is consistent with the spirv-cross package in nixpkgs.
substituteInPlace "$proj/$proj.xcodeproj/project.pbxproj" \
--replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
done
substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \
--replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
# Adding all of `usr/include` from the SDK results in header conflicts with `libcxx.dev`.
# Work around it by symlinking just the SIMD stuff needed by MoltenVK.
--replace-fail MetalGLShaderConverterTool MoltenVKShaderConverter \
--replace-fail MetalGLShaderConverter-macOS MoltenVKShaderConverter
# Don’t try to build `xcframework`s because `xcbuild` can’t build them.
sed -e '/xcframework/d' -i Scripts/package_all.sh
# Remove vendored dependency links.
find . -lname '*/External/*' -delete
# The library will be linked in the install phase regardless of version,
# so truncate it if it exists to avoid link failures.
test -f Scripts/create_dylib.sh && truncate --size 0 Scripts/create_dylib.sh
# Link glslang source because MoltenVK needs non-public headers to build.
mkdir -p build/include
ln -s "${MacOSX-SDK}/usr/include/simd" "build/include"
ln -s "${glslang.src}" "build/include/glslang"
'';
dontConfigure = true;
env.NIX_CFLAGS_COMPILE = toString (
[
"-isystem ${lib.getDev libcxx}/include/c++/v1"
"-I${lib.getDev spirv-cross}/include/spirv_cross"
"-I${lib.getDev spirv-headers}/include/spirv/unified1"
]
++ lib.optional enablePrivateAPIUsage "-DMVK_USE_METAL_PRIVATE_API=1"
);
env.NIX_CFLAGS_COMPILE = toString [
"-isystem ${lib.getDev libcxx}/include/c++/v1"
"-I${lib.getDev spirv-cross}/include/spirv_cross"
"-I${lib.getDev spirv-headers}/include/spirv/unified1/"
env.NIX_LDFLAGS = toString [
"-lMachineIndependent"
"-lGenericCodeGen"
"-lglslang"
"-lOSDependent"
"-lSPIRV"
"-lSPIRV-Tools"
"-lSPIRV-Tools-opt"
"-lspirv-cross-msl"
"-lspirv-cross-core"
"-lspirv-cross-glsl"
"-lspirv-cross-reflect"
];
buildPhase = ''
runHook preBuild
NIX_CFLAGS_COMPILE+=" \
-I$NIX_BUILD_TOP/$sourceRoot/build/include \
-I$NIX_BUILD_TOP/$sourceRoot/Common"
NIX_LDFLAGS+=" -L$NIX_BUILD_TOP/$sourceRoot/build/lib"
# Build each project on its own because `xcbuild` fails to build `MoltenVKPackaging.xcodeproj`.
build=$NIX_BUILD_TOP/$sourceRoot/build
mkdir -p "$build/bin" "$build/lib"
NIX_LDFLAGS+=" \
-lMachineIndependent \
-lGenericCodeGen \
-lglslang \
-lOSDependent \
-lSPIRV \
-lSPIRV-Tools \
-lSPIRV-Tools-opt \
-lspirv-cross-msl \
-lspirv-cross-core \
-lspirv-cross-glsl"
pushd MoltenVKShaderConverter
xcodebuild build \
SYMROOT=$PWD/Products OBJROOT=$PWD/Intermedates \
-jobs $NIX_BUILD_CORES \
-configuration Release \
-project MoltenVKShaderConverter.xcodeproj \
-scheme MoltenVKShaderConverter \
-project MoltenVKPackaging.xcodeproj \
-scheme 'MoltenVK Package (macOS only)' \
-destination generic/platform=macOS \
-arch ${stdenv.hostPlatform.darwinArch}
declare -A products=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib )
for product in "''${!products[@]}"; do
cp MoltenVKShaderConverter-*/Build/Products/Release/$product "$build/''${products[$product]}/$product"
done
popd
NIX_LDFLAGS+=" \
-lobjc \
-lMoltenVKShaderConverter \
-lspirv-cross-reflect"
pushd MoltenVK
xcodebuild build \
-jobs $NIX_BUILD_CORES \
-configuration Release \
-project MoltenVK.xcodeproj \
-scheme MoltenVK-macOS \
-arch ${stdenv.hostPlatform.darwinArch}
cp MoltenVK-*/Build/Products/Release/dynamic/libMoltenVK.dylib "$build/lib/libMoltenVK.dylib"
popd
runHook postBuild
'';
postBuild =
if isStatic then
''
mkdir -p Package/Release/MoltenVK/static
cp Products/Release/libMoltenVK.a Package/Release/MoltenVK/static
''
else
''
# MoltenVK’s Xcode project builds the dylib, but it doesn’t seem to work with
# xcbuild. This is based on the script versions prior to 1.2.8 used.
mkdir -p Package/Release/MoltenVK/dynamic/dylib
clang++ -Wl,-all_load -Wl,-w \
-dynamiclib \
-compatibility_version 1.0.0 -current_version 1.0.0 \
-LProducts/Release \
-framework AppKit \
-framework CoreGraphics \
-framework Foundation \
-framework IOKit \
-framework IOSurface \
-framework Metal \
-framework QuartzCore \
-lobjc \
-lMoltenVKShaderConverter \
-lspirv-cross-reflect \
-install_name "$out/lib/libMoltenVK.dylib" \
-o Package/Release/MoltenVK/dynamic/dylib/libMoltenVK.dylib \
-force_load Products/Release/libMoltenVK.a
'';
installPhase = ''
mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" "$dev/include/MoltenVK"
cp build/bin/MoltenVKShaderConverter "$bin/bin/"
cp build/lib/libMoltenVK.dylib "$out/lib/"
cp MoltenVK/MoltenVK/API/* "$dev/include/MoltenVK"
install -m644 MoltenVK/icd/MoltenVK_icd.json "$out/share/vulkan/icd.d/MoltenVK_icd.json"
substituteInPlace $out/share/vulkan/icd.d/MoltenVK_icd.json \
--replace-fail ./libMoltenVK.dylib "$out/lib/libMoltenVK.dylib"
'';
runHook preInstall
postFixup = ''
install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib"
codesign -s - -f "$out/lib/libMoltenVK.dylib"
codesign -s - -f "$bin/bin/MoltenVKShaderConverter"
libraryExtension=${if isStatic then ".a" else ".dylib"}
packagePath=${if isStatic then "static" else "dynamic/dylib"}
mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" "$dev"
cp Package/Release/MoltenVKShaderConverter/Tools/MoltenVKShaderConverter "$bin/bin"
cp -r Package/Release/MoltenVK/include "$dev"
cp Package/Release/MoltenVK/$packagePath/libMoltenVK$libraryExtension "$out/lib"
# Install ICD definition for use with vulkan-loader.
install -m644 MoltenVK/icd/MoltenVK_icd.json \
"$out/share/vulkan/icd.d/MoltenVK_icd.json"
substituteInPlace "$out/share/vulkan/icd.d/MoltenVK_icd.json" \
--replace-fail ./libMoltenVK.dylib "$out/lib/libMoltenVK.dylib"
runHook postInstall
'';
passthru.updateScript = gitUpdater {
rev-prefix = "v";
ignoredVersions = ".*-(beta|rc).*";
};
meta = {

4
pkgs/os-specific/linux/prl-tools/default.nix
View File

@ -36,13 +36,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "prl-tools";
version = "19.2.1-54832";
version = "19.3.0-54924";
# We download the full distribution to extract prl-tools-lin.iso from
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
src = fetchurl {
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
hash = "sha256-PmQSGoJbB0+Q7t56FOFxOVQ86CJLqAa6PTnWLx5CzpA=";
hash = "sha256-Hj1manQSZHiht6mmWes44RVk2Bdqp6QdNCdK322bzWc=";
};
hardeningDisable = [ "pic" "format" ];

25
pkgs/os-specific/linux/xone/default.nix
View File

@ -1,27 +1,18 @@
{ stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "xone";
version = "0.3";
version = "0.3-unstable-2024-03-16";
src = fetchFromGitHub {
owner = "medusalix";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE=";
repo = "xone";
rev = "948d2302acdd6333295eaba4da06d96677290ad3";
hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM=";
};
patches = [
# Fix build on kernel 6.3
(fetchpatch {
name = "kernel-6.3.patch";
url = "https://github.com/medusalix/xone/commit/bbf0dcc484c3f5611f4e375da43e0e0ef08f3d18.patch";
hash = "sha256-A2OzRRk4XT++rS6k6EIyiPy/LJptvVRUxoP7CIGrPWU=";
})
];
setSourceRoot = ''
export sourceRoot=$(pwd)/${src.name}
export sourceRoot=$(pwd)/${finalAttrs.src.name}
'';
nativeBuildInputs = kernel.moduleBuildDependencies;
@ -30,7 +21,7 @@ stdenv.mkDerivation rec {
"-C"
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"M=$(sourceRoot)"
"VERSION=${version}"
"VERSION=${finalAttrs.version}"
];
buildFlags = [ "modules" ];
@ -45,4 +36,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
};
}
)

4
pkgs/servers/bililiverecorder/default.nix
View File

@ -13,8 +13,8 @@ let
aspnetcore_6_0
];
version = "2.10.1";
hash = "sha256-7F/Hgt0p73QY5Sa3MRP//x7EpfcHCbnAPKDf00XzUbw=";
version = "2.11.0";
hash = "sha256-Q2nRljBl+rnf3Q7WFgPJ9b0xDkUTS9DJ7MpvnwV+cMM=";
in
stdenv.mkDerivation {

3
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2024.3.0";
version = "2024.3.1";
components = {
"3_day_blinds" = ps: with ps; [
];
@ -2430,6 +2430,7 @@
"joaoapps_join" = ps: with ps; [
]; # missing inputs: python-join-api
"juicenet" = ps: with ps; [
python-juicenet
];
"justnimbus" = ps: with ps; [
justnimbus

6
pkgs/servers/home-assistant/default.nix
View File

@ -536,7 +536,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2024.3.0";
hassVersion = "2024.3.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -554,13 +554,13 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-/DCE2IHdS+oImpzwIaFgXotAsoiPPbe3X3HG7RXbv9g=";
hash = "sha256-cvzoia2zzqXSDnPQdevfs73H4qITPBpEpzpFKM9jRKs=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
hash = "sha256-G9M1WV+s4zu9BY10RWmJ71ghafAOHMjnCR6BOlggguM=";
hash = "sha256-WK2PTTFDnQMwiXAtxjNOo9u5KVXWnqUXqd286hq0VEc=";
};
nativeBuildInputs = with python.pkgs; [

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20240306.0";
version = "20240307.0";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-eDuJC23PJbjaKC9TBCLg5ML3XR6admKrT9RVgfUQCw8=";
hash = "sha256-Wy5TzJ6+Dbkk51TMt9zGIfjI7gMrT4mK0IIRnl4byVE=";
};
# there is nothing to strip in this package

4
pkgs/servers/home-assistant/intents.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "home-assistant-intents";
version = "2024.2.28";
version = "2024.3.12";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-EmnaYc+L1PHOv6M7odYDl+UBZkLJRtP86xPoqdbuOqU=";
hash = "sha256-9oMn5ogHcuopAnXgATu9xlBBBMeWJ9RT5C//xJ5FOBI=";
};
postPatch = ''

6
pkgs/servers/klipper/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "klipper";
version = "unstable-2024-02-17";
version = "unstable-2024-03-15";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "28f06a104bc0cfe3a7d36db343ade5a805b3e132";
sha256 = "sha256-v2nv4g3dQTMbUKIrEJo8s66WRWXnSkWO8K+12fK/cZw=";
rev = "bfb71bc2dc63f2911a11ebf580f82b1e8b2706c4";
sha256 = "sha256-djF1IOcMCBcsmVV0hgn6QMwDVClxSSithgiRvss9KQc=";
};
sourceRoot = "${src.name}/klippy";

4
pkgs/servers/mail/mox/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "mox";
version = "0.0.9";
version = "0.0.10";
src = fetchFromGitHub {
owner = "mjl-";
repo = "mox";
rev = "v${version}";
hash = "sha256-QDDNWGuDWxUBdoYEHQC7Ug0i8NyaqqGVsmFtTWfiM0M=";
hash = "sha256-BigxFlMkagw82Lkz1xMMSwAJyfSdSbeQr6G6rCaomNg=";
};
# set the version during buildtime

Some files were not shown because too many files have changed in this diff Show More