mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-07 21:18:05 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8959daafec
@ -11902,6 +11902,12 @@
|
||||
github = "Mephistophiles";
|
||||
githubId = 4850908;
|
||||
};
|
||||
mevatron = {
|
||||
email = "mevatron@gmail.com";
|
||||
name = "mevatron";
|
||||
github = "mevatron";
|
||||
githubId = 714585;
|
||||
};
|
||||
mfossen = {
|
||||
email = "msfossen@gmail.com";
|
||||
github = "mfossen";
|
||||
|
||||
@ -51,9 +51,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS.
|
||||
|
||||
- `k9s` was updated to v0.30. There have been various breaking changes in the config file format,
|
||||
check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0) and
|
||||
[v0.30](https://github.com/derailed/k9s/releases/tag/v0.30.0) for details. It is recommended
|
||||
- `k9s` was updated to v0.31. There have been various breaking changes in the config file format,
|
||||
check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0),
|
||||
[v0.30](https://github.com/derailed/k9s/releases/tag/v0.30.0) and
|
||||
[v0.31](https://github.com/derailed/k9s/releases/tag/v0.31.0) for details. It is recommended
|
||||
to back up your current configuration and let k9s recreate the new base configuration.
|
||||
|
||||
- `idris2` was updated to v0.7.0. This version introduces breaking changes. Check out the [changelog](https://github.com/idris-lang/Idris2/blob/v0.7.0/CHANGELOG.md#v070) for details.
|
||||
|
||||
@ -1359,6 +1359,7 @@ in {
|
||||
''
|
||||
else ''
|
||||
jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
|
||||
'${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.9" then ".production.main as $main | del(.production.main) | .production |= {main: $main} + ." else ""}' \
|
||||
>'${cfg.statePath}/config/database.yml'
|
||||
''
|
||||
}
|
||||
|
||||
@ -122,62 +122,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
# The current implementations of `doRename`, `mkRenamedOptionModule` do not provide the full options path when used with submodules.
|
||||
# They would only show `settings.useacl' instead of `services.dokuwiki.sites."site1.local".settings.useacl'
|
||||
# The partial re-implementation of these functions is done to help users in debugging by showing the full path.
|
||||
mkRenamed = from: to: { config, options, name, ... }: let
|
||||
pathPrefix = [ "services" "dokuwiki" "sites" name ];
|
||||
fromPath = pathPrefix ++ from;
|
||||
fromOpt = getAttrFromPath from options;
|
||||
toOp = getAttrsFromPath to config;
|
||||
toPath = pathPrefix ++ to;
|
||||
in {
|
||||
options = setAttrByPath from (mkOption {
|
||||
visible = false;
|
||||
description = lib.mdDoc "Alias of {option}${showOption toPath}";
|
||||
apply = x: builtins.trace "Obsolete option `${showOption fromPath}' is used. It was renamed to ${showOption toPath}" toOp;
|
||||
});
|
||||
config = mkMerge [
|
||||
{
|
||||
warnings = optional fromOpt.isDefined
|
||||
"The option `${showOption fromPath}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption toPath}'.";
|
||||
}
|
||||
(lib.modules.mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt)
|
||||
];
|
||||
};
|
||||
|
||||
siteOpts = { options, config, lib, name, ... }:
|
||||
{
|
||||
imports = [
|
||||
(mkRenamed [ "aclUse" ] [ "settings" "useacl" ])
|
||||
(mkRenamed [ "superUser" ] [ "settings" "superuser" ])
|
||||
(mkRenamed [ "disableActions" ] [ "settings" "disableactions" ])
|
||||
({ config, options, ... }: let
|
||||
showPath = suffix: lib.options.showOption ([ "services" "dokuwiki" "sites" name ] ++ suffix);
|
||||
replaceExtraConfig = "Please use `${showPath ["settings"]}' to pass structured settings instead.";
|
||||
ecOpt = options.extraConfig;
|
||||
ecPath = showPath [ "extraConfig" ];
|
||||
in {
|
||||
options.extraConfig = mkOption {
|
||||
visible = false;
|
||||
apply = x: throw "The option ${ecPath} can no longer be used since it's been removed.\n${replaceExtraConfig}";
|
||||
};
|
||||
config.assertions = [
|
||||
{
|
||||
assertion = !ecOpt.isDefined;
|
||||
message = "The option definition `${ecPath}' in ${showFiles ecOpt.files} no longer has any effect; please remove it.\n${replaceExtraConfig}";
|
||||
}
|
||||
{
|
||||
assertion = config.mergedConfig.useacl -> (config.acl != null || config.aclFile != null);
|
||||
message = "Either ${showPath [ "acl" ]} or ${showPath [ "aclFile" ]} is mandatory if ${showPath [ "settings" "useacl" ]} is true";
|
||||
}
|
||||
{
|
||||
assertion = config.usersFile != null -> config.mergedConfig.useacl != false;
|
||||
message = "${showPath [ "settings" "useacl" ]} is required when ${showPath [ "usersFile" ]} is set (Currently defined as `${config.usersFile}' in ${showFiles options.usersFile.files}).";
|
||||
}
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
options = {
|
||||
enable = mkEnableOption (lib.mdDoc "DokuWiki web application");
|
||||
@ -392,21 +338,6 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
# Required for the mkRenamedOptionModule
|
||||
# TODO: Remove me once https://github.com/NixOS/nixpkgs/issues/96006 is fixed
|
||||
# or we don't have any more notes about the removal of extraConfig, ...
|
||||
warnings = mkOption {
|
||||
type = types.listOf types.unspecified;
|
||||
default = [ ];
|
||||
visible = false;
|
||||
internal = true;
|
||||
};
|
||||
assertions = mkOption {
|
||||
type = types.listOf types.unspecified;
|
||||
default = [ ];
|
||||
visible = false;
|
||||
internal = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
@ -440,10 +371,6 @@ in
|
||||
# implementation
|
||||
config = mkIf (eachSite != {}) (mkMerge [{
|
||||
|
||||
warnings = flatten (mapAttrsToList (_: cfg: cfg.warnings) eachSite);
|
||||
|
||||
assertions = flatten (mapAttrsToList (_: cfg: cfg.assertions) eachSite);
|
||||
|
||||
services.phpfpm.pools = mapAttrs' (hostName: cfg: (
|
||||
nameValuePair "dokuwiki-${hostName}" {
|
||||
inherit user;
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.74";
|
||||
version = "1.75";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-plr5vmtYL0adeocY4/3hRI2RQ7lDkLvBbQPq2Jw6MvU=";
|
||||
hash = "sha256-K+RUsRr19fc0E9VhZWIawxkGXCTwqXl3a13pRiRxDPg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub, unstableGitUpdater }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "yuzu-compatibility-list";
|
||||
version = "unstable-2023-12-28";
|
||||
version = "unstable-2024-01-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flathub";
|
||||
repo = "org.yuzu_emu.yuzu";
|
||||
rev = "0b9bf10851d6ad54441dc4f687d5755ed2c6f7a8";
|
||||
hash = "sha256-oWEeAhyxFO1TFH3d+/ivRf1KnNUU8y5c/7NtOzlpKXg=";
|
||||
rev = "0f5500f50e2a5ac7e40e6f5f8aeb160d46348828";
|
||||
hash = "sha256-0JHl7myoa3MlfucmbKB5tubJ6sQ2IlTIL3i2yveOvaU=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2023-12-29
|
||||
# Last updated: 2024-01-10
|
||||
{
|
||||
version = "4037";
|
||||
distHash = "sha256:0pw56hj13fm9j5nja1lhj839d88w00kcr30kygasr36w9c7yv2n7";
|
||||
fullHash = "sha256:0f42fp8z333b3k4pn8j0cp3480llvlygl5p6qfgywhq3g5hcpzpb";
|
||||
version = "4056";
|
||||
distHash = "sha256:14qd5v238pka9axrxjbaawr0kpkkbd95mzri6jdjxjyzbkk03hmb";
|
||||
fullHash = "sha256:0fb4i6708q59ql9ffrw2myanqgxpy20z971y6l7yvxm1pqw9qhyx";
|
||||
}
|
||||
|
||||
@ -47,13 +47,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation(finalAttrs: {
|
||||
pname = "yuzu";
|
||||
version = "1665";
|
||||
version = "1676";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuzu-emu";
|
||||
repo = "yuzu-mainline";
|
||||
rev = "mainline-0-${finalAttrs.version}";
|
||||
hash = "sha256-xzSup1oz83GPpOGh9aJJ5YjoFX/cBI8RV6SvDYNH/zA=";
|
||||
hash = "sha256-vRrliVuGXI/Dpmdkbj+P5hshzPzB6nijrXQfLXHaGqk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
7
pkgs/applications/emulators/yuzu/update.sh
Executable file
7
pkgs/applications/emulators/yuzu/update.sh
Executable file
@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
#shellcheck shell=bash
|
||||
nix-update -u yuzuPackages.nx_tzdb "$@"
|
||||
nix-update -u yuzuPackages.compat-list "$@"
|
||||
nix-update -u yuzuPackages.mainline "$@"
|
||||
nix-update -u yuzuPackages.early-access "$@"
|
||||
@ -1,7 +1,16 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, curl
|
||||
, wget
|
||||
, git
|
||||
, ripgrep
|
||||
, postlight-parser
|
||||
, readability-extractor
|
||||
, chromium
|
||||
, yt-dlp
|
||||
}:
|
||||
|
||||
let
|
||||
@ -34,6 +43,8 @@ let
|
||||
rev = "e43f383dae3a35237e42f6acfe1207a8e7e7bdf5";
|
||||
hash = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM=";
|
||||
};
|
||||
# possibly a real issue, but that version is not supported anymore
|
||||
disabledTests = [ "test_should_highlight_bash_syntax_without_name" ];
|
||||
});
|
||||
};
|
||||
};
|
||||
@ -41,31 +52,51 @@ in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "archivebox";
|
||||
version = "0.6.2";
|
||||
version = "0.7.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY=";
|
||||
hash = "sha256-hdBUEX2tOWN2b11w6aG3x7MP7KQTj4Rwc2w8XvABGf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
pdm-backend
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
requests
|
||||
mypy-extensions
|
||||
croniter
|
||||
dateparser
|
||||
django
|
||||
django-extensions
|
||||
dateparser
|
||||
youtube-dl
|
||||
python-crontab
|
||||
croniter
|
||||
w3lib
|
||||
ipython
|
||||
mypy-extensions
|
||||
python-crontab
|
||||
requests
|
||||
w3lib
|
||||
yt-dlp
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--set USE_NODE True" # used through dependencies, not needed explicitly
|
||||
"--set READABILITY_BINARY ${lib.meta.getExe readability-extractor}"
|
||||
"--set MERCURY_BINARY ${lib.meta.getExe postlight-parser}"
|
||||
"--set CURL_BINARY ${lib.meta.getExe curl}"
|
||||
"--set RIPGREP_BINARY ${lib.meta.getExe ripgrep}"
|
||||
"--set WGET_BINARY ${lib.meta.getExe wget}"
|
||||
"--set GIT_BINARY ${lib.meta.getExe git}"
|
||||
"--set YOUTUBEDL_BINARY ${lib.meta.getExe yt-dlp}"
|
||||
] ++ (if (lib.meta.availableOn stdenv.hostPlatform chromium) then [
|
||||
"--set CHROME_BINARY ${chromium}/bin/chromium-browser"
|
||||
] else [
|
||||
"--set-default USE_CHROME False"
|
||||
]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source self-hosted web archiving";
|
||||
homepage = "https://archivebox.io";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
maintainers = with maintainers; [ siraben viraptor ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
appimageTools.wrapAppImage rec {
|
||||
pname = "bazecor";
|
||||
version = "1.3.8";
|
||||
version = "1.3.9";
|
||||
|
||||
src = appimageTools.extract {
|
||||
inherit pname version;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage";
|
||||
hash = "sha256-SwlSH5z0p9ZVoDQzj4GxO3g/iHG8zQZndE4TmqdMtZQ=";
|
||||
hash = "sha256-qve5xxhhyVej8dPDkZ7QQdeDUmqGO4pHJTykbS4RhAk=";
|
||||
};
|
||||
|
||||
# Workaround for https://github.com/Dygmalab/Bazecor/issues/370
|
||||
@ -26,7 +26,7 @@ appimageTools.wrapAppImage rec {
|
||||
|
||||
# also make sure to update the udev rules in ./10-dygma.rules; most recently
|
||||
# taken from
|
||||
# https://github.com/Dygmalab/Bazecor/blob/v1.3.8/src/main/utils/udev.ts#L6
|
||||
# https://github.com/Dygmalab/Bazecor/blob/v1.3.9/src/main/utils/udev.ts#L6
|
||||
|
||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
|
||||
p.glib
|
||||
@ -39,6 +39,12 @@ appimageTools.wrapAppImage rec {
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/bazecor-* $out/bin/bazecor
|
||||
|
||||
install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/Bazecor.desktop \
|
||||
--replace 'Exec=Bazecor' 'Exec=bazecor'
|
||||
|
||||
install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps
|
||||
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
ln -s --target-directory=$out/lib/udev/rules.d ${./10-dygma.rules}
|
||||
'';
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pe-bear";
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hasherezade";
|
||||
repo = "pe-bear";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WuuhQxjmV/AlmM1z85paUbpIaBht4fgqY8yvtZ0hPKQ=";
|
||||
sha256 = "sha256-O5vBmcQXwde63OKc2LI66/tEqPzs0pK8loYkhILg2oY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -15,9 +15,9 @@
|
||||
version = "2023-10-23";
|
||||
};
|
||||
};
|
||||
hash = "sha256-lT1CCwYj0hT4tCJb689mZwNecUsEwcfn2Ot8r9LBT+M=";
|
||||
hash_deb_amd64 = "sha256-4BWLn0+gYNWG4DsolbY6WlTvXWl7tZIZrnqXlrGUGjQ=";
|
||||
version = "120.0.6099.199";
|
||||
hash = "sha256-yqk0bh68onWqML20Q8eDsTT9o+eKtta7kS9HL74do6Q=";
|
||||
hash_deb_amd64 = "sha256-MxIyOXssQ1Ke5WZbBbB4FpDec+rn46m8+PbMdmxaQCA=";
|
||||
version = "120.0.6099.216";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
|
||||
@ -2,16 +2,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atlantis";
|
||||
version = "0.22.3";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runatlantis";
|
||||
repo = "atlantis";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A/FT9t5Z+Iw1mVwS3d5Cc86A9e6jVbEtmEWroVUhhtw=";
|
||||
hash = "sha256-a+xrmEHkSh5kicxIIxnoXgF9ep2ay5kCXwMR2sAVJIA=";
|
||||
};
|
||||
ldflags = [
|
||||
"-X=main.version=${version}"
|
||||
"-X=main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-KUkh5yx+v5g0N4yIpgpt3i+uCtOtR0Jvf2PFQcGWtm8=";
|
||||
vendorHash = "sha256-ZbCNHARgliw9TMkHyS9k+cnWgbdCCJ+8nMdJMu66Uvo=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.30.8";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RIk3e/rySYev5n0NLN6ZYHIx3ssfdUXnzBJ2y6Y/n5U=";
|
||||
hash = "sha256-01Hlf/wFJjqQbvr/yvzEb+W8Z3krkPlQHUWw04FM7ts=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-Exn4NYegZWrItBoGVb97GUDRhhfeSJUEdr7xJnxcRMI=";
|
||||
vendorHash = "sha256-F7RxqxfjcmBAa8MmgRfUvEEtGMvs7NK5P257n7isl9E=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.11.4";
|
||||
version = "1.11.5";
|
||||
pname = "session-desktop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
hash = "sha256-fSa113BYpTZ4jvxroQsoslAkWfQr4/ROkgVOFyiVsKQ=";
|
||||
hash = "sha256-Sma8e3A1tf7JmnlS4mbtlF98Ow5aRPqw+aUoitzCjmk=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
@ -20,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-1URS9VPqV58p8RUA47j8sdqYqps1Ruo0aqdZXedvPX8=";
|
||||
hash = "sha256-Y1SVUcBRDM+nyWuT0r0WS/PfKNkQd9x9DYlmJUFoeoo=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
@ -34,16 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-ef+JW5ud9LlRxaCJC2iOT5N7FgZO7IkAABJcMQPvIBA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove when IsmaelMartinez/teams-for-linux#1058 is merged
|
||||
(fetchpatch {
|
||||
name = "teams-for-linux-fix-version.patch";
|
||||
url = "https://github.com/IsmaelMartinez/teams-for-linux/commit/1d14947eef35c6a2e0cbdfcce405820f8dd36c68.diff";
|
||||
hash = "sha256-kj2jEAqgZ0frUw85hY23mFYFcXz95z/WQSDymsheDfg=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ];
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, python3
|
||||
, pipewire
|
||||
, libpulseaudio
|
||||
, libnotify
|
||||
, xdg-utils
|
||||
, electron_28
|
||||
, makeDesktopItem
|
||||
@ -44,6 +45,7 @@ buildNpmPackage rec {
|
||||
libPath = lib.makeLibraryPath [
|
||||
libpulseaudio
|
||||
pipewire
|
||||
libnotify
|
||||
];
|
||||
binPath = lib.makeBinPath [ xdg-utils ];
|
||||
in
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mailspring";
|
||||
version = "1.13.2";
|
||||
version = "1.13.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/mailspring-${finalAttrs.version}-amd64.deb";
|
||||
hash = "sha256-KEoKUg5CRYP0kNT4jr7pjUp6gK4cQ/qQEiOBNCrhbFM=";
|
||||
hash = "sha256-2F5k8zRRI6x1EQ0k8wvIq1Q3Lnrn2ROp/Mq+H7Vqzlc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, mercury, pandoc, ncurses, gpgme }:
|
||||
{ lib, stdenv, fetchFromGitHub, mercury, pandoc, ncurses, gpgme, coreutils, file }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notmuch-bower";
|
||||
@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ mercury pandoc ];
|
||||
postPatch = ''
|
||||
substituteInPlace src/compose.m --replace 'shell_quoted("base64' 'shell_quoted("${coreutils}/bin/base64'
|
||||
substituteInPlace src/detect_mime_type.m --replace 'shell_quoted("file' 'shell_quoted("${file}/bin/file'
|
||||
'';
|
||||
|
||||
buildInputs = [ ncurses gpgme ];
|
||||
|
||||
|
||||
@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
|
||||
description = "VLSI layout tool written in Tcl";
|
||||
homepage = "http://opencircuitdesign.com/magic/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ anna328p thoughtpolice AndersonTorres ];
|
||||
maintainers = with maintainers; [ thoughtpolice AndersonTorres ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,6 +7,20 @@
|
||||
*/
|
||||
|
||||
let versions = [
|
||||
{
|
||||
version = "14.0.0";
|
||||
lang = "en";
|
||||
language = "English";
|
||||
sha256 = "sha256-NzMhGQZq6o6V4UdtJxUH/yyP2s7wjTR86SRA7lW7JfI=";
|
||||
installer = "Mathematica_14.0.0_LINUX.sh";
|
||||
}
|
||||
{
|
||||
version = "14.0.0";
|
||||
lang = "en";
|
||||
language = "English";
|
||||
sha256 = "sha256-UrcBEg6G6nbVX++X0z0oG5JjieXL0AquAqtjzY5EBn4=";
|
||||
installer = "Mathematica_14.0.0_BNDL_LINUX.sh";
|
||||
}
|
||||
{
|
||||
version = "13.3.1";
|
||||
lang = "en";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "lbry-desktop";
|
||||
version = "0.53.8";
|
||||
version = "0.53.9";
|
||||
in appimageTools.wrapAppImage rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -12,7 +12,7 @@ in appimageTools.wrapAppImage rec {
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage";
|
||||
# Gotten from latest-linux.yml
|
||||
hash = "sha512-WZB2pMzSuWGPj6uad+rIECOhuWEOxi0hVUQifOrhUrKj4SnBDws+oy7V2+NpDGkzbG+Kf3IO8rcWBD4wfFoo2Q==";
|
||||
hash = "sha256-FkqIazE4eIEobYRBstXfPWh6MTCaNcCLk14yDGC4rRk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -33,11 +33,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apt";
|
||||
version = "2.7.7";
|
||||
version = "2.7.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-07PztwFPblYbhsBZuJBA0MdCy6vFdlk8bvqg3Xsk3nc=";
|
||||
hash = "sha256-nAmiwfGEiftDDWFrk+bfWhX2FHOFanidXjzOCtIZXcY=";
|
||||
};
|
||||
|
||||
# cycle detection; lib can't be split
|
||||
|
||||
@ -13,10 +13,10 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-VokC5JAfBvFUaep8eIDI2eNObfhGwa2qTXcZxuaohNo=";
|
||||
aarch64-linux = "sha256-n9D9syJU/vuwwh0gdJOIobzgAv/rQawTanyRiiz9gl4=";
|
||||
x86_64-darwin = "sha256-wW7U3eTfR3nZtFEbhNK8GzaxK5XbW19VPV4dwo2kCxY=";
|
||||
aarch64-darwin = "sha256-NTDe6PdNc5Li1vyDTypb53zDOIK8C0iS0wTDu80S84s=";
|
||||
x86_64-linux = "sha256-Tip719cZ2La7d7fdpwrKCTRyUyaZCaNXb3bH0fb6WUs=";
|
||||
aarch64-linux = "sha256-Ua0GNPZRT4VCeSpnczkWXhzV7fHeyyLJlkOzMXskNiU=";
|
||||
x86_64-darwin = "sha256-GAus7HeKyEPfts6nKJfKVVsCgdw0nUou+oFO6orIkAM=";
|
||||
aarch64-darwin = "sha256-AvikE5fIsrIkeJth1x5J+hAJI1U18+JwZpAJe0laDAQ=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
bin = "$out/bin/codeium_language_server";
|
||||
@ -24,7 +24,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "codeium";
|
||||
version = "1.6.18";
|
||||
version = "1.6.20";
|
||||
src = fetchurl {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
|
||||
|
||||
48
pkgs/by-name/eb/ebpf-usb/package.nix
Normal file
48
pkgs/by-name/eb/ebpf-usb/package.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, bcc
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ebpf-usb";
|
||||
version = "unstable-2022-04-03";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "francisrstokes";
|
||||
repo = "ebpf-usb";
|
||||
rev = "3ab6f0d8c6ece51bbb5cc5e05daa4008eccd70e8";
|
||||
hash = "sha256-n3ttFej9sroTqAOgyAejwKT+aMt/z7HlVPV6CVGPNUQ=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--set PYTHONUNBUFFERED 1"
|
||||
];
|
||||
|
||||
pythonPath = [ bcc ] ++ (with python3Packages; [
|
||||
hexdump
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ebpf-usb.py \
|
||||
--replace '#!/usr/bin/env -S python3 -u' '#!/usr/bin/env python3'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 ebpf-usb.py $out/bin/ebpf-usb
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python script for USB monitoring using eBPF";
|
||||
homepage = "https://github.com/francisrstokes/ebpf-usb";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with maintainers; [ mevatron ];
|
||||
mainProgram = "ebpf-usb";
|
||||
};
|
||||
}
|
||||
@ -4,13 +4,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nom";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guyfedwards";
|
||||
repo = "nom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RKuaMgPYBD2G9WOKvfb+hj01aBVsCP0eOXULE+JpLR8=";
|
||||
hash = "sha256-yemEq61oUzoOrBZ7e6djNxbw/QqR5Fuhi1Y12n/AdrU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI=";
|
||||
|
||||
165
pkgs/by-name/po/postlight-parser/package.json
Normal file
165
pkgs/by-name/po/postlight-parser/package.json
Normal file
@ -0,0 +1,165 @@
|
||||
{
|
||||
"name": "@postlight/parser",
|
||||
"version": "2.2.3",
|
||||
"description": "Postlight Parser transforms web pages into clean text. Publishers and programmers use it to make the web make sense, and readers use it to read any web article comfortably.",
|
||||
"author": "Postlight <mercury@postlight.com>",
|
||||
"homepage": "https://reader.postlight.com",
|
||||
"license": "MIT",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/postlight/parser.git"
|
||||
},
|
||||
"bugs": {
|
||||
"url": "https://github.com/postlight/parser/issues"
|
||||
},
|
||||
"keywords": [
|
||||
"mercury",
|
||||
"parser",
|
||||
"reader",
|
||||
"web",
|
||||
"content"
|
||||
],
|
||||
"files": [
|
||||
"dist",
|
||||
"cli.js",
|
||||
"src/shims/"
|
||||
],
|
||||
"main": "./dist/mercury.js",
|
||||
"bin": {
|
||||
"mercury-parser": "./cli.js",
|
||||
"postlight-parser": "./cli.js"
|
||||
},
|
||||
"scripts": {
|
||||
"lint": "eslint . --fix",
|
||||
"lint:ci": "remark . && eslint .",
|
||||
"lint-fix-quiet": "eslint --fix --quiet",
|
||||
"build": "yarn lint && rollup -c && yarn test:build",
|
||||
"build:ci": "rollup -c && yarn test:build",
|
||||
"build:web": "yarn lint && rollup -c rollup.config.web.js && yarn test:build:web",
|
||||
"build:esm": "yarn lint && rollup -c rollup.config.esm.js && yarn test:build:esm",
|
||||
"build:esm:ci": "rollup -c rollup.config.esm.js && yarn test:build:esm",
|
||||
"build:web:ci": "rollup -c rollup.config.web.js && yarn test:build:web",
|
||||
"release": "yarn build && yarn build:web",
|
||||
"build:generator": "rollup -c scripts/rollup.config.js",
|
||||
"test_build": "rollup -c",
|
||||
"test": "yarn test:node && yarn test:web",
|
||||
"test:node": "jest --json --outputFile test-output.json",
|
||||
"test:web": "node ./node_modules/karma/bin/karma start karma.conf.js --auto-watch",
|
||||
"test:build": "cd ./scripts && jest check-build.test.js",
|
||||
"test:build:web": "node ./scripts/proxy-browser-test.js",
|
||||
"test:build:esm": "node ./scripts/proxy-browser-test.js",
|
||||
"watch:test": "jest --watch",
|
||||
"generate-parser": "node ./dist/generate-custom-parser.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.0.0",
|
||||
"@babel/plugin-transform-runtime": "^7.0.0",
|
||||
"@babel/polyfill": "^7.0.0",
|
||||
"@babel/preset-env": "^7.0.0",
|
||||
"@babel/runtime": "^7.0.0",
|
||||
"@jesses/circle-github-bot": "^2.1.0",
|
||||
"@octokit/rest": "^16.9.0",
|
||||
"babel-core": "^7.0.0-bridge.0",
|
||||
"babel-eslint": "^10.0.1",
|
||||
"babel-jest": "^23.4.2",
|
||||
"babel-plugin-module-alias": "^1.6.0",
|
||||
"babel-plugin-module-resolver": "^3.1.2",
|
||||
"babelify": "^10.0.0",
|
||||
"babelrc-rollup": "^3.0.0",
|
||||
"brfs": "^2.0.1",
|
||||
"brfs-babel": "^2.0.0",
|
||||
"browserify": "^16.2.3",
|
||||
"changelog-maker": "^2.3.0",
|
||||
"eslint": "^5.12.0",
|
||||
"eslint-config-airbnb": "^17.1.0",
|
||||
"eslint-config-prettier": "^6.1.0",
|
||||
"eslint-import-resolver-babel-module": "^2.2.1",
|
||||
"eslint-plugin-babel": "^5.3.0",
|
||||
"eslint-plugin-import": "^2.14.0",
|
||||
"eslint-plugin-jsx-a11y": "^6.1.2",
|
||||
"eslint-plugin-react": "^7.12.3",
|
||||
"express": "^4.16.4",
|
||||
"husky": "^3.0.0",
|
||||
"inquirer": "^7.0.0",
|
||||
"jasmine-core": "^2.5.2",
|
||||
"jest": "^23.6.0",
|
||||
"jest-cli": "^23.6.0",
|
||||
"karma": "^6.3.16",
|
||||
"karma-browserify": "8.1.0",
|
||||
"karma-chrome-launcher": "^3.0.0",
|
||||
"karma-cli": "^2.0.0",
|
||||
"karma-jasmine": "^1.0.2",
|
||||
"karma-mocha": "^1.3.0",
|
||||
"karma-requirejs": "^1.1.0",
|
||||
"lint-staged": "^8.1.0",
|
||||
"mocha": "^6.0.0",
|
||||
"nock": "^10.0.6",
|
||||
"ora": "^4.0.0",
|
||||
"prettier": "^1.15.3",
|
||||
"remark-cli": "^7.0.0",
|
||||
"remark-lint": "^6.0.4",
|
||||
"remark-preset-lint-recommended": "^3.0.2",
|
||||
"request": "^2.88.2",
|
||||
"requirejs": "^2.3.6",
|
||||
"rollup": "^1.1.0",
|
||||
"rollup-plugin-babel": "^4.0.1",
|
||||
"rollup-plugin-commonjs": "^9.2.0",
|
||||
"rollup-plugin-node-globals": "^1.4.0",
|
||||
"rollup-plugin-node-resolve": "^2.0.0",
|
||||
"rollup-plugin-terser": "^6.1.0",
|
||||
"rollup-plugin-uglify": "^6.0.1",
|
||||
"watchify": "^3.11.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/runtime-corejs2": "^7.2.0",
|
||||
"@postlight/ci-failed-test-reporter": "^1.0",
|
||||
"browser-request": "github:postlight/browser-request#feat-add-headers-to-response",
|
||||
"cheerio": "^0.22.0",
|
||||
"difflib": "github:postlight/difflib.js",
|
||||
"ellipsize": "0.1.0",
|
||||
"iconv-lite": "0.5.0",
|
||||
"jquery": "^3.5.0",
|
||||
"moment": "^2.23.0",
|
||||
"moment-parseformat": "3.0.0",
|
||||
"moment-timezone": "0.5.37",
|
||||
"postman-request": "^2.88.1-postman.31",
|
||||
"string-direction": "^0.1.2",
|
||||
"turndown": "^7.1.1",
|
||||
"valid-url": "^1.0.9",
|
||||
"wuzzy": "^0.1.4",
|
||||
"yargs-parser": "^15.0.1"
|
||||
},
|
||||
"bundleDependencies": [
|
||||
"jquery",
|
||||
"moment-timezone",
|
||||
"browser-request"
|
||||
],
|
||||
"browser": {
|
||||
"main": "./dist/mercury.web.js",
|
||||
"cheerio": "./src/shims/cheerio-query",
|
||||
"jquery": "./node_modules/jquery/dist/jquery.min.js",
|
||||
"postman-request": "browser-request",
|
||||
"iconv-lite": "./src/shims/iconv-lite",
|
||||
"moment-timezone": "./node_modules/moment-timezone/builds/moment-timezone-with-data-2012-2022.min.js"
|
||||
},
|
||||
"husky": {
|
||||
"hooks": {
|
||||
"pre-commit": "lint-staged"
|
||||
}
|
||||
},
|
||||
"lint-staged": {
|
||||
"*.js": [
|
||||
"eslint --fix",
|
||||
"prettier --write",
|
||||
"git add"
|
||||
],
|
||||
"*.{json,css,md}": [
|
||||
"remark .",
|
||||
"prettier --write",
|
||||
"git add"
|
||||
]
|
||||
}
|
||||
}
|
||||
36
pkgs/by-name/po/postlight-parser/package.nix
Normal file
36
pkgs/by-name/po/postlight-parser/package.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkYarnPackage
|
||||
, fetchFromGitHub
|
||||
, fetchYarnDeps
|
||||
}:
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "postlight-parser";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postlight";
|
||||
repo = "parser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k6m95FHeJ+iiWSeY++1zds/bo1RtNXbnv2spaY/M+L0=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
||||
doDist = false;
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-Vs8bfkhEbPv33ew//HBeDnpQcyWveByHi1gUsdl2CNI=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/postlight/parser/blob/${src.rev}/CHANGELOG.md";
|
||||
homepage = "https://reader.postlight.com";
|
||||
description = "Extracts the bits that humans care about from any URL you give it";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ viraptor ];
|
||||
mainProgram = "postlight-parser";
|
||||
};
|
||||
}
|
||||
29
pkgs/by-name/re/readability-extractor/package.nix
Normal file
29
pkgs/by-name/re/readability-extractor/package.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "readability-extractor";
|
||||
version = "0.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArchiveBox";
|
||||
repo = "readability-extractor";
|
||||
rev = "be5c3222990d4f0459b21e74802565309bdd1d52";
|
||||
hash = "sha256-KX9mtvwDUIV2XsH6Hgx5/W34AlM4QtZuzxp4QofPcyg=";
|
||||
};
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
npmDepsHash = "sha256-bQHID9c2Ioyectx6t/GjTR/4cCyfwDfpT0aEQZoYCiU=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ArchiveBox/readability-extractor";
|
||||
description = "Javascript wrapper around Mozilla Readability for ArchiveBox to call as a oneshot CLI to extract article text";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ viraptor ];
|
||||
mainProgram = "readability-extractor";
|
||||
};
|
||||
}
|
||||
@ -5,16 +5,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tera-cli";
|
||||
version = "0.2.5";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chevdor";
|
||||
repo = "tera-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W+pcVLxOlikwAGvx0twm23GyCMzdqnHY0YBNtcsSB5I=";
|
||||
hash = "sha256-Fzrlt6p4bVtJvGg8SaMdS/+2wzABtBkj9ERcg3/bwcQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A01mok8KQk1FV8P7E4svdBCW6xqpduHy1XuUcdDFjfc=";
|
||||
cargoHash = "sha256-aPN7rbU/BSgNAoq0g8JrzsXk3pbenrJZxqrm5f4zYn8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command line utility to render templates from json|toml|yaml and ENV, using the tera templating engine";
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "universal-android-debloater";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Universal-Debloater-Alliance";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-8s4/lAekW2glz4lH79UtbziToytT53m5wQGTVMBAqMU=";
|
||||
hash = "sha256-yCtdCg2mEAz4b/ev32x+RbjCtHTu20mOKFgtckXk1Fo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fMW9CmDyJ77PIuJ6QGI8nNZsuAZwkL9xf3xbbX13HKw=";
|
||||
cargoHash = "sha256-70dX5fqORdGG2q3YeXJHABCHy0dvtA/Cptk8aLGNgV4=";
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20240101162810";
|
||||
version = "20240105034708";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-aL5QH+bvQt3l40GuM0lbvamjl1I7MpkSNceiaccyttg=";
|
||||
hash = "sha256-8taKbZUWttpTY56lzgWJeAPpt0q9srSwRkNqkOsmY2Y=";
|
||||
};
|
||||
vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY=";
|
||||
meta = with lib; {
|
||||
|
||||
@ -58,6 +58,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# stripping breaks static libs, causing this when you attempt to compile a binary:
|
||||
# error adding symbols: Archive has no index; run ranlib to add one
|
||||
dontStrip = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
mkdir download; pushd download
|
||||
|
||||
@ -147,7 +147,7 @@ in {
|
||||
ln -sf $out/nim/bin/nim $out/bin/nim
|
||||
ln -sf $out/nim/lib $out/lib
|
||||
./install.sh $out
|
||||
cp -a tools $out/nim/
|
||||
cp -a tools dist $out/nim/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -210,7 +210,7 @@ def _determine_latest_version(current_version, target, versions):
|
||||
return (max(sorted(versions))).raw_version
|
||||
|
||||
|
||||
def _get_latest_version_pypi(package, extension, current_version, target):
|
||||
def _get_latest_version_pypi(attr_path, package, extension, current_version, target):
|
||||
"""Get latest version and hash from PyPI."""
|
||||
url = "{}/{}/json".format(INDEX, package)
|
||||
json = _fetch_page(url)
|
||||
@ -234,7 +234,7 @@ def _get_latest_version_pypi(package, extension, current_version, target):
|
||||
return version, sha256, None
|
||||
|
||||
|
||||
def _get_latest_version_github(package, extension, current_version, target):
|
||||
def _get_latest_version_github(attr_path, package, extension, current_version, target):
|
||||
def strip_prefix(tag):
|
||||
return re.sub("^[^0-9]*", "", tag)
|
||||
|
||||
@ -242,9 +242,6 @@ def _get_latest_version_github(package, extension, current_version, target):
|
||||
matches = re.findall(r"^([^0-9]*)", string)
|
||||
return next(iter(matches), "")
|
||||
|
||||
# when invoked as an updateScript, UPDATE_NIX_ATTR_PATH will be set
|
||||
# this allows us to work with packages which live outside of python-modules
|
||||
attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"python3Packages.{package}")
|
||||
try:
|
||||
homepage = subprocess.check_output(
|
||||
[
|
||||
@ -421,13 +418,17 @@ def _update_package(path, target):
|
||||
# Attempt a fetch using each pname, e.g. backports-zoneinfo vs backports.zoneinfo
|
||||
successful_fetch = False
|
||||
for pname in pnames:
|
||||
if BULK_UPDATE and _skip_bulk_update(f"python3Packages.{pname}"):
|
||||
# when invoked as an updateScript, UPDATE_NIX_ATTR_PATH will be set
|
||||
# this allows us to work with packages which live outside of python-modules
|
||||
attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"python3Packages.{pname}")
|
||||
|
||||
if BULK_UPDATE and _skip_bulk_update(attr_path):
|
||||
raise ValueError(f"Bulk update skipped for {pname}")
|
||||
elif _get_attr_value(f"python3Packages.{pname}.cargoDeps") is not None:
|
||||
elif _get_attr_value(f"{attr_path}.cargoDeps") is not None:
|
||||
raise ValueError(f"Cargo dependencies are unsupported, skipping {pname}")
|
||||
try:
|
||||
new_version, new_sha256, prefix = FETCHERS[fetcher](
|
||||
pname, extension, version, target
|
||||
attr_path, pname, extension, version, target
|
||||
)
|
||||
successful_fetch = True
|
||||
break
|
||||
@ -452,7 +453,7 @@ def _update_package(path, target):
|
||||
sri_hash = _hash_to_sri("sha256", new_sha256)
|
||||
|
||||
# retrieve the old output hash for a more precise match
|
||||
if old_hash := _get_attr_value(f"python3Packages.{pname}.src.outputHash"):
|
||||
if old_hash := _get_attr_value(f"{attr_path}.src.outputHash"):
|
||||
# fetchers can specify a sha256, or a sri hash
|
||||
try:
|
||||
text = _replace_value("hash", sri_hash, text, old_hash)
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastcdr";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-CDR";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rdRn/vRcZuej7buyb1K6f+9A4oLSodNw3pwefjsUXHA=";
|
||||
hash = "sha256-eSf6LNTVsGEBXjTmTBjjWKBqs68pbnVcw1p2bi1Asgg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, doxygen,
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, pkg-config, doxygen,
|
||||
libX11, libXinerama, libXrandr, libGLU, libGL,
|
||||
glib, ilmbase, libxml2, pcre, zlib,
|
||||
glib, libxml2, pcre, zlib,
|
||||
AGL, Accelerate, Carbon, Cocoa, Foundation,
|
||||
boost,
|
||||
jpegSupport ? true, libjpeg,
|
||||
exrSupport ? false, openexr,
|
||||
exrSupport ? false, openexr_3,
|
||||
gifSupport ? true, giflib,
|
||||
pngSupport ? true, libpng,
|
||||
tiffSupport ? true, libtiff,
|
||||
@ -42,9 +42,9 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = lib.optionals (!stdenv.isDarwin) [
|
||||
libX11 libXinerama libXrandr libGLU libGL
|
||||
] ++ [
|
||||
glib ilmbase libxml2 pcre zlib
|
||||
glib libxml2 pcre zlib
|
||||
] ++ lib.optional jpegSupport libjpeg
|
||||
++ lib.optional exrSupport openexr
|
||||
++ lib.optional exrSupport openexr_3
|
||||
++ lib.optional gifSupport giflib
|
||||
++ lib.optional pngSupport libpng
|
||||
++ lib.optional tiffSupport libtiff
|
||||
@ -74,6 +74,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/openscenegraph/OpenSceneGraph/commit/bc2daf9b3239c42d7e51ecd7947d31a92a7dc82b.patch";
|
||||
hash = "sha256-VR8YKOV/YihB5eEGZOGaIfJNrig1EPS/PJmpKsK284c=";
|
||||
})
|
||||
# OpenEXR 3 support: https://github.com/openscenegraph/OpenSceneGraph/issues/1075
|
||||
(fetchurl {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch?id=0f642d8f09b589166f0e0c0fc84df7673990bf3f";
|
||||
hash = "sha256-fdNbkg6Vp7DeDBTe5Zso8qJ5v9uPSXHpQ5XlGkvputk=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON";
|
||||
|
||||
@ -147,7 +147,7 @@ let
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
inherit
|
||||
pname version nativeLibs javaLibs lispLibs systems asds
|
||||
version nativeLibs javaLibs lispLibs systems asds
|
||||
pkg program flags faslExt
|
||||
;
|
||||
|
||||
@ -216,6 +216,7 @@ let
|
||||
dontStrip = true;
|
||||
|
||||
} // (args // {
|
||||
pname = "${args.pkg.pname}-${args.pname}";
|
||||
src = if builtins.length (args.patches or []) > 0
|
||||
then pkgs.applyPatches { inherit (args) src patches; }
|
||||
else args.src;
|
||||
|
||||
@ -232,13 +232,13 @@ let
|
||||
|
||||
prompter = build-asdf-system rec {
|
||||
pname = "prompter";
|
||||
version = "0.1.1";
|
||||
version = "20240108-git";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "atlas-engineer";
|
||||
repo = "prompter";
|
||||
rev = version;
|
||||
sha256 = "sha256-A9gIUBj0oUDFGR5aqHz+tdNR6t03LPMrx0n9qM3ACwE=";
|
||||
rev = "7890ed5d02e70aba01ceb964c6ee4f40776e7dc0";
|
||||
hash = "sha256-rRKtpSKAqfzvnlC3NQ4840RrlbBUpI4V6uX6p5hRJWQ=";
|
||||
};
|
||||
|
||||
lispLibs = [
|
||||
@ -362,7 +362,7 @@ let
|
||||
|
||||
nyxt-gtk = build-asdf-system {
|
||||
pname = "nyxt";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
|
||||
lispLibs = (with super; [
|
||||
alexandria
|
||||
@ -470,8 +470,8 @@ let
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "atlas-engineer";
|
||||
repo = "nyxt";
|
||||
rev = "3.10.0";
|
||||
sha256 = "sha256-yEa5Lx1egkg9Jh3EQfvaBQicm31uxIq/3s2NOQUC4uc=";
|
||||
rev = "3.11.0";
|
||||
hash = "sha256-Nw2r3FdqwxHlq8CrZo7Z423xe0rR5zu+U4dDPdG880M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, aiohttp
|
||||
, aiohttp-socks
|
||||
, aioredis
|
||||
, aiofiles
|
||||
, aresponses
|
||||
, babel
|
||||
, certifi
|
||||
@ -13,12 +14,16 @@
|
||||
, pytest-asyncio
|
||||
, pytest-lazy-fixture
|
||||
, redis
|
||||
, hatchling
|
||||
, pydantic
|
||||
, pytz
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiogram";
|
||||
version = "3.2.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -29,18 +34,17 @@ buildPythonPackage rec {
|
||||
hash = "sha256-8SYrg+gfNSTR0CTPf4cYDa4bfA0LPBmZtPcATF22fqw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "aiohttp>=3.8.0,<3.9.0" "aiohttp" \
|
||||
--replace "Babel>=2.9.1,<2.10.0" "Babel" \
|
||||
--replace "magic-filter>=1.0.9" "magic-filter"
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiofiles
|
||||
aiohttp
|
||||
babel
|
||||
certifi
|
||||
magic-filter
|
||||
pydantic
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -50,17 +54,20 @@ buildPythonPackage rec {
|
||||
pytest-asyncio
|
||||
pytest-lazy-fixture
|
||||
pytestCheckHook
|
||||
pytz
|
||||
redis
|
||||
];
|
||||
|
||||
# requires network
|
||||
# import failures
|
||||
disabledTests = [
|
||||
"test_download_file_404"
|
||||
"test_download_404"
|
||||
"test_aiohtt_server"
|
||||
"test_deep_linking"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aiogram" ];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern and fully asynchronous framework for Telegram Bot API";
|
||||
homepage = "https://github.com/aiogram/aiogram";
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-lambda-builders";
|
||||
version = "1.44.0";
|
||||
version = "1.45.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "awslabs";
|
||||
repo = "aws-lambda-builders";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-97NhNlYaxBwUdBmg6qzpGdtGyE86rO/PXl9pDfyitbI=";
|
||||
hash = "sha256-TmU7neEnHaRuGNzK9VuXUiEayBLZaPqjrnPLvBOQj5g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
, requests
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, tqdm
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
@ -36,6 +37,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
logfury
|
||||
requests
|
||||
tqdm
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ lib.optionals (pythonOlder "3.12") [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, setuptools-scm
|
||||
, fastprogress
|
||||
@ -14,16 +15,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blackjax";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blackjax-devs";
|
||||
repo = pname;
|
||||
repo = "blackjax";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hqOKSHyZ/BmOu6MJLeecD3H1BbLbZqywmlBzn3xjQRk=";
|
||||
hash = "sha256-VAsCDI0rEqx0UJlD82wbZ8KuMi6LOjUlO6YzqnOfAGk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
@ -37,7 +38,10 @@ buildPythonPackage rec {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
];
|
||||
disabledTestPaths = [ "tests/test_benchmarks.py" ];
|
||||
disabledTests = [
|
||||
# too slow
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai-grpc";
|
||||
version = "9.11.5";
|
||||
version = "10.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "Clarifai";
|
||||
repo = "clarifai-python-grpc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-jH5B3iakMj7tyKWREicrqmBvekjocRbYuvuUjudB8vg=";
|
||||
hash = "sha256-FpBrVoKwuKLanF0SYJLO1cd8qhI1xgBVa1wVpojG8p8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cstruct";
|
||||
version = "5.2";
|
||||
version = "5.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreax79";
|
||||
repo = "python-cstruct";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Dwogf0mmxFyBV7tPsuKV6gMZLPSCm7YhzqgJNHpaPFA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VDJ0k3cOuHjckujf9yD1GVE+UM/Y9rjqhiq+MqGq2eM=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, autoreconfHook
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, cython_3
|
||||
, pariSupport ? true, pari # for interfacing with the PARI/GP signal handler
|
||||
}:
|
||||
|
||||
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cython
|
||||
cython_3
|
||||
] ++ lib.optionals pariSupport [
|
||||
# When cysignals is built with pari, including cysignals into the
|
||||
# buildInputs of another python package will cause cython to link against
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-modelcluster";
|
||||
version = "6.1";
|
||||
version = "6.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "wagtail";
|
||||
repo = "django-modelcluster";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fNGD2aU668VQ8YHcaFjtjiW/gYJgSx7arDAyUKpFYRE=";
|
||||
hash = "sha256-y2jGSZvTeSnpWDFJ+aNGofTEtMMlY9TrXZjQeET5OhY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "epion";
|
||||
version = "0.0.1";
|
||||
version = "0.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,9 +18,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "devenzo-com";
|
||||
repo = "epion_python";
|
||||
# https://github.com/devenzo-com/epion_python/issues/1
|
||||
rev = "d8759951fc7bfd1507abe725b2bc98754cbbf505";
|
||||
hash = "sha256-uC227rlu4NB5lpca02QLi2JZ5SKklLfv7rXvvJA1aCA=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XyYjbr0EPRrwWsXhZT2oWcoDPZoZCuT9aZ2UHSSt0E8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "f5-icontrol-rest";
|
||||
version = "1.3.15";
|
||||
version = "1.3.16";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F5Networks";
|
||||
repo = "f5-icontrol-rest-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ScudlJTQfa0BsEVI+mIndYWF8OcARdxwFwTAOEJxA8w=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-asAFIRoc2zll8a8gMMt4ZRQILhMAes8wf3PGwG5wF9c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, mock
|
||||
, flit-core
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, sqlalchemy
|
||||
}:
|
||||
@ -43,6 +44,11 @@ buildPythonPackage rec {
|
||||
"test_persist_selectable"
|
||||
];
|
||||
|
||||
pytestFlagsArray = lib.optionals (pythonAtLeast "3.12") [
|
||||
# datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version.
|
||||
"-W" "ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flask_sqlalchemy"
|
||||
];
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
, protobuf
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
@ -28,9 +29,14 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"google-auth"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-auth
|
||||
google-cloud-core
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
{ lib
|
||||
, aiofiles
|
||||
, aiohttp
|
||||
, anyio
|
||||
, backoff
|
||||
, botocore
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, graphql-core
|
||||
, httpx
|
||||
, mock
|
||||
, parse
|
||||
, pytest-asyncio
|
||||
@ -14,6 +16,7 @@
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-toolbelt
|
||||
, setuptools
|
||||
, urllib3
|
||||
, vcrpy
|
||||
, websockets
|
||||
@ -22,25 +25,26 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gql";
|
||||
version = "3.4.1";
|
||||
format = "setuptools";
|
||||
version = "3.6.0b0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphql-python";
|
||||
repo = pname;
|
||||
repo = "gql";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/uPaRju2AJCjMCfA29IKQ4Hu71RBu/Yz8jHwk9EE1Eg=";
|
||||
hash = "sha256-yX6NbtGxBa3lL/bS3j2ouTPku6a4obqNGx1xRzx+Skk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace \
|
||||
"websockets>=10,<11;python_version>'3.6'" \
|
||||
"websockets>=10,<12;python_version>'3.6'"
|
||||
'';
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
anyio
|
||||
backoff
|
||||
graphql-core
|
||||
yarl
|
||||
@ -60,6 +64,7 @@ buildPythonPackage rec {
|
||||
all = [
|
||||
aiohttp
|
||||
botocore
|
||||
httpx
|
||||
requests
|
||||
requests-toolbelt
|
||||
urllib3
|
||||
@ -68,6 +73,9 @@ buildPythonPackage rec {
|
||||
aiohttp = [
|
||||
aiohttp
|
||||
];
|
||||
httpx = [
|
||||
httpx
|
||||
];
|
||||
requests = [
|
||||
requests
|
||||
requests-toolbelt
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, absl-py
|
||||
, cvxpy
|
||||
@ -16,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jaxopt";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -25,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "google";
|
||||
repo = "jaxopt";
|
||||
rev = "refs/tags/jaxopt-v${version}";
|
||||
hash = "sha256-uVOd3knoku5fKBNXOhCikGtjDuW3TtRqev94OM/8Pgk=";
|
||||
hash = "sha256-T/BHSnuk3IRuLkBj3Hvb/tFIb7Au25jjQtvwL28OU1U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -38,6 +39,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
cvxpy
|
||||
optax
|
||||
@ -52,11 +54,6 @@ buildPythonPackage rec {
|
||||
"jaxopt.tree_util"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Stack frame issue
|
||||
"test_bisect"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://jaxopt.github.io";
|
||||
description = "Hardware accelerated, batchable and differentiable optimizers in JAX";
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libsass";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "libsass-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5O4Er3jNUFy83m/K0HzYR+fHcSDqF/3M+fXaFZY8zEg=";
|
||||
hash = "sha256-CiSr9/3EDwpDEzu6VcMBAlm3CtKTmGYbZMnMEjyZVxI=";
|
||||
};
|
||||
|
||||
buildInputs = [ libsass ];
|
||||
|
||||
@ -20,6 +20,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-MSYIZ/bzngRu6mG3EGblUotSCA+6bi+l3EymFA8NRZA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace magic_filter/__init__.py \
|
||||
--replace '"1"' '"${version}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pytestCheckHook
|
||||
@ -22,6 +23,11 @@ buildPythonPackage rec {
|
||||
sed -i '/^addopts/d' setup.cfg
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [
|
||||
# error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *'
|
||||
"-Wno-error=int-conversion"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "multidict" ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycollada";
|
||||
version = "0.7.2";
|
||||
version = "0.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "70a2630ed499bdab718c0e61a3e6ae3698130d7e4654e89cdecde51bfdaea56f";
|
||||
sha256 = "sha256-86N1nMTOwdWekyqtdDmdvPVB0YhiqtkDx3AEDaQq8g4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy python-dateutil ];
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygitguardian";
|
||||
version = "1.11.0";
|
||||
format = "pyproject";
|
||||
version = "1.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "GitGuardian";
|
||||
repo = "py-gitguardian";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Vr0+y3Zi7DsXzm2COOlMqUVjlZMRJkaVxT8QpSePhuA=";
|
||||
hash = "sha256-ybl6QOLb1xE6v0D1C2wKMsSU+r2gWzj24Q4pPIMBsCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -49,6 +49,7 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTests = [
|
||||
# Tests require an API key
|
||||
"test_bogus_rate_limit"
|
||||
"test_compute_sca_files"
|
||||
"test_content_scan_exceptions"
|
||||
"test_content_scan"
|
||||
@ -60,6 +61,7 @@ buildPythonPackage rec {
|
||||
"test_multi_content_scan"
|
||||
"test_multiscan_parameters"
|
||||
"test_quota_overview"
|
||||
"test_rate_limit"
|
||||
"test_sca_client_scan_diff"
|
||||
"test_sca_scan_directory_invalid_tar"
|
||||
"test_sca_scan_directory"
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, setuptools
|
||||
, mypy
|
||||
, pytestCheckHook
|
||||
@ -24,15 +23,6 @@ buildPythonPackage rec {
|
||||
hash = "sha256-oEWUXkE8U7/ye6puJZRSkQFi10BPGuc8XZQbHwqOPEI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/python-lsp/pylsp-mypy/pull/64
|
||||
(fetchpatch {
|
||||
name = "fix-hanging-test.patch";
|
||||
url = "https://github.com/python-lsp/pylsp-mypy/commit/90d28edb474135007804f1e041f88713a95736f9.patch";
|
||||
hash = "sha256-3DVyUXVImRemXCuyoXlYbPJm6p8OnhBdEKmwjx88ets=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
@ -40,7 +30,6 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
mypy
|
||||
python-lsp-server
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
];
|
||||
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetbox";
|
||||
version = "7.3.0";
|
||||
version = "7.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/ptLsV+3EYDBjM+D1VO75VqvCYe6PTlpKAJuQskazJc=";
|
||||
hash = "sha256-QIvh24ZqnF8uF9HOuY0yt3QT/jHgJ2C916d+rBqezWQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysol-cards";
|
||||
version = "0.14.3";
|
||||
version = "0.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "pysol_cards";
|
||||
hash = "sha256-sPv9OGFb/G/XVdq1hQWprhYtDaGGbCXKkUGTi1gj8GE=";
|
||||
hash = "sha256-C4fKez+ZFVzM08/XOfc593RNb4GYIixtSToDSj1FcMM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six random2 ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytado";
|
||||
version = "0.17.2";
|
||||
version = "0.17.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "wmalgadey";
|
||||
repo = "PyTado";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4=";
|
||||
sha256 = "sha256-whpNYiAb2cqKI4m0HJN2lPt51FLuEzrkrRTSWs6uznU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-check";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pytest_check";
|
||||
inherit version;
|
||||
hash = "sha256-bfAyZLa7zyXNhhUSDNoDtObRH9srfI3eapyP7xinSVw=";
|
||||
hash = "sha256-0uaWYDFB9bLekFuTWD5FmE7DxhzscCZJ3rEL2XSFYLs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,6 +2,8 @@
|
||||
, asyncssh
|
||||
, buildPythonPackage
|
||||
, dulwich
|
||||
, dvc-http
|
||||
, dvc-objects
|
||||
, fetchFromGitHub
|
||||
, fsspec
|
||||
, funcy
|
||||
@ -37,6 +39,8 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
asyncssh
|
||||
dulwich
|
||||
dvc-http
|
||||
dvc-objects
|
||||
fsspec
|
||||
funcy
|
||||
gitpython
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "screenlogicpy";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "dieselrabbit";
|
||||
repo = "screenlogicpy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pilPmHE5amCQ/mGTy3hJqtSEElx7SevQpeMJZKYv7BA=";
|
||||
hash = "sha256-z6cM0sihZvOHCA3v1DYQEev0axf4AcqEW13WA1EMhQM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sexpdata";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-b2XxFSkYkMvOXNJpwTvfH4KkzSO8YbbhUKJ1Ee5qfV4=";
|
||||
hash = "sha256-krZ7A2H2dm+PnkS5UZzz+8+vp1Xbhbv4k8Phz03awQk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slackclient";
|
||||
version = "3.26.1";
|
||||
version = "3.26.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jg4mUVT1sB9hxRqhLOeZxQHTpBK/N76b2XUaFe/nBKY=";
|
||||
hash = "sha256-pvD86kbNOnuNT6+WTAKziJDUTx3ebJUq029UbSVuxdw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-bibtex";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BGtJ8HCuUnavNMG43bm8lWLvbeL3pS03qRy45T9UuGM=";
|
||||
hash = "sha256-9IevaUM28ov7fWoXBwlTp9JkvsQwAKI3lyQnT1+NcK4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,12 +16,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "steamship";
|
||||
version = "2.17.32";
|
||||
version = "2.17.33";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dTpz2/XXu8patDnorg/36652j9VLUjE5uF2fVzbDjfI=";
|
||||
hash = "sha256-hvvXg+V/VKTWWdqXM7Q1K5awemkGhSz64gV7HeRBXfg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sumo";
|
||||
version = "2.3.7";
|
||||
version = "2.3.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "SMTG-UCL";
|
||||
repo = "sumo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9NHz8SPymD9zANWMeajjavpjw68X4abqhrLl0dn92l0=";
|
||||
hash = "sha256-nQ5US7maFcOJCqFYeokGiBFp3jhiOPSfCBeclLdHdkk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -144,6 +144,8 @@ buildPythonPackage rec {
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py
|
||||
echo 'ProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py
|
||||
echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_processEnded.skip = "exit code 120"' >> src/twisted/internet/test/test_process.py
|
||||
echo 'ProcessTestsBuilder_SelectReactorTests.test_processEnded.skip = "exit code 120"' >> src/twisted/internet/test/test_process.py
|
||||
'';
|
||||
|
||||
# Generate Twisted's plug-in cache. Twisted users must do it as well. See
|
||||
|
||||
@ -1,18 +1,23 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-setuptools";
|
||||
version = "69.0.0.0";
|
||||
format = "setuptools";
|
||||
version = "68.2.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sKBiGfYoxlJ7L4zncKT0dVDgDT6MOtg+LcMbxubtqV0=";
|
||||
hash = "sha256-Ce/DgK1cf3jjC8oVRvcGRpVozyYITPq3Ps+D3qHShEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zamg";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "killer0071234";
|
||||
repo = "python-zamg";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hgJtM208xsDh9RbxOFu5DOiKonLMj8aWyu9+EhpE6TA=";
|
||||
hash = "sha256-MomqMgL3axMdT/ckx2IG9k0IIDlNq0bod0ukjIvkM7Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,29 +1,46 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, isPy3k
|
||||
, pytest, requests }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zm-py";
|
||||
version = "0.5.2";
|
||||
format = "setuptools";
|
||||
version = "0.5.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b391cca0e52f2a887aa7a46c314b73335b7e3341c428b425fcf314983e5ebb36";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rohankapoorcom";
|
||||
repo = "zm-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-n9FRX2Pnn96H0HVT4SHLJgONc0XzQ005itMNpvl9IYg=";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
PYTHONPATH="./zoneminder:$PYTHONPATH" pytest
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"zoneminder"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A loose python wrapper around the ZoneMinder REST API";
|
||||
homepage = "https://github.com/rohankapoorcom/zm-py";
|
||||
changelog = "https://github.com/rohankapoorcom/zm-py/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "1.62.0";
|
||||
version = "1.63.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QUI54nFlZJnZ2zfhSnFV5nGoXFiVm9jEnWP7B9HwjNI=";
|
||||
hash = "sha256-S2SP/Q4iVVrsvTo5pedOwkOXsPGwstz+NM0bltWBa1Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GOgjHrYSFpzkGUorr4w3YShOHWCczp0Qzjq/qw89i4k=";
|
||||
vendorHash = "sha256-vr/HLcOdzkKGdKJXROaKo070mwg1r2D2m0C3sT2CeQc=";
|
||||
|
||||
subPackages = [ "cmd/api-linter" ];
|
||||
|
||||
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
"-w"
|
||||
];
|
||||
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.62.0/.github/workflows/release.yaml#L76
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.63.1/.github/workflows/release.yaml#L76
|
||||
preBuild = ''
|
||||
cat > cmd/api-linter/version.go <<EOF
|
||||
package main
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "firebase-tools";
|
||||
version = "13.0.2";
|
||||
version = "13.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firebase";
|
||||
repo = "firebase-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vR4WvnZjxdbebXWdVbM8vQTCo7pgRMcu9A2KygHZCMk=";
|
||||
hash = "sha256-kq7ZrTh6cbrVCEW2/APtcdLqn9hCKXIxZmGgvgpfG4U=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-h99Zj+yJJvLKc/B6AbKKQTOdrZCIT3BVlkxrOtOyNA4=";
|
||||
npmDepsHash = "sha256-VR+fpykY38JekzcBCK99qmiM3veuZ85BtGGTNf7TW5o=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
|
||||
@ -21,12 +21,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glamoroustoolkit";
|
||||
version = "1.0.10";
|
||||
version = "1.0.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-TvT1u9eVHEg/NomTVlY8gFAYxj76ZLRLm3kbtXUTyc8=";
|
||||
hash = "sha256-GQeYR232zoHLIt1AzznD7rp6u4zMiAdj1+0OfXfT6AQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-java-format";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
|
||||
sha256 = "sha256-ffNOUfh4Kb8mfc0Dwl/lSUMChDLYW/ETi9Csx1mIteM=";
|
||||
sha256 = "sha256-2Ji19wxVr9z3wEMeSX1opIRyw4Ty0E/m8JeN/+Ysvio=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ktlint";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
|
||||
sha256 = "sha256-ZyMaiirHJOLvQRq+lQQ+tz+LnugD21WaM4IeU2HgGK8=";
|
||||
sha256 = "sha256:01cl4jaa2bq52wii1wkzsy6sw546xh8wa8kyhvnfwp34m9d32r4w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opengrok";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
# binary distribution
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-qlZPoJrsH5ZHOXI0+eLiO/9rjZFXVLiF1dahTNbzfUI=";
|
||||
hash = "sha256-3/BBLPoYX1/ft3MGiJD9OPtkB2PJM7bXkGRuXxTToXI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.23.2";
|
||||
version = "2.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-CR3ay54Z/h/mYomWtoOqV0Ynq+iygLR5Zd31gaEQ098=";
|
||||
hash = "sha256-DnhUqnz+0VfZk5KCbVrQcQpsAI2ojVFMHw83UN2DzwQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HodvOSuzp57ijaShCJ+fnX5qk4o5LzMLOfPnpDlc2FU=";
|
||||
vendorHash = "sha256-vSvHjQZFLzUIC9u+myI6Xi4YhetVkiQxBIkm5/RoV2U=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable some tests that need file system & network access.
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sqldef";
|
||||
version = "0.16.14";
|
||||
version = "0.16.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0kubun";
|
||||
repo = "sqldef";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AuUGv3spAxPi3EwgWlxAfgksh6W/rTCnsGr3Fch5YTs=";
|
||||
hash = "sha256-srwCSALP+xtccMnIOpsErn4hk83grXyOMEA2Hwsvjv0=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{ fetchFromGitLab
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, libao
|
||||
, libmodplug
|
||||
, libsamplerate
|
||||
@ -7,29 +10,31 @@
|
||||
, ncurses
|
||||
, which
|
||||
, pkg-config
|
||||
, lib, stdenv }:
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.53";
|
||||
pname = "frotz";
|
||||
version = "2.54";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "DavidGriffith";
|
||||
repo = "frotz";
|
||||
rev = version;
|
||||
sha256 = "sha256-xVC/iE71W/Wdy5aPGH9DtcVAHWCcg3HkEA3iDV6OYUo=";
|
||||
hash = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/macports/macports-ports/raw/496e5b91e3b6c9dc6820d77ab60dbe400d1924ee/games/frotz/files/Makefile.patch";
|
||||
extraPrefix = "";
|
||||
hash = "sha256-P83ZzSi3bhncQ52Y38Q3F/7v1SJKr5614tytt862HRg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ which pkg-config ];
|
||||
buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ];
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(
|
||||
CC="cc"
|
||||
CFLAGS="-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600"
|
||||
LDFLAGS="-lncursesw -ltinfo"
|
||||
)
|
||||
'';
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
callPackage ./generic.nix rec {
|
||||
pname = "experienced-pixel-dungeon";
|
||||
version = "2.16";
|
||||
version = "2.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TrashboxBobylev";
|
||||
repo = "Experienced-Pixel-Dungeon-Redone";
|
||||
rev = "ExpPD-${version}";
|
||||
hash = "sha256-EfSByMceefUcnNmLSTnFNJs/iz1Q45X0BHHfj89d7PI=";
|
||||
hash = "sha256-fTHAA3pCXAA9W32eeY29eaLnfcG5pLop/awQG5zKMt4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
, perl
|
||||
, zlib
|
||||
, expat
|
||||
, libffi
|
||||
, libffi_3_3
|
||||
, libselinux
|
||||
, libdrm
|
||||
, udev
|
||||
@ -119,7 +119,7 @@ in stdenv.mkDerivation rec {
|
||||
libxshmfence
|
||||
elfutils
|
||||
expat
|
||||
libffi
|
||||
libffi_3_3
|
||||
libselinux
|
||||
# libudev is not listed in any dependencies, but is loaded dynamically
|
||||
udev
|
||||
|
||||
@ -4,9 +4,9 @@ let
|
||||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.6.10"; #zen
|
||||
version = "6.7"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1hhy5jp1s65vpvrw9xylx3xl7mmagzmm5r9bq81hvvr7bhf754ny"; #zen
|
||||
sha256 = "005m4qjhbvn4jmm37sad9bmrrk2qfkxlaq3s7k296hjfkrqnbvlw"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvme-cli";
|
||||
version = "2.7";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-nvme";
|
||||
repo = "nvme-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qijzXucNE+M8fOEtNaoQYX41HeJOMtg/cJFCUJyS6Ew=";
|
||||
hash = "sha256-Gm+1tb/Nh+Yg2PgSUn/1hR4CZYnfTWRwcQU0A8UeQwI=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-fAf4kOe/6bQW0i46+EZbD/6iWI2Bjkn2no6XeR/+mg4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# drop this patch for version 8.0.2
|
||||
./fix-build-w-libxml2-12.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
diff --git a/mapows.c b/mapows.c
|
||||
index f141a7b..5a94ecb 100644
|
||||
--- a/mapows.c
|
||||
+++ b/mapows.c
|
||||
@@ -168,7 +168,7 @@ static int msOWSPreParseRequest(cgiRequestObj *request,
|
||||
#endif
|
||||
if (ows_request->document == NULL
|
||||
|| (root = xmlDocGetRootElement(ows_request->document)) == NULL) {
|
||||
- xmlErrorPtr error = xmlGetLastError();
|
||||
+ const xmlError *error = xmlGetLastError();
|
||||
msSetError(MS_OWSERR, "XML parsing error: %s",
|
||||
"msOWSPreParseRequest()", error->message);
|
||||
return MS_FAILURE;
|
||||
diff --git a/mapwcs.cpp b/mapwcs.cpp
|
||||
index 70e63b8..19afa79 100644
|
||||
--- a/mapwcs.cpp
|
||||
+++ b/mapwcs.cpp
|
||||
@@ -362,7 +362,7 @@ static int msWCSParseRequest(cgiRequestObj *request, wcsParamsObj *params, mapOb
|
||||
/* parse to DOM-Structure and get root element */
|
||||
if((doc = xmlParseMemory(request->postrequest, strlen(request->postrequest)))
|
||||
== NULL) {
|
||||
- xmlErrorPtr error = xmlGetLastError();
|
||||
+ const xmlError *error = xmlGetLastError();
|
||||
msSetError(MS_WCSERR, "XML parsing error: %s",
|
||||
"msWCSParseRequest()", error->message);
|
||||
return MS_FAILURE;
|
||||
diff --git a/mapwcs20.cpp b/mapwcs20.cpp
|
||||
index b35e803..2431bdc 100644
|
||||
--- a/mapwcs20.cpp
|
||||
+++ b/mapwcs20.cpp
|
||||
@@ -1446,7 +1446,7 @@ int msWCSParseRequest20(mapObj *map,
|
||||
|
||||
/* parse to DOM-Structure and get root element */
|
||||
if(doc == NULL) {
|
||||
- xmlErrorPtr error = xmlGetLastError();
|
||||
+ const xmlError *error = xmlGetLastError();
|
||||
msSetError(MS_WCSERR, "XML parsing error: %s",
|
||||
"msWCSParseRequest20()", error->message);
|
||||
return MS_FAILURE;
|
||||
@ -39,6 +39,7 @@ buildHomeAssistantComponent {
|
||||
# changelog, description, homepage, license, maintainers
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Package attribute
|
||||
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-agent";
|
||||
version = "0.38.1";
|
||||
version = "0.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-caqJE92yEzqU/UQS7Cgxe+4+wGqBqPshhhPAyPP2WPQ=";
|
||||
hash = "sha256-mUPWww7RnrCwJKGWXIsX7vnTmxj2h31AzM8a0eKa15g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aN/vIBbezieMhWG/czwXxx+/M40mDySZmM8pxVVs3Vs=";
|
||||
vendorHash = "sha256-nOuinJXTiTumHlOWcuGTBcrw9ArIdb/R8jIT/5+i0vM=";
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
||||
frontendYarnOfflineCache = fetchYarnDeps {
|
||||
|
||||
@ -47,14 +47,14 @@ let
|
||||
]);
|
||||
path = lib.makeBinPath [ coreutils par2cmdline unrar unzip p7zip util-linux ];
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
pname = "sabnzbd";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ub8CwFcmxfsfhR45M5lVZvCHyzN/7CK4ElS4Q0U4qu8=";
|
||||
sha256 = "sha256-M9DvwizNeCXkV07dkgiComdjoceUACCuccZb+y9RMdw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plocate";
|
||||
version = "1.1.20";
|
||||
version = "1.1.21";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sesse.net/plocate";
|
||||
rev = version;
|
||||
sha256 = "sha256-Nc39wPVW+GpmT8X8q/VbrPhPxO/PgFBPTOCWAkkUfDY=";
|
||||
sha256 = "sha256-ucCRm1w3ON3Qh7qt1Pf5/3kvXVGP+dJwjSuwYGcDMcs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goflow2";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netsampler";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c+1Y3OTM2FR9o7zWYGW3uH1LQ2U1occf1++Rnf/atVQ=";
|
||||
hash = "sha256-RgHCUuP2EE38X6iMaYD2a8f/C2fBcBEHM5ErlKBkMqI=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "redli";
|
||||
version = "0.9.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IBM-Cloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AeIGlRsUWK6q0GJJFmvJwpuGy312VPsMhkxMqDDzay4=";
|
||||
hash = "sha256-Tux4GsYG3DlJoV10Ahb+X+8mpkchLchbh+PCgRD0kUA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
let
|
||||
pname = "requestly";
|
||||
version = "1.5.15";
|
||||
version = "1.5.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/requestly/requestly-desktop-app/releases/download/v${version}/Requestly-${version}.AppImage";
|
||||
hash = "sha256-GTc4VikXsyiEfgN6oY/YQPBqNLia4cFz1aYS65+SboI=";
|
||||
hash = "sha256-c+Ti7j+3r0hSw2uvaDkavykUQQdvg0OgD1XdDTQbJuA=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@ -5,17 +5,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "9.13.0";
|
||||
version = "9.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hGiMdL+SXJ5psrmfM5pvKD01yaD1q3tOOhfGzbcjvuE=";
|
||||
hash = "sha256-9MIIxWfETi2DX1DYPALL+JoC4r3yKJpeSFIx+hrGKiM=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-pRFRPUL/Ck4m7JH5ykei3PSXbCFKRii8YyjBLQ5kb9M=";
|
||||
vendorHash = "sha256-Yii2sDfYqIzQAUaMotT87Wa5g3skxWllq6yGlkPDbLg=";
|
||||
|
||||
subPackages = [
|
||||
"apps/cnspec"
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ggshield";
|
||||
version = "1.22.0";
|
||||
format = "pyproject";
|
||||
version = "1.23.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GitGuardian";
|
||||
repo = "ggshield";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AxFztqD43KqX0r8tZz4ltjUh2x42kdPqi+b/OunpPF4=";
|
||||
hash = "sha256-c2EXgUs+6GA5zHHF7Cx21LIsZ+jbmQFFUwLft2q5M30=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@ -11,13 +11,13 @@ assert systemdSupport -> stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "htop";
|
||||
version = "3.2.2";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "htop-dev";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-OrlNE1A71q4XAauYNfumV1Ev1wBpFIBxPiw7aF++yjM=";
|
||||
hash = "sha256-qDhQkzY2zj2yxbgFUXwE0MGEgAFOsAhnapUuetO9WTw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ]
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user