Merge staging-next into staging
This commit is contained in:
@@ -552,7 +552,6 @@
|
||||
"lf-": 6652840
|
||||
},
|
||||
"members": {
|
||||
"9999years": 15312184,
|
||||
"Qyriad": 1542224,
|
||||
"RaitoBezarius": 314564
|
||||
},
|
||||
|
||||
@@ -23,6 +23,19 @@
|
||||
meta.maintainers = with lib.maintainers; [ mic92 ];
|
||||
|
||||
options.hardware.facter = with lib; {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = config.hardware.facter.report != { };
|
||||
defaultText = literalExpression ''
|
||||
config.hardware.facter.report != { }
|
||||
'';
|
||||
description = ''
|
||||
Whether to enable automatic hardware configuration using a report generated by nixos-facter.
|
||||
|
||||
See <https://nix-community.github.io/nixos-facter/> for more information.
|
||||
'';
|
||||
};
|
||||
|
||||
report = mkOption {
|
||||
type = types.attrsOf types.anything;
|
||||
default =
|
||||
|
||||
@@ -22,7 +22,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null) {
|
||||
config = lib.mkIf config.hardware.facter.enable {
|
||||
boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.disk.kernelModules;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ let
|
||||
hasIntelCpu = facterLib.hasIntelCpu report;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null && isBaremetal) {
|
||||
config = lib.mkIf (config.hardware.facter.enable && isBaremetal) {
|
||||
# none (e.g. bare-metal)
|
||||
# provide firmware for devices that might not have been detected by nixos-facter
|
||||
hardware.enableRedistributableFirmware = lib.mkDefault true;
|
||||
|
||||
@@ -12,7 +12,7 @@ in
|
||||
defaultText = "hardware dependent";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null && cfg.enable) {
|
||||
config = lib.mkIf (config.hardware.facter.enable && cfg.enable) {
|
||||
services.xserver.videoDrivers = [ "modesetting" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null && cfg.enable) (
|
||||
config = lib.mkIf (config.hardware.facter.enable && cfg.enable) (
|
||||
{
|
||||
boot.initrd.kernelModules = config.hardware.facter.detected.boot.graphics.kernelModules;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null) {
|
||||
config = lib.mkIf config.hardware.facter.enable {
|
||||
boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.keyboard.kernelModules;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -60,12 +60,10 @@ in
|
||||
];
|
||||
};
|
||||
};
|
||||
config =
|
||||
lib.mkIf (config.hardware.facter.reportPath != null && config.hardware.facter.detected.dhcp.enable)
|
||||
{
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
config = lib.mkIf (config.hardware.facter.enable && config.hardware.facter.detected.dhcp.enable) {
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
# Per-interface DHCP configuration
|
||||
networking.interfaces = perInterfaceConfig;
|
||||
};
|
||||
# Per-interface DHCP configuration
|
||||
networking.interfaces = perInterfaceConfig;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null && config.boot.initrd.network.enable) {
|
||||
config = lib.mkIf (config.hardware.facter.enable && config.boot.initrd.network.enable) {
|
||||
boot.initrd.kernelModules = config.hardware.facter.detected.boot.initrd.networking.kernelModules;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null) {
|
||||
config = lib.mkIf config.hardware.facter.enable {
|
||||
networking.enableIntel2200BGFirmware = lib.mkIf cfg._2200BG.enable (lib.mkDefault true);
|
||||
hardware.enableRedistributableFirmware = lib.mkIf cfg._3945ABG.enable (lib.mkDefault true);
|
||||
};
|
||||
|
||||
@@ -51,7 +51,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null) {
|
||||
config = lib.mkIf config.hardware.facter.enable {
|
||||
|
||||
# KVM support
|
||||
boot.kernelModules =
|
||||
|
||||
@@ -71,11 +71,11 @@ in
|
||||
};
|
||||
|
||||
extraArgs = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.singleLineStr;
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [
|
||||
"--slice-us 5000"
|
||||
"--verbose"
|
||||
"--slice-us 5000"
|
||||
];
|
||||
description = ''
|
||||
Parameters passed to the chosen scheduler at runtime.
|
||||
@@ -107,9 +107,10 @@ in
|
||||
'';
|
||||
Restart = "on-failure";
|
||||
};
|
||||
|
||||
environment = {
|
||||
SCX_SCHEDULER = cfg.scheduler;
|
||||
SCX_FLAGS = lib.escapeShellArgs cfg.extraArgs;
|
||||
SCX_FLAGS = lib.concatStringsSep " " cfg.extraArgs;
|
||||
};
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash --pure -p curl cacert libxml2 yq nix jq
|
||||
#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/3c7487575d9445185249a159046cc02ff364bff8.tar.gz
|
||||
#! nix-shell -i bash --pure -p curl cacert nix jq
|
||||
#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/5b2c2d84341b2afb5647081c1386a80d7a8d8605.tar.gz
|
||||
# ^
|
||||
# |
|
||||
# nixos-unstable ~ 2023-07-06 -----------------/
|
||||
# nixos-unstable ~ 2026-03-16 -----------------/
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
|
||||
# scrape the downloads page for release info
|
||||
|
||||
curl -s -o eclipse-dl.html https://download.eclipse.org/eclipse/downloads/
|
||||
trap "rm eclipse-dl.html" EXIT
|
||||
curl -s -O https://download.eclipse.org/eclipse/downloads/data.json
|
||||
trap "rm data.json" EXIT
|
||||
|
||||
dlquery() {
|
||||
q=$1
|
||||
xmllint --html eclipse-dl.html --xmlout 2>/dev/null | xq -r ".html.body.main.div.table[3].tr[1].td[0].a${q}";
|
||||
q="$1"
|
||||
cat data.json | jq -r ".releases[0] | $q";
|
||||
}
|
||||
|
||||
# extract release info from download page HTML
|
||||
|
||||
platform_major=$(dlquery '."#text" | split(".") | .[0]' -r);
|
||||
platform_minor=$(dlquery '."#text" | split(".") | .[1]' -r);
|
||||
platform_major=$(dlquery '.label | split(".") | .[0]');
|
||||
platform_minor=$(dlquery '.label | split(".") | .[1]');
|
||||
|
||||
year=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]')
|
||||
buildmonth=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]')
|
||||
builddaytime=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]')
|
||||
year=$(dlquery '.path | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]')
|
||||
buildmonth=$(dlquery '.path | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]')
|
||||
builddaytime=$(dlquery '.path | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]')
|
||||
timestamp="${year}${buildmonth}${builddaytime}";
|
||||
|
||||
# account for possible release-month vs. build-month mismatches
|
||||
|
||||
@@ -43,57 +43,63 @@ let
|
||||
srcHash = "sha256-0hLTQR7f7s58DUgAZbDeREMee6VrqAKHyhS1Hs/Em1A=";
|
||||
cargoHash = "sha256-qcB+r9VzBz6ACZaXPL26MOxxtb/h2OIuxyc54vUgfPM=";
|
||||
yarnHash = "sha256-EmKeHORr/+qsDzAwtearMi7qodcCgjeAQcy+79HL7Vg=";
|
||||
pythonDeps = with python3Packages; [
|
||||
# anki (pylib) runtime deps
|
||||
decorator
|
||||
distro
|
||||
markdown
|
||||
orjson
|
||||
protobuf
|
||||
requests
|
||||
typing-extensions
|
||||
pythonDeps =
|
||||
with python3Packages;
|
||||
[
|
||||
# anki (pylib) runtime deps
|
||||
decorator
|
||||
distro
|
||||
markdown
|
||||
orjson
|
||||
protobuf
|
||||
requests
|
||||
typing-extensions
|
||||
|
||||
# aqt runtime deps
|
||||
beautifulsoup4
|
||||
flask
|
||||
flask-cors
|
||||
jsonschema
|
||||
pip-system-certs
|
||||
pyqt6
|
||||
pyqt6-sip
|
||||
pyqt6-webengine
|
||||
send2trash
|
||||
waitress
|
||||
# aqt runtime deps
|
||||
beautifulsoup4
|
||||
flask
|
||||
flask-cors
|
||||
jsonschema
|
||||
pip-system-certs
|
||||
pyqt6
|
||||
pyqt6-sip
|
||||
pyqt6-webengine
|
||||
send2trash
|
||||
waitress
|
||||
|
||||
# build-system deps (needed by uv for editable installs)
|
||||
editables
|
||||
hatchling
|
||||
pathspec
|
||||
pluggy
|
||||
setuptools
|
||||
trove-classifiers
|
||||
# build-system deps (needed by uv for editable installs)
|
||||
editables
|
||||
hatchling
|
||||
pathspec
|
||||
pluggy
|
||||
setuptools
|
||||
trove-classifiers
|
||||
|
||||
# transitive deps
|
||||
attrs
|
||||
blinker
|
||||
certifi
|
||||
charset-normalizer
|
||||
click
|
||||
idna
|
||||
itsdangerous
|
||||
jinja2
|
||||
jsonschema-specifications
|
||||
markupsafe
|
||||
packaging
|
||||
pip
|
||||
pysocks
|
||||
referencing
|
||||
rpds-py
|
||||
soupsieve
|
||||
urllib3
|
||||
werkzeug
|
||||
wrapt
|
||||
];
|
||||
# transitive deps
|
||||
attrs
|
||||
blinker
|
||||
certifi
|
||||
charset-normalizer
|
||||
click
|
||||
idna
|
||||
itsdangerous
|
||||
jinja2
|
||||
jsonschema-specifications
|
||||
markupsafe
|
||||
packaging
|
||||
pip
|
||||
pysocks
|
||||
referencing
|
||||
rpds-py
|
||||
soupsieve
|
||||
urllib3
|
||||
werkzeug
|
||||
wrapt
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
anki-audio
|
||||
anki-mac-helper
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ankitects";
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gleam";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = "gleam";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-y4D4e2zpa3WxUcO0XtuiY8KP+Y1LkNHKK675ZqbOHDU=";
|
||||
hash = "sha256-5wnHS9366qqfmJyatmElIwzCVazdNf3xH8Ydh2cPX2E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-e0MwqNJHiKoPaWxI38codA3BcYp3j1kcnrvFzPc8roE=";
|
||||
cargoHash = "sha256-Z8fEhj0b6K3KHmmC1CPaMXBdMn9fHu2Jc9ukDGFtSb4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ncps";
|
||||
version = "0.9.2";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kalbasit";
|
||||
repo = "ncps";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LRabKv+4xYQn2XH4AIacFkn3ewUd2S3UlVWCA6MUweU=";
|
||||
hash = "sha256-VPcX9gLXnTrap6HHU+08QdTBbT2oaNA2C9WY0e/FVoc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PpHSkD7+csPfUXoYRuKhBm1iBtTSwJhOxuW/4ayv9hY=";
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ptyxis";
|
||||
version = "49.3";
|
||||
version = "50.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "chergert";
|
||||
repo = "ptyxis";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kBkLJdUN9WNP0HLiQQMWBC/49YaLmkgOuIj8jqkgLgY=";
|
||||
hash = "sha256-SHp+2hYEYoKi5I4XuTwL818Kil812tOtuHNXCKoAJCk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "rmfakecloud";
|
||||
version = "0.0.27";
|
||||
version = "0.0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddvk";
|
||||
repo = "rmfakecloud";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Umh5MwFCKJ8Nr0uhPEvlTAn7SpMmvAh6N2l74bS6BYw=";
|
||||
hash = "sha256-N6hAv8dVCM3VWuKpHlK82mjQh6RB7W+n9KBNNQXDrC8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XksCJ9b5NDIutwqnWP63R2udp/Y5qkkgo2a4TPUi0Z4=";
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
buildDartApplication rec {
|
||||
pname = "serverpod_cli";
|
||||
version = "3.4.2";
|
||||
version = "3.4.4";
|
||||
|
||||
# Fetch the whole monorepo
|
||||
src = fetchFromGitHub {
|
||||
owner = "serverpod";
|
||||
repo = "serverpod";
|
||||
tag = version;
|
||||
hash = "sha256-u2YQRUMebfk2/GXll0uIgr0Lyh8DrBD7h6fo8laXgpE=";
|
||||
hash = "sha256-c/JsEUNGsa55slbJ33ZMr72+UelhiWKls5d2dUumJ+A=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/tools/serverpod_cli";
|
||||
|
||||
@@ -384,11 +384,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f",
|
||||
"sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.18.1"
|
||||
"version": "1.18.2"
|
||||
},
|
||||
"mime": {
|
||||
"dependency": "transitive",
|
||||
@@ -514,51 +514,51 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "serverpod_client",
|
||||
"sha256": "4beb3bb5d2b4d753199c663d80aaf646b07d54a25963f1ed5eee97ec04f6ccec",
|
||||
"sha256": "e7aecd8fb0a4ad86fcb931fb411f6e408b65c0fbcdb046940530cdaef8dea2db",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.2"
|
||||
"version": "3.4.4"
|
||||
},
|
||||
"serverpod_lints": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "serverpod_lints",
|
||||
"sha256": "2a36b136061ce3409d2c63358021794c32eb400636945157bf142e2e6eaf39f9",
|
||||
"sha256": "ad270a1d5315f1edd4f7474a00dc937b4e3a8043d59c15c19cf5bdd0272183ca",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.2"
|
||||
"version": "3.4.4"
|
||||
},
|
||||
"serverpod_serialization": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "serverpod_serialization",
|
||||
"sha256": "6643931c8147d1ed7207d6d18202399221e36f9f85b478a148fde15a4a076c1a",
|
||||
"sha256": "6b087d9e6075dec0973c31220b0ba09f67d31d79cb691f689a704e4b7f8343a3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.2"
|
||||
"version": "3.4.4"
|
||||
},
|
||||
"serverpod_service_client": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "serverpod_service_client",
|
||||
"sha256": "84b6dd7a6712ffb4ddfc01f721e3af1e5e20bc18e95d4245eb029360c0daae81",
|
||||
"sha256": "2d81f988f25ce136f3695f53564836853dca822fd01bf12065b9bab5b566306c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.2"
|
||||
"version": "3.4.4"
|
||||
},
|
||||
"serverpod_shared": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "serverpod_shared",
|
||||
"sha256": "4a37fd56b84259d1eea9b5483f52d7ed044629e53d577af4e0e1e94940151503",
|
||||
"sha256": "8ebb1107e7a8f5bae35228a93f6a7701067d4dab4f340b4e34b010786668c46f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.2"
|
||||
"version": "3.4.4"
|
||||
},
|
||||
"shelf": {
|
||||
"dependency": "transitive",
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
gtk3,
|
||||
pango,
|
||||
cairo,
|
||||
libgbm,
|
||||
expat,
|
||||
libxkbcommon,
|
||||
eudev,
|
||||
@@ -103,6 +104,7 @@ intel-oneapi.mkIntelOneApi (finalAttrs: {
|
||||
nss
|
||||
dbus
|
||||
cups
|
||||
libgbm
|
||||
expat
|
||||
libxkbcommon
|
||||
eudev
|
||||
@@ -154,6 +156,7 @@ intel-oneapi.mkIntelOneApi (finalAttrs: {
|
||||
gtk3
|
||||
pango
|
||||
cairo
|
||||
libgbm
|
||||
expat
|
||||
libxkbcommon
|
||||
eudev
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
hatchling,
|
||||
mpv-unwrapped,
|
||||
lame,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "anki-audio";
|
||||
version = "0.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ankitects";
|
||||
repo = "anki-bundle-extras";
|
||||
rev = "e83c6e64dcb110ed579fc78afbb4e72bed8fb9e9";
|
||||
hash = "sha256-iOAZ7EytEVpvsrnVFk6bkiU8FWf2Q7tTzJjawZQCW6E=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
env = {
|
||||
ANKI_AUDIO_TARGET_OS = "darwin";
|
||||
ANKI_AUDIO_TARGET_ARCH = stdenv.hostPlatform.darwinArch;
|
||||
};
|
||||
|
||||
preBuild =
|
||||
let
|
||||
archDir = if stdenv.hostPlatform.isAarch64 then "arm64" else "amd64";
|
||||
in
|
||||
''
|
||||
mkdir -p mac/${archDir}/dist/audio/Resources
|
||||
ln -s ${lib.getExe mpv-unwrapped} ${lib.getExe lame} mac/${archDir}/dist/audio/Resources/
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "anki_audio" ];
|
||||
|
||||
meta = {
|
||||
description = "Audio binaries (mpv, lame) for Anki";
|
||||
homepage = "https://github.com/ankitects/anki-bundle-extras";
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
platforms = lib.platforms.darwin;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
euank
|
||||
junestepp
|
||||
oxij
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
stdenv,
|
||||
anki,
|
||||
hatchling,
|
||||
swift,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "anki-mac-helper";
|
||||
inherit (anki) version src;
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/qt/mac";
|
||||
|
||||
build-system = [ hatchling ];
|
||||
nativeBuildInputs = [ swift ];
|
||||
|
||||
# This is intended to emulate github:ankitects/anki/qt/mac/helper_build.py,
|
||||
# but targets the platform directly instead of universal binary + lipo.
|
||||
preBuild = ''
|
||||
swiftc \
|
||||
-target ${stdenv.hostPlatform.darwinArch}-apple-macos11 \
|
||||
-emit-library \
|
||||
-module-name ankihelper \
|
||||
-O \
|
||||
*.swift \
|
||||
-o anki_mac_helper/libankihelper.dylib
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "anki_mac_helper" ];
|
||||
|
||||
meta = {
|
||||
description = "Small support library for Anki on Macs";
|
||||
homepage = "https://github.com/ankitects/anki";
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
platforms = lib.platforms.darwin;
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
euank
|
||||
junestepp
|
||||
oxij
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -7,7 +7,6 @@
|
||||
libusb-package,
|
||||
numpy,
|
||||
packaging,
|
||||
pyserial,
|
||||
pyusb,
|
||||
scipy,
|
||||
pytestCheckHook,
|
||||
@@ -43,13 +42,13 @@ buildPythonPackage rec {
|
||||
libusb-package
|
||||
numpy
|
||||
packaging
|
||||
pyserial
|
||||
pyusb
|
||||
scipy
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# exception: Cannot find a Crazyradio Dongle (HW required)
|
||||
"examples/radio/radio_test.py"
|
||||
"sys_test/single_cf_grounded/"
|
||||
"sys_test/swarm_test_rig/"
|
||||
];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coverage";
|
||||
version = "7.13.2";
|
||||
version = "7.13.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coveragepy";
|
||||
repo = "coveragepy";
|
||||
tag = version;
|
||||
hash = "sha256-dYgZLAiuPwYs4NomT+c2KS9VXXYEMW8oyHk2y4TCwe0=";
|
||||
hash = "sha256-QWwaZDX3qW8AWbx5McOI5S+UO63/jGyRcycNSkAEgro=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -26,6 +26,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
libcst
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
|
||||
@@ -38,6 +38,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-cloud-core
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
libcst
|
||||
|
||||
@@ -26,6 +26,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
|
||||
@@ -27,6 +27,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-cloud-core
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
|
||||
@@ -23,6 +23,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
||||
@@ -29,6 +29,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-auth
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
|
||||
@@ -23,6 +23,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-cloud-core
|
||||
|
||||
@@ -24,6 +24,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
|
||||
@@ -24,6 +24,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
grpc-google-iam-v1
|
||||
google-api-core
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-auth
|
||||
|
||||
@@ -46,6 +46,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
deprecated
|
||||
google-api-core
|
||||
|
||||
@@ -30,6 +30,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-auth
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
||||
@@ -27,6 +27,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-cloud-core
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-auth
|
||||
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-auth
|
||||
|
||||
@@ -24,6 +24,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
||||
@@ -24,6 +24,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
||||
@@ -26,6 +26,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-auth
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
aiofiles,
|
||||
buildPythonPackage,
|
||||
charset-normalizer,
|
||||
cryptography,
|
||||
@@ -17,22 +18,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "niquests";
|
||||
version = "3.17.0";
|
||||
version = "3.18.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "niquests";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HGczeExOoZMBiPS//B/gu56Wnpzz55oawhTT67ekuOs=";
|
||||
hash = "sha256-lZMUm1rYCsNSMz/cKTqynaLqb1P75JJCFMDZ9onFS4g=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"wassima"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
charset-normalizer
|
||||
urllib3-future
|
||||
@@ -66,6 +63,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "niquests" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiofiles
|
||||
cryptography
|
||||
fastapi
|
||||
pytest-asyncio
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "samoswall";
|
||||
domain = "polaris";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samoswall";
|
||||
repo = "polaris-mqtt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/HMR+BZuwAoqFfELkjhT3k5NKMc2ahE/I3DTR1lQ5L0=";
|
||||
hash = "sha256-N8/NTipJEltyHekQaZZjvqfw+noI7pu/YStoidV9ddw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenvNoCC,
|
||||
yarn-berry,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "horizon-card";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rejuvenate";
|
||||
repo = "lovelace-horizon-card";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z2cJ6BIhNnzUo9nIFxVyrPBVWSKf35fyLXK72pE8TJw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarn-berry
|
||||
yarn-berry.yarnBerryConfigHook
|
||||
];
|
||||
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-LYPHBnDRcGeXo2btx1A4/e7fr7MYg/2G5GkuG/xDG+I=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
yarn build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install dist/lovelace-horizon-card.js -Dt $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Sun Card successor: Visualize the position of the Sun over the horizon";
|
||||
homepage = "https://github.com/rejuvenate/lovelace-horizon-card";
|
||||
changelog = "https://github.com/rejuvenate/lovelace-horizon-card/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ SuperSandro2000 ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -1635,7 +1635,7 @@ with pkgs;
|
||||
|
||||
coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { };
|
||||
|
||||
intel-oneapi = callPackage ../development/libraries/intel-oneapi { };
|
||||
intel-oneapi = recurseIntoAttrs (callPackage ../development/libraries/intel-oneapi { });
|
||||
|
||||
cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
|
||||
|
||||
|
||||
@@ -758,6 +758,12 @@ self: super: with self; {
|
||||
|
||||
anitopy = callPackage ../development/python-modules/anitopy { };
|
||||
|
||||
anki-audio = callPackage ../development/python-modules/anki-audio { };
|
||||
|
||||
anki-mac-helper = callPackage ../development/python-modules/anki-mac-helper {
|
||||
inherit (pkgs) swift;
|
||||
};
|
||||
|
||||
anndata = callPackage ../development/python-modules/anndata { };
|
||||
|
||||
annexremote = callPackage ../development/python-modules/annexremote { };
|
||||
|
||||
Reference in New Issue
Block a user