Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-01-24 06:00:59 +00:00
committed by GitHub
46 changed files with 981 additions and 596 deletions

View File

@@ -12,6 +12,10 @@ in
Add your user to the corectrl group to run corectrl without needing to enter your password
'');
package = mkPackageOption pkgs "corectrl" {
extraDescription = "Useful for overriding the configuration options used for the package.";
};
gpuOverclock = {
enable = mkEnableOption (lib.mdDoc ''
GPU overclocking
@@ -32,9 +36,9 @@ in
config = mkIf cfg.enable (lib.mkMerge [
{
environment.systemPackages = [ pkgs.corectrl ];
environment.systemPackages = [ cfg.package ];
services.dbus.packages = [ pkgs.corectrl ];
services.dbus.packages = [ cfg.package ];
users.groups.corectrl = { };

View File

@@ -11,7 +11,7 @@ let
if useCCTweaked
then fetchurl {
url = "${baseUrl}-cct.jar";
hash = "sha256-B9Zan6wpYnUtaNbUIrXvkchPiEquMs9R2Kiqg85/VdY=";
hash = "sha256-nna5KRp6jVLkbWKOHGtQqaPr3Zl05mVkCf/8X9C5lRY=";
}
else fetchurl {
url = "${baseUrl}-cc.jar";

View File

@@ -5,12 +5,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "ablog";
version = "0.11.4.post1";
version = "0.11.6";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-Zyvx7lVUQtjoGsSpFmH8pFrgTGgsFd4GMsL3fXKtUpU=";
hash = "sha256-fV4W4AaiqyruIz3OQ7/lGkMPMKmyiFa+fdU2QeeQCvs=";
};
nativeBuildInputs = with python3.pkgs; [
@@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec {
pytestFlagsArray = [
"-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning"
"--rootdir" "src/ablog"
"-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError
];
meta = with lib; {

File diff suppressed because it is too large Load Diff

View File

@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "pot";
version = "2.7.0";
version = "2.7.4";
src = fetchFromGitHub {
owner = "pot-app";
repo = "pot-desktop";
rev = version;
hash = "sha256-ODqMbyL6Zda/cY5Lgijaj9Pr5aozQDgzHlS89q4rA4w=";
hash = "sha256-c7FHkp/utvrr7qasY+XKaTnPaiZWb8M5EGiFne52osQ=";
};
sourceRoot = "${src.name}/src-tauri";
@@ -68,15 +68,14 @@ stdenv.mkDerivation rec {
dontFixup = true;
outputHashMode = "recursive";
outputHash = "sha256-xl1dSrJ7o0Xn4QB2tRBB6U8gUItltxTE+hyEJ1GIw1k=";
outputHash = "sha256-BQ5M+pKEXGJzWmxMchNgxpvLpgFCRIg33GQCvO4TLz4=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
# All other crates in the same workspace reuse this hash.
"tauri-plugin-autostart-0.0.0" = "sha256-wgVsF3H9BT8lBew7tQ308eIQ6cLZT93hD/4eYCDEq98=";
"tauri-plugin-sql-0.0.0" = "sha256-e9iwcHwW8MaRzkaAbewrq6b9+n3ZofMTBnvA23ZF2ro=";
"tauri-plugin-autostart-0.0.0" = "sha256-/uxaSBp+N1VjjSiwf6NwNnSH02Vk6gQZ/CzO+AyEI7o=";
};
};

View File

@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "terraform-compliance";
version = "1.3.45";
version = "1.3.46";
format = "setuptools";
src = fetchFromGitHub {
owner = "terraform-compliance";
repo = "cli";
rev = "refs/tags/${version}";
sha256 = "sha256-Q7EzDL8yt2UPrM4u4f4ttDI5Da0ZzQwZmOlk7RrNN5E=";
sha256 = "sha256-30aQA+VJY2qarpYGZpgt5ebYFt5UHUHJcuBNgKiGnt0=";
};
postPatch = ''

View File

@@ -62,13 +62,13 @@ let
in
buildGoModule rec {
pname = "podman";
version = "4.8.3";
version = "4.9.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
hash = "sha256-Q4LdBRJed1Vm5Qo3wyEsU3Pj2t9FfyB9rjiM4Vi0ZEw=";
hash = "sha256-ygYBSZdxpE3HrFz585p7NFgHHSAfxAce/fFCQ7fcvgk=";
};
patches = [

View File

@@ -42,13 +42,13 @@ let
in
buildGoModule rec {
pname = "amazon-ssm-agent";
version = "3.2.2086.0";
version = "3.2.2143.0";
src = fetchFromGitHub {
owner = "aws";
repo = "amazon-ssm-agent";
rev = "refs/tags/${version}";
hash = "sha256-oV/0B2VxM6Gx84FIk3bUZU5DQDXt3Jek6/Xv0ZkZ89Y=";
hash = "sha256-RE17XoioTVlqASpHl6y7ykbK9sYqUIF05ROnXf05NrU=";
};
vendorHash = null;
@@ -68,15 +68,15 @@ buildGoModule rec {
darwin.DarwinTools
];
# See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1630.0/makefile#L120-L138
# See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.2143.0/makefile#L121-L147
# The updater is not built because it cannot work on NixOS
subPackages = [
"core"
"agent"
"agent/cli-main"
"agent/framework/processor/executer/outofproc/sessionworker"
"agent/framework/processor/executer/outofproc/worker"
"agent/session/logging"
"agent/framework/processor/executer/outofproc/sessionworker"
];
ldflags = [ "-s" "-w" ];

View File

@@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "bufisk";
version = "0.1.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "bufisk";
rev = "v${version}";
hash = "sha256-pVnqvQn7jwpx6T3sS4eA29JeJdh0GrPVm0J8n2UjJTw=";
};
vendorHash = "sha256-iv5zIn9C56AQB87T+n5fJzm/fhBFBUObFwrlJ72A/J4=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://github.com/bufbuild/bufisk";
description = "A user-friendly launcher for Buf";
license = licenses.asl20;
maintainers = with maintainers; [ aaronjheng ];
mainProgram = "bufisk";
};
}

View File

@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "pgmoneta";
version = "0.7.3";
version = "0.8.0";
src = fetchFromGitHub {
owner = "pgmoneta";
repo = "pgmoneta";
rev = version;
hash = "sha256-sErdlHXMn97acVIxKapsnLkyOAgO7lOB0UQC5GkL4sQ=";
hash = "sha256-bIuVFF8v7O++g7lorGduAlOGx4XoiqjqkTWHM3RNNdg=";
};
nativeBuildInputs = [

View File

@@ -1,13 +1,13 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "starlark";
version = "unstable-2023-11-01";
version = "0-unstable-2023-11-21";
src = fetchFromGitHub {
owner = "google";
repo = "starlark-go";
rev = "556fd59b42f68a2fb1f84957741b72811c714e51";
hash = "sha256-0IiEtZOQEvE2Qm//lI1eyFFL1q/ZQzO9JzmiGsk0HkQ=";
rev = "90ade8b19d09805d1b91a9687198869add6dfaa1";
hash = "sha256-ZNOPx7L21A4BR5WshMMAHGm6j1ukWC9waJ1lYLvxBw0=";
};
vendorHash = "sha256-jQE5fSqJeiDV7PW7BY/dzCxG6b/KEVIobcjJsaL2zMw=";
@@ -19,5 +19,6 @@ buildGoModule rec {
description = "An interpreter for Starlark, implemented in Go";
license = licenses.bsd3;
maintainers = with maintainers; [ aaronjheng ];
mainProgram = "starlark";
};
}

View File

@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "libfabric";
version = "1.20.0";
version = "1.20.1";
enableParallelBuilding = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "ofiwg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-woRkm/5kLIv1ypSlCosP/ewYgnSXQJYzkuOqdHvEH8I=";
sha256 = "sha256-rQzsh3Q2xaGwmmsfvUmFE8WbAb1e2JEvunSoqZYRHvE=";
};
outputs = [ "out" "dev" "man" ];

View File

@@ -0,0 +1,32 @@
{ lib
, buildDunePackage
, fetchurl
, alcotest
}:
buildDunePackage rec {
pname = "middleware";
version = "0.0.1";
minimalOCamlVersion = "4.14.0";
src = fetchurl {
url = "https://github.com/skolemlabs/middleware/releases/download/${version}/${pname}-${version}.tbz";
hash = "sha256-zhLEGvyZiKrdBKWcEbB4PHvYzBlkrp1Ldnon0mP2Ypg=";
};
checkInputs = [
alcotest
];
doCheck = true;
meta = {
description = "Composable stacked functions, which can respond to inner calls";
homepage = "https://github.com/skolemlabs/middleware";
changelog = "https://github.com/skolemlabs/middleware/blob/${version}/CHANGES.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sixstring982 ];
};
}

View File

@@ -1,5 +1,4 @@
{ stdenv
, buildDunePackage
{ buildDunePackage
, dune-configurator
, fetchFromGitHub
, alcotest
@@ -16,8 +15,6 @@ buildDunePackage rec {
inherit (owl-base) version src meta;
duneVersion = "3";
checkInputs = [ alcotest ];
buildInputs = [ dune-configurator stdio ];
propagatedBuildInputs = [
@@ -27,5 +24,7 @@ buildDunePackage rec {
npy
];
doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462
doCheck = false;
# Tests fail with Clang: https://github.com/owlbarn/owl/issues/462
# and with GCC 13: https://github.com/owlbarn/owl/issues/653
}

View File

@@ -1,19 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch2
, setuptools
, packaging
}:
buildPythonPackage rec {
pname = "asterisk-mbox";
version = "0.5.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
pname = "asterisk_mbox";
inherit version;
sha256 = "0624f9ab85ce9c4d43655f8653e8539fa10c81b60fd7b94b1a15dce306c20888";
hash = "sha256-BiT5q4XOnE1DZV+GU+hTn6EMgbYP17lLGhXc4wbCCIg=";
};
patches = [
# https://github.com/PhracturedBlue/asterisk_mbox/pull/1
(fetchpatch2 {
name = "distutils-deprecated.patch";
url = "https://github.com/PhracturedBlue/asterisk_mbox/commit/bab84525306a0c41aadd3aab4ebba7c062253d07.patch";
hash = "sha256-2j7jIl3Ydn2dHJhEzu/77Zkxhw58NIebgULifpTVidY=";
})
];
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
packaging
];
# no tests implemented
doCheck = false;

View File

@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "azure-data-tables";
version = "12.4.4";
version = "12.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-HWjIQBWYmU43pSxKLcwx45EExn10jeEkyY9Hpbyn0vw=";
hash = "sha256-7qOTpjgMQusD6AeCXAN4MgA9CcgjKUgx2hXoEVWgtOY=";
};
propagatedBuildInputs = [

View File

@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "borb";
version = "2.1.20";
version = "2.1.21";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-HvPwFtqAPtJrG+O+t8OyQmYHVo6DC7StAjSfAxtuFe4=";
hash = "sha256-gnsPsvchvcUlWwmhDIazuc8/83ZRKc29VKhIDFSoFlE=";
};
propagatedBuildInputs = [
@@ -44,6 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for reading, creating and manipulating PDF files in Python";
homepage = "https://borbpdf.com/";
changelog = "https://github.com/jorisschellekens/borb/releases/tag/v${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ marsam ];
};

View File

@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "cron_descriptor";
version = "1.2.35";
version = "1.4";
src = fetchFromGitHub {
owner = "Salamek";
repo = "cron-descriptor";
rev = "refs/tags/${version}";
hash = "sha256-m+h91cddmEPHCeUWWNpTvb89mFwm8ty8tTnw3YDjCFo=";
hash = "sha256-r5TMatjNYaPhPxhJbBGGshQf6VxKyBV6Za1lQoblxYA=";
};
# remove tests_require, as we don't do linting anyways

View File

@@ -1,17 +1,19 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, toml
, pyyaml
, fetchPypi
, fetchpatch2
, setuptools
, packaging
, tomli
, pyyaml
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "dparse";
version = "0.6.3";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -20,15 +22,32 @@ buildPythonPackage rec {
hash = "sha256-J7uLS8rv7DmXaXuj9uBrJEcgC6JzwLCFw9ASoEVxtSg=";
};
propagatedBuildInputs = [
toml
pyyaml
packaging
patches = [
(fetchpatch2 {
name = "fix-configparser-deprecation-warning.patch";
url = "https://github.com/pyupio/dparse/pull/69.patch";
hash = "sha256-RolD6xDJpI8/UHgAdcsXoyxOGLok7AogLMOTl1ZPKvw=";
})
];
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
packaging
] ++ lib.optionals (pythonOlder "3.11") [
tomli
];
passthru.optional-dependencies = {
# FIXME pipenv = [ pipenv ];
conda = [ pyyaml ];
};
nativeCheckInputs = [
pytestCheckHook
];
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
pythonImportsCheck = [
"dparse"

View File

@@ -4,14 +4,15 @@
, six, pydispatcher, urwid }:
buildPythonPackage rec {
pname = "python_openzwave";
pname = "python-openzwave";
version = "0.4.19";
format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
pname = "python_openzwave";
inherit version;
sha256 = "6b40c7711383eeb3535cf5504f1cf47cc1ac7018eb820f299642a5a2795aef84";
extension = "zip";
};

View File

@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "quaternion";
version = "2022.4.4";
version = "2023.0.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "moble";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-fgyi50purfqUIe7zuz/52K6Sw3TjuvAX0EnzkXD//B4=";
hash = "sha256-G5Xbo6Ns98oqtY/AKz9CE7nt8j2b6+Hv14ZoKtlDCMQ=";
};
propagatedBuildInputs = [

View File

@@ -4,6 +4,7 @@
, fetchFromGitHub
, fetchpatch
, poetry-core
, pythonRelaxDepsHook
, requests
, urllib3
, pytestCheckHook
@@ -13,7 +14,7 @@ buildPythonPackage rec {
pname = "synologydsm-api";
version = "1.0.2";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "hacf-fr";
repo = "synologydsm-api";
rev = "v${version}";
sha256 = "0gyahf1x6i6j9pslh1y3pyh3si5jvxb06r1w761b9gsxyk14y1si";
hash = "sha256-UQdPwvRdv7SCOTxkA1bfskQ9oL/DB0j1TdJE04ODyj8=";
};
patches = [
@@ -29,12 +30,17 @@ buildPythonPackage rec {
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/hacf-fr/synologydsm-api/commit/f1ea2be927388bdff6d43d09027b82a854635e34.patch";
sha256 = "120pdgp2i4ds6y3rf9j372f9zdcf4y8rsgl1xjbkgdhkp76bkkgr";
hash = "sha256-+c25zLkTtjeX7IE+nZEnjrWfnDhDJpeHN7qRKO5rF4g=";
})
];
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"urllib3"
];
propagatedBuildInputs = [

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.226.0";
version = "0.227.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
hash = "sha256-mWC98FLh5m2gYFlFUjrJBeaFBuNx8fm5ojiidE7c2rU=";
hash = "sha256-+tVSlqKyf70fxUfIQ+KnhzI6nE5Weh9D9JIlStah83U=";
};
postPatch = ''

View File

@@ -16,8 +16,8 @@ let
rulesProto = fetchFromGitHub {
owner = "bazelbuild";
repo = "rules_proto";
rev = "4.0.0-3.19.2";
sha256 = "sha256-wdmp+Tmf63PPr7G4X5F7rDas45WEETU3eKb47PFVI6o=";
rev = "4.0.0";
hash = "sha256-WVPZx14thneAC4PdiDhBibnPwlCKEF9c93CHR0t1Efo=";
postFetch = ''
sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release
cat <<EOF >>$out/proto/private/BUILD.release
@@ -29,13 +29,13 @@ let
in
buildBazelPackage rec {
pname = "bazel-watcher";
version = "0.23.1";
version = "0.24.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = "bazel-watcher";
rev = "v${version}";
sha256 = "sha256-fnhbxrgwffFQDIRLGisi1Wk3EjfkN8Mi8wtWT/Gy+78=";
hash = "sha256-ebNHAYKyE3226KiCc2/VSz1OSITuPwuYlAIS3JrWzj0=";
};
nativeBuildInputs = [ go git python3 ];
@@ -63,7 +63,7 @@ buildBazelPackage rec {
# currently present in PATH. Without removing the go_sdk from the marker
# file, the hash of it will change anytime the Go derivation changes and
# that would lead to impurities in the marker files which would result in
# a different sha256 for the fetch phase.
# a different hash for the fetch phase.
rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker
@@ -81,7 +81,7 @@ buildBazelPackage rec {
rm -rf $bazelOut/external/com_google_protobuf
'';
sha256 = "sha256-7/sLGgUCG4SU2nbK0596467dlrKylewiewhIvNFTMvY=";
sha256 = "sha256-B2KVD/FmkAa7MNhLaH286gF3uA20qjN3CoA83KRB9E8=";
};
buildAttrs = {

View File

@@ -23,13 +23,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
buildDotnetModule rec {
pname = "github-runner";
version = "2.311.0";
version = "2.312.0";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-71SwPuX1XZygT/TdAHECudxFxsQuXrl/tcAYVAxfxfI=";
hash = "sha256-gSxo73o/5B6RsR5fNQ8pCv/adXrZdVPwFK4Sjwa3ZIQ=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git-revision
@@ -160,6 +160,11 @@ buildDotnetModule rec {
"UseExternalsTrimmedPackage"
"ValidateHash"
]
++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterV2L0.${x}") [
"TestSelfUpdateAsync_DownloadRetry"
"TestSelfUpdateAsync_ValidateHash"
"TestSelfUpdateAsync"
]
++ map (x: "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [
"CompositeActionWithActionfile_CompositeContainerNested"
"CompositeActionWithActionfile_CompositePrestepNested"

View File

@@ -2,8 +2,12 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; sha256 = "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn"; })
(fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.19.1"; sha256 = "0rdgvlbqkcyc356xs0wzwbm92lf95621mf2shk30i3ahp0k0gd0k"; })
(fetchNuGet { pname = "Azure.Storage.Common"; version = "12.18.1"; sha256 = "1hjzggfv24598601jhcdfcaflbd5b97aglhxy7a5ymy1aszhwp9k"; })
(fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; })
(fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; })
@@ -109,6 +113,7 @@
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11-rc2-24027"; sha256 = "11rz0kdzk4bw9yc85jmskxla7i1bs61kladqzvymrg8xn3lk488a"; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1-rc2-24027"; sha256 = "080gd86c1pkfkzz67ispkzxc426lfh82zajayiizbgwd6yqa7fv5"; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
@@ -138,11 +143,13 @@
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "04q3sxrfxqgig9scmxblxlb6n6fypv535lby26pi20ixszs19dxc"; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
(fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; })
(fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })
(fetchNuGet { pname = "System.Linq"; version = "4.1.0-rc2-24027"; sha256 = "0icbsy0vq07achclz32jvnnfdchkgylsjj67gra3fn5906s40n24"; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
(fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; })
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; })
(fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
@@ -150,6 +157,7 @@
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0-rc2-24027"; sha256 = "062kbbvm17nhwmcxjnakfv3i23vrk6c9gmz6x8q79kcr5hxr40qs"; })
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12-rc2-24027"; sha256 = "065p89awfiz9kb304hqs7wkfpykd9z9kkv84ihm813msv54i8lvj"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
@@ -180,6 +188,7 @@
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0-rc2-24027"; sha256 = "1g5ghiyfb8njzfz39cswizjbxgaamil7kgkzgab93fhgk7jksmyg"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0-rc2-24027"; sha256 = "09k4c6is31dpccwgb749055m2ad0b84rnapk69fmj3wjswacg26p"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
@@ -221,6 +230,8 @@
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11-rc2-24027"; sha256 = "02xic3hhfy48s50bxh25as1l9v3afgrhlxqfnd5ki4qirxly7qs6"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; })
(fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; sha256 = "1hr4qqzrij3y2ayi8jj70yfg0i9imf6fpdam1gr8qgp795kh86qg"; })
@@ -235,6 +246,7 @@
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0-rc2-24027"; sha256 = "108sdqpy3ga6gzksl59w1k21a3jlrh8x2igyxh3dm3212rca1pyg"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1-rc2-24027"; sha256 = "06kwi42lgf3zw3b5yw668ammbjl6208y182wyqaaqrxgn5gs4yh7"; })
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })

