Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt 2024-07-11 00:58:50 +02:00
commit fcfac8071d
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
63 changed files with 1124 additions and 1088 deletions

View File

@ -15413,6 +15413,12 @@
githubId = 49961859;
name = "Pavel Sobolev";
};
pawelchcki = {
email = "pawel.chcki@gmail.com";
github = "pawelchcki";
githubId = 812891;
name = "Paweł Chojnacki";
};
pawelpacana = {
email = "pawel.pacana@gmail.com";
github = "pawelpacana";

View File

@ -5,7 +5,6 @@ let
stateDir = "/var/lib/clamav";
clamavGroup = clamavUser;
cfg = config.services.clamav;
pkg = pkgs.clamav;
toKeyValue = generators.toKeyValue {
mkKeyValue = generators.mkKeyValueDefault { } " ";
@ -27,6 +26,7 @@ in
options = {
services.clamav = {
package = mkPackageOption pkgs "clamav" { };
daemon = {
enable = mkEnableOption "ClamAV clamd daemon";
@ -125,7 +125,7 @@ in
};
config = mkIf (cfg.updater.enable || cfg.daemon.enable) {
environment.systemPackages = [ pkg ];
environment.systemPackages = [ cfg.package ];
users.users.${clamavUser} = {
uid = config.ids.uids.clamav;
@ -172,7 +172,7 @@ in
restartTriggers = [ clamdConfigFile ];
serviceConfig = {
ExecStart = "${pkg}/bin/clamd";
ExecStart = "${cfg.package}/bin/clamd";
ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";
User = clamavUser;
Group = clamavGroup;
@ -201,7 +201,7 @@ in
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkg}/bin/freshclam";
ExecStart = "${cfg.package}/bin/freshclam";
SuccessExitStatus = "1"; # if databases are up to date
StateDirectory = "clamav";
User = clamavUser;
@ -274,7 +274,7 @@ in
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkg}/bin/clamdscan --multiscan --fdpass --infected --allmatch ${lib.concatStringsSep " " cfg.scanner.scanDirectories}";
ExecStart = "${cfg.package}/bin/clamdscan --multiscan --fdpass --infected --allmatch ${lib.concatStringsSep " " cfg.scanner.scanDirectories}";
};
};
};

View File

@ -1,35 +1,62 @@
{ lib, fetchFromGitHub, pythonPackages, mopidy, unstableGitUpdater }:
{
lib,
fetchFromGitHub,
pythonPackages,
mopidy,
nix-update-script,
}:
pythonPackages.buildPythonApplication rec {
pname = "mopidy-spotify";
version = "4.1.1-unstable-2024-02-27";
version = "5.0.0a2";
pyproject = true;
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy-spotify";
rev = "112d4abbb3f5b6477dab796f2824fa42196bfa0a";
hash = "sha256-RkXDzAbOOll3uCNZ2mFRnjqMkT/NkXOGjywLRTC9i60=";
rev = "refs/tags/v${version}";
hash = "sha256-QeABG9rQKJ8sIoK38R74N0s5rRG+zws7AZR0xPysdcY=";
};
propagatedBuildInputs = [
build-system = [ pythonPackages.setuptools ];
dependencies = [
mopidy
pythonPackages.responses
pythonPackages.pykka
pythonPackages.requests
];
nativeBuildInputs = [
pythonPackages.pytestCheckHook
];
optional-dependencies = {
lint = with pythonPackages; [
black
check-manifest
flake8
flake8-bugbear
isort
];
test = with pythonPackages; [
pytest
pytest-cov
responses
];
dev = optional-dependencies.lint ++ optional-dependencies.test ++ [ pythonPackages.tox ];
};
nativeCheckInputs = [ pythonPackages.pytestCheckHook ] ++ optional-dependencies.test;
pythonImportsCheck = [ "mopidy_spotify" ];
passthru.updateScript = unstableGitUpdater {
tagPrefix = "v";
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
homepage = "https://github.com/mopidy/mopidy-spotify";
meta = {
description = "Mopidy extension for playing music from Spotify";
license = licenses.asl20;
maintainers = with maintainers; [ ];
homepage = "https://github.com/mopidy/mopidy-spotify";
changelog = "https://github.com/mopidy/mopidy-spotify/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ getchoo ];
};
}

View File

@ -23,16 +23,16 @@
rustPlatform.buildRustPackage rec {
pname = "ludusavi";
version = "0.24.1";
version = "0.24.3";
src = fetchFromGitHub {
owner = "mtkennerly";
repo = "ludusavi";
rev = "v${version}";
hash = "sha256-nRNXVJJcpZmAfZwDEBaEFlry1gbITWEw0khtsXnMdm0=";
hash = "sha256-FtLLj5uFcKuRTCSsSuyj0XGzFMVWQvVk4dTmBCmzfNs=";
};
cargoHash = "sha256-E5TaE4TlRA0wmRUiwFqivs18X6oiBCmeXrPI1GxKFBI=";
cargoHash = "sha256-xC6HiXt8cfrDtno9IrOe8SP7WBL79paLI223fjxPsbg=";
nativeBuildInputs = [
cmake

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "harsh";
version = "0.10.0";
version = "0.10.2";
src = fetchFromGitHub {
owner = "wakatara";
repo = pname;
rev = "v${version}";
hash = "sha256-SF5SvVllAXaALSasVt+wqiywYltAuzaPoc9IohwYmss=";
hash = "sha256-XkOdW6ewout69A1ovth1iQR36nRtkdsbDI9CWibSHXs=";
};
vendorHash = "sha256-4Sa8/mVD7t4uR8Wq4n+fvot7LZfraphFobrG6rteQeI=";

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "iroh";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
hash = "sha256-mTa+vdYSBcXTYlcDGJWktGVRC6NPBGcjb+syr/A1QIQ=";
hash = "sha256-1ke1S5IBrg8XYO67iUaH0T4dA59TkyqelsghIK+TuyM=";
};
cargoHash = "sha256-xTPx4P9SbOyC3YjZNxNFh65pSfiPjMKV+wgZtT00Me0=";
cargoHash = "sha256-O6HHZtZes8BO2XuCMdVuuHphzYiqkS5axbYIxsGZw6k=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [

View File

@ -19,14 +19,17 @@ let
optionalString
;
mkLibraryFile = pkgs: let
pkgs' = if isList pkgs then pkgs else pkgs self;
in writeText "libraries" ''
${(concatMapStringsSep "\n" (p: "${p}/${p.libraryFile}") pkgs')}
'';
withPackages' = {
pkgs,
ghc ? ghcWithPackages (p: with p; [ ieee754 ])
}: let
pkgs' = if isList pkgs then pkgs else pkgs self;
library-file = writeText "libraries" ''
${(concatMapStringsSep "\n" (p: "${p}/${p.libraryFile}") pkgs')}
'';
library-file = mkLibraryFile pkgs;
pname = "agdaWithPackages";
version = Agda.version;
in runCommand "${pname}-${version}" {
@ -118,5 +121,5 @@ in
{
mkDerivation = args: stdenv.mkDerivation (args // defaults args);
inherit withPackages withPackages';
inherit mkLibraryFile withPackages withPackages';
}

View File

@ -20,17 +20,17 @@
buildGoModule rec {
pname = "aaaaxy";
version = "1.5.139";
version = "1.5.173";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-j8BpLN0PhMqUQXhF1L7uEW2KLaVq5cfckXnWrkltCgM=";
hash = "sha256-tCA4mmNbRCn48lN5U+x4mnHEsLbMf5jBDOU/jnRFkvE=";
fetchSubmodules = true;
};
vendorHash = "sha256-a6nfGP6Lwjwr4wXXRUrCyV9+BCyHOSKczk5rjZdFnlA=";
vendorHash = "sha256-4zQJUw0CQci/BPfo8V2LzuFc6MDQMXf06RCrqxg1G/c=";
buildInputs = [
alsa-lib

View File

@ -0,0 +1,51 @@
{
lib,
fetchFromGitHub,
cmake,
pkg-config,
stdenv,
gtest,
nix-update-script,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cpuinfo";
version = "0-unstable-2024-06-02";
src = fetchFromGitHub {
owner = "pytorch";
repo = "cpuinfo";
rev = "05332fd802d9109a2a151ec32154b107c1e5caf9";
hash = "sha256-VhTRHpT+4g97m+amOZ52lJWavHsN5QVnjnEn6wJzE3A=";
};
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
nativeBuildInputs = [
cmake
pkg-config
];
checkInputs = [ gtest ];
cmakeFlags = [
(lib.cmakeBool "CPUINFO_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "CPUINFO_BUILD_MOCK_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "CPUINFO_BUILD_BENCHMARKS" false)
(lib.cmakeBool "USE_SYSTEM_LIBS" true)
];
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
meta = {
description = "Tools and library to detect essential for performance optimization information about host CPU";
homepage = "https://github.com/pytorch/cpuinfo";
license = lib.licenses.bsd2;
mainProgram = "cpu-info";
maintainers = with lib.maintainers; [ pawelchcki ];
pkgConfigModules = [ "libcpuinfo" ];
platforms = lib.platforms.all;
};
})

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "dumbpipe";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
hash = "sha256-T/EFy89CZyBthfxGlCJtovDmcR1ntYFkgAOA/sg3GWs=";
hash = "sha256-UCPg917stw8zE6B0hdHyzq98icHpr+Z3b5RL4sZim1w=";
};
cargoHash = "sha256-nF8govoQILX6ft5iJWHAMQA/UgeNrkdUNulO+sX2jXo=";
cargoHash = "sha256-qHdU7t73rBXwU8E2HdErFFlnG8r9H3zcXQSA37h0LFA=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [

View File

@ -0,0 +1,125 @@
{ stdenv
, fetchFromGitHub
, callPackage
, gnat
, zlib
, llvm
, lib
, gcc-unwrapped
, texinfo
, gmp
, mpfr
, libmpc
, gnutar
, glibc
, makeWrapper
, backend ? "mcode"
}:
assert backend == "mcode" || backend == "llvm" || backend == "gcc";
stdenv.mkDerivation (finalAttrs: {
pname = "ghdl-${backend}";
version = "4.1.0";
src = fetchFromGitHub {
owner = "ghdl";
repo = "ghdl";
rev = "v${finalAttrs.version}";
hash = "sha256-tPSHer3qdtEZoPh9BsEyuTOrXgyENFUyJqnUS3UYAvM=";
};
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
nativeBuildInputs = [
gnat
] ++ lib.optionals (backend == "gcc") [
texinfo
makeWrapper
];
buildInputs = [
zlib
] ++ lib.optionals (backend == "llvm") [
llvm
] ++ lib.optionals (backend == "gcc") [
gmp
mpfr
libmpc
];
propagatedBuildInputs = [
] ++ lib.optionals (backend == "llvm" || backend == "gcc") [
zlib
];
preConfigure = ''
# If llvm 7.0 works, 7.x releases should work too.
sed -i 's/check_version 7.0/check_version 7/g' configure
'' + lib.optionalString (backend == "gcc") ''
${gnutar}/bin/tar -xf ${gcc-unwrapped.src}
'';
configureFlags = [
# See https://github.com/ghdl/ghdl/pull/2058
"--disable-werror"
"--enable-synth"
] ++ lib.optionals (backend == "llvm") [
"--with-llvm-config=${llvm.dev}/bin/llvm-config"
] ++ lib.optionals (backend == "gcc") [
"--with-gcc=gcc-${gcc-unwrapped.version}"
];
buildPhase = lib.optionalString (backend == "gcc") ''
make copy-sources
mkdir gcc-objs
cd gcc-objs
../gcc-${gcc-unwrapped.version}/configure \
--with-native-system-header-dir=/include \
--with-build-sysroot=${lib.getDev glibc} \
--prefix=$out \
--enable-languages=c,vhdl \
--disable-bootstrap \
--disable-lto \
--disable-multilib \
--disable-libssp \
--disable-libgomp \
--disable-libquadmath
make -j $NIX_BUILD_CORES
make install
cd ../
make -j $NIX_BUILD_CORES ghdllib
'';
postFixup = lib.optionalString (backend == "gcc") ''
wrapProgram $out/bin/ghdl \
--set LIBRARY_PATH ${lib.makeLibraryPath [
glibc
]}
'';
hardeningDisable = [
] ++ lib.optionals (backend == "gcc") [
# GCC compilation fails with format errors
"format"
];
enableParallelBuilding = true;
passthru = {
# run with:
# nix-build -A ghdl-mcode.passthru.tests
# nix-build -A ghdl-llvm.passthru.tests
# nix-build -A ghdl-gcc.passthru.tests
tests = {
simple = callPackage ./test-simple.nix { inherit backend; };
};
};
meta = {
homepage = "https://github.com/ghdl/ghdl";
description = "VHDL 2008/93/87 simulator";
license = lib.licenses.gpl2Plus;
mainProgram = "ghdl";
maintainers = with lib.maintainers; [ lucus16 thoughtpolice ];
platforms = lib.platforms.linux;
};
})

View File

@ -1,7 +1,7 @@
{ stdenv, ghdl-llvm, ghdl-mcode, backend }:
{ stdenv, lib, ghdl-llvm, ghdl-mcode, ghdl-gcc, backend }:
let
ghdl = if backend == "llvm" then ghdl-llvm else ghdl-mcode;
ghdl = if backend == "llvm" then ghdl-llvm else if backend == "gcc" then ghdl-gcc else ghdl-mcode;
in
stdenv.mkDerivation {
name = "ghdl-test-simple";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
mkdir -p ghdlwork
ghdl -a --workdir=ghdlwork --ieee=synopsys simple.vhd simple-tb.vhd
ghdl -e --workdir=ghdlwork --ieee=synopsys -o sim-simple tb
'' + (if backend == "llvm" then ''
'' + (if backend == "llvm" || backend == "gcc" then ''
./sim-simple --assert-level=warning > output.txt
'' else ''
ghdl -r --workdir=ghdlwork --ieee=synopsys tb > output.txt

View File

@ -7,10 +7,10 @@
}:
stdenv.mkDerivation rec {
pname = "halo";
version = "2.17.0";
version = "2.17.1";
src = fetchurl {
url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar";
hash = "sha256-dSNYFifFITNnUxUOLmiO8LbHyjlCmVU9LlpZp/ThD/Q=";
hash = "sha256-bleY8e7JYwOenSif+3GB5wNmTy3lSt2CAmyX50toeKc=";
};
nativeBuildInputs = [

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "hugo";
version = "0.128.1";
version = "0.128.2";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
rev = "refs/tags/v${version}";
hash = "sha256-vSszDPyRvaWpf7m27R4rbS1R7z4vk3hHzn3I0siijTE=";
hash = "sha256-hX+GAHm7bCM9iKvp/OEmrzJQpd0ZbyHIC+DFz1d4Sj0=";
};
vendorHash = "sha256-iNI/5uAYMG+bfndpD17dp1v3rGbFdHnG9oQv/grb/XY=";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "humioctl";
version = "0.34.1";
version = "0.35.0";
src = fetchFromGitHub {
owner = "humio";
repo = "cli";
rev = "v${version}";
hash = "sha256-/oMsNAUCM1FdGDfn7pxkfT1hJlJJDbaxEXvGGJy0VgE=";
hash = "sha256-9VnF5R2O0OJ2nu+K+utHPxCTFEpjpd49RiXVh3H2PqA=";
};
vendorHash = "sha256-ABXBzmRBByet6Jb/uvcvpdGHC5MSAKvZUnsyY2d2nGs=";
vendorHash = "sha256-vGX77+I/zdTBhVSywd7msjrJ0KtcdZRgvWZWQC9M9og=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "misconfig-mapper";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "intigriti";
repo = "misconfig-mapper";
rev = "refs/tags/v${version}";
hash = "sha256-kudzShQdTHjv8ahdNavQHBSV0+xM7wygJNZbOz/stQI=";
hash = "sha256-mla1rjko3hKbxdwUWzky/eFaibfPVXJSXqrVC3Usab4=";
};
vendorHash = "sha256-T4SDL1Pq3mfN6Qd13Safof1EgCqQVB2+K1qJHm+2ilc=";
vendorHash = "sha256-rpDzsUGtYIIUKf8P8Qkd16fuMbwKhKQMATYPVeNhstk=";
ldflags = [
"-s"

View File

@ -12,13 +12,13 @@ in
beamPackages.mixRelease rec {
pname = "next-ls";
version = "0.23.0";
version = "0.23.1";
src = fetchFromGitHub {
owner = "elixir-tools";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-wTEf0pxVIT7qmPufAN9vGR9rY31kWjNabYZwKe/hkVU=";
hash = "sha256-jI7/BcS9CimCQskXd7Cq3EGPuc9l4L7Gre8hor58ags=";
};
mixFodDeps = beamPackages.fetchMixDeps {

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "rustmission";
version = "0.3.3";
version = "0.4.3";
src = fetchFromGitHub {
owner = "intuis";
repo = "rustmission";
rev = "v${version}";
hash = "sha256-OOewobyfJYnspeXFYzTP7SLrNQRnDl0jv81TJjQAdUE=";
hash = "sha256-Vjbz3Yfcn14oVJ5+lRMYO09Zcim3xqpjWepkkRBD454=";
};
cargoHash = "sha256-dLddB+YA1uC8CVMVI1aVo1oMufxRupW26hGkb8796Ek=";
cargoHash = "sha256-KHLf6Ime76NoEQDLRFFaCvhfqpL9T3h37SwqVv/T/5Q=";
nativeBuildInputs = [ pkg-config ];

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "sendme";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
hash = "sha256-hqhUtMZ3x4zePEjglHgQbzyqxijZX4q45Q4nsPwSeWc=";
hash = "sha256-OBsVy1pCvybTp5IvqjBC20ofPxx/4thJELKhkb1FRHk=";
};
cargoHash = "sha256-Pux0Cqw9ZUrP98ydw7sI0vPZ7w7bcWKTM2FpDv3uzAQ=";
cargoHash = "sha256-sS0BCA4K+U0AfScY3v8AnKJxb5w8yFAFjbBr+nSFRN8=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [

View File

@ -14,9 +14,9 @@
}:
stdenv.mkDerivation (self: {
pname = "srm-cuarzo";
version = "0.6.0-1";
version = "0.6.1-1";
rev = "v${self.version}";
hash = "sha256-guC2NLIg0NGyflgtrl5X2FiDKCwKd/7mglMEn56uF3Q=";
hash = "sha256-jc5JnVNaVw3nBlBUss4IjBnPGVSkImKPfLb/XMsKOg8=";
src = fetchFromGitHub {
inherit (self) rev hash;

View File

@ -14,13 +14,13 @@
buildPythonApplication rec {
pname = "gnome-extensions-cli";
version = "0.10.1";
version = "0.10.2";
format = "pyproject";
src = fetchPypi {
pname = "gnome_extensions_cli";
inherit version;
hash = "sha256-yAoo3NjNtTZSHmbLKzW2X7Cy2smLNp8/9vo+OPGxlVY=";
hash = "sha256-AoZINsx2DhjcMwbllF3ypjo/y/3BjOFxcjZOyUGKp7c=";
};
nativeBuildInputs = [

View File

@ -1,71 +0,0 @@
{ stdenv
, fetchFromGitHub
, callPackage
, gnat
, zlib
, llvm
, lib
, backend ? "mcode"
}:
assert backend == "mcode" || backend == "llvm";
stdenv.mkDerivation (finalAttrs: {
pname = "ghdl-${backend}";
version = "4.1.0";
src = fetchFromGitHub {
owner = "ghdl";
repo = "ghdl";
rev = "v${finalAttrs.version}";
hash = "sha256-tPSHer3qdtEZoPh9BsEyuTOrXgyENFUyJqnUS3UYAvM=";
};
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
nativeBuildInputs = [
gnat
];
buildInputs = [
zlib
] ++ lib.optionals (backend == "llvm") [
llvm
];
propagatedBuildInputs = [
] ++ lib.optionals (backend == "llvm") [
zlib
];
preConfigure = ''
# If llvm 7.0 works, 7.x releases should work too.
sed -i 's/check_version 7.0/check_version 7/g' configure
'';
configureFlags = [
# See https://github.com/ghdl/ghdl/pull/2058
"--disable-werror"
"--enable-synth"
] ++ lib.optionals (backend == "llvm") [
"--with-llvm-config=${llvm.dev}/bin/llvm-config"
];
enableParallelBuilding = true;
passthru = {
# run with either of
# nix-build -A ghdl-mcode.passthru.tests
# nix-build -A ghdl-llvm.passthru.tests
tests = {
simple = callPackage ./test-simple.nix { inherit backend; };
};
};
meta = {
homepage = "https://github.com/ghdl/ghdl";
description = "VHDL 2008/93/87 simulator";
license = lib.licenses.gpl2Plus;
mainProgram = "ghdl";
maintainers = with lib.maintainers; [ lucus16 thoughtpolice ];
platforms = lib.platforms.linux;
};
})

View File

@ -275,16 +275,17 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t
release = next(filter(lambda x: strip_prefix(x["tag_name"]) == version, releases))
prefix = get_prefix(release["tag_name"])
# some attributes require using the fetchgit
git_fetcher_args = []
if _get_attr_value(f"{attr_path}.src.fetchSubmodules"):
git_fetcher_args.append("--fetch-submodules")
if _get_attr_value(f"{attr_path}.src.fetchLFS"):
git_fetcher_args.append("--fetch-lfs")
if _get_attr_value(f"{attr_path}.src.leaveDotGit"):
git_fetcher_args.append("--leave-dotGit")
fetcher = _get_attr_value(f"{attr_path}.src.fetcher")
if fetcher is not None and fetcher.endswith("nix-prefetch-git"):
# some attributes require using the fetchgit
git_fetcher_args = []
if _get_attr_value(f"{attr_path}.src.fetchSubmodules"):
git_fetcher_args.append("--fetch-submodules")
if _get_attr_value(f"{attr_path}.src.fetchLFS"):
git_fetcher_args.append("--fetch-lfs")
if _get_attr_value(f"{attr_path}.src.leaveDotGit"):
git_fetcher_args.append("--leave-dotGit")
if git_fetcher_args or _get_attr_value(f"{attr_path}.src.fetcher").endswith("nix-prefetch-git"):
algorithm = "sha256"
cmd = [
"nix-prefetch-git",

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "mdk-sdk";
version = "0.27.0";
version = "0.29.0";
src = fetchurl {
url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz";
hash = "sha256-JGYZ+Rodvyo/PkQfuW7xM0aIa3Gql75TwRUU1yZHJJ8=";
hash = "sha256-umseIESdiiefQReycc2W8gsurxlpFHfAgV0YdXl1hZE=";
};
nativeBuildInputs = [ autoPatchelfHook ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nss_wrapper";
version = "1.1.15";
version = "1.1.16";
src = fetchurl {
url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz";
sha256 = "sha256-Nvh0gypPIVjgT2mqd+VRXhbPbjv4GWjV3YSW231pBq0=";
sha256 = "sha256-3HmrByd5vkQDtFtgzQRN0TeA1LuWddJ6vxkyrafIqI0=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -12,13 +12,13 @@
mkDerivation rec {
pname = "qxmpp";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "qxmpp-project";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8AF+deDRxipN+YMHE9vUyTaUbSJIckMkB7t3YVtupQs=";
sha256 = "sha256-e9Uucf0iKR11X35nCPZvf8GuF4k5Ha4huStyylNk3+4=";
};
nativeBuildInputs = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "bumps";
version = "0.9.2";
version = "0.9.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-PhoxjnkeLGL8vgEp7UubXKlS8p44TUkJ3c4SqRjKFJA=";
hash = "sha256-MpUpj3/hsjkrsv+Ix6Cuadd6dpivWAqBVwBSygW6Uw8=";
};
# Module has no tests

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "desktop-notifier";
version = "5.0.0";
version = "5.0.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "SamSchott";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Qv63aX96iUzxZPKr3FZq7fuWh2fYmKV3JMmy7txT05w=";
hash = "sha256-A+25T0xgUcE1NaOKNZgeP80VlEmqa137YGn3g/pwpxM=";
};
build-system = [ setuptools ];

View File

@ -44,7 +44,7 @@
buildPythonPackage rec {
pname = "django";
version = "5.0.5";
version = "5.0.7";
pyproject = true;
disabled = pythonOlder "3.10";
@ -53,7 +53,7 @@ buildPythonPackage rec {
owner = "django";
repo = "django";
rev = "refs/tags/${version}";
hash = "sha256-0/AbPmTl38E9BpHVKs0r79fISjEa1d4XO/se1pA7zxg=";
hash = "sha256-g2Y8kcfYUjykZ7Y6JEsNW/jw6chMLLYpQlgdTFt7HmM=";
};
patches =

View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "google-ai-generativelanguage";
version = "0.6.6";
version = "0.6.7";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-FznwNcru7KXCj4h0Be7IaQ8zctr3n+zyZFSpek8XM6g=";
hash = "sha256-6eLvojtiwxGPhkFu75zEgBkjDScVxVWsYfnh6oBQMTI=";
};
build-system = [ setuptools ];

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
version = "1.4.3";
version = "1.4.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-7RqwaSthQcwGebhi5F/V//WxBIp5upVS0ToDDsjyURY=";
hash = "sha256-t6u/PkEH7BC719Qv7ES+VKhknNTCYRfZ3srYSMtR+ko=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-iam-logging";
version = "1.3.3";
version = "1.3.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-99YYGGrI8zg+cwdVKqFVneL0jTzO7GJq91O/Kk0lGJM=";
hash = "sha256-ZxNJV7jMqaMaN4Obt5sToUBmcXsfQHJPkNYnt8K+jf4=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-shell";
version = "1.9.3";
version = "1.9.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-33TZcRsOWP8PBAXFHy9DQn20bVECwD2wv7hcaYl0E8Y=";
hash = "sha256-zYQwPv+r4amD5B8fSm3UMmSH0TAr+LWmBdheA5GmJBE=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-webrisk";
version = "1.14.3";
version = "1.14.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-VrfIVy3qGEMfFUiJ27zZPjBaWIPZX/qraga/+FfJol4=";
hash = "sha256-nfWCUXVGiNrECNqGxQrknZutqLh/WSF6YnYH7cnM14U=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-cloud-workstations";
version = "0.5.6";
version = "0.5.7";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-K6Qq243bX3waymyGcirLAANqmP0UAUgFS3kidwCFYBE=";
hash = "sha256-KQrTGUor4So+FqCiiUazqPRdYIY+G/OeOMjtOov7oxk=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -7,6 +7,7 @@
python-dateutil,
pythonAtLeast,
pythonOlder,
pythonRelaxDepsHook,
requests,
responses,
setuptools,
@ -24,8 +25,12 @@ buildPythonPackage rec {
hash = "sha256-nE1JIlYlJ5O3L7FQD5L+JvLnVs7nq4Ff6dmHvgXjj0M=";
};
pythonRelaxDeps = [ "requests" ];
build-system = [ setuptools ];
nativeBuildInputs = [ pythonRelaxDepsHook ];
dependencies = [
pyjwt
python-dateutil

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-llama-parse";
version = "0.1.4";
version = "0.1.6";
pyproject = true;
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_llama_parse";
inherit version;
hash = "sha256-eGCLGTyBiJSu/u4KowPwK3+A8uTK8Thmwv07CxAj4sA=";
hash = "sha256-BPLc+7D7h85wiQ9aL0+JlB15vmqBi0NzjwU1YOS0Uc8=";
};
pythonRelaxDeps = [ "llama-parse" ];

View File

@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "marimo";
version = "0.7.0";
version = "0.7.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-N2GBQxtNReedw8+27fTs//BfVuoG3y39HEo9nrcOiYA=";
hash = "sha256-c+1hiOOWblN0pk+dkIlYm8HqQfHIph0FE5XAQufH86g=";
};
build-system = [ setuptools ];

View File

@ -2,7 +2,9 @@
lib,
buildPythonPackage,
fetchPypi,
pythonOlder,
setuptools,
versioneer,
}:
buildPythonPackage rec {
@ -10,24 +12,34 @@ buildPythonPackage rec {
version = "0.2.2";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
pname = "opsdroid_get_image_size";
inherit version;
hash = "sha256-Cp2tvsdCZ+/86DF7FRNwx5diGcUWLYcFwQns7nYXkog=";
};
nativeBuildInputs = [ setuptools ];
postPatch = ''
# Remove vendorized versioneer.py
rm versioneer.py
'';
# test data not included on pypi
build-system = [ setuptools ];
nativeBuildInputs = [ versioneer ];
# Test data not included on PyPI
doCheck = false;
pythonImportsCheck = [ "get_image_size" ];
meta = with lib; {
description = "Get image width and height given a file path using minimal dependencies";
mainProgram = "get-image-size";
license = licenses.mit;
homepage = "https://github.com/opsdroid/image_size";
changelog = "https://github.com/opsdroid/image_size/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ globin ];
mainProgram = "get-image-size";
};
}

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "periodictable";
version = "1.7.0";
version = "1.7.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Qg5XwrGdalIbHAteOH2lkKMahFbkzBwAvKXOLcXwXqk=";
hash = "sha256-Q9fbcjPWszli+D156lT0fDuSPT6DQDy8A/WPNTr0tSw=";
};
propagatedBuildInputs = [

View File

@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "pytorch-lightning";
version = "2.2.5";
version = "2.3.3";
pyproject = true;
src = fetchFromGitHub {
owner = "Lightning-AI";
repo = "pytorch-lightning";
rev = "refs/tags/${version}";
hash = "sha256-2O6Gr9BdjI/WTU0+KTfOQG31xzHyBeqxGv97f3WxUMs=";
hash = "sha256-JgT+OiBToBBa3h556gF+kmcqLKLaK17tlTPokvEDyUE=";
};
preConfigure = ''

View File

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.30.0";
version = "3.31.0";
pyproject = true;
disabled = pythonOlder "3.6";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-KJC0M5sk1dlCzadQ1/MBEnWuAGva/MP2MygqehH2fTg=";
hash = "sha256-6fuC2yIGtjIxnEiI2/1sQ5RZB18WlteozyS8/XDTwkg=";
};
postPatch = ''

View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-update nixfmt curl jq
#!nix-shell -i bash -p nix-update nixfmt-classic curl jq
set -eu -o pipefail

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "vehicle";
version = "2.2.1";
version = "2.2.2";
format = "pyproject";
disabled = pythonOlder "3.11";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-vehicle";
rev = "refs/tags/v${version}";
hash = "sha256-mu30v4iZoOYfQZc1P45UZaor6hf+i+gOvGcVGcQYzTo=";
hash = "sha256-MPK5Aim/kGXLMOapttkp5ygl8gIlHv0675sBBf6kyAA=";
};
postPatch = ''

View File

@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
which,
@ -35,6 +36,10 @@
gpuTargets ? [ ],
}:
let
stdenv_pkg = stdenv;
in
buildPythonPackage rec {
pname = "vllm";
version = "0.3.3";
@ -52,25 +57,24 @@ buildPythonPackage rec {
lib.strings.concatStringsSep ";" rocmPackages.clr.gpuTargets
);
# xformers 0.0.23.post1 github release specifies its version as 0.0.24
#
# cupy-cuda12x is the same wheel as cupy, but built with cuda dependencies, we already have it set up
# like that in nixpkgs. Version upgrade is due to upstream shenanigans
# https://github.com/vllm-project/vllm/pull/2845/commits/34a0ad7f9bb7880c0daa2992d700df3e01e91363
#
# hipcc --version works badly on NixOS due to unresolved paths.
# Unclear why pythonRelaxDeps doesn't work here, but on last attempt, it didn't.
postPatch =
''
substituteInPlace requirements.txt \
--replace "xformers == 0.0.23.post1" "xformers == 0.0.24"
--replace "xformers == 0.0.23.post1" "xformers"
substituteInPlace requirements.txt \
--replace "cupy-cuda12x == 12.1.0" "cupy == 12.3.0"
--replace "cupy-cuda12x == 12.1.0" "cupy"
substituteInPlace requirements-build.txt \
--replace "torch==2.1.2" "torch == 2.2.1"
--replace "torch==2.1.2" "torch"
substituteInPlace pyproject.toml \
--replace "torch == 2.1.2" "torch == 2.2.1"
--replace "torch == 2.1.2" "torch"
substituteInPlace requirements.txt \
--replace "torch == 2.1.2" "torch == 2.2.1"
--replace "torch == 2.1.2" "torch"
''
+ lib.optionalString rocmSupport ''
substituteInPlace setup.py \
@ -141,6 +145,8 @@ buildPythonPackage rec {
cupy
];
stdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv_pkg;
pythonImportsCheck = [ "vllm" ];
meta = with lib; {

View File

@ -1,7 +1,7 @@
{
lib,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
setuptools,
zope-interface,
zope-schema,
@ -11,7 +11,6 @@
beautifulsoup4,
soupsieve,
wsgiproxy2,
six,
mock,
zope-testing,
zope-testrunner,
@ -21,22 +20,24 @@
buildPythonPackage rec {
pname = "zope-testbrowser";
version = "7.0";
pyproject = true;
format = "setuptools";
src = fetchPypi {
pname = "zope.testbrowser";
inherit version;
sha256 = "sha256-WTbSoNd9h4HQATWP0LEUYShbAtxuOzJLhMHtkyax/z8=";
src = fetchFromGitHub {
owner = "zopefoundation";
repo = "zope.testbrowser";
rev = "refs/tags/${version}";
hash = "sha256-vGx2ObHgt4hSQe/JKZkD2/GhdtbJEAfggkM209maen4=";
};
postPatch = ''
# remove test that requires network access
substituteInPlace src/zope/testbrowser/tests/test_doctests.py \
--replace "suite.addTests(wire)" ""
--replace-fail "suite.addTests(wire)" ""
'';
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
setuptools
zope-interface
zope-schema
@ -46,7 +47,6 @@ buildPythonPackage rec {
beautifulsoup4
soupsieve
wsgiproxy2
six
];
nativeCheckInputs = [
@ -68,6 +68,7 @@ buildPythonPackage rec {
];
meta = {
changelog = "https://github.com/zopefoundation/zope.testbrowser/blob/${src.rev}/CHANGES.rst";
description = "Programmable browser for functional black-box tests";
homepage = "https://github.com/zopefoundation/zope.testbrowser";
license = lib.licenses.zpl21;

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "jaq";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "01mf02";
repo = "jaq";
rev = "v${version}";
hash = "sha256-Lk8lss9ZwyN7fuWwHm7e7HvYNIUSNelswoYhZ+Dr6iw=";
hash = "sha256-i/VCr12ThKkT8L2lvzWiPD2Ir1WLcbgGYVsUDRgzGLs=";
};
cargoHash = "sha256-0YPzPRBqO9otX9kSxufeW/M0TggKAoSTsChbOhMjv74=";
cargoHash = "sha256-3F95yv4D2FLuT7+e0LJ0NQ8bjsirCF/qsO0V7WdJS5M=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-zigbuild";
version = "0.19.0";
version = "0.19.1";
src = fetchFromGitHub {
owner = "messense";
repo = pname;
rev = "v${version}";
hash = "sha256-1WTV6XqV9Y7d6WlH7rBb0Lfki6ftf+3z/azqQwzcOts=";
hash = "sha256-AY5oq8fSF1IEvmbB5hRjo+Esz7EE9ZI4EKwtZIjbasA=";
};
cargoHash = "sha256-Msi3V8mVnz9AqXdci79N9cbCouOyvVI4NdUAFP2IEsg=";
cargoHash = "sha256-StYEw5DvgxEojRcF0g88CTa58qUDjgNJiw6BCYKNzBY=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "hyperrogue";
version = "13.0o";
version = "13.0r";
src = fetchFromGitHub {
owner = "zenorogue";
repo = "hyperrogue";
rev = "v${version}";
sha256 = "sha256-a7Ykm+Z7MXfO+eZJjZ+TMuOe6Q+QmjOwcMORI9bZGeM=";
sha256 = "sha256-uenMBGlRDA//4J/9tY2Ec8r8qo4bsqiZytux0EHPFCo=";
};
CXXFLAGS = [

View File

@ -3,8 +3,9 @@
, buildGoModule
, fetchFromGitHub
, installShellFiles
, nixosTests
, externalPlugins ? []
, vendorHash ? "sha256-tp22jj6DNnYFQhtAFW2uLo10ty//dyNqIDH2egDgbOw="
, vendorHash ? "sha256-mp+0/DQTNsgAZTnLqcQq1HVLAfKr5vUGYSZlIvM7KpE="
}:
let
@ -14,13 +15,13 @@ let
builtins.map ({name, repo, version}: "${repo}@${version}") attrs;
in buildGoModule rec {
pname = "coredns";
version = "1.11.1";
version = "1.11.3";
src = fetchFromGitHub {
owner = "coredns";
repo = "coredns";
rev = "v${version}";
sha256 = "sha256-XZoRN907PXNKV2iMn51H/lt8yPxhPupNfJ49Pymdm9Y=";
sha256 = "sha256-8LZMS1rAqEZ8k1IWSRkQ2O650oqHLP0P31T8oUeE4fw=";
};
inherit vendorHash;
@ -64,12 +65,21 @@ in buildGoModule rec {
'' + lib.optionalString stdenv.isDarwin ''
# loopback interface is lo0 on macos
sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go
# test is apparently outdated but only exhibits this on darwin
substituteInPlace test/corefile_test.go \
--replace "TestCorefile1" "SkipCorefile1"
'';
postInstall = ''
installManPage man/*
'';
passthru.tests = {
kubernetes-single-node = nixosTests.kubernetes.dns-single-node;
kubernetes-multi-node = nixosTests.kubernetes.dns-multi-node;
};
meta = with lib; {
homepage = "https://coredns.io";
description = "DNS server that runs middleware";

View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ckbcomp";
version = "1.228";
version = "1.229";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
sha256 = "sha256-fBDaP7OpQKQV8CIM3s74+E1M6BwsS47Jn2AX8xQK0tI=";
sha256 = "sha256-5kC41Ekvr6VBoD85P8weS802wgt6SX6GqgFXPPFZWJQ=";
};
buildInputs = [ perl ];

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "gotify-desktop";
version = "1.3.6";
version = "1.3.7";
src = fetchFromGitHub {
owner = "desbma";
repo = pname;
rev = version;
sha256 = "sha256-epolESdf9+2lI+AJ8hMpVPakS1f8fYam+JniiPLIHCs=";
sha256 = "sha256-ISK1sI7NkXJBtuCkl5g8ffrGv5dYgzmpsmPTZmDAaMI=";
};
cargoHash = "sha256-VJ/k6sfBCuokXGpfZ9zGQ7ucbHLweUSgBhlChwko69g=";
cargoHash = "sha256-QK2rzC9l+CiDv1+0NzR2x5B/5BYiY8KkLC2jxBdjXMU=";
nativeBuildInputs = [ pkg-config ];

View File

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnquery";
version = "11.11.0";
version = "11.12.1";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
rev = "refs/tags/v${version}";
hash = "sha256-G2mVr0TB5BBzBdo4YcE3gH2jU9iZ9UuTgrYlqsEhQXs=";
hash = "sha256-5C7VpqXmopJfk+rg1aPxrqFvQbXvdkCsdluJL0R7HFs=";
};
subPackages = [ "apps/cnquery" ];
vendorHash = "sha256-aXt/Ehh1G9k0rYGOrdbpddVB4faGTkOy0zWSz2X8BtI=";
vendorHash = "sha256-PFDHcmvEkwJiPqPVA7s76CFKJOg8ublXzpPyWxNfXjo=";
ldflags = [
"-w"

View File

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.11.0";
version = "11.12.1";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-3cjtWdBovnRHFUS9TAPkGbg+XocgkkgJFfkljkyjqUg=";
hash = "sha256-9EQOenHcPecRLqM7p0qKrOOVoa9Sr1fQNqAbxiiM0Hc=";
};
proxyVendor = true;
vendorHash = "sha256-9N1v2i2Cxs7t1d2eI9NQOOqlmc9evV15HH12HZ0gr4U=";
vendorHash = "sha256-DKhDPqfS330iL/WwmHkq07RCM7IJc2YXQrhvNEGzTZI=";
subPackages = [ "apps/cnspec" ];

View File

@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "fanficfare";
version = "4.35.0";
version = "4.36.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-hPBURlsrr/7c26YFZo5UT7PTs8s+D8BXxjU/uposHjQ=";
hash = "sha256-gsaY02x8hJr0NzR5Q9VB3KkAFnotjrWXRoUjFpBJB0w=";
};
nativeBuildInputs = with python3Packages; [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "hyprland-per-window-layout";
version = "2.10";
version = "2.11";
src = fetchFromGitHub {
owner = "coffebar";
repo = pname;
rev = version;
hash = "sha256-oCHX9C/TnTGxHfZBtKhwcWJaijZ92MqCOnf6OgviH1o=";
hash = "sha256-euq+RRUeoKFmEmNJ6dOI01SAp6XywaspmGG5wCspkiA=";
};
cargoHash = "sha256-RkIHwIWzKwzpPIFmOkBmOUq07YdLQRVOGblybnACUfs=";
cargoHash = "sha256-sK1X3CNZ1PTNaLcGVAx4pk9EXDSfSjptJDwC73DFq7w=";
meta = with lib; {
description = "Per window keyboard layout (language) for Hyprland wayland compositor";

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "swayr";
version = "0.27.3";
version = "0.27.4";
src = fetchFromSourcehut {
owner = "~tsdh";
repo = "swayr";
rev = "swayr-${version}";
sha256 = "sha256-3M4/uk1E5Ly9pifjoDIUEhWf1IZxwRYUC3f3qOsMyRg=";
sha256 = "sha256-dliRPKtCJ6mbBl87QoDsHJ2+iaI9nVsWWWwWAkQ1RqE=";
};
cargoHash = "sha256-cjrt2jkcNbTabnhlu0P8mBIKbIpCE6L6BYlxi/fIwrg=";
cargoHash = "sha256-6e4eJIGCrkOdoOTtbYvTLjNVA9FQBQUhgOyM/064/Sw=";
patches = [
./icon-paths.patch

View File

@ -7,9 +7,9 @@ let
inherit (callPackage ../build-support/agda {
inherit Agda self;
inherit (pkgs.haskellPackages) ghcWithPackages;
}) withPackages mkDerivation;
}) withPackages mkLibraryFile mkDerivation;
in {
inherit mkDerivation;
inherit mkLibraryFile mkDerivation;
lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; });

View File

@ -15666,13 +15666,11 @@ with pkgs;
meta.broken = stdenv.hostPlatform.isDarwin;
});
ghdl = ghdl-mcode;
ghdl-mcode = callPackage ../by-name/gh/ghdl/package.nix { backend = "mcode"; };
ghdl-mcode = callPackage ../development/compilers/ghdl {
backend = "mcode";
};
ghdl-gcc = callPackage ../by-name/gh/ghdl/package.nix { backend = "gcc"; };
ghdl-llvm = callPackage ../development/compilers/ghdl {
ghdl-llvm = callPackage ../by-name/gh/ghdl/package.nix {
backend = "llvm";
inherit (llvmPackages_15) llvm;
};