Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f90dd167f5
|
|
@ -154,7 +154,7 @@ Here is how your `default.nix` file would look for a phoenix project.
|
|||
with import <nixpkgs> { };
|
||||
|
||||
let
|
||||
# beam.interpreters.erlang_23 is available if you need a particular version
|
||||
# beam.interpreters.erlang_26 is available if you need a particular version
|
||||
packages = beam.packagesWith beam.interpreters.erlang;
|
||||
|
||||
pname = "your_project";
|
||||
|
|
|
|||
|
|
@ -18390,7 +18390,7 @@
|
|||
};
|
||||
weathercold = {
|
||||
name = "Weathercold";
|
||||
email = "weathercold.scr@gmail.com";
|
||||
email = "weathercold.scr@proton.me";
|
||||
matrix = "@weathercold:matrix.org";
|
||||
github = "Weathercold";
|
||||
githubId = 49368953;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.trust-dns;
|
||||
toml = pkgs.formats.toml { };
|
||||
|
|
@ -55,7 +54,7 @@ in
|
|||
defaultText = "pkgs.trust-dns";
|
||||
description = mdDoc ''
|
||||
Trust-dns package to use.
|
||||
Only `bin/named` need be provided: the other trust-dns utilities (client and resolver) are not needed.
|
||||
Only `bin/trust-dns` need be provided: the other trust-dns utilities (client and resolver) are not needed.
|
||||
'';
|
||||
};
|
||||
quiet = mkOption {
|
||||
|
|
@ -136,7 +135,7 @@ in
|
|||
flags = (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet");
|
||||
flagsStr = builtins.concatStringsSep " " flags;
|
||||
in ''
|
||||
${cfg.package}/bin/named --config ${configFile} ${flagsStr}
|
||||
${cfg.package}/bin/trust-dns --config ${configFile} ${flagsStr}
|
||||
'';
|
||||
Type = "simple";
|
||||
Restart = "on-failure";
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = if unrarSupport
|
||||
then lib.licenses.unfreeRedistributable
|
||||
else lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ pSub AndersonTorres ];
|
||||
maintainers = with lib.maintainers; [ pSub ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeone";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubermatic";
|
||||
repo = "kubeone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dLpe3C1gMnEyajJFPawDlTchYKA8cAy2QUAae6+7QBQ=";
|
||||
hash = "sha256-izUjiRQAdTpdk86s1lQwLfpHy4eJo3mGAgTwWfGkNAQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aCRrf/E4UVL6PwUPRRzLjD+MzL8gcNJrc2IgKKyIIHI=";
|
||||
vendorHash = "sha256-AFyvTv1uVeq2KtRG6VToTBnX+8tHorDZPSturJhsrG4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -28,6 +28,27 @@
|
|||
, extraPackages ? []
|
||||
# For Adding additional python packaages
|
||||
, extraPythonPackages ? []
|
||||
, soapysdr # For it's passthru.searchPath
|
||||
# soapysdr plugins we add by default. Ideally, we should have a
|
||||
# soapysdrPackages = soapysdr.pkgs attribute set, but until now this wasn't
|
||||
# crucial.
|
||||
, soapyairspy
|
||||
, soapyaudio
|
||||
, soapybladerf
|
||||
, soapyhackrf
|
||||
, soapyremote
|
||||
, soapyrtlsdr
|
||||
, soapyuhd
|
||||
# For adding / changing soapysdr packages, like soapsdr-with-plugins does
|
||||
, extraSoapySdrPackages ? [
|
||||
soapyairspy
|
||||
soapyaudio
|
||||
soapybladerf
|
||||
soapyhackrf
|
||||
soapyremote
|
||||
soapyrtlsdr
|
||||
soapyuhd
|
||||
]
|
||||
# Allow to add whatever you want to the wrapper
|
||||
, extraMakeWrapperArgs ? []
|
||||
}:
|
||||
|
|
@ -87,6 +108,10 @@ let
|
|||
++ lib.optionals (extraPackages != []) [
|
||||
"--prefix" "GRC_BLOCKS_PATH" ":" "${lib.makeSearchPath "share/gnuradio/grc/blocks" extraPackages}"
|
||||
]
|
||||
++ lib.optionals (extraSoapySdrPackages != []) [
|
||||
"--prefix" "SOAPY_SDR_PLUGIN_PATH" ":" "${lib.makeSearchPath
|
||||
soapysdr.passthru.searchPath extraSoapySdrPackages}"
|
||||
]
|
||||
++ lib.optionals (unwrapped.hasFeature "gr-qtgui")
|
||||
# 3.7 builds with qt4
|
||||
(if lib.versionAtLeast unwrapped.versionAttr.major "3.8" then
|
||||
|
|
|
|||
|
|
@ -1,66 +1,83 @@
|
|||
{ stdenv, lib, lndir, makeWrapper
|
||||
, fetchFromGitHub, cmake
|
||||
, libusb-compat-0_1, pkg-config
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, libusb-compat-0_1
|
||||
, ncurses
|
||||
, usePython ? false
|
||||
, python ? null
|
||||
, ncurses, swig2
|
||||
, extraPackages ? []
|
||||
, testers
|
||||
, swig2
|
||||
, extraPackages ? [ ]
|
||||
, buildPackages
|
||||
, testers
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
version = "0.8.1";
|
||||
modulesVersion = with lib; versions.major version + "." + versions.minor version;
|
||||
modulesPath = "lib/SoapySDR/modules" + modulesVersion;
|
||||
extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages;
|
||||
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "soapysdr";
|
||||
inherit version;
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pothosware";
|
||||
repo = "SoapySDR";
|
||||
rev = "soapy-sdr-${version}";
|
||||
rev = "soapy-sdr-${finalAttrs.version}";
|
||||
sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# see https://github.com/pothosware/SoapySDR/issues/352 for upstream issue
|
||||
./fix-pkgconfig.patch
|
||||
# Fix for https://github.com/pothosware/SoapySDR/issues/352
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pothosware/SoapySDR/commit/10c05b3e52caaa421147d6b4623eccd3fc3be3f4.patch";
|
||||
hash = "sha256-D7so6NSZiU6SXbzns04Q4RjSZW0FJ+MYobvvVpVMjws=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper pkg-config ];
|
||||
buildInputs = [ libusb-compat-0_1 ncurses ]
|
||||
++ lib.optionals usePython [ python swig2 ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
libusb-compat-0_1
|
||||
ncurses
|
||||
] ++ lib.optionals usePython [
|
||||
python
|
||||
swig2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optional usePython python.pkgs.numpy;
|
||||
propagatedBuildInputs = lib.optionals usePython [
|
||||
python.pkgs.numpy
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
] ++ lib.optional usePython "-DUSE_PYTHON_CONFIG=ON";
|
||||
] ++ lib.optionals usePython [
|
||||
"-DUSE_PYTHON_CONFIG=ON"
|
||||
];
|
||||
|
||||
# https://github.com/pothosware/SoapySDR/issues/352
|
||||
postPatch = ''
|
||||
substituteInPlace lib/SoapySDR.in.pc \
|
||||
--replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
|
||||
--replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (lib.length extraPackages != 0) ''
|
||||
postFixup = lib.optionalString (extraPackages != [ ]) (
|
||||
# Join all plugins via symlinking
|
||||
for i in ${toString extraPackages}; do
|
||||
${buildPackages.xorg.lndir}/bin/lndir -silent $i $out
|
||||
done
|
||||
# Needed for at least the remote plugin server
|
||||
for file in $out/bin/*; do
|
||||
wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.escapeShellArg extraPackagesSearchPath}
|
||||
done
|
||||
'';
|
||||
lib.pipe extraPackages [
|
||||
(map (pkg: ''
|
||||
${buildPackages.xorg.lndir}/bin/lndir -silent ${pkg} $out
|
||||
''))
|
||||
lib.concatStrings
|
||||
] + ''
|
||||
# Needed for at least the remote plugin server
|
||||
for file in $out/bin/*; do
|
||||
wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.escapeShellArg (
|
||||
lib.makeSearchPath finalAttrs.passthru.searchPath extraPackages
|
||||
)}
|
||||
done
|
||||
''
|
||||
);
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
searchPath = "lib/SoapySDR/modules${lib.versions.majorMinor finalAttrs.version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pothosware/SoapySDR";
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/lib/SoapySDR.in.pc b/lib/SoapySDR.in.pc
|
||||
index a1ca698..fd2f4c0 100644
|
||||
--- a/lib/SoapySDR.in.pc
|
||||
+++ b/lib/SoapySDR.in.pc
|
||||
@@ -1,7 +1,5 @@
|
||||
-prefix=@CMAKE_INSTALL_PREFIX@
|
||||
-exec_prefix=${prefix}
|
||||
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
||||
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||
|
||||
Name: Soapy SDR
|
||||
Description: Vendor and platform neutral SDR interface library.
|
||||
|
|
@ -1,4 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, curl, openssl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, htslib
|
||||
, zlib
|
||||
, bzip2
|
||||
, xz
|
||||
, curl
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "angsd";
|
||||
|
|
@ -11,8 +21,20 @@ stdenv.mkDerivation rec {
|
|||
rev = version;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull pending inclusion upstream patch for parallel buil fixes:
|
||||
# https://github.com/ANGSD/angsd/pull/590
|
||||
(fetchpatch {
|
||||
name = "parallel-make.patch";
|
||||
url = "https://github.com/ANGSD/angsd/commit/89fd1d898078016df390e07e25b8a3eeadcedf43.patch";
|
||||
hash = "sha256-KQgUfr3v8xc+opAm4qcSV2eaupztv4gzJJHyzJBCxqA=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ htslib zlib bzip2 xz curl openssl ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [ "HTSSRC=systemwide" "prefix=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "glab";
|
||||
version = "1.31.0";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-K7yGRuIfYEqs4ziystxLMK+dYUZoyGlBJAmx2qmY08Q=";
|
||||
hash = "sha256-7XFekLlWcifqGJL6IIONpixdMAyGBJJmqo+l6RKCfC8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WfzN70HHLatBuV+GW2VC+5laR3rBfDOqPydyxMSmL3s=";
|
||||
vendorHash = "sha256-HiU6Kx/du8QLNKUDsSMm349msxSxyNRppxadtIpglBg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
@ -29,6 +29,8 @@ buildGoModule rec {
|
|||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
make manpage
|
||||
installManPage share/man/man1/*
|
||||
installShellCompletion --cmd glab \
|
||||
--bash <($out/bin/glab completion -s bash) \
|
||||
--fish <($out/bin/glab completion -s fish) \
|
||||
|
|
@ -39,6 +41,7 @@ buildGoModule rec {
|
|||
description = "GitLab CLI tool bringing GitLab to your command line";
|
||||
license = licenses.mit;
|
||||
homepage = "https://gitlab.com/gitlab-org/cli";
|
||||
changelog = "https://gitlab.com/gitlab-org/cli/-/releases/v${version}";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 4cd154b..fee3267 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -323,7 +323,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conmon-common"
|
||||
-version = "0.5.1"
|
||||
+version = "0.6.0"
|
||||
dependencies = [
|
||||
"capnp",
|
||||
"capnpc",
|
||||
@@ -331,7 +331,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conmonrs"
|
||||
-version = "0.5.1"
|
||||
+version = "0.6.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"capnp",
|
||||
@@ -376,7 +376,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conmonrs-cli"
|
||||
-version = "0.5.1"
|
||||
+version = "0.6.0"
|
||||
dependencies = [
|
||||
"capnp",
|
||||
"capnp-rpc",
|
||||
|
|
@ -7,22 +7,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "conmon-rs";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RQ3cVM7aEuCCmOCr4UWkxBMr66tdYFl0nNO7tXY05vE=";
|
||||
sha256 = "sha256-B8uloch+ucOLIIR64GE5Z8ahe2NLqPmDGcugQVSqpl4=";
|
||||
};
|
||||
|
||||
# Cargo.lock is out of date for this release.
|
||||
cargoPatches = [ ./Cargo.lock.patch ];
|
||||
|
||||
nativeBuildInputs = [ capnproto protobuf ];
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-BNowZkD+y1jh25EvfhQzvT5BZzrq46KBd69AJ//9enE=";
|
||||
cargoHash = "sha256-hEhAnNppiyY6EcdHfri534ih8VUfpT7lO9L4mFJ6Caw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OCI container runtime monitor written in Rust";
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.28.0";
|
||||
version = "1.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vVw3mVliu9JiCgTpwBfubaOkEkNJD4Tb1M7HARg5VjA=";
|
||||
sha256 = "sha256-4RwR4aM+h0cqogJ9sxoODlPGaXH2PALFoBU3jv/6Agg=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trealla";
|
||||
version = "2.25.2";
|
||||
version = "2.27.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trealla-prolog";
|
||||
repo = "trealla";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3NBrJFSTcjftvTYn26SMeU2HtR81J2qlDAwAZRdis4M=";
|
||||
hash = "sha256-b6OIp0UTBGl463wgwVCyTbC3Id0mgEIUnla+U3qv738=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -68,7 +68,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"test"
|
||||
] ++ lib.optional checkLeaks "leaks";
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://trealla-prolog.github.io/trealla/";
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "23.3.4.18";
|
||||
sha256 = "sha256-sxNVu/52kOMFKQYPLi5uXnR1mYTF2KlHUo4T7kh0KoY=";
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
pname = "commons-compress";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
|
||||
sha256 = "sha256-m+7cc7h9xVXKlLBTTr2L91AFWDTN+hNSycxDNO0oBAI=";
|
||||
sha256 = "sha256-VQzXg16rnrghsRY2H3NnGJ+0HEbz8/Num7Xlm9pEqqw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "llhttp";
|
||||
version = "9.0.1";
|
||||
version = "9.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodejs";
|
||||
repo = "llhttp";
|
||||
rev = "release/v${version}";
|
||||
hash = "sha256-cXqc6/lQUhp9GV8msXsPokd6OGSczvz8uAXkM16GEE0=";
|
||||
hash = "sha256-DWRo9mVpmty/Ec+pKqPTZqwOlYJD+SmddwEui7P/694=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "61";
|
||||
version = "62";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "Kane610";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tzP20KDPCq1/fJY+OfEpo3LMbP662ROh2aPI4nmDp0Y=";
|
||||
hash = "sha256-5XCF67YuelS4RDUxfImSAELfdb3rJWGprIYQeQPp+yk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-core";
|
||||
version = "2.15.3";
|
||||
version = "2.15.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JhvAGhUnT8WmlQ1bkrmqG318bo91Q8kUUF5b/ZdEeTo=";
|
||||
hash = "sha256-waiq7emF955ZMrohY2OTeffYAlv9myg3jbFkmk71Qe0=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.15.0";
|
||||
version = "3.15.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TY/HrTDlo6cq50bSaRVuZyt1rThB9BPiQW0RS98gIo8=";
|
||||
hash = "sha256-XihIFu8TUrZgQqJ43LJVB0vCIjf89MpGfmDXS5yUuoM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hass-nabucasa";
|
||||
version = "0.70.0";
|
||||
version = "0.71.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "nabucasa";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-lELb39N5pAZFeANgzg5TBmC+gmY/wgXbE7wlvdlJe2A=";
|
||||
hash = "sha256-2v8LEVYY7PEzcIMaXcy9h+8O2KrU0zTKyZb2IrO35JQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatasmota";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "emontnemery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-edZ8Y2fk2Kfhjs/c44vP55uPsFCnDt+wiD+q9821y7U=";
|
||||
hash = "sha256-lsb92JsqIhq7zaNaolgV8dtSFIq+Enklb6hlBvT7/Ig=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.31.9";
|
||||
version = "0.32.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IRetWNKVzWsrHOphdgV5xmdiubwDx8KOUA7x+BmTt9A=";
|
||||
hash = "sha256-kJ7HbGwmA6/OtSxpkvajf+VzjYK+uq6kMaja9CmVBt4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.8.post1";
|
||||
version = "1.0.1";
|
||||
pname = "pyfiglet";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c6c2321755d09267b438ec7b936825a4910fec696292139e664ca8670e103639";
|
||||
sha256 = "sha256-x9kIim+CG99pxY2XVzeAhadogWJrIwjmu9pwcSFgfxg=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygmt";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GenericMappingTools";
|
||||
repo = "pygmt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XDIAFIU+chewMDEoQDYqSYvK1tT9afh44w3Yd7ILZIc=";
|
||||
hash = "sha256-+bkjqHjJIwk44u226q6xqeGmwMWleyc4lRfMZdDjVBA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytesseract";
|
||||
version = "0.3.11";
|
||||
version = "0.3.12";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "madmaze";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8obU1QFlboQnFjb3JUkVG+tt0wDlRffVH/PBmN1r3dk=";
|
||||
hash = "sha256-19eLgcvmEFGiyu6v/EzLG8w+jFQL/5rbfDaiQqAGq5g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, rapidjson
|
||||
, pytestCheckHook
|
||||
|
|
@ -16,8 +15,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "Tencent";
|
||||
repo = "rapidjson";
|
||||
rev = "083f359f5c36198accc2b9360ce1e32a333231d9";
|
||||
hash = "sha256-8O5KwZcvoEkpE+O0Twn2CKHjV2AYh8qnSaBofoWEBs8=";
|
||||
rev = "5e17dbed34eef33af8f3e734820b5dc547a2a3aa";
|
||||
hash = "sha256-CTy42X6P6+Gz4WbJ3tCpAw3qqlJ+mU1PaWW9LGG+6nU=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
|
|
@ -30,15 +29,17 @@ let
|
|||
cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ];
|
||||
});
|
||||
in buildPythonPackage rec {
|
||||
version = "1.10";
|
||||
version = "1.11";
|
||||
pname = "python-rapidjson";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rP7L9e25HscqIKEl3n9WuML2Fh7/TGU4LI7mokhNNUA=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-rapidjson";
|
||||
repo = "python-rapidjson";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Jnnr4MCopx2YJTqbHqSCzPBzUl0T8SqcznRGSI14d2Q=";
|
||||
};
|
||||
|
||||
setupPyBuildFlags = [
|
||||
|
|
@ -55,7 +56,7 @@ in buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/python-rapidjson/python-rapidjson/blob/v${version}/CHANGES.rst";
|
||||
changelog = "https://github.com/python-rapidjson/python-rapidjson/blob/${src.rev}/CHANGES.rst";
|
||||
homepage = "https://github.com/python-rapidjson/python-rapidjson";
|
||||
description = "Python wrapper around rapidjson";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rope";
|
||||
version = "1.6.0";
|
||||
version = "1.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "python-rope";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-avNCti288dY9pl5AVTmUzZU/vb6WDkXEtELNlEi6L/o=";
|
||||
hash = "sha256-j65C3x3anhH23D4kic5j++r/Ft0RqgZ/jFrNrNHVcXA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ultraheat-api";
|
||||
version = "0.5.1";
|
||||
version = "0.5.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "ultraheat_api";
|
||||
inherit version;
|
||||
hash = "sha256-7yZATv0cgjRnvD9u34iZtsdsfEkdbAoVWJ19+HHlrzI=";
|
||||
hash = "sha256-rRQTjV9hyUawMaXBgUx/d6pQjM8ffjcFJE2x08Cf4Gw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vispy";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tZ97z2UoyRS8ps60rZWZhMZgS+o0ZjASpyq4itiInq8=";
|
||||
hash = "sha256-3vcn528rZd7YhmSoPaUN2peWOWHBbxOk2FCr3UWTD5Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-deconz";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/XsCQt3JHiPrXJH8w2zDmaMQBLWgcmkbj9RooVYuFw0=";
|
||||
hash = "sha256-YRJMIpC6Zk5sQjGyzdEbQEeYgFJzIbxe4BReayceu10=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-xbee";
|
||||
version = "0.18.1";
|
||||
version = "0.18.2";
|
||||
# https://github.com/Martiusweb/asynctest/issues/152
|
||||
# broken by upstream python bug with asynctest and
|
||||
# is used exclusively by home-assistant with python 3.8
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = "zigpy-xbee";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vR+oLshiIYmMdAvir+TGBqVkTGXKAVnUWnQPR3YwuUk=";
|
||||
hash = "sha256-aglKQWIMh0IyrcGt+PZVtzcgs88YbtZB7Tfg7hlB+18=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-js-server-python";
|
||||
version = "0.51.1";
|
||||
version = "0.51.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2U0mRlNUCZD05lgGB3dz2WaUxG2dv/C7nxD2sI3R8B8=";
|
||||
hash = "sha256-SRBH7HdsgS60Z8y6ef5/VCunzMGBEWw0u1jR7wSByNc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-mockery";
|
||||
version = "2.33.0";
|
||||
version = "2.33.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vektra";
|
||||
repo = "mockery";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HQBGKWJSjo4ox8YEeQhzM8r+GxuEMsj3SiFAO78j0bA=";
|
||||
sha256 = "sha256-VhzU/18xLmimhRyEqAEi0+B8uiXJFb+ri/0MuugogzI=";
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.19.2";
|
||||
version = "2.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-kzrjIsyHf/hUo4Axcg97CrIyjeexc2IZ4/bITuUR7NM=";
|
||||
hash = "sha256-AeZ/pp7zWi8liDu247WXetXK/CurV0GUZ/isVdDF3yQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u1oMX2ZplmDGx7ePfA5vKHUuDmWYVCJrYh2HQ23dTfU=";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "1.88.0";
|
||||
version = "1.97.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OgeKr0xSWp83Ri3WBNsY3TL6tAWsMtsEdD6KeKdPdCw=";
|
||||
hash = "sha256-k1/6QAxQ3h5xG+2VBc/PillddYhrvsQrtJK5tXrb0sQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-efcgpxvhHe6KtNfNYYc5fYv93fJPf63V39d+5AcCvPQ=";
|
||||
vendorHash = "sha256-oEIRmkOCHIvIQJX7GQVJD/aURoEJ7V/LJFEg+oltWEY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minify";
|
||||
version = "2.12.8";
|
||||
version = "2.12.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdewolff";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5p1HWXx9kKKaiC0dTQDd1JpRDhKkDGdnDpuz+I0kgpo=";
|
||||
hash = "sha256-+NBYn+gEsoclROnq2msNB4knviGn/XA9vNAuB0JZNek=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RBBCcqahIF1KjnK/Kxr0TZlRJirFffo9Dt40gNk5EQE=";
|
||||
vendorHash = "sha256-/Pw7fHVXWsovxfyzkWfb6UiRDBmiua82667N4Scl5+A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -46,5 +46,6 @@ buildGoModule rec {
|
|||
changelog = "https://github.com/tdewolff/minify/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gaelreyrol ];
|
||||
mainProgram = "minify";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,17 +19,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aaaaxy";
|
||||
version = "1.4.42";
|
||||
version = "1.4.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "divVerent";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GD7SgxGZRivVbgrzAe7U0EgkTmrXFvSGzzZUOE7CwbY=";
|
||||
hash = "sha256-93ffxzYSVumfk7J8K9Ma2WYWaGQLBIxSkds8OKzOCcw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1w+/tmF73hN5y5vj++JCX+T5RQ/PF747wmAbN9i7Bgs=";
|
||||
vendorHash = "sha256-wUH0ohccMjdeGpm9bcw8K7Ss0FZGXaPfxeJCKYkEhJ8=";
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
|
|
|||
|
|
@ -1,26 +1,23 @@
|
|||
{lib, stdenv, fetchFromGitLab, fetchpatch, autoconf, automake, gettext, ncurses}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, autoconf
|
||||
, automake
|
||||
, gettext
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "psmisc";
|
||||
version = "23.5";
|
||||
version = "23.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-02jvRPqN8DS30ID42hQFu400NoFC5QiH5YA3NB+EoFI=";
|
||||
hash = "sha256-TjnOn8a7HAgt11zcM0i5DM5ERmsvLJHvo1e5FOsl6IA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream patch to be released in the next version
|
||||
(fetchpatch {
|
||||
name = "fallback-to-kill.diff";
|
||||
url = "https://gitlab.com/psmisc/psmisc/-/commit/6892e321e7042e3df60a5501a1c59d076e8a856f.patch";
|
||||
sha256 = "sha256-3uk1KXEOqAxpHWBORUw5+dR5s/Z55JJs5tuBZlTdjlo=";
|
||||
excludes = [ "ChangeLog" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake gettext ];
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trust-dns";
|
||||
version = "0.22.1";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluejekyll";
|
||||
repo = "trust-dns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YjwzU/mYKiHL2xB/oczkP/4i5XYIvSNyqDLmmrRQPhM=";
|
||||
sha256 = "sha256-CfFEhZEk1Z7VG0n8EvyQwHvZIOEES5GKpm5tMeqhRVY=";
|
||||
};
|
||||
cargoHash = "sha256-uAmszVOlRttmn6b3Rv2Y5ZuP3qBIVjIFJ42BJro+K8s=";
|
||||
cargoHash = "sha256-jmow/jtdbuKFovXWA5xbgM67iJmkwP35hiOivIJ5JdM=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.9.1";
|
||||
version = "2023.9.2";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ let
|
|||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.9.1";
|
||||
hassVersion = "2023.9.2";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -332,7 +332,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
# Primary source is the pypi sdist, because it contains translations
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uOFCaYpw/UVWdkJ3ixu8cMx9sbDy2WnHPxvPvWN1mkE=";
|
||||
hash = "sha256-pVW9NQYEf2pmGCp342lCzEiWfAyFCiWeRMVbhPd8wxQ=";
|
||||
};
|
||||
|
||||
# Secondary source is git for tests
|
||||
|
|
@ -340,7 +340,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rglLwAlHlwoaF/RxUsKc8+f38D6ztMh2p2fkHLWq9MM=";
|
||||
hash = "sha256-4sZBrGd5gz4W7c7Ok5Bj/47MaXAqAFC4qufcidbU5zA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
|||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20230908.0";
|
||||
version = "20230911.0";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
|
|
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
|||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-XZAdS4RjnPmMXYzBmyA4+liH5kdm3U/YqJJGXIaqOGo=";
|
||||
hash = "sha256-AcMZYjSbsBrfC0Oh5P+eruNILWdVmk46+p+8xLpqfuo=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.9.1";
|
||||
version = "2023.9.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-USpB/ZanWfLxL3J4/mdKzj3o5rgb9kRrZ/oG4S36CfU=";
|
||||
hash = "sha256-cKBf7S6ZvLlRp0L23mDu1CvG7d1d34LaIev60JPD0TE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2023-08-21";
|
||||
version = "unstable-2023-09-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "5f990f93d533247d3a675e8c423280f4333ad8ce";
|
||||
sha256 = "sha256-jICOEzLvy2wBInW4qIbFZbhRuHjsio6UM13K9UlZi1U=";
|
||||
rev = "8ef0f7d7e3d3b2ac7bc1e80ed3295ceca6bba4e7";
|
||||
sha256 = "sha256-f/fPnZvtnASphYtvM9NBae0on8GWSwQPykukZ3XCy3M=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/klippy";
|
||||
|
|
|
|||
65
pkgs/servers/search/qdrant/Cargo.lock
generated
65
pkgs/servers/search/qdrant/Cargo.lock
generated
|
|
@ -263,7 +263,7 @@ dependencies = [
|
|||
"serde_urlencoded",
|
||||
"smallvec",
|
||||
"socket2 0.5.3",
|
||||
"time 0.3.17",
|
||||
"time",
|
||||
"url",
|
||||
]
|
||||
|
||||
|
|
@ -457,7 +457,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
|
|||
|
||||
[[package]]
|
||||
name = "api"
|
||||
version = "1.5.0"
|
||||
version = "1.5.1"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"common",
|
||||
|
|
@ -913,16 +913,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.28"
|
||||
version = "0.4.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f"
|
||||
checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
|
||||
dependencies = [
|
||||
"android-tzdata",
|
||||
"iana-time-zone",
|
||||
"js-sys",
|
||||
"num-traits",
|
||||
"serde",
|
||||
"time 0.1.45",
|
||||
"wasm-bindgen",
|
||||
"windows-targets 0.48.0",
|
||||
]
|
||||
|
|
@ -986,20 +985,19 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.4.1"
|
||||
version = "4.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
|
||||
checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.4.1"
|
||||
version = "4.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
|
||||
checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
|
|
@ -1009,9 +1007,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.4.0"
|
||||
version = "4.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
|
||||
checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
|
|
@ -1202,7 +1200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
|
||||
dependencies = [
|
||||
"percent-encoding",
|
||||
"time 0.3.17",
|
||||
"time",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
|
|
@ -3683,7 +3681,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "qdrant"
|
||||
version = "1.5.0"
|
||||
version = "1.5.1"
|
||||
dependencies = [
|
||||
"actix-cors",
|
||||
"actix-files",
|
||||
|
|
@ -4546,9 +4544,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.105"
|
||||
version = "1.0.106"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
|
||||
checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
|
|
@ -4867,9 +4865,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sysinfo"
|
||||
version = "0.29.9"
|
||||
version = "0.29.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8d0e9cc2273cc8d31377bdd638d72e3ac3e5607b18621062b169d02787f1bab"
|
||||
checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"core-foundation-sys",
|
||||
|
|
@ -4931,18 +4929,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.47"
|
||||
version = "1.0.48"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
|
||||
checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.47"
|
||||
version = "1.0.48"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
|
||||
checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -4991,17 +4989,6 @@ dependencies = [
|
|||
"tikv-jemalloc-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.1.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"wasi 0.10.0+wasi-snapshot-preview1",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.17"
|
||||
|
|
@ -5543,9 +5530,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.3.3"
|
||||
version = "2.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
|
||||
checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi-util",
|
||||
|
|
@ -5567,12 +5554,6 @@ version = "0.9.0+wasi-snapshot-preview1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.0+wasi-snapshot-preview1"
|
||||
|
|
@ -5950,7 +5931,7 @@ dependencies = [
|
|||
"hmac",
|
||||
"pbkdf2",
|
||||
"sha1",
|
||||
"time 0.3.17",
|
||||
"time",
|
||||
"zstd 0.11.2+zstd.1.5.2",
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qdrant";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qdrant";
|
||||
repo = "qdrant";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-kJfLaXJEeAkn5dh/m6NPLQ8T8ec53jBlT4E0CdnRCSI=";
|
||||
sha256 = "sha256-CWE3tCeLJjtuFcvnGLdODtx0mvVSl2ULIcxgf3X3SPU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
# Native buildInputs components
|
||||
, bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config
|
||||
# Common components
|
||||
, curl, libiconv, ncurses, openssl, openssl_1_1, pcre, pcre2
|
||||
, curl, libiconv, ncurses, openssl, pcre2
|
||||
, libkrb5, libaio, liburing, systemd
|
||||
, CoreServices, cctools, perl
|
||||
, jemalloc, less, libedit
|
||||
|
|
@ -44,14 +44,13 @@ let
|
|||
|
||||
buildInputs = [
|
||||
libiconv ncurses zlib
|
||||
pcre2
|
||||
openssl
|
||||
curl
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ]
|
||||
++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ]))
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ]
|
||||
++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ])
|
||||
++ (if (lib.versionOlder version "10.5")
|
||||
then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ]
|
||||
else [ openssl curl ]);
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ];
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
|
||||
|
|
@ -244,13 +243,6 @@ let
|
|||
in
|
||||
self: {
|
||||
# see https://mariadb.org/about/#maintenance-policy for EOLs
|
||||
mariadb_104 = self.callPackage generic {
|
||||
# Supported until 2024-06-18
|
||||
version = "10.4.31";
|
||||
hash = "sha256-Uqv1Q0xqQuCgSKY6uZo4mPt/yhWA+t16Yb0OnOm4UFQ=";
|
||||
inherit (self.darwin) cctools;
|
||||
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
mariadb_105 = self.callPackage generic {
|
||||
# Supported until 2025-06-24
|
||||
version = "10.5.22";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "swego";
|
||||
version = "0.98";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodauf";
|
||||
repo = "Swego";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fS1mrB4379hnnkLMkpKqV2QB680t5T0QEqsvqOp9pzY=";
|
||||
sha256 = "sha256-OlaNDXKaIim5n0niqYIpRliVo7lse76vNxPKF6B6yF0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-N4HDngQFNCzQ74W52R0khetN6+J7npvBC/bYZBAgLB4=";
|
||||
|
|
|
|||
|
|
@ -94,6 +94,8 @@ with pkgs;
|
|||
|
||||
config = callPackage ./config.nix { };
|
||||
|
||||
top-level = callPackage ./top-level { };
|
||||
|
||||
haskell = callPackage ./haskell { };
|
||||
|
||||
hooks = callPackage ./hooks { };
|
||||
|
|
|
|||
47
pkgs/test/top-level/default.nix
Normal file
47
pkgs/test/top-level/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib, pkgs, ... }:
|
||||
let
|
||||
nixpkgsFun = import ../../top-level;
|
||||
in
|
||||
lib.recurseIntoAttrs {
|
||||
platformEquality =
|
||||
let
|
||||
configsLocal = [
|
||||
# crossSystem is implicitly set to localSystem.
|
||||
{
|
||||
localSystem = { system = "x86_64-linux"; };
|
||||
}
|
||||
{
|
||||
localSystem = { system = "aarch64-linux"; };
|
||||
crossSystem = null;
|
||||
}
|
||||
# Both systems explicitly set to the same string.
|
||||
{
|
||||
localSystem = { system = "x86_64-linux"; };
|
||||
crossSystem = { system = "x86_64-linux"; };
|
||||
}
|
||||
# Vendor and ABI inferred from system double.
|
||||
{
|
||||
localSystem = { system = "aarch64-linux"; };
|
||||
crossSystem = { config = "aarch64-unknown-linux-gnu"; };
|
||||
}
|
||||
];
|
||||
configsCross = [
|
||||
# GNU is inferred from double, but config explicitly requests musl.
|
||||
{
|
||||
localSystem = { system = "aarch64-linux"; };
|
||||
crossSystem = { config = "aarch64-unknown-linux-musl"; };
|
||||
}
|
||||
# Cross-compile from AArch64 to x86-64.
|
||||
{
|
||||
localSystem = { system = "aarch64-linux"; };
|
||||
crossSystem = { system = "x86_64-unknown-linux-gnu"; };
|
||||
}
|
||||
];
|
||||
|
||||
pkgsLocal = map nixpkgsFun configsLocal;
|
||||
pkgsCross = map nixpkgsFun configsCross;
|
||||
in
|
||||
assert lib.all (p: p.buildPlatform == p.hostPlatform) pkgsLocal;
|
||||
assert lib.all (p: p.buildPlatform != p.hostPlatform) pkgsCross;
|
||||
pkgs.emptyFile;
|
||||
}
|
||||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.155.0";
|
||||
version = "0.156.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-4/U5ZAmNI3+uvxcDbSP0/AHnrn4eesDErtQrQPot8G4=";
|
||||
hash = "sha256-E50MtMrZy2lnMjoYV4MJF+0YGLmGEioOF74rldXdOPU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oqxAiFe7NE3WZkJIL63HmOtVR98WyMK4+VAGqb/eDN0=";
|
||||
vendorHash = "sha256-maMORSR6ZAasUxAy4kXvua4C+/dWdZbDde2VIKSV8w4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
nimPackages.buildNimPackage (finalAttrs: {
|
||||
pname = "ttop";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
nimBinOnly = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inv2004";
|
||||
repo = "ttop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kOYgqFKZ0TC54o6tQaxGA1i12sU8Mg9bEwbGoZiBZ0Y=";
|
||||
hash = "sha256-GMGGkpBX+pmZ+TSDRs2N3H4Bwa3oXSDo9vM192js7Ww=";
|
||||
};
|
||||
|
||||
buildInputs = with nimPackages; [ asciigraph illwill jsony parsetoml zippy ];
|
||||
|
|
|
|||
|
|
@ -488,11 +488,13 @@ mapAliases ({
|
|||
epoxy = libepoxy; # Added 2021-11-11
|
||||
epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
|
||||
eql = throw "eql has been removed from nixpkgs, because it depended on qt4. eql5 exists, but is not currently pacakged in nixpkgs."; # added 2022-05-09
|
||||
inherit (beam.interpreters) erlangR26 erlangR25 erlangR24 erlangR23; # added 2023-03-21
|
||||
inherit (beam.interpreters) erlangR26 erlangR25 erlangR24; # added 2023-03-21
|
||||
erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21
|
||||
erlangR21 = erlang_21;
|
||||
erlang_22 = throw "erlangR22 has been removed in favor of newer versions."; # added 2023-03-21
|
||||
erlangR22 = erlang_22;
|
||||
erlang_23 = throw "erlangR23 has been removed in favor of newer versions."; # added 2023-09-11
|
||||
erlangR23 = erlang_23;
|
||||
esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12
|
||||
etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22
|
||||
eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10
|
||||
|
|
@ -1084,6 +1086,7 @@ mapAliases ({
|
|||
manul = throw "manul has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-01
|
||||
manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22
|
||||
marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
|
||||
mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11
|
||||
mariadb_108 = throw "mariadb_108 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10
|
||||
mariadb_109 = throw "mariadb_109 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10
|
||||
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
|
||||
|
|
|
|||
|
|
@ -17837,7 +17837,7 @@ with pkgs;
|
|||
};
|
||||
|
||||
inherit (beam.interpreters)
|
||||
erlang erlang_26 erlang_25 erlang_24 erlang_23
|
||||
erlang erlang_26 erlang_25 erlang_24
|
||||
erlang_odbc erlang_javac erlang_odbc_javac
|
||||
elixir elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
|
||||
elixir-ls;
|
||||
|
|
@ -18336,8 +18336,6 @@ with pkgs;
|
|||
|
||||
eltclsh = callPackage ../development/tools/eltclsh { };
|
||||
|
||||
trealla = callPackage ../development/interpreters/trealla { };
|
||||
|
||||
waagent = callPackage ../applications/networking/cluster/waagent { };
|
||||
|
||||
wapm-cli = callPackage ../tools/package-management/wapm/cli {
|
||||
|
|
@ -27126,7 +27124,6 @@ with pkgs;
|
|||
mariadb-galera = callPackage ../servers/sql/mariadb/galera { };
|
||||
|
||||
inherit (import ../servers/sql/mariadb pkgs)
|
||||
mariadb_104
|
||||
mariadb_105
|
||||
mariadb_106
|
||||
mariadb_1010
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, beam
|
||||
, callPackage
|
||||
, openssl_1_1
|
||||
, wxGTK32
|
||||
, buildPackages
|
||||
, stdenv
|
||||
|
|
@ -82,21 +81,6 @@ in
|
|||
odbcSupport = true;
|
||||
};
|
||||
|
||||
erlang_23 = self.beamLib.callErlang ../development/interpreters/erlang/23.nix {
|
||||
openssl = openssl_1_1;
|
||||
wxGTK = wxGTK32;
|
||||
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
|
||||
parallelBuild = true;
|
||||
autoconf = buildPackages.autoconf269;
|
||||
inherit wxSupport systemdSupport;
|
||||
};
|
||||
erlang_23_odbc = self.interpreters.erlang_23.override { odbcSupport = true; };
|
||||
erlang_23_javac = self.interpreters.erlang_23.override { javacSupport = true; };
|
||||
erlang_23_odbc_javac = self.interpreters.erlang_23.override {
|
||||
javacSupport = true;
|
||||
odbcSupport = true;
|
||||
};
|
||||
|
||||
# Other Beam languages. These are built with `beam.interpreters.erlang`. To
|
||||
# access for example elixir built with different version of Erlang, use
|
||||
# `beam.packages.erlang_24.elixir`.
|
||||
|
|
@ -116,6 +100,5 @@ in
|
|||
erlang_26 = self.packagesWith self.interpreters.erlang_26;
|
||||
erlang_25 = self.packagesWith self.interpreters.erlang_25;
|
||||
erlang_24 = self.packagesWith self.interpreters.erlang_24;
|
||||
erlang_23 = self.packagesWith self.interpreters.erlang_23;
|
||||
} // packagesAliases;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,10 +61,22 @@ in let
|
|||
localSystem = lib.systems.elaborate args.localSystem;
|
||||
|
||||
# Condition preserves sharing which in turn affects equality.
|
||||
#
|
||||
# See `lib.systems.equals` documentation for more details.
|
||||
#
|
||||
# Note that it is generally not possible to compare systems as given in
|
||||
# parameters, e.g. if systems are initialized as
|
||||
#
|
||||
# localSystem = { system = "x86_64-linux"; };
|
||||
# crossSystem = { config = "x86_64-unknown-linux-gnu"; };
|
||||
#
|
||||
# Both systems are semantically equivalent as the same vendor and ABI are
|
||||
# inferred from the system double in `localSystem`.
|
||||
crossSystem =
|
||||
if crossSystem0 == null || crossSystem0 == args.localSystem
|
||||
let system = lib.systems.elaborate crossSystem0; in
|
||||
if crossSystem0 == null || lib.systems.equals system localSystem
|
||||
then localSystem
|
||||
else lib.systems.elaborate crossSystem0;
|
||||
else system;
|
||||
|
||||
# Allow both:
|
||||
# { /* the config */ } and
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user