View File

@@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, stdenv }:
{ lib, buildGoModule, fetchFromGitHub, stdenv, testers, earthly }:
buildGoModule rec {
pname = "earthly";
version = "0.7.23";
version = "0.8.0";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
hash = "sha256-YXfW+O7u97x8YoWLNFSU/OIB9DGsqWEIwUpfvnXySMg=";
hash = "sha256-CB3ybV/jW1l0esSPNA6hBsceVw0UlmyDydz9dLmd3N4=";
};
vendorHash = "sha256-Tr9clCUS7T0295Oxe6wvQN0oXCg1G48rzGXBL3R9TYU=";
vendorHash = "sha256-IU/D//ucQQIb/+M5rN7mtoVqDFmq799b6IoQfjD86Ls=";
subPackages = [ "cmd/earthly" "cmd/debugger" ];
CGO_ENABLED = 0;
@@ -39,6 +39,13 @@ buildGoModule rec {
mv $out/bin/debugger $out/bin/earthly-debugger
'';
passthru = {
tests.version = testers.testVersion {
package = earthly;
version = "v${version}";
};
};
meta = with lib; {
description = "Build automation for the container era";
homepage = "https://earthly.dev/";

View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.19.11";
version = "0.19.12";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-NUwjzOpHA0Ijuh0E69KXx8YVS5GTnKmob9HepqugbIU=";
hash = "sha256-NQ06esCSU6YPvQ4cMsi3DEFGIQGl8Ff6fhdTxUAyGvo=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubedock";
version = "0.15.1";
version = "0.15.2";
src = fetchFromGitHub {
owner = "joyrex2001";
repo = "kubedock";
rev = version;
hash = "sha256-/uC/blvR6+F5Uyj1Fc5I5eSKucc0w76U0cwWKULfdyU=";
hash = "sha256-EewvlH+Coz/78AfZfj230BNzuPsKvB7pnV0sJtvYGnc=";
};
vendorHash = "sha256-rkn6JzPB1UNpaCon6LyYNUAsV88t3xbppDrtBwjBEHk=";

View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terraform-ls";
version = "0.32.5";
version = "0.32.6";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
hash = "sha256-ywqxme/dsMwREvgLa2iLaibYzXHqgXR4OO8V8UiSSjw=";
hash = "sha256-+1nmxjR1iVtQXjdsqXaYTh8kLGq9gqSDjt1drvR9KoY=";
};
vendorHash = "sha256-+6yO4gQmMNzl/rMWWQnyhepEI5miSCyolOQxQXWqGng=";
vendorHash = "sha256-8taGEDJ+Qtw/4eOWYiWZmEbmCwqcFXYh3x/9wR3oBJ8=";
ldflags = [ "-s" "-w" ];

View File

@@ -37,16 +37,16 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mysql-shell";
version = "8.0.35";
version = "8.0.36";
srcs = [
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
hash = "sha256-kXxe04cE6ZIRGFzkviTjOowZyRJB7XOvQYGm840VdMI=";
hash = "sha256-9PJwa5WKinOA72yVjdlyMHvb7qRR76/DQuTEbim36d0=";
})
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
hash = "sha256-2Dn/RR5BWHMsD/QzKYPo8tqyAQGmHCGwVl2+bzNfy5I=";
hash = "sha256-s0+7dbcLcgS8u/6p7vpVAV9sR2gf2j9VDnSCJvw77fQ=";
})
];
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
# Build MySQL
echo "Building mysqlclient mysqlxclient"
cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
cmake -DWITH_SYSTEM_LIBS=ON -DWITH_BOOST=system -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
-DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build
cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient

