mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
5f6c15e436
@ -26,13 +26,9 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# for cli usage
|
||||
environment.systemPackages = [ pkgs.vector ];
|
||||
|
||||
users.groups.vector = { };
|
||||
users.users.vector = {
|
||||
description = "Vector service user";
|
||||
group = "vector";
|
||||
isSystemUser = true;
|
||||
};
|
||||
systemd.services.vector = {
|
||||
description = "Vector event and log aggregator";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
@ -52,8 +48,7 @@ in
|
||||
in
|
||||
{
|
||||
ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}";
|
||||
User = "vector";
|
||||
Group = "vector";
|
||||
DynamicUser = true;
|
||||
Restart = "no";
|
||||
StateDirectory = "vector";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
|
||||
@ -651,6 +651,9 @@ in
|
||||
preload_link_header = false;
|
||||
redirect_avatar_requests = false;
|
||||
pg_force_readonly_mode = false;
|
||||
dns_query_timeout_secs = null;
|
||||
regex_timeout_seconds = 2;
|
||||
allow_impersonation = true;
|
||||
};
|
||||
|
||||
services.redis.servers.discourse =
|
||||
|
||||
@ -61,6 +61,13 @@ in {
|
||||
# https://www.home-assistant.io/integrations/frontend/
|
||||
frontend = {};
|
||||
|
||||
# include some popular integrations, that absolutely shouldn't break
|
||||
esphome = {};
|
||||
knx = {};
|
||||
matter = {};
|
||||
shelly = {};
|
||||
zha = {};
|
||||
|
||||
# set up a wake-on-lan switch to test capset capability required
|
||||
# for the ping suid wrapper
|
||||
# https://www.home-assistant.io/integrations/wake_on_lan/
|
||||
@ -107,7 +114,7 @@ in {
|
||||
# Cause a configuration change that requires a service restart as we added a new runtime dependency
|
||||
specialisation.newFeature = {
|
||||
inheritParentConfig = true;
|
||||
configuration.services.home-assistant.config.esphome = {};
|
||||
configuration.services.home-assistant.config.backup = {};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -61,13 +61,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audacity";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "Audacity-${version}";
|
||||
hash = "sha256-OQX3YFUdK9TR7ZuN2dZc6ZAWaqfftk5VH0qoOwbTAuM=";
|
||||
hash = "sha256-4L5ggu1izm9kichZBsJHAFq74q59xWGVYC11gy3K9go=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -150,6 +150,7 @@ stdenv.mkDerivation rec {
|
||||
"-Daudacity_conan_enabled=Off"
|
||||
"-Daudacity_use_ffmpeg=loaded"
|
||||
"-Daudacity_has_vst3=Off"
|
||||
"-Daudacity_has_crashreports=Off"
|
||||
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
|
||||
73
pkgs/applications/audio/ledfx/default.nix
Normal file
73
pkgs/applications/audio/ledfx/default.nix
Normal file
@ -0,0 +1,73 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "ledfx";
|
||||
version = "2.0.64";
|
||||
format = "setuptools";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TKRa4PcMd0Jl94XD2WubOhmsxZaUplZeWKsuKz83Rl4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# replace tcp-latency which is not packaged with icmplib
|
||||
(fetchpatch {
|
||||
url = "https://github.com/LedFx/LedFx/commit/98cd4256846ae3bdae7094eeacb3b02a4807dc6f.patch";
|
||||
excludes = [
|
||||
# only used in win.spec file which is windows specific
|
||||
"hiddenimports.py"
|
||||
];
|
||||
hash = "sha256-p9fiLdjZI5fe5Qy2xbJIAtblp/7BwUxAvwjHQy5l9nQ=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"openrgb-python~=0.2.10",' "" \
|
||||
--replace '"pyupdater>=3.1.0",' "" \
|
||||
--replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \
|
||||
--replace "~=" ">="
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiohttp
|
||||
aiohttp-cors
|
||||
aubio
|
||||
certifi
|
||||
cython
|
||||
flux-led
|
||||
icmplib
|
||||
multidict
|
||||
numpy
|
||||
# openrgb-python # not packaged
|
||||
paho-mqtt
|
||||
pillow
|
||||
psutil
|
||||
pyserial
|
||||
pystray
|
||||
# rpi-ws281x # not packaged
|
||||
requests
|
||||
sacn
|
||||
samplerate
|
||||
sentry-sdk
|
||||
sounddevice
|
||||
uvloop
|
||||
voluptuous
|
||||
zeroconf
|
||||
];
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "LedFx is a network based LED effect controller with support for advanced real-time audio effects";
|
||||
homepage = "https://github.com/LedFx/LedFx";
|
||||
changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = teams.c3d2.members;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which }:
|
||||
{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which, bash }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "raysession";
|
||||
@ -23,7 +23,7 @@ buildPythonApplication rec {
|
||||
qttools # lrelease to build translations.
|
||||
which # which to find lrelease.
|
||||
];
|
||||
buildInputs = [ libjack2 ];
|
||||
buildInputs = [ libjack2 bash ];
|
||||
propagatedBuildInputs = [ pydbus pyliblo pyqt5 ];
|
||||
|
||||
dontWrapQtApps = true; # The program is a python script.
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
|
||||
"version": "2023.1.1",
|
||||
"sha256": "19f2f435ff21453f724e16b318a94d19c414fd5863aa08cc73e78c85a20d73c5",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.1.tar.gz",
|
||||
"build_number": "231.8109.222"
|
||||
"version": "2023.1.2",
|
||||
"sha256": "e3efc51a4431dc67da6463a8a37aab8ad6a214a8338430ae61cd4add5e7e5b04",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.2.tar.gz",
|
||||
"build_number": "231.8770.66"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@ -35,18 +35,18 @@
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
|
||||
"version": "2023.1",
|
||||
"sha256": "e6fe45c9df8e763ee3278444b5fb1003910c436752e83221e0303a62c5e81eaa",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.tar.gz",
|
||||
"build_number": "231.8109.175"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "0a9bc55c2eaecbe983cd1db9ab6a353e3b7c3747f6fc6dea95736df104a68239",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1.tar.gz",
|
||||
"build_number": "231.8770.65"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
|
||||
"version": "2023.1",
|
||||
"sha256": "3029c751c36d86fef0021feceb8f3010d37aebd42aef6d6aed9e3b9207c2d2ac",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.tar.gz",
|
||||
"build_number": "231.8109.175"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "62ac9a6a801e5e029c3ca5ea28ee5de2680e3d58ae233cf1cb3d3636c6b205ca",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1.tar.gz",
|
||||
"build_number": "231.8770.65"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
@ -84,36 +84,36 @@
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
|
||||
"version": "2023.1",
|
||||
"sha256": "494cd8bbb41023ae4a53487e9ac46aacc68f52ee3e14c8621f49e2675d56fa9c",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.tar.gz",
|
||||
"build_number": "231.8109.212"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "d50a7ed977e04ae50d6a16422a0968896fc6d94b0ab84d044ad3503d904570e0",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1.tar.gz",
|
||||
"build_number": "231.8770.54"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
|
||||
"version": "2023.1",
|
||||
"sha256": "f9eabc980d82a9c9b27bc84daa7f1e786f41b17bbbfeca282985c6ed87e768ec",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.tar.gz",
|
||||
"build_number": "231.8109.174"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "44a852fa872751ba53b1a10eb5d136a407ae7db90e4e4f8c37ba282dcc9c1419",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1.tar.gz",
|
||||
"build_number": "231.8770.57"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
|
||||
"version": "2023.1",
|
||||
"sha256": "bd074c7bafdcfcce4db001a4356040d0badd7cd2f65418a35b4156b00a07e94b",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.tar.gz",
|
||||
"build_number": "231.8109.174"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "93e11177010037a156939f2ded59ac5d8d0661e47a4471399665affe4a1eb7a9",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1.tar.gz",
|
||||
"build_number": "231.8770.64"
|
||||
}
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
|
||||
"version": "2023.1.1",
|
||||
"sha256": "98e1d907604dcde89b2a5df6a8331894eab03f1fb72e6acbde7da5c279f0043e",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.1.dmg",
|
||||
"build_number": "231.8109.222"
|
||||
"version": "2023.1.2",
|
||||
"sha256": "a980ecceda348d5a9e4ee7aaec2baf6d985a66c714ee270d402d708838e40d26",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.2.dmg",
|
||||
"build_number": "231.8770.66"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@ -142,18 +142,18 @@
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "233cc0253921bb002bd20eff0e493864b5b7ad951cd806d29a702cf1a6934f0f",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.dmg",
|
||||
"build_number": "231.8109.175"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "ee7769737cb0e22d4c88ea8808d0767b8d88667b6b732748d745a5eb48809c46",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1.dmg",
|
||||
"build_number": "231.8770.65"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "1e8498336a5c4d90518f47d687a167adbe0e634d1f7d10530164c84542b91677",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.dmg",
|
||||
"build_number": "231.8109.175"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "46fed7185c1cc901778593941db035d9806ebdad930eccbb4472668d440e60af",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1.dmg",
|
||||
"build_number": "231.8770.65"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
@ -191,36 +191,36 @@
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "fe6ee0086b3e59eecc7e2816e8f803a702a6b7ea382cb0a2168d08d19dd656d7",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.dmg",
|
||||
"build_number": "231.8109.212"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "72131efb1d4606cefd9bfb11cc98443a13f5b9761ac007484564db2107e7f8e9",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1.dmg",
|
||||
"build_number": "231.8770.54"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "fba60e34520c807ba0a9124802e5782e2b4c8e63c27e07968b9cb642f0fc0a77",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.dmg",
|
||||
"build_number": "231.8109.174"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "2c37a3e8c8a9b800b9132f31d0cfdffbb3fd4ee83de13b3141187ec05a79e3e0",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1.dmg",
|
||||
"build_number": "231.8770.57"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "35f110baf5a37232175a367c524a4cb04216bc2c0b0767506449648df6a12032",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.dmg",
|
||||
"build_number": "231.8109.174"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "e7b9b86501682a0cf5a1b2d22e65491a6923635043378707581357a10fc8dc2a",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1.dmg",
|
||||
"build_number": "231.8770.64"
|
||||
}
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
|
||||
"version": "2023.1.1",
|
||||
"sha256": "f18183aa0efd776f2d641c72e61892e2d987f4b1f2a59786b2afb12604c43658",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.1-aarch64.dmg",
|
||||
"build_number": "231.8109.222"
|
||||
"version": "2023.1.2",
|
||||
"sha256": "61c8c1e76fe25389557111534c3fdadb5ba69427384890bf25499d0b474c147d",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.2-aarch64.dmg",
|
||||
"build_number": "231.8770.66"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@ -249,18 +249,18 @@
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "33964525cb28ac199e39e3c8eac4128874963f3292d5074257ae54fe1df9f986",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1-aarch64.dmg",
|
||||
"build_number": "231.8109.175"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "c9ab2053e1ad648466c547c378bd4e8753b4db8908de1caaeca91563ad80f6f9",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1-aarch64.dmg",
|
||||
"build_number": "231.8770.65"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "6e2ca530fe082f79724fb89849e06fa91b8c17089430f9633a7e9a813204151f",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1-aarch64.dmg",
|
||||
"build_number": "231.8109.175"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "ae631000e19b821194b38be7caaa1e13ad78b465e6eb00f44215bb1173038448",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1-aarch64.dmg",
|
||||
"build_number": "231.8770.65"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
@ -298,26 +298,26 @@
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "dbd708379f2a489add7e87a321297841baf8bfcf83ce2f5549a1ff9f5037cf46",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1-aarch64.dmg",
|
||||
"build_number": "231.8109.212"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "b089e107bd81829fffe97509912c4467f8b4ea09fd5f38ebd8cc8c57e6adb947",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1-aarch64.dmg",
|
||||
"build_number": "231.8770.54"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "56d0202ea1261eb8ac5bd24f1cb044282cda5bd6c8306d3ec606109a3fe28fba",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1-aarch64.dmg",
|
||||
"build_number": "231.8109.174"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "17327de2d4edd3fbddb47c96d4db1bfba716786eb5b74b4a2e3ba6d0482610f9",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1-aarch64.dmg",
|
||||
"build_number": "231.8770.57"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
|
||||
"version": "2023.1",
|
||||
"sha256": "91f4a8f63c36407e9431a97a1ecc33762f67afd488046796cf4cca3a6709518c",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1-aarch64.dmg",
|
||||
"build_number": "231.8109.174"
|
||||
"version": "2023.1.1",
|
||||
"sha256": "3ccf935b898511106b25f3d30363767372f6a301311a5547f68210895b054cf1",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1-aarch64.dmg",
|
||||
"build_number": "231.8770.64"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -160,6 +160,9 @@ in stdenv.mkDerivation rec {
|
||||
++ lib.optional tclSupport tcl
|
||||
++ lib.optional rubySupport ruby;
|
||||
|
||||
# error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec";
|
||||
|
||||
preConfigure = "" + lib.optionalString ftNixSupport ''
|
||||
cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
|
||||
cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
|
||||
|
||||
@ -8317,6 +8317,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/darfink/starsearch.vim/";
|
||||
};
|
||||
|
||||
statuscol-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "statuscol.nvim";
|
||||
version = "2023-04-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "luukvbaal";
|
||||
repo = "statuscol.nvim";
|
||||
rev = "b115b5d7a4ea5d4b152d61d89457cc874e08a7d1";
|
||||
sha256 = "026j7m8la14pfz9xqmw13gr1x8c9yx9ykqq4wa8x7cyf3a1s8z13";
|
||||
};
|
||||
meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
|
||||
};
|
||||
|
||||
stylish-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "stylish.nvim";
|
||||
version = "2022-02-01";
|
||||
|
||||
@ -698,6 +698,7 @@ https://github.com/cshuaimin/ssr.nvim/,HEAD,
|
||||
https://github.com/luukvbaal/stabilize.nvim/,,
|
||||
https://github.com/eigenfoo/stan-vim/,,
|
||||
https://github.com/darfink/starsearch.vim/,,
|
||||
https://github.com/luukvbaal/statuscol.nvim/,,
|
||||
https://github.com/teto/stylish.nvim/,HEAD,
|
||||
https://github.com/kvrohit/substrata.nvim/,HEAD,
|
||||
https://github.com/lambdalisue/suda.vim/,,
|
||||
|
||||
@ -8,7 +8,6 @@ let
|
||||
flask-api
|
||||
flask-bootstrap
|
||||
flask-paginate
|
||||
flask-reverse-proxy-fix
|
||||
flask-wtf
|
||||
arrow
|
||||
werkzeug
|
||||
@ -18,20 +17,20 @@ let
|
||||
];
|
||||
in
|
||||
with python3.pkgs; buildPythonApplication rec {
|
||||
version = "4.7";
|
||||
version = "4.8";
|
||||
pname = "buku";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "buku";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c=";
|
||||
sha256 = "sha256-kPVlfTYUusf5CZnKB53WZcCHo3MEnA2bLUHTRPGPn+8=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytest
|
||||
pytest-vcr
|
||||
pytest-recording
|
||||
pyyaml
|
||||
mypy-extensions
|
||||
click
|
||||
|
||||
@ -71,16 +71,17 @@ mkDerivation rec {
|
||||
|
||||
unpackPhase = ''
|
||||
# deb file contains a setuid binary, so 'dpkg -x' doesn't work here
|
||||
dpkg --fsys-tarfile ${src} | tar --extract
|
||||
mkdir deb
|
||||
dpkg --fsys-tarfile ${src} | tar --extract -C deb
|
||||
'';
|
||||
|
||||
installPhase =''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
mv usr/* $out/
|
||||
rmdir usr
|
||||
mv * $out/
|
||||
mv deb/usr/* $out/
|
||||
rmdir deb/usr
|
||||
mv deb/* $out/
|
||||
rm $out/bin/google-earth-pro $out/opt/google/earth/pro/googleearth
|
||||
|
||||
# patch and link googleearth binary
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "klayout";
|
||||
version = "0.28.6";
|
||||
version = "0.28.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Errpn2GHxVncum+6zriM9OrhrCDK8EtD2ZYVYPoyabk=";
|
||||
hash = "sha256-CA6PNoQtg59Mo7dKIgSVeC4owVuAirJ3mFds1J9IQtI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
, gtkmm3
|
||||
, pcre
|
||||
, swig
|
||||
, antlr4_9
|
||||
, antlr4_12
|
||||
, sudo
|
||||
, mysql
|
||||
, libxml2
|
||||
@ -46,16 +46,14 @@ let
|
||||
inherit (python3.pkgs) paramiko pycairo pyodbc;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mysql-workbench";
|
||||
version = "8.0.32";
|
||||
version = "8.0.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
|
||||
sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI=";
|
||||
url = "https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
|
||||
sha256 = "a6c9b05ee6f8accd45203d8234a43415da65ddc8118d427dd1a2ef2a209261bc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-gdal-includes.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./hardcode-paths.patch;
|
||||
catchsegv = "${glibc.bin}/bin/catchsegv";
|
||||
@ -79,11 +77,11 @@ in stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
# 1. have it look for 4.9.3 instead of 4.9.1
|
||||
# 1. have it look for 4.12.0 instead of 4.11.1
|
||||
# 2. for some reason CMakeCache.txt is part of source code
|
||||
preConfigure = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "antlr-4.9.1-complete.jar" "antlr-4.9.3-complete.jar"
|
||||
--replace "antlr-4.11.1-complete.jar" "antlr-4.12.0-complete.jar"
|
||||
rm -f build/CMakeCache.txt
|
||||
'';
|
||||
|
||||
@ -100,7 +98,7 @@ in stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
gtkmm3
|
||||
libX11
|
||||
antlr4_9.runtime.cpp
|
||||
antlr4_12.runtime.cpp
|
||||
python3
|
||||
mysql
|
||||
libxml2
|
||||
@ -157,7 +155,7 @@ in stdenv.mkDerivation rec {
|
||||
# mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8.
|
||||
# Newer versions of connector still provide the legacy library when enabled
|
||||
# but the headers are in a different location.
|
||||
"-DWITH_ANTLR_JAR=${antlr4_9.jarLocation}"
|
||||
"-DWITH_ANTLR_JAR=${antlr4_12.jarLocation}"
|
||||
"-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc"
|
||||
];
|
||||
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
--- a/backend/wbpublic/grt/spatial_handler.h
|
||||
+++ b/backend/wbpublic/grt/spatial_handler.h
|
||||
@@ -24,12 +24,12 @@
|
||||
#ifndef SPATIAL_HANDLER_H_
|
||||
#define SPATIAL_HANDLER_H_
|
||||
|
||||
-#include <gdal/ogrsf_frmts.h>
|
||||
-#include <gdal/ogr_api.h>
|
||||
-#include <gdal/gdal_pam.h>
|
||||
-#include <gdal/memdataset.h>
|
||||
-#include <gdal/gdal_alg.h>
|
||||
-#include <gdal/gdal.h>
|
||||
+#include <ogrsf_frmts.h>
|
||||
+#include <ogr_api.h>
|
||||
+#include <gdal_pam.h>
|
||||
+#include <memdataset.h>
|
||||
+#include <gdal_alg.h>
|
||||
+#include <gdal.h>
|
||||
#include <deque>
|
||||
#include "base/geometry.h"
|
||||
#include "wbpublic_public_interface.h"
|
||||
--- a/backend/wbpublic/grtui/geom_draw_box.h
|
||||
+++ b/backend/wbpublic/grtui/geom_draw_box.h
|
||||
@@ -25,7 +25,7 @@
|
||||
#define _GEOM_DRAW_BOX_H_
|
||||
|
||||
#include <mforms/drawbox.h>
|
||||
-#include <gdal/ogr_geometry.h>
|
||||
+#include <ogr_geometry.h>
|
||||
#include "wbpublic_public_interface.h"
|
||||
|
||||
class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox {
|
||||
--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
|
||||
+++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
|
||||
@@ -21,9 +21,9 @@
|
||||
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
-#include <gdal/ogrsf_frmts.h>
|
||||
-#include <gdal/ogr_api.h>
|
||||
-#include <gdal/gdal.h>
|
||||
+#include <ogrsf_frmts.h>
|
||||
+#include <ogr_api.h>
|
||||
+#include <gdal.h>
|
||||
|
||||
#include <grts/structs.db.query.h>
|
||||
#include <grtpp_util.h>
|
||||
@ -2,7 +2,7 @@
|
||||
, fetchFromGitHub
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gtksourceview3
|
||||
, gtksourceview4
|
||||
, webkitgtk
|
||||
, wrapGAppsHook
|
||||
, python3Packages
|
||||
@ -10,19 +10,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "skytemple";
|
||||
version = "1.3.10";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NK0yLxs7/pVpl9LCz6ggYsaUDuEAj6edBEPC+4yCxNM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk3
|
||||
gtksourceview3
|
||||
gtksourceview4
|
||||
# webkitgkt is used for rendering interactive statistics graph which
|
||||
# can be seen by opening a ROM, entering Pokemon section, selecting
|
||||
# any Pokemon, and clicking Stats and Moves tab.
|
||||
@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec {
|
||||
skytemple-icons
|
||||
skytemple-ssb-debugger
|
||||
tilequant
|
||||
];
|
||||
] ++ skytemple-files.optional-dependencies.spritecollab;
|
||||
|
||||
doCheck = false; # there are no tests
|
||||
|
||||
|
||||
@ -1,15 +1,31 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
mail (2.7.1)
|
||||
date (3.3.3)
|
||||
mail (2.8.1)
|
||||
mini_mime (>= 0.1.1)
|
||||
mini_mime (1.0.1)
|
||||
taskjuggler (3.6.0)
|
||||
mail (>= 2.4.3)
|
||||
term-ansicolor (>= 1.0.7)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
mini_mime (1.1.2)
|
||||
net-imap (0.3.4)
|
||||
date
|
||||
net-protocol
|
||||
net-pop (0.1.2)
|
||||
net-protocol
|
||||
net-protocol (0.2.1)
|
||||
timeout
|
||||
net-smtp (0.3.3)
|
||||
net-protocol
|
||||
sync (0.5.0)
|
||||
taskjuggler (3.7.2)
|
||||
mail (~> 2.7, >= 2.7.1)
|
||||
term-ansicolor (~> 1.7, >= 1.7.1)
|
||||
term-ansicolor (1.7.1)
|
||||
tins (~> 1.0)
|
||||
tins (1.20.2)
|
||||
timeout (0.3.2)
|
||||
tins (1.32.1)
|
||||
sync
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@ -18,4 +34,4 @@ DEPENDENCIES
|
||||
taskjuggler
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
2.4.12
|
||||
|
||||
@ -1,24 +1,88 @@
|
||||
{
|
||||
mail = {
|
||||
dependencies = ["mini_mime"];
|
||||
date = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
|
||||
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.1";
|
||||
version = "3.3.3";
|
||||
};
|
||||
mail = {
|
||||
dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
};
|
||||
mini_mime = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
|
||||
sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.1.2";
|
||||
};
|
||||
net-imap = {
|
||||
dependencies = ["date" "net-protocol"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.4";
|
||||
};
|
||||
net-pop = {
|
||||
dependencies = ["net-protocol"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.2";
|
||||
};
|
||||
net-protocol = {
|
||||
dependencies = ["timeout"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.1";
|
||||
};
|
||||
net-smtp = {
|
||||
dependencies = ["net-protocol"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.3";
|
||||
};
|
||||
sync = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
};
|
||||
taskjuggler = {
|
||||
dependencies = ["mail" "term-ansicolor"];
|
||||
@ -26,10 +90,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ky3cydl3szhdyxsy4k6zxzjlbll7mlq025aj6xd5jmh49k3pfbp";
|
||||
sha256 = "07fagka8nl29xwwzfhxx89gp34m5hih5vnq4sha1z814004md53j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.6.0";
|
||||
version = "3.7.2";
|
||||
};
|
||||
term-ansicolor = {
|
||||
dependencies = ["tins"];
|
||||
@ -42,14 +106,25 @@
|
||||
};
|
||||
version = "1.7.1";
|
||||
};
|
||||
tins = {
|
||||
timeout = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pqj45n216zrz7yckdbdknlmhh187iqzx8fp76y2h0jrgqjfkxmj";
|
||||
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.20.2";
|
||||
version = "0.3.2";
|
||||
};
|
||||
tins = {
|
||||
dependencies = ["sync"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0373zn7zkllcn2q4ylbjgjx9mvm8m73ll3jwjav48dx8myplsp5p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.32.1";
|
||||
};
|
||||
}
|
||||
|
||||
@ -166,7 +166,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
# needed for GSETTINGS_SCHEMAS_PATH
|
||||
gsettings-desktop-schemas glib gtk3
|
||||
gsettings-desktop-schemas glib gtk3 gtk4
|
||||
|
||||
# needed for XDG_ICON_DIRS
|
||||
gnome.adwaita-icon-theme
|
||||
|
||||
@ -230,8 +230,9 @@ buildStdenv.mkDerivation ({
|
||||
url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb";
|
||||
hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA=";
|
||||
})
|
||||
] ++ [
|
||||
] ++ lib.optionals (lib.versionOlder version "114.0") [
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1830040
|
||||
# https://hg.mozilla.org/mozilla-central/rev/cddb250a28d8
|
||||
(fetchpatch {
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/firefox/avoid-redefinition.patch?id=2f620d205ed0f9072bbd7714b5ec1b7bf6911c12";
|
||||
hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A=";
|
||||
|
||||
@ -291,7 +291,7 @@ stdenv.mkDerivation rec {
|
||||
export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive
|
||||
|
||||
# Enter local state directory.
|
||||
REAL_HOME=\$HOME
|
||||
REAL_HOME=\''${HOME%/}
|
||||
TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser}
|
||||
HOME=\$TBB_HOME
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "temporal";
|
||||
version = "1.20.0";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YZzGAOPCljTMmyt1t0gjbgn+IelntCo/275+SjOJiJE=";
|
||||
hash = "sha256-2xer6W8pSZttjn5m5GgTOpHyXx2rE4qRZsBZzxwWh4o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UMqkgQsnOxFcXgbm+oi3JGjqmbwaKEh6s5bzivGVAM8=";
|
||||
vendorHash = "sha256-Fo/xePou96KdFlUNIqhDZX4TJoYXqlMyuLDvmR/XreY=";
|
||||
|
||||
excludedPackages = [ "./build" ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rssguard";
|
||||
version = "4.3.3";
|
||||
version = "4.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinrotter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dSnPQbCPXREMOeqyn17BEi29soeVfrThnDBqdti5BiA=";
|
||||
sha256 = "sha256-1xoMymsx5Z8oZzZtPzLWaOs0zy/E0pIsLpHgZlVdgSw=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtwebengine qttools ];
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"version" = "1.11.29";
|
||||
"version" = "1.11.30";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "/q2tMYz2Qu/njoFPzI965Vn69kliLXJqIAhWSB6CnBE=";
|
||||
"desktopYarnHash" = "1v910qx9ij4szs1fyxc1d2lh71zzyga5ry8d9i0pdw9nlwbkqjdh";
|
||||
"webSrcHash" = "tnCaq3k0DFBYnJfS1BY4/OOR9oe+zHMnwATPsOoNAHc=";
|
||||
"webYarnHash" = "0rd7f6ypp64znwdlaxqfahpf6lrr0mn28y3h635bn7ipzfjcqmqk";
|
||||
"desktopSrcHash" = "WICzS+KARX+Z4vfBqBd13wtNB7m18rsXJsFey/MnST0=";
|
||||
"desktopYarnHash" = "0rm0rghd2piaxhf7jvxs6rd6yykgdm8d2a7rxqc9m9xjklxdf6nj";
|
||||
"webSrcHash" = "5o1DEVtkx4PYYRXYdyjVOlkvbQSc9/an5DshARTJTR4=";
|
||||
"webYarnHash" = "0bg5vc7q8afqfpsaqqkczf9whbzici5d2bxj5cadhrlmlb27f8nx";
|
||||
};
|
||||
}
|
||||
|
||||
@ -191,7 +191,7 @@ stdenv.mkDerivation rec {
|
||||
"-Dpythia6=OFF"
|
||||
"-Dpythia8=OFF"
|
||||
"-Drfio=OFF"
|
||||
"-Droot7=ON"
|
||||
"-Droot7=OFF"
|
||||
"-Dsqlite=OFF"
|
||||
"-Dssl=ON"
|
||||
"-Dtmva=ON"
|
||||
|
||||
@ -19,12 +19,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitea";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
|
||||
hash = "sha256-i2exxgVsQhQtojJkyFJgBejCj6dSRo30ESEtN9n7Vfk=";
|
||||
hash = "sha256-L0wedLLQ8NBiw7JQ5AiFa+kQb+Vg0jnBtSGtgIknIDg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, alacritty
|
||||
, cage
|
||||
, cairo
|
||||
, libxkbcommon
|
||||
, makeWrapper
|
||||
, mesa
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, udev
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots
|
||||
, xwayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wio";
|
||||
version = "0.pre+unstable=2021-06-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "museoa";
|
||||
repo = pname;
|
||||
rev = "e0b258777995055d69e61a0246a6a64985743f42";
|
||||
sha256 = "sha256-8H9fOnZsNjjq9XvOv68F4RRglGNluxs5/jp/h4ROLiI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
libxkbcommon
|
||||
mesa # for libEGL
|
||||
udev
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlroots
|
||||
xwayland
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/wio \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ alacritty cage ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wio-project.org/";
|
||||
description = "That Plan 9 feel, for Wayland";
|
||||
longDescription = ''
|
||||
Wio is a Wayland compositor for Linux and FreeBSD which has a similar look
|
||||
and feel to plan9's rio.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (wayland.meta) platforms;
|
||||
};
|
||||
|
||||
passthru.providedSessions = [ "wio" ];
|
||||
}
|
||||
# TODO: factor Linux-specific options
|
||||
@ -2,25 +2,30 @@
|
||||
|
||||
let
|
||||
sets = [
|
||||
# The compact, sans-serif set:
|
||||
"comfy"
|
||||
"comfy-fixed"
|
||||
"comfy-duo"
|
||||
# The compact, serif set:
|
||||
"comfy-motion"
|
||||
"comfy-motion-fixed"
|
||||
"comfy-motion-duo"
|
||||
# The wide, sans-serif set:
|
||||
"comfy-wide"
|
||||
"comfy-wide-fixed"
|
||||
"comfy-wide-duo"
|
||||
# Family | Shapes | Spacing | Style | Ligatures |
|
||||
# ------------------------+--------+---------+------------+-----------|
|
||||
"comfy" # Sans | Compact | Monospaced | Yes |
|
||||
"comfy-fixed" # Sans | Compact | Monospaced | No |
|
||||
"comfy-duo" # Sans | Compact | Duospaced | Yes |
|
||||
# ------------------------+--------+---------+------------+-----------|
|
||||
"comfy-motion" # Slab | Compact | Monospaced | Yes |
|
||||
"comfy-motion-fixed" # Slab | Compact | Monospaced | No |
|
||||
"comfy-motion-duo" # Slab | Compact | Duospaced | Yes |
|
||||
# ------------------------+--------+---------+------------+-----------|
|
||||
"comfy-wide" # Sans | Wide | Monospaced | Yes |
|
||||
"comfy-wide-fixed" # Sans | Wide | Monospaced | No |
|
||||
"comfy-wide-duo" # Sans | Wide | Duospaced | Yes |
|
||||
# ------------------------+--------+---------+------------+-----------|
|
||||
"comfy-wide-motion" # Slab | Wide | Monospaced | Yes |
|
||||
"comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No |
|
||||
"comfy-wide-motion-duo" # Slab | Wide | Duospaced | Yes |
|
||||
];
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~protesilaos";
|
||||
repo = "iosevka-comfy";
|
||||
rev = version;
|
||||
sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p";
|
||||
sha256 = "sha256-gHDERf3eDsb59wz+kGa2wLY7RDRWs2woi5P2rZDYjL0=";
|
||||
};
|
||||
privateBuildPlan = src.outPath + "/private-build-plans.toml";
|
||||
makeIosevkaFont = set:
|
||||
@ -34,11 +39,11 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "be5invis";
|
||||
repo = "iosevka";
|
||||
rev = "ad1e247a3fb8d2e2561122e8e57dcdc86a23df77";
|
||||
hash = "sha256-sfItIMl9HOUykoZPsNKRGKwgkSWvNGUe3czHE8qFG5w=";
|
||||
rev = "d3b461432137b36922e41322c2e45a2401e727a5";
|
||||
hash = "sha256-Sm+eG6ovVLmvKvQFEZblQV3jCLQRrc9Gga3pukwteLE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-HaO2q1f+hX3LjccuVCQaqQZCdUH9r7+jiFOR+3m8Suw=";
|
||||
npmDepsHash = "sha256-pikpi9eyo1a+AFLr7BMl1kegy3PgYFjzmE3QJqPXpNM=";
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-pop-shell";
|
||||
version = "unstable-2023-04-05";
|
||||
version = "unstable-2023-04-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "shell";
|
||||
rev = "a3a1b7bb832838fec2ea875954d33443fc680912";
|
||||
hash = "sha256-B82UKtJRDDejBX1UBBIjPRO8rzHNapJRi8wv6dT7oJ8=";
|
||||
rev = "b5acccefcaa653791d25f70a22c0e04f1858d96e";
|
||||
hash = "sha256-w6EBHKWJ4L3ZRVmFqZhCqHGumbElQXk9udYSnwjIl6c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib nodePackages.typescript gjs ];
|
||||
|
||||
@ -140,5 +140,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ ethindp ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -108,6 +108,59 @@ let
|
||||
|
||||
name_ = name;
|
||||
|
||||
validatePythonMatches = attrName: let
|
||||
isPythonModule = drv:
|
||||
# all pythonModules have the pythonModule attribute
|
||||
(drv ? "pythonModule")
|
||||
# Some pythonModules are turned in to a pythonApplication by setting the field to false
|
||||
&& (!builtins.isBool drv.pythonModule);
|
||||
isMismatchedPython = drv: drv.pythonModule != python;
|
||||
|
||||
optionalLocation = let
|
||||
pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs;
|
||||
in if pos == null then "" else " at ${pos.file}:${toString pos.line}:${toString pos.column}";
|
||||
|
||||
leftPadName = name: against: let
|
||||
len = lib.max (lib.stringLength name) (lib.stringLength against);
|
||||
in lib.strings.fixedWidthString len " " name;
|
||||
|
||||
throwMismatch = drv: let
|
||||
myName = "'${namePrefix}${name}'";
|
||||
theirName = "'${drv.name}'";
|
||||
in throw ''
|
||||
Python version mismatch in ${myName}:
|
||||
|
||||
The Python derivation ${myName} depends on a Python derivation
|
||||
named ${theirName}, but the two derivations use different versions
|
||||
of Python:
|
||||
|
||||
${leftPadName myName theirName} uses ${python}
|
||||
${leftPadName theirName myName} uses ${toString drv.pythonModule}
|
||||
|
||||
Possible solutions:
|
||||
|
||||
* If ${theirName} is a Python library, change the reference to ${theirName}
|
||||
in the ${attrName} of ${myName} to use a ${theirName} built from the same
|
||||
version of Python
|
||||
|
||||
* If ${theirName} is used as a tool during the build, move the reference to
|
||||
${theirName} in ${myName} from ${attrName} to nativeBuildInputs
|
||||
|
||||
* If ${theirName} provides executables that are called at run time, pass its
|
||||
bin path to makeWrapperArgs:
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${lib.getName drv } ] }" ];
|
||||
|
||||
${optionalLocation}
|
||||
'';
|
||||
|
||||
checkDrv = drv:
|
||||
if (isPythonModule drv) && (isMismatchedPython drv)
|
||||
then throwMismatch drv
|
||||
else drv;
|
||||
|
||||
in inputs: builtins.map (checkDrv) inputs;
|
||||
|
||||
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
|
||||
self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
|
||||
"disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format"
|
||||
@ -149,14 +202,14 @@ let
|
||||
pythonOutputDistHook
|
||||
] ++ nativeBuildInputs;
|
||||
|
||||
buildInputs = buildInputs ++ pythonPath;
|
||||
buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath);
|
||||
|
||||
propagatedBuildInputs = propagatedBuildInputs ++ [
|
||||
propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (propagatedBuildInputs ++ [
|
||||
# we propagate python even for packages transformed with 'toPythonApplication'
|
||||
# this pollutes the PATH but avoids rebuilds
|
||||
# see https://github.com/NixOS/nixpkgs/issues/170887 for more context
|
||||
python
|
||||
];
|
||||
]);
|
||||
|
||||
inherit strictDeps;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, buildPecl, php, valgrind, pcre2, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "5.0.1";
|
||||
version = "5.0.3";
|
||||
in buildPecl {
|
||||
inherit version;
|
||||
pname = "swoole";
|
||||
@ -10,7 +10,7 @@ in buildPecl {
|
||||
owner = "swoole";
|
||||
repo = "swoole-src";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d0xccbfOmebWR14oTUviWz/mB5IA7iXn0uUWxTQRd9w=";
|
||||
sha256 = "sha256-xadseYMbA+llzTf9JFIitJK2iR0dN8vAjv3n9/e7FGs=";
|
||||
};
|
||||
|
||||
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];
|
||||
|
||||
@ -28,7 +28,8 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
noiseprotocol
|
||||
protobuf
|
||||
protobuf.out
|
||||
protobuf.dev
|
||||
zeroconf
|
||||
];
|
||||
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncsleepiq";
|
||||
version = "1.2.3";
|
||||
version = "1.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-X+bJyzQxWJaS1/KNOE/3zQKSbwUpm9XN35HYf6s+BPs=";
|
||||
hash = "sha256-eW6iSGuaZ/cQZKN55b6tHsBPdYglxGYt7OoxV7czB8w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Async interface to SleepIQ API";
|
||||
homepage = "https://github.com/kbickar/asyncsleepiq";
|
||||
changelog = "https://github.com/kbickar/asyncsleepiq/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
||||
@ -1,21 +1,47 @@
|
||||
{ buildPythonPackage, fetchPypi, lib
|
||||
, authres, dnspython, dkimpy, publicsuffix2
|
||||
{ lib
|
||||
, authres
|
||||
, buildPythonPackage
|
||||
, dkimpy
|
||||
, dnspython
|
||||
, fetchFromGitHub
|
||||
, publicsuffix2
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "authheaders";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValiMail";
|
||||
repo = "authentication-headers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vtLt7JUdLF0gBWgMzP65UAR6A9BnTech5n0alFErcSQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ];
|
||||
propagatedBuildInputs = [
|
||||
authres
|
||||
dnspython
|
||||
dkimpy
|
||||
publicsuffix2
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"authheaders"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for the generation of email authentication headers";
|
||||
homepage = "https://github.com/ValiMail/authentication-headers";
|
||||
changelog = "https://github.com/ValiMail/authentication-headers/blob${version}/CHANGES";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bashlex";
|
||||
version = "0.16";
|
||||
version = "0.18";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "idank";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-vpcru/ax872WK3XuRQWTmTD9zRdObn2Bit6kY9ZIQaI=";
|
||||
hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI=";
|
||||
};
|
||||
|
||||
# workaround https://github.com/idank/bashlex/issues/51
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.35.1";
|
||||
version = "0.35.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-o2806cXjtt+yMeSdpEq4KOlIlDsvf7qCUO2TBzkt5uY=";
|
||||
hash = "sha256-I9PXFdRXHQ7OnzCdB631nlfnkpConl+j5Z3iiH7RcA4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,25 +1,45 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pycryptodomex, filelock, urllib3, lxml }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, filelock
|
||||
, lxml
|
||||
, pycryptodomex
|
||||
, pythonOlder
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blobfile";
|
||||
version = "2.0.1";
|
||||
format = "wheel";
|
||||
version = "2.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "wheel";
|
||||
python = "py3";
|
||||
dist = "py3";
|
||||
hash = "sha256-b1Gz6UjzCpLnNKl0sk/ND2pRhB/Qg96WiJkjFIE1jaI=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "christopher-hesse";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vVoiNIN/LNdbedaOQ+gtj4jhzmrGri49fftHKG+K/fg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pycryptodomex filelock urllib3 lxml ];
|
||||
propagatedBuildInputs = [
|
||||
pycryptodomex
|
||||
filelock
|
||||
urllib3
|
||||
lxml
|
||||
];
|
||||
|
||||
# Tests require a running Docker instance
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"blobfile"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Read Google Cloud Storage, Azure Blobs, and local paths with the same interface";
|
||||
homepage = "https://github.com/christopher-hesse/blobfile";
|
||||
description = "Read Google Cloud Storage, Azure Blobs, and local paths with the same interface ";
|
||||
changelog = "https://github.com/christopher-hesse/blobfile/blob/v${version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bumps";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BY9kg0ksKfrpQgsl1aDDJJ+zKJmURqwTtKxlITxse+o=";
|
||||
hash = "sha256-J8NeV9FCUC5dLkosBzVrovxiJJbeuj8Xc50NGEI9Bms=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Data fitting with bayesian uncertainty analysis";
|
||||
homepage = "https://bumps.readthedocs.io/";
|
||||
changelog = "https://github.com/bumps/bumps/releases/tag/v${version}";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ rprospero ];
|
||||
};
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "can";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "hardbyte";
|
||||
repo = "python-can";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jNy47SapujTF3ReJtIbwUY53IftIH4cXZjkzHrnZMFQ=";
|
||||
hash = "sha256-KY+WViWcKbrO6SO6cIo5dWylyBDEdmAR6wYwJogeCjs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "censys";
|
||||
version = "2.1.9";
|
||||
version = "2.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "censys";
|
||||
repo = "censys-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BB/pLpPK2qh5902bZp9QM3Wiu/l48pzq7HcjaAtM4D0=";
|
||||
hash = "sha256-CtW6EN9oH/OIZ4XaoSuKlMYK9Mh/ewRs6y34xbfY234=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, antlr4
|
||||
, antlr4-python3-runtime
|
||||
, igraph
|
||||
@ -11,27 +10,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "explorerscript";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1";
|
||||
sha256 = "sha256-REQYyxB2sb/gG54+OkMw+M4Agg9SWfAyqAhiSNnd3tE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
antlr4
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://github.com/SkyTemple/ExplorerScript/pull/17
|
||||
(fetchpatch {
|
||||
url = "https://github.com/SkyTemple/ExplorerScript/commit/47d8b3d246881d675a82b4049b87ed7d9a0e1b15.patch";
|
||||
sha256 = "0sadw9l2nypl2s8lw526lvbdj4rzqdvrjncx4zxxgyp3x47csb48";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py
|
||||
antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4
|
||||
|
||||
@ -27,14 +27,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-auth";
|
||||
version = "2.17.1";
|
||||
version = "2.17.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jzebRrrTga0qC5id+wwTrSjTwqefJzSCE/iUah0V1Vo=";
|
||||
hash = "sha256-zjEeK8WLEw/d8xbfV8mzlDwqe09uwx3pZjqTM+QGTvw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.12.0";
|
||||
version = "3.12.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-v874eaWthn7DD9Sxg+hrXr/93k7u591h0GL68wwmeP4=";
|
||||
hash = "sha256-KBqnGp56U2lGLo/2MWu5kfHr7pfIJJDT857+xnrK+iU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-pubsub";
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PKVX/A1AT3EqHahBLnGlXNY7aiZZdbCmvsQ/+KNV7UA=";
|
||||
hash = "sha256-WH2n1TXKhYzu7XA2IFNV5abdPkTqSryW9OUNGr/YhDs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-spanner";
|
||||
version = "3.31.0";
|
||||
version = "3.32.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gVQL0boXV/4vaYBpSM8Qli8do3YC7X5ULJeepE2LDUo=";
|
||||
hash = "sha256-/2ktwVBV6CmEKrX8cngxmeOz4Hwhpw2ThOX1rA/yYeQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-resumable-media";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Fbii5130LcZQLRMG2wvOJke6YBP5zQO24XNowIhu6Qo=";
|
||||
hash = "sha256-IYkx6OKypzpY6zVKKI4DoP1fscRYMmGsbkwHhmZGjJM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphene";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "graphql-python";
|
||||
repo = "graphene";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XnrzgPkkFsTgNE9J+eSkD8f5MokKjtZhbbE/dxNZryk=";
|
||||
hash = "sha256-kwF6oXp06w7r1PbPoJTCQ9teTExYMoqvIZDhtv5QNn8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
45
pkgs/development/python-modules/grpcio-testing/default.nix
Normal file
45
pkgs/development/python-modules/grpcio-testing/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, grpcio
|
||||
, protobuf
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-testing";
|
||||
version = "1.54.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/0LlPGUVhV7lh4RDQH7wImxaynN2wDLoELxoUUG8bpM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'grpcio>={version}'.format(version=grpc_version.VERSION)" "'grpcio'"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
grpcio
|
||||
protobuf
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"grpc_testing"
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Testing utilities for gRPC Python";
|
||||
homepage = "https://grpc.io/";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gvm-tools";
|
||||
version = "23.3.0";
|
||||
version = "23.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sv34PwOEWGsIgSNpUcqvwjJ+6FSrmpXNB5gc47EjFU0=";
|
||||
hash = "sha256-L7GR50nlcm2EQ6YxLAfieQJ+vPUrCrj72KNSY73LFko=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.4.2";
|
||||
version = "2023.4.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cMrp0IewFezXpuXDnXDoDmEge/2NWRlhqkBmIwBjlrE=";
|
||||
hash = "sha256-5wUx0S3Wg30Kn6RAkybAOMQqRvVDt9HeIJyTPCVHqRc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "isbnlib";
|
||||
version = "3.10.13";
|
||||
version = "3.10.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Rnk0H1ag35HGNeg4oiLOfxB1XLW8yVSOP3qK/1Z009Q=";
|
||||
hash = "sha256-lvkIZMd7AfVfoR5b/Kn9kJUB2YQvO8cQ1Oq4UZXZBTk=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -37,6 +37,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Extract, clean, transform, hyphenate and metadata for ISBNs";
|
||||
homepage = "https://github.com/xlcnd/isbnlib";
|
||||
changelog = "https://github.com/xlcnd/isbnlib/blob/v${version}/CHANGES.txt";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msal";
|
||||
version = "1.21.0";
|
||||
version = "1.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lrXIZ4MP0Rbl99DsjvGyOLTNpNGuqG2P7PUYJg4Tb78=";
|
||||
hash = "sha256-ioL1N1ZCwWJciQWAGEMClMEJRA3OQupmfUZsLKtSCs0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.131";
|
||||
version = "2.1.134";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eG1giXUuQfxROe0H8ZhU0qde8LZwRXy6YCiT54mZ6q4=";
|
||||
hash = "sha256-hVh8N/eTJL5HpxIUkLsnD985zm1pGnD5YDgwJ/3N6dU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
33
pkgs/development/python-modules/pmdsky-debug-py/default.nix
Normal file
33
pkgs/development/python-modules/pmdsky-debug-py/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
#This package is auto-generated. It could totally be possible to generate it from upstream, but seems unecessary
|
||||
buildPythonPackage rec {
|
||||
pname = "pmdsky-debug-py";
|
||||
version = "4.0.0";
|
||||
# SkyTemple specifically require this version. This is used when patching the binary,
|
||||
# and risk to be a bit problematic if using the latest version, given it doesn’t follow semver.
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-iRiUZoyWAkFGPvRyQRWvI0210Vk2jPS0PSCCCns5yJI=";
|
||||
};
|
||||
|
||||
prePatch = "cd src";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python";
|
||||
homepage = "https://github.com/SkyTemple/pmdsky-debug-py";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.4.7";
|
||||
version = "23.4.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8EZzxVluFl/EnnJZpu3Mo1KtZVIC36/UvgBeUaPLouo=";
|
||||
hash = "sha256-rShSVoDL5jY1xCZ6O9jUdGpErMMmq91Ypb0rBoTApIQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "prometheus-flask-exporter";
|
||||
version = "0.20.3";
|
||||
version = "0.22.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rycus86";
|
||||
repo = "prometheus_flask_exporter";
|
||||
rev = version;
|
||||
hash = "sha256-l9Iw9fvXQMXzq1y/4Dml8uLPJWyqX6SDIXptJVw3cVQ=";
|
||||
hash = "sha256-GAQ80J7at8Apqu+DUMN3+rLi/lrNv5Y7w/DKpUN2iu8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ flask prometheus-client ];
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-desmume";
|
||||
version = "0.0.4.post2";
|
||||
version = "0.0.5.post0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY=";
|
||||
hash = "sha256-q6E7J7e0yXt+jo1KNqqAw2cG/Us+Tw0dLfTqAKWfAlc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -64,6 +64,6 @@ buildPythonPackage rec {
|
||||
description = "Python library to interface with DeSmuME, the Nintendo DS emulator";
|
||||
homepage = "https://github.com/SkyTemple/py-desmume";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,39 +1,72 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, grpcio-tools
|
||||
, ujson
|
||||
, environs
|
||||
, fetchFromGitHub
|
||||
, grpcio
|
||||
, pandas
|
||||
, grpcio-testing
|
||||
, mmh3
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, scikit-learn
|
||||
, setuptools-scm
|
||||
, ujson
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymilvus";
|
||||
version = "2.2.6";
|
||||
version = "2.2.8";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/i3WObwoY6Ffqw+Guij6+uGbKYKET2AJ+d708efmSx0=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "milvus-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Oqwa/2UT9jyGaEEzjr/phZZStLOZ6JRj+4ck0tmP0W0=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
grpcio
|
||||
grpcio-tools
|
||||
ujson
|
||||
pandas
|
||||
mmh3
|
||||
] ++ lib.optionals stdenv.isLinux [ setuptools-scm ];
|
||||
pythonRelaxDeps = [
|
||||
"grpcio"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
environs
|
||||
grpcio
|
||||
mmh3
|
||||
pandas
|
||||
ujson
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
grpcio-testing
|
||||
pytestCheckHook
|
||||
scikit-learn
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pymilvus"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_get_commit"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python SDK for Milvus";
|
||||
homepage = "https://github.com/milvus-io/pymilvus";
|
||||
description = "Python SDK for Milvus. ";
|
||||
changelog = "https://github.com/milvus-io/pymilvus/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [happysalada];
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,17 +8,18 @@
|
||||
, pytest-asyncio
|
||||
, pytest-cases
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysiaalarm";
|
||||
version = "3.0.2";
|
||||
version = "3.1.1";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hS0OaafYjRdPVSCOHfb2zKp0tEOl1LyMJpwnpvsvALs=";
|
||||
hash = "sha256-q42bsBeAwU9lt7wtYGFJv23UBND+aMXZJlSWyTfZDQE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -35,6 +36,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
dataclasses-json
|
||||
pycryptodome
|
||||
pytz
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -51,6 +53,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python package for creating a client that talks with SIA-based alarm systems";
|
||||
homepage = "https://github.com/eavanvalkenburg/pysiaalarm";
|
||||
changelog = "https://github.com/eavanvalkenburg/pysiaalarm/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-engineio";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "miguelgrinberg";
|
||||
repo = "python-engineio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pixLk9Q7mIw1ReFemDu039lJtCwqi73tvhXl0KhKvgw=";
|
||||
hash = "sha256-sE6AlT01Rou427i9w+xwUTMflKxUr0Heqt2l+Y2AMmU=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvizio";
|
||||
version = "0.1.60";
|
||||
version = "0.1.61";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RwwZDb4mQJZw8w1sTFJ0eM3az4pDQbVLGtA+anyKEJM=";
|
||||
sha256 = "sha256-AtqMWe2zgRqOp5S9oKq7keHNHM8pnTmV1mfGiVzygTc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "range-typed-integers";
|
||||
version = "1.0.1";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theCapypara";
|
||||
repo = "range-typed-integers";
|
||||
rev = version;
|
||||
sha256 = "sha256-4+XdalHq6Q2cBbuYi4x7kmCNQh1MwYf+XlLP9FzzzgE=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A package provides integer types that have a specific range of valid values";
|
||||
homepage = "https://github.com/theCapypara/range-typed-integers";
|
||||
license = [ licenses.mit ];
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
40
pkgs/development/python-modules/sectools/default.nix
Normal file
40
pkgs/development/python-modules/sectools/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ldap3
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sectools";
|
||||
version = "1.3.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p0dalirius";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-F9mmPSlfSSS7UDNuX9OPrqDsEpqq0bD3eROG8D9CC78=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ldap3
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sectools"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "library containing functions to write security tools";
|
||||
homepage = "https://github.com/p0dalirius/sectools";
|
||||
changelog = "https://github.com/p0dalirius/sectools/releases/tag/${version}";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +1,40 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript
|
||||
, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, appdirs
|
||||
, dungeon-eos
|
||||
, explorerscript
|
||||
, ndspy
|
||||
, pillow
|
||||
, setuptools
|
||||
, skytemple-rust
|
||||
, tilequant
|
||||
, pyyaml
|
||||
, pmdsky-debug-py
|
||||
, typing-extensions
|
||||
, pythonOlder
|
||||
, # optional dependancies for SpriteCollab
|
||||
aiohttp
|
||||
, lru-dict
|
||||
, graphql-core
|
||||
, gql
|
||||
, armips
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
, parameterized
|
||||
, xmldiff
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-files";
|
||||
version = "1.3.9";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0=";
|
||||
hash = "sha256-SLRZ9ThrH2UWqfr5BbjJKDM/SRkCfMNK70XZT4+Ks7w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -21,9 +45,37 @@ buildPythonPackage rec {
|
||||
|
||||
buildInputs = [ armips ];
|
||||
|
||||
propagatedBuildInputs = [ appdirs dungeon-eos explorerscript ndspy pillow setuptools skytemple-rust tilequant ];
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
dungeon-eos
|
||||
explorerscript
|
||||
ndspy
|
||||
pillow
|
||||
setuptools
|
||||
skytemple-rust
|
||||
tilequant
|
||||
pyyaml
|
||||
pmdsky-debug-py
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
spritecollab = [
|
||||
aiohttp
|
||||
gql
|
||||
graphql-core
|
||||
lru-dict
|
||||
] ++ gql.optional-dependencies.aiohttp;
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook parameterized xmldiff ] ++ passthru.optional-dependencies.spritecollab;
|
||||
pytestFlagsArray = "test/";
|
||||
disabledTestPaths = [
|
||||
"test/skytemple_files_test/common/spritecollab/sc_online_test.py"
|
||||
"test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test
|
||||
];
|
||||
|
||||
doCheck = false; # requires Pokémon Mystery Dungeon ROM
|
||||
pythonImportsCheck = [ "skytemple_files" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -5,27 +5,30 @@
|
||||
, libiconv
|
||||
, Foundation
|
||||
, rustPlatform
|
||||
, setuptools-rust }:
|
||||
, setuptools-rust
|
||||
, range-typed-integers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-rust";
|
||||
version = "1.3.7";
|
||||
version = "1.4.0.post0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0=";
|
||||
hash = "sha256-aw57B15sDbMcdNPD8MW+O7AdqSSqjlOcuXNSm10GdPM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";
|
||||
hash = "sha256-SvHrMr5k4afVdU5nvg+bcoHVmzHYyoOYqv7nOSVxRCE=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
|
||||
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
|
||||
propagatedBuildInputs = [ range-typed-integers ];
|
||||
|
||||
GETTEXT_SYSTEM = true;
|
||||
|
||||
|
||||
@ -1,20 +1,31 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3
|
||||
, wrapGAppsHook, nest-asyncio, pycairo, py-desmume, pygtkspellcheck, setuptools
|
||||
, skytemple-files, skytemple-icons
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gtksourceview4
|
||||
, wrapGAppsHook
|
||||
, nest-asyncio
|
||||
, pycairo
|
||||
, py-desmume
|
||||
, pygtkspellcheck
|
||||
, setuptools
|
||||
, skytemple-files
|
||||
, skytemple-icons
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-ssb-debugger";
|
||||
version = "1.3.8.post2";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow=";
|
||||
hash = "sha256-/LBz0PCQI3QOAmOZk6Jynqi/+NN0w8gbY/S3YckRZ68=";
|
||||
};
|
||||
|
||||
buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];
|
||||
buildInputs = [ gobject-introspection gtk3 gtksourceview4 ];
|
||||
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
||||
propagatedBuildInputs = [
|
||||
nest-asyncio
|
||||
|
||||
@ -9,17 +9,9 @@
|
||||
, sortedcollections
|
||||
}:
|
||||
|
||||
let
|
||||
aikku93-tilequant = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = "aikku93-tilequant";
|
||||
rev = "6604e0906edff384b6c8d4cde03e6601731f66fd";
|
||||
sha256 = "0w19h3n2i0xriqsy0b0rifjgbv4hqd7gl78fw0cappkrdykij5r1";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "tilequant";
|
||||
version = "0.4.0.post0";
|
||||
version = "0.4.1.post0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -28,13 +20,10 @@ buildPythonPackage rec {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "189af203iay3inj1bbgm3hh1fshn879bcm28ypbvfp27fy7j5b25";
|
||||
hash = "sha256-7vU/AYnX7deOH3PjrseRIj9BUJMWzDlwR3UcMpBRyfc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp -R --no-preserve=mode ${aikku93-tilequant} __aikku93_tilequant
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gitpython
|
||||
];
|
||||
@ -56,6 +45,6 @@ buildPythonPackage rec {
|
||||
description = "Tool for quantizing image colors using tile-based palette restrictions";
|
||||
homepage = "https://github.com/SkyTemple/tilequant";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ marius851000 xfix ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,29 +1,43 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, hatchling
|
||||
, click
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "userpath";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256="sha256-3NZsX6mxo8EjYvMJu7W8eZK6yK+G0XtOaxpLFmoRxD8=";
|
||||
hash = "sha256-BCM9L8/lz/kRweT7cYl1VkDhUk/4ekuCq51rh1/uV4c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ];
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
# test suite is difficult to emulate in sandbox due to shell manipulation
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
];
|
||||
|
||||
# Test suite is difficult to emulate in sandbox due to shell manipulation
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "click" "userpath" ];
|
||||
pythonImportsCheck = [
|
||||
"userpath"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform tool for adding locations to the user PATH";
|
||||
homepage = "https://github.com/ofek/userpath";
|
||||
license = [ licenses.asl20 licenses.mit ];
|
||||
changelog = "https://github.com/ofek/userpath/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ yshym ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, undmg
|
||||
, _7zz
|
||||
, jdk
|
||||
}:
|
||||
|
||||
@ -12,9 +12,7 @@ let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "jprofiler";
|
||||
|
||||
# 11.1.4 is the last version which can be unpacked by undmg
|
||||
# See: https://github.com/matthewbauer/undmg/issues/9
|
||||
version = if stdenv.isLinux then "13.0.2" else "11.1.4";
|
||||
version = "13.0.6";
|
||||
nameApp = "JProfiler";
|
||||
|
||||
meta = with lib; {
|
||||
@ -30,15 +28,15 @@ let
|
||||
|
||||
src = if stdenv.isLinux then fetchurl {
|
||||
url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz";
|
||||
sha256 = "sha256-x9I7l2ctquCqUymtlQpFXE6+u0Yg773qE6MvAxvCaEE=";
|
||||
hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg=";
|
||||
} else fetchurl {
|
||||
url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${lib.replaceStrings ["."] ["_"] version}.dmg";
|
||||
sha256 = "sha256-WDMGrDsMdY1//WMHgr+/YKSxHWt6A1dD1Pd/MuDOaz8=";
|
||||
hash = "sha256-OI6NSPqYws5Rv25U5jIPzkyJtB8LF04qHB3NPR9XBWg=";
|
||||
};
|
||||
|
||||
srcIcon = fetchurl {
|
||||
url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png";
|
||||
sha256 = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE=";
|
||||
hash = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE=";
|
||||
};
|
||||
|
||||
desktopItems = makeDesktopItem {
|
||||
@ -80,15 +78,20 @@ let
|
||||
darwin = stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
# Archive extraction via undmg fails for this particular version.
|
||||
nativeBuildInputs = [ makeWrapper undmg ];
|
||||
nativeBuildInputs = [ makeWrapper _7zz ];
|
||||
|
||||
sourceRoot = "${nameApp}.app";
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
7zz x $src -x!JProfiler/\[\]
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
sourceRoot = "${nameApp}";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{Applications/${nameApp}.app,bin}
|
||||
cp -R . $out/Applications/${nameApp}.app
|
||||
mkdir -p $out/{Applications,bin}
|
||||
cp -R ${nameApp}.app $out/Applications/
|
||||
makeWrapper $out/Applications/${nameApp}.app/Contents/MacOS/JavaApplicationStub $out/bin/${pname}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hound";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hound-search";
|
||||
repo = "hound";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M1c4lsD7DQo5+RCCDdyn9FeGuGngMsg1qSrxM2wCzpg=";
|
||||
sha256 = "sha256-FqAPywVSkFsdgFpFe5m2+/Biwi11aYybKAhf6h2b//g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ=";
|
||||
vendorSha256 = "sha256-0psvz4bnhGuwwSAXvQp0ju0GebxoUyY2Rjp/D43KF78=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -33,8 +33,8 @@ buildGoModule rec {
|
||||
passthru.tests = { inherit (nixosTests) hound; };
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Lightning fast code searching made easy";
|
||||
homepage = "https://github.com/hound-search/hound";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ grahamc SuperSandro2000 ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-public-api";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-lItbWIY9CytvcLmASkbbF5wLYKWrXn2Gl9mgccg9J0M=";
|
||||
hash = "sha256-Tf2nAisZlKPalWa0T5XDAWy+d/ERJYtzJVb3gEdcGSo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6Eula3fex0KhWhBR53K0Kl0nlbqpfZfD/Y3zrEURPmc=";
|
||||
cargoHash = "sha256-X+4C/ExKAVvAX11dBcJHhV7WW/EUI1zk3UR8mBQkSY4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, runCommand, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }:
|
||||
let
|
||||
dataVersion = "2.28.0";
|
||||
dataVersion = "2.29.0";
|
||||
frontendVersion = "unstable-2023-04-09";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
owner = "PathOfBuildingCommunity";
|
||||
repo = "PathOfBuilding";
|
||||
rev = "v${dataVersion}";
|
||||
hash = "sha256-IO6qUE6OcjNibljNzcJQlwji3DZqrBm7cvHedKuAwpM=";
|
||||
hash = "sha256-uG+Qb50+oG5yd67w2WgnatKpq+/0UA8IfJeJXRKnQXU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
49
pkgs/misc/dart-sass-embedded/default.nix
Normal file
49
pkgs/misc/dart-sass-embedded/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "dart-sass-embedded";
|
||||
version = "1.62.1";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook;
|
||||
|
||||
src = let base = "https://github.com/sass/dart-sass-embedded/releases/download/${version}/sass_embedded-${version}"; in
|
||||
fetchurl {
|
||||
"x86_64-linux" = {
|
||||
url = "${base}-linux-x64.tar.gz";
|
||||
hash = "sha256-NXTadacyKlOQNGSLj/hP8syhYuuSTXK2Y9cYzTk28HU=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
url = "${base}-linux-arm64.tar.gz";
|
||||
hash = "sha256-DX29U1AjmqVhKFgzP+71vsdoMjQ13IS93PZ1JLOA7bA=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
url = "${base}-macos-x64.tar.gz";
|
||||
hash = "sha256-0oyb9YBKoPNaWFLbIUZOJc5yK11uDYyAKKW4urkmRJQ=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
url = "${base}-macos-arm64.tar.gz";
|
||||
hash = "sha256-dkBcdVbxolK8xXYaOHot0s9FxGmfhMNAEoZqo+2LRfk=";
|
||||
};
|
||||
}."${stdenvNoCC.hostPlatform.system}" or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -r * $out
|
||||
ln -s $out/dart-sass-embedded $out/bin/dart-sass-embedded
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A wrapper for Dart Sass that implements the compiler side of the Embedded Sass protocol";
|
||||
homepage = "https://github.com/sass/dart-sass-embedded";
|
||||
changelog = "https://github.com/sass/dart-sass-embedded/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ shyim ];
|
||||
};
|
||||
}
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "raycast";
|
||||
version = "1.49.3";
|
||||
version = "1.50.0";
|
||||
|
||||
src = fetchurl {
|
||||
# https://github.com/NixOS/nixpkgs/pull/223495
|
||||
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
# to host GitHub Actions to periodically check for updates
|
||||
# and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast)
|
||||
url = "https://archive.org/download/raycast/raycast-${version}.dmg";
|
||||
sha256 = "sha256-Irn99/49fRQg73cX8aKZ72D1o+mDPg44Q1pXAMdXrb0=";
|
||||
sha256 = "sha256-+LvQDQZjbj/p8VT/af9XwKSKkKd65YzcwrKF9hoXCog=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@ -16,8 +16,8 @@ buildGoModule rec {
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Minimal IRC server bridge to Mattermost";
|
||||
homepage = "https://github.com/42wim/matterircd";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RPa3G1zrWzunyQOdNUQ/dZGJ/7sh2OGvoEqeYaT7Qv0=";
|
||||
hash = "sha256-kMVbswnq8hnPv/QmvPXmOL4QOTHyuKvgQ6+CNX0DunQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -26,7 +26,7 @@ buildGoModule rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prometheus exporter for Redis metrics";
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://github.com/oliver006/redis_exporter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ eskytthe srhb ma27 ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zfs_exporter";
|
||||
version = "2.2.7";
|
||||
version = "2.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdf";
|
||||
repo = pname;
|
||||
rev = "v" + version;
|
||||
hash = "sha256-bc9bmGrRGhm58JzrVLLJBUc1zaGXqz2fqx+ZphidFbc=";
|
||||
hash = "sha256-NTlYMznUfDfLftvuR5YWOW4Zu0rWfLkKPHPTrD/62+Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c=";
|
||||
vendorHash = "sha256-ZJRxH9RhNSnVmcsonaakbvvjQ+3ovnyMny1Pe/vyQxE=";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/share/doc/${pname} *.md
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mysql-connector-java";
|
||||
version = "8.0.31";
|
||||
version = "8.0.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip";
|
||||
sha256 = "sha256-Wo86n/4mono7YAagI/5Efm/X+2jjpOPaFSCMNAB6btI=";
|
||||
sha256 = "sha256-k3jft7sM2xrc88mdhltxtm+SZcRAn6B4EvglMyJyX4Y=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tempo";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "tempo";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-fhRIr9dFcfD3hFw6fnrV4yWEcz+CB5xph3KpxnKEWis=";
|
||||
sha256 = "sha256-gnQAldqfxJk8kbXAyX1VQXddCnSBWnvc3wesYoYI7wI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
|
||||
index 9e4533d2..e57f8a5f 100644
|
||||
--- a/app/assets/javascripts/discourse/package.json
|
||||
+++ b/app/assets/javascripts/discourse/package.json
|
||||
@@ -14,7 +14,7 @@
|
||||
"build": "ember build",
|
||||
"start": "ember serve",
|
||||
"test": "ember test",
|
||||
- "postinstall": "yarn --silent --cwd .. patch-package"
|
||||
+ "postinstall": "patch-package"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.21.4",
|
||||
@ -8,7 +8,7 @@
|
||||
, bundlerEnv
|
||||
, callPackage
|
||||
|
||||
, ruby_3_1
|
||||
, ruby_3_2
|
||||
, replace
|
||||
, gzip
|
||||
, gnutar
|
||||
@ -38,21 +38,22 @@
|
||||
, fixup_yarn_lock
|
||||
, nodePackages
|
||||
, nodejs_16
|
||||
, dart-sass-embedded
|
||||
|
||||
, plugins ? []
|
||||
}@args:
|
||||
|
||||
let
|
||||
version = "3.1.0.beta2";
|
||||
version = "3.1.0.beta4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wkNTm5/QyujPcMUrnc6eWmjhrRQAthhmejmjpy6zmbE=";
|
||||
sha256 = "sha256-22GXFYPjPYL20amR4xFB4L/dCp32H4Z3uf0GLGEghUE=";
|
||||
};
|
||||
|
||||
ruby = ruby_3_1;
|
||||
ruby = ruby_3_2;
|
||||
|
||||
runtimeDeps = [
|
||||
# For backups, themes and assets
|
||||
@ -186,6 +187,20 @@ let
|
||||
cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
|
||||
'';
|
||||
};
|
||||
sass-embedded = gems.sass-embedded // {
|
||||
dontBuild = false;
|
||||
# `sass-embedded` depends on `dart-sass-embedded` and tries to
|
||||
# fetch that as `.tar.gz` from GitHub releases. That `.tar.gz`
|
||||
# can also be specified via `SASS_EMBEDDED`. But instead of
|
||||
# compressing our `dart-sass-embedded` just to decompress it
|
||||
# again, we simply patch the Rakefile to symlink that path.
|
||||
patches = [
|
||||
./rubyEnv/sass-embedded-static.patch
|
||||
];
|
||||
postPatch = ''
|
||||
export SASS_EMBEDDED=${dart-sass-embedded}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
groups = [
|
||||
@ -199,7 +214,7 @@ let
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/app/assets/javascripts/yarn.lock";
|
||||
sha256 = "0ryc4p5s35mzg1p71z98x5fvr5fpldmgghdi1viha4ckbpv153lw";
|
||||
sha256 = "0a20kns4irdpzzx2dvdjbi0m3s754gp737q08z5nlcnffxqvykrk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = runtimeDeps ++ [
|
||||
@ -207,6 +222,7 @@ let
|
||||
redis
|
||||
nodePackages.uglify-js
|
||||
nodePackages.terser
|
||||
nodePackages.patch-package
|
||||
yarn
|
||||
nodejs_16
|
||||
];
|
||||
@ -226,6 +242,12 @@ let
|
||||
# Fix the rake command used to recursively execute itself in the
|
||||
# assets precompilation task.
|
||||
./assets_rake_command.patch
|
||||
|
||||
# `app/assets/javascripts/discourse/package.json`'s postinstall
|
||||
# hook tries to call `../node_modules/.bin/patch-package`, which
|
||||
# hasn't been `patchShebangs`-ed yet. So instead we just use
|
||||
# `patch-package` from `nativeBuildInputs`.
|
||||
./asserts_patch-package_from_path.patch
|
||||
];
|
||||
|
||||
# We have to set up an environment that is close enough to
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-assign";
|
||||
rev = "c6e6a883f66670e5cfc1eb973af8ac5b7c20f815";
|
||||
sha256 = "sha256-OwNV+ZNogUgd6ZKdXwUqoMqcZKc4jbf276rHIYQzjYc=";
|
||||
rev = "a655a009fade4671e4a2d38f0a0f7ce89d201d80";
|
||||
sha256 = "sha256-HCwId3/7NRuToLFyJrOVaAiSxysB7XNZp9BUndSJzlY=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (7.0.4.2)
|
||||
activesupport (7.0.4.3)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
concurrent-ruby (1.2.0)
|
||||
i18n (1.12.0)
|
||||
concurrent-ruby (1.2.2)
|
||||
i18n (1.13.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
minitest (5.17.0)
|
||||
minitest (5.18.0)
|
||||
rrule (0.4.4)
|
||||
activesupport (>= 2.3)
|
||||
tzinfo (2.0.6)
|
||||
@ -22,4 +22,4 @@ DEPENDENCIES
|
||||
rrule (= 0.4.4)
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.6
|
||||
2.4.10
|
||||
|
||||
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-calendar";
|
||||
rev = "b71d4979370dcbd6f193b2ac5cfa0267f8a19fed";
|
||||
sha256 = "sha256-XGybZqoM0nX8acLo3iwo+zD+zA4pz/ekLOnmDRNIVSo=";
|
||||
rev = "d85e8e288d69788e0c3202bb3dab9c3450a98914";
|
||||
sha256 = "sha256-mSn2gGidH4iSZ0fhf3UPh9pwMQurK0YGW2OAtdEWFBQ=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-calendar";
|
||||
|
||||
@ -5,20 +5,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dmywys50074vj5rivpx188b00qimlc4jn84xzqlialrgp3ckq5f";
|
||||
sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.4.2";
|
||||
version = "7.0.4.3";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
|
||||
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
};
|
||||
i18n = {
|
||||
dependencies = ["concurrent-ruby"];
|
||||
@ -26,20 +26,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
|
||||
sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
|
||||
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.17.0";
|
||||
version = "5.18.0";
|
||||
};
|
||||
rrule = {
|
||||
dependencies = ["activesupport"];
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-canned-replies";
|
||||
rev = "b30b20d43ba5cbbb1ff1476bb43e97d5b8a807e8";
|
||||
sha256 = "sha256-XROYSqGy4Z39VAlMXCbx9d+kivpknN98Kn/HhoC4ndQ=";
|
||||
rev = "5a2d9a11ef3f07fc781acd83770bafc14eca2c1b";
|
||||
sha256 = "sha256-R6CmL1hqqybc/I3oAzr3xZ4WThPWQirMjlXkF82xmIk=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-canned-replies";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-chat-integration";
|
||||
rev = "0522ad64143c9aedb27e00b642e82cad1273c83b";
|
||||
sha256 = "sha256-GsoDVZkmKEX8+HwwQXptmmRuykTDqkbsL4WbFsL/PSo=";
|
||||
rev = "9647c7afc0df42b8e2b5ae585afaf51f107fa195";
|
||||
sha256 = "sha256-lP404OJvEEQVKIQTBMca7zb/YxQ6HXcPG1jMKpEB3iA=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-chat-integration";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-data-explorer";
|
||||
rev = "556d12ac507b140d1ed9d307cad58fa8e1d8cfdd";
|
||||
sha256 = "sha256-fcO/j506kIydnipx6VsuMkj4Wb2MmPCo3LSrj9Fnczc=";
|
||||
rev = "f99b3af7ed4a21474f35223e83013ee3e8ad7002";
|
||||
sha256 = "sha256-3bBKBSc/+yF9ogNj3J6HXM3ynoAoUZeHhZOOhTfbxDw=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-data-explorer";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-docs";
|
||||
rev = "bf1c4574a61b053c136e2b181ba2fedb6c16f838";
|
||||
sha256 = "sha256-voo3Q+e/Ud1Hg+SdHlvRsxoacFnPOQXwWu/g6n5cR3Y=";
|
||||
rev = "0b4d2f3691048b6e0e257a1ac9ed01f66f662ba8";
|
||||
sha256 = "sha256-HeIUCTbMNpuo6zeaDClsGrUOz4m0L+4UK7AwPsrKIHY=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
addressable (2.8.1)
|
||||
addressable (2.8.4)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
faraday (2.7.4)
|
||||
faraday-net_http (>= 2.0, < 3.1)
|
||||
@ -24,4 +24,4 @@ DEPENDENCIES
|
||||
sawyer (= 0.9.2)
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.6
|
||||
2.4.10
|
||||
|
||||
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-github";
|
||||
rev = "148f28c1089288c9527fab1dcb88f13a5a5b0d10";
|
||||
sha256 = "sha256-u91X+YFoKE0lP4RnNWX2XzNrJvlOQPbuZzFqBEVf84w=";
|
||||
rev = "77e336a1b4ea08e2bb8a010d30146e4844afb3f3";
|
||||
sha256 = "sha256-VHuf4ymT+W676RAuA3WPQl9QXLdQz4s8vP9EC8XAwW0=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-github";
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
|
||||
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
version = "2.8.4";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["faraday-net_http" "ruby2_keywords"];
|
||||
|
||||
@ -12,7 +12,7 @@ GEM
|
||||
pyu-ruby-sasl (~> 0.0.3.2)
|
||||
rubyntlm (~> 0.3.4)
|
||||
pyu-ruby-sasl (0.0.3.3)
|
||||
rack (2.2.6.2)
|
||||
rack (2.2.7)
|
||||
rubyntlm (0.3.4)
|
||||
|
||||
PLATFORMS
|
||||
@ -25,4 +25,4 @@ DEPENDENCIES
|
||||
rubyntlm (= 0.3.4)
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.6
|
||||
2.4.10
|
||||
|
||||
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonmbake";
|
||||
repo = "discourse-ldap-auth";
|
||||
rev = "2f7a04b9fbeda0c8ab5c70e9012e4914ede9a707";
|
||||
sha256 = "sha256-zBug9PHgvRsdQjvfWE5Bylm+0Ot+jBHFrbux7+Kn72c=";
|
||||
rev = "edcf06957090e8d978a89fe7b07a6ba56fe35214";
|
||||
sha256 = "sha256-VxBBip8QEXDQGDOsU5cXjUZe2HThJn20BPsNr33KhKI=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jonmbake/discourse-ldap-auth";
|
||||
|
||||
@ -56,10 +56,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
|
||||
sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.6.2";
|
||||
version = "2.2.7";
|
||||
};
|
||||
rubyntlm = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-openid-connect";
|
||||
rev = "fd552d5eee75ba5710ce92bcd2fa7457ec98bcab";
|
||||
sha256 = "sha256-+58QfVvA6BqI/5AfdI4RiSSMzWHvAJMxPvDS2r5FieU=";
|
||||
rev = "a16d5edd386f4099064753a4eed72ecb9c1bb1a8";
|
||||
sha256 = "sha256-9Fuu/UFmU4Gpkm5cRKOgDK0bt7nD545X18wtue+IrN8=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-openid-connect";
|
||||
|
||||
@ -13,4 +13,4 @@ DEPENDENCIES
|
||||
webrick (= 1.7.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.6
|
||||
2.4.10
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-prometheus";
|
||||
rev = "78324fbaa8cfa3040ee7e01ac793ad2515b6c004";
|
||||
sha256 = "sha256-xzI6gzRztLuEzFHlMi3iXZP9bRRMsRHRQEBrwqyzpdk=";
|
||||
rev = "802cb5aa89838ecb3078dbe21b70d87b1675d89e";
|
||||
sha256 = "sha256-tgujK/k/7l/9dAFna5sfUpgP0PVfjk+aGRbqZ70lmRw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user