Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -8797,6 +8797,12 @@
|
||||
githubId = 3696783;
|
||||
name = "Leroy Hopson";
|
||||
};
|
||||
lillycham = {
|
||||
email = "lillycat332@gmail.com";
|
||||
github = "lillycat332";
|
||||
githubId = 54189319;
|
||||
name = "Lilly Cham";
|
||||
};
|
||||
lilyball = {
|
||||
email = "lily@sb.org";
|
||||
github = "lilyball";
|
||||
|
||||
@@ -135,10 +135,11 @@ with lib;
|
||||
cfgLine = name: value: ''
|
||||
${name}: ${builtins.toString value}
|
||||
'';
|
||||
virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0);
|
||||
cfgFile = fileName: properties: pkgs.writeTextDir fileName ''
|
||||
# generated by NixOS
|
||||
${lib.concatStrings (lib.mapAttrsToList cfgLine properties)}
|
||||
#qmdump#map:virtio0:drive-virtio0:local-lvm:raw:
|
||||
#qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw:
|
||||
'';
|
||||
inherit (cfg) partitionTableType;
|
||||
supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid";
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ludusavi";
|
||||
version = "0.15.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtkennerly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3nh1EhjiH+dUBw3CNeFSg/+Wkxr5AYgVdM1HzVKbqJI=";
|
||||
sha256 = "sha256-LTqorrZ7hp9hFGcQ0rdc/U6st9YraXEftDpH7VEShs8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-l9jYqmKC0GJL9MSRbrNng4rO6/dx4q8EVCxfuin4v6E=";
|
||||
cargoSha256 = "sha256-3SijgvIPb+QBAWZaTivw8P5aYjctGfgnVrFYcGl8PyE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -13,15 +13,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.10.0";
|
||||
# map of nix platform -> expected url platform
|
||||
platformMap = {
|
||||
x86_64-linux = "linux-x86";
|
||||
aarch64-linux = "linux-arm64";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.10.0";
|
||||
name = "fluffychat";
|
||||
stdenv.mkDerivation {
|
||||
inherit version;
|
||||
pname = "fluffychat";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gitlab.com/api/v4/projects/16112282/packages/generic/fluffychat/${version}/fluffychat-${platformMap.${stdenv.hostPlatform.system}}.tar.gz";
|
||||
|
||||
@@ -60,6 +60,8 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace subprojects/libqalculate/libqalculate/Calculator-plot.cc \
|
||||
--replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
|
||||
--replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
|
||||
substituteInPlace subprojects/libqalculate/libqalculate/meson.build \
|
||||
--replace "link_with: 'libqalculate_lib_static'" "link_with: libqalculate_lib_static"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@@ -80,6 +82,5 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "com.github.parnold_x.nasc";
|
||||
broken = true; # at 2022-09-23
|
||||
};
|
||||
}
|
||||
|
||||
+391
-274
File diff suppressed because it is too large
Load Diff
@@ -31,14 +31,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "20230326-111934-3666303c";
|
||||
version = "20230408-112425-69ae8472";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-tgJUnQKVdLJKohda9oy9dwz53OiK4O0A9YlsI0o+meY=";
|
||||
hash = "sha256-Uk6I/JtSkGCQGG95DDD1hsu40X00/k5d44WP3OJ+rn4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"image-0.24.5" = "sha256-fTajVwm88OInqCPZerWcSAm1ga46ansQ3EzAmbT58Js=";
|
||||
"libssh-rs-0.1.7" = "sha256-pLaWKk/iGy7FfoVafpPYzErnKudxeIWzssWv2Zlm58s=";
|
||||
"xcb-imdkit-0.2.0" = "sha256-QOT9HLlA26DVPUF4ViKH2ckexUsu45KZMdJwoUhW+hA=";
|
||||
};
|
||||
};
|
||||
@@ -136,6 +135,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
|
||||
homepage = "https://wezfurlong.org/wezterm";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 mimame ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -25,11 +25,11 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "forgejo";
|
||||
version = "1.19.0-3";
|
||||
version = "1.19.1-0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/forgejo/forgejo/releases/download/v${version}/forgejo-src-${version}.tar.gz";
|
||||
hash = "sha256-u27DDw3JUtVJ2nvkKfaGzpYP8bpRnwc1LUVra8Epkjc=";
|
||||
hash = "sha256-zoYEkUmJx7lt++2Rmjx/jgyZ2Y9uJH4k8VpD++My7mU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.30.5";
|
||||
version = "0.30.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7Fjz6Q/f6jocMPAcgeodzdImILKuRmF6V0zo00ZPfjI=";
|
||||
hash = "sha256-mxkwAKfra2btUa/l3TjJac68SmzyGwjmz4HD2yN/U8U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cHG3wUlk0AotfrQ8pYZNQDualhKSp6aNpY2mbjgnqzU=";
|
||||
cargoHash = "sha256-jJ9JrpEJyk3Cg7YCZadESR0+9vB+ZdTQhG2affoCdx4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.571";
|
||||
version = "0.572";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roblox";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-LWA4cssbdV2LfNRYygDHehmnTfNLvbZrh34NjGf3fqg=";
|
||||
hash = "sha256-7pckVsxzEdy0YykyvaouNWmnETEi86Cs7kCxaoU5lHs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
let
|
||||
basis_universal = fetchFromGitHub {
|
||||
owner = "zeux";
|
||||
repo = "basis_universal";
|
||||
rev = "8903f6d69849fd782b72a551a4dd04a264434e20";
|
||||
hash = "sha256-o3dCxAAkpMoNkvkM7qD75cPn/obDc/fJ8u7KLPm1G6g=";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "meshoptimizer";
|
||||
version = "unstable-2023-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeux";
|
||||
repo = "meshoptimizer";
|
||||
hash = "sha256-OWeptdnKFvTyfkz0sFCpiTI7323GfVE8vb8bNUBnslA=";
|
||||
rev = "49d9222385daf61a9ce75bb4699472408eb3df3e";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMESHOPT_BUILD_GLTFPACK=ON"
|
||||
"-DMESHOPT_BASISU_PATH=${basis_universal}"
|
||||
] ++ lib.optional (!stdenv.hostPlatform.isStatic)
|
||||
"-DMESHOPT_BUILD_SHARED_LIBS:BOOL=ON";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mesh optimization library that makes meshes smaller and faster to render";
|
||||
homepage = "https://github.com/zeux/meshoptimizer";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.lillycham ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "gltfpack";
|
||||
};
|
||||
}
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-later";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "thegeeklab";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-icJn8lk7gAhqTRu3rAroWgtNwOdbimE4y+CHLiDvb9k=";
|
||||
hash = "sha256-kqvWrNygriFG+jVjezJNe5CwUix38Ge0hQgu351Qyjw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "5.8.1";
|
||||
version = "5.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-M6icdvD412qeURAIkywUliUM9QAgG/b+yBMZVYatvyQ=";
|
||||
hash = "sha256-S2OC2OvXoc7LDTX0ZkVtaLHflio+3u1Ic/i9TtQN4Ac=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bundletool";
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||
sha256 = "sha256-50Dn04VixejYfMgXVIstuU5CgC6aB3T99nTnWP95aU0=";
|
||||
sha256 = "sha256-L3j5yNBZ2xx+pKxv+yUnRmrwODjRULcPS3f+fe78oBE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "litecli";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
disabled = python3Packages.pythonOlder "3.4";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-AvaSdHlwRlw7rN/o8GjcXZbyXVsrEh+XF37wVTBEED4=";
|
||||
sha256 = "sha256-Ia8s+gg91N8ePMqiohFxKbXxchJ1b1luoJDilndsJ6E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trino-cli";
|
||||
version = "412";
|
||||
version = "413";
|
||||
|
||||
jarfilename = "${pname}-${version}-executable.jar";
|
||||
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}";
|
||||
sha256 = "sha256-jVz4VjlCVzuKOSa99vhmiu8v0ISIoCU9Vv9tRQ5vcX4=";
|
||||
sha256 = "sha256-gsa5RbW9gz7TRhiU4bKLtxTZaggP9Ee6KpxhZBhpqgA=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
+167
-108
@@ -28,7 +28,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "analysis"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
@@ -43,6 +43,7 @@ dependencies = [
|
||||
"sml-naive-fmt",
|
||||
"sml-namespace",
|
||||
"sml-statics",
|
||||
"sml-statics-types",
|
||||
"sml-syntax",
|
||||
"str-util",
|
||||
"text-pos",
|
||||
@@ -104,14 +105,22 @@ version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chain-map"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "char-name"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
|
||||
[[package]]
|
||||
name = "cm-syntax"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
@@ -123,14 +132,14 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "code-h2-md-map"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "config"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"serde",
|
||||
@@ -167,9 +176,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-channel"
|
||||
version = "0.5.7"
|
||||
version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
|
||||
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-utils",
|
||||
@@ -197,7 +206,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "diagnostic"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
|
||||
[[package]]
|
||||
name = "diff"
|
||||
@@ -214,7 +223,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
|
||||
[[package]]
|
||||
name = "elapsed"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"log",
|
||||
]
|
||||
@@ -240,13 +249,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.0"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
|
||||
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
|
||||
dependencies = [
|
||||
"errno-dragonfly",
|
||||
"libc",
|
||||
"windows-sys 0.45.0",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -262,7 +271,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "event-parse"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"drop_bomb",
|
||||
"rowan",
|
||||
@@ -272,7 +281,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "fast-hash"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"rustc-hash",
|
||||
]
|
||||
@@ -290,7 +299,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "fmt-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
@@ -343,7 +352,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
|
||||
[[package]]
|
||||
name = "identifier-case"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
@@ -358,7 +367,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "idx"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
@@ -372,7 +381,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "input"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"cm-syntax",
|
||||
"config",
|
||||
@@ -396,25 +405,25 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "io-lifetimes"
|
||||
version = "1.0.9"
|
||||
version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
|
||||
checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"windows-sys 0.45.0",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.6"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
|
||||
checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"io-lifetimes",
|
||||
"rustix",
|
||||
"windows-sys 0.45.0",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -431,7 +440,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524"
|
||||
|
||||
[[package]]
|
||||
name = "lang-srv"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"anyhow",
|
||||
@@ -459,13 +468,13 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "lex-util"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.140"
|
||||
version = "0.2.141"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
|
||||
checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
@@ -515,16 +524,16 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.6.5"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
|
||||
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "millet-cli"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"config",
|
||||
@@ -538,7 +547,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "millet-ls"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
@@ -558,7 +567,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-hir"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"paths",
|
||||
@@ -569,7 +578,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-statics"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
@@ -585,6 +594,7 @@ dependencies = [
|
||||
"sml-lower",
|
||||
"sml-namespace",
|
||||
"sml-statics",
|
||||
"sml-statics-types",
|
||||
"sml-syntax",
|
||||
"str-util",
|
||||
"text-pos",
|
||||
@@ -593,7 +603,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-syntax"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
@@ -659,7 +669,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "panic-hook"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"better-panic",
|
||||
]
|
||||
@@ -667,7 +677,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "paths"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"glob",
|
||||
@@ -678,7 +688,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "pattern-match"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
]
|
||||
@@ -756,8 +766,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||
|
||||
[[package]]
|
||||
name = "rowan"
|
||||
version = "0.15.10"
|
||||
source = "git+https://github.com/azdavis/rowan.git#ce2018bd3b264802846529c85f2a5d3f4ced6280"
|
||||
version = "0.15.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64449cfef9483a475ed56ae30e2da5ee96448789fb2aa240a04beb6a055078bf"
|
||||
dependencies = [
|
||||
"countme",
|
||||
"hashbrown",
|
||||
@@ -780,16 +791,16 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.37.6"
|
||||
version = "0.37.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849"
|
||||
checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"errno",
|
||||
"io-lifetimes",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys 0.45.0",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -800,29 +811,29 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.159"
|
||||
version = "1.0.160"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
|
||||
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.159"
|
||||
version = "1.0.160"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
|
||||
checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.13",
|
||||
"syn 2.0.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.95"
|
||||
version = "1.0.96"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
|
||||
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
@@ -837,7 +848,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.13",
|
||||
"syn 2.0.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -851,7 +862,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "slash-var-path"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
@@ -859,14 +870,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-comment"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"sml-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-file-syntax"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"elapsed",
|
||||
@@ -880,7 +891,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-fixity"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
@@ -889,7 +900,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-hir"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"la-arena",
|
||||
"num-bigint",
|
||||
@@ -899,7 +910,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-lex"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"lex-util",
|
||||
@@ -909,11 +920,11 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "sml-libs"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/sml-libs.git#07a772374caa2b0e3acda920f7cc07c958813005"
|
||||
source = "git+https://github.com/azdavis/sml-libs.git#360d865bfe1e8afc4f8e483e0ac8f53da0593041"
|
||||
|
||||
[[package]]
|
||||
name = "sml-lower"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
@@ -928,7 +939,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-naive-fmt"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-comment",
|
||||
@@ -937,11 +948,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-namespace"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
|
||||
[[package]]
|
||||
name = "sml-parse"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"event-parse",
|
||||
@@ -953,38 +964,52 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-path"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-statics"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"code-h2-md-map",
|
||||
"chain-map",
|
||||
"config",
|
||||
"diagnostic",
|
||||
"drop_bomb",
|
||||
"elapsed",
|
||||
"fast-hash",
|
||||
"fmt-util",
|
||||
"idx",
|
||||
"log",
|
||||
"once_cell",
|
||||
"paths",
|
||||
"pattern-match",
|
||||
"sml-hir",
|
||||
"sml-namespace",
|
||||
"sml-path",
|
||||
"stack-map",
|
||||
"sml-statics-types",
|
||||
"str-util",
|
||||
"uniq",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-statics-types"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"code-h2-md-map",
|
||||
"drop_bomb",
|
||||
"fast-hash",
|
||||
"fmt-util",
|
||||
"idx",
|
||||
"once_cell",
|
||||
"paths",
|
||||
"sml-hir",
|
||||
"sml-path",
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-syntax"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"char-name",
|
||||
"code-h2-md-map",
|
||||
@@ -997,7 +1022,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-ty-var-scope"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-hir",
|
||||
@@ -1012,18 +1037,10 @@ dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stack-map"
|
||||
version = "0.8.8"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "str-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"smol_str",
|
||||
]
|
||||
@@ -1041,9 +1058,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.13"
|
||||
version = "2.0.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
|
||||
checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -1053,7 +1070,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "syntax-gen"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"identifier-case",
|
||||
@@ -1073,7 +1090,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tests"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"cm-syntax",
|
||||
@@ -1099,7 +1116,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "text-pos"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"text-size-util",
|
||||
@@ -1114,7 +1131,7 @@ checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a"
|
||||
[[package]]
|
||||
name = "text-size-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
dependencies = [
|
||||
"text-size",
|
||||
]
|
||||
@@ -1137,7 +1154,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||
[[package]]
|
||||
name = "token"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
@@ -1176,7 +1193,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "topo-sort"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
|
||||
[[package]]
|
||||
name = "ungrammar"
|
||||
@@ -1223,7 +1240,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
[[package]]
|
||||
name = "uniq"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa"
|
||||
source = "git+https://github.com/azdavis/language-util.git#cc57f0aef443b16a8cd5a7506d11e182ab091e8d"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
@@ -1280,37 +1297,37 @@ version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
"windows_aarch64_gnullvm 0.42.2",
|
||||
"windows_aarch64_msvc 0.42.2",
|
||||
"windows_i686_gnu 0.42.2",
|
||||
"windows_i686_msvc 0.42.2",
|
||||
"windows_x86_64_gnu 0.42.2",
|
||||
"windows_x86_64_gnullvm 0.42.2",
|
||||
"windows_x86_64_msvc 0.42.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.45.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
|
||||
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.42.2"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
|
||||
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
"windows_aarch64_gnullvm 0.48.0",
|
||||
"windows_aarch64_msvc 0.48.0",
|
||||
"windows_i686_gnu 0.48.0",
|
||||
"windows_i686_msvc 0.48.0",
|
||||
"windows_x86_64_gnu 0.48.0",
|
||||
"windows_x86_64_gnullvm 0.48.0",
|
||||
"windows_x86_64_msvc 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1319,42 +1336,84 @@ version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.4.1"
|
||||
@@ -1381,7 +1440,7 @@ checksum = "1dbabb1cbd15a1d6d12d9ed6b35cc6777d4af87ab3ba155ea37215f20beab80c"
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "0.8.8"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"flate2",
|
||||
|
||||
@@ -2,21 +2,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.8.8";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DdzBIlkwYo/E+S/KTXUzc3Fp1DQDP8qL8+sG/67XQe4=";
|
||||
hash = "sha256-lZW+R9fSrW10bLJCIsdtfgrrRRKnfg/sVtlfxl+XFR0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"char-name-0.1.0" = "sha256-8biNETzXhR3GE5Ywrbcd4199h3ipwwZbtpZOQGOYA1g=";
|
||||
"rowan-0.15.10" = "sha256-yOaUq2tQEiNgQB7qB8fFzfnwUWagu72MIPHmaTX0B0Y=";
|
||||
"sml-libs-0.1.0" = "sha256-6jbRMqlW5sL0x0i4qatduXvLHhrkUE7gsSwC6JYwiHQ=";
|
||||
"char-name-0.1.0" = "sha256-dq7y7WOzOzEZztojgh21wPrIqCfiioFJ/gbJ2jY10lQ=";
|
||||
"sml-libs-0.1.0" = "sha256-+sxaPBG5qBIC195BFQYH8Yo6juuelGZzztCUiS45WRg=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-guppy";
|
||||
version = "unstable-2023-01-19";
|
||||
version = "unstable-2023-04-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "0f2e0627d430fa6488980f2808c472ae406d3603";
|
||||
sha256 = "sha256-7ADq5yDVpYn91K/rbXWxp0+34twQ8LArD+vVd48tee4=";
|
||||
rev = "e93f51ca56dc9cc310004931a906b6b486b93058";
|
||||
sha256 = "sha256-kg1iWku+zAXG9cCYCD4rqKzKNtDt0hMCnE5QyhJpLq8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-oVG3x0yGTqNKMaqkOJhfhqRWNwAkUgfkGr7Vxr+nY4I=";
|
||||
cargoSha256 = "sha256-XKAre9L2mk31CgXbP53zR8mr92Jh9qVSx+sMkhqq/M4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hakari";
|
||||
version = "0.9.23";
|
||||
version = "0.9.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "cargo-hakari-${version}";
|
||||
sha256 = "sha256-Ewki2Ux233WEW7x3jgpdeMH6xoMYJQ9X3vP8CqY+0hc=";
|
||||
sha256 = "sha256-kg1iWku+zAXG9cCYCD4rqKzKNtDt0hMCnE5QyhJpLq8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IpTWyp0o6OKS8h0U8ybC2Io3Tbs592UBzAWmd8zEm2I=";
|
||||
cargoHash = "sha256-hrWsQXjWzhSVVj+bUviGEn+E7Lytzgf1r8VmQxJQubE=";
|
||||
|
||||
cargoBuildFlags = [ "-p" "cargo-hakari" ];
|
||||
cargoTestFlags = [ "-p" "cargo-hakari" ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.16.6";
|
||||
version = "0.16.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0YrEhzZUkstlc2Y3VVfmSsOl4H8oFISMbviW0BzdTB4=";
|
||||
sha256 = "sha256-XMlmggT0L9F3J8/WA6AUZTnpCzyZTtb7feKDabPvW/Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-xPtW1vfkhe1CIZSgpNwLVn3kNr3M/Dbk5fRBqxUlFd8=";
|
||||
cargoSha256 = "sha256-OLMKvB7l29vM/n59dklyEXT5DXvImYKc3EdwnPVY968=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@ rec {
|
||||
production = generic {
|
||||
version = "525.105.17";
|
||||
sha256_64bit = "sha256-xjWiGigsm1NIXxnrtkoPS1NqlouU1Nl2KeC8VHpYFCo=";
|
||||
sha256_aarch64 = "sha256-FUbmupHNVab3sM/ShDXPM7pK+5GC2/ri1YW20Hx3vbE=";
|
||||
openSha256 = "sha256-O3XB8tNLmNkzrYoVyJVEE0IcE772lOdr8qn4rQHIupE=";
|
||||
settingsSha256 = "sha256-KUw31Am9Zfwk5QTs6th8+J3C4oUBacNgb7ZUNeV68W4=";
|
||||
persistencedSha256 = "sha256-jhBtsf9MXrkU/SsBndR1ESGUHhgUWiSH7R75swk3m40=";
|
||||
@@ -37,6 +38,7 @@ rec {
|
||||
latest = selectHighestVersion production (generic {
|
||||
version = "530.41.03";
|
||||
sha256_64bit = "sha256-riehapaMhVA/XRYd2jQ8FgJhKwJfSu4V+S4uoKy3hLE=";
|
||||
sha256_aarch64 = "sha256-uM5zMEO/AO32VmqUOzmc05FFm/lz76jPSSaQmeZUlFo=";
|
||||
openSha256 = "sha256-etbtw6LMRUcFoZC9EDDRrTDekV8JFRYmkp3idLaMk5g=";
|
||||
settingsSha256 = "sha256-8KB6T9f+gWl8Ni+uOyrJKiiH5mNx9eyfCcW/RjPTQQA=";
|
||||
persistencedSha256 = "sha256-zrstlt/0YVGnsPGUuBbR9ULutywi2wNDVxh7OhJM7tM=";
|
||||
@@ -45,6 +47,7 @@ rec {
|
||||
beta = selectHighestVersion latest (generic {
|
||||
version = "530.30.02";
|
||||
sha256_64bit = "sha256-R/3bvXoiumYZI9vObn9R7sVN9oBQxAbMBJDDv77eeWM=";
|
||||
sha256_aarch64 = "sha256-/b5Jdow+O7ExXjtXTzDX38qgmBDUYDUl+5zxXvbi1ts=";
|
||||
openSha256 = "sha256-LCtTyuJ8s8isTBt9HetItLqSjL1GOn0tPUarjuxHpMk=";
|
||||
settingsSha256 = "sha256-6mynLNSaWeiB52HdwZ0EQNyPg+tuat0oEqpZGSb2yQo=";
|
||||
persistencedSha256 = "sha256-h6iq0iD9F41a7s6jWKPTI+oVzgDRIr1Kk97LNH9rg7E=";
|
||||
@@ -71,6 +74,7 @@ rec {
|
||||
legacy_470 = generic {
|
||||
version = "470.161.03";
|
||||
sha256_64bit = "sha256-Xagqf4x254Hn1/C+e3mNtNNE8mvU+s+avPPHHHH+dkA=";
|
||||
sha256_aarch64 = "sha256-Ak+j3CkQNCsclv0X23gP1fx3XPOSEyRkjyK5+GDxhn4=";
|
||||
settingsSha256 = "sha256-ryUSiI8PsY3knkJLg0k1EmyYW5OWkhuZma/hmXNuojw=";
|
||||
persistencedSha256 = "sha256-/2h90Gq9NQd9Q+9eLVE6vrxXmINXxlLcSNOHxKToOEE=";
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, url ? null
|
||||
, sha256_32bit ? null
|
||||
, sha256_64bit
|
||||
, sha256_aarch64 ? null
|
||||
, openSha256 ? null
|
||||
, settingsSha256
|
||||
, settingsVersion ? version
|
||||
@@ -28,7 +29,7 @@
|
||||
libsOnly ? false
|
||||
, # don't include the bundled 32-bit libraries on 64-bit platforms,
|
||||
# even if it’s in downloaded binary
|
||||
disable32Bit ? false
|
||||
disable32Bit ? stdenv.hostPlatform.system == "aarch64-linux"
|
||||
# 32 bit libs only version of this package
|
||||
, lib32 ? null
|
||||
# Whether to extract the GSP firmware
|
||||
@@ -59,14 +60,28 @@ let
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = args.url or "https://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
|
||||
urls = if args ? url then [ args.url ] else [
|
||||
"https://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"
|
||||
"https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"
|
||||
];
|
||||
sha256 = sha256_64bit;
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = args.url or "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
|
||||
urls = if args ? url then [ args.url ] else [
|
||||
"https://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"
|
||||
"https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"
|
||||
];
|
||||
sha256 = sha256_32bit;
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" && sha256_aarch64 != null then
|
||||
fetchurl {
|
||||
urls = if args ? url then [ args.url ] else [
|
||||
"https://us.download.nvidia.com/XFree86/aarch64/${version}/NVIDIA-Linux-aarch64-${version}${pkgSuffix}.run"
|
||||
"https://download.nvidia.com/XFree86/Linux-aarch64/${version}/NVIDIA-Linux-aarch64-${version}${pkgSuffix}.run"
|
||||
];
|
||||
sha256 = sha256_aarch64;
|
||||
}
|
||||
else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";
|
||||
|
||||
patches = if libsOnly then null else patches;
|
||||
@@ -126,7 +141,9 @@ let
|
||||
homepage = "https://www.nvidia.com/object/unix.html";
|
||||
description = "X.org driver and kernel module for NVIDIA graphics cards";
|
||||
license = licenses.unfreeRedistributable;
|
||||
platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ];
|
||||
platforms = [ "x86_64-linux" ]
|
||||
++ optionals (sha256_32bit != null) [ "i686-linux" ]
|
||||
++ optionals (sha256_aarch64 != null) [ "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ jonringer kiskae ];
|
||||
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
|
||||
inherit broken;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
, broken ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation ({
|
||||
pname = "nvidia-open";
|
||||
version = "${kernel.version}-${nvidia_x11.version}";
|
||||
|
||||
@@ -24,6 +24,10 @@ stdenv.mkDerivation {
|
||||
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
|
||||
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
|
||||
{
|
||||
aarch64-linux = "TARGET_ARCH=aarch64";
|
||||
x86_64-linux = "TARGET_ARCH=x86_64";
|
||||
}.${stdenv.hostPlatform.system}
|
||||
];
|
||||
|
||||
installTargets = [ "modules_install" ];
|
||||
@@ -33,8 +37,10 @@ stdenv.mkDerivation {
|
||||
description = "NVIDIA Linux Open GPU Kernel Module";
|
||||
homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
|
||||
license = with licenses; [ gpl2Plus mit ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
inherit broken;
|
||||
};
|
||||
}
|
||||
} // lib.optionalAttrs stdenv.hostPlatform.isAarch64 {
|
||||
env.NIX_CFLAGS_COMPILE = "-fno-stack-protector";
|
||||
})
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-R4Id8neiQypnj2hYYWEYSY10eJ7yId5k95aMnphvqEs=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-amKwWr+0Q9Ci0CxLEjtxTiu/T9wJL77DPL/QiWqsMoc=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-EWQ02mIWYQfYEc8A9+U6N14v0h4kux8Cg7x4Xfj5uL0=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-dJHFGTIv+inVU6djuQkFcOF2nTALd+1dS888ooHXt/w=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-Hmy3A2KuWk+Myqha/Typd6sY4rHI7kTAGLnz9XH1KRA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-ijcR3z0aUN0euC9oygULlMtaNnffelv45ku4zmcZkUA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-mNBv8F4BJHXJ86vnSM+0sfEkS3jB8TcMhM+6RJ5zgYM=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-aXmDer5/bq0L6SoPhqyJ8IY2FzH+TYNHDvQTZgrrrj0=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-2J06RvoKZJj3qRj6fg4l+S6soR+5gpCCupcJ75ggvD8=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-E2QBwA0prJ4B8a6tEj9lBkAnrYUTlsweOJBpQsLBo9M=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-U3np5JP2/otbEkn+S5xtNO+RuUt6CkWMK4iftoTT460=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_armv6.tar.gz";
|
||||
sha256 = "sha256-NARiVRdT7U0E6BUlehJbEeHQ9tF6vmCh/d59osVy/S0=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-y5/svgOJS3KbUJLbgjy9VOpog9W7xGyyx96JtdVyzjk=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_armv7.tar.gz";
|
||||
sha256 = "sha256-HU6uUSfdr3UkPX+oyjGlMHJkcfpGBRphBNLtBG3oLzY=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.27";
|
||||
version = "0.107.28";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
schema_version = 17;
|
||||
schema_version = 20;
|
||||
tests.adguardhome = nixosTests.adguardhome;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,11 +11,9 @@
|
||||
, xdg-utils
|
||||
, dbus
|
||||
, hwdata
|
||||
, libX11
|
||||
, mangohud32
|
||||
, appstream
|
||||
, addOpenGLRunpath
|
||||
, glslang
|
||||
, makeWrapper
|
||||
, mako
|
||||
, meson
|
||||
, ninja
|
||||
@@ -23,12 +21,14 @@
|
||||
, unzip
|
||||
, libXNVCtrl
|
||||
, wayland
|
||||
, libX11
|
||||
, nlohmann_json
|
||||
, spdlog
|
||||
, glew
|
||||
, glfw
|
||||
, nlohmann_json
|
||||
, xorg
|
||||
, addOpenGLRunpath
|
||||
, gamescopeSupport ? true # build mangoapp and mangohudctl
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -39,32 +39,11 @@ let
|
||||
owner = "ocornut";
|
||||
repo = "imgui";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18=";
|
||||
hash = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18=";
|
||||
};
|
||||
patch = fetchurl {
|
||||
url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch";
|
||||
sha256 = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18=";
|
||||
};
|
||||
};
|
||||
|
||||
# Derived from subprojects/spdlog.wrap
|
||||
#
|
||||
# NOTE: We only statically link spdlog due to a bug in pressure-vessel:
|
||||
# https://github.com/ValveSoftware/steam-runtime/issues/511
|
||||
#
|
||||
# Once this fix is released upstream, we should switch back to using
|
||||
# the system provided spdlog
|
||||
spdlog = rec {
|
||||
version = "1.8.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabime";
|
||||
repo = "spdlog";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-D29jvDZQhPscaOHlrzGN1s7/mXlcsovjbqYpXd7OM50=";
|
||||
};
|
||||
patch = fetchurl {
|
||||
url = "https://wrapdb.mesonbuild.com/v2/spdlog_${version}-1/get_patch";
|
||||
sha256 = "sha256-PDjyddV5KxKGORECWUMp6YsXc3kks0T5gxKrCZKbdL4=";
|
||||
hash = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -82,16 +61,17 @@ let
|
||||
hash = "sha256-hgNYz15z9FjNHoj4w4EW0SOrQh1c4uQSnsOOrt2CDhc=";
|
||||
};
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mangohud";
|
||||
version = "0.6.8";
|
||||
version = "0.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flightlessmango";
|
||||
repo = "MangoHud";
|
||||
rev = "refs/tags/v${version}";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-jfmgN90kViHa7vMOjo2x4bNY2QbLk93uYEvaA4DxYvg=";
|
||||
hash = "sha256-wvidO9LAZwVUZhYYWnelSiP0Q1WTPoCg6pMXsoJBPPg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
@@ -100,13 +80,15 @@ in stdenv.mkDerivation rec {
|
||||
postUnpack = ''(
|
||||
cd "$sourceRoot/subprojects"
|
||||
cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version}
|
||||
cp -R --no-preserve=mode,ownership ${spdlog.src} spdlog-${spdlog.version}
|
||||
cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version}
|
||||
)'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${vulkan-headers.src}/include";
|
||||
|
||||
patches = [
|
||||
# Add @libraryPath@ template variable to fix loading the preload
|
||||
# library and @dataPath@ to support overlaying Vulkan apps without
|
||||
# requiring MangoHud to be installed
|
||||
./preload-nix-workaround.patch
|
||||
|
||||
# Hard code dependencies. Can't use makeWrapper since the Vulkan
|
||||
# layer can be used without the mangohud executable by setting MANGOHUD=1.
|
||||
(substituteAll {
|
||||
@@ -122,81 +104,84 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
libdbus = dbus.lib;
|
||||
inherit hwdata libX11;
|
||||
})
|
||||
] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
|
||||
# Support 32bit OpenGL applications by appending the mangohud32
|
||||
# lib path to LD_LIBRARY_PATH.
|
||||
#
|
||||
# This workaround is necessary since on Nix's build of ld.so, $LIB
|
||||
# always expands to lib even when running an 32bit application.
|
||||
#
|
||||
# See https://github.com/NixOS/nixpkgs/issues/101597.
|
||||
(substituteAll {
|
||||
src = ./opengl32-nix-workaround.patch;
|
||||
inherit mangohud32;
|
||||
inherit hwdata;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''(
|
||||
cd subprojects
|
||||
unzip ${imgui.patch}
|
||||
unzip ${spdlog.patch}
|
||||
unzip ${vulkan-headers.patch}
|
||||
)'';
|
||||
postPatch = ''
|
||||
substituteInPlace bin/mangohud.in \
|
||||
--subst-var-by libraryPath ${lib.makeSearchPath "lib/mangohud" ([
|
||||
(placeholder "out")
|
||||
] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
|
||||
mangohud32
|
||||
])} \
|
||||
--subst-var-by dataDir ${placeholder "out"}/share
|
||||
|
||||
(
|
||||
cd subprojects
|
||||
unzip ${imgui.patch}
|
||||
unzip ${vulkan-headers.patch}
|
||||
)
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Dwith_wayland=enabled"
|
||||
"-Duse_system_spdlog=enabled"
|
||||
"-Dtests=disabled" # Tests require AMD GPU
|
||||
] ++ lib.optionals gamescopeSupport [
|
||||
"-Dmangoapp_layer=true"
|
||||
"-Dmangoapp=true"
|
||||
"-Dmangoapp_layer=true"
|
||||
"-Dmangohudctl=true"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
addOpenGLRunpath
|
||||
glslang
|
||||
makeWrapper
|
||||
mako
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
unzip
|
||||
|
||||
# Only the headers are used from these packages
|
||||
# The corresponding libraries are loaded at runtime from the app's runpath
|
||||
libXNVCtrl
|
||||
wayland
|
||||
libX11
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
libX11
|
||||
libXNVCtrl
|
||||
wayland
|
||||
nlohmann_json
|
||||
spdlog
|
||||
] ++ lib.optionals gamescopeSupport [
|
||||
glew
|
||||
glfw
|
||||
nlohmann_json
|
||||
xorg.libXrandr
|
||||
];
|
||||
|
||||
# Support 32bit Vulkan applications by linking in 32bit Vulkan layer
|
||||
# This is needed for the same reason the 32bit OpenGL workaround is needed.
|
||||
# Support 32bit Vulkan applications by linking in 32bit Vulkan layers
|
||||
# This is needed for the same reason the 32bit preload workaround is needed.
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
|
||||
ln -s ${mangohud32}/share/vulkan/implicit_layer.d/MangoHud.json \
|
||||
"$out/share/vulkan/implicit_layer.d/MangoHud.x86.json"
|
||||
ln -s ${mangohud32}/share/vulkan/implicit_layer.d/MangoHud.x86.json \
|
||||
"$out/share/vulkan/implicit_layer.d"
|
||||
|
||||
${lib.optionalString gamescopeSupport ''
|
||||
ln -s ${mangohud32}/share/vulkan/implicit_layer.d/libMangoApp.x86.json \
|
||||
"$out/share/vulkan/implicit_layer.d"
|
||||
''}
|
||||
'';
|
||||
|
||||
# Support Nvidia cards by adding OpenGL path and support overlaying
|
||||
# Vulkan applications without requiring MangoHud to be installed
|
||||
# Add OpenGL driver path to RUNPATH to support NVIDIA cards
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/mangohud" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ addOpenGLRunpath.driverLink ]} \
|
||||
--prefix XDG_DATA_DIRS : "$out/share"
|
||||
'' + lib.optionalString (gamescopeSupport) ''
|
||||
if [[ -e "$out/bin/mangoapp" ]]; then
|
||||
wrapProgram "$out/bin/mangoapp" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ addOpenGLRunpath.driverLink ]} \
|
||||
--prefix XDG_DATA_DIRS : "$out/share"
|
||||
fi
|
||||
addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so"
|
||||
${lib.optionalString gamescopeSupport ''
|
||||
addOpenGLRunpath "$out/bin/mangoapp"
|
||||
''}
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more";
|
||||
homepage = "https://github.com/flightlessmango/MangoHud";
|
||||
@@ -204,4 +189,4 @@ in stdenv.mkDerivation rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kira-bruneau zeratax ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/src/dbus.cpp b/src/dbus.cpp
|
||||
index 3b3cccb..1405725 100644
|
||||
index 7379af1..4eef3fe 100644
|
||||
--- a/src/dbus.cpp
|
||||
+++ b/src/dbus.cpp
|
||||
@@ -152,7 +152,7 @@ bool dbus_manager::get_media_player_metadata(metadata& meta, std::string name) {
|
||||
@@ -11,21 +11,11 @@ index 3b3cccb..1405725 100644
|
||||
SPDLOG_ERROR("Could not load libdbus-1.so.3");
|
||||
return false;
|
||||
}
|
||||
diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp
|
||||
index 4db6f78..c60d08c 100644
|
||||
--- a/src/loaders/loader_x11.cpp
|
||||
+++ b/src/loaders/loader_x11.cpp
|
||||
@@ -89,4 +89,4 @@ void libx11_loader::CleanUp(bool unload) {
|
||||
|
||||
}
|
||||
|
||||
-std::shared_ptr<libx11_loader> g_x11(new libx11_loader("libX11.so.6"));
|
||||
+std::shared_ptr<libx11_loader> g_x11(new libx11_loader("@libX11@/lib/libX11.so.6"));
|
||||
diff --git a/src/logging.cpp b/src/logging.cpp
|
||||
index 1668226..f0c8df5 100644
|
||||
index 046c847..42782be 100644
|
||||
--- a/src/logging.cpp
|
||||
+++ b/src/logging.cpp
|
||||
@@ -24,7 +24,11 @@ string exec(string command) {
|
||||
@@ -26,7 +26,11 @@ string exec(string command) {
|
||||
#endif
|
||||
std::array<char, 128> buffer;
|
||||
std::string result;
|
||||
@@ -38,10 +28,10 @@ index 1668226..f0c8df5 100644
|
||||
return "popen failed!";
|
||||
}
|
||||
diff --git a/src/pci_ids.cpp b/src/pci_ids.cpp
|
||||
index feec222..6baa707 100644
|
||||
index 002a843..5a6262b 100644
|
||||
--- a/src/pci_ids.cpp
|
||||
+++ b/src/pci_ids.cpp
|
||||
@@ -24,11 +24,9 @@ std::istream& get_uncommented_line(std::istream& is, std::string &line)
|
||||
@@ -24,11 +24,9 @@ static std::istream& get_uncommented_line(std::istream& is, std::string &line)
|
||||
void parse_pciids()
|
||||
{
|
||||
std::ifstream file;
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/bin/mangohud.in b/bin/mangohud.in
|
||||
index e13da99..086443c 100755
|
||||
--- a/bin/mangohud.in
|
||||
+++ b/bin/mangohud.in
|
||||
@@ -23,6 +23,6 @@ fi
|
||||
# figure out whether the 32 or 64 bit version should be used, and will search
|
||||
# for it in the correct directory
|
||||
LD_PRELOAD="${LD_PRELOAD}${LD_PRELOAD:+:}${MANGOHUD_LIB_NAME}"
|
||||
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@ld_libdir_mangohud@"
|
||||
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@ld_libdir_mangohud@:@mangohud32@/lib/mangohud"
|
||||
|
||||
exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LD_PRELOAD="${LD_PRELOAD}" "$@"
|
||||
@@ -0,0 +1,26 @@
|
||||
diff --git a/bin/mangohud.in b/bin/mangohud.in
|
||||
index f975224..24936eb 100755
|
||||
--- a/bin/mangohud.in
|
||||
+++ b/bin/mangohud.in
|
||||
@@ -8,16 +8,18 @@ if [ "$#" -eq 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud.so"
|
||||
+MANGOHUD_LIB_NAME="libMangoHud.so"
|
||||
|
||||
if [ "$1" = "--dlsym" ]; then
|
||||
MANGOHUD_DLSYM=1
|
||||
- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
|
||||
+ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
|
||||
shift
|
||||
fi
|
||||
|
||||
# Preload using the plain filenames of the libs, the dynamic linker will
|
||||
# figure out whether the 32 or 64 bit version should be used
|
||||
LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
|
||||
+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
||||
+XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
|
||||
|
||||
-exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" "$@"
|
||||
+exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" XDG_DATA_DIRS="${XDG_DATA_DIRS}" "$@"
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clash";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dreamacro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w/Iz1PZekeKVGFHPteMEbjLP3V9qMmLLAz27qW0VtPk=";
|
||||
hash = "sha256-uuhxxNLhwZrOvxRRiuJ2iY5rcAA/K8KAUryA01aisSI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-raNFt+Ymh7m+p1wXy1ofMO1UJ2EouwaY7Ysngfw3X8U=";
|
||||
vendorHash = "sha256-HS3VnQ9nkRy9OEfE1ASb3fhH/JlgUSlrVlGYNYwGmVA=";
|
||||
|
||||
# Do not build testing suit
|
||||
excludedPackages = [ "./test" ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "step-cli";
|
||||
version = "0.23.4";
|
||||
version = "0.24.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smallstep";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RNuYqmfMrIrWodrn7lpM0YO+HVxz+gKr5IregRqo5ak=";
|
||||
hash = "sha256-Qo0Bct2Eys6RHv17j1owUDVPoL+OcMJRpO8LP8P/cPw=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
rm command/certificate/remote_test.go
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-drIVwsqgJsYDXSuu5AhnBnKwwgkhVyNS/HS9FcoJeLM=";
|
||||
vendorHash = "sha256-uUD4CNFmj/0OjsvirVihMd9I94W0NYTR0WbqujrWUyw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.31.5";
|
||||
version = "3.31.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Q+aCVOeF03UeGPnnXc9lNkhrlL3ECud7KEhYtLzRIj0=";
|
||||
hash = "sha256-NlvDKpDuGjXEPINEBT+qDEwGWxJW32PAfpyezPt1Ucc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mxOfHAaYCrwJT7I18iUHj0rK+MmJ4PX68Ln4cPO8sns=";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "volatility3";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "volatilityfoundation";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tbnyNxC4qyiHEeLzMgMJj9/uGLQTxDzNr1x22oSTM6k=";
|
||||
hash = "sha256-Oi9uy1zNRnKJc+31+IjMiza72EUopiM75sP+Mjjw+aE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -22532,6 +22532,8 @@ with pkgs;
|
||||
|
||||
mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { };
|
||||
|
||||
meshoptimizer = callPackage ../development/libraries/meshoptimizer { };
|
||||
|
||||
mctc-lib = callPackage ../development/libraries/science/chemistry/mctc-lib { };
|
||||
|
||||
mstore = callPackage ../development/libraries/science/chemistry/mstore { };
|
||||
|
||||
Reference in New Issue
Block a user