View File

@@ -6,7 +6,7 @@
}:
let
tag = "0.3.6";
tag = "0.3.7";
in
stdenv.mkDerivation {
pname = "apfs";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
owner = "linux-apfs";
repo = "linux-apfs-rw";
rev = "v${tag}";
hash = "sha256-k62PgUffBx6ZrWWLeX460adh/vv6XWxSmtEiwaWxiaU=";
hash = "sha256-LmUaIKZ1Msc4yAXNMzyDhPCPsQYeYnUbRF6pA9WvHYk=";
};
hardeningDisable = [ "pic" ];

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "rtl8812au";
version = "${kernel.version}-unstable-2023-07-22";
version = "${kernel.version}-unstable-2024-01-19";
src = fetchFromGitHub {
owner = "morrownr";
repo = "8812au-20210629";
rev = "b5f4e6e894eca8fea38661e2fc22a2570e0274ad";
hash = "sha256-3uPowesJVh/cnagMz/Uadb+U5rDUAWfU39tZaDNCoqg=";
rev = "3b921c0beda8583c1d2d1b0b7e4692d11e7ea772";
hash = "sha256-Ji61Y23uGSTyj3Z5ia9iev5rVzSOv7XY/IfAClhz7Q8=";
};
nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies;

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "rtl88x2bu";
version = "${kernel.version}-unstable-2023-09-24";
version = "${kernel.version}-unstable-2023-11-29";
src = fetchFromGitHub {
owner = "morrownr";
repo = "88x2bu-20210702";
rev = "888ba1b309e6258a736ef5c37a68836cd0ea5517";
sha256 = "sha256-oLRGRKUNTmIw+Zn23TArGumo24AIH2YEMpnStyXBNw8=";
rev = "cd2b6cbd9c8fbfebee8a1f28fab8e4434450456c";
sha256 = "sha256-t1lLJSEDzY2zvgcKYaxUq/umrlLpxu4+4zWmG8R0Wz4=";
};
hardeningDisable = [ "pic" ];

