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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-16 00:15:11 +00:00
committed by GitHub
parent c249517d3a 8a95f3f42b
commit 4f1244514f
56 changed files with 571 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/audio/mopidy.nix
+1
View File
@@ -12,6 +12,7 @@ let
mopidyEnv = buildEnv {
name = "mopidy-with-extensions-${mopidy.version}";
ignoreCollisions = true;
paths = closePropagation cfg.extensionPackages;
pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ];
nativeBuildInputs = [ makeWrapper ];
nixos/modules/tasks/auto-upgrade.nix
+104 -73
View File
@@ -1,7 +1,14 @@
{ config, lib, pkgs, ... }:
let cfg = config.system.autoUpgrade;
{
config,
lib,
pkgs,
...
}:
let
cfg = config.system.autoUpgrade;
in {
in
{
options = {
@@ -19,7 +26,10 @@ in {
};
operation = lib.mkOption {
type = lib.types.enum ["switch" "boot"];
type = lib.types.enum [
"switch"
"boot"
];
default = "switch";
example = "boot";
description = ''
@@ -125,22 +135,27 @@ in {
The default value of `null` means that reboots are allowed at any time.
'';
default = null;
example = { lower = "01:00"; upper = "05:00"; };
type = with lib.types; nullOr (submodule {
options = {
lower = lib.mkOption {
description = "Lower limit of the reboot window";
type = lib.types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}";
example = "01:00";
};
example = {
lower = "01:00";
upper = "05:00";
};
type =
with lib.types;
nullOr (submodule {
options = {
lower = lib.mkOption {
description = "Lower limit of the reboot window";
type = lib.types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}";
example = "01:00";
};
upper = lib.mkOption {
description = "Upper limit of the reboot window";
type = lib.types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}";
example = "05:00";
upper = lib.mkOption {
description = "Upper limit of the reboot window";
type = lib.types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}";
example = "05:00";
};
};
};
});
});
};
persistent = lib.mkOption {
@@ -165,20 +180,28 @@ in {
config = lib.mkIf cfg.enable {
assertions = [{
assertion = !((cfg.channel != null) && (cfg.flake != null));
message = ''
The options 'system.autoUpgrade.channel' and 'system.autoUpgrade.flake' cannot both be set.
'';
}];
assertions = [
{
assertion = !((cfg.channel != null) && (cfg.flake != null));
message = ''
The options 'system.autoUpgrade.channel' and 'system.autoUpgrade.flake' cannot both be set.
'';
}
];
system.autoUpgrade.flags = (if cfg.flake == null then
[ "--no-build-output" ] ++ lib.optionals (cfg.channel != null) [
system.autoUpgrade.flags = (
if cfg.flake == null then
[ "--no-build-output" ]
++ lib.optionals (cfg.channel != null) [
"-I"
"nixpkgs=${cfg.channel}/nixexprs.tar.xz"
]
else
[ "--refresh" "--flake ${cfg.flake}" ]);
[
"--refresh"
"--flake ${cfg.flake}"
]
);
systemd.services.nixos-upgrade = {
description = "NixOS Upgrade";
@@ -188,10 +211,13 @@ in {
serviceConfig.Type = "oneshot";
environment = config.nix.envVars // {
inherit (config.environment.sessionVariables) NIX_PATH;
HOME = "/root";
} // config.networking.proxy.envVars;
environment =
config.nix.envVars
// {
inherit (config.environment.sessionVariables) NIX_PATH;
HOME = "/root";
}
// config.networking.proxy.envVars;
path = with pkgs; [
coreutils
@@ -203,54 +229,59 @@ in {
config.programs.ssh.package
];
script = let
nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";
date = "${pkgs.coreutils}/bin/date";
readlink = "${pkgs.coreutils}/bin/readlink";
shutdown = "${config.systemd.package}/bin/shutdown";
upgradeFlag = lib.optional (cfg.channel == null) "--upgrade";
in if cfg.allowReboot then ''
${nixos-rebuild} boot ${toString (cfg.flags ++ upgradeFlag)}
booted="$(${readlink} /run/booted-system/{initrd,kernel,kernel-modules})"
built="$(${readlink} /nix/var/nix/profiles/system/{initrd,kernel,kernel-modules})"
script =
let
nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";
date = "${pkgs.coreutils}/bin/date";
readlink = "${pkgs.coreutils}/bin/readlink";
shutdown = "${config.systemd.package}/bin/shutdown";
upgradeFlag = lib.optional (cfg.channel == null) "--upgrade";
in
if cfg.allowReboot then
''
${nixos-rebuild} boot ${toString (cfg.flags ++ upgradeFlag)}
booted="$(${readlink} /run/booted-system/{initrd,kernel,kernel-modules})"
built="$(${readlink} /nix/var/nix/profiles/system/{initrd,kernel,kernel-modules})"
${lib.optionalString (cfg.rebootWindow != null) ''
current_time="$(${date} +%H:%M)"
${lib.optionalString (cfg.rebootWindow != null) ''
current_time="$(${date} +%H:%M)"
lower="${cfg.rebootWindow.lower}"
upper="${cfg.rebootWindow.upper}"
lower="${cfg.rebootWindow.lower}"
upper="${cfg.rebootWindow.upper}"
if [[ "''${lower}" < "''${upper}" ]]; then
if [[ "''${current_time}" > "''${lower}" ]] && \
[[ "''${current_time}" < "''${upper}" ]]; then
do_reboot="true"
if [[ "''${lower}" < "''${upper}" ]]; then
if [[ "''${current_time}" > "''${lower}" ]] && \
[[ "''${current_time}" < "''${upper}" ]]; then
do_reboot="true"
else
do_reboot="false"
fi
else
# lower > upper, so we are crossing midnight (e.g. lower=23h, upper=6h)
# we want to reboot if cur > 23h or cur < 6h
if [[ "''${current_time}" < "''${upper}" ]] || \
[[ "''${current_time}" > "''${lower}" ]]; then
do_reboot="true"
else
do_reboot="false"
fi
fi
''}
if [ "''${booted}" = "''${built}" ]; then
${nixos-rebuild} ${cfg.operation} ${toString cfg.flags}
${lib.optionalString (cfg.rebootWindow != null) ''
elif [ "''${do_reboot}" != true ]; then
echo "Outside of configured reboot window, skipping."
''}
else
do_reboot="false"
${shutdown} -r +1
fi
else
# lower > upper, so we are crossing midnight (e.g. lower=23h, upper=6h)
# we want to reboot if cur > 23h or cur < 6h
if [[ "''${current_time}" < "''${upper}" ]] || \
[[ "''${current_time}" > "''${lower}" ]]; then
do_reboot="true"
else
do_reboot="false"
fi
fi
''}
if [ "''${booted}" = "''${built}" ]; then
${nixos-rebuild} ${cfg.operation} ${toString cfg.flags}
${lib.optionalString (cfg.rebootWindow != null) ''
elif [ "''${do_reboot}" != true ]; then
echo "Outside of configured reboot window, skipping."
''}
''
else
${shutdown} -r +1
fi
'' else ''
${nixos-rebuild} ${cfg.operation} ${toString (cfg.flags ++ upgradeFlag)}
'';
''
${nixos-rebuild} ${cfg.operation} ${toString (cfg.flags ++ upgradeFlag)}
'';
startAt = cfg.dates;
pkgs/applications/editors/neovim/tests/default.nix
+10 -1
View File
@@ -55,11 +55,17 @@ let
nvim-with-luasnip = wrapNeovim2 "-with-luasnip" (makeNeovimConfig {
plugins = [ {
plugin = vimPlugins.luasnip;
}
];
});
# build should fail with a wrong
nvim-run-failing-check = (wrapNeovimUnstable neovim-unwrapped {
luaRcContent = "this is an invalid lua statement to break the build";
}).overrideAttrs({
doCheck = true;
});
nvimAutoDisableWrap = makeNeovimConfig { };
wrapNeovim2 = suffix: config:
@@ -96,6 +102,9 @@ in
inherit nmt;
# Disabled because of https://github.com/NixOS/nixpkgs/pull/352727
# failed_check = pkgs.testers.testBuildFailure nvim-run-failing-check;
vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; };
### neovim tests
pkgs/applications/editors/neovim/wrapper.nix
+8 -1
View File
@@ -61,7 +61,7 @@ let
stdenv.mkDerivation (finalAttrs:
let
pluginsNormalized = neovimUtils.normalizePlugins plugins;
pluginsNormalized = neovimUtils.normalizePlugins finalAttrs.plugins;
myVimPackage = neovimUtils.normalizedPluginsToVimPackage pluginsNormalized;
@@ -250,6 +250,13 @@ let
# A Vim "package", see ':h packages'
vimPackage = myVimPackage;
checkPhase = ''
runHook preCheck
$out/bin/nvim -i NONE -e +quitall!
runHook postCheck
'';
passthru = {
inherit providerLuaRc packpathDirs;
unwrapped = neovim-unwrapped;
pkgs/applications/version-management/git-workspace/default.nix
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-workspace";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "orf";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Xf3uR+MG8vRBcad5n5k9NKyfC6v0y3BCz0CfDORsy/Q=";
sha256 = "sha256-cAAEbeA7+lnFH5vr+cfOlkhRjZJnIWX7AoKnow68k3I=";
};
cargoHash = "sha256-oywwbDwg6O4pdqRJAM+IAt65DV6IkpMec8v4PY1RoZU=";
cargoHash = "sha256-xLsN9yiAo7HP2HpixZ5SUu0Wnv07nL9D8t+JPT6uKb0=";
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/ca/cargo-gra/package.nix
+5 -5
View File
@@ -6,20 +6,20 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-gra";
version = "0.6.0";
version = "0.6.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-cli7qaIVYvoZpDml/QAxm2vjvh/g28zlDSpU9IIUBfw=";
hash = "sha256-JbBcpp/E3WlQrwdxMsbSdmIEnDTQj/1XDwAWJsniRu0=";
};
cargoHash = "sha256-xsaavcpDaiDDbL3Dl+7NLcfB5U6vuYsVPoIuA/KXCvI=";
cargoHash = "sha256-wfMiqWcEsL6/d6XFnEFm/lCbelU7BHC7JKdHREnynAU=";
meta = {
license = lib.licenses.gpl3Plus;
description = "gtk-rust-app cli for building flatpak apps with ease";
homepage = "https://gitlab.com/floers/gtk-stuff/cargo-gra/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ bot-wxt1221 ];
platforms = lib.platforms.unix;
description = "gtk-rust-app cli for building flatpak apps with ease";
};
}
pkgs/by-name/cl/clevis/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "clevis";
version = "20";
version = "21";
src = fetchFromGitHub {
owner = "latchset";
repo = "clevis";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-rBdZrnHPzRd9vbyl1h/Nb0cFAtIPUHSmxVoKrKuCrQ8=";
hash = "sha256-2vDQP+yvH4v46fLEWG/37r5cYP3OeDfJz71cDHEGiUg=";
};
patches = [
pkgs/by-name/eq/equibop/package.nix
+3 -3
View File
@@ -23,13 +23,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "equibop";
version = "2.0.9";
version = "2.1.1";
src = fetchFromGitHub {
owner = "Equicord";
repo = "Equibop";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-mK/zoW8Km6xlppxJnVbuas4yE1rpAOd9QnjETlxxnsE=";
hash = "sha256-LGgmWaC7iYj0Mx5wPKmLkYV2ozyhkiwrE4v4uFB0erg=";
};
pnpmDeps = pnpm_9.fetchDeps {
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
src
patches
;
hash = "sha256-TSdkHSZTbFf3Nq0QHDNTeUHmd6N+L1N1kSiKt0uNF6s=";
hash = "sha256-dIz/HyhzFU86QqQEQ9qWSthKB9HfoRJbmpc3raWNbcA=";
};
nativeBuildInputs = [
pkgs/by-name/eq/equicord/package.nix
+1 -1
View File
@@ -9,7 +9,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "equicord";
version = "1.10.4"; # from package.json
version = "1.10.6"; # from package.json
src = fetchFromGitHub {
owner = "Equicord";
pkgs/by-name/go/got/package.nix
+2 -2
View File
@@ -27,11 +27,11 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "got";
version = "0.104";
version = "0.105";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
hash = "sha256-sy14eSC8SXUhOVoGvrB9f0+StpN5WGMiS2BJ09ZpyMk=";
hash = "sha256-MXPjYNzQb6JBvsMfxN+GKEP/7fKwEGBWgGgLDf1cokQ=";
};
nativeBuildInputs = [ pkg-config bison ]
pkgs/by-name/he/hexgui/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
}:
stdenv.mkDerivation {
pname = "hexgui";
version = "unstable-2023-1-7";
version = "0.10-unstable-2024-11-03";
src = fetchFromGitHub {
owner = "selinger";
repo = "hexgui";
rev = "62f07ff51db0d4a945ad42f86167cc2f2ce65d90";
hash = "sha256-yEdZs9HUt3lcrdNO1OH8M8g71+2Ltf+v1RR1fKRDV0o=";
rev = "444408f4411a4f13cbd90ac670f1dd344d35a948";
hash = "sha256-W5klRwVsSlrSp3Pw5D4uknIRjaNMv+OTUtXXTmd6P3I=";
};
nativeBuildInputs = [ ant jdk makeWrapper ];
pkgs/by-name/ka/karlender/package.nix
+4 -14
View File
@@ -11,30 +11,20 @@
nix-update-script,
dbus,
cargo-gra,
fetchpatch,
}:
rustPlatform.buildRustPackage rec {
pname = "karlender";
version = "0.10.4";
version = "0.10.11";
src = fetchFromGitLab {
owner = "floers";
repo = pname;
rev = "v${version}";
hash = "sha256-W+s1RCPwy7ZiK514AaQLwV9y+VJ58oMGlrS5cdoFKIg=";
hash = "sha256-PwXSJq4uBtgIA2aQ5AZawEMmHoVS2Z9haVHyJ2oyXUs=";
};
cargoPatches = [
# https://gitlab.com/floers/calendar-stuff/karlender/-/merge_requests/43
# Remove it when it is merged and released.
(fetchpatch {
url = "https://gitlab.com/floers/calendar-stuff/karlender/-/commit/ce50c68323a834a0ee2cbff88ed285a971dfd91e.patch";
hash = "sha256-0hGgJPwnSNGTO/eiooQkQlBJ4brbaWVKRY6MT1PZApg=";
})
];
cargoHash = "sha256-CeHIx6oUtAcr6tBdqmIDTLuYcesaA6G72L3HwHDLY7Y=";
cargoHash = "sha256-R/oQvyZCcTImOA8FB5bECTj5VGFElImoQwIRX75PtOs=";
nativeBuildInputs = [
pkg-config
@@ -79,9 +69,9 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Mobile-friendly GTK calendar application";
mainProgram = "karlender";
homepage = "https://gitlab.com/floers/karlender";
license = lib.licenses.gpl3Plus;
mainProgram = "karlender";
maintainers = with lib.maintainers; [
chuangzhu
bot-wxt1221
pkgs/by-name/li/lianad/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "lianad";
version = "6.0"; # keep in sync with liana
version = "8.0"; # keep in sync with liana
src = fetchFromGitHub {
owner = "wizardsardine";
repo = "liana";
rev = "v${version}";
hash = "sha256-LLDgo4GoRTVYt72IT0II7O5wiMDrvJhe0f2yjzxQgsE=";
hash = "sha256-2aIaRZNIRgFdA+NVnzOkEE3kYA15CoNBrsNGBhIz0nU=";
};
cargoHash = "sha256-a4hLtDXnEeTa0e1LcMkEPKEqGBp5bzWseq5Pe5ZYF1M=";
cargoHash = "sha256-/EkDAZPNka+vRWsAo4i/65lufUu8N/m8cfBsOInjaxQ=";
buildInputs = [ udev ];
pkgs/by-name/me/metadata/package.nix
+12 -3
View File
@@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchpatch
, pkg-config
, ffmpeg
, rustPlatform
@@ -14,11 +15,11 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "zmwangx";
repo = "metadata";
rev = "v${version}";
hash = "sha256-OFWdCV9Msy/mNaSubqoJi4tBiFqL7RuWWQluSnKe4fU=";
rev = "ec9614cfa64ffc95d74e4b19496ebd9b026e692b";
hash = "sha256-ugirYg3l+zIfKAqp2smLgG99mX9tsy9rmGe6lFAwx5o=";
};
cargoHash = "sha256-F5jXS/W600nbQtu1FD4+DawrFsO+5lJjvAvTiFKT840=";
cargoHash = "sha256-OMm39sgbq2wTRJTVoCf5imJe3hmf+Djq9w9tzKBrkIM=";
nativeBuildInputs = [
pkg-config
@@ -27,6 +28,14 @@ rustPlatform.buildRustPackage rec {
rustPlatform.bindgenHook
];
cargoPatches = [
(fetchpatch {
name = "update-crate-ffmpeg-next-version.patch";
url = "https://github.com/myclevorname/metadata/commit/a1bc9f53d9aa0aeb17cbb530a1da1de4fdf85328.diff";
hash = "sha256-LEwOK1UFUwLZhqLnoUor5CSOwz4DDjNFMnMOGq1S1Sc=";
})
];
postBuild = ''
a2x --doctype manpage --format manpage man/metadata.1.adoc
'';
pkgs/by-name/pr/protoc-gen-es/package.nix
+3 -3
View File
@@ -7,20 +7,20 @@
buildNpmPackage rec {
pname = "protoc-gen-es";
version = "2.0.0";
version = "2.2.2";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "protobuf-es";
rev = "refs/tags/v${version}";
hash = "sha256-foPt++AZjBfqKepzi2mKXB7zbpCqjmPftN9wyk5Yk8g=";
hash = "sha256-yeGPtSfxq9bNhWgLEbt6lT7B1CNEgJS0E9hxwHa/Lfw=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-4m3xeiid+Ag9l1qNoBH08hu3wawWfNw1aqeniFK0Byc=";
npmDepsHash = "sha256-2PcpDF5ohPu92TkMjg2NyXAvPt+yZuAtLHYkGuE7TRo=";
npmWorkspace = "packages/protoc-gen-es";
pkgs/by-name/st/stm32cubemx/package.nix
+2 -2
View File
@@ -13,11 +13,11 @@ let
iconame = "STM32CubeMX";
package = stdenvNoCC.mkDerivation rec {
pname = "stm32cubemx";
version = "6.11.1";
version = "6.12.1";
src = fetchzip {
url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip";
hash = "sha256-By9T43GLM1J63TkRi3kl05h1RflBorU1QHgYOrXQ9N0=";
hash = "sha256-6VDvvKx68U47soBUWiaBuDu6enINLDhJd0he7sSCzeg=";
stripRoot = false;
};
pkgs/tools/networking/termscp/default.nix → pkgs/by-name/te/termscp/package.nix
+25 -25
View File
@@ -1,16 +1,13 @@
{
lib,
stdenv,
stdenvNoCC,
dbus,
fetchFromGitHub,
openssl,
pkg-config,
rustPlatform,
AppKit,
Cocoa,
Foundation,
Security,
samba,
versionCheckHook,
nix-update-script,
}:
@@ -31,31 +28,32 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs =
[
dbus
openssl
samba
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Cocoa
Foundation
Security
];
buildInputs = [
dbus
openssl
samba
];
# Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR = 1;
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.hostPlatform.isDarwin [
"-framework"
"AppKit"
]
);
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
# Requires network access
doCheck = false;
checkFeatures = [ "isolated-tests" ];
checkFlags =
[
# requires networking
"--skip=cli::remote::test::test_should_make_remote_args_from_one_bookmark_and_one_remote_with_local_dir"
"--skip=cli::remote::test::test_should_make_remote_args_from_two_bookmarks_and_local_dir"
"--skip=cli::remote::test::test_should_make_remote_args_from_two_remotes_and_local_dir"
]
++ lib.optionals stdenvNoCC.isDarwin [
"--skip=system::watcher::test::should_poll_file_removed"
"--skip=system::watcher::test::should_poll_file_update"
];
passthru = {
updateScript = nix-update-script { };
@@ -69,6 +67,8 @@ rustPlatform.buildRustPackage rec {
mainProgram = "termscp";
maintainers = with lib.maintainers; [
fab
gepbird
];
platforms = with lib.platforms; linux ++ darwin;
};
}
pkgs/applications/graphics/texturepacker/default.nix → pkgs/by-name/te/texturepacker/package.nix
+13 -15
View File
@@ -1,33 +1,31 @@
{ lib
, stdenv
, fetchurl
, dpkg
, autoPatchelfHook
, wrapQtAppsHook
, qtbase
, qtdeclarative
, qtsvg
{
lib,
stdenv,
fetchurl,
dpkg,
autoPatchelfHook,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "texturepacker";
version = "7.4.0";
version = "7.5.0";
src = fetchurl {
url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb";
hash = "sha256-v+azjIIscmp72WB3gki0CKb+z+FYsuJxIx9jvdfs+qM=";
hash = "sha256-zUT9NnBNtgFqNr7e9IAqWuK61MjrQuC+gCi1D2m1kGc=";
};
nativeBuildInputs = [
dpkg
autoPatchelfHook
wrapQtAppsHook
qt6.wrapQtAppsHook
];
buildInputs = [
qtbase
qtdeclarative
qtsvg
qt6.qtbase
qt6.qtdeclarative
qt6.qtsvg
];
installPhase = ''
pkgs/by-name/to/ton/package.nix
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "ton";
version = "2024.09";
version = "2024.10";
src = fetchFromGitHub {
owner = "ton-blockchain";
repo = "ton";
rev = "v${version}";
hash = "sha256-IzDftvPwsKWEVn4R8QL6j1ceA26BksKSrlr0CkFZlrU=";
hash = "sha256-Eab5tXP5gv9v/hu/Eh2WC/SeJ/bG1u6FKbREKB/ry9c=";
fetchSubmodules = true;
};
pkgs/by-name/wa/wasm-tools/package.nix
+3 -3
View File
@@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-tools";
version = "1.219.1";
version = "1.220.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-9FAq6wcTXXFdQ5kcpkj2KqTcd8C8zXmhRWW/ajCJUMI=";
hash = "sha256-gXwdY75tTx57khF52LfNTIbacP53uxr/+YSc2zFiGSk=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-moBRkUbcIGZaVdcE3yDtREtG4unN4n5yA7edpnrUFg4=";
cargoHash = "sha256-bnFkeIzn8hHU7ABli8CVs+HeECqgc28nCKvdGN0Hr8s=";
cargoBuildFlags = [ "--package" "wasm-tools" ];
cargoTestFlags = [ "--all" ] ++
# Due to https://github.com/bytecodealliance/wasm-tools/issues/1820
pkgs/desktops/gnome/extensions/arcmenu/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-arcmenu";
version = "55";
version = "63";
src = fetchFromGitLab {
owner = "arcmenu";
repo = "ArcMenu";
rev = "v${version}";
hash = "sha256-xLKvcrZkqcj7aHiv9JumLWSP5LbajITAyopCIwGqpkE=";
hash = "sha256-XlDkdNINTnUAqr2bxL0u2tHWfiggqT1oOryED7sG/vs=";
};
patches = [
pkgs/development/libraries/libusb1/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@
, autoreconfHook
, doxygen
, pkg-config
, enableUdev ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic
, enableUdev ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isAndroid
, udev
, libobjc
, IOKit
pkgs/development/php-packages/maxminddb/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
}:
let
pname = "maxminddb";
version = "1.11.1";
version = "1.12.0";
in
buildPecl {
inherit pname version;
@@ -15,7 +15,7 @@ buildPecl {
owner = "maxmind";
repo = "MaxMind-DB-Reader-php";
rev = "v${version}";
sha256 = "sha256-e22HVsD0YstGQiRch0zUUF5CY1zSuFCyU2anK9uGCY4=";
sha256 = "sha256-zFO77h++OHxnk0Rz61jiCBZS80g0+GmRbw2LxayIFuo=";
};
prePatch = ''
pkgs/development/python-modules/aiohttp-retry/default.nix
+9 -5
View File
@@ -6,23 +6,26 @@
pytestCheckHook,
pytest-aiohttp,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "aiohttp-retry";
version = "2.8.3";
format = "setuptools";
version = "2.9.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "inyutin";
repo = "aiohttp_retry";
rev = "v${version}";
hash = "sha256-Zr68gx8ZR9jKrogmqaFLvpBAIHE9ptHm0zZ/b49cCLw=";
rev = "refs/tags/v${version}";
hash = "sha256-9riIGQDxC+Ee16itSWJWobPkmuy7Mkn2eyTkevIGse8=";
};
propagatedBuildInputs = [ aiohttp ];
build-system = [ setuptools ];
dependencies = [ aiohttp ];
__darwinAllowLocalNetworking = true;
@@ -38,6 +41,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Retry client for aiohttp";
homepage = "https://github.com/inyutin/aiohttp_retry";
changelog = "https://github.com/inyutin/aiohttp_retry/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
-26
View File
@@ -1,26 +0,0 @@
From 94c4768cd69b026e498d92133dd6c7d8589cf911 Mon Sep 17 00:00:00 2001
From: Jiajie Chen <c@jia.je>
Date: Sat, 25 Jun 2022 10:19:44 +0800
Subject: [PATCH] Patch LDCXXSHARED for macOS along with LDSHARED
In Nixpkgs, we patched distutils to respect LDCXXSHARED environment, so
the replacement should be taken on LDCXXSHARED as well.
---
cocotb_build_libs.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/cocotb_build_libs.py b/cocotb_build_libs.py
index 66097ec2..d5555b36 100755
--- a/cocotb_build_libs.py
+++ b/cocotb_build_libs.py
@@ -583,6 +583,7 @@ def get_ext():
if sys.platform == "darwin":
cfg_vars["LDSHARED"] = cfg_vars["LDSHARED"].replace("-bundle", "-dynamiclib")
+ cfg_vars["LDCXXSHARED"] = cfg_vars["LDCXXSHARED"].replace("-bundle", "-dynamiclib")
share_lib_dir = os.path.relpath(os.path.join(cocotb_share_dir, "lib"))
include_dir = os.path.relpath(os.path.join(cocotb_share_dir, "include"))
--
2.36.1
pkgs/development/python-modules/cocotb/0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch
-25
View File
@@ -1,25 +0,0 @@
diff --git a/tests/test_cases/test_cocotb/test_deprecated.py b/tests/test_cases/test_cocotb/test_deprecated.py
index 523b93ba..b4f1701e 100644
--- a/tests/test_cases/test_cocotb/test_deprecated.py
+++ b/tests/test_cases/test_cocotb/test_deprecated.py
@@ -26,20 +26,6 @@ async def test_returnvalue_deprecated(dut):
assert val == 42
-# strings are not supported on Icarus (gh-2585) or GHDL (gh-2584)
-@cocotb.test(
- expect_error=AttributeError
- if cocotb.SIM_NAME.lower().startswith("icarus")
- else TypeError
- if cocotb.SIM_NAME.lower().startswith("ghdl")
- else ()
-)
-async def test_unicode_handle_assignment_deprecated(dut):
- with pytest.warns(DeprecationWarning, match=".*bytes.*"):
- dut.stream_in_string.value = "Bad idea"
- await cocotb.triggers.ReadWrite()
-
-
@cocotb.test()
async def test_convert_handle_to_string_deprecated(dut):
dut.stream_in_data.value = 0
pkgs/development/python-modules/cocotb/default.nix
+25 -25
View File
@@ -10,11 +10,13 @@
swig,
iverilog,
ghdl,
stdenv,
fetchpatch,
}:
buildPythonPackage rec {
pname = "cocotb";
version = "1.9.1";
version = "1.9.2";
format = "setuptools";
# pypi source doesn't include tests
@@ -22,7 +24,7 @@ buildPythonPackage rec {
owner = "cocotb";
repo = "cocotb";
rev = "refs/tags/v${version}";
hash = "sha256-+pS+y9rmyJ4laDK5evAtoqr5D0GuHGaX6DpK1qtumnA=";
hash = "sha256-7KCo7g2I1rfm8QDHRm3ZKloHwjDIICnJCF8KhaFdvqY=";
};
nativeBuildInputs = [ setuptools-scm ];
@@ -30,29 +32,25 @@ buildPythonPackage rec {
buildInputs = [ setuptools ];
propagatedBuildInputs = [ find-libpython ];
postPatch =
''
patchShebangs bin/*.py
postPatch = ''
patchShebangs bin/*.py
# POSIX portability (TODO: upstream this)
for f in \
cocotb/share/makefiles/Makefile.* \
cocotb/share/makefiles/simulators/Makefile.*
do
substituteInPlace $f --replace 'shell which' 'shell command -v'
done
# POSIX portability (TODO: upstream this)
for f in \
cocotb/share/makefiles/Makefile.* \
cocotb/share/makefiles/simulators/Makefile.*
do
substituteInPlace $f --replace 'shell which' 'shell command -v'
done
# remove circular dependency cocotb-bus from setup.py
substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
'';
# remove circular dependency cocotb-bus from setup.py
substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
'';
patches = [
# Fix "can't link with bundle (MH_BUNDLE) only dylibs (MH_DYLIB) file" error
./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
# For the 1.8.1 release only: remove the test_unicode_handle_assignment_deprecated test
# It's more thoroughly removed upstream master with 425e1edb8e7133f4a891f2f87552aa2748cd8d2c
./0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch
disabledTests = [
# https://github.com/cocotb/cocotb/commit/425e1edb8e7133f4a891f2f87552aa2748cd8d2c#diff-4df986cbc2b1a3f22172caea94f959d8fcb4a128105979e6e99c68139469960cL33
"test_cocotb"
"test_cocotb_parallel"
];
nativeCheckInputs = [
@@ -62,6 +60,7 @@ buildPythonPackage rec {
iverilog
ghdl
];
preCheck = ''
export PATH=$out/bin:$PATH
mv cocotb cocotb.hidden
@@ -69,13 +68,14 @@ buildPythonPackage rec {
pythonImportsCheck = [ "cocotb" ];
meta = with lib; {
meta = {
changelog = "https://github.com/cocotb/cocotb/releases/tag/v${version}";
description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
mainProgram = "cocotb-config";
homepage = "https://github.com/cocotb/cocotb";
license = licenses.bsd3;
maintainers = with maintainers; [
license = lib.licenses.bsd3;
broken = stdenv.hostPlatform.isDarwin;
maintainers = with lib.maintainers; [
matthuszagh
jleightcap
];
pkgs/development/python-modules/djangocms-alias/default.nix
+66
View File
@@ -0,0 +1,66 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
django,
pythonOlder,
pytestCheckHook,
setuptools,
django-parler,
django-cms,
distutils,
pytest-django,
beautifulsoup4,
python,
django-app-helper,
}:
buildPythonPackage rec {
pname = "djangocms-alias";
version = "2.0.1";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "django-cms";
repo = "djangocms-alias";
rev = "refs/tags/${version}";
hash = "sha256-ZOushwfBMjzlnuY6vHtM6Ge/VotBHaosIhFItmVkqkc=";
};
build-system = [ setuptools ];
dependencies = [
django
django-cms
django-parler
];
checkInputs = [
beautifulsoup4
distutils
django-app-helper
pytestCheckHook
pytest-django
];
checkPhase = ''
runHook preCheck
${python.interpreter} test_settings.py
runHook postCheck
'';
# Disable tests because dependency djangocms-versioning isn't packaged yet.
doCheck = false;
pythonImportCheck = [ "djangocms_alias" ];
meta = {
description = "Lean enterprise content management powered by Django";
homepage = "https://django-cms.org";
changelog = "https://github.com/django-cms/django-cms/releases/tag/${version}";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.onny ];
};
}
pkgs/development/python-modules/greeneye-monitor/default.nix
+8 -4
View File
@@ -3,6 +3,7 @@
aiohttp,
buildPythonPackage,
fetchFromGitHub,
pytest-socket,
pytestCheckHook,
pythonOlder,
setuptools,
@@ -12,7 +13,7 @@
buildPythonPackage rec {
pname = "greeneye-monitor";
version = "5.0.2";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -23,14 +24,17 @@ buildPythonPackage rec {
hash = "sha256-7EDuQ+wECcTzxkEufMpg3WSzosWeiwfxcVIVtQi+0BI=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
aiohttp
siobrultech-protocols
];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytest-socket
pytestCheckHook
];
pythonImportsCheck = [ "greeneye.monitor" ];
pkgs/development/python-modules/influxdb3-python/default.nix
+17
View File
@@ -8,6 +8,8 @@
pythonOlder,
reactivex,
setuptools,
pandas,
polars,
urllib3,
}:
@@ -25,6 +27,12 @@ buildPythonPackage rec {
hash = "sha256-4P+bQEldyBNh4qsIkoZLXnUOrQ5wVGbr55xbS0oQMMM=";
};
postPatch = ''
# Upstream falls back to a default version if not in a GitHub Actions
substituteInPlace setup.py \
--replace-fail "version=get_version()," "version = '${version}',"
'';
build-system = [ setuptools ];
dependencies = [
@@ -35,6 +43,15 @@ buildPythonPackage rec {
urllib3
];
optional-dependencies = {
pandas = [ pandas ];
polars = [ polars ];
dataframe = [
pandas
polars
];
};
# Missing ORC support
# https://github.com/NixOS/nixpkgs/issues/212863
# nativeCheckInputs = [
pkgs/development/python-modules/kbcstorage/default.nix
+14 -5
View File
@@ -12,6 +12,8 @@
setuptools-git-versioning,
setuptools-scm,
urllib3,
google-auth,
google-cloud-storage,
}:
buildPythonPackage rec {
@@ -33,19 +35,26 @@ buildPythonPackage rec {
--replace-fail "urllib3<2.0.0" "urllib3"
'';
nativeBuildInputs = [
build-system = [
setuptools
setuptools-git-versioning
setuptools-scm
];
propagatedBuildInputs = [
pythonRelaxDeps = [
"google-cloud-storage"
"google-auth"
];
dependencies = [
azure-storage-blob
boto3
python-dotenv
requests
responses
urllib3
google-auth
google-cloud-storage
];
# Requires API token and an active Keboola bucket
@@ -59,11 +68,11 @@ buildPythonPackage rec {
"kbcstorage.tables"
];
meta = with lib; {
meta = {
description = "Keboola Connection Storage API client";
homepage = "https://github.com/keboola/sapi-python-client";
changelog = "https://github.com/keboola/sapi-python-client/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ mrmebelman ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mrmebelman ];
};
}
pkgs/development/python-modules/khanaa/001-skip-broken-test.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/tests/test_thai_spelling.py b/tests/test_thai_spelling.py
index 88ec07b..fb6cd01 100644
--- a/tests/test_thai_spelling.py
+++ b/tests/test_thai_spelling.py
@@ -164,6 +164,7 @@ class TestSpellWord(unittest.TestCase):
for case in GENERAL:
self.assertEqual(spell.spell_out(**case[0]), case[1])
+ @unittest.skip("deprecated spell_out function is broken for test")
def test_onset_tone(self):
spell = SpellWord()
for case in ONSET_TONE:
pkgs/development/python-modules/khanaa/default.nix
+4
View File
@@ -26,6 +26,10 @@ buildPythonPackage rec {
build-system = [ setuptools ];
patches = [
./001-skip-broken-test.patch
];
nativeCheckInputs = [ unittestCheckHook ];
unittestFlagsArray = [
pkgs/development/python-modules/langchain-openai/default.nix
+5 -4
View File
@@ -72,17 +72,18 @@ buildPythonPackage rec {
disabledTests = [
# These tests require network access
"test__convert_dict_to_message_tool_call"
"test__get_encoding_model"
"test_get_token_ids"
"test_azure_openai_secrets"
"test_azure_openai_api_key_is_secret_string"
"test_get_num_tokens_from_messages"
"test_azure_openai_api_key_masked_when_passed_from_env"
"test_azure_openai_api_key_masked_when_passed_via_constructor"
"test_azure_openai_secrets"
"test_azure_openai_uses_actual_secret_value_from_secretstr"
"test_azure_serialized_secrets"
"test_openai_get_num_tokens"
"test_chat_openai_get_num_tokens"
"test_get_num_tokens_from_messages"
"test_get_token_ids"
"test_openai_get_num_tokens"
];
pythonImportsCheck = [ "langchain_openai" ];
pkgs/development/python-modules/lime/default.nix
+7 -2
View File
@@ -26,6 +26,11 @@ buildPythonPackage rec {
hash = "sha256-dpYOTwVf61Pom1AiODuvyHtj8lusYmWYSwozPRpX94E=";
};
postPatch = ''
substituteInPlace lime/tests/test_scikit_image.py \
--replace-fail "random_seed" "rng"
'';
propagatedBuildInputs = [
matplotlib
numpy
@@ -50,11 +55,11 @@ buildPythonPackage rec {
"lime.lime_text"
];
meta = with lib; {
meta = {
description = "Local Interpretable Model-Agnostic Explanations for machine learning classifiers";
homepage = "https://github.com/marcotcr/lime";
changelog = "https://github.com/marcotcr/lime/releases/tag/${version}";
license = licenses.bsd2;
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ khaser ];
};
}
pkgs/development/python-modules/mercadopago/default.nix
+12 -5
View File
@@ -4,12 +4,13 @@
fetchFromGitHub,
pythonOlder,
requests,
setuptools,
}:
buildPythonPackage rec {
pname = "mercadopago";
version = "2.2.3";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -20,18 +21,24 @@ buildPythonPackage rec {
hash = "sha256-u4/e/shfTyrucf+uj5nqAkeugX9JZjXBrNtoOkpff8c=";
};
propagatedBuildInputs = [ requests ];
build-system = [
setuptools
];
dependencies = [
requests
];
# require internet
doCheck = false;
pythonImportsCheck = [ "mercadopago" ];
meta = with lib; {
meta = {
description = "This library provides developers with a simple set of bindings to help you integrate Mercado Pago API to a website and start receiving payments";
homepage = "https://www.mercadopago.com";
changelog = "https://github.com/mercadopago/sdk-python/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ derdennisop ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ derdennisop ];
};
}
pkgs/development/python-modules/mkdocstrings/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "mkdocstrings";
version = "0.26.2";
version = "0.27.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = "mkdocstrings";
rev = "refs/tags/${version}";
hash = "sha256-xZKE8+bNHL+GSQS00MlShOl/3p7+mRV558Pel50ipOI=";
hash = "sha256-L86aFq1S7Hfp+1MHwliCSz0mfgAFD/5AHbeqL1aZ5XM=";
};
postPatch = ''
pkgs/development/python-modules/mqtt2influxdb/default.nix
+21 -7
View File
@@ -8,21 +8,31 @@
py-expression-eval,
pyaml,
pycron,
pytestCheckHook,
schema,
setuptools,
}:
buildPythonPackage rec {
pname = "mqtt2influxdb";
version = "1.5.2";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "hardwario";
repo = "bch-mqtt2influxdb";
rev = "v${version}";
sha256 = "YDgMoxnH4vCCa7b857U6iVBhYLxk8ZjytGziryn24bg=";
rev = "refs/tags/v${version}";
hash = "sha256-YDgMoxnH4vCCa7b857U6iVBhYLxk8ZjytGziryn24bg=";
};
propagatedBuildInputs = [
postPatch = ''
substituteInPlace setup.py \
--replace-fail "find_version('mqtt2influxdb', '__init__.py')," "'${version}',"
'';
build-system = [ setuptools ];
dependencies = [
influxdb
jsonpath-ng
paho-mqtt
@@ -32,14 +42,18 @@ buildPythonPackage rec {
schema
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "mqtt2influxdb" ];
pytestFlagsArray = [ "tests/test.py" ];
meta = with lib; {
homepage = "https://github.com/hardwario/bch-mqtt2influxdb";
description = "Flexible MQTT to InfluxDB Bridge";
mainProgram = "mqtt2influxdb";
platforms = platforms.linux;
homepage = "https://github.com/hardwario/bch-mqtt2influxdb";
changelog = "https://github.com/hardwario/bch-mqtt2influxdb/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ cynerd ];
mainProgram = "mqtt2influxdb";
};
}
pkgs/development/python-modules/mypy-boto3/default.nix
+22 -22
View File
@@ -46,8 +46,8 @@ let
in
rec {
mypy-boto3-accessanalyzer =
buildMypyBoto3Package "accessanalyzer" "1.35.60"
"sha256-xXLkCWbh5JBL2Mt0KIIRQJEhfPeJrIafGf8edWdkwq8=";
buildMypyBoto3Package "accessanalyzer" "1.35.61"
"sha256-CKKqm4XMJBxILifvWH+74U04kespYgkuj6Ft8eQUanA=";
mypy-boto3-account =
buildMypyBoto3Package "account" "1.35.0"
@@ -218,8 +218,8 @@ rec {
"sha256-Sh+w+fi1myX1QUR0JnQeE4/fh2TSVvXIp5tVzxigu5I=";
mypy-boto3-cloudcontrol =
buildMypyBoto3Package "cloudcontrol" "1.35.0"
"sha256-T7rLgdtj8PUAZ6WRRkFYH/I6bqq+NA29kddxeI72UVU=";
buildMypyBoto3Package "cloudcontrol" "1.35.61"
"sha256-kORoEbZu8JfMy5qBqfBS1Ohr/WAxR7N/Tc6GNGvtqwc=";
mypy-boto3-clouddirectory =
buildMypyBoto3Package "clouddirectory" "1.35.30"
@@ -606,8 +606,8 @@ rec {
"sha256-Df0AUKZh6S4OdqGBUtEC4cnic9E06Frj0McQH+yQwFc=";
mypy-boto3-iam =
buildMypyBoto3Package "iam" "1.35.0"
"sha256-s3mgHDyhejZ8t6RgkF+c4at4MKmruMilbyil/xCHZX8=";
buildMypyBoto3Package "iam" "1.35.61"
"sha256-zzB/f7JATO2n/aRV9tTPO99X4So7FtJxAdtiI8Web+c=";
mypy-boto3-identitystore =
buildMypyBoto3Package "identitystore" "1.35.0"
@@ -694,12 +694,12 @@ rec {
"sha256-6w4Q6vynF47uBeTNBqus4hM9Fy5Bs3C0Qh/Ig3sPBhw=";
mypy-boto3-iotwireless =
buildMypyBoto3Package "iotwireless" "1.35.0"
"sha256-e4a8Na1spmmaUVAiAWPvn7DqzYHzEL4EatCewrRxJKE=";
buildMypyBoto3Package "iotwireless" "1.35.61"
"sha256-VR/yynst0jq8jdc2EQkohh2zBJA0VcAo+m9cDJwcksQ=";
mypy-boto3-ivs =
buildMypyBoto3Package "ivs" "1.35.41"
"sha256-U4GiLc6Tdk6qCKrLxVPikRKkcAWxnp1DIV8nOi/XQH8=";
buildMypyBoto3Package "ivs" "1.35.61"
"sha256-KMY2z2O8JY++v8Vi3o6zx6HFUZdjNHkGOZD4y05ZGQ4=";
mypy-boto3-ivs-realtime =
buildMypyBoto3Package "ivs-realtime" "1.35.32"
@@ -798,8 +798,8 @@ rec {
"sha256-xrNvzGZkTDmWtEJwfoZmoe0vqHWmltV9sV3OxLy5JeM=";
mypy-boto3-license-manager-user-subscriptions =
buildMypyBoto3Package "license-manager-user-subscriptions" "1.35.0"
"sha256-1xu8CxA0xJeHPjAkAr6+csVax9Kzuzc0DdZkTu7iVWI=";
buildMypyBoto3Package "license-manager-user-subscriptions" "1.35.61"
"sha256-wQSuqF5iZUZYc1Z1iyRwm1vkmb6wdubv1PskWIXn54Y=";
mypy-boto3-lightsail =
buildMypyBoto3Package "lightsail" "1.35.0"
@@ -1074,8 +1074,8 @@ rec {
"sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs=";
mypy-boto3-quicksight =
buildMypyBoto3Package "quicksight" "1.35.56"
"sha256-wiAo7FwQYo4oL8qiE3KOlpeuo4uOCacLZwBf5vel88M=";
buildMypyBoto3Package "quicksight" "1.35.61"
"sha256-+Q+lS2qxfLM9w+OKQsi76Hic26AgmoZvLkUiYBliiP0=";
mypy-boto3-ram =
buildMypyBoto3Package "ram" "1.35.0"
@@ -1094,8 +1094,8 @@ rec {
"sha256-XPb/7sVSVFkDjPQ2x6w7tJmIBiS1YH10805lv/eGsyw=";
mypy-boto3-redshift =
buildMypyBoto3Package "redshift" "1.35.52"
"sha256-quOZw+mVY3pNXvhWRN4eU9LySeFsrJzSK6FwS0h5Z3E=";
buildMypyBoto3Package "redshift" "1.35.61"
"sha256-Z0Q/jd9A3CkKUjHcUTNgwMysosL/q4/PHC8uz42DAHQ=";
mypy-boto3-redshift-data =
buildMypyBoto3Package "redshift-data" "1.35.51"
@@ -1162,8 +1162,8 @@ rec {
"sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw=";
mypy-boto3-s3 =
buildMypyBoto3Package "s3" "1.35.46"
"sha256-8Ah6N2XRA7LbVlzYBl68Kw9w8t1OksEy9kuJRd2GmUA=";
buildMypyBoto3Package "s3" "1.35.61"
"sha256-aWX+bF89g2KseJVmNUCETtKciFySpiIzwpocAxyijJA=";
mypy-boto3-s3control =
buildMypyBoto3Package "s3control" "1.35.55"
@@ -1174,8 +1174,8 @@ rec {
"sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI=";
mypy-boto3-sagemaker =
buildMypyBoto3Package "sagemaker" "1.35.53"
"sha256-Vj7lAt1eU47vE7XZ95QJBe95302681tJuy4nw02Bibc=";
buildMypyBoto3Package "sagemaker" "1.35.61"
"sha256-OgIgfz1e3f+RJdBMCga8LtwikKL2ssenjWzmOPZphPU=";
mypy-boto3-sagemaker-a2i-runtime =
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0"
@@ -1330,8 +1330,8 @@ rec {
"sha256-60qxUQtbi+Dl2osn7zkSmpTuXf8DjTKDa3XXVsJynKE=";
mypy-boto3-sts =
buildMypyBoto3Package "sts" "1.35.0"
"sha256-YZWAwLz01/eYCMgyiniUoO6sVvlFQYM8WjKcvHCPdng=";
buildMypyBoto3Package "sts" "1.35.61"
"sha256-N0ZbodMgLNObUIw0aVX5paJZcHEwB5Glacu8KterTdE=";
mypy-boto3-support =
buildMypyBoto3Package "support" "1.35.0"
pkgs/development/python-modules/nessclient/default.nix
+5
View File
@@ -25,6 +25,11 @@ buildPythonPackage rec {
hash = "sha256-STDEIY7D02MlH+R6uLAKl6ghSQjhG1OEQWj71DrZP30=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail "version = '0.0.0-dev'" "version = '${version}'"
'';
build-system = [ setuptools ];
dependencies = [
pkgs/development/python-modules/pyacaia-async/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyacaia-async";
version = "0.0.10";
version = "0.1.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyacaia_async";
inherit version;
hash = "sha256-hmzsZIIZsswUvy9AMgfXNC2v6H8Wvgdk9Qa4PoYmhCU=";
hash = "sha256-RwiASn6mD6BhZByoHVqaCH7koVhN5wQorG2l51wFAcI=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pyais/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyais";
version = "2.8.1";
version = "2.8.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "M0r13n";
repo = "pyais";
rev = "refs/tags/v${version}";
hash = "sha256-aIpIeDJGMfNVzeXY8GaPOYKam2HxcdHgSOhOoGmGDoc=";
hash = "sha256-G3P1ijwOmd1UFIRXC8qPG93gtWJt+EclzO7wjtvj6tk=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/pydanfossair/default.nix
+9 -4
View File
@@ -2,27 +2,32 @@
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
}:
buildPythonPackage rec {
pname = "pydanfossair";
version = "0.2.0";
format = "setuptools";
version = "0.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "JonasPed";
repo = "pydanfoss-air";
rev = "v${version}";
hash = "sha256-WTRiEQbd3wwNAz1gk0rS3khy6lg61rcGZQTMlBc0uO8=";
rev = "refs/tags/v${version}";
hash = "sha256-ZTairxQbvijNiSomDoeZtmL/Hn3ce1Z5TEOf+0C8cYg=";
};
build-system = [ setuptools ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pydanfossair" ];
meta = with lib; {
description = "Python interface for Danfoss Air HRV systems";
homepage = "https://github.com/JonasPed/pydanfoss-air";
changelog = "https://github.com/JonasPed/pydanfoss-air/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/pydiscovergy/default.nix
+3 -1
View File
@@ -19,7 +19,7 @@ buildPythonPackage rec {
version = "3.0.2";
pyproject = true;
disabled = pythonOlder "3.10";
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "jpbede";
@@ -30,6 +30,8 @@ buildPythonPackage rec {
postPatch = ''
sed -i '/addopts =/d' pyproject.toml
substituteInPlace pyproject.toml \
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
'';
build-system = [ poetry-core ];
pkgs/development/python-modules/pyldavis/default.nix
+51
View File
@@ -0,0 +1,51 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
funcy,
ipython,
jinja2,
joblib,
numpy,
pandas,
scikit-learn,
scipy,
}:
buildPythonPackage rec {
pname = "pyLDAvis";
version = "3.4.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "bmabey";
repo = "pyLDAvis";
rev = version;
sha256 = "sha256-WIQytds3PeU85l6ix2UUIwypjpM5rMZvQxiHx9BY91Y=";
};
propagatedBuildInputs = [
funcy
jinja2
joblib
ipython
numpy
pandas
scikit-learn
scipy
];
pythonImportsCheck = [
"pyLDAvis"
"pyLDAvis.gensim_models"
];
meta = with lib; {
homepage = "https://github.com/bmabey/pyLDAvis";
description = "Python library for interactive topic model visualization";
maintainers = with lib.maintainers; [ gm6k ];
license = licenses.bsd3;
sourceProvenance = with sourceTypes; [ fromSource ];
platforms = platforms.all;
};
}
pkgs/development/python-modules/pypitoken/default.nix
+10 -7
View File
@@ -5,6 +5,7 @@
jsonschema,
poetry-core,
pymacaroons,
pytest-cov-stub,
pytest-mock,
pytestCheckHook,
pythonOlder,
@@ -14,30 +15,32 @@
buildPythonPackage rec {
pname = "pypitoken";
version = "7.0.1";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ewjoachim";
repo = pname;
repo = "pypitoken";
rev = "refs/tags/${version}";
hash = "sha256-1SUR6reZywgFpSdD49E5PjEDNrlvsHH4TK6SkXStUws=";
};
postPatch = ''
sed -i "/--cov/d" setup.cfg
substituteInPlace pyproject.toml \
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
'';
nativeBuildInputs = [ poetry-core ];
build-system = [ poetry-core ];
propagatedBuildInputs = [
dependencies = [
pymacaroons
jsonschema
typing-extensions
];
nativeCheckInputs = [
pytest-cov-stub
pytest-mock
pytestCheckHook
];
@@ -47,8 +50,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for generating and manipulating PyPI tokens";
homepage = "https://pypitoken.readthedocs.io/";
changelog = "https://github.com/ewjoachim/pypitoken/releases/tag/6.0.3${version}";
license = with licenses; [ mit ];
changelog = "https://github.com/ewjoachim/pypitoken/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/pytest-voluptuous/default.nix
+9 -2
View File
@@ -5,6 +5,8 @@
pytest,
pytestCheckHook,
pythonOlder,
setuptools-scm,
setuptools,
six,
voluptuous,
}:
@@ -12,7 +14,7 @@
buildPythonPackage rec {
pname = "pytest-voluptuous";
version = "1.2.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,9 +25,14 @@ buildPythonPackage rec {
hash = "sha256-xdj4qCSSJQI9Rb1WyUYrAg1I5wQ5o6IJyIjJAafP/LY=";
};
build-system = [
setuptools
setuptools-scm
];
buildInputs = [ pytest ];
propagatedBuildInputs = [ voluptuous ];
dependencies = [ voluptuous ];
nativeCheckInputs = [
pytestCheckHook
pkgs/development/python-modules/securityreporter/default.nix
+5
View File
@@ -24,6 +24,11 @@ buildPythonPackage rec {
hash = "sha256-fpsvjbPE6iaOmLxykGSkCjkhFTmb8xhXa8pDrWN66KM=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
'';
build-system = [ poetry-core ];
dependencies = [ requests ];
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1265";
version = "3.0.1266";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-7W74JPGht8lyyfjTXx0VQoRJr18R98WFGoyGCJlSvTU=";
hash = "sha256-YcWdg23Zu/86PxBClZbFFQwOPyPN7TEMCHa/hI5OY6Y=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/twilio/default.nix
+13 -10
View File
@@ -1,7 +1,7 @@
{
lib,
aiohttp,
aiohttp-retry,
aiohttp,
aiounittest,
buildPythonPackage,
cryptography,
@@ -9,9 +9,10 @@
fetchFromGitHub,
mock,
multidict,
pyngrok,
pyjwt,
pyngrok,
pytestCheckHook,
pythonAtLeast,
pythonOlder,
pytz,
requests,
@@ -43,9 +44,6 @@ buildPythonPackage rec {
requests
];
# aiounittest is not supported on 3.12
doCheck = pythonOlder "3.12";
nativeCheckInputs = [
aiounittest
cryptography
@@ -61,11 +59,16 @@ buildPythonPackage rec {
"test_set_user_agent_extensions"
];
disabledTestPaths = [
# Tests require API token
"tests/cluster/test_webhook.py"
"tests/cluster/test_cluster.py"
];
disabledTestPaths =
[
# Tests require API token
"tests/cluster/test_webhook.py"
"tests/cluster/test_cluster.py"
]
++ lib.optionals (pythonAtLeast "3.11") [
# aiounittest is not supported on Python 3.12
"tests/unit/http/test_async_http_client.py"
];
pythonImportsCheck = [ "twilio" ];
pkgs/development/tools/analysis/checkov/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.291";
version = "3.2.296";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-CpLJD76FK2kX4p8M41S/GmGAwfTX1ugyyl10MEG4WNY=";
hash = "sha256-lHfAbgi5Ut3vwkEqIEXrvBFhEn1exIEB1PZmbVnqKbU=";
};
patches = [ ./flake8-compat-5.x.patch ];
pkgs/development/tools/coder/default.nix
+10 -10
View File
@@ -14,21 +14,21 @@ let
channels = {
stable = {
version = "2.15.1";
version = "2.16.1";
hash = {
x86_64-linux = "sha256-DB/3iUkgWzAI+3DEQB8heYkG6apUARDulQ4lKDAPN1I=";
x86_64-darwin = "sha256-62tjAC3WtWC8eIkh9dPi2Exksp2gDHyXEU2tCavKZ4Q=";
aarch64-linux = "sha256-957GdH5sDjbjxEt8LXKPBM7vht7T6JizVwYYhbitdpw=";
aarch64-darwin = "sha256-ckcd1u9dgg9LKhr47Yw8dJKkR7hawPie4QNyySH8vyM=";
x86_64-linux = "sha256-Mv+4xFuilzGU4ccDhc+Xhk5+cN8ixA8Api5yOJtQ2xY=";
x86_64-darwin = "sha256-it+XaD9Zn9mJQpS+sNN2dGVH0pGDyv/UnOPZQ2hnk0c=";
aarch64-linux = "sha256-HzS7NKnaglzctEFLnmMDV6P4BPNOqqCvT1Y6iO/+a2s=";
aarch64-darwin = "sha256-/tKiFVr06EkAOctrQ3n3GjFT7BryJfYVUkP/Tqw2IE4=";
};
};
mainline = {
version = "2.16.0";
version = "2.17.2";
hash = {
x86_64-linux = "sha256-Uk9oGiLSHBCINAzQg88tlHyMw/OGfdmCw2/NXJs5wbQ=";
x86_64-darwin = "sha256-Bbayv00NDJGUA4M4KyG4XCXIiaQSf4JSgy5VvLSVmAM=";
aarch64-linux = "sha256-nV02uO+UkNNvQDIkh2G+9H8gvk9DOSYyIu4O3nwkYXk=";
aarch64-darwin = "sha256-C9Nm8dW3V25D7J/3ABO5oLGL4wcSCsAXtQNZABwVpWs=";
x86_64-linux = "sha256-IhR6C9qwe6p4svdXR+BreFTeJb0MYOEgjIVE3JHH4XA=";
x86_64-darwin = "sha256-titICVmAfXP306Mj9vFHPGtA4T85BncHta944qyEPZI=";
aarch64-linux = "sha256-bvCBO4IcmCi5jgdNXsManCXErV4raKUoiwHLP9GHZhk=";
aarch64-darwin = "sha256-3pC5oryN8wDNHuaWJBkUUOLy3HbnCEIsLXbzzuwfuPY=";
};
};
};
pkgs/os-specific/linux/zfs/generic.nix
+3
View File
@@ -95,11 +95,14 @@ let
substituteInPlace ./config/zfs-build.m4 \
--replace-fail "bashcompletiondir=/etc/bash_completion.d" \
"bashcompletiondir=$out/share/bash-completion/completions"
substituteInPlace ./cmd/arc_summary --replace-fail "/sbin/modinfo" "modinfo"
'' + optionalString (!isAtLeast22Series) ''
substituteInPlace ./etc/zfs/Makefile.am --replace-fail "\$(sysconfdir)/zfs" "$out/etc/zfs"
find ./contrib/initramfs -name Makefile.am -exec sed -i -e 's|/usr/share/initramfs-tools|'$out'/share/initramfs-tools|g' {} \;
substituteInPlace ./cmd/arc_summary/arc_summary3 --replace-fail "/sbin/modinfo" "modinfo"
substituteInPlace ./cmd/vdev_id/vdev_id \
--replace-fail "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
"PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}"
pkgs/servers/web-apps/outline/default.nix
+3 -3
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "outline";
version = "0.80.2";
version = "0.81.0";
src = fetchFromGitHub {
owner = "outline";
repo = "outline";
rev = "v${version}";
hash = "sha256-kmi6H2vdzg7ftUOrzs2b5e9n1bSFHiQ0wk6Q6T/lDdk=";
hash = "sha256-PgRdIdk0VJHFa+rNRV4mlZ0A/jHmAg0O9td98y1itzw=";
};
nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-Ibgn/J2OCP2F0hbPQi35uGAOfoZ2D5HD/E85oOTr6G0=";
hash = "sha256-j0mA+2GQZNxQoEi8qwmipUXGjPL4/bY5GHAT0o92Ob0=";
};
configurePhase = ''
pkgs/top-level/all-packages.nix
-6
View File
@@ -5467,10 +5467,6 @@ with pkgs;
pythonPackages = python3Packages;
};
termscp = callPackage ../tools/networking/termscp {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation Security;
};
texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
extraFonts = true;
@@ -16012,8 +16008,6 @@ with pkgs;
terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects ;
texturepacker = qt6.callPackage ../applications/graphics/texturepacker { };
inherit (callPackage ../applications/graphics/tesseract {
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
})
pkgs/top-level/python-packages.nix
+4
View File
@@ -3325,6 +3325,8 @@ self: super: with self; {
djangocms-text-ckeditor = callPackage ../development/python-modules/djangocms-text-ckeditor { };
djangocms-alias = callPackage ../development/python-modules/djangocms-alias { };
django-admin-datta = callPackage ../development/python-modules/django-admin-datta { };
django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { };
@@ -10419,6 +10421,8 @@ self: super: with self; {
inherit (pkgs) protobuf;
};
pyldavis = callPackage ../development/python-modules/pyldavis { };
pylddwrap = callPackage ../development/python-modules/pylddwrap { };
pyloadapi = callPackage ../development/python-modules/pyloadapi { };