Merge staging-next into staging
This commit is contained in:
commit
77394c111b
6
.github/CODEOWNERS
vendored
6
.github/CODEOWNERS
vendored
@ -108,9 +108,9 @@
|
||||
/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn
|
||||
|
||||
# Perl
|
||||
/pkgs/development/interpreters/perl @stigtsp @zakame
|
||||
/pkgs/top-level/perl-packages.nix @stigtsp @zakame
|
||||
/pkgs/development/perl-modules @stigtsp @zakame
|
||||
/pkgs/development/interpreters/perl @stigtsp @zakame @dasJ
|
||||
/pkgs/top-level/perl-packages.nix @stigtsp @zakame @dasJ
|
||||
/pkgs/development/perl-modules @stigtsp @zakame @dasJ
|
||||
|
||||
# R
|
||||
/pkgs/applications/science/math/R @jbedo
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "termusic";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4o36h/x4+h2H4xpgPfOgIza6zNANyhmSM3Cm1XwWb7w=";
|
||||
sha256 = "sha256-5I9Fu+A5IBfaxaPcYKTzWq3/8ts0BPSOOVeU6D61dbc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WHxrMD6W7UyJg8HhjxWlm9KQ5SKsM6fLdvhDzBb16pI=";
|
||||
cargoHash = "sha256-R/hElL0MjeBqboJTQkIREPOh+/YbdKtUAzqPD6BpSPs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ alsa-lib ];
|
||||
|
@ -25,14 +25,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rofi-unwrapped";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davatorium";
|
||||
repo = "rofi";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-xAGhwzm+L8/aBJ65zfbnHyZFlg5x0b2s1x1aTC2I5po=";
|
||||
sha256 = "sha256-3XFusKeckagEPfbLtt1xAVTEfn1Qebdi/Iq1AYbHCR4=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmrig-proxy";
|
||||
version = "6.15.1";
|
||||
version = "6.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig-proxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VbHymVc/swrRaEBqvYlCEVjYeU0ii9oSr+b6q0hlCaQ=";
|
||||
sha256 = "sha256-3Tp0wTL3uHs0N4CdlNusvpuam653b6qUZu9/KBT4HOM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -1,10 +1,11 @@
|
||||
{ buildPythonApplication
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, attrs
|
||||
, click
|
||||
, cloudflare
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, poetry
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
@ -13,6 +14,7 @@
|
||||
buildPythonApplication rec {
|
||||
pname = "cloudflare-dyndns";
|
||||
version = "4.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kissgyorgy";
|
||||
@ -21,9 +23,9 @@ buildPythonApplication rec {
|
||||
hash = "sha256-6Q5fpJ+HuQ+hc3xTtB5tR43pn9WZ0nZZR723iLAkpis=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
@ -33,19 +35,31 @@ buildPythonApplication rec {
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/kissgyorgy/cloudflare-dyndns/pull/22
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/kissgyorgy/cloudflare-dyndns/commit/741ed1ccb3373071ce15683a3b8ddc78d64866f8.patch";
|
||||
sha256 = "sha256-mjSah0DWptZB6cjhP6dJg10BpJylPSQ2K4TKda7VmHw=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'click = "^7.0"' 'click = "*"'
|
||||
--replace 'click = "^7.0"' 'click = "*"' \
|
||||
--replace 'attrs = "^21.1.0"' 'attrs = "*"'
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTests = [
|
||||
"test_get_ipv4"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = " CloudFlare Dynamic DNS client ";
|
||||
description = "CloudFlare Dynamic DNS client";
|
||||
homepage = "https://github.com/kissgyorgy/cloudflare-dyndns";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atlantis";
|
||||
version = "0.19.7";
|
||||
version = "0.19.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runatlantis";
|
||||
repo = "atlantis";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wnYLZ/mSNco8lIr6zmVoGGVGnOBWAzXgB+uy5U5Os4A=";
|
||||
sha256 = "sha256-o8lBpiR8gIo1kyOTkPOIuMnJbJsi619Zl0bAAFGYM4E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nNZLL8S32vGfQkDD+vI4ovUvZZgGzgQmb8BAGBb+R4k=";
|
||||
vendorSha256 = "sha256-aEMRCvZBaY1uwZqKtMmZ4aiPdNmtANcnuE7eykBiTQg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
@ -73,7 +73,7 @@ let
|
||||
in
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
@ -82,7 +82,7 @@ env.mkDerivation rec {
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "06va1b5dac7a2av6vc0xin27y1hfnf4xbafy10myv33am8l5222m";
|
||||
sha256 = "0b8nwimks6hfnb3bqik8d4s9z689hhj4p9ykqgc36pmpr54nyma8";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, wrapGAppsHook
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, unzip
|
||||
, xdg-utils
|
||||
, gtk3
|
||||
, jdk
|
||||
, gradle
|
||||
, perl
|
||||
@ -78,11 +79,13 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
jdk
|
||||
gradle
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
copyDesktopItems
|
||||
unzip
|
||||
];
|
||||
|
||||
buildInputs = [ gtk3 ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
@ -118,17 +121,22 @@ stdenv.mkDerivation rec {
|
||||
tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1
|
||||
unzip $out/lib/javafx-web-18-linux${lib.optionalString stdenv.isAarch64 "-aarch64"}.jar libjfxwebkit.so -d $out/lib/
|
||||
|
||||
wrapProgram $out/bin/JabRef \
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||
--set JAVA_HOME "${jdk}" \
|
||||
--set JAVA_OPTS "-Djava.library.path=$out/lib/ --patch-module org.jabref=$out/share/java/jabref/resources/main"
|
||||
|
||||
# lowercase alias (for convenience and required for browser extensions)
|
||||
ln -sf $out/bin/JabRef $out/bin/jabref
|
||||
|
||||
rm $out/bin/JabRef.bat
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
|
||||
--set JAVA_HOME "${jdk}"
|
||||
--set JAVA_OPTS "-Djava.library.path=$out/lib/ --patch-module org.jabref=$out/share/java/jabref/resources/main"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source bibliography reference manager";
|
||||
homepage = "https://www.jabref.org";
|
||||
|
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "morgen";
|
||||
version = "2.5.8";
|
||||
version = "2.5.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
|
||||
sha256 = "sha256-8WFDhEWrVGah2pyhTuaZYamiqQltC8zY2D411rOFBaE=";
|
||||
sha256 = "sha256-WGBn4ZLERGXNPBRDoxhsOcnRT07wEdCO6+sUq/l7Hok=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -18,6 +18,8 @@ stdenvNoCC.mkDerivation rec {
|
||||
sha256 = "sha256-ZE/uYBKB2popdIdZWA8AvyJiwMzt32u6u/H/AyNcoVo=";
|
||||
};
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
APP_DIR="$out/Applications/iTerm2.app"
|
||||
|
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.24.0";
|
||||
version = "1.24.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-sQ8Qorf74ypMmpRd9b/wrqg28TZ295t6qkKosxyaG1I=";
|
||||
sha256 = "sha256-HUiz1t5wxUPR2elxE1Q5/BwRnkHgzej2HsrZnFbhHhA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
@ -225,7 +225,7 @@ stdenv.mkDerivation ({
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
inherit
|
||||
(import ../common/strip-attributes.nix { inherit stdenv; })
|
||||
(import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
@ -233,7 +233,7 @@ stdenv.mkDerivation ({
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
inherit
|
||||
(import ../common/strip-attributes.nix { inherit stdenv; })
|
||||
(import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
@ -228,7 +228,7 @@ stdenv.mkDerivation ({
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
inherit
|
||||
(import ../common/strip-attributes.nix { inherit stdenv; })
|
||||
(import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
@ -233,7 +233,7 @@ stdenv.mkDerivation ({
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
inherit
|
||||
(import ../common/strip-attributes.nix { inherit stdenv; })
|
||||
(import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
@ -253,7 +253,7 @@ stdenv.mkDerivation ({
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
inherit
|
||||
(import ../common/strip-attributes.nix { inherit stdenv; })
|
||||
(import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
@ -264,7 +264,7 @@ stdenv.mkDerivation ({
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
inherit
|
||||
(import ../common/strip-attributes.nix { inherit stdenv; })
|
||||
(import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
@ -232,7 +232,7 @@ stdenv.mkDerivation ({
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
inherit
|
||||
(import ../common/strip-attributes.nix { inherit stdenv; })
|
||||
(import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
@ -213,7 +213,7 @@ stdenv.mkDerivation ({
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
inherit
|
||||
(import ../common/strip-attributes.nix { inherit stdenv; })
|
||||
(import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
@ -227,7 +227,7 @@ stdenv.mkDerivation ({
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
inherit
|
||||
(import ../common/strip-attributes.nix { inherit stdenv; })
|
||||
(import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv }:
|
||||
{ lib, stdenv, langJit }:
|
||||
|
||||
{
|
||||
# Note [Cross-compiler stripping]
|
||||
@ -48,7 +48,8 @@
|
||||
lib{,32,64}/gcc/${stdenv.targetPlatform.config}/*/*.{a,o,so*}
|
||||
)
|
||||
popd
|
||||
|
||||
'' + lib.optionalString (!langJit) ''
|
||||
${/*keep indentation*/ ""}
|
||||
pushd $lib
|
||||
local -ar libHostFiles=(
|
||||
lib{,32,64}/*.{a,o,so*}
|
||||
@ -58,6 +59,7 @@
|
||||
)
|
||||
popd
|
||||
|
||||
'' + ''
|
||||
eval "$oldOpts"
|
||||
|
||||
stripDebugList="$stripDebugList ''${outHostFiles[*]} ''${libHostFiles[*]}"
|
||||
|
@ -1,21 +1,21 @@
|
||||
|
||||
{ newScope, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
callPackage = newScope self;
|
||||
|
||||
version = "6.0.2";
|
||||
version = "6.1.4";
|
||||
|
||||
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
|
||||
src = fetchFromGitHub {
|
||||
owner = "platformio";
|
||||
repo = "platformio-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yfUF9+M45ZSjmB275kTs8+/Q8Q5FMmr63e3Om8dPi2k=";
|
||||
sha256 = "sha256-PLVsXnaflEZdn12lWrpnm8+uNfwB+T7JXnvjQihfuSs=";
|
||||
};
|
||||
|
||||
self = {
|
||||
platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
|
||||
};
|
||||
|
||||
in self
|
||||
in
|
||||
self
|
||||
|
@ -1,17 +1,23 @@
|
||||
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
|
||||
index 416dccfd..896c3649 100644
|
||||
index 1e5f935a..26d1ac6a 100644
|
||||
--- a/platformio/package/manifest/schema.py
|
||||
+++ b/platformio/package/manifest/schema.py
|
||||
@@ -253,9 +253,6 @@ class ManifestSchema(BaseSchema):
|
||||
@@ -276,9 +276,12 @@ class ManifestSchema(BaseSchema):
|
||||
@staticmethod
|
||||
@memoized(expire="1h")
|
||||
def load_spdx_licenses():
|
||||
- version = "3.17"
|
||||
- version = "3.18"
|
||||
- spdx_data_url = (
|
||||
- "https://raw.githubusercontent.com/spdx/license-list-data/"
|
||||
- "v%s/json/licenses.json" % version
|
||||
- )
|
||||
- return json.loads(fetch_remote_content(spdx_data_url))
|
||||
+ # version = "3.18"
|
||||
+ # spdx_data_url = (
|
||||
+ # "https://raw.githubusercontent.com/spdx/license-list-data/"
|
||||
+ # "v%s/json/licenses.json" % version
|
||||
+ # )
|
||||
+ # return json.loads(fetch_remote_content(spdx_data_url))
|
||||
+ with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f:
|
||||
+ spdx = json.load(f)
|
||||
+ return spdx
|
||||
|
@ -12,7 +12,7 @@ in rec {
|
||||
|
||||
getdns = stdenv.mkDerivation rec {
|
||||
pname = "getdns";
|
||||
version = "1.7.0";
|
||||
version = "1.7.2";
|
||||
outputs = [ "out" "dev" "lib" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
@ -20,7 +20,9 @@ in rec {
|
||||
with builtins;
|
||||
concatStringsSep "-" (splitVersion version)
|
||||
}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-6ocTzl4HesdrFBjOtq/SXm1OOelgD29egdOjoTpg9lI=";
|
||||
sha256 =
|
||||
# upstream publishes hashes in hex format
|
||||
"db89fd2a940000e03ecf48d0232b4532e5f0602e80b592be406fd57ad76fdd17";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
@ -49,7 +51,7 @@ in rec {
|
||||
|
||||
stubby = stdenv.mkDerivation rec {
|
||||
pname = "stubby";
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
outputs = [ "out" "man" "stubbyExampleJson" ];
|
||||
|
||||
inherit (getdns) src;
|
||||
|
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.87.0";
|
||||
version = "1.93.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-iRGLNMGs5WawzcqQb5AQTuD4NCJoBUSHfFUXXvm5+jE=";
|
||||
hash = "sha256-nAVZHCp28/ePYtBVSJNmR5728q5lCPGO5VP+6vKbAYo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-bmtm+cvjBIlZVRq/vjHd5Sl4FXJHP3cPp4+bWY5SKus=";
|
||||
hash = "sha256-m6t/wkCRrILKdR5/NjGlACUuDJydjEKpm178BjPFDbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
|
||||
{ lib, stdenv, fetchurl, boost, fastjet, fixDarwinDylibNames, hepmc, lhapdf, rsync, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pythia";
|
||||
@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-5bFNRKpZQzMuMt1d2poY/dGgCFxxmOKNhA4EFn+mAT0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rsync ];
|
||||
nativeBuildInputs = [ rsync ]
|
||||
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
|
||||
buildInputs = [ boost fastjet hepmc zlib lhapdf ];
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -16,23 +16,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adblock";
|
||||
version = "0.5.2";
|
||||
version = "0.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Pypi only has binary releases
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArniDagur";
|
||||
repo = "python-adblock";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-6FH+AVK7+Yg1a6oKbFV80TuGGE4Y7I3mMVzwVHdHYO4=";
|
||||
hash = "sha256-5g5xdUzH/RTVwu4Vfb5Cb1t0ruG0EXgiXjrogD/+JCU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-JI/C+Woi/dJWUGUum8daecjFWiQgxY6BFYZ5MpTcRvU=";
|
||||
hash = "sha256-1xmYmF5P7a5O9MilxDy+CVhmWMGRetdM2fGvTPy7JmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
41
pkgs/development/python-modules/aioairq/default.nix
Normal file
41
pkgs/development/python-modules/aioairq/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pycryptodome
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairq";
|
||||
version = "0.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CorantGmbH";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BvesFiXiVlgfaffWfNcP1K9XUOL2qU8F/sdvRKNcuS4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pycryptodome
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aioairq"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to retrieve data from air-Q devices";
|
||||
homepage = "https://github.com/CorantGmbH/aioairq";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -16,13 +16,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "basemap";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matplotlib";
|
||||
repo = "basemap";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-ObRQ5GsYx3k7fLaaK5Z4Td54rW/Nnx5+2zm8KLCIZl8=";
|
||||
sha256 = "sha256-F/6xPmdXSJAuASyFaKOP+6Jz8U2JRZdqErEH7PFkr/w=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/packages/basemap";
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blebox-uniapi";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blebox";
|
||||
repo = "blebox_uniapi";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA=";
|
||||
sha256 = "sha256-mJaUB4kEm+eRh3Kc+SiTCSSmCmBEJBVZ5uah95MJX64=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -0,0 +1,36 @@
|
||||
{ buildPythonPackage
|
||||
, cryptography
|
||||
, django
|
||||
, fetchPypi
|
||||
, lib
|
||||
, poetry-core
|
||||
, pythonOlder }:
|
||||
buildPythonPackage rec {
|
||||
pname = "django-encrypted-model-fields";
|
||||
version = "0.6.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-i9IcVWXA1k7E29N1rTT+potNotuHHew/px/nteQiHJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
django
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "encrypted_model_fields" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of fields that wrap standard Django fields with encryption provided by the python cryptography library";
|
||||
homepage = "https://gitlab.com/lansharkconsulting/django/django-encrypted-model-fields";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ centromere ];
|
||||
};
|
||||
}
|
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastavro";
|
||||
version = "1.5.3";
|
||||
version = "1.6.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-6Zs4Whf/9c829D3tHvrhOzVRjYzqomcT9wzrBCklQmc=";
|
||||
sha256 = "sha256-n9/M/blE+fvknUvlIlTWLqOhxo2Su3lj548enUf1DUg=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
@ -4,7 +4,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.5.3";
|
||||
version = "2.6.0";
|
||||
pname = "gsd";
|
||||
disabled = isPy27;
|
||||
|
||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
owner = "glotzerlab";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-3CJKpvgJuFC/2qQdy0H/kvLbtmfF22gBAQustK99uEE=";
|
||||
sha256 = "sha256-GVb05uy5HKIn+fARFBN+mK54y2CtFBM8At21VUFr7tc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
@ -1,28 +1,41 @@
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, six
|
||||
, flake8, pep8-naming, pytest, pytest-cov }:
|
||||
{ lib
|
||||
, attrs
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonlines";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbolster";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1242bvk208vjaw8zl1d7ydb0i05v8fwdgi92d3bi1vaji9s2hv65";
|
||||
hash = "sha256-eMpUk5s49OyD+cNGdAeKA2LvpXdKta2QjZIFDnIBKC8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
];
|
||||
|
||||
checkInputs = [ flake8 pep8-naming pytest pytest-cov ];
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jsonlines"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to simplify working with jsonlines and ndjson data";
|
||||
homepage = "https://github.com/wbolster/jsonlines";
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -13,25 +13,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mahotas";
|
||||
version = "1.4.12";
|
||||
version = "1.4.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luispedro";
|
||||
repo = "mahotas";
|
||||
rev = "v${version}";
|
||||
sha256 = "1n19yha1cqyx7hnlici1wkl7n68dh0vbpsyydfhign2c0w9jvg42";
|
||||
sha256 = "sha256-AmctF/9hLgHw6FUm0s61eCdcc12lBa1t0OkXclis//w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-freeimage-tests.patch";
|
||||
url = "https://github.com/luispedro/mahotas/commit/08cc4aa0cbd5dbd4c37580d52b822810c03b2c69.patch";
|
||||
sha256 = "0389sz7fyl8h42phw8sn4pxl4wc3brcrj9d05yga21gzil9bfi23";
|
||||
excludes = [ "ChangeLog" ];
|
||||
})
|
||||
propagatedBuildInputs = [
|
||||
freeimage
|
||||
imread
|
||||
numpy
|
||||
pillow
|
||||
scipy
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ numpy imread pillow scipy freeimage ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,19 +1,20 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, colorful
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, httpx
|
||||
, packaging
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, colorful
|
||||
, rich
|
||||
, tomlkit
|
||||
, git
|
||||
, packaging
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "22.7.2";
|
||||
version = "22.8.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JvmdxkgWIcXQ7ML1Sx6/YeH5WXyq/UCEZlTc9nJbcQQ=";
|
||||
hash = "sha256-oWk6t7PocF7go7EE7nQjHA78G0Q1tAOXBff2zKXDvgU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -31,9 +32,10 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorful
|
||||
tomlkit
|
||||
httpx
|
||||
packaging
|
||||
requests
|
||||
rich
|
||||
tomlkit
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@ -47,6 +49,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"PrepareTestCase"
|
||||
# Signing fails
|
||||
"test_find_no_signing_key"
|
||||
"test_find_signing_key"
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifiprotect";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "briis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ID3KSKPtgslS1Z+BZprMcTSQUnQbiHKgGQQipOSER9g=";
|
||||
hash = "sha256-KGPPnyjFbKmNdFosn+4WvQH1rxDsiOEH9qmb3Zq8Xb8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -46,7 +46,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.9.0";
|
||||
version = "1.9.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -55,7 +55,7 @@ buildPythonPackage rec {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = version;
|
||||
hash = "sha256-sZpM9wgybyt/5Rw3X05whLvQNMC55o+s7eYA4QJdj6c=";
|
||||
hash = "sha256-MUO0leSm6yU29rtTJpv49PO3yEN66EyGEYN8ThH6L7A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
34
pkgs/development/python-modules/turnt/default.nix
Normal file
34
pkgs/development/python-modules/turnt/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, click, tomli }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "turnt";
|
||||
version = "1.8.0";
|
||||
format = "flit";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c6cfcb68a3353032c4ce6fff352196e723d05f9cee23eaf4f36d4dcfd89b8e49";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
tomli
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
$out/bin/turnt test/*/*.t
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "turnt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Snapshot testing tool";
|
||||
homepage = "https://github.com/cucapra/turnt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ leungbk ];
|
||||
};
|
||||
}
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "actionlint";
|
||||
version = "1.6.15";
|
||||
version = "1.6.16";
|
||||
|
||||
subPackages = [ "cmd/actionlint" ];
|
||||
|
||||
@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AhV5D0ujTjYvlcEbmqSZ2VPTKDQHZ6/lJpt9DlY2q7c=";
|
||||
sha256 = "sha256-WcAQUoyu8ZaqEACoTQNJLoR+N9psZmUTHp/C4qBrpcs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wKK597mk51jT6s1eKA4AjiCvI4IkZ9WjMXxaY8AWwkU=";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.2.11";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hRr6p/qV6+GrEAADClg4NDTVgkSkY8O6YiLLo6ldFqo=";
|
||||
sha256 = "sha256-iwg4mo8E3RV1NRX/95FXKmDJxcUJDk+sV14ehdI8d68=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-xu7BjZRp0IiCImhJi5GrSuBk4BsIVKJFOXyOvV3ruRY=";
|
||||
cargoSha256 = "sha256-/3XqnH6x7b319Y3Q5RDCH4FHF2GAaP2kMLSEPeJyNqI=";
|
||||
|
||||
cargoBuildFlags = [ "--package" "lang-srv" ];
|
||||
|
||||
|
27
pkgs/development/tools/misc/om4/default.nix
Normal file
27
pkgs/development/tools/misc/om4/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchFromGitHub, bison, flex, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "om4";
|
||||
version = "6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibara";
|
||||
repo = "m4";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "04h76hxwb5rs3ylkw1dv8k0kmkzl84ccqlwdwxb6i0x57rrqbgzx";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
||||
configureFlags = [ "--enable-m4" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Portable OpenBSD m4 macro processor";
|
||||
homepage = "https://github.com/ibara/m4";
|
||||
license = with licenses; [ bsd2 bsd3 isc publicDomain ];
|
||||
mainProgram = "m4";
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.ninjin ];
|
||||
};
|
||||
}
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.112.0";
|
||||
version = "0.113.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Q2qZI5Y+qyt71orPh9zNfEylBeJw4o9SA3BnlI/h5yg=";
|
||||
sha256 = "sha256-I7zAICnc9MqQtk3KXixJenfTWsZSlxYjhj48bdgtU3w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-MZUd8muhso8a6Houv1Mf/6+SC0hD4UnjIFssB9wscaQ=";
|
||||
vendorSha256 = "sha256-nIoVmuD4kW0SeFLqsZgw0fZmbhdNN8VTqlmaB9SRU6s=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
33
pkgs/development/tools/rars/default.nix
Normal file
33
pkgs/development/tools/rars/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, fetchurl, stdenvNoCC, makeWrapper, jre }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "rars";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/TheThirdOne/rars/releases/download/v${version}/rars1_5.jar";
|
||||
sha256 = "sha256-w75gfARfR46Up6qng1GYL0u8ENfpD3xHhl/yp9lEcUE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
export JAR=$out/share/java/${pname}/${pname}.jar
|
||||
install -D $src $JAR
|
||||
makeWrapper ${jre}/bin/java $out/bin/${pname} \
|
||||
--add-flags "-jar $JAR"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "RISC-V Assembler and Runtime Simulator";
|
||||
homepage = "https://github.com/TheThirdOne/rars";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ athas ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
{ callPackage, python3, enableNpm ? true }:
|
||||
{ callPackage, python3, fetchpatch, enableNpm ? true }:
|
||||
|
||||
let
|
||||
buildNodejs = callPackage ./nodejs.nix {
|
||||
@ -11,5 +11,13 @@ buildNodejs {
|
||||
sha256 = "sha256-iDSjPJLf5rqJA+ZxXK6qJd/0ZX5wPFTNBuwRNJPiw8I=";
|
||||
patches = [
|
||||
./disable-darwin-v8-system-instrumentation.patch
|
||||
# Fix npm silently fail without a HOME directory https://github.com/npm/cli/issues/4996
|
||||
(fetchpatch {
|
||||
url = "https://github.com/npm/cli/commit/9905d0e24c162c3f6cc006fa86b4c9d0205a4c6f.patch";
|
||||
sha256 = "sha256-RlabXWtjzTZ5OgrGf4pFkolonvTDIPlzPY1QcYDd28E=";
|
||||
includes = [ "deps/npm/lib/npm.js" "deps/npm/lib/utils/log-file.js" ];
|
||||
stripLen = 1;
|
||||
extraPrefix = "deps/npm/";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neo4j";
|
||||
version = "4.4.8";
|
||||
version = "4.4.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
|
||||
sha256 = "34c8ce7edc2ab9f63a204f74f37621cac3427f12b0aef4c6ef47eaf4c2b90d66";
|
||||
sha256 = "sha256-hp7Lic42/kV7TUxPyqSP3y8tc5xFMjvSyMzfCaoRq78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.108.0";
|
||||
version = "0.109.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pF0h+wIjaBkD/dFyD9HWFLhjmdYLfBfKsdGXPH9X+vg=";
|
||||
sha256 = "sha256-C4BeQoNYAcY5nKqjXlYimJGpsrQfhaNHmgjz9FjZZiM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vHlEZtXQIRObPyauKuBw1DyQb1WLFsSYPbl95McHbig=";
|
||||
vendorSha256 = "sha256-M6vwwS7JdK9sYltXxz/fScqny2qYoESJtmLWjBZnKLM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "lxd";
|
||||
version = "5.4";
|
||||
version = "5.5";
|
||||
|
||||
goPackagePath = "github.com/lxc/lxd";
|
||||
|
||||
@ -20,7 +20,7 @@ buildGoPackage rec {
|
||||
"https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
|
||||
"https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-4jS2fFB30F4i+VjjJWvZHyYkUFRZk9Cq8bTOK9uZOTo=";
|
||||
sha256 = "sha256-Ri5mwDtesI6vOjtb5L5zBD469jIYx5rxAJib0Bja8ps=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff --git c/Cargo.lock i/Cargo.lock
|
||||
index 9b8929c..8e1e923 100644
|
||||
--- c/Cargo.lock
|
||||
+++ i/Cargo.lock
|
||||
@@ -303,6 +303,7 @@ dependencies = [
|
||||
"lodepng",
|
||||
"loop9",
|
||||
"natord",
|
||||
+ "num-traits",
|
||||
"pbr",
|
||||
"quick-error",
|
||||
"resize",
|
@ -2,18 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gifski";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageOptim";
|
||||
repo = "gifski";
|
||||
rev = version;
|
||||
sha256 = "sha256-cycgrQ1f0x1tPziQCRyqWinG8v0SVYW3LpFsxhZpQhE=";
|
||||
sha256 = "sha256-Y2gNVm8Ziq3ipfgqRLbw1Hrd0ry556b78riWCo9sg3s=";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./cargo.lock-fix-missing-dependency.patch ];
|
||||
|
||||
cargoSha256 = "sha256-qJ+awu+Ga3fdxaDKdSzCcdyyuKCheb87qT7tX1dL1zo=";
|
||||
cargoSha256 = "sha256-KH+RoPilgigBzvQaY542Q9cImNVeYlL7QGnslBWHtwE=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.31.2";
|
||||
version = "0.31.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-btuBVG/ZF996RLTfB6HvMRuuZOwJGAMvoefVtw9SjME=";
|
||||
sha256 = "sha256-4iljPNw/tS/COStARg2PlrCoeE0lkSQ5+r8BrnxFLMo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-r5+BBiC2IS7DAKTwPNW6mM41nlIgSeP4cNPRWXNFkrU=";
|
||||
cargoSha256 = "sha256-Ilz7Efa8QXXcNXx+GvYzrOeRFNJDnK4+3HfqFIX4V0Q=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandown
|
||||
|
@ -4,12 +4,12 @@ with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pynitrokey";
|
||||
version = "0.4.26";
|
||||
version = "0.4.27";
|
||||
format = "flit";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OuLR6txvoOpOUYpkjA5UkXUIIa1hYCwTmmPuUC3i4zM=";
|
||||
sha256 = "sha256-aWQhMvATcDtyBtj38mGnypkKIqKQgneBzWDh5o/5Wkc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook-mermaid";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badboy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Fd6TCmi1PnDJP2osMJNtEGzrI1Ay8s/XkhpzI+DLrGA=";
|
||||
sha256 = "sha256-zXgXgcMF7MOa9Vx3rhv9aavqRCfMcyRLtaWEvYlyaTs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-W/HSPT7X5B4Gyg806H3nm0wWlF89gutW530dgZ/qJLo=";
|
||||
cargoSha256 = "sha256-sV/1caeXq/he92cvAajDL7pZJNiXCzf/DDXKnPKU4XQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
@ -8276,9 +8276,9 @@ with pkgs;
|
||||
|
||||
nodenv = callPackage ../development/tools/nodenv { };
|
||||
|
||||
nodejs = hiPrio nodejs-16_x;
|
||||
nodejs = hiPrio nodejs-18_x;
|
||||
|
||||
nodejs-slim = nodejs-slim-16_x;
|
||||
nodejs-slim = nodejs-slim-18_x;
|
||||
|
||||
nodejs-14_x = callPackage ../development/web/nodejs/v14.nix {
|
||||
openssl = openssl_1_1;
|
||||
@ -16234,6 +16234,8 @@ with pkgs;
|
||||
gnum4 = callPackage ../development/tools/misc/gnum4 { };
|
||||
m4 = gnum4;
|
||||
|
||||
om4 = callPackage ../development/tools/misc/om4 { };
|
||||
|
||||
gnumake = callPackage ../development/tools/build-managers/gnumake { };
|
||||
gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
|
||||
|
||||
@ -35701,6 +35703,8 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
rars = callPackage ../development/tools/rars { };
|
||||
|
||||
rargs = callPackage ../tools/misc/rargs { };
|
||||
|
||||
rancher = callPackage ../applications/networking/cluster/rancher { };
|
||||
|
@ -258,6 +258,8 @@ in {
|
||||
|
||||
aioairzone = callPackage ../development/python-modules/aioairzone { };
|
||||
|
||||
aioairq = callPackage ../development/python-modules/aioairq { };
|
||||
|
||||
aioaladdinconnect = callPackage ../development/python-modules/aioaladdinconnect { };
|
||||
|
||||
aioambient = callPackage ../development/python-modules/aioambient { };
|
||||
@ -2482,6 +2484,8 @@ in {
|
||||
|
||||
django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { };
|
||||
|
||||
django-encrypted-model-fields = callPackage ../development/python-modules/django-encrypted-model-fields { };
|
||||
|
||||
django-environ = callPackage ../development/python-modules/django_environ { };
|
||||
|
||||
django-extensions = callPackage ../development/python-modules/django-extensions { };
|
||||
@ -11000,6 +11004,8 @@ in {
|
||||
inherit (pkgs.libsForQt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
turnt = callPackage ../development/python-modules/turnt { };
|
||||
|
||||
tuya-iot-py-sdk = callPackage ../development/python-modules/tuya-iot-py-sdk { };
|
||||
|
||||
tuyaha = callPackage ../development/python-modules/tuyaha { };
|
||||
|
Loading…
Reference in New Issue
Block a user