View File

@@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "knot-exporter";
version = "3.3.2";
version = "3.3.3";
pyproject = true;
src = fetchPypi {
pname = "knot_exporter";
inherit version;
hash = "sha256-/TBzq9MhYb664TsSD46Ep7gOkLBmmPSK9d89xlgvbSw=";
hash = "sha256-A7WRwWwcfgrkR5ixEaDCcCdJ1J8/zeG5aFCBnFbD3Qo=";
};
nativeBuildInputs = [

View File

@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "spicedb";
version = "1.28.0";
version = "1.29.0";
src = fetchFromGitHub {
owner = "authzed";
repo = "spicedb";
rev = "v${version}";
hash = "sha256-Zbg5rcgOSgTeVDuZpvzXuo0DWx5PH+9xPxHZZJjqpKs=";
hash = "sha256-AQmYoTrCwS2IdA9N2RWmbnPNIfKW3ofreZv+VEbe1Wg=";
};
vendorHash = "sha256-jzH9f/hN2S9MUtomIjPQ/VErDWyVjNN9G4W7hHiFRJs=";
vendorHash = "sha256-LYVxKrFMtxG13cxpQ2btXO9EmKY0UBI+ZP3aYI88i3A=";
subPackages = [ "cmd/spicedb" ];

View File

@@ -1,7 +1,7 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }:
let
version = "1.58.0";
version = "1.58.2";
in
buildGoModule {
pname = "tailscale";
@@ -11,7 +11,7 @@ buildGoModule {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-ue1opjT8wkL+hYzMxU/GtOrJd3/KPSOptU8A8nklacY=";
hash = "sha256-FiFFfUtse0CKR4XJ82HEjpZNxCaa4FnwSJfEzJ5kZgk=";
};
vendorHash = "sha256-BK1zugKGtx2RpWHDvFZaFqz/YdoewsG8SscGt25uwtQ=";

View File

@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication rec {
pname = "stratis-cli";
version = "3.6.0";
format = "pyproject";
pyproject = true;
src = fetchFromGitHub {
owner = "stratis-storage";
@@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-mLmjMofdr0U+Bfnkde7lJqPXkd1ICPYdlcsOm2nOcQA=";
};
nativeBuildInputs = with python3Packages; [
setuptools
];
propagatedBuildInputs = with python3Packages; [
dbus-client-gen
dbus-python-client-gen

View File

@@ -9,13 +9,13 @@
}:
buildPythonApplication rec {
pname = "mpremote";
version = "1.20.0";
version = "1.22.1";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
rev = "v${version}";
hash = "sha256-udIyNcRjwwoWju0Qob0CFtMibbVKwc7j2ji83BC1rX0=";
rev = "refs/tags/v${version}";
hash = "sha256-tGFXJW1RkUs/64Yatgg/1zZFPDQdu76uiMjNU8ebdvg=";
};
sourceRoot = "source/tools/mpremote";
format = "pyproject";

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "13.0.0";
version = "14.0.0";
src = fetchFromGitHub {
owner = "topgrade-rs";
repo = "topgrade";
rev = "v${version}";
hash = "sha256-BuYwLD8HlmFjCpR8043GhrYK3XWffeqEaeEDqWhxZVI=";
hash = "sha256-sZUJMbFQiGw1Qqdtv+yExSnmaKd02+qIEgE3SHKYP6s=";
};
cargoHash = "sha256-+kSvA9AC0peXeFLVjenATRfnIS9qaOr/f1ozPbifiPI=";
cargoHash = "sha256-XRVxPjvQT0XfhMMa+M4yLtTIpUl6Mtq9eM9wG2pkug8=";
nativeBuildInputs = [
installShellFiles

View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "watchexec";
version = "1.25.0";
version = "1.25.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-kEZvzIbmL+Plko+uLP5LnacPoypkBCMzxSOkRkDsLW4=";
hash = "sha256-0zBY0PS7qJCAabg9ZKX1JC+gaTM/WSs2U6Avcq3MHmQ=";
};
cargoHash = "sha256-FgTD7jFgkhJA73VVZ47FcA21xJaMX8c3SAaB13Nvrqs=";
cargoHash = "sha256-RSJOGiSziI2OJkRJAxPZ57uyPPjd3uExijHdIy52dr4=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -1113,7 +1113,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10;
boost = boost177; # Configure checks for specific version.
icu = icu69;
icu = icu73;
protobuf = protobuf_21;
};
@@ -18049,8 +18049,6 @@ with pkgs;
ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { };
starlark = callPackage ../development/interpreters/starlark { };
starlark-rust = callPackage ../development/interpreters/starlark-rust { };
supercollider = libsForQt5.callPackage ../development/interpreters/supercollider {

View File

@@ -1068,6 +1068,8 @@ let
mezzo = callPackage ../development/compilers/mezzo { };
middleware = callPackage ../development/ocaml-modules/middleware { };
mimic = callPackage ../development/ocaml-modules/mimic { };
mimic-happy-eyeballs = callPackage ../development/ocaml-modules/mimic/happy-eyeballs.nix { };

View File

@@ -388,6 +388,7 @@ mapAliases ({
pytestrunner = pytest-runner; # added 2021-01-04
python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05
python-igraph = igraph; # added 2021-11-11
python_openzwave = python-openzwave; # added 2024-01-07
python-openzwave-mqtt = throw "python-openzwave was removed, as it was packaged as a dependency of home-assistant, which it is no longer."; # added 2024-01-05
python_docs_theme = python-docs-theme; # added 2023-11-04
python_fedora = python-fedora; # added 2023-11-15

View File

@@ -11889,7 +11889,7 @@ self: super: with self; {
python-openstackclient = callPackage ../development/python-modules/python-openstackclient { };
python_openzwave = callPackage ../development/python-modules/python_openzwave { };
python-openzwave = callPackage ../development/python-modules/python-openzwave { };
python-osc = callPackage ../development/python-modules/python-osc { };