mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge master into staging-next
This commit is contained in:
commit
b179570bca
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xplr";
|
||||
|
@ -11,19 +11,23 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-lqFhLCOLiuSQWhbcZUEj2xFRlZ+x1ZTVc8IJw7tJjhE=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
cargoHash = "sha256-3hrpg2cMvIuFy6mH1/1igIpU4nbzFQLCAhiIRZbTuaI=";
|
||||
|
||||
checkFlags = [
|
||||
# failure: path::tests::test_relative_to_parent
|
||||
"--skip=path::tests::test_relative_to_parent"
|
||||
];
|
||||
# fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin
|
||||
env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) {
|
||||
TARGET_STRIP = "${stdenv.cc.targetPrefix}strip";
|
||||
};
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
rm .cargo/config
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hackable, minimal, fast TUI file explorer";
|
||||
homepage = "https://xplr.dev";
|
||||
changelog = "https://github.com/sayanarijit/xplr/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame ];
|
||||
maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
2
pkgs/applications/graphics/oculante/Cargo.lock
generated
2
pkgs/applications/graphics/oculante/Cargo.lock
generated
|
@ -3219,7 +3219,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "oculante"
|
||||
version = "0.7.2"
|
||||
version = "0.7.3"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arboard",
|
||||
|
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oculante";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woelper";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-OJKmnH1uJvVnHiuieveDaR+lybpWHC3MZvis0iAKiZU=";
|
||||
hash = "sha256-Q4YEBEA+Kt09Se9b03EZ6phm+6Q3fAxXCZRXQeqPA2k=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
67
pkgs/applications/misc/tomato-c/default.nix
Normal file
67
pkgs/applications/misc/tomato-c/default.nix
Normal file
|
@ -0,0 +1,67 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libnotify
|
||||
, makeWrapper
|
||||
, mpv
|
||||
, ncurses
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tomato-c";
|
||||
version = "unstable-2023-08-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrielzschmitz";
|
||||
repo = "Tomato.C";
|
||||
rev = "6e43e85aa15f3d96811311a3950eba8ce9715634";
|
||||
hash = "sha256-RpKkQ7xhM2XqfZdXra0ju0cTBL3Al9NMVQ/oleFydDs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "sudo " ""
|
||||
substituteInPlace notify.c \
|
||||
--replace "/usr/local" "${placeholder "out"}"
|
||||
substituteInPlace util.c \
|
||||
--replace "/usr/local" "${placeholder "out"}"
|
||||
substituteInPlace tomato.desktop \
|
||||
--replace "/usr/local" "${placeholder "out"}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libnotify
|
||||
mpv
|
||||
ncurses
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"CPPFLAGS=$NIX_CFLAGS_COMPILE"
|
||||
"LDFLAGS=$NIX_LDFLAGS"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for file in $out/bin/*; do
|
||||
wrapProgram $file \
|
||||
--prefix PATH : ${lib.makeBinPath [ libnotify mpv ]}
|
||||
done
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/gabrielzschmitz/Tomato.C";
|
||||
description = " A pomodoro timer written in pure C";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
mainProgram = "tomato";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
|
@ -7,20 +7,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.9.26";
|
||||
version = "0.9.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
hash = "sha256-difvEmFfwH7+d2qAcNwTcydP0WHDvHkOSXilaWLrHoM=";
|
||||
hash = "sha256-PVnUfDUj2CazmvNZbRuHUIiP6Ta+3x6aeDSowgzAhiU=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-bWiBY3Bo/FpipUHhbsbPNLKxvJF7L0tpuPi0Cb0firU=";
|
||||
vendorHash = "sha256-uByv18e9fLALWoXc8hD4HGv8DFRJejCyzD8tjU5FQn0=";
|
||||
|
||||
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
|
||||
subPackages = [
|
||||
|
|
|
@ -28,13 +28,13 @@
|
|||
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
|
||||
},
|
||||
"aiven": {
|
||||
"hash": "sha256-T9d1iMuFqewDVK4EOsF4uCsqZAsThMHaRa7ilGnYXCo=",
|
||||
"hash": "sha256-Nm5flY+BN9PpQY+4LyohFwDfdEPxfVpT/rkfn8aLQyI=",
|
||||
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
|
||||
"owner": "aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v4.7.0",
|
||||
"rev": "v4.8.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-Fcu4RWgbVyAUr72h8q91HT+LbUh9+4SPDz8Vc4/u5RM="
|
||||
"vendorHash": "sha256-eScN0by/rnCf4+p4g3yhz2kJRyfFyqlVi+0MJXPdzKw="
|
||||
},
|
||||
"akamai": {
|
||||
"hash": "sha256-LGgZF2/YCYpoDOSu0UeuPqK9wGXrvPQE4WUGGS0sx30=",
|
||||
|
@ -182,13 +182,13 @@
|
|||
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
|
||||
},
|
||||
"buildkite": {
|
||||
"hash": "sha256-rcklWodBh5iJjxIjGhEH0l3S9bXUWfBG52V/23o8JDM=",
|
||||
"hash": "sha256-nDJ4XsWvielQYqShBav7g/pZyDcU0jqgemXUqaNJHnA=",
|
||||
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
|
||||
"owner": "buildkite",
|
||||
"repo": "terraform-provider-buildkite",
|
||||
"rev": "v0.24.0",
|
||||
"rev": "v0.25.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-3BtXtXhFyTNQD0J/5hNi0JsPcaIDWUQNEgf6r0VIfMM="
|
||||
"vendorHash": "sha256-C/jT+vcZat8UHXgOhtj+gyl8ttCEb564byp/npI2Ei8="
|
||||
},
|
||||
"checkly": {
|
||||
"hash": "sha256-tOTrAi6hd4HFbHAj0p/LTYdxQl1R1WuQ9L4hzqmDVqI=",
|
||||
|
@ -445,13 +445,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"gitlab": {
|
||||
"hash": "sha256-uKImp0kcsLZL1SOAygd/ssJ7pxclUbAcDcEB3ko9Mio=",
|
||||
"hash": "sha256-91hv73KEer3FyS9FWoQ0gV1VwRKZqAu/6fAughmX5D0=",
|
||||
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
|
||||
"owner": "gitlabhq",
|
||||
"repo": "terraform-provider-gitlab",
|
||||
"rev": "v16.2.0",
|
||||
"rev": "v16.3.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0="
|
||||
"vendorHash": "sha256-G7+3vqxdi4i21o1hYj2GVvoCdcmFN3ue1i4fuepucsw="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-tfjrVWj+l9mNdgZ+unu4NW15OAOzViTVmSTzO/ZiqRE=",
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.9.3";
|
||||
version = "3.9.4";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IP6rVOrhIWrEWqrA0BCthAbCD2pRNnDzvY7bP4ANTCc=";
|
||||
hash = "sha256-cdmW0VSWjr3rm/1T0uDy1iPm3ojR5wrgRixyjIQhodU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -32,7 +32,7 @@ buildDotnetModule (args // {
|
|||
|
||||
useDotnetFromEnv = true;
|
||||
|
||||
dontBuld = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
@ -83,6 +83,7 @@ in
|
|||
shell = stdenv.shell;
|
||||
which = "${which}/bin/which";
|
||||
dirname = "${coreutils}/bin/dirname";
|
||||
realpath = "${coreutils}/bin/realpath";
|
||||
};
|
||||
} ./dotnet-fixup-hook.sh) { };
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ wrapDotnetProgram() {
|
|||
if [ ! "${selfContainedBuild-}" ]; then
|
||||
if [ "${useDotnetFromEnv-}" ]; then
|
||||
# if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
|
||||
dotnetRootFlags+=("--run" 'command -v dotnet &>/dev/null && export DOTNET_ROOT="$(@dirname@ "$(@dirname@ "$(@which@ dotnet)")")" || export DOTNET_ROOT="@dotnetRuntime@"')
|
||||
dotnetRootFlags+=("--run" 'command -v dotnet &>/dev/null && export DOTNET_ROOT="$(@dirname@ "$(@realpath@ "$(@which@ dotnet)")")" || export DOTNET_ROOT="@dotnetRuntime@"')
|
||||
dotnetRootFlags+=("--suffix" "PATH" ":" "@dotnetRuntime@/bin")
|
||||
else
|
||||
dotnetRootFlags+=("--set" "DOTNET_ROOT" "@dotnetRuntime@")
|
||||
|
|
|
@ -132,6 +132,13 @@ let
|
|||
else throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}";
|
||||
in
|
||||
|
||||
assert (lib.isList curlOpts) -> lib.warn ''
|
||||
fetchurl for ${toString (builtins.head urls_)}: curlOpts is a list (${lib.generators.toPretty { multiline = false; } curlOpts}), which is not supported anymore.
|
||||
- If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
|
||||
curlOpts = ${lib.strings.escapeNixString (toString curlOpts)};
|
||||
- If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
|
||||
curlOptsList = [ ${lib.concatMapStringsSep " " lib.strings.escapeNixString curlOpts} ];'' true;
|
||||
|
||||
stdenvNoCC.mkDerivation ((
|
||||
if (pname != "" && version != "") then
|
||||
{ inherit pname version; }
|
||||
|
@ -161,12 +168,7 @@ stdenvNoCC.mkDerivation ((
|
|||
|
||||
outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
|
||||
|
||||
curlOpts = lib.warnIf (lib.isList curlOpts) ''
|
||||
fetchurl for ${toString (builtins.head urls_)}: curlOpts is a list (${lib.generators.toPretty { multiline = false; } curlOpts}), which is not supported anymore.
|
||||
- If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
|
||||
curlOpts = ${lib.strings.escapeNixString (toString curlOpts)};
|
||||
- If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
|
||||
curlOptsList = [ ${lib.concatMapStringsSep " " lib.strings.escapeNixString curlOpts} ];'' curlOpts;
|
||||
inherit curlOpts;
|
||||
curlOptsList = lib.escapeShellArgs curlOptsList;
|
||||
inherit showURLs mirrorsFile postFetch downloadToTemp executable;
|
||||
|
||||
|
|
|
@ -7,41 +7,34 @@
|
|||
|
||||
{ lib, fetchurl, unzip, glibcLocalesUtf8 }:
|
||||
|
||||
{ # Optionally move the contents of the unpacked tree up one level.
|
||||
stripRoot ? true
|
||||
{ name ? "source"
|
||||
, url ? ""
|
||||
, urls ? []
|
||||
, extraPostFetch ? ""
|
||||
, nativeBuildInputs ? []
|
||||
, postFetch ? ""
|
||||
, name ? "source"
|
||||
, pname ? ""
|
||||
, version ? ""
|
||||
, nativeBuildInputs ? [ ]
|
||||
, # Allows to set the extension for the intermediate downloaded
|
||||
# file. This can be used as a hint for the unpackCmdHooks to select
|
||||
# an appropriate unpacking tool.
|
||||
extension ? null
|
||||
, extraPostFetch ? ""
|
||||
|
||||
# Optionally move the contents of the unpacked tree up one level.
|
||||
, stripRoot ? true
|
||||
# Allows to set the extension for the intermediate downloaded
|
||||
# file. This can be used as a hint for the unpackCmdHooks to select
|
||||
# an appropriate unpacking tool.
|
||||
, extension ? null
|
||||
|
||||
# the rest are given to fetchurl as is
|
||||
, ... } @ args:
|
||||
|
||||
assert (extraPostFetch != "") -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub'." true;
|
||||
|
||||
lib.warnIf (extraPostFetch != "") "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub'."
|
||||
|
||||
(let
|
||||
let
|
||||
tmpFilename =
|
||||
if extension != null
|
||||
then "download.${extension}"
|
||||
else baseNameOf (if url != "" then url else builtins.head urls);
|
||||
in
|
||||
|
||||
fetchurl ((
|
||||
if (pname != "" && version != "") then
|
||||
{
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version;
|
||||
}
|
||||
else
|
||||
{ inherit name; }
|
||||
) // {
|
||||
fetchurl ({
|
||||
inherit name;
|
||||
recursiveHash = true;
|
||||
|
||||
downloadToTemp = true;
|
||||
|
@ -61,8 +54,7 @@ fetchurl ((
|
|||
mv "$downloadedFile" "$renamed"
|
||||
unpackFile "$renamed"
|
||||
chmod -R +w "$unpackDir"
|
||||
''
|
||||
+ (if stripRoot then ''
|
||||
'' + (if stripRoot then ''
|
||||
if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then
|
||||
echo "error: zip file must contain a single file or directory."
|
||||
echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
|
||||
|
@ -75,16 +67,11 @@ fetchurl ((
|
|||
mv "$unpackDir/$fn" "$out"
|
||||
'' else ''
|
||||
mv "$unpackDir" "$out"
|
||||
'')
|
||||
+ ''
|
||||
'') + ''
|
||||
${postFetch}
|
||||
'' + ''
|
||||
${extraPostFetch}
|
||||
''
|
||||
|
||||
# Remove non-owner write permissions
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/38649
|
||||
+ ''
|
||||
chmod 755 "$out"
|
||||
'';
|
||||
} // removeAttrs args [ "stripRoot" "extraPostFetch" "postFetch" "extension" "nativeBuildInputs" ]))
|
||||
# ^ Remove non-owner write permissions
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/38649
|
||||
} // removeAttrs args [ "stripRoot" "extraPostFetch" "postFetch" "extension" "nativeBuildInputs" ])
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20230627";
|
||||
version = "20230727";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gRkYoDDD3QCsfZcpIqNAZBAb/si975vyd0NnlWNHob8=";
|
||||
sha256 = "sha256-TRbFwaYRVHgg7dyg/OFPFkZ9nZ747zaNhnnfMljSOOE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook intltool ];
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20230810162343";
|
||||
version = "20230815132423";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-RzYFpbiy0ajOjyu9Fdw+aJX9cLbquXzfWiLPaszyxOY=";
|
||||
hash = "sha256-rz7oxcmIQJ9cM7KbQ+zBcBmggGhhhGFad9k0hGLgVgY=";
|
||||
};
|
||||
vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,17 +1,38 @@
|
|||
{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl, nixosTests }:
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, glib
|
||||
, gtk3
|
||||
, libxfce4ui
|
||||
, vte
|
||||
, xfconf
|
||||
, pcre2
|
||||
, libxslt
|
||||
, docbook_xml_dtd_45
|
||||
, docbook_xsl
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-terminal";
|
||||
version = "1.0.4";
|
||||
version = "1.1.0";
|
||||
|
||||
sha256 = "sha256-eCb6KB9fFPuYzNLUm/yYrh+0D60ISzasnv/myStImEI=";
|
||||
sha256 = "sha256-ilxiP1Org5/uSQOzfRgODmouH0BmK3CmCJj1kutNuII=";
|
||||
|
||||
nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ];
|
||||
nativeBuildInputs = [
|
||||
libxslt
|
||||
docbook_xml_dtd_45
|
||||
docbook_xsl
|
||||
];
|
||||
|
||||
buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4";
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libxfce4ui
|
||||
vte
|
||||
xfconf
|
||||
pcre2
|
||||
];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal;
|
||||
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "assemblyscript";
|
||||
version = "0.27.8";
|
||||
version = "0.27.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AssemblyScript";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EwpIUD9+IjJlWOnUEXgvx60i59ftQyHcPTQVWVoOGNQ=";
|
||||
sha256 = "sha256-UOMWUM1wOhX2pR29DSYpPKLnjb1CWrKk6BtyXK7kqDk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8=";
|
||||
|
|
|
@ -17,16 +17,11 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0)
|
|||
paths = dotnetPackages;
|
||||
pathsToLink = [ "/host" "/packs" "/sdk" "/sdk-manifests" "/shared" "/templates" ];
|
||||
ignoreCollisions = true;
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
postBuild = ''
|
||||
cp -R ${cli}/{dotnet,share,nix-support} $out/
|
||||
|
||||
mkdir $out/bin
|
||||
ln -s $out/dotnet $out/bin/dotnet
|
||||
wrapProgram $out/bin/dotnet \
|
||||
--prefix LD_LIBRARY_PATH : ${cli.icu}/lib
|
||||
'';
|
||||
passthru = {
|
||||
inherit (cli) icu;
|
||||
|
|
|
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
doInstallCheck = !stdenv.hostPlatform.isAarch64; # tests are flaky for aarch64-linux on hydra
|
||||
installCheckTarget = "testall";
|
||||
|
||||
preInstallCheck = ''
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "lcrq";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "librecast";
|
||||
repo = "lcrq";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-s8+uTF6GQ76wG1zoAxqCaVT1J5Rd7vxPKX4zbQx6ro4=";
|
||||
hash = "sha256-GvfmHST53qwVrztnmCzUVbVkgNGtAl5adqdNWOHItiU=";
|
||||
};
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
@ -68,6 +68,9 @@ stdenv.mkDerivation rec {
|
|||
GDK_PIXBUF_MODULE_FILE=${gdkPixbufModuleFile} \
|
||||
gdk-pixbuf-query-loaders --update-cache
|
||||
|
||||
''
|
||||
# Cross-compiled gdk-pixbuf doesn't support thumbnailers
|
||||
+ lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
mkdir -p "$out/bin"
|
||||
makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-avif" \
|
||||
--set GDK_PIXBUF_MODULE_FILE ${gdkPixbufModuleFile}
|
||||
|
|
28
pkgs/development/mobile/cordova/default.nix
Normal file
28
pkgs/development/mobile/cordova/default.nix
Normal file
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "cordova";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "cordova-cli";
|
||||
rev = version;
|
||||
hash = "sha256-fEV7NlRcRpyeRplsdXHI2U4/89DsvKQpVwHD5juiNPo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZMxZiwCgqzOBwDXeTfIEwqFVdM9ysWeE5AbX7rUdwIc=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
description = "Build native mobile applications using HTML, CSS and JavaScript";
|
||||
homepage = "https://github.com/apache/cordova-cli";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "cordova";
|
||||
maintainers = with lib.maintainers; [ flosse ];
|
||||
};
|
||||
}
|
|
@ -49,23 +49,31 @@ mapAliases {
|
|||
balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31
|
||||
bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
|
||||
bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
|
||||
inherit (pkgs) btc-rpc-explorer; # added 2023-08-17
|
||||
inherit (pkgs) carbon-now-cli; # added 2023-08-17
|
||||
inherit (pkgs) carto; # added 2023-08-17
|
||||
castnow = pkgs.castnow; # added 2023-07-30
|
||||
inherit (pkgs) clean-css-cli; # added 2023-08-18
|
||||
inherit (pkgs) configurable-http-proxy; # added 2023-08-19
|
||||
inherit (pkgs) cordova; # added 2023-08-18
|
||||
eask = pkgs.eask; # added 2023-08-17
|
||||
inherit (pkgs.elmPackages) elm-test;
|
||||
eslint_d = pkgs.eslint_d; # Added 2023-05-26
|
||||
inherit (pkgs) firebase-tools; # added 2023-08-18
|
||||
flood = pkgs.flood; # Added 2023-07-25
|
||||
inherit (pkgs) graphqurl; # added 2023-08-19
|
||||
gtop = pkgs.gtop; # added 2023-07-31
|
||||
inherit (pkgs) htmlhint; # added 2023-08-19
|
||||
hueadm = pkgs.hueadm; # added 2023-07-31
|
||||
inherit (pkgs) hyperpotamus; # added 2023-08-19
|
||||
immich = pkgs.immich-cli; # added 2023-08-19
|
||||
indium = throw "indium was removed because it was broken"; # added 2023-08-19
|
||||
ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
|
||||
inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
|
||||
karma = pkgs.karma-runner; # added 2023-07-29
|
||||
manta = pkgs.node-manta; # Added 2023-05-06
|
||||
markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
|
||||
inherit (pkgs) markdownlint-cli2; # added 2023-08-22
|
||||
readability-cli = pkgs.readability-cli; # Added 2023-06-12
|
||||
reveal-md = pkgs.reveal-md; # added 2023-07-31
|
||||
s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
"@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen";
|
||||
"@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt";
|
||||
aws-cdk = "cdk";
|
||||
carbon-now-cli = "carbon-now";
|
||||
cdk8s-cli = "cdk8s";
|
||||
cdktf-cli = "cdktf";
|
||||
clipboard-cli = "clipboard";
|
||||
|
@ -40,7 +39,6 @@
|
|||
dockerfile-language-server-nodejs = "docker-langserver";
|
||||
fast-cli = "fast";
|
||||
fauna-shell = "fauna";
|
||||
firebase-tools = "firebase";
|
||||
fkill-cli = "fkill";
|
||||
fleek-cli = "fleek";
|
||||
git-run = "gr";
|
||||
|
|
|
@ -39,8 +39,6 @@
|
|||
, "bower2nix"
|
||||
, "browserify"
|
||||
, "browser-sync"
|
||||
, "btc-rpc-explorer"
|
||||
, "carbon-now-cli"
|
||||
, "cdk8s-cli"
|
||||
, "cdktf-cli"
|
||||
, "clipboard-cli"
|
||||
|
@ -100,7 +98,6 @@
|
|||
, "coinmon"
|
||||
, "concurrently"
|
||||
, "conventional-changelog-cli"
|
||||
, "cordova"
|
||||
, "cpy-cli"
|
||||
, "create-cycle-app"
|
||||
, "create-react-app"
|
||||
|
@ -127,7 +124,6 @@
|
|||
, "expo-cli"
|
||||
, "fast-cli"
|
||||
, "fauna-shell"
|
||||
, "firebase-tools"
|
||||
, "fixjson"
|
||||
, "fkill-cli"
|
||||
, "fleek-cli"
|
||||
|
@ -148,7 +144,6 @@
|
|||
, "graphql"
|
||||
, "graphql-cli"
|
||||
, "graphql-language-service-cli"
|
||||
, "graphqurl"
|
||||
, "grunt-cli"
|
||||
, "makam"
|
||||
, "meshcommander"
|
||||
|
@ -161,13 +156,11 @@
|
|||
, "hsd"
|
||||
, "hs-airdrop"
|
||||
, "hs-client"
|
||||
, "hyperpotamus"
|
||||
, "ijavascript"
|
||||
, "inliner"
|
||||
, "imapnotify"
|
||||
, "insect"
|
||||
, "intelephense"
|
||||
, "ionic"
|
||||
, "jake"
|
||||
, "joplin"
|
||||
, "js-beautify"
|
||||
|
@ -196,7 +189,6 @@
|
|||
, "lua-fmt"
|
||||
, "lv_font_conv"
|
||||
, "madoko"
|
||||
, "markdownlint-cli2"
|
||||
, "markdown-link-check"
|
||||
, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"}
|
||||
, "mastodon-bot"
|
||||
|
|
3895
pkgs/development/node-packages/node-packages.nix
generated
3895
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -92,17 +92,6 @@ final: prev: {
|
|||
'';
|
||||
};
|
||||
|
||||
carbon-now-cli = prev.carbon-now-cli.override {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||
prePatch = ''
|
||||
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
|
||||
'';
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/carbon-now \
|
||||
--set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium
|
||||
'';
|
||||
};
|
||||
|
||||
coc-imselect = prev.coc-imselect.override (oldAttrs: {
|
||||
meta = oldAttrs.meta // { broken = since "10"; };
|
||||
});
|
||||
|
@ -136,9 +125,6 @@ final: prev: {
|
|||
'';
|
||||
};
|
||||
|
||||
firebase-tools = prev.firebase-tools.override {
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.xcbuild ];
|
||||
};
|
||||
|
||||
git-ssb = prev.git-ssb.override (oldAttrs: {
|
||||
buildInputs = [ final.node-gyp-build ];
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
let
|
||||
pname = "psalm";
|
||||
version = "5.13.1";
|
||||
version = "5.15.0";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
|
||||
sha256 = "sha256-kMNL44Ma0A3RBYxLUGl6kXvOppZ8FKt2ETb2ZaqsOsY=";
|
||||
sha256 = "sha256-eAvogKsnvXMNUZHh44RPHpd0iMqEY9fzqJvXPT7SE1A=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
|
@ -24,6 +25,20 @@ buildPythonPackage rec {
|
|||
hash = "sha256-7NrOoc1gi8YzZaKvCnHnzAKPlMnMhqxjdyZGN5H/8TQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/aioflo/pull/65
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/aioflo/commit/f38d3f6427777ab0eeb56177943679e2570f0634.patch";
|
||||
hash = "sha256-iLgklhEZ61rrdzQoO6rp1HGZcqLsqGNitwIiPNLNHQ4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
@ -32,6 +47,8 @@ buildPythonPackage rec {
|
|||
aiohttp
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-aiohttp
|
||||
|
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, pylsqpack
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioquic-mitmproxy";
|
||||
version = "0.9.20.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meitinger";
|
||||
repo = "aioquic_mitmproxy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VcIbtrcA0dBEE52ZD90IbXoh6L3wDUbr2kFJikts6+w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
cryptography
|
||||
pylsqpack
|
||||
pyopenssl
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aioquic"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "QUIC and HTTP/3 implementation in Python";
|
||||
homepage = "https://github.com/meitinger/aioquic_mitmproxy";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
|
@ -43,6 +42,5 @@ buildPythonPackage rec {
|
|||
changelog = "https://github.com/borisbabic/browser_cookie3/blob/master/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ borisbabic ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, cffi
|
||||
, libiconv
|
||||
|
@ -15,17 +15,20 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cmsis_pack_manager";
|
||||
pname = "cmsis-pack-manager";
|
||||
version = "0.5.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sVfyz9D7/0anIp0bEPp1EJkERDbNJ3dCcydLbty1KsQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyocd";
|
||||
repo = "cmsis-pack-manager";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PeyJf3TGUxv8/MKIQUgWrenrK4Hb+4cvtDA2h3r6kGg=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sha256 = "dO4qw5Jx0exwb4RuOhu6qvGxQZ+LayHtXDHZKADLTEI=";
|
||||
hash = "sha256-dO4qw5Jx0exwb4RuOhu6qvGxQZ+LayHtXDHZKADLTEI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook ];
|
||||
|
@ -35,10 +38,10 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [ appdirs pyyaml ];
|
||||
nativeCheckInputs = [ hypothesis jinja2 pytestCheckHook unzip ];
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
# remove cmsis_pack_manager source directory so that binaries can be imported
|
||||
# from the installed wheel instead
|
||||
preCheck = ''
|
||||
unzip $dist/*.whl cmsis_pack_manager/cmsis_pack_manager/native.so
|
||||
rm -r cmsis_pack_manager
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
|
|
|
@ -3,33 +3,46 @@
|
|||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, pythonRelaxDepsHook
|
||||
, pyasn1
|
||||
, pyasn1-modules
|
||||
, cryptography
|
||||
, tinydb
|
||||
, joblib
|
||||
, tinyrecord
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "edk2-pytool-library";
|
||||
version = "0.16.2";
|
||||
version = "0.17.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tianocore";
|
||||
repo = "edk2-pytool-library";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JL9znvXl+RIEzycKhXkggEJ87bQ+UzspBD1YM3AoYlc=";
|
||||
hash = "sha256-US9m7weW11+VxX6ZsKP5tYKp+bQoiI+TZ3YWE97D/f0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"tinydb"
|
||||
"joblib"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyasn1
|
||||
pyasn1-modules
|
||||
cryptography
|
||||
tinydb
|
||||
joblib
|
||||
tinyrecord
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
73
pkgs/development/python-modules/minichain/default.nix
Normal file
73
pkgs/development/python-modules/minichain/default.nix
Normal file
|
@ -0,0 +1,73 @@
|
|||
{ buildPythonPackage
|
||||
, eliot
|
||||
, fetchPypi
|
||||
, google-search-results
|
||||
, jinja2
|
||||
, lib
|
||||
, manifest-ml
|
||||
, openai
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minichain";
|
||||
version = "0.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/pull/248195#issuecomment-1687398702.
|
||||
disabled = pythonAtLeast "3.11";
|
||||
|
||||
# See https://github.com/srush/MiniChain/issues/23 and https://github.com/NixOS/nixpkgs/issues/248185 as to why we
|
||||
# don't fetchFromGitHub.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+mju1Mz/aojROpiOVzv6WoRNTrhgCub4yyYLEWcHWh0=";
|
||||
};
|
||||
|
||||
# See https://github.com/srush/MiniChain/issues/24.
|
||||
postPatch = ''
|
||||
substituteInPlace ./minichain/__init__.py --replace "from .gradio import GradioConf, show" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# Only used in the examples:
|
||||
"datasets"
|
||||
"faiss-cpu"
|
||||
"jinja2-highlight"
|
||||
"trio"
|
||||
|
||||
# Not used anywhere:
|
||||
"eliot-tree"
|
||||
|
||||
# Not yet packaged in nixpkgs:
|
||||
"gradio"
|
||||
];
|
||||
|
||||
# Some of these could be made optional. Certain packages are used by certain backends.
|
||||
propagatedBuildInputs = [
|
||||
eliot
|
||||
google-search-results
|
||||
jinja2
|
||||
manifest-ml
|
||||
openai
|
||||
];
|
||||
|
||||
# As of 0.3.3, the PyPI distribution does not include any tests.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "minichain" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tiny library for coding with large language models";
|
||||
homepage = "https://srush-minichain.hf.space";
|
||||
changelog = "https://github.com/srush/MiniChain/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
|
@ -96,6 +96,8 @@ buildPythonPackage rec {
|
|||
sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "0.27.8";
|
||||
version = "0.27.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7.1";
|
||||
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7D7oi3NCqq0QSW66MqYMmc9ga02T5G4xFVic4PjgFRA=";
|
||||
hash = "sha256-vp85M9VZvbY4saG88WcR3Qw8z+A9nU1Oi3sf9yitsV4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -82,6 +82,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-aiohttp
|
||||
pytestCheckHook
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
, pulumi
|
||||
, isPy27
|
||||
, semver
|
||||
, pip
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, six
|
||||
|
@ -28,6 +29,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pip
|
||||
pulumi.pkgs.pulumi-language-python
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
, requests-mock
|
||||
, scipy
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -31,6 +33,8 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -24,13 +24,13 @@ let
|
|||
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
|
||||
in buildPythonPackage rec {
|
||||
pname = "pyopencl";
|
||||
version = "2023.1.1";
|
||||
version = "2023.1.2";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CtkleKlKC+De3Vyk/Lbie1p13k5frHV/BMkES9nUJEQ=";
|
||||
hash = "sha256-6wDNV0BJ1ZK2edz4v+erSjbJSjn9Gssaa0XWwNe+mmg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-stdnum";
|
||||
version = "1.18";
|
||||
version = "1.19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vMdj2cSa4j2l0remhtX9He7J2QUTQRYKENGscjomvsA=";
|
||||
hash = "sha256-Ez7IL1Y5DqdMGQVp6Y8vsUuGmAix1UeFcI8i0P6tiz8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "timetagger";
|
||||
version = "23.7.1";
|
||||
version = "23.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "almarklein";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OLIjb5mFNNi0elPeXaPoK9V0fVw2Cnd7CHjPc1oGfyM=";
|
||||
hash = "sha256-VHvCvXmNwxuk4Le2VqsU1CFcHfAr40WbhELzu5wfB1U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
40
pkgs/development/python-modules/tinyrecord/default.nix
Normal file
40
pkgs/development/python-modules/tinyrecord/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, tinydb
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tinyrecord";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eugene-eeo";
|
||||
repo = "tinyrecord";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mF4hpHuNyiQ5DurRnyLck5e/Vp26GCLkhD8eeSB4NYs=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
tinydb
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tinyrecord"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Transaction support for TinyDB";
|
||||
homepage = "https://github.com/eugene-eeo/tinyrecord";
|
||||
changelog = "https://github.com/eugene-eeo/tinyrecord/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
37
pkgs/development/python-modules/urwid-mitmproxy/default.nix
Normal file
37
pkgs/development/python-modules/urwid-mitmproxy/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, glibcLocales
|
||||
, pythonOlder
|
||||
, unittestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urwid-mitmproxy";
|
||||
version = "2.1.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitmproxy";
|
||||
repo = "urwid-mitmproxy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-93AauYWbrG/2smAhbNKGE0twGJZ2u9gBetlXGCpciH8=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"urwid"
|
||||
];
|
||||
|
||||
# Tests which assert on strings don't decode results correctly, see urwid
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Urwid fork used by mitmproxy";
|
||||
homepage = "https://github.com/mitmproxy/urwid-mitmproxy";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "1.56.0";
|
||||
version = "1.56.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IanIznKRmmW83/NWjW5VeBQUA/u4RSFzAQf1/QOAsK8=";
|
||||
hash = "sha256-X8S8hfdfoqWRhJIuhNEZFXIAW1k5nFvE5v/7homO1Ow=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6MvXVHg4EH5S37JnY0jnAFjDplQINWPFyd54c1W/oAE=";
|
||||
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
"-w"
|
||||
];
|
||||
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.56.0/.github/workflows/release.yaml#L76
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.56.1/.github/workflows/release.yaml#L76
|
||||
preBuild = ''
|
||||
cat > cmd/api-linter/version.go <<EOF
|
||||
package main
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cocogitto";
|
||||
version = "5.4.0";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oknozor";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HlvFE7payno4cBOZEQS3stsVPBte+1EUcfca5lVlmVc=";
|
||||
sha256 = "sha256-kzG22TDWGmqXuX9wr4w6PP0chbjAEqQO38jF8BGVu6w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zKqWrwd5dv6Vja/BXPXLBRFzb0wwrfwFsHXau+UBPg4=";
|
||||
cargoHash = "sha256-sBwR0I8eNEBglPSeSNqc7qv3eXbzcgZNBPC74Kulhbw=";
|
||||
|
||||
# Test depend on git configuration that would likely exist in a normal user environment
|
||||
# and might be failing to create the test repository it works in.
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "codespelunker";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boyter";
|
||||
repo = "cs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9Od2SOUYf4ij+UWOX/1kWS+qUZRje1wjzSAzBc5qk8s=";
|
||||
hash = "sha256-FZf3aRozpXWTRDrNDRxb1dGBXiLVEYOUd8a/hqzThps=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
44
pkgs/development/tools/firebase-tools/default.nix
Normal file
44
pkgs/development/tools/firebase-tools/default.nix
Normal file
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, xcbuild
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "firebase-tools";
|
||||
version = "12.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firebase";
|
||||
repo = "firebase-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uyw3M6EWRaiDLZg1MH1weiXih5hWh5Kz3HnB1xXISNA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-AjUREpqQX9+7tjO68Q9WIWQ71l5O641Oc+3Pr2khP4s=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
xcbuild
|
||||
];
|
||||
|
||||
env = {
|
||||
PUPPETEER_SKIP_DOWNLOAD = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/firebase/firebase-tools/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Manage, and deploy your Firebase project from the command line";
|
||||
homepage = "https://github.com/firebase/firebase-tools";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "firebase";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gotemplate";
|
||||
version = "3.7.4";
|
||||
version = "3.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coveooss";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vARW8afqkcope5EcqCFju/cF6LsdEYvt3fKHEXRbmXM=";
|
||||
hash = "sha256-BMZyq7fa57WaE0cSkGjHWxtEnbC7vEy+kLaHDoI/KZU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uRB3atrJ+A1/xXvgmkyM/AKN+9VKSIDvsnPIdtsc3vc=";
|
||||
|
|
|
@ -15,16 +15,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "5.9.0";
|
||||
version = "5.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "texlab";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mF0vbKdTACGeL1NZ57kzZANxjcHX92WtRJoU2Z4iJiM=";
|
||||
hash = "sha256-ZWvxi000wxjCzAe8PnzLb3z7smBc95gky0WyrkzVmEc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-io0dkKDNoF+1n7D1q1JShd/Gj5Ce1Uh3dnM6uiTw0Vs=";
|
||||
cargoHash = "sha256-ohovhwm/lIcNRorHtiluBVVVLIsaft/godDmte2hl9M=";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
|
||||
|
||||
|
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
|
|||
# generate the man page
|
||||
postInstall = lib.optionalString (!isCross) ''
|
||||
# TexLab builds man page separately in CI:
|
||||
# https://github.com/latex-lsp/texlab/blob/v5.6.0/.github/workflows/publish.yml#L127-L131
|
||||
# https://github.com/latex-lsp/texlab/blob/v5.9.2/.github/workflows/publish.yml#L117-L121
|
||||
help2man --no-info "$out/bin/texlab" > texlab.1
|
||||
installManPage texlab.1
|
||||
'';
|
||||
|
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-ndk";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbqsrc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rpEBxoXm77UuK7jiaf90yxVnmJay6ptkRk5KUEBoSvk=";
|
||||
sha256 = "sha256-jMhDKMFJVz/PdMnSrA+moknXPfwFhPj/fggHDAUCsNY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XRT4U6zkmXzNnPnnHWrGlQWVV3W09UXQ0McksIFKgyE=";
|
||||
cargoHash = "sha256-IUMS0oCucYeBSfjxIYl0hhJw2GIpSgh+Vm1iUQ+Jceo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreGraphics
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sentry-cli";
|
||||
version = "2.20.4";
|
||||
version = "2.20.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-AsekaFoXCqzb97uTIcwf5CdqYuseMwHkKbLx1D+cD6A=";
|
||||
sha256 = "sha256-gV1IL2IKbmUeOJkMfJ3Hd8xoylVi0i7ADdxaISLF+wM=";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoHash = "sha256-As8NGFI23eU/FE6F6tTbnWuU/5CL2s5bY6JLB9RJmaU=";
|
||||
cargoHash = "sha256-9L+wfYO5BOkpB3VqUSOJEwq671SVGlWcbXd80m/UoYI=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.sentry.io/cli/";
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unityhub";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb";
|
||||
sha256 = "sha256-d5TUUhGqchkrCRqJWHEewurjsHxbfZ+5hv9w9Yv2EQ4=";
|
||||
sha256 = "sha256-R/Ehf379Vbh/fN6iJO6BKsUuGMe2ogJdlWosElR+7f8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "chiaki";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~thestr4ng3r/chiaki";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-VkCA8KS4EHuVSgoYt1YDT38hA1NEBckiBwRcgDZUSs4=";
|
||||
hash = "sha256-mLx2ygMlIuDJt9iT4nIj/dcLGjMvvmneKd49L7C3BQk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -33,6 +33,7 @@ mkDerivation rec {
|
|||
protobuf
|
||||
python3Packages.protobuf
|
||||
python3Packages.python
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -60,5 +61,6 @@ mkDerivation rec {
|
|||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ delroth ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "chiaki";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ezquake";
|
||||
version = "3.6.2";
|
||||
version = "3.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QW-Group";
|
||||
repo = pname + "-source";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-mi/VDSZ+ybEAaZOhBGh/cSnrRUAB/h+WQZ4Aml0UfW4=";
|
||||
hash = "sha256-ThrsJfj+eP7Lv2ZSNLO6/b98VHrL6/rhwf2p0qMvTF8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, canonicalize-jars-hook
|
||||
, cmake
|
||||
, cmark
|
||||
, Cocoa
|
||||
|
@ -67,7 +68,7 @@ rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ];
|
||||
nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook ];
|
||||
buildInputs =
|
||||
[
|
||||
qtbase
|
||||
|
|
|
@ -1,4 +1,11 @@
|
|||
{ stdenv, lib, file, fetchurl, autoPatchelfHook, unzip }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
|
||||
, autoPatchelfHook
|
||||
, unzip
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "terraria-server";
|
||||
|
@ -10,8 +17,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-Mk+5s9OlkyTLXZYVT0+8Qcjy2Sb5uy2hcC8CML0biNY=";
|
||||
};
|
||||
|
||||
buildInputs = [ file stdenv.cc.cc.libgcc ];
|
||||
nativeBuildInputs = [ autoPatchelfHook unzip ];
|
||||
buildInputs = [ stdenv.cc.cc.libgcc zlib ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
@ -29,6 +36,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Dedicated server for Terraria, a 2D action-adventure sandbox";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ ncfavier ];
|
||||
mainProgram = "TerrariaServer";
|
||||
maintainers = with maintainers; [ ncfavier tomasajt ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -67,13 +67,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conky";
|
||||
version = "1.19.3";
|
||||
version = "1.19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brndnmtthws";
|
||||
repo = "conky";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Wt1g7/2PebpyxvIBihDBsl3DvM1EeRyOhD5ntlk0Oh0=";
|
||||
hash = "sha256-XptnokBWtBx0W2k2C9jVwIYH8pOrDUbuQLvh8JrW/w8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -38,12 +38,12 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rabbitmq-server";
|
||||
version = "3.12.1";
|
||||
version = "3.12.3";
|
||||
|
||||
# when updating, consider bumping elixir version in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-n++vqJlRH0C4WdZEswoaJxkuvghbu9MYhBUqFhbhISA=";
|
||||
hash = "sha256-ZtfybHy6gsLcUz5LGTQrzG/a8x+s6ZkIQsiFC845NC0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "elasticmq-server";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar";
|
||||
sha256 = "sha256-71GlX8zwiC5tZm2LGSUdOa4ZDZUQQJ9zTY8viu2MQLk=";
|
||||
sha256 = "sha256-7eWdhsYkeUKnr7BzJhJ9/jFn76CdK7Qq1eIfV/OG7es=";
|
||||
};
|
||||
|
||||
# don't do anything?
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ buildGoModule, fetchFromGitLab, lib }:
|
||||
buildGoModule rec {
|
||||
pname = "gnss-share";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
src = fetchFromGitLab {
|
||||
owner = "postmarketOS";
|
||||
repo = "gnss-share";
|
||||
rev = version;
|
||||
hash = "sha256-HlaT4TeVAyGN95cWUw1XgVNfGa+cUibh8nkBt/Eb7Yo=";
|
||||
hash = "sha256-0osXA+t+trm41ekcDiJwq0IAB+6ibrlwP/c2JNAXRpU=";
|
||||
};
|
||||
vendorHash = "sha256-a5CZxh92MW3yP/ZhwGI9UWUT8hwJ0/zeTyPNC+c2R9U=";
|
||||
meta = with lib; {
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "questdb";
|
||||
version = "7.3";
|
||||
version = "7.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
|
||||
hash = "sha256-teZ9oJ5aUPs0aTUxyK9UmpFRclHZVLEVl0jlWbrbiBs=";
|
||||
hash = "sha256-bnnuIoARr7awwdxDo9NDKy1HEJVl24YTqYhBpmc8n/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "static-web-server";
|
||||
version = "2.21.0";
|
||||
version = "2.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "static-web-server";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4BQDbJTGEOZ+lB7b7KQE82I95+JCbPY9z/oU32TjYc4=";
|
||||
hash = "sha256-odt9ztEjb+ppi1e+SI7T6BGtSWVG4EM14lyuVoz5gOM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kPd77hJHVfzfBLixROTXxIbWtAskxUEJqbdFME+FL1U=";
|
||||
cargoHash = "sha256-HWiMaMnco4xkskjRroqgy11D/Plg/1VDZwn/IpNG6LM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
|
|
@ -9,16 +9,17 @@
|
|||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "xonsh";
|
||||
version = "0.14.0";
|
||||
format = "pyproject";
|
||||
|
||||
# fetch from github because the pypi package ships incomplete tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "xonsh";
|
||||
repo = "xonsh";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-ZrPKKa/vl06QAjGr16ZzKF/DAByFHr6ze2WVOCa+wf8=";
|
||||
hash = "sha256-ZrPKKa/vl06QAjGr16ZzKF/DAByFHr6ze2WVOCa+wf8=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
env.LC_ALL = "en_US.UTF-8";
|
||||
|
||||
postPatch = ''
|
||||
sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
|
||||
|
@ -31,6 +32,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||
patchShebangs .
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# fails on sandbox
|
||||
"test_colorize_file"
|
||||
|
@ -63,7 +69,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
nativeCheckInputs = [ glibcLocales git ] ++
|
||||
(with python3.pkgs; [ pyte pytestCheckHook pytest-mock pytest-subprocess ]);
|
||||
(with python3.pkgs; [ pip pyte pytestCheckHook pytest-mock pytest-subprocess ]);
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [ ply prompt-toolkit pygments ];
|
||||
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aws-nuke";
|
||||
version = "2.23.0";
|
||||
version = "2.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rebuy-de";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fvEUZWnYjSZrdTLTq1WVuZ3GaIWqdk3+qnuXDwT0K/0=";
|
||||
hash = "sha256-AftmWmZFi9NIXNxbMEO1eIzRl3UwS3rxXZ4htJClEfo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c9OpKsP4TQ4aDZnHPSy6tNmNBN6tsj4Kb8WOig5+ogI=";
|
||||
vendorHash = "sha256-cYQlHl0fmLH5f+QNdJ+V6L9Ts8sa9y8l0oOIqdpJlL0=";
|
||||
|
||||
overrideModAttrs = _: {
|
||||
preBuild = ''
|
||||
|
|
|
@ -24,15 +24,15 @@ let
|
|||
x86_64-linux = "../../cmpl_gcc_x64.mak";
|
||||
}.${stdenv.hostPlatform.system} or "../../cmpl_gcc.mak"; # generic build
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "7zz";
|
||||
version = "22.01";
|
||||
version = "23.01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.tar.xz";
|
||||
url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz";
|
||||
hash = {
|
||||
free = "sha256-mp3cFXOEiVptkUdD1+X8XxwoJhBGs+Ns5qk3HBByfLg=";
|
||||
unfree = "sha256-OTCYcwxwBCOSr4CJF+dllF3CQ33ueq48/MSWbrkg+8U=";
|
||||
free = "sha256-F1ybQsyReF2NBR/3eMZySvxVEntpwq2VUlRCHp/5nZs=";
|
||||
unfree = "sha256-NWBxAHNg5aGCTZkEmT6LJIC1G1cOjJ+vfA9Y6+S/n3Q=";
|
||||
}.${if enableUnfree then "unfree" else "free"};
|
||||
downloadToTemp = (!enableUnfree);
|
||||
# remove the unRAR related code from the src drv
|
||||
|
@ -54,10 +54,10 @@ stdenv.mkDerivation rec {
|
|||
sourceRoot = ".";
|
||||
|
||||
patches = [
|
||||
./fix-build-on-darwin.patch
|
||||
./fix-cross-mingw-build.patch
|
||||
# remove unneeded semicolons related to -Wextra-semi-stmt, caused by upstream
|
||||
./fix-empty-expr-stmt.patch
|
||||
];
|
||||
patchFlags = [ "-p0" ];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isMinGW ''
|
||||
substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \
|
||||
|
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
|
||||
install -Dm555 -t $out/bin b/*/7zz${stdenv.hostPlatform.extensions.executable}
|
||||
install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt
|
||||
install -Dm444 -t $out/share/doc/${finalAttrs.pname} ../../../../DOC/*.txt
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
@ -120,8 +120,8 @@ stdenv.mkDerivation rec {
|
|||
# and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction
|
||||
# the unRAR compression code is disabled by default
|
||||
lib.optionals enableUnfree [ unfree ];
|
||||
maintainers = with maintainers; [ anna328p peterhoeg jk ];
|
||||
maintainers = with maintainers; [ anna328p eclairevoyant jk peterhoeg ];
|
||||
platforms = platforms.unix ++ platforms.windows;
|
||||
mainProgram = "7zz";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
diff -Naur CPP/7zip/Common/FileStreams.cpp CPP/7zip/Common/FileStreams.cpp
|
||||
--- CPP/7zip/Common/FileStreams.cpp
|
||||
+++ CPP/7zip/Common/FileStreams.cpp
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <pwd.h>
|
||||
|
||||
// for major()/minor():
|
||||
-#if defined(__FreeBSD__) || defined(BSD)
|
||||
+#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__)
|
||||
#include <sys/types.h>
|
||||
#else
|
||||
#include <sys/sysmacros.h>
|
||||
diff -Naur CPP/7zip/UI/Common/UpdateCallback.cpp CPP/7zip/UI/Common/UpdateCallback.cpp
|
||||
--- CPP/7zip/UI/Common/UpdateCallback.cpp
|
||||
+++ CPP/7zip/UI/Common/UpdateCallback.cpp
|
||||
@@ -9,7 +9,7 @@
|
||||
// #include <pwd.h>
|
||||
|
||||
// for major()/minor():
|
||||
-#if defined(__FreeBSD__) || defined(BSD)
|
||||
+#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__)
|
||||
#include <sys/types.h>
|
||||
#else
|
||||
#include <sys/sysmacros.h>
|
|
@ -1,7 +1,5 @@
|
|||
diff --git C/7zVersion.rc C/7zVersion.rc
|
||||
index 6ed26de7445..675e9bb0321 100755
|
||||
--- C/7zVersion.rc
|
||||
+++ C/7zVersion.rc
|
||||
--- a/C/7zVersion.rc
|
||||
+++ b/C/7zVersion.rc
|
||||
@@ -5,7 +5,7 @@
|
||||
#define MY_VFT_APP 0x00000001L
|
||||
#define MY_VFT_DLL 0x00000002L
|
||||
|
@ -11,200 +9,52 @@ index 6ed26de7445..675e9bb0321 100755
|
|||
|
||||
#ifndef MY_VERSION
|
||||
#include "7zVersion.h"
|
||||
diff --git C/7zip_gcc_c.mak C/7zip_gcc_c.mak
|
||||
index d41810478db..43cdd51271e 100755
|
||||
--- C/7zip_gcc_c.mak
|
||||
+++ C/7zip_gcc_c.mak
|
||||
@@ -93,7 +93,7 @@ DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll
|
||||
--- a/C/7zip_gcc_c.mak
|
||||
+++ b/C/7zip_gcc_c.mak
|
||||
@@ -106,7 +106,7 @@
|
||||
endif
|
||||
|
||||
|
||||
-LIB2 = -lOle32 -loleaut32 -luuid -ladvapi32 -lUser32
|
||||
+LIB2 = -lole32 -loleaut32 -luuid -ladvapi32 -luser32
|
||||
-LIB2 = -lOle32 -loleaut32 -luuid -ladvapi32 -lUser32 -lShell32
|
||||
+LIB2 = -lole32 -loleaut32 -luuid -ladvapi32 -luser32 -lshell32
|
||||
|
||||
CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE
|
||||
CFLAGS_EXTRA = -DUNICODE -D_UNICODE
|
||||
# -Wno-delete-non-virtual-dtor
|
||||
diff --git C/Alloc.c C/Alloc.c
|
||||
index 142a1ea2219..0d0107c56f4 100755
|
||||
--- C/Alloc.c
|
||||
+++ C/Alloc.c
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
|
||||
diff --git C/CpuArch.c C/CpuArch.c
|
||||
index a0e93e8b08e..36e0be0b1c8 100755
|
||||
--- C/CpuArch.c
|
||||
+++ C/CpuArch.c
|
||||
@@ -217,7 +217,7 @@ BoolInt CPU_Is_InOrder()
|
||||
}
|
||||
|
||||
#if !defined(MY_CPU_AMD64) && defined(_WIN32)
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
static BoolInt CPU_Sys_Is_SSE_Supported()
|
||||
{
|
||||
OSVERSIONINFO vi;
|
||||
@@ -275,7 +275,7 @@ BoolInt CPU_IsSupported_SHA()
|
||||
// #include <stdio.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
#endif
|
||||
|
||||
BoolInt CPU_IsSupported_AVX2()
|
||||
@@ -351,7 +351,7 @@ BoolInt CPU_IsSupported_PageGB()
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
|
||||
BoolInt CPU_IsSupported_CRC32() { return IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
|
||||
BoolInt CPU_IsSupported_CRYPTO() { return IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
|
||||
diff --git C/DllSecur.c C/DllSecur.c
|
||||
index a37c1b3e2c5..16755bba930 100755
|
||||
--- C/DllSecur.c
|
||||
+++ C/DllSecur.c
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
|
||||
#include "DllSecur.h"
|
||||
|
||||
diff --git C/Threads.h C/Threads.h
|
||||
index e9493afff62..71972558d48 100755
|
||||
--- C/Threads.h
|
||||
+++ C/Threads.h
|
||||
@@ -5,7 +5,7 @@
|
||||
#define __7Z_THREADS_H
|
||||
|
||||
#ifdef _WIN32
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
#else
|
||||
|
||||
#if defined(__linux__)
|
||||
diff --git C/Util/7zipInstall/7zipInstall.c C/Util/7zipInstall/7zipInstall.c
|
||||
index 2c498bb4392..d791bc4181c 100755
|
||||
--- C/Util/7zipInstall/7zipInstall.c
|
||||
+++ C/Util/7zipInstall/7zipInstall.c
|
||||
@@ -10,7 +10,7 @@
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
#include "../../7z.h"
|
||||
#include "../../7zAlloc.h"
|
||||
diff --git C/Util/7zipInstall/resource.rc C/Util/7zipInstall/resource.rc
|
||||
index 4d6a91feda1..c19f601f69f 100755
|
||||
--- C/Util/7zipInstall/resource.rc
|
||||
+++ C/Util/7zipInstall/resource.rc
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <winnt.h>
|
||||
#include <WinUser.h>
|
||||
-#include <CommCtrl.h>
|
||||
+#include <commctrl.h>
|
||||
|
||||
#define USE_COPYRIGHT_CR
|
||||
#include "../../7zVersion.rc"
|
||||
diff --git C/Util/7zipUninstall/7zipUninstall.c C/Util/7zipUninstall/7zipUninstall.c
|
||||
index 89cd764dbe9..32ece1c6c14 100755
|
||||
--- C/Util/7zipUninstall/7zipUninstall.c
|
||||
+++ C/Util/7zipUninstall/7zipUninstall.c
|
||||
@@ -11,7 +11,7 @@
|
||||
// #define SZ_ERROR_ABORT 100
|
||||
|
||||
#include <windows.h>
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
#include "../../7zVersion.h"
|
||||
|
||||
diff --git C/Util/7zipUninstall/resource.rc C/Util/7zipUninstall/resource.rc
|
||||
index 506e0665cdd..ae1dfedc83b 100755
|
||||
--- C/Util/7zipUninstall/resource.rc
|
||||
+++ C/Util/7zipUninstall/resource.rc
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <winnt.h>
|
||||
#include <WinUser.h>
|
||||
-#include <CommCtrl.h>
|
||||
+#include <commctrl.h>
|
||||
|
||||
#define USE_COPYRIGHT_CR
|
||||
#include "../../7zVersion.rc"
|
||||
diff --git CPP/7zip/7zip_gcc.mak CPP/7zip/7zip_gcc.mak
|
||||
index 2a24e06aa1f..fb32b933201 100755
|
||||
--- CPP/7zip/7zip_gcc.mak
|
||||
+++ CPP/7zip/7zip_gcc.mak
|
||||
@@ -113,8 +113,8 @@ MY_MKDIR=mkdir
|
||||
--- a/CPP/7zip/7zip_gcc.mak
|
||||
+++ b/CPP/7zip/7zip_gcc.mak
|
||||
@@ -124,8 +124,8 @@
|
||||
DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll
|
||||
endif
|
||||
|
||||
-LIB2_GUI = -lOle32 -lGdi32 -lComctl32 -lComdlg32 $(LIB_HTMLHELP)
|
||||
-LIB2_GUI = -lOle32 -lGdi32 -lComctl32 -lComdlg32 -lShell32 $(LIB_HTMLHELP)
|
||||
-LIB2 = -loleaut32 -luuid -ladvapi32 -lUser32 $(LIB2_GUI)
|
||||
+LIB2_GUI = -lole32 -lgdi32 -lcomctl32 -lcomdlg32 $(LIB_HTMLHELP)
|
||||
+LIB2_GUI = -lole32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 $(LIB_HTMLHELP)
|
||||
+LIB2 = -loleaut32 -luuid -ladvapi32 -luser32 $(LIB2_GUI)
|
||||
|
||||
CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE
|
||||
# -Wno-delete-non-virtual-dtor
|
||||
diff --git CPP/7zip/Bundles/Fm/StdAfx.h CPP/7zip/Bundles/Fm/StdAfx.h
|
||||
index c15e07939da..d1e094cc339 100755
|
||||
--- CPP/7zip/Bundles/Fm/StdAfx.h
|
||||
+++ CPP/7zip/Bundles/Fm/StdAfx.h
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
#include "../../../Common/Common.h"
|
||||
|
||||
--- a/C/Util/7zipInstall/resource.rc
|
||||
+++ b/C/Util/7zipInstall/resource.rc
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <winnt.h>
|
||||
#include <WinUser.h>
|
||||
-#include <CommCtrl.h>
|
||||
-#include <ShlObj.h>
|
||||
-#include <Shlwapi.h>
|
||||
+#include <commctrl.h>
|
||||
+#include <shlobj.h>
|
||||
+#include <shlwapi.h>
|
||||
|
||||
#endif
|
||||
diff --git CPP/7zip/Bundles/SFXWin/SfxWin.cpp CPP/7zip/Bundles/SFXWin/SfxWin.cpp
|
||||
index cf3bad389a0..260484c11e4 100755
|
||||
--- CPP/7zip/Bundles/SFXWin/SfxWin.cpp
|
||||
+++ CPP/7zip/Bundles/SFXWin/SfxWin.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
#define USE_COPYRIGHT_CR
|
||||
#include "../../7zVersion.rc"
|
||||
--- a/C/Util/7zipUninstall/resource.rc
|
||||
+++ b/C/Util/7zipUninstall/resource.rc
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <winnt.h>
|
||||
#include <WinUser.h>
|
||||
-#include <CommCtrl.h>
|
||||
+#include <commctrl.h>
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
-#include <Shlwapi.h>
|
||||
+#include <shlwapi.h>
|
||||
|
||||
#include "../../../Common/MyInitGuid.h"
|
||||
|
||||
diff --git CPP/7zip/Bundles/SFXWin/StdAfx.h CPP/7zip/Bundles/SFXWin/StdAfx.h
|
||||
index f263ecb77c5..e96640e995c 100755
|
||||
--- CPP/7zip/Bundles/SFXWin/StdAfx.h
|
||||
+++ CPP/7zip/Bundles/SFXWin/StdAfx.h
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "../../../Common/Common.h"
|
||||
|
||||
#include <commctrl.h>
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
// #define printf(x) NO_PRINTF_(x)
|
||||
// #define sprintf(x) NO_SPRINTF_(x)
|
||||
diff --git CPP/7zip/Crypto/RandGen.cpp CPP/7zip/Crypto/RandGen.cpp
|
||||
index c123109a15b..c3709ccff6b 100755
|
||||
--- CPP/7zip/Crypto/RandGen.cpp
|
||||
+++ CPP/7zip/Crypto/RandGen.cpp
|
||||
#define USE_COPYRIGHT_CR
|
||||
#include "../../7zVersion.rc"
|
||||
--- a/CPP/7zip/Crypto/RandGen.cpp
|
||||
+++ b/CPP/7zip/Crypto/RandGen.cpp
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#ifdef USE_STATIC_RtlGenRandom
|
||||
|
@ -214,10 +64,8 @@ index c123109a15b..c3709ccff6b 100755
|
|||
|
||||
EXTERN_C_BEGIN
|
||||
#ifndef RtlGenRandom
|
||||
diff --git CPP/7zip/GuiCommon.rc CPP/7zip/GuiCommon.rc
|
||||
index 565ee702ef9..13043ef4c53 100755
|
||||
--- CPP/7zip/GuiCommon.rc
|
||||
+++ CPP/7zip/GuiCommon.rc
|
||||
--- a/CPP/7zip/GuiCommon.rc
|
||||
+++ b/CPP/7zip/GuiCommon.rc
|
||||
@@ -4,7 +4,7 @@
|
||||
// #include <WinUser.h>
|
||||
|
||||
|
@ -227,186 +75,8 @@ index 565ee702ef9..13043ef4c53 100755
|
|||
|
||||
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
diff --git CPP/7zip/MyVersionInfo.rc CPP/7zip/MyVersionInfo.rc
|
||||
index eddf8935c84..90e65376be8 100755
|
||||
--- CPP/7zip/MyVersionInfo.rc
|
||||
+++ CPP/7zip/MyVersionInfo.rc
|
||||
@@ -1,2 +1,2 @@
|
||||
#include "MyVersion.h"
|
||||
-#include "..\..\C\7zVersion.rc"
|
||||
+#include "../../C/7zVersion.rc"
|
||||
diff --git CPP/7zip/UI/Common/Update.cpp CPP/7zip/UI/Common/Update.cpp
|
||||
index 5490ff445a0..003ee6634ea 100755
|
||||
--- CPP/7zip/UI/Common/Update.cpp
|
||||
+++ CPP/7zip/UI/Common/Update.cpp
|
||||
@@ -1163,7 +1163,7 @@ static HRESULT EnumerateInArchiveItems(
|
||||
|
||||
#if defined(_WIN32) && !defined(UNDER_CE)
|
||||
|
||||
-#include <MAPI.h>
|
||||
+#include <mapi.h>
|
||||
|
||||
#endif
|
||||
|
||||
diff --git CPP/7zip/UI/Console/Main.cpp CPP/7zip/UI/Console/Main.cpp
|
||||
index 363572cd3dd..765f55293a7 100755
|
||||
--- CPP/7zip/UI/Console/Main.cpp
|
||||
+++ CPP/7zip/UI/Console/Main.cpp
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
-#include <Psapi.h>
|
||||
+#include <psapi.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#include <sys/ioctl.h>
|
||||
diff --git CPP/7zip/UI/Explorer/ContextMenu.h CPP/7zip/UI/Explorer/ContextMenu.h
|
||||
index e60ffccf11b..aea34e7de07 100755
|
||||
--- CPP/7zip/UI/Explorer/ContextMenu.h
|
||||
+++ CPP/7zip/UI/Explorer/ContextMenu.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
#include "MyExplorerCommand.h"
|
||||
|
||||
diff --git CPP/7zip/UI/Explorer/DllExportsExplorer.cpp CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
|
||||
index 84c92e2e2d3..df126d8d232 100755
|
||||
--- CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
|
||||
+++ CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "../../../Common/MyWindows.h"
|
||||
// #include "../../../Common/IntToString.h"
|
||||
|
||||
-#include <OleCtl.h>
|
||||
+#include <olectl.h>
|
||||
|
||||
#include "../../../Common/MyInitGuid.h"
|
||||
|
||||
diff --git CPP/7zip/UI/Explorer/MyExplorerCommand.h CPP/7zip/UI/Explorer/MyExplorerCommand.h
|
||||
index b1997f0da6e..d1d038df11b 100755
|
||||
--- CPP/7zip/UI/Explorer/MyExplorerCommand.h
|
||||
+++ CPP/7zip/UI/Explorer/MyExplorerCommand.h
|
||||
@@ -17,7 +17,7 @@
|
||||
ShObjIdl.h : old Windows SDK
|
||||
ShObjIdl_core.h : new Windows 10 SDK */
|
||||
|
||||
-#include <ShObjIdl.h>
|
||||
+#include <shobjidl.h>
|
||||
|
||||
#ifndef __IShellItem_INTERFACE_DEFINED__
|
||||
#define __IShellItem_INTERFACE_DEFINED__
|
||||
diff --git CPP/7zip/UI/Explorer/StdAfx.h CPP/7zip/UI/Explorer/StdAfx.h
|
||||
index 35e8b337d68..16883ceda1b 100755
|
||||
--- CPP/7zip/UI/Explorer/StdAfx.h
|
||||
+++ CPP/7zip/UI/Explorer/StdAfx.h
|
||||
@@ -9,6 +9,6 @@
|
||||
|
||||
#include "../../../Common/Common.h"
|
||||
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
#endif
|
||||
diff --git CPP/7zip/UI/FileManager/BrowseDialog.cpp CPP/7zip/UI/FileManager/BrowseDialog.cpp
|
||||
index e43172385b6..286faeeb660 100755
|
||||
--- CPP/7zip/UI/FileManager/BrowseDialog.cpp
|
||||
+++ CPP/7zip/UI/FileManager/BrowseDialog.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
-#include <CommCtrl.h>
|
||||
+#include <commctrl.h>
|
||||
|
||||
#ifndef UNDER_CE
|
||||
#include "../../../Windows/CommonDialog.h"
|
||||
diff --git CPP/7zip/UI/FileManager/FM.cpp CPP/7zip/UI/FileManager/FM.cpp
|
||||
index b0b3715c9a5..14af8c32288 100755
|
||||
--- CPP/7zip/UI/FileManager/FM.cpp
|
||||
+++ CPP/7zip/UI/FileManager/FM.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
-#include <Shlwapi.h>
|
||||
+#include <shlwapi.h>
|
||||
|
||||
#include "../../../../C/Alloc.h"
|
||||
#ifdef _WIN32
|
||||
diff --git CPP/7zip/UI/FileManager/FSFolderCopy.cpp CPP/7zip/UI/FileManager/FSFolderCopy.cpp
|
||||
index b0e1146816d..16208e58f6b 100755
|
||||
--- CPP/7zip/UI/FileManager/FSFolderCopy.cpp
|
||||
+++ CPP/7zip/UI/FileManager/FSFolderCopy.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
-#include <WinBase.h>
|
||||
+#include <winbase.h>
|
||||
|
||||
#include "../../../Common/Defs.h"
|
||||
#include "../../../Common/StringConvert.h"
|
||||
diff --git CPP/7zip/UI/FileManager/HelpUtils.cpp CPP/7zip/UI/FileManager/HelpUtils.cpp
|
||||
index 94253a70f5c..3f4479dbddd 100755
|
||||
--- CPP/7zip/UI/FileManager/HelpUtils.cpp
|
||||
+++ CPP/7zip/UI/FileManager/HelpUtils.cpp
|
||||
@@ -24,7 +24,7 @@ void ShowHelpWindow(LPCSTR)
|
||||
#include "../../../Windows/FileName.h"
|
||||
|
||||
#else
|
||||
-#include <HtmlHelp.h>
|
||||
+#include <htmlhelp.h>
|
||||
#endif
|
||||
|
||||
#include "../../../Common/StringConvert.h"
|
||||
diff --git CPP/7zip/UI/FileManager/MyWindowsNew.h CPP/7zip/UI/FileManager/MyWindowsNew.h
|
||||
index c0fe8439b98..ba7d608b90e 100755
|
||||
--- CPP/7zip/UI/FileManager/MyWindowsNew.h
|
||||
+++ CPP/7zip/UI/FileManager/MyWindowsNew.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
-#include <ShObjIdl.h>
|
||||
+#include <shobjidl.h>
|
||||
|
||||
#ifndef __ITaskbarList3_INTERFACE_DEFINED__
|
||||
#define __ITaskbarList3_INTERFACE_DEFINED__
|
||||
diff --git CPP/7zip/UI/FileManager/Panel.cpp CPP/7zip/UI/FileManager/Panel.cpp
|
||||
index f7162e502ac..2eaf9e1266b 100755
|
||||
--- CPP/7zip/UI/FileManager/Panel.cpp
|
||||
+++ CPP/7zip/UI/FileManager/Panel.cpp
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "StdAfx.h"
|
||||
|
||||
-#include <WindowsX.h>
|
||||
+#include <windowsx.h>
|
||||
// #include <stdio.h>
|
||||
|
||||
#include "../../../Common/IntToString.h"
|
||||
diff --git CPP/7zip/UI/FileManager/Panel.h CPP/7zip/UI/FileManager/Panel.h
|
||||
index 5a9fef01de2..1f2b86a8e43 100755
|
||||
--- CPP/7zip/UI/FileManager/Panel.h
|
||||
+++ CPP/7zip/UI/FileManager/Panel.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
#include "../../../../C/Alloc.h"
|
||||
|
||||
diff --git CPP/7zip/UI/FileManager/PanelItemOpen.cpp CPP/7zip/UI/FileManager/PanelItemOpen.cpp
|
||||
index 6af42c96923..595acdbb563 100755
|
||||
--- CPP/7zip/UI/FileManager/PanelItemOpen.cpp
|
||||
+++ CPP/7zip/UI/FileManager/PanelItemOpen.cpp
|
||||
--- a/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
|
||||
+++ b/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
@ -416,52 +86,8 @@ index 6af42c96923..595acdbb563 100755
|
|||
|
||||
#include "../../../Common/IntToString.h"
|
||||
|
||||
diff --git CPP/7zip/UI/FileManager/RootFolder.cpp CPP/7zip/UI/FileManager/RootFolder.cpp
|
||||
index 6984434026f..d50c1eb832e 100755
|
||||
--- CPP/7zip/UI/FileManager/RootFolder.cpp
|
||||
+++ CPP/7zip/UI/FileManager/RootFolder.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
#include "../../../Common/StringConvert.h"
|
||||
|
||||
diff --git CPP/7zip/UI/FileManager/StdAfx.h CPP/7zip/UI/FileManager/StdAfx.h
|
||||
index 74cfbc6deef..88960aa8c58 100755
|
||||
--- CPP/7zip/UI/FileManager/StdAfx.h
|
||||
+++ CPP/7zip/UI/FileManager/StdAfx.h
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
// #include "../../../Common/MyWindows.h"
|
||||
|
||||
-// #include <CommCtrl.h>
|
||||
-// #include <ShlObj.h>
|
||||
-// #include <Shlwapi.h>
|
||||
+// #include <commctrl.h>
|
||||
+// #include <shlobj.h>
|
||||
+// #include <shlwapi.h>
|
||||
|
||||
#endif
|
||||
diff --git CPP/7zip/UI/FileManager/SysIconUtils.cpp CPP/7zip/UI/FileManager/SysIconUtils.cpp
|
||||
index 43c613244a8..1cdf1d4c5b3 100755
|
||||
--- CPP/7zip/UI/FileManager/SysIconUtils.cpp
|
||||
+++ CPP/7zip/UI/FileManager/SysIconUtils.cpp
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "SysIconUtils.h"
|
||||
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
#define MY_CAST_FUNC (void(*)())
|
||||
// #define MY_CAST_FUNC
|
||||
diff --git CPP/7zip/UI/FileManager/SysIconUtils.h CPP/7zip/UI/FileManager/SysIconUtils.h
|
||||
index ba747d9ded0..2eedc4be403 100755
|
||||
--- CPP/7zip/UI/FileManager/SysIconUtils.h
|
||||
+++ CPP/7zip/UI/FileManager/SysIconUtils.h
|
||||
--- a/CPP/7zip/UI/FileManager/SysIconUtils.h
|
||||
+++ b/CPP/7zip/UI/FileManager/SysIconUtils.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
@ -471,79 +97,8 @@ index ba747d9ded0..2eedc4be403 100755
|
|||
|
||||
#include "../../../Common/MyString.h"
|
||||
|
||||
diff --git CPP/7zip/UI/FileManager/SystemPage.cpp CPP/7zip/UI/FileManager/SystemPage.cpp
|
||||
index ff68172e2bf..06025259c85 100755
|
||||
--- CPP/7zip/UI/FileManager/SystemPage.cpp
|
||||
+++ CPP/7zip/UI/FileManager/SystemPage.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
#include "../../../Common/Defs.h"
|
||||
#include "../../../Common/StringConvert.h"
|
||||
diff --git CPP/7zip/UI/GUI/GUI.cpp CPP/7zip/UI/GUI/GUI.cpp
|
||||
index 0cc2ee3afcc..4ffc2384668 100755
|
||||
--- CPP/7zip/UI/GUI/GUI.cpp
|
||||
+++ CPP/7zip/UI/GUI/GUI.cpp
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "../../../Common/MyWindows.h"
|
||||
|
||||
-#include <Shlwapi.h>
|
||||
+#include <shlwapi.h>
|
||||
|
||||
#include "../../../Common/MyInitGuid.h"
|
||||
|
||||
diff --git CPP/7zip/UI/GUI/StdAfx.h CPP/7zip/UI/GUI/StdAfx.h
|
||||
index 498b2fcbe4b..3c830f6a3d4 100755
|
||||
--- CPP/7zip/UI/GUI/StdAfx.h
|
||||
+++ CPP/7zip/UI/GUI/StdAfx.h
|
||||
@@ -11,9 +11,9 @@
|
||||
|
||||
// #include "../../../Common/MyWindows.h"
|
||||
|
||||
-// #include <CommCtrl.h>
|
||||
-// #include <ShlObj.h>
|
||||
-// #include <Shlwapi.h>
|
||||
+// #include <commctrl.h>
|
||||
+// #include <shlobj.h>
|
||||
+// #include <shlwapi.h>
|
||||
|
||||
// #define printf(x) NO_PRINTF_(x)
|
||||
// #define sprintf(x) NO_SPRINTF_(x)
|
||||
diff --git CPP/Common/MyInitGuid.h CPP/Common/MyInitGuid.h
|
||||
index 6895097371a..6b2f3f35d5a 100755
|
||||
--- CPP/Common/MyInitGuid.h
|
||||
+++ CPP/Common/MyInitGuid.h
|
||||
@@ -29,7 +29,7 @@ Also we need IID_IUnknown that is initialized in some file for linking:
|
||||
#include <basetyps.h>
|
||||
#endif
|
||||
|
||||
-#include <InitGuid.h>
|
||||
+#include <initguid.h>
|
||||
|
||||
#ifdef UNDER_CE
|
||||
DEFINE_GUID(IID_IUnknown,
|
||||
diff --git CPP/Common/MyWindows.h CPP/Common/MyWindows.h
|
||||
index 69eed8f6446..f48680f9d05 100755
|
||||
--- CPP/Common/MyWindows.h
|
||||
+++ CPP/Common/MyWindows.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
|
||||
#ifdef UNDER_CE
|
||||
#undef VARIANT_TRUE
|
||||
diff --git CPP/Windows/Control/ComboBox.h CPP/Windows/Control/ComboBox.h
|
||||
index 8ab9ce5027d..8b12599b785 100755
|
||||
--- CPP/Windows/Control/ComboBox.h
|
||||
+++ CPP/Windows/Control/ComboBox.h
|
||||
--- a/CPP/Windows/Control/ComboBox.h
|
||||
+++ b/CPP/Windows/Control/ComboBox.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "../../Common/MyWindows.h"
|
||||
|
@ -553,10 +108,8 @@ index 8ab9ce5027d..8b12599b785 100755
|
|||
|
||||
#include "../Window.h"
|
||||
|
||||
diff --git CPP/Windows/Control/ImageList.h CPP/Windows/Control/ImageList.h
|
||||
index e59443058b8..f72ea0d1990 100755
|
||||
--- CPP/Windows/Control/ImageList.h
|
||||
+++ CPP/Windows/Control/ImageList.h
|
||||
--- a/CPP/Windows/Control/ImageList.h
|
||||
+++ b/CPP/Windows/Control/ImageList.h
|
||||
@@ -3,7 +3,7 @@
|
||||
#ifndef __WINDOWS_CONTROL_IMAGE_LIST_H
|
||||
#define __WINDOWS_CONTROL_IMAGE_LIST_H
|
||||
|
@ -566,10 +119,8 @@ index e59443058b8..f72ea0d1990 100755
|
|||
|
||||
#include "../Defs.h"
|
||||
|
||||
diff --git CPP/Windows/Control/ListView.h CPP/Windows/Control/ListView.h
|
||||
index 56e1100c726..cbd9cd1e21d 100755
|
||||
--- CPP/Windows/Control/ListView.h
|
||||
+++ CPP/Windows/Control/ListView.h
|
||||
--- a/CPP/Windows/Control/ListView.h
|
||||
+++ b/CPP/Windows/Control/ListView.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "../../Common/MyWindows.h"
|
||||
|
@ -579,10 +130,8 @@ index 56e1100c726..cbd9cd1e21d 100755
|
|||
|
||||
#include "../Window.h"
|
||||
|
||||
diff --git CPP/Windows/Control/ProgressBar.h CPP/Windows/Control/ProgressBar.h
|
||||
index 741315dd4dd..f18d89c14f0 100755
|
||||
--- CPP/Windows/Control/ProgressBar.h
|
||||
+++ CPP/Windows/Control/ProgressBar.h
|
||||
--- a/CPP/Windows/Control/ProgressBar.h
|
||||
+++ b/CPP/Windows/Control/ProgressBar.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "../../Common/MyWindows.h"
|
||||
|
@ -592,49 +141,8 @@ index 741315dd4dd..f18d89c14f0 100755
|
|||
|
||||
#include "../Window.h"
|
||||
|
||||
diff --git CPP/Windows/Control/PropertyPage.h CPP/Windows/Control/PropertyPage.h
|
||||
index 97c87b3b453..551c95994c2 100755
|
||||
--- CPP/Windows/Control/PropertyPage.h
|
||||
+++ CPP/Windows/Control/PropertyPage.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "../../Common/MyWindows.h"
|
||||
|
||||
-#include <PrSht.h>
|
||||
+#include <prsht.h>
|
||||
|
||||
#include "Dialog.h"
|
||||
|
||||
diff --git CPP/Windows/FileIO.h CPP/Windows/FileIO.h
|
||||
index 9146491d236..e11022f82d4 100755
|
||||
--- CPP/Windows/FileIO.h
|
||||
+++ CPP/Windows/FileIO.h
|
||||
@@ -17,7 +17,7 @@
|
||||
#ifdef _WIN32
|
||||
|
||||
#if defined(_WIN32) && !defined(UNDER_CE)
|
||||
-#include <WinIoCtl.h>
|
||||
+#include <winioctl.h>
|
||||
#endif
|
||||
|
||||
#else
|
||||
diff --git CPP/Windows/ProcessUtils.h CPP/Windows/ProcessUtils.h
|
||||
index 64ebe3775e4..de46c6f52a5 100755
|
||||
--- CPP/Windows/ProcessUtils.h
|
||||
+++ CPP/Windows/ProcessUtils.h
|
||||
@@ -3,7 +3,7 @@
|
||||
#ifndef __WINDOWS_PROCESS_UTILS_H
|
||||
#define __WINDOWS_PROCESS_UTILS_H
|
||||
|
||||
-#include <Psapi.h>
|
||||
+#include <psapi.h>
|
||||
|
||||
#include "../Common/MyString.h"
|
||||
|
||||
diff --git CPP/Windows/SecurityUtils.h CPP/Windows/SecurityUtils.h
|
||||
index de62035ec86..18a083fc580 100755
|
||||
--- CPP/Windows/SecurityUtils.h
|
||||
+++ CPP/Windows/SecurityUtils.h
|
||||
--- a/CPP/Windows/SecurityUtils.h
|
||||
+++ b/CPP/Windows/SecurityUtils.h
|
||||
@@ -3,7 +3,7 @@
|
||||
#ifndef __WINDOWS_SECURITY_UTILS_H
|
||||
#define __WINDOWS_SECURITY_UTILS_H
|
||||
|
@ -644,16 +152,3 @@ index de62035ec86..18a083fc580 100755
|
|||
|
||||
#include "Defs.h"
|
||||
|
||||
diff --git CPP/Windows/Shell.h CPP/Windows/Shell.h
|
||||
index 30388bc5a70..dc3daa5e60b 100755
|
||||
--- CPP/Windows/Shell.h
|
||||
+++ CPP/Windows/Shell.h
|
||||
@@ -4,7 +4,7 @@
|
||||
#define __WINDOWS_SHELL_H
|
||||
|
||||
#include "../Common/MyWindows.h"
|
||||
-#include <ShlObj.h>
|
||||
+#include <shlobj.h>
|
||||
|
||||
#include "../Common/MyString.h"
|
||||
|
||||
|
|
184
pkgs/tools/archivers/7zz/fix-empty-expr-stmt.patch
Normal file
184
pkgs/tools/archivers/7zz/fix-empty-expr-stmt.patch
Normal file
|
@ -0,0 +1,184 @@
|
|||
diff -Naur a/C/7zCrc.c b/C/7zCrc.c
|
||||
--- a/C/7zCrc.c
|
||||
+++ b/C/7zCrc.c
|
||||
@@ -174,7 +174,7 @@
|
||||
UInt32 Z7_FASTCALL CrcUpdateT0_32(UInt32 v, const void *data, size_t size, const UInt32 *table)
|
||||
{
|
||||
const Byte *p = (const Byte *)data;
|
||||
- UNUSED_VAR(table);
|
||||
+ UNUSED_VAR(table)
|
||||
|
||||
for (; size != 0 && ((unsigned)(ptrdiff_t)p & (T0_32_UNROLL_BYTES - 1)) != 0; size--)
|
||||
v = __crc32b(v, *p++);
|
||||
@@ -206,7 +206,7 @@
|
||||
UInt32 Z7_FASTCALL CrcUpdateT0_64(UInt32 v, const void *data, size_t size, const UInt32 *table)
|
||||
{
|
||||
const Byte *p = (const Byte *)data;
|
||||
- UNUSED_VAR(table);
|
||||
+ UNUSED_VAR(table)
|
||||
|
||||
for (; size != 0 && ((unsigned)(ptrdiff_t)p & (T0_64_UNROLL_BYTES - 1)) != 0; size--)
|
||||
v = __crc32b(v, *p++);
|
||||
diff -Naur a/C/AesOpt.c b/C/AesOpt.c
|
||||
--- a/C/AesOpt.c
|
||||
+++ b/C/AesOpt.c
|
||||
@@ -639,7 +639,7 @@
|
||||
const v128 k_z0 = w[2];
|
||||
for (; numBlocks != 0; numBlocks--, data++)
|
||||
{
|
||||
- MM_XOR_m (*data);
|
||||
+ MM_XOR_m (*data)
|
||||
AES_E_MC_m (k0)
|
||||
AES_E_MC_m (k1)
|
||||
AES_E_MC_m (k2)
|
||||
@@ -660,7 +660,7 @@
|
||||
}
|
||||
}
|
||||
AES_E_m (k_z1)
|
||||
- MM_XOR_m (k_z0);
|
||||
+ MM_XOR_m (k_z0)
|
||||
*data = m;
|
||||
}
|
||||
*p = m;
|
||||
@@ -745,7 +745,7 @@
|
||||
while (w != p);
|
||||
WOP_KEY (AES_D, 1)
|
||||
WOP_KEY (AES_XOR, 0)
|
||||
- MM_XOR (m0, iv);
|
||||
+ MM_XOR (m0, iv)
|
||||
WOP_M1 (XOR_data_M1)
|
||||
iv = data[NUM_WAYS - 1];
|
||||
WOP (STORE_data)
|
||||
@@ -759,14 +759,14 @@
|
||||
AES_D_IMC_m (w[2])
|
||||
do
|
||||
{
|
||||
- AES_D_IMC_m (w[1]);
|
||||
- AES_D_IMC_m (w[0]);
|
||||
+ AES_D_IMC_m (w[1])
|
||||
+ AES_D_IMC_m (w[0])
|
||||
w -= 2;
|
||||
}
|
||||
while (w != p);
|
||||
- AES_D_m (w[1]);
|
||||
- MM_XOR_m (w[0]);
|
||||
- MM_XOR_m (iv);
|
||||
+ AES_D_m (w[1])
|
||||
+ MM_XOR_m (w[0])
|
||||
+ MM_XOR_m (iv)
|
||||
iv = *data;
|
||||
*data = m;
|
||||
}
|
||||
@@ -809,11 +809,11 @@
|
||||
{
|
||||
const v128 *w = p;
|
||||
v128 m;
|
||||
- CTR_START (m, 0);
|
||||
+ CTR_START (m, 0)
|
||||
do
|
||||
{
|
||||
- AES_E_MC_m (w[0]);
|
||||
- AES_E_MC_m (w[1]);
|
||||
+ AES_E_MC_m (w[0])
|
||||
+ AES_E_MC_m (w[1])
|
||||
w += 2;
|
||||
}
|
||||
while (w != wEnd);
|
||||
diff -Naur a/C/LzmaEnc.c b/C/LzmaEnc.c
|
||||
--- a/C/LzmaEnc.c
|
||||
+++ b/C/LzmaEnc.c
|
||||
@@ -195,11 +195,11 @@
|
||||
unsigned GetPosSlot1(UInt32 pos)
|
||||
{
|
||||
unsigned res;
|
||||
- BSR2_RET(pos, res);
|
||||
+ BSR2_RET(pos, res)
|
||||
return res;
|
||||
}
|
||||
-#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
|
||||
-#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
|
||||
+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res) }
|
||||
+#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res) }
|
||||
|
||||
|
||||
#else // ! LZMA_LOG_BSR
|
||||
diff -Naur a/C/Sha1Opt.c b/C/Sha1Opt.c
|
||||
--- a/C/Sha1Opt.c
|
||||
+++ b/C/Sha1Opt.c
|
||||
@@ -300,26 +300,26 @@
|
||||
LOAD_SHUFFLE (m2, 2)
|
||||
LOAD_SHUFFLE (m3, 3)
|
||||
|
||||
- T(m0, c0); H(e1); C(e0);
|
||||
- T(m1, c0); SU0(m0, m1, m2); H(e0); C(e1);
|
||||
- T(m2, c0); SU0(m1, m2, m3); SU1(m0, m3); H(e1); C(e0);
|
||||
- T(m3, c0); SU0(m2, m3, m0); SU1(m1, m0); H(e0); C(e1);
|
||||
- T(m0, c0); SU0(m3, m0, m1); SU1(m2, m1); H(e1); C(e0);
|
||||
- T(m1, c1); SU0(m0, m1, m2); SU1(m3, m2); H(e0); P(e1);
|
||||
- T(m2, c1); SU0(m1, m2, m3); SU1(m0, m3); H(e1); P(e0);
|
||||
- T(m3, c1); SU0(m2, m3, m0); SU1(m1, m0); H(e0); P(e1);
|
||||
- T(m0, c1); SU0(m3, m0, m1); SU1(m2, m1); H(e1); P(e0);
|
||||
- T(m1, c1); SU0(m0, m1, m2); SU1(m3, m2); H(e0); P(e1);
|
||||
- T(m2, c2); SU0(m1, m2, m3); SU1(m0, m3); H(e1); M(e0);
|
||||
- T(m3, c2); SU0(m2, m3, m0); SU1(m1, m0); H(e0); M(e1);
|
||||
- T(m0, c2); SU0(m3, m0, m1); SU1(m2, m1); H(e1); M(e0);
|
||||
- T(m1, c2); SU0(m0, m1, m2); SU1(m3, m2); H(e0); M(e1);
|
||||
- T(m2, c2); SU0(m1, m2, m3); SU1(m0, m3); H(e1); M(e0);
|
||||
- T(m3, c3); SU0(m2, m3, m0); SU1(m1, m0); H(e0); P(e1);
|
||||
- T(m0, c3); SU0(m3, m0, m1); SU1(m2, m1); H(e1); P(e0);
|
||||
- T(m1, c3); SU1(m3, m2); H(e0); P(e1);
|
||||
- T(m2, c3); H(e1); P(e0);
|
||||
- T(m3, c3); H(e0); P(e1);
|
||||
+ T(m0, c0); H(e1); C(e0)
|
||||
+ T(m1, c0); SU0(m0, m1, m2) H(e0); C(e1)
|
||||
+ T(m2, c0); SU0(m1, m2, m3) SU1(m0, m3) H(e1); C(e0)
|
||||
+ T(m3, c0); SU0(m2, m3, m0) SU1(m1, m0) H(e0); C(e1)
|
||||
+ T(m0, c0); SU0(m3, m0, m1) SU1(m2, m1) H(e1); C(e0)
|
||||
+ T(m1, c1); SU0(m0, m1, m2) SU1(m3, m2) H(e0); P(e1)
|
||||
+ T(m2, c1); SU0(m1, m2, m3) SU1(m0, m3) H(e1); P(e0)
|
||||
+ T(m3, c1); SU0(m2, m3, m0) SU1(m1, m0) H(e0); P(e1)
|
||||
+ T(m0, c1); SU0(m3, m0, m1) SU1(m2, m1) H(e1); P(e0)
|
||||
+ T(m1, c1); SU0(m0, m1, m2) SU1(m3, m2) H(e0); P(e1)
|
||||
+ T(m2, c2); SU0(m1, m2, m3) SU1(m0, m3) H(e1); M(e0)
|
||||
+ T(m3, c2); SU0(m2, m3, m0) SU1(m1, m0) H(e0); M(e1)
|
||||
+ T(m0, c2); SU0(m3, m0, m1) SU1(m2, m1) H(e1); M(e0)
|
||||
+ T(m1, c2); SU0(m0, m1, m2) SU1(m3, m2) H(e0); M(e1)
|
||||
+ T(m2, c2); SU0(m1, m2, m3) SU1(m0, m3) H(e1); M(e0)
|
||||
+ T(m3, c3); SU0(m2, m3, m0) SU1(m1, m0) H(e0); P(e1)
|
||||
+ T(m0, c3); SU0(m3, m0, m1) SU1(m2, m1) H(e1); P(e0)
|
||||
+ T(m1, c3); SU1(m3, m2) H(e0); P(e1)
|
||||
+ T(m2, c3); H(e1); P(e0)
|
||||
+ T(m3, c3); H(e0); P(e1)
|
||||
|
||||
abcd = vaddq_u32(abcd, abcd_save);
|
||||
e0 += e0_save;
|
||||
diff -Naur a/C/Sha256Opt.c b/C/Sha256Opt.c
|
||||
--- a/C/Sha256Opt.c
|
||||
+++ b/C/Sha256Opt.c
|
||||
@@ -316,10 +316,10 @@
|
||||
LOAD_SHUFFLE (m2, 2)
|
||||
LOAD_SHUFFLE (m3, 3)
|
||||
|
||||
- R16 ( 0, NNN, NNN, SM1, NNN, SM1, SM2, SM1, SM2 );
|
||||
- R16 ( 1, SM1, SM2, SM1, SM2, SM1, SM2, SM1, SM2 );
|
||||
- R16 ( 2, SM1, SM2, SM1, SM2, SM1, SM2, SM1, SM2 );
|
||||
- R16 ( 3, SM1, SM2, NNN, SM2, NNN, NNN, NNN, NNN );
|
||||
+ R16 ( 0, NNN, NNN, SM1, NNN, SM1, SM2, SM1, SM2 )
|
||||
+ R16 ( 1, SM1, SM2, SM1, SM2, SM1, SM2, SM1, SM2 )
|
||||
+ R16 ( 2, SM1, SM2, SM1, SM2, SM1, SM2, SM1, SM2 )
|
||||
+ R16 ( 3, SM1, SM2, NNN, SM2, NNN, NNN, NNN, NNN )
|
||||
|
||||
state0 = vaddq_u32(state0, state0_save);
|
||||
state1 = vaddq_u32(state1, state1_save);
|
||||
diff -Naur a/CPP/Windows/System.h b/CPP/Windows/System.h
|
||||
--- a/CPP/Windows/System.h
|
||||
+++ b/CPP/Windows/System.h
|
||||
@@ -105,7 +105,7 @@
|
||||
}
|
||||
|
||||
void CpuZero() { }
|
||||
- void CpuSet(unsigned cpuIndex) { UNUSED_VAR(cpuIndex); }
|
||||
+ void CpuSet(unsigned cpuIndex) { UNUSED_VAR(cpuIndex) }
|
||||
int IsCpuSet(unsigned cpuIndex) const { return (cpuIndex < numSysThreads) ? 1 : 0; }
|
||||
|
||||
BOOL SetProcAffinity() const
|
|
@ -8,7 +8,7 @@ DRV_DIR="$PWD"
|
|||
OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
|
||||
# The best_release.json is not always up-to-date
|
||||
# In those cases you can force the version by calling `./update.sh <newer_version>`
|
||||
NEW_VERSION="${1:-$(curl 'https://sourceforge.net/projects/sevenzip/best_release.json' | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)}"
|
||||
NEW_VERSION="${1:-$(curl -H "Accept: application/json" 'https://sourceforge.net/projects/sevenzip/best_release.json' | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)}"
|
||||
|
||||
echo "comparing versions $OLD_VERSION => $NEW_VERSION"
|
||||
if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then
|
||||
|
|
47
pkgs/tools/misc/btc-rpc-explorer/default.nix
Normal file
47
pkgs/tools/misc/btc-rpc-explorer/default.nix
Normal file
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, python3
|
||||
, vips
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "btc-rpc-explorer";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janoside";
|
||||
repo = "btc-rpc-explorer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZGg3jwSl1XyzS9hMa2YqwExhHSNgrsUmSscZtfF2h54=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9pVjydGaEaHytZqwXv0/kaJAVqlE7zzuTvubBFTkuBg=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
'';
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vips
|
||||
];
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/janoside/btc-rpc-explorer/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Database-free, self-hosted Bitcoin explorer, via RPC to Bitcoin Core";
|
||||
homepage = "https://github.com/janoside/btc-rpc-explorer";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "btc-rpc-explorer";
|
||||
maintainers = with lib.maintainers; [ d-xo ];
|
||||
};
|
||||
}
|
28
pkgs/tools/misc/hyperpotamus/default.nix
Normal file
28
pkgs/tools/misc/hyperpotamus/default.nix
Normal file
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "hyperpotamus";
|
||||
version = "0.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pmarkert";
|
||||
repo = "hyperpotamus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dExkvObz+PNjqAZnigZHs/DCSHq31jDg9pgFmmtPmWk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-cH0VEhs4q13gnFKQmmu8fXjueBu/u7xtySE6HTm+bik=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
description = "YAML based HTTP script processing engine";
|
||||
homepage = "https://github.com/pmarkert/hyperpotamus";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "hyperpotamus";
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
};
|
||||
}
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerlab";
|
||||
version = "0.44.0";
|
||||
version = "0.44.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "srl-labs";
|
||||
repo = "containerlab";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r3rN1HSNz8aFjMjg/s1YNSgv9/YZZAgjowQXO81eT84=";
|
||||
hash = "sha256-W05FPyBAKnndrELXytrXzpfTcEtq3Q2RDvOQkKMpvwI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ddns-go";
|
||||
version = "5.6.0";
|
||||
version = "5.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeessy2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w9/5n5QKx+pNiA0wBTjjwllsAvsGUH53buwmx2CIZIg=";
|
||||
hash = "sha256-uVYTAJhTQDNknBZmE8uaX4h5lU7cb/cyzIoTV2iHGJ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-azsXfWa4w3wZaiy9AKy7UPOybikubcJvLsXthYedmbY=";
|
||||
|
|
28
pkgs/tools/networking/graphqurl/default.nix
Normal file
28
pkgs/tools/networking/graphqurl/default.nix
Normal file
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "graphqurl";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hasura";
|
||||
repo = "graphqurl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0dR8lLD0yatAvE3kA90cNOzVRTFpQmzN1l13hdFr3TM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-2kLmhNFO/ySa6S9rBNYCePmsYXWz006IxiOJ7ZUkgPw=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
description = "CLI and JS library for making GraphQL queries";
|
||||
homepage = "https://github.com/hasura/graphqurl";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "gq";
|
||||
maintainers = with lib.maintainers; [ bbigras ];
|
||||
};
|
||||
}
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocserv";
|
||||
version = "1.1.7";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "openconnect";
|
||||
repo = "ocserv";
|
||||
rev = version;
|
||||
sha256 = "sha256-30S2puoL+5cBZ5nCKW2zvGPcnFvaKjRZVGKDC3E5XRk=";
|
||||
sha256 = "sha256-EwjP4HKJEPMnn2tnJG7tPgHc49iQQm+V1mKx8CLOSkw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gperf pkg-config ronn ];
|
||||
|
|
32
pkgs/tools/text/markdownlint-cli2/default.nix
Normal file
32
pkgs/tools/text/markdownlint-cli2/default.nix
Normal file
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "markdownlint-cli2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DavidAnson";
|
||||
repo = "markdownlint-cli2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qtdR7Rhz+HLZJX82OrN+twOsvFOv99e4BBDVV1UayPI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Fx0lDcvzLRVSAX0apKmu1CBfnGmGQR9FQEdhHUtue/c=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
'';
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/DavidAnson/markdownlint-cli2/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "A fast, flexible, configuration-based command-line interface for linting Markdown/CommonMark files with the markdownlint library";
|
||||
homepage = "https://github.com/DavidAnson/markdownlint-cli2";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
37
pkgs/tools/typesetting/carbon-now-cli/default.nix
Normal file
37
pkgs/tools/typesetting/carbon-now-cli/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "carbon-now-cli";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mixn";
|
||||
repo = "carbon-now-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2fqZdPkVM3qBZKacBv9dX99Q9WnM5m7OpChG2n1TnXg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-UgrgnaA+GXRQT3dtAoMq6tsZZ2gV1CQNoYG58IuSZUM=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json \
|
||||
--replace "bundle/cli.js" "dist/cli.js" \
|
||||
--replace "trash " "rm -rf " \
|
||||
--replace "npx playwright install --with-deps" "true"
|
||||
'';
|
||||
|
||||
env = {
|
||||
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Beautiful images of your code — from right inside your terminal";
|
||||
homepage = "https://github.com/mixn/carbon-now-cli";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "carbon-now";
|
||||
maintainers = with lib.maintainers; [ rmcgibbo ];
|
||||
};
|
||||
}
|
|
@ -192,6 +192,8 @@ with pkgs;
|
|||
meta.platforms = lib.platforms.linux;
|
||||
} ../build-support/setup-hooks/auto-patchelf.sh;
|
||||
|
||||
tomato-c = callPackage ../applications/misc/tomato-c { };
|
||||
|
||||
appflowy = callPackage ../applications/office/appflowy { };
|
||||
|
||||
appimageTools = callPackage ../build-support/appimage { };
|
||||
|
@ -1658,10 +1660,14 @@ with pkgs;
|
|||
|
||||
basez = callPackage ../tools/misc/basez { };
|
||||
|
||||
btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { };
|
||||
|
||||
butler = callPackage ../games/itch/butler.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { };
|
||||
|
||||
cf-vault = callPackage ../tools/admin/cf-vault { };
|
||||
|
||||
cfonts = callPackage ../tools/misc/cfonts { };
|
||||
|
@ -1804,6 +1810,8 @@ with pkgs;
|
|||
|
||||
httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
|
||||
|
||||
hyperpotamus = callPackage ../tools/misc/hyperpotamus { };
|
||||
|
||||
immich-cli = callPackage ../tools/misc/immich-cli { };
|
||||
|
||||
inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;
|
||||
|
@ -1842,6 +1850,8 @@ with pkgs;
|
|||
|
||||
markdownlint-cli = callPackage ../tools/text/markdownlint-cli { };
|
||||
|
||||
markdownlint-cli2 = callPackage ../tools/text/markdownlint-cli2 { };
|
||||
|
||||
mbidled = callPackage ../tools/networking/mbidled { };
|
||||
|
||||
metapixel = callPackage ../tools/graphics/metapixel { };
|
||||
|
@ -17713,6 +17723,8 @@ with pkgs;
|
|||
|
||||
graphqlmap = callPackage ../tools/security/graphqlmap { };
|
||||
|
||||
graphqurl = callPackage ../tools/networking/graphqurl { };
|
||||
|
||||
groovy = callPackage ../development/interpreters/groovy { };
|
||||
|
||||
inherit (callPackages ../applications/networking/cluster/hadoop {
|
||||
|
@ -18921,6 +18933,8 @@ with pkgs;
|
|||
|
||||
cookiecutter = with python3Packages; toPythonApplication cookiecutter;
|
||||
|
||||
cordova = callPackage ../development/mobile/cordova { };
|
||||
|
||||
corrosion = callPackage ../development/tools/build-managers/corrosion { };
|
||||
|
||||
corundum = callPackage ../development/tools/corundum { };
|
||||
|
@ -19227,6 +19241,8 @@ with pkgs;
|
|||
|
||||
findnewest = callPackage ../development/tools/misc/findnewest { };
|
||||
|
||||
firebase-tools = callPackage ../development/tools/firebase-tools { };
|
||||
|
||||
flootty = callPackage ../development/tools/flootty { };
|
||||
|
||||
fffuu = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { });
|
||||
|
|
|
@ -326,6 +326,8 @@ self: super: with self; {
|
|||
|
||||
aioquic = callPackage ../development/python-modules/aioquic { };
|
||||
|
||||
aioquic-mitmproxy = callPackage ../development/python-modules/aioquic-mitmproxy { };
|
||||
|
||||
aiorecollect = callPackage ../development/python-modules/aiorecollect { };
|
||||
|
||||
aioredis = callPackage ../development/python-modules/aioredis { };
|
||||
|
@ -6564,6 +6566,8 @@ self: super: with self; {
|
|||
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio;
|
||||
};
|
||||
|
||||
minichain = callPackage ../development/python-modules/minichain { };
|
||||
|
||||
minidb = callPackage ../development/python-modules/minidb { };
|
||||
|
||||
minidump = callPackage ../development/python-modules/minidump { };
|
||||
|
@ -12755,6 +12759,8 @@ self: super: with self; {
|
|||
|
||||
tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { };
|
||||
|
||||
tinyrecord = callPackage ../development/python-modules/tinyrecord { };
|
||||
|
||||
tissue = callPackage ../development/python-modules/tissue { };
|
||||
|
||||
titlecase = callPackage ../development/python-modules/titlecase { };
|
||||
|
@ -13328,6 +13334,8 @@ self: super: with self; {
|
|||
|
||||
urwid-readline = callPackage ../development/python-modules/urwid-readline { };
|
||||
|
||||
urwid-mitmproxy = callPackage ../development/python-modules/urwid-mitmproxy { };
|
||||
|
||||
usb-devices = callPackage ../development/python-modules/usb-devices { };
|
||||
|
||||
usbrelay-py = callPackage ../os-specific/linux/usbrelay/python.nix { };
|
||||
|
|
Loading…
Reference in a new issue