Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e8dfc4330b
33 changed files with 3029 additions and 465 deletions
|
|
@ -1,8 +1,8 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
inherit (lib) any boolToString concatStringsSep isBool isString mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption optionalAttrs types;
|
||||
inherit (lib) any boolToString concatStringsSep isBool isString mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption optionalAttrs types mkPackageOptionMD;
|
||||
|
||||
package = pkgs.dolibarr.override { inherit (cfg) stateDir; };
|
||||
package = cfg.package.override { inherit (cfg) stateDir; };
|
||||
|
||||
cfg = config.services.dolibarr;
|
||||
vhostCfg = lib.optionalAttrs (cfg.nginx != null) config.services.nginx.virtualHosts."${cfg.domain}";
|
||||
|
|
@ -50,6 +50,8 @@ in
|
|||
options.services.dolibarr = {
|
||||
enable = mkEnableOption (lib.mdDoc "dolibarr");
|
||||
|
||||
package = mkPackageOptionMD pkgs "dolibarr" { };
|
||||
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "micro";
|
||||
version = "2.0.12";
|
||||
version = "2.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyedidia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-L8yJE3rjNcx+1gawQ8urZcFfoQdO20E67mJQjWaVwVo=";
|
||||
hash = "sha256-fe+7RkUwCveBk14bYzg5uLGOqTVVJsrqixBQhCS79hY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-h00s+xqepj+odKAgf54s35xMnnj3gtx5LWDOYFx5GY0=";
|
||||
vendorHash = "sha256-ePhObvm3m/nT+7IyT0W6K+y+9UNkfd2kYjle2ffAd9Y=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ buildGoModule rec {
|
|||
|
||||
postInstall = ''
|
||||
installManPage assets/packaging/micro.1
|
||||
install -Dt $out/share/applications assets/packaging/micro.desktop
|
||||
install -Dm444 -t $out/share/applications assets/packaging/micro.desktop
|
||||
install -Dm644 assets/micro-logo-mark.svg $out/share/icons/hicolor/scalable/apps/micro.svg
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcstar";
|
||||
version = "1.7.3";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Kerenoc";
|
||||
repo = "GCstar";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hah8ijh9mvcgbh36y3d3s6y79mzz27w24f2i29qllv7cayf6129";
|
||||
sha256 = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -24,21 +24,21 @@ in
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pagefind";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudcannon";
|
||||
repo = "pagefind";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vQbLaZug3gySMIbMdNqU7XcL4GZ7XqZ3ZkwdDBC5T9o=";
|
||||
hash = "sha256-IN+l5Wq89tjppE0xCcvczQSkJc1CLymEFeieJhvQQ54=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ubuzO/67HguWPqd3y/IapO07L2pg2Q4vo1yTpEthdoU=";
|
||||
cargoHash = "sha256-T7DBuqfpqaEmu9iItnFYsJVnEFxG1r9uXEkfqJp1mD8=";
|
||||
|
||||
env.npmDeps_web_js = fetchNpmDeps {
|
||||
name = "npm-deps-web-js";
|
||||
src = "${src}/pagefind_web_js";
|
||||
hash = "sha256-pGE4lUFZ4dA++8kBklcMBoaN/1Z92dfOzQKhukbuEyc=";
|
||||
hash = "sha256-1gdVBCxxLEGFihIxoSSgxw/tMyVgwe7HFG/JjEfYVnQ=";
|
||||
};
|
||||
env.npmDeps_ui_default = fetchNpmDeps {
|
||||
name = "npm-deps-ui-default";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, buildGoModule
|
||||
, esbuild
|
||||
, fetchFromGitHub
|
||||
, jq
|
||||
, libdeltachat
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
|
|
@ -35,18 +36,26 @@ let
|
|||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.41.4";
|
||||
version = "1.42.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T2EPCYQ2N414sUEqpXtx459sZZXOnHgXM0/dz3Wi9hw=";
|
||||
hash = "sha256-Ua4HN02203l2FgeMotqLjcRSEHFP/4OTrl8sPS/0C+k=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-q60qrTN6H1AfJGhula8dzRwnKw2l+X0BOIvnKZh5t2s=";
|
||||
npmDepsHash = "sha256-c9ZwShmHIoFJ2mAabKyYkYsCMXqxUf+tAS1a1/7s0qo=";
|
||||
|
||||
postPatch = ''
|
||||
test \
|
||||
$(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \
|
||||
= $(pkg-config --modversion deltachat) \
|
||||
|| (echo "error: libdeltachat version does not match jsonrpc-client" && exit 1)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
makeWrapper
|
||||
pkg-config
|
||||
python3
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "miriway";
|
||||
version = "unstable-2023-08-30";
|
||||
version = "unstable-2023-11-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Miriway";
|
||||
repo = "Miriway";
|
||||
rev = "2c9a0599e1a9b37f2a73a245eacce307a3e5b883";
|
||||
hash = "sha256-VCLl4GyUmzcC/OEfxXV0bI/6lxLP9eIAAOIjANEI1d8=";
|
||||
rev = "7d324c3d890b745a1d470ce085d91aaedf0fc6cf";
|
||||
hash = "sha256-/pA24HSDco2uavIKb7t5DfGHwO7E/NANvLUMwZqnpQY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
1139
pkgs/by-name/cy/cyme/Cargo.lock
generated
Normal file
1139
pkgs/by-name/cy/cyme/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -8,20 +8,28 @@
|
|||
, libusb1
|
||||
, udev
|
||||
, nix-update-script
|
||||
, testers
|
||||
, cyme
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cyme";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuna-f1sh";
|
||||
repo = "cyme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Y5TcRcbqarcKRDWCI36YhbLJFU+yrpAE3vRGArbfr0U=";
|
||||
hash = "sha256-97sxK2zhUKBS238F9mNk8a2VbTVpvbDlN1yDas4Fls4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ycFNNTZ7AU4WRnf1+RJB7KxQKVdJbubB28tS/GyU0bI=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libudev-sys-0.1.4" = "sha256-7dUqPH8bQ/QSBIppxQbymwQ44Bvi1b6N2AMUylbyKK8=";
|
||||
"libusb1-sys-0.6.4" = "sha256-Y3K3aEZnpLud/g4Tx+1HDEkNRKi5s4Fo0QSWya/L+L4=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -40,7 +48,12 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip=test_run"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = cyme;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tuna-f1sh/cyme";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "23.10.09";
|
||||
version = "23.11.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-H5zkBV8WV03mPKAq0IqFXv/O2qE3zT9UJJMo4tt1Agc=";
|
||||
sha256 = "sha256-sIC5GYROj53vrMRdKKEHprGP+jHZqgz2lbPPFIVuj74=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme";
|
||||
version = "23.04.26";
|
||||
version = "23.11.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-6tkE23G67nH/aZjDEtW64RcZsBrcd9iNj1r9lDlUFsk=";
|
||||
sha256 = "sha256-jH3bzwyiDRovrH8GyJhwMJRHM5du8ek4leKnFSO8vAo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20231121082246";
|
||||
version = "20231122065640";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-wES4u1CYV3oO+KrIePJRhFqyWeiMCvn9lIhCtlaujlg=";
|
||||
hash = "sha256-M11PasiVVfRz1oySS6eJhCAsxX4sF5ehknYWEhb3K9Q=";
|
||||
};
|
||||
vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ=";
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openshadinglanguage";
|
||||
version = "1.12.13.0";
|
||||
version = "1.12.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EVV7YHovWwbRju+uv8IK2wpcpoK1ndZ8yNRHzU8LUuE=";
|
||||
hash = "sha256-x8t7uC4q29MkTCIS1rK0ICw78u5zZG+/zyhwttLOBr4=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -23,11 +23,12 @@ mkCoqDerivation {
|
|||
repo = "VST";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.15" "8.17"; out = "2.12"; }
|
||||
{ case = range "8.15" "8.17"; out = "2.13"; }
|
||||
{ case = range "8.14" "8.16"; out = "2.10"; }
|
||||
{ case = range "8.13" "8.15"; out = "2.9"; }
|
||||
{ case = range "8.12" "8.13"; out = "2.8"; }
|
||||
] null;
|
||||
release."2.13".sha256 = "sha256-i6rvP3cpayBln5KHZOpeNfraYU5h0O9uciBQ4jRH4XA=";
|
||||
release."2.12".sha256 = "sha256-4HL0U4HA5/usKNXC0Dis1UZY/Hb/LRd2IGOrqrvdWkw=";
|
||||
release."2.11.1".sha256 = "sha256-unpNstZBnRT4dIqAYOv9n1J0tWJMeRuaaa2RG1U0Xs0=";
|
||||
release."2.10".sha256 = "sha256-RIxfPWoHnV1CFkpxCusoGY/LIk07TgC7wWGRP4BSq8w=";
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ compcert = mkCoqDerivation {
|
|||
releaseRev = v: "v${v}";
|
||||
|
||||
defaultVersion = with lib.versions; lib.switch coq.version [
|
||||
{ case = range "8.14" "8.17"; out = "3.13"; }
|
||||
{ case = range "8.14" "8.17"; out = "3.13.1"; }
|
||||
{ case = isEq "8.13" ; out = "3.10"; }
|
||||
{ case = isEq "8.12" ; out = "3.9"; }
|
||||
{ case = range "8.8" "8.11"; out = "3.8"; }
|
||||
|
|
@ -40,6 +40,7 @@ compcert = mkCoqDerivation {
|
|||
"3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A=";
|
||||
"3.12".sha256 = "sha256-hXkQ8UnAx3k50OJGBmSm4hgrnRFCosu4+PEMrcKfmV0=";
|
||||
"3.13".sha256 = "sha256-ZedxgEPr1ZgKIcyhQ6zD1l2xr6RDNNUYq/4ZyR6ojM4=";
|
||||
"3.13.1".sha256 = "sha256-ldXbuzVB0Z+UVTd5S4yGSg6oRYiKbXLMmUZcQsJLcns=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ctranslate2";
|
||||
version = "3.21.0";
|
||||
version = "3.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenNMT";
|
||||
repo = "CTranslate2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ehybfwwMYMKPPeyv05zgDxmw0zr35eoY8wc/tb7DQw0=";
|
||||
hash = "sha256-Fw0pMTc0Zmr4RfH2rdPgpOODZW9CL5UbDbIeH6A4zZQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
10
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
10
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
|
|
@ -1087,7 +1087,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat"
|
||||
version = "1.131.6"
|
||||
version = "1.131.7"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
|
|
@ -1165,7 +1165,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat-jsonrpc"
|
||||
version = "1.131.6"
|
||||
version = "1.131.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-channel 2.1.0",
|
||||
|
|
@ -1189,7 +1189,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat-repl"
|
||||
version = "1.131.6"
|
||||
version = "1.131.7"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
|
|
@ -1204,7 +1204,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat-rpc-server"
|
||||
version = "1.131.6"
|
||||
version = "1.131.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
|
|
@ -1229,7 +1229,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat_ffi"
|
||||
version = "1.131.6"
|
||||
version = "1.131.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, cargo
|
||||
, cmake
|
||||
, deltachat-desktop
|
||||
, deltachat-repl
|
||||
, openssl
|
||||
, perl
|
||||
|
|
@ -30,13 +31,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.131.6";
|
||||
version = "1.131.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/LWWqa8f+ODP4LDIx9U9kRCFYI+5N6KztFDPbc2TiF0=";
|
||||
hash = "sha256-QzNZBBQ0fFqQByaNRNebtnoljC4rQqVTxbNz2M3LDAc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -81,7 +82,7 @@ in stdenv.mkDerivation rec {
|
|||
passthru = {
|
||||
inherit cargoLock;
|
||||
tests = {
|
||||
inherit deltachat-repl;
|
||||
inherit deltachat-desktop deltachat-repl;
|
||||
python = python3.pkgs.deltachat;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, googleapis-common-protos
|
||||
, grpcio
|
||||
, protobuf
|
||||
|
|
@ -10,16 +11,22 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai-grpc";
|
||||
version = "9.10.0";
|
||||
format = "setuptools";
|
||||
version = "9.10.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8jx2OP1VcQtGmen58r1k/w7srjSJC/53sNxFrRm7IXs=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Clarifai";
|
||||
repo = "clarifai-python-grpc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-lTvxafPdWET0p6dRnaTiOd8oPOjcRFZ45AtXkObNSBQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
googleapis-common-protos
|
||||
grpcio
|
||||
|
|
|
|||
|
|
@ -2,38 +2,75 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, clarifai-grpc
|
||||
, numpy
|
||||
, opencv4
|
||||
, pillow
|
||||
, pyyaml
|
||||
, rich
|
||||
, schema
|
||||
, tqdm
|
||||
, tritonclient
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai";
|
||||
version = "9.7.1";
|
||||
format = "setuptools";
|
||||
version = "9.10.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Clarifai";
|
||||
repo = "clarifai-python-utils";
|
||||
repo = "clarifai-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/zgHgD2kf3ZG7Mu9AEBfOwqpcD0Ye0LVrFxLeuGurCM=";
|
||||
hash = "sha256-i/B4wtSqG/ZysAcidsXnqYPdcmu93Ufd6N9fxUmDJ2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
clarifai-grpc
|
||||
numpy
|
||||
tqdm
|
||||
opencv4
|
||||
tritonclient
|
||||
rich
|
||||
schema
|
||||
pillow
|
||||
pyyaml
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# require network access and API key
|
||||
"test_export_workflow_general"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# require network access and API key
|
||||
"tests/test_app.py"
|
||||
"tests/test_data_upload.py"
|
||||
"tests/test_model_predict.py"
|
||||
"tests/test_model_train.py"
|
||||
"tests/test_search.py"
|
||||
"tests/workflow/test_create_delete.py"
|
||||
"tests/workflow/test_predict.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "clarifai" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Clarifai Python Utilities";
|
||||
homepage = "https://github.com/Clarifai/clarifai-python-utils";
|
||||
changelog = "https://github.com/Clarifai/clarifai-python-utils/releases/tag/${src.rev}";
|
||||
homepage = "https://github.com/Clarifai/clarifai-python";
|
||||
changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${src.rev}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "edk2-pytool-library";
|
||||
version = "0.19.5";
|
||||
version = "0.19.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "tianocore";
|
||||
repo = "edk2-pytool-library";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gxza9bVLVVHejKNI9CQZQxfJuT71LBsxDQ8e4xAozS0=";
|
||||
hash = "sha256-T4DVidz4Xu4M+G7CzrUxRQPotg8ciwCQfa95e0IgpkM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygls";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "openlawlibrary";
|
||||
repo = "pygls";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OfLlYTgVCg+oiYww0RjRTjiBwTZBSNqJRryo8gZEmk4=";
|
||||
hash = "sha256-hIr06qzOkObEcrIgFUloAPBJdOtcipl4htpbbUVkbdw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "0.11.5";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
||||
hash = "sha256-sCJMCy4TLRQV3zI28Aydv5a8OV8OHOjLbwhfyIlxOeY=";
|
||||
hash = "sha256-vGhjnOKvR2RdgFx3WsM217SO9gcKZknPaf7LKo3SJPU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prqlc";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prql";
|
||||
repo = "prql";
|
||||
rev = version;
|
||||
hash = "sha256-McJ3V3kndawheWo/xsBU8Xi8K47vHMpQHTpDbR4vkWk=";
|
||||
hash = "sha256-E6++xmEzY9Ndq4RCKALEHF9mh1E1NBME1gaJN70O2sE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q1PSpGpd5QRT6QKQOd6hVdZrlDBawfsqqp/CTJfnl7E=";
|
||||
cargoHash = "sha256-WLJ9XrtCXDGfqhSccSdel28EARNxZgoGbC6B+W9CsTc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "marksman";
|
||||
version = "2023-10-30";
|
||||
version = "2023-11-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artempyanykh";
|
||||
repo = "marksman";
|
||||
rev = version;
|
||||
sha256 = "sha256-dAyZIqc9YGuhGydT17s4D1q4CKH6uK5CYW0c0ZJwJAI=";
|
||||
sha256 = "sha256-sgAXGGlzQ6mrGG3cxQ8iCIzyc0TrlVFlCpl+nW46EPU=";
|
||||
};
|
||||
|
||||
projectFile = "Marksman/Marksman.fsproj";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, stdenvNoCC, nodejs, fetchzip, testers }:
|
||||
{ lib, stdenvNoCC, nodejs-slim, fetchzip, testers }:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "twilio-cli";
|
||||
version = "5.16.1";
|
||||
version = "5.16.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-J/0g0HLn25KwQvphCq32qgX4Pdu+OmZT3UImcTS1o1M=";
|
||||
hash = "sha256-5YIv4Y46PnyvYt1GQZUrL1/00LldbGDqGjjpys3Sphs=";
|
||||
};
|
||||
|
||||
buildInputs = [ nodejs ];
|
||||
buildInputs = [ nodejs-slim ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
changelog = "https://github.com/twilio/twilio-cli/blob/${finalAttrs.version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
platforms = nodejs.meta.platforms;
|
||||
platforms = nodejs-slim.meta.platforms;
|
||||
mainProgram = "twilio";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
From 0b49ad87d24193b819dfaf706b4f9f62256863ac Mon Sep 17 00:00:00 2001
|
||||
From: Joshua Trees <me@jtrees.io>
|
||||
Date: Tue, 31 Jan 2023 22:59:55 +0100
|
||||
Subject: [PATCH] store config and saves in XDG_CONFIG_HOME
|
||||
|
||||
---
|
||||
src/rotp/Rotp.java | 15 +++++++++++++++
|
||||
src/rotp/lang/bn/labels.txt | 2 +-
|
||||
src/rotp/lang/en/labels.txt | 2 +-
|
||||
src/rotp/ui/UserPreferences.java | 7 ++++---
|
||||
4 files changed, 21 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/rotp/Rotp.java b/src/rotp/Rotp.java
|
||||
index 72d8e446..a8fcd695 100644
|
||||
--- a/src/rotp/Rotp.java
|
||||
+++ b/src/rotp/Rotp.java
|
||||
@@ -43,6 +43,7 @@ public class Rotp {
|
||||
public static String exeFileName = "Remnants.exe";
|
||||
public static boolean countWords = false;
|
||||
private static String startupDir = System.getProperty("startupdir");
|
||||
+ private static String configDir = null;
|
||||
private static JFrame frame;
|
||||
public static String releaseId = "1.04";
|
||||
public static long startMs = System.currentTimeMillis();
|
||||
@@ -165,6 +166,20 @@ public class Rotp {
|
||||
}
|
||||
return startupDir;
|
||||
}
|
||||
+ public static String configDir() {
|
||||
+ if (configDir == null) {
|
||||
+ configDir = getXdgConfigHome() + File.separator + "rotp" + File.separator;
|
||||
+ }
|
||||
+ return configDir;
|
||||
+ }
|
||||
+ private static String getXdgConfigHome() {
|
||||
+ String value = System.getenv().get("XDG_CONFIG_HOME");
|
||||
+ if (value == null || value.trim().length() == 0) {
|
||||
+ String XDG_CONFIG_HOME_DEFAULT = System.getenv().get("HOME") + File.separator + ".config";
|
||||
+ value = XDG_CONFIG_HOME_DEFAULT;
|
||||
+ }
|
||||
+ return value;
|
||||
+ }
|
||||
private static void stopIfInsufficientMemory(JFrame frame, int allocMb) {
|
||||
if (allocMb < 260) {
|
||||
JOptionPane.showMessageDialog(frame, "Error starting game: Not enough free memory to play");
|
||||
diff --git a/src/rotp/lang/bn/labels.txt b/src/rotp/lang/bn/labels.txt
|
||||
index bdbc47ef..6072c90a 100644
|
||||
--- a/src/rotp/lang/bn/labels.txt
|
||||
+++ b/src/rotp/lang/bn/labels.txt
|
||||
@@ -362,7 +362,7 @@ GAME_SETTINGS_BACKUP_DESC | Enable to have your current game periodicall
|
||||
GAME_SETTINGS_SAVEDIR | Save Directory: %1
|
||||
GAME_SETTINGS_SAVEDIR_DEFAULT | Default
|
||||
GAME_SETTINGS_SAVEDIR_CUSTOM | Custom
|
||||
-GAME_SETTINGS_SAVEDIR_DESC1 | The save directory is currently set to the same directory as the game.
|
||||
+GAME_SETTINGS_SAVEDIR_DESC1 | The save directory is currently set to the default location.
|
||||
GAME_SETTINGS_SAVEDIR_DESC2 | The save directory is currently set to: %1
|
||||
|
||||
// Load Game UI
|
||||
diff --git a/src/rotp/lang/en/labels.txt b/src/rotp/lang/en/labels.txt
|
||||
index 6ba316ae..59e3f0e6 100644
|
||||
--- a/src/rotp/lang/en/labels.txt
|
||||
+++ b/src/rotp/lang/en/labels.txt
|
||||
@@ -362,7 +362,7 @@ GAME_SETTINGS_BACKUP_DESC | Enable to have your current game periodicall
|
||||
GAME_SETTINGS_SAVEDIR | Save Directory: %1
|
||||
GAME_SETTINGS_SAVEDIR_DEFAULT | Default
|
||||
GAME_SETTINGS_SAVEDIR_CUSTOM | Custom
|
||||
-GAME_SETTINGS_SAVEDIR_DESC1 | The save directory is currently set to the same directory as the game.
|
||||
+GAME_SETTINGS_SAVEDIR_DESC1 | The save directory is currently set to the default location.
|
||||
GAME_SETTINGS_SAVEDIR_DESC2 | The save directory is currently set to: %1
|
||||
|
||||
// Load Game UI
|
||||
diff --git a/src/rotp/ui/UserPreferences.java b/src/rotp/ui/UserPreferences.java
|
||||
index 6deec256..a792091e 100644
|
||||
--- a/src/rotp/ui/UserPreferences.java
|
||||
+++ b/src/rotp/ui/UserPreferences.java
|
||||
@@ -190,7 +190,7 @@ public class UserPreferences {
|
||||
public static void screenSizePct(int i) { setScreenSizePct(i); }
|
||||
public static String saveDirectoryPath() {
|
||||
if (saveDir.isEmpty())
|
||||
- return Rotp.jarPath();
|
||||
+ return Rotp.configDir();
|
||||
else
|
||||
return saveDir;
|
||||
}
|
||||
@@ -233,7 +233,7 @@ public class UserPreferences {
|
||||
save();
|
||||
}
|
||||
public static void load() {
|
||||
- String path = Rotp.jarPath();
|
||||
+ String path = Rotp.configDir();
|
||||
File configFile = new File(path, PREFERENCES_FILE);
|
||||
// modnar: change to InputStreamReader, force UTF-8
|
||||
try ( BufferedReader in = new BufferedReader( new InputStreamReader( new FileInputStream(configFile), "UTF-8"));) {
|
||||
@@ -251,7 +251,8 @@ public class UserPreferences {
|
||||
}
|
||||
}
|
||||
public static int save() {
|
||||
- String path = Rotp.jarPath();
|
||||
+ String path = Rotp.configDir();
|
||||
+ new File(path).mkdirs();
|
||||
try (FileOutputStream fout = new FileOutputStream(new File(path, PREFERENCES_FILE));
|
||||
// modnar: change to OutputStreamWriter, force UTF-8
|
||||
PrintWriter out = new PrintWriter(new OutputStreamWriter(fout, "UTF-8")); ) {
|
||||
--
|
||||
2.38.3
|
||||
|
||||
87
pkgs/games/rotp/default.nix
Normal file
87
pkgs/games/rotp/default.nix
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, jdk, jre }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "remnants-of-the-precursors";
|
||||
version = "1.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rayfowler";
|
||||
repo = "rotp-public";
|
||||
rev = "e3726fc22c2c44316306c50c79779e3da1c4c140";
|
||||
sha256 = "sha256-oMA8LRpBoBX7t4G+HuRz0a8g+UEwYO7Ya0Qq4j8AWec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jdk makeWrapper ];
|
||||
|
||||
# By default, the game tries to write to the java class path. If that fails
|
||||
# (and it always does, since they are in the read-only nix store), it won't
|
||||
# launch.
|
||||
patches = [ ./0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
javac -d "$out/share/" -sourcepath src src/rotp/Rotp.java
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# We need the assets, but don't want the source files.
|
||||
find "src/rotp" -type f -name '*java' -exec rm "{}" \;
|
||||
cp -r src/rotp/* "$out/share/rotp/"
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${jre}/bin/java $out/bin/rotp \
|
||||
--add-flags "-cp $out/share rotp.Rotp"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = ''Open-source modernization of the 1993 classic "Master of Orion", written in Java'';
|
||||
homepage = "https://www.remnantsoftheprecursors.com/";
|
||||
|
||||
# See LICENSE file in source repo for more details.
|
||||
license = with licenses; [
|
||||
# All java files created by Ray Fowler:
|
||||
gpl3Only
|
||||
|
||||
# All Java files in the src/rotp/apachemath folder:
|
||||
asl20
|
||||
|
||||
# The /src/rotp/model/planet/PlanetHeightMap.java file:
|
||||
#
|
||||
# This file is a Java-rewrite of the "Planet Generator" code (originally in C)
|
||||
# available from the following site:
|
||||
#
|
||||
# http://hjemmesider.diku.dk/~torbenm/Planet
|
||||
#
|
||||
# That page includes the following statement: "Both the program itself and
|
||||
# maps created by the program are free for use, modification and reproduction,
|
||||
# both privately and for commercial purposes, as long as this does not limit
|
||||
# what other people may do with the program and the images they produce with
|
||||
# the program"
|
||||
{
|
||||
free = true;
|
||||
url = "http://hjemmesider.diku.dk/~torbenm/Planet";
|
||||
}
|
||||
|
||||
# All image files are copyright by Peter Penev.
|
||||
#
|
||||
# All sound files are copyright by Remi Agullo.
|
||||
#
|
||||
# Various *.txt files that contain a license notice are copyright by Jeff Colucci. This
|
||||
# includes English text and any foreign language translations.
|
||||
#
|
||||
# The manual.pdf file is copyright by Tom Chick. This includes any foreign language
|
||||
# translations of the manual contained in this repository
|
||||
cc-by-nc-nd-40
|
||||
];
|
||||
|
||||
maintainers = with maintainers; [ jtrees ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
1912
pkgs/tools/system/amdgpu_top/Cargo.lock
generated
1912
pkgs/tools/system/amdgpu_top/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -14,16 +14,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "amdgpu_top";
|
||||
version = "0.1.11";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Umio-Yasuno";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jeKwvecB67U+TACr4uXGjRWvRG3GUleiqyu5MYlFwq0=";
|
||||
hash = "sha256-bkrXm3lXJr+sZ09GeVHgfIp8JO3a/Ejrsm1Cm4eY4IU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
outputHashes = {
|
||||
"libdrm_amdgpu_sys-0.2.2" = "sha256-2QXT/6octEzokW8+0mHx02R8qQ3kCBDxZT4yyfDkM5A=";
|
||||
};
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, asciidoctor
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, Security
|
||||
|
|
@ -11,18 +10,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ripgrep";
|
||||
version = "13.0.0";
|
||||
version = "14.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BurntSushi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0pdcjzfi0fclbzmmf701fdizb95iw427vy3m1svy6gdn2zwj3ldr";
|
||||
sha256 = "sha256-yVRjOwifxjxuvuwF2d7QCNb7PaT3ELoGP34T2RE1ZVY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1kfdgh8dra4jxgcdb0lln5wwrimz0dpp33bq3h7jgs8ngaq2a9wp";
|
||||
cargoSha256 = "sha256-c4rJYZkAa8vqw3/ccOjGMoyzqq7CVDAMOme9/ORmx9M=";
|
||||
|
||||
nativeBuildInputs = [ asciidoctor installShellFiles ]
|
||||
nativeBuildInputs = [ installShellFiles ]
|
||||
++ lib.optional withPCRE2 pkg-config;
|
||||
buildInputs = lib.optional withPCRE2 pcre2
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
|
@ -30,10 +29,13 @@ rustPlatform.buildRustPackage rec {
|
|||
buildFeatures = lib.optional withPCRE2 "pcre2";
|
||||
|
||||
preFixup = ''
|
||||
installManPage $releaseDir/build/ripgrep-*/out/rg.1
|
||||
$out/bin/rg --generate man > rg.1
|
||||
installManPage rg.1
|
||||
|
||||
installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish}
|
||||
installShellCompletion --zsh complete/_rg
|
||||
installShellCompletion --cmd rg \
|
||||
--bash <($out/bin/rg --generate complete-bash) \
|
||||
--fish <($out/bin/rg --generate complete-fish) \
|
||||
--zsh <($out/bin/rg --generate complete-zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,9 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ icu fontconfig harfbuzz openssl ]
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
|
||||
|
||||
# workaround for https://github.com/NixOS/nixpkgs/issues/166205
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) " -l${stdenv.cc.libcxx.cxxabi.libName}";
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace dist/appimage/tectonic.desktop \
|
||||
--replace Exec=tectonic Exec=$out/bin/tectonic
|
||||
|
|
|
|||
|
|
@ -11759,6 +11759,12 @@ with pkgs;
|
|||
|
||||
osl = libsForQt5.callPackage ../development/compilers/osl {
|
||||
boost = boost179;
|
||||
libclang = llvmPackages_15.libclang;
|
||||
clang =
|
||||
if stdenv.cc.libcxx != null
|
||||
then (overrideLibcxx llvmPackages_15.stdenv).cc
|
||||
else clang_15;
|
||||
llvm = llvm_15;
|
||||
};
|
||||
|
||||
osqp = callPackage ../development/libraries/science/math/osqp { };
|
||||
|
|
@ -37492,6 +37498,8 @@ with pkgs;
|
|||
|
||||
qgo = libsForQt5.callPackage ../games/qgo { };
|
||||
|
||||
rotp = callPackage ../games/rotp { };
|
||||
|
||||
rpg-cli = callPackage ../games/rpg-cli { };
|
||||
|
||||
runelite = callPackage ../games/runelite { };
|
||||
|
|
|
|||
|
|
@ -128,8 +128,7 @@ let
|
|||
(lib.versionAtLeast self.coq.version "8.14") {
|
||||
compcert = self.compcert.override {
|
||||
version = with lib.versions; lib.switch self.coq.version [
|
||||
{ case = isEq "8.17"; out = "3.13"; }
|
||||
{ case = range "8.15" "8.16"; out = "3.12"; }
|
||||
{ case = range "8.15" "8.17"; out = "3.13.1"; }
|
||||
{ case = isEq "8.14"; out = "3.11"; }
|
||||
] null;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue