Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -8,7 +8,7 @@
|
||||
imports =
|
||||
[
|
||||
# Include the default lxd configuration.
|
||||
"${modulesPath}/modules/virtualisation/lxc-container.nix"
|
||||
"${modulesPath}/virtualisation/lxc-container.nix"
|
||||
# Include the container-specific autogenerated configuration.
|
||||
./lxd.nix
|
||||
];
|
||||
|
||||
@@ -45,7 +45,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "touchosc";
|
||||
version = "1.2.4.180";
|
||||
version = "1.2.5.183";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "linux-arm64";
|
||||
@@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-Z3vHcfimchshFTRbSsVhAw4DJPetZF59zyAnnbQ3YAM=";
|
||||
armv7l-linux = "sha256-KUA6UFenEVme0AMuE69dR13RfYSGAd9GEdikh3DS0ko=";
|
||||
x86_64-linux = "sha256-3RA+piRJ4UE4tPYALaifENJg7+0BZDmSwS36VJiEn8Q=";
|
||||
aarch64-linux = "sha256-V5615E2jVqk7CcCBbW5A0JEyEi6secC0Rj8KrQpfjns=";
|
||||
armv7l-linux = "sha256-0nyRffx8/OieVJTvJRtUIvrx5IyqmqEMMEZszPPDXb0=";
|
||||
x86_64-linux = "sha256-oV2T7l5/3JqXXoyiR3PeYJyHQe4GcDUxsi6cNxLUcng=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, writeShellScript
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
|
||||
, freetype
|
||||
, libjpeg
|
||||
@@ -107,14 +108,14 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation {
|
||||
pname = "darling";
|
||||
version = "unstable-2023-05-02";
|
||||
version = "unstable-2023-11-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darlinghq";
|
||||
repo = "darling";
|
||||
rev = "557e7e9dece394a3f623825679474457e5b64fd0";
|
||||
rev = "34351655a40d2090e70b3033a577b8cdea967633";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-SOoLaV7wg33qRHPQXkdMvrY++CvoG85kwd6IU6DkYa0=";
|
||||
hash = "sha256-Jhr7Do15vms8bJ8AczVSkuWrC7gUR5ZvU9/PfCmGGcg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "sdk" ];
|
||||
@@ -221,6 +222,8 @@ in stdenv.mkDerivation {
|
||||
$out/libexec/darling/usr/libexec/darling/mldr
|
||||
'';
|
||||
|
||||
passthru.tests.nixos = nixosTests.darling;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source Darwin/macOS emulation layer for Linux";
|
||||
homepage = "https://www.darlinghq.org";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatekeeper";
|
||||
version = "3.13.3";
|
||||
version = "3.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "gatekeeper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kLDriWkzOX4mC4VTpkyEtMTpOSoR0BsCwVeWLCfaY5w=";
|
||||
hash = "sha256-h6GxU7y6z5wyZjuK7wI6BG0aF2u6hqLsID7ijTNzifc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, buildGo121Module
|
||||
, fetchFromGitHub
|
||||
, fetchFromGitLab
|
||||
, callPackage
|
||||
@@ -87,7 +86,6 @@ let
|
||||
heroku = automated-providers.heroku.override { spdx = "MPL-2.0"; };
|
||||
# mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
|
||||
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
|
||||
tailscale = automated-providers.tailscale.override { mkProviderGoModule = buildGo121Module; };
|
||||
};
|
||||
|
||||
# Put all the providers we not longer support in this list.
|
||||
@@ -98,7 +96,6 @@ let
|
||||
in
|
||||
lib.optionalAttrs config.allowAliases {
|
||||
fly = archived "fly" "2023/10";
|
||||
ksyun = removed "ksyun" "2023/04";
|
||||
};
|
||||
|
||||
# excluding aliases, used by terraform-full
|
||||
|
||||
@@ -103,11 +103,10 @@
|
||||
"hash": "sha256-EGpHajrTTOx7LrFHzsrrkGMqsuUEJLJAN6AJ48QdJis=",
|
||||
"homepage": "https://registry.terraform.io/providers/vmware/avi",
|
||||
"owner": "vmware",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-avi",
|
||||
"rev": "v22.1.5",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-1+VDh9hR/2Knl5oV9ZQiPCt+F7VmaTU4MI1+o8Msu8M="
|
||||
"vendorHash": "sha256-r42KHzvRBXuWgLgtg+WUVt0ThjSMXtUKjEE9y/s/1uQ="
|
||||
},
|
||||
"aviatrix": {
|
||||
"hash": "sha256-PRYtkq4CLEbUJ7YOSlvDyz+z4icLi0DBkDCTs/tNoIQ=",
|
||||
@@ -1227,11 +1226,10 @@
|
||||
"hash": "sha256-9SOHw46KChe7bGInsIIyy0pyNG3K7CXNEomHkmpt8d4=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v3.22.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-HvjbXSAkbTmADyWQaw0lZV3nZUEIYiAB3VahYvIQeb4="
|
||||
"vendorHash": "sha256-5rRWlInDRj7hw4GZqTxfH7Y8tyTvzJgBWA1I5j0EyaI="
|
||||
},
|
||||
"vcd": {
|
||||
"hash": "sha256-ltdkB9PqmuCs5daRjcThVhy1wIoDW21yBiwtRo/pMss=",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchYarnDeps
|
||||
, yarn
|
||||
, fixup_yarn_lock
|
||||
, prefetch-yarn-deps
|
||||
, nodejs
|
||||
, makeWrapper
|
||||
, copyDesktopItems
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarn
|
||||
fixup_yarn_lock
|
||||
prefetch-yarn-deps
|
||||
nodejs
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
export HOME="$TMPDIR"
|
||||
yarn config --offline set yarn-offline-mirror "$offlineCache"
|
||||
fixup_yarn_lock yarn.lock
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
patchShebangs node_modules/
|
||||
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.32.2";
|
||||
version = "0.32.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CKL4XsOBo8y4k06t5E7k2HBmI4VABW4rxU6Bjl52fhs=";
|
||||
hash = "sha256-CldVak1BQ4VhRt24hHdog5O3crkQBZBkRWNT7uYUw4Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7v5813veJPP5NVe2gFZr+iXJmK+aLajSZuhEkgsMxuY=";
|
||||
cargoHash = "sha256-gWBmzpgZcsO4u8kXSqtr4FIYvshXpxWbECg/tcyl9Ok=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
||||
+5072
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libxkbcommon
|
||||
, libinput
|
||||
, libglvnd
|
||||
, mesa
|
||||
, udev
|
||||
, wayland
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "unstable-2023-11-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = "f61cdc5759235177521fbb6a39f164b9615adfc0";
|
||||
hash = "sha256-ZPkPqROZXRLLhv6fbjfsov5hIt+D0K7VFajKebHVZaw=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
|
||||
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
|
||||
"smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";
|
||||
"cosmic-comp-config-0.1.0" = "sha256-NKXIKhZLwZ0BZyGVEplAJ75H5YOsLRNeRrzdhczo3FQ=";
|
||||
"cosmic-config-0.1.0" = "sha256-CxeefjDmEqQkXPhWTomF1yb4GCI9vs3OCvMawBGUgaw=";
|
||||
"cosmic-protocols-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8=";
|
||||
"softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k=";
|
||||
"taffy-0.3.11" = "sha256-+gXAFZsS1cWxEisEpP0FMz9q1/UV7L2Ri4ToIP5Bt7s=";
|
||||
};
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libxkbcommon libinput libglvnd mesa udev wayland ];
|
||||
|
||||
# Force linking to libEGL, which is always dlopen()ed, and to
|
||||
# libwayland-client, which is always dlopen()ed except by the
|
||||
# obscure winit backend.
|
||||
RUSTFLAGS = map (a: "-C link-arg=${a}") [
|
||||
"-Wl,--push-state,--no-as-needed"
|
||||
"-lEGL"
|
||||
"-lwayland-client"
|
||||
"-Wl,--pop-state"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pop-os/cosmic-workspaces-epoch";
|
||||
description = "Workspaces Epoch for the COSMIC Desktop Environment";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ nyanbinary ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -17,16 +17,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eza";
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q72IIKUWZBroDcxMEa1ppTPda9lg/KtEpCNOqlg9ZhU=";
|
||||
hash = "sha256-wydKLy02S2REgN01Gb4PK1KsczjXsx5hU+hO9o9iZzE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UBayjaQX+bRkciookfQYUrCCewMXlIL3Z1I2ZJIbX6o=";
|
||||
cargoHash = "sha256-MybbaJQqVHz7yt8rPp8k3aWqQHD7SJkbC7PDjwgmpLo=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
|
||||
buildInputs = [ zlib ]
|
||||
|
||||
@@ -109,9 +109,9 @@ in {
|
||||
major = "3";
|
||||
minor = "13";
|
||||
patch = "0";
|
||||
suffix = "a1";
|
||||
suffix = "a2";
|
||||
};
|
||||
hash = "sha256-8Cgb8izABBQ2HBT8kZcYPn6y6rtylla2lEIiT7tj7ss=";
|
||||
hash = "sha256-ttRrRBkMTAJCHraaBC0WsMVUgb3agYxsQW3CRBE6nC0=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zuo";
|
||||
version = "unstable-2023-11-10";
|
||||
version = "unstable-2023-11-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "racket";
|
||||
repo = "zuo";
|
||||
rev = "9e2aa26b0574b4ac53c838f6b59fd78f952c3923";
|
||||
hash = "sha256-wF+jj4+4uFofW9KhVqRF7EoWViRny2KuSfX/l6UN+yY=";
|
||||
rev = "4d85edb4f221de8a1748ee38dcc6963d8d2da33a";
|
||||
hash = "sha256-pFEXkByZpVnQgXK1DeFSEnalvhCTwOy75WrRojBM78U=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libubox";
|
||||
version = "unstable-2023-05-23";
|
||||
version = "unstable-2023-11-03";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.openwrt.org/project/libubox.git";
|
||||
rev = "75a3b870cace1171faf57bd55e5a9a2f1564f757";
|
||||
hash = "sha256-QhJ09i7IWP6rbxrYuhisVsCr82Ou/JAZMEdkaLhZp1o=";
|
||||
rev = "f7d1569113110ea8df071d2ea64fd17aaf5b42c9";
|
||||
hash = "sha256-W0+QXI0gJ4WwrlRMPAJOChvilZ4zlAf4kXrfgBAkQAE=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ];
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
||||
description = "C utility functions for OpenWrt";
|
||||
homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ fpletz mkg20001 ];
|
||||
mainProgram = "jshn";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ubus";
|
||||
version = "unstable-2023-06-05";
|
||||
version = "unstable-2023-11-14";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.openwrt.org/project/ubus.git";
|
||||
rev = "f787c97b34894a38b15599886cacbca01271684f";
|
||||
hash = "sha256-PGPFtNaRXS6ryC+MA/w2CtPQfJa+vG5OXf/NPFMoIzQ=";
|
||||
rev = "b3e8c4ef07ebb6f0f34a5c1f0dc1539068363619";
|
||||
hash = "sha256-H/QrLMhdEC1LnSxHpp/90OdKbfHRqLVWUnzyQlsVO8c=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DBUILD_LUA=OFF" ];
|
||||
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
||||
description = "ustream SSL wrapper";
|
||||
homepage = "https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ fpletz mkg20001 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, atdgen-codec-runtime, menhir, easy-format, buildDunePackage, re, yojson, nixosTests }:
|
||||
{ lib, atdgen-codec-runtime, cmdliner, menhir, easy-format, buildDunePackage, re, yojson, nixosTests }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "atd";
|
||||
@@ -7,10 +7,9 @@ buildDunePackage rec {
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
nativeBuildInputs = [ menhir ];
|
||||
buildInputs = [ cmdliner ];
|
||||
propagatedBuildInputs = [ easy-format re yojson ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.atd;
|
||||
};
|
||||
|
||||
@@ -2,13 +2,11 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "atdgen-codec-runtime";
|
||||
version = "2.11.0";
|
||||
|
||||
duneVersion = "3";
|
||||
version = "2.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ahrefs/atd/releases/download/${version}/atdts-${version}.tbz";
|
||||
hash = "sha256-TTTuSxNKydPmTmztUapLoxntBIrAo8aWYIJ/G5cok1Y=";
|
||||
url = "https://github.com/ahrefs/atd/releases/download/${version}/atd-${version}.tbz";
|
||||
hash = "sha256-ukJ5vtVNE9zz9nA6SzF0TbgV3yLAUC2ZZdbGdM4IOTM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,21 +5,22 @@
|
||||
, hatchling
|
||||
, platformdirs
|
||||
, traitlets
|
||||
, pip
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-core";
|
||||
version = "5.3.1";
|
||||
version = "5.5.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter";
|
||||
repo = "jupyter_core";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kQ7oNEC5L19PTPaX6C2bP5FYuzlsFsS0TABsw6VvoL8=";
|
||||
hash = "sha256-GufCQUkR4283xMsyrbv5tDfJ8SeL35WBW5Aw2z6Ardc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,6 +37,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pip
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -43,6 +45,11 @@ buildPythonPackage rec {
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
# suppress pytest.PytestUnraisableExceptionWarning: Exception ignored in: <socket.socket fd=-1, family=AddressFamily.AF_UNIX, type=SocketKind.SOCK_STREAM, proto=0>
|
||||
"-W ignore::pytest.PytestUnraisableExceptionWarning"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# creates a temporary script, which isn't aware of PYTHONPATH
|
||||
"test_argv0"
|
||||
@@ -57,7 +64,8 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Base package on which Jupyter projects rely";
|
||||
homepage = "https://jupyter.org/";
|
||||
changelog = "https://github.com/jupyter/jupyter_core/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
maintainers = teams.jupyter.members;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/jupyter_core/tests/test_command.py b/jupyter_core/tests/test_command.py
|
||||
index 4ef38cd..08fba22 100644
|
||||
--- a/jupyter_core/tests/test_command.py
|
||||
+++ b/jupyter_core/tests/test_command.py
|
||||
@@ -174,7 +174,7 @@ def test_not_on_path(tmpdir):
|
||||
diff --git a/tests/test_command.py b/tests/test_command.py
|
||||
index a0833c1..67c2110 100644
|
||||
--- a/tests/test_command.py
|
||||
+++ b/tests/test_command.py
|
||||
@@ -191,7 +191,7 @@ def test_not_on_path(tmpdir):
|
||||
witness_src = "#!{}\n{}\n".format(sys.executable, 'print("WITNESS ME")')
|
||||
write_executable(witness, witness_src)
|
||||
|
||||
@@ -11,7 +11,7 @@ index 4ef38cd..08fba22 100644
|
||||
if "SYSTEMROOT" in os.environ: # Windows http://bugs.python.org/issue20614
|
||||
env["SYSTEMROOT"] = os.environ["SYSTEMROOT"]
|
||||
if sys.platform == "win32":
|
||||
@@ -198,7 +198,7 @@ def test_path_priority(tmpdir):
|
||||
@@ -216,7 +216,7 @@ def test_path_priority(tmpdir):
|
||||
witness_b_src = "#!{}\n{}\n".format(sys.executable, 'print("WITNESS B")')
|
||||
write_executable(witness_b, witness_b_src)
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, backoff
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, geojson
|
||||
@@ -7,21 +6,17 @@
|
||||
, imagesize
|
||||
, nbconvert
|
||||
, nbformat
|
||||
, ndjson
|
||||
, numpy
|
||||
, opencv
|
||||
# , opencv-python
|
||||
, opencv4
|
||||
, packaging
|
||||
, pillow
|
||||
, pydantic
|
||||
# , pygeotile
|
||||
, pyproj
|
||||
, pytest-cases
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, rasterio
|
||||
, requests
|
||||
, setuptools
|
||||
, shapely
|
||||
, tqdm
|
||||
, typeguard
|
||||
@@ -30,8 +25,8 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "labelbox";
|
||||
version = "3.52.0";
|
||||
format = "setuptools";
|
||||
version = "3.56.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -39,7 +34,7 @@ buildPythonPackage rec {
|
||||
owner = "Labelbox";
|
||||
repo = "labelbox-python";
|
||||
rev = "refs/tags/v.${version}";
|
||||
hash = "sha256-t0Q+6tnUPK2oqjdAwwYeSebgn2EQ1fBivw115L8ndOg=";
|
||||
hash = "sha256-JRh14XpW/iGeBWrslm7weCP/vyJ7eZICqRgQpE2wjXs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -48,18 +43,13 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"backoff"
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
backoff
|
||||
google-api-core
|
||||
ndjson
|
||||
pydantic
|
||||
python-dateutil
|
||||
requests
|
||||
tqdm
|
||||
];
|
||||
@@ -70,7 +60,7 @@ buildPythonPackage rec {
|
||||
geojson
|
||||
numpy
|
||||
pillow
|
||||
# opencv-python
|
||||
opencv4
|
||||
typeguard
|
||||
imagesize
|
||||
pyproj
|
||||
@@ -83,10 +73,15 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
nbconvert
|
||||
nbformat
|
||||
pytest-cases
|
||||
pytestCheckHook
|
||||
] ++ passthru.optional-dependencies.data;
|
||||
|
||||
# disable pytest_plugins which requires `pygeotile`
|
||||
preCheck = ''
|
||||
substituteInPlace tests/conftest.py \
|
||||
--replace "pytest_plugins" "_pytest_plugins"
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires network access
|
||||
"tests/integration"
|
||||
@@ -94,11 +89,6 @@ buildPythonPackage rec {
|
||||
"tests/data"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# see tox.ini
|
||||
"-k 'not notebooks'"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"labelbox"
|
||||
];
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
, importlib-metadata
|
||||
, flaky
|
||||
, ipywidgets
|
||||
, pyppeteer
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
@@ -33,15 +32,14 @@ let
|
||||
};
|
||||
in buildPythonPackage rec {
|
||||
pname = "nbconvert";
|
||||
version = "7.8.0";
|
||||
version = "7.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9bwVoSR+FN1Bzu8MCjvHACDgFldusFeNpi8cW0+VBHk=";
|
||||
hash = "sha256-q+3AHPVDF3/94L/Cppcm1aR49q8QozL8G/Kfy08M8AA=";
|
||||
};
|
||||
|
||||
# Add $out/share/jupyter to the list of paths that are used to search for
|
||||
@@ -87,7 +85,6 @@ in buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
flaky
|
||||
ipywidgets
|
||||
pyppeteer
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -105,8 +102,9 @@ in buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Converting Jupyter Notebooks";
|
||||
homepage = "https://jupyter.org/";
|
||||
homepage = "https://github.com/jupyter/nbconvert";
|
||||
changelog = "https://github.com/jupyter/nbconvert/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
maintainers = lib.teams.jupyter.members;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minify";
|
||||
version = "2.20.5";
|
||||
version = "2.20.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdewolff";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+oaK6OdBRxtWW+0zp+pbCcGyphuOLzyv/LfjDqDiTGw=";
|
||||
hash = "sha256-kfn7oOBmfvghzp156yTTry7Bp+e/CW/RQlG4P6QSRHw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GQqdr0zMQhi6QfLAyFchtWPOGfpo5yODDinKWA/s+qs=";
|
||||
vendorHash = "sha256-uTzx1Ei6MQZX76pxNaNaREX2ic0Cz4uGT38vX9xmIt8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "20.9.0";
|
||||
sha256 = "sha256-oj2WgQq/BFVCazSdR85TEPMwlbe8BXG5zFEPSBw6RRk=";
|
||||
version = "20.10.0";
|
||||
sha256 = "sha256-MuslbuvYys1VdOZjHlS0K+fsjr4lrUeoymhUA7rRVTU=";
|
||||
patches = [
|
||||
./revert-arm64-pointer-auth.patch
|
||||
./disable-darwin-v8-system-instrumentation-node19.patch
|
||||
|
||||
@@ -1,19 +1,30 @@
|
||||
{ lib, stdenv, fetchurl, unzip, jre8
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, unzip
|
||||
, jdk11
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, iconConvTools
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "protege-distribution";
|
||||
version = "5.5.0";
|
||||
version = "5.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/protegeproject/protege-distribution/releases/download/v${version}/Protege-${version}-platform-independent.zip";
|
||||
sha256 = "092x22wyisdnhccx817mqq15sxqdfc7iz4whr4mbvzrd9di6ipjq";
|
||||
url = "https://github.com/protegeproject/protege-distribution/releases/download/protege-${version}/Protege-${version}-platform-independent.zip";
|
||||
sha256 = "08pr0rn76wcc9bczdf93nlshxbid4z4nyvmaz198hhlq96aqpc3i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip copyDesktopItems iconConvTools ];
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
iconConvTools
|
||||
jdk11
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Replace logic for searching the install directory with a static cd into $out
|
||||
@@ -23,11 +34,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Resolve @out@ (introduced by "static-path.patch") to $out, and set the
|
||||
# correct Java executable (Protege is a JRE 8 application)
|
||||
substituteInPlace run.sh \
|
||||
--subst-var-by out $out \
|
||||
--replace "java -X" "exec ${jre8.outPath}/bin/java -X"
|
||||
# Resolve @out@ (introduced by "static-path.patch") to $out
|
||||
substituteInPlace run.sh --subst-var-by out $out
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -36,20 +44,18 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
mkdir -p $out/bin
|
||||
|
||||
# Delete non-Linux launch scripts
|
||||
rm run.{bat,command}
|
||||
|
||||
# Move launch script into /bin, giving it a recognizable name
|
||||
install -D run.sh $out/bin/run-protege
|
||||
# Wrap launch script to set $JAVA_HOME correctly
|
||||
mv run.sh $out/bin/run-protege
|
||||
wrapProgram $out/bin/run-protege --set JAVA_HOME ${jdk11.home}
|
||||
|
||||
# Generate and copy icons to where they can be found
|
||||
icoFileToHiColorTheme app/Protege.ico protege $out
|
||||
|
||||
# Move everything else under protege/
|
||||
mkdir $out/protege
|
||||
mv {bin,bundles,conf,plugins} $out/protege
|
||||
mv {bundles,conf,plugins} $out/protege
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lilypond";
|
||||
version = "2.24.2";
|
||||
version = "2.24.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
|
||||
sha256 = "sha256-eUTmENe08d5Mccz+H73TIB9U+sVFYb3NBIkU+Nu2Ckg=";
|
||||
sha256 = "sha256-3wBfdu969aTNdKEPjnEVJ4t/p58UAYk3tlwQlJjsRL4=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "below";
|
||||
version = "0.6.3";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookincubator";
|
||||
repo = "below";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d5a/M2XEw2E2iydopzedqZ/XfQU7KQyTC5NrPTeeNLg=";
|
||||
sha256 = "sha256-2mZBpvLPY6yrEAvB1YlFuaXJlmmNuZqhu3xWADNHbx0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-EoRCmEe9SAySZCm+QhaR4ngik4Arnm4SZjgDM5fSRmk=";
|
||||
cargoHash = "sha256-cTNxWCd4YH5VuZh0GRfBNtHmLqCQ75uyHqROkv1jbRA=";
|
||||
|
||||
prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service'';
|
||||
postInstall = ''
|
||||
|
||||
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-discord";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "discord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hksnD1RWK83JjVIZsKeK8bQobNmzIbm9drgU0VjiqLs=";
|
||||
hash = "sha256-p2DQD2E9RmP6yZGD88Y15eTz06euhNDaxCnnrWzqaB4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+dmlJZPc2Tw9G64MeLPY5Rgml3UKEqAtgGI1ImRvMBU=";
|
||||
vendorHash = "sha256-rbz6bWBl2rmfHuszjKoWZP4/B4F90MUtR5nAIXCU3pg=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -31,7 +31,10 @@ stdenv.mkDerivation rec {
|
||||
dontDisableStatic = true;
|
||||
|
||||
# postgis config directory assumes /include /lib from the same root for json-c library
|
||||
NIX_LDFLAGS = "-L${lib.getLib json_c}/lib";
|
||||
NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"
|
||||
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
|
||||
+ lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) " -l${stdenv.cc.libcxx.cxxabi.libName}";
|
||||
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.87.0";
|
||||
version = "0.87.1";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
@@ -33,10 +33,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "nushell";
|
||||
repo = "nushell";
|
||||
rev = version;
|
||||
hash = "sha256-anIkIVRsJW2f2hj/Bz9lcw1vFoWhGHAE/XgIvnxbJg8=";
|
||||
hash = "sha256-lPfP0bnMTb+IQoWdf7oHaj96/l68Ic6OmB/Ur9Q65g8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vwOAYigKItd2T/ze5H26cMfIssoAnt0XFQtfA8exLyM=";
|
||||
cargoHash = "sha256-2xc0IiPCmhFtVXWEpDpRny27/bJZAh/Ke9+LVsrcWF0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]
|
||||
|
||||
@@ -16,14 +16,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2023.11.2";
|
||||
version = "2023.11.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7VYGrWoElc/urs+jomJrRt0dzdmJhCenRvb9bHCl6H4=";
|
||||
hash = "sha256-KIDqIf9aJP5IS+qE0Gy5j3F2DGz/WGbN4Wf9SGzgnzA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -57,6 +57,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
protobuf
|
||||
pyparsing
|
||||
pyserial
|
||||
python-magic
|
||||
pyyaml
|
||||
requests
|
||||
tornado
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "hysteria";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apernet";
|
||||
repo = pname;
|
||||
rev = "app/v${version}";
|
||||
hash = "sha256-3ovJVo3Jqkq067XgDMxW5efCp6Ivfex4LbuUyR0cB8s=";
|
||||
hash = "sha256-5j24wIZ4LloE9t0sv5p+oiYmexOaORASNN9JylXxrk4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ErU1yEtSuMVkoJv9hyaE4OZS5o7GxuleoK0Q9BI2skw=";
|
||||
|
||||
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://git.openwrt.org/?p=project/uqmi.git;a=summary";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ fpletz mkg20001 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,6 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://www.cgsecurity.org/wiki/CmosPwd";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ t4ccer ];
|
||||
platforms = platforms.x86_64;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user