Merge master into staging-next
This commit is contained in:
commit
4f7f1065a7
@ -923,14 +923,59 @@ for this to work.
|
||||
|
||||
`justStaticExecutables drv`
|
||||
: Only build and install the executables produced by `drv`, removing everything
|
||||
that may refer to other Haskell packages' store paths (like libraries and
|
||||
documentation). This dramatically reduces the closure size of the resulting
|
||||
derivation. Note that the executables are only statically linked against their
|
||||
Haskell dependencies, but will still link dynamically against libc, GMP and
|
||||
other system library dependencies. If dependencies use their Cabal-generated
|
||||
`Paths_*` module, this may not work as well if GHC's dead code elimination
|
||||
is unable to remove the references to the dependency's store path that module
|
||||
contains.
|
||||
that may refer to other Haskell packages' store paths (like libraries and
|
||||
documentation). This dramatically reduces the closure size of the resulting
|
||||
derivation. Note that the executables are only statically linked against their
|
||||
Haskell dependencies, but will still link dynamically against libc, GMP and
|
||||
other system library dependencies.
|
||||
|
||||
If the library being built or its dependencies use their Cabal-generated
|
||||
`Paths_*` module, this may not work as well if GHC's dead code elimination is
|
||||
unable to remove the references to the dependency's store path that module
|
||||
contains. (See [nixpkgs#164630][164630] for more information.)
|
||||
|
||||
Importing the `Paths_*` module may cause builds to fail with this message:
|
||||
|
||||
```
|
||||
error: output '/nix/store/64k8iw0ryz76qpijsnl9v87fb26v28z8-my-haskell-package-1.0.0.0' is not allowed to refer to the following paths:
|
||||
/nix/store/5q5s4a07gaz50h04zpfbda8xjs8wrnhg-ghc-9.6.3
|
||||
```
|
||||
|
||||
If that happens, first disable the check for GHC references and rebuild the
|
||||
derivation:
|
||||
|
||||
```nix
|
||||
pkgs.haskell.lib.overrideCabal
|
||||
(pkgs.haskell.lib.justStaticExecutables my-haskell-package)
|
||||
(drv: {
|
||||
disallowGhcReference = false;
|
||||
})
|
||||
```
|
||||
|
||||
Then use `strings` to determine which libraries are responsible:
|
||||
|
||||
```
|
||||
$ nix-build ...
|
||||
$ strings result/bin/my-haskell-binary | grep /nix/store/
|
||||
...
|
||||
/nix/store/n7ciwdlg8yyxdhbrgd6yc2d8ypnwpmgq-hs-opentelemetry-sdk-0.0.3.6/bin
|
||||
...
|
||||
```
|
||||
|
||||
Finally, use `remove-references-to` to delete those store paths from the produced output:
|
||||
|
||||
```nix
|
||||
pkgs.haskell.lib.overrideCabal
|
||||
(pkgs.haskell.lib.justStaticExecutables my-haskell-package)
|
||||
(drv: {
|
||||
postInstall = ''
|
||||
${drv.postInstall or ""}
|
||||
remove-references-to -t ${pkgs.haskellPackages.hs-opentelemetry-sdk}
|
||||
'';
|
||||
})
|
||||
```
|
||||
|
||||
[164630]: https://github.com/NixOS/nixpkgs/issues/164630
|
||||
|
||||
`enableSeparateBinOutput drv`
|
||||
: Install executables produced by `drv` to a separate `bin` output. This
|
||||
|
@ -22520,6 +22520,11 @@
|
||||
githubId = 46590321;
|
||||
name = "xrelkd";
|
||||
};
|
||||
xtrayambak = {
|
||||
github = "xTrayambak";
|
||||
githubId = 59499552;
|
||||
name = "Trayambak Rai";
|
||||
};
|
||||
xurei = {
|
||||
email = "olivier.bourdoux@gmail.com";
|
||||
github = "xurei";
|
||||
|
@ -40,6 +40,14 @@
|
||||
before changing the package to `pkgs.stalwart-mail` in
|
||||
[`services.stalwart-mail.package`](#opt-services.stalwart-mail.package).
|
||||
|
||||
- `haskell.lib.compose.justStaticExecutables` now disallows references to GHC in the
|
||||
output by default, to alert users to closure size issues caused by
|
||||
[#164630](https://github.com/NixOS/nixpkgs/issues/164630). See ["Packaging
|
||||
Helpers" in the Haskell section of the Nixpkgs
|
||||
manual](https://nixos.org/manual/nixpkgs/unstable/#haskell-packaging-helpers)
|
||||
for information on working around `output '...' is not allowed to refer to
|
||||
the following paths` errors caused by this change.
|
||||
|
||||
- The `stalwart-mail` module now uses RocksDB as the default storage backend
|
||||
for `stateVersion` ≥ 24.11. (It was previously using SQLite for structured
|
||||
data and the filesystem for blobs).
|
||||
|
@ -106,7 +106,8 @@ in
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa";
|
||||
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa";
|
||||
ExecStart = "${alsa-utils}/sbin/alsactl restore --ignore";
|
||||
ExecStop = "${alsa-utils}/sbin/alsactl store --ignore";
|
||||
};
|
||||
};
|
||||
|
@ -1,29 +1,38 @@
|
||||
{ lib, fetchFromGitLab, buildGoModule, scdoc, nix-update-script }:
|
||||
{ lib
|
||||
, fetchFromGitLab
|
||||
, buildGoModule
|
||||
, scdoc
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "darkman";
|
||||
version = "1.5.4";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "WhyNotHugo";
|
||||
repo = "darkman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6SNXVe6EfVwcXH9O6BxNw+v4/uhKhCtVS3XE2GTc2Sc=";
|
||||
sha256 = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY=";
|
||||
|
||||
nativeBuildInputs = [ scdoc ];
|
||||
patches = [
|
||||
./go-mod.patch
|
||||
./makefile.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace darkman.service \
|
||||
--replace "/usr/bin/darkman" "$out/bin/darkman"
|
||||
--replace-fail /usr/bin/darkman $out/bin/darkman
|
||||
substituteInPlace contrib/dbus/nl.whynothugo.darkman.service \
|
||||
--replace "/usr/bin/darkman" "$out/bin/darkman"
|
||||
--replace-fail /usr/bin/darkman $out/bin/darkman
|
||||
substituteInPlace contrib/dbus/org.freedesktop.impl.portal.desktop.darkman.service \
|
||||
--replace "/usr/bin/darkman" "$out/bin/darkman"
|
||||
--replace-fail /usr/bin/darkman $out/bin/darkman
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-3lILSVm7mtquCdR7+cDMuDpHihG+gDJTcQa1cM2o7ZU=";
|
||||
nativeBuildInputs = [ scdoc ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make build
|
||||
@ -32,6 +41,7 @@ buildGoModule rec {
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 darkman -t $out/bin
|
||||
make PREFIX=$out install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
28
pkgs/applications/misc/darkman/go-mod.patch
Normal file
28
pkgs/applications/misc/darkman/go-mod.patch
Normal file
@ -0,0 +1,28 @@
|
||||
diff --git a/go.mod b/go.mod
|
||||
index 2d396a4..c4fea4b 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,14 +1,19 @@
|
||||
module gitlab.com/WhyNotHugo/darkman
|
||||
|
||||
-go 1.16
|
||||
+go 1.18
|
||||
|
||||
require (
|
||||
github.com/adrg/xdg v0.3.3
|
||||
github.com/godbus/dbus/v5 v5.0.4
|
||||
- github.com/kr/pretty v0.2.0 // indirect
|
||||
github.com/rxwycdh/rxhash v0.0.0-20230131062142-10b7a38b400d
|
||||
github.com/sj14/astral v0.1.2
|
||||
- github.com/spf13/cobra v1.7.0 // indirect
|
||||
- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
|
||||
+ github.com/spf13/cobra v1.7.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
+
|
||||
+require (
|
||||
+ github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||
+ github.com/kr/pretty v0.2.0 // indirect
|
||||
+ github.com/spf13/pflag v1.0.5 // indirect
|
||||
+ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
|
||||
+)
|
12
pkgs/applications/misc/darkman/makefile.patch
Normal file
12
pkgs/applications/misc/darkman/makefile.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 9048e45..0fb1f5a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -26,7 +26,6 @@ site/index.html: darkman.1
|
||||
mandoc -T html -O style=man-style.css < darkman.1 > site/index.html
|
||||
|
||||
install: build
|
||||
- @install -Dm755 darkman ${DESTDIR}${PREFIX}/bin/darkman
|
||||
@install -Dm644 darkman.service ${DESTDIR}${PREFIX}/lib/systemd/user/darkman.service
|
||||
@install -Dm644 darkman.1 ${DESTDIR}${PREFIX}/share/man/man1/darkman.1
|
||||
@install -Dm644 LICENCE ${DESTDIR}${PREFIX}/share/licenses/darkman/LICENCE
|
@ -1,4 +1,4 @@
|
||||
{ lib, haskellPackages, haskell, removeReferencesTo
|
||||
{ lib, stdenv, haskellPackages, haskell
|
||||
# “Plugins” are a fancy way of saying gitit will invoke
|
||||
# GHC at *runtime*, which in turn makes it pull GHC
|
||||
# into its runtime closure. Only enable if you really need
|
||||
@ -7,55 +7,36 @@
|
||||
, pluginSupport ? false
|
||||
}:
|
||||
|
||||
# this is similar to what we do with the pandoc executable
|
||||
|
||||
let
|
||||
plain = haskellPackages.gitit;
|
||||
plugins =
|
||||
if pluginSupport
|
||||
then plain
|
||||
else haskell.lib.compose.disableCabalFlag "plugins" plain;
|
||||
static = haskell.lib.compose.justStaticExecutables plugins;
|
||||
inherit (haskell.lib.compose)
|
||||
enableCabalFlag
|
||||
disableCabalFlag
|
||||
justStaticExecutables
|
||||
overrideCabal
|
||||
;
|
||||
|
||||
base = (if pluginSupport then enableCabalFlag else disableCabalFlag)
|
||||
"plugins"
|
||||
haskellPackages.gitit;
|
||||
|
||||
# Removes erroneous references from dead code that GHC can't eliminate
|
||||
aarch64DarwinFix = overrideCabal (drv:
|
||||
lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) {
|
||||
postInstall = ''
|
||||
${drv.postInstall or ""}
|
||||
remove-references-to -t ${haskellPackages.HTTP} "$out/bin/gitit"
|
||||
remove-references-to -t ${haskellPackages.HTTP} "$out/bin/expireGititCache"
|
||||
remove-references-to -t ${haskellPackages.happstack-server} "$out/bin/gitit"
|
||||
remove-references-to -t ${haskellPackages.hoauth2} "$out/bin/gitit"
|
||||
remove-references-to -t ${haskellPackages.pandoc} "$out/bin/gitit"
|
||||
remove-references-to -t ${haskellPackages.pandoc-types} "$out/bin/gitit"
|
||||
'';
|
||||
});
|
||||
in
|
||||
(haskell.lib.compose.overrideCabal (drv: {
|
||||
buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ];
|
||||
}) static).overrideAttrs (drv: {
|
||||
|
||||
# These libraries are still referenced, because they generate
|
||||
# a `Paths_*` module for figuring out their version.
|
||||
# The `Paths_*` module is generated by Cabal, and contains the
|
||||
# version, but also paths to e.g. the data directories, which
|
||||
# lead to a transitive runtime dependency on the whole GHC distribution.
|
||||
# This should ideally be fixed in haskellPackages (or even Cabal),
|
||||
# but a minimal gitit is important enough to patch it manually.
|
||||
disallowedReferences = [
|
||||
haskellPackages.pandoc-types
|
||||
haskellPackages.HTTP
|
||||
haskellPackages.pandoc
|
||||
haskellPackages.happstack-server
|
||||
haskellPackages.filestore
|
||||
];
|
||||
postInstall = ''
|
||||
remove-references-to \
|
||||
-t ${haskellPackages.pandoc-types} \
|
||||
$out/bin/gitit
|
||||
remove-references-to \
|
||||
-t ${haskellPackages.HTTP} \
|
||||
$out/bin/gitit
|
||||
remove-references-to \
|
||||
-t ${haskellPackages.pandoc} \
|
||||
$out/bin/gitit
|
||||
remove-references-to \
|
||||
-t ${haskellPackages.happstack-server} \
|
||||
$out/bin/gitit
|
||||
remove-references-to \
|
||||
-t ${haskellPackages.filestore} \
|
||||
$out/bin/gitit
|
||||
'';
|
||||
|
||||
meta = drv.meta // {
|
||||
maintainers = drv.meta.maintainers or []
|
||||
++ [ lib.maintainers.Profpatsch ];
|
||||
};
|
||||
})
|
||||
if pluginSupport
|
||||
then base
|
||||
else lib.pipe (base.override { ghc-paths = null; }) [
|
||||
justStaticExecutables
|
||||
aarch64DarwinFix
|
||||
]
|
||||
|
311
pkgs/applications/misc/mission-center/Cargo.lock
generated
311
pkgs/applications/misc/mission-center/Cargo.lock
generated
@ -16,36 +16,30 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.1.2"
|
||||
version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
|
||||
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "allocator-api2"
|
||||
version = "0.2.16"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.80"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
|
||||
checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||
checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.4.2"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
|
||||
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
|
||||
[[package]]
|
||||
name = "block"
|
||||
@ -55,9 +49,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
|
||||
|
||||
[[package]]
|
||||
name = "cairo-rs"
|
||||
version = "0.19.2"
|
||||
version = "0.19.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c"
|
||||
checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-sys-rs",
|
||||
@ -79,15 +73,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.90"
|
||||
version = "1.0.96"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
|
||||
checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-expr"
|
||||
version = "0.15.7"
|
||||
version = "0.15.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d"
|
||||
checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
|
||||
dependencies = [
|
||||
"smallvec",
|
||||
"target-lexicon",
|
||||
@ -223,7 +217,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.52",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -260,9 +254,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gdk-pixbuf-sys"
|
||||
version = "0.19.0"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96"
|
||||
checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f"
|
||||
dependencies = [
|
||||
"gio-sys",
|
||||
"glib-sys",
|
||||
@ -273,9 +267,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gdk4"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b"
|
||||
checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07"
|
||||
dependencies = [
|
||||
"cairo-rs",
|
||||
"gdk-pixbuf",
|
||||
@ -288,9 +282,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gdk4-sys"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626"
|
||||
checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk-pixbuf-sys",
|
||||
@ -305,9 +299,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.12"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
|
||||
checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
@ -336,9 +330,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gio"
|
||||
version = "0.19.2"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02"
|
||||
checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
@ -354,9 +348,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gio-sys"
|
||||
version = "0.19.0"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4"
|
||||
checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
@ -367,9 +361,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "glib"
|
||||
version = "0.19.2"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053"
|
||||
checksum = "be682de2914107f591efdbe2debf05d9ad70726310ee2b6a3802a697649fcc55"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"futures-channel",
|
||||
@ -389,22 +383,22 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "glib-macros"
|
||||
version = "0.19.2"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8"
|
||||
checksum = "6ed782fa3e949c31146671da6e7a227a5e7d354660df1db6d0aac4974dc82a3c"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.52",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glib-sys"
|
||||
version = "0.19.0"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4"
|
||||
checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"system-deps",
|
||||
@ -412,9 +406,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gobject-sys"
|
||||
version = "0.19.0"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979"
|
||||
checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
@ -434,9 +428,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "graphene-sys"
|
||||
version = "0.19.0"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0"
|
||||
checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
@ -446,9 +440,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gsk4"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e"
|
||||
checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be"
|
||||
dependencies = [
|
||||
"cairo-rs",
|
||||
"gdk4",
|
||||
@ -461,9 +455,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gsk4-sys"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738"
|
||||
checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk4-sys",
|
||||
@ -477,9 +471,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gtk4"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83"
|
||||
checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab"
|
||||
dependencies = [
|
||||
"cairo-rs",
|
||||
"field-offset",
|
||||
@ -498,23 +492,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gtk4-macros"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567"
|
||||
checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"proc-macro-crate",
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gtk4-sys"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18"
|
||||
checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk-pixbuf-sys",
|
||||
@ -531,9 +523,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.14.3"
|
||||
version = "0.14.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
|
||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"allocator-api2",
|
||||
@ -550,15 +542,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.4.1"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
||||
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.2.5"
|
||||
version = "2.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
|
||||
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
@ -566,9 +558,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.10"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
|
||||
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
@ -610,9 +602,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.153"
|
||||
version = "0.2.154"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
||||
checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
|
||||
|
||||
[[package]]
|
||||
name = "libdbus-sys"
|
||||
@ -668,22 +660,22 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.1"
|
||||
version = "2.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
|
||||
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.9.0"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
|
||||
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "missioncenter"
|
||||
version = "0.4.5"
|
||||
version = "0.5.1"
|
||||
dependencies = [
|
||||
"dbus",
|
||||
"errno-sys",
|
||||
@ -698,6 +690,7 @@ dependencies = [
|
||||
"rust-ini",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"static_assertions",
|
||||
"textdistance",
|
||||
]
|
||||
|
||||
@ -738,9 +731,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
|
||||
[[package]]
|
||||
name = "ordered-multimap"
|
||||
version = "0.7.1"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f"
|
||||
checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
|
||||
dependencies = [
|
||||
"dlv-list",
|
||||
"hashbrown",
|
||||
@ -748,9 +741,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pango"
|
||||
version = "0.19.2"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d"
|
||||
checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d"
|
||||
dependencies = [
|
||||
"gio",
|
||||
"glib",
|
||||
@ -760,9 +753,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pango-sys"
|
||||
version = "0.19.0"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea"
|
||||
checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
@ -772,9 +765,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.13"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
|
||||
checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
@ -797,53 +790,29 @@ dependencies = [
|
||||
"toml_edit 0.21.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-error"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
||||
dependencies = [
|
||||
"proc-macro-error-attr",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-error-attr"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.78"
|
||||
version = "1.0.81"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
|
||||
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.35"
|
||||
version = "1.0.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
|
||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.10.3"
|
||||
version = "1.10.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
|
||||
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@ -864,9 +833,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.2"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
|
||||
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
|
||||
|
||||
[[package]]
|
||||
name = "rusqlite"
|
||||
@ -916,29 +885,29 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.197"
|
||||
version = "1.0.200"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
|
||||
checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.197"
|
||||
version = "1.0.200"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
|
||||
checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.52",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.114"
|
||||
version = "1.0.116"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
|
||||
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
@ -965,26 +934,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.13.1"
|
||||
version = "1.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
|
||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
||||
|
||||
[[package]]
|
||||
name = "static_assertions"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
version = "2.0.60"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.52"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
|
||||
checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -993,9 +957,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "system-deps"
|
||||
version = "6.2.0"
|
||||
version = "6.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331"
|
||||
checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
|
||||
dependencies = [
|
||||
"cfg-expr",
|
||||
"heck",
|
||||
@ -1012,9 +976,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
|
||||
|
||||
[[package]]
|
||||
name = "temp-dir"
|
||||
version = "0.1.12"
|
||||
version = "0.1.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6"
|
||||
checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
|
||||
|
||||
[[package]]
|
||||
name = "textdistance"
|
||||
@ -1024,22 +988,22 @@ checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b"
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.57"
|
||||
version = "1.0.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
|
||||
checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.57"
|
||||
version = "1.0.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
|
||||
checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.52",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1053,14 +1017,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.8.10"
|
||||
version = "0.8.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
|
||||
checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"toml_edit 0.22.6",
|
||||
"toml_edit 0.22.12",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1085,15 +1049,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.22.6"
|
||||
version = "0.22.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
|
||||
checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"winnow 0.6.5",
|
||||
"winnow 0.6.7",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1116,9 +1080,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
||||
|
||||
[[package]]
|
||||
name = "version-compare"
|
||||
version = "0.1.1"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
|
||||
checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
@ -1165,13 +1129,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
|
||||
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
@ -1180,45 +1145,51 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
|
||||
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
|
||||
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
|
||||
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
|
||||
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
|
||||
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
|
||||
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
|
||||
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
@ -1231,9 +1202,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.6.5"
|
||||
version = "0.6.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
|
||||
checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@ -1255,5 +1226,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.52",
|
||||
"syn",
|
||||
]
|
||||
|
@ -45,13 +45,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mission-center";
|
||||
version = "0.4.5";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mission-center-devs";
|
||||
repo = "mission-center";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e5+uB2vzwRqjUiR+gxpSARHPqG+1iX3yifsfwv5LnZI=";
|
||||
hash = "sha256-I/UkHXDGbKiOcn7R0nQVKcgdvyV4ycgQGNoHA6QMAnw=";
|
||||
};
|
||||
|
||||
cargoDeps = symlinkJoin {
|
||||
@ -136,12 +136,12 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs data/hwdb/generate_hwdb.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Monitor your CPU, Memory, Disk, Network and GPU usage";
|
||||
homepage = "https://gitlab.com/mission-center-devs/mission-center";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "missioncenter";
|
||||
};
|
||||
}
|
||||
|
@ -10,18 +10,18 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.1.2"
|
||||
version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
|
||||
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.80"
|
||||
version = "1.0.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
|
||||
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
@ -31,18 +31,18 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
|
||||
|
||||
[[package]]
|
||||
name = "ash"
|
||||
version = "0.37.3+1.3.251"
|
||||
version = "0.38.0+1.3.281"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
|
||||
checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
|
||||
dependencies = [
|
||||
"libloading",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.21.7"
|
||||
version = "0.22.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
|
||||
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
||||
|
||||
[[package]]
|
||||
name = "bincode"
|
||||
@ -61,9 +61,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.4.2"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
|
||||
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
@ -86,18 +86,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.14.3"
|
||||
version = "1.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
|
||||
checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
|
||||
dependencies = [
|
||||
"bytemuck_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck_derive"
|
||||
version = "1.5.0"
|
||||
version = "1.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
|
||||
checksum = "369cfaf2a5bed5d8f8202073b2e093c9f508251de1551a0deb4253e4c7d80909"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -106,9 +106,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cargo-util"
|
||||
version = "0.2.9"
|
||||
version = "0.2.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "74862c3c6e53a1c1f8f0178f9d38ab41e49746cd3a7cafc239b3d0248fd4e342"
|
||||
checksum = "f6e977de2867ec90a1654882ff95ca5849a526e893bab588f84664cfcdb11c0a"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"core-foundation",
|
||||
@ -116,7 +116,7 @@ dependencies = [
|
||||
"hex",
|
||||
"ignore",
|
||||
"jobserver",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
"miow",
|
||||
"same-file",
|
||||
"sha2",
|
||||
@ -129,9 +129,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.90"
|
||||
version = "1.0.98"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
|
||||
checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
@ -141,9 +141,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "cfg_aliases"
|
||||
version = "0.1.1"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
|
||||
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
||||
|
||||
[[package]]
|
||||
name = "const-random"
|
||||
@ -172,7 +172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
|
||||
dependencies = [
|
||||
"core-foundation-sys",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -187,14 +187,14 @@ version = "0.2.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
|
||||
dependencies = [
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crc32fast"
|
||||
version = "1.4.0"
|
||||
version = "1.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
|
||||
checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
@ -220,9 +220,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.19"
|
||||
version = "0.8.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
|
||||
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
|
||||
|
||||
[[package]]
|
||||
name = "crunchy"
|
||||
@ -246,7 +246,7 @@ version = "0.9.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
|
||||
dependencies = [
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
"libdbus-sys",
|
||||
"winapi",
|
||||
]
|
||||
@ -281,11 +281,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "drm"
|
||||
version = "0.11.1"
|
||||
version = "0.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
|
||||
checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1"
|
||||
dependencies = [
|
||||
"bitflags 2.4.2",
|
||||
"bitflags 2.5.0",
|
||||
"bytemuck",
|
||||
"drm-ffi",
|
||||
"drm-fourcc",
|
||||
@ -294,9 +294,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "drm-ffi"
|
||||
version = "0.7.1"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
|
||||
checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53"
|
||||
dependencies = [
|
||||
"drm-sys",
|
||||
"rustix",
|
||||
@ -310,11 +310,11 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
|
||||
|
||||
[[package]]
|
||||
name = "drm-sys"
|
||||
version = "0.6.1"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
|
||||
checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986"
|
||||
dependencies = [
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
"linux-raw-sys 0.6.4",
|
||||
]
|
||||
|
||||
@ -325,24 +325,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d"
|
||||
dependencies = [
|
||||
"khronos",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.8"
|
||||
name = "either"
|
||||
version = "1.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
|
||||
checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
|
||||
dependencies = [
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "2.0.1"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
|
||||
checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
|
||||
|
||||
[[package]]
|
||||
name = "filetime"
|
||||
@ -351,16 +357,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
"redox_syscall",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.0.28"
|
||||
version = "1.0.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
|
||||
checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
@ -377,7 +383,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gatherer"
|
||||
version = "0.4.5"
|
||||
version = "0.5.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arrayvec",
|
||||
@ -392,28 +398,33 @@ dependencies = [
|
||||
"flate2",
|
||||
"gbm",
|
||||
"lazy_static",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
"libloading",
|
||||
"log",
|
||||
"nix",
|
||||
"pkg-config",
|
||||
"rayon",
|
||||
"rust-ini",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha2",
|
||||
"static_assertions",
|
||||
"tar",
|
||||
"thiserror",
|
||||
"ureq",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gbm"
|
||||
version = "0.14.2"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "313702b30cdeb83ddc72bc14dcee67803cd0ae2d12282ea06e368c25a900c844"
|
||||
checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"bitflags 2.5.0",
|
||||
"drm",
|
||||
"drm-fourcc",
|
||||
"gbm-sys",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -422,7 +433,7 @@ version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58"
|
||||
dependencies = [
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -437,12 +448,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.12"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
|
||||
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
@ -461,9 +472,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.14.3"
|
||||
version = "0.14.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
|
||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
||||
|
||||
[[package]]
|
||||
name = "hex"
|
||||
@ -499,17 +510,17 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.10"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
|
||||
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
|
||||
|
||||
[[package]]
|
||||
name = "jobserver"
|
||||
version = "0.1.28"
|
||||
version = "0.1.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
|
||||
checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
|
||||
dependencies = [
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -535,9 +546,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.153"
|
||||
version = "0.2.155"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
||||
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
|
||||
|
||||
[[package]]
|
||||
name = "libdbus-sys"
|
||||
@ -545,24 +556,25 @@ version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
version = "0.7.4"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
|
||||
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"winapi",
|
||||
"windows-targets 0.52.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.13"
|
||||
version = "0.4.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
|
||||
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
@ -578,15 +590,15 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.1"
|
||||
version = "2.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
|
||||
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.7.2"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
|
||||
checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
|
||||
dependencies = [
|
||||
"adler",
|
||||
]
|
||||
@ -602,14 +614,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
|
||||
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
|
||||
dependencies = [
|
||||
"bitflags 2.4.2",
|
||||
"bitflags 2.5.0",
|
||||
"cfg-if",
|
||||
"cfg_aliases",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -620,9 +632,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
|
||||
[[package]]
|
||||
name = "ordered-multimap"
|
||||
version = "0.7.1"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f"
|
||||
checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
|
||||
dependencies = [
|
||||
"dlv-list",
|
||||
"hashbrown",
|
||||
@ -636,9 +648,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.13"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
|
||||
checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
@ -648,22 +660,42 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.78"
|
||||
version = "1.0.83"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
|
||||
checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.35"
|
||||
version = "1.0.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
|
||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rayon"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
|
||||
dependencies = [
|
||||
"either",
|
||||
"rayon-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rayon-core"
|
||||
version = "1.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
|
||||
dependencies = [
|
||||
"crossbeam-deque",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.4.1"
|
||||
@ -686,9 +718,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.2"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
|
||||
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
|
||||
|
||||
[[package]]
|
||||
name = "ring"
|
||||
@ -699,7 +731,7 @@ dependencies = [
|
||||
"cc",
|
||||
"cfg-if",
|
||||
"getrandom",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
"spin",
|
||||
"untrusted",
|
||||
"windows-sys 0.52.0",
|
||||
@ -718,22 +750,22 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.31"
|
||||
version = "0.38.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
|
||||
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
|
||||
dependencies = [
|
||||
"bitflags 2.4.2",
|
||||
"bitflags 2.5.0",
|
||||
"errno",
|
||||
"libc 0.2.153",
|
||||
"linux-raw-sys 0.4.13",
|
||||
"libc 0.2.155",
|
||||
"linux-raw-sys 0.4.14",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustls"
|
||||
version = "0.22.2"
|
||||
version = "0.22.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
|
||||
checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
|
||||
dependencies = [
|
||||
"log",
|
||||
"ring",
|
||||
@ -745,15 +777,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustls-pki-types"
|
||||
version = "1.3.1"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8"
|
||||
checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
|
||||
|
||||
[[package]]
|
||||
name = "rustls-webpki"
|
||||
version = "0.102.2"
|
||||
version = "0.102.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
|
||||
checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
|
||||
dependencies = [
|
||||
"ring",
|
||||
"rustls-pki-types",
|
||||
@ -762,9 +794,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.17"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
|
||||
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
@ -777,18 +809,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.197"
|
||||
version = "1.0.202"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
|
||||
checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.197"
|
||||
version = "1.0.202"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
|
||||
checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -797,9 +829,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.114"
|
||||
version = "1.0.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
|
||||
checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
@ -829,6 +861,12 @@ version = "0.9.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
|
||||
|
||||
[[package]]
|
||||
name = "static_assertions"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||
|
||||
[[package]]
|
||||
name = "subtle"
|
||||
version = "2.5.0"
|
||||
@ -837,9 +875,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.52"
|
||||
version = "2.0.66"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
|
||||
checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -853,7 +891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
|
||||
dependencies = [
|
||||
"filetime",
|
||||
"libc 0.2.153",
|
||||
"libc 0.2.155",
|
||||
"xattr",
|
||||
]
|
||||
|
||||
@ -869,6 +907,26 @@ dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.61"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.61"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tiny-keccak"
|
||||
version = "2.0.2"
|
||||
@ -965,9 +1023,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
|
||||
|
||||
[[package]]
|
||||
name = "ureq"
|
||||
version = "2.9.6"
|
||||
version = "2.9.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35"
|
||||
checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"flate2",
|
||||
@ -1040,11 +1098,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.6"
|
||||
version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
|
||||
checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1068,7 +1126,7 @@ version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.4",
|
||||
"windows-targets 0.52.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1088,17 +1146,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
|
||||
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm 0.52.4",
|
||||
"windows_aarch64_msvc 0.52.4",
|
||||
"windows_i686_gnu 0.52.4",
|
||||
"windows_i686_msvc 0.52.4",
|
||||
"windows_x86_64_gnu 0.52.4",
|
||||
"windows_x86_64_gnullvm 0.52.4",
|
||||
"windows_x86_64_msvc 0.52.4",
|
||||
"windows_aarch64_gnullvm 0.52.5",
|
||||
"windows_aarch64_msvc 0.52.5",
|
||||
"windows_i686_gnu 0.52.5",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc 0.52.5",
|
||||
"windows_x86_64_gnu 0.52.5",
|
||||
"windows_x86_64_gnullvm 0.52.5",
|
||||
"windows_x86_64_msvc 0.52.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1109,9 +1168,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
|
||||
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
@ -1121,9 +1180,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
|
||||
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
@ -1133,9 +1192,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
|
||||
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
@ -1145,9 +1210,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
|
||||
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
@ -1157,9 +1222,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
|
||||
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
@ -1169,9 +1234,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
|
||||
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
@ -1181,9 +1246,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
|
||||
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
||||
|
||||
[[package]]
|
||||
name = "xattr"
|
||||
@ -1191,8 +1256,8 @@ version = "1.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
|
||||
dependencies = [
|
||||
"libc 0.2.153",
|
||||
"linux-raw-sys 0.4.13",
|
||||
"libc 0.2.155",
|
||||
"linux-raw-sys 0.4.14",
|
||||
"rustix",
|
||||
]
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.5.12";
|
||||
version = "1.6.3";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
@ -25,7 +25,7 @@ let
|
||||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
hash = if stdenv.isDarwin then "sha256-MSJmF5WddxbC/S7w2nWjlDxt5HPUDCoRFwJ2MZMH9Ks=" else "sha256-UQLljP7eZELTuHwX+OylXY+Wy2YK1ZEJX1IQfIvBLe8=";
|
||||
hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-Eq2cUXjp0XdVeR4t3oG2DUtsKOp3e3nPMMhznUc4BmE=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
@ -1,49 +1,49 @@
|
||||
{ stdenv, buildGoModule, fetchFromGitHub, lib, installShellFiles }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub, lib, nix-update-script, go }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jx";
|
||||
version = "2.1.155";
|
||||
version = "3.10.146";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jenkins-x";
|
||||
repo = "jx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kwcmZSOA26XuSgNSHitGaMohalnLobabXf4z3ybSJtk=";
|
||||
sha256 = "sha256-cbf/prSKHiu4I6w08j/HLD8c7Lrgt3eTC5QRVvuhS5w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZtcCBXcJXX9ThzY6T0MhNfDDzRC9PYzRB1VyS4LLXLs=";
|
||||
vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14=";
|
||||
|
||||
doCheck = false;
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
subPackages = [ "cmd/jx" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
"-X github.com/jenkins-x/jx/pkg/version.Version=${version}"
|
||||
"-X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev}"
|
||||
"-X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean"
|
||||
"-s"
|
||||
"-X github.com/jenkins-x/jx/pkg/cmd/version.Version=${version}"
|
||||
"-X github.com/jenkins-x/jx/pkg/cmd/version.Revision=${src.rev}"
|
||||
"-X github.com/jenkins-x/jx/pkg/cmd/version.GoVersion=${go.version}"
|
||||
"-X github.com/jenkins-x/jx/pkg/cmd/version.GitTreeState=clean"
|
||||
"-X github.com/jenkins-x/jx/pkg/cmd/version.BuildDate=''"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash zsh; do
|
||||
$out/bin/jx completion $shell > jx.$shell
|
||||
installShellCompletion jx.$shell
|
||||
done
|
||||
mv $out/bin/cmd $out/bin/jx
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Command line tool for installing and using Jenkins X";
|
||||
mainProgram = "jx";
|
||||
homepage = "https://jenkins-x.io";
|
||||
changelog = "https://github.com/jenkins-x/jx/releases/tag/v${version}";
|
||||
longDescription = ''
|
||||
Jenkins X provides automated CI+CD for Kubernetes with Preview
|
||||
Environments on Pull Requests using Jenkins, Knative Build, Prow,
|
||||
Skaffold and Helm.
|
||||
Environments on Pull Requests using using Cloud Native pipelines
|
||||
from Tekton.
|
||||
'';
|
||||
license = licenses.asl20 ;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kalbasit ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-gadget";
|
||||
version = "0.28.1";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inspektor-gadget";
|
||||
repo = "inspektor-gadget";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+eysHATyAdCN6HVPN2bgc/ICo+XXaef0H0UDW2xCcjc=";
|
||||
hash = "sha256-5lXM7SuQvjQYWWbtRVJrdYBRbHFs1Ha9hQLDweaTKQ4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0XByai7fEnkmEEkH1koVM1+z3UNFLbsUCK3sP4KBe+A=";
|
||||
vendorHash = "sha256-Fc3WLeEqH2CK6b4jWqcxCBYl2ST6scjjNA1/Rl3Go1o=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "7.10.0-beta.1";
|
||||
version = "7.12.0-beta.2";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-8S7O5v514OjUgXRuYvqOf83377RefZrFrQD2MbLm0QA=";
|
||||
hash = "sha256-Hpg9pkRXbwF5uKhLzn1cfHTzlYmsZd5tndtwVFcL7iU=";
|
||||
}
|
||||
|
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haruna";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "multimedia";
|
||||
repo = "haruna";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m4u1V+vp4wOSqRbdbxgxDNgC28biiB3A6w1pSfuczHs=";
|
||||
hash = "sha256-PjELW0evn53gIbScrM2bYEpb9U/TE/lOCD2DiJ1aodo=";
|
||||
domain = "invent.kde.org";
|
||||
};
|
||||
|
||||
|
29
pkgs/applications/video/mpv/0001-fix-darwin-build.patch
Normal file
29
pkgs/applications/video/mpv/0001-fix-darwin-build.patch
Normal file
@ -0,0 +1,29 @@
|
||||
--- a/osdep/mac/input_helper.swift
|
||||
+++ b/osdep/mac/input_helper.swift
|
||||
@@ -18,6 +18,14 @@
|
||||
import Cocoa
|
||||
import Carbon.HIToolbox
|
||||
|
||||
+extension NSCondition {
|
||||
+ fileprivate func withLock<T>(_ body: () throws -> T) rethrows -> T {
|
||||
+ self.lock()
|
||||
+ defer { self.unlock() }
|
||||
+ return try body()
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
class InputHelper: NSObject {
|
||||
var option: OptionHelper?
|
||||
var lock = NSCondition()
|
||||
--- a/audio/out/ao_avfoundation.m
|
||||
+++ b/audio/out/ao_avfoundation.m
|
||||
@@ -312,7 +312,8 @@
|
||||
|
||||
+ #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000
|
||||
p->observer = [[AVObserver alloc] initWithAO:ao];
|
||||
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
|
||||
[center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererOutputConfigurationDidChangeNotification object:p->renderer];
|
||||
[center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererWasFlushedAutomaticallyNotification object:p->renderer];
|
||||
-
|
||||
+ #endif
|
||||
return CONTROL_OK;
|
@ -1,13 +0,0 @@
|
||||
diff --git a/TOOLS/osxbundle.py b/TOOLS/osxbundle.py
|
||||
index 98699e478b..d02ecf610e 100755
|
||||
--- a/TOOLS/osxbundle.py
|
||||
+++ b/TOOLS/osxbundle.py
|
||||
@@ -39,7 +39,7 @@ def apply_plist_template(plist_file, version):
|
||||
print(line.rstrip().replace('${VERSION}', version))
|
||||
|
||||
def sign_bundle(binary_name):
|
||||
- sh('codesign --force --deep -s - ' + bundle_path(binary_name))
|
||||
+ sh('rcodesign sign ' + bundle_path(binary_name))
|
||||
|
||||
def bundle_version():
|
||||
if os.path.exists('VERSION'):
|
@ -1,132 +1,177 @@
|
||||
{ lib
|
||||
, config
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, addOpenGLRunpath
|
||||
, bash
|
||||
, docutils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, ffmpeg
|
||||
, freefont_ttf
|
||||
, freetype
|
||||
, libass
|
||||
, libpthreadstubs
|
||||
, nv-codec-headers-11
|
||||
, lua
|
||||
, libuchardet
|
||||
, libiconv
|
||||
, xcbuild
|
||||
, rcodesign
|
||||
{
|
||||
lib,
|
||||
SDL2,
|
||||
addOpenGLRunpath,
|
||||
alsa-lib,
|
||||
bash,
|
||||
buildPackages,
|
||||
callPackage,
|
||||
config,
|
||||
darwin,
|
||||
docutils,
|
||||
fetchFromGitHub,
|
||||
ffmpeg,
|
||||
freefont_ttf,
|
||||
freetype,
|
||||
lcms2,
|
||||
libGL,
|
||||
libGLU,
|
||||
libX11,
|
||||
libXScrnSaver,
|
||||
libXext,
|
||||
libXinerama,
|
||||
libXpresent,
|
||||
libXrandr,
|
||||
libXv,
|
||||
libXxf86vm,
|
||||
libarchive,
|
||||
libass,
|
||||
libbluray,
|
||||
libbs2b,
|
||||
libcaca,
|
||||
libcdio,
|
||||
libcdio-paranoia,
|
||||
libdrm,
|
||||
libdvdnav,
|
||||
libiconv,
|
||||
libjack2,
|
||||
libplacebo,
|
||||
libpng,
|
||||
libpthreadstubs,
|
||||
libpulseaudio,
|
||||
libsixel,
|
||||
libtheora,
|
||||
libuchardet,
|
||||
libva,
|
||||
libvdpau,
|
||||
libxkbcommon,
|
||||
lua,
|
||||
mesa,
|
||||
meson,
|
||||
mujs,
|
||||
ninja,
|
||||
nv-codec-headers-11,
|
||||
openalSoft,
|
||||
pipewire,
|
||||
pkg-config,
|
||||
python3,
|
||||
rubberband,
|
||||
shaderc, # instead of spirv-cross
|
||||
speex,
|
||||
stdenv,
|
||||
swift,
|
||||
vapoursynth,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
xcbuild,
|
||||
zimg,
|
||||
|
||||
, waylandSupport ? stdenv.isLinux
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, libxkbcommon
|
||||
|
||||
, x11Support ? stdenv.isLinux
|
||||
, libGLU, libGL
|
||||
, libX11
|
||||
, libXext
|
||||
, libXxf86vm
|
||||
, libXrandr
|
||||
, libXpresent
|
||||
|
||||
, cddaSupport ? false
|
||||
, libcdio
|
||||
, libcdio-paranoia
|
||||
|
||||
, vulkanSupport ? stdenv.isLinux
|
||||
, libplacebo
|
||||
, shaderc # instead of spirv-cross
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
|
||||
, drmSupport ? stdenv.isLinux
|
||||
, libdrm
|
||||
, mesa
|
||||
|
||||
, alsaSupport ? stdenv.isLinux, alsa-lib
|
||||
, archiveSupport ? true, libarchive
|
||||
, bluraySupport ? true, libbluray
|
||||
, bs2bSupport ? true, libbs2b
|
||||
, cacaSupport ? true, libcaca
|
||||
, cmsSupport ? true, lcms2
|
||||
, dvdnavSupport ? stdenv.isLinux, libdvdnav
|
||||
, dvbinSupport ? stdenv.isLinux
|
||||
, jackaudioSupport ? false, libjack2
|
||||
, javascriptSupport ? true, mujs
|
||||
, libpngSupport ? true, libpng
|
||||
, openalSupport ? true, openalSoft
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
|
||||
, pipewireSupport ? stdenv.isLinux, pipewire
|
||||
, rubberbandSupport ? true, rubberband
|
||||
, screenSaverSupport ? true, libXScrnSaver
|
||||
, sdl2Support ? true, SDL2
|
||||
, sixelSupport ? false, libsixel
|
||||
, speexSupport ? true, speex
|
||||
, swiftSupport ? stdenv.isDarwin, swift
|
||||
, theoraSupport ? true, libtheora
|
||||
, vaapiSupport ? x11Support || waylandSupport, libva
|
||||
, vapoursynthSupport ? false, vapoursynth
|
||||
, vdpauSupport ? true, libvdpau
|
||||
, xineramaSupport ? stdenv.isLinux, libXinerama
|
||||
, xvSupport ? stdenv.isLinux, libXv
|
||||
, zimgSupport ? true, zimg
|
||||
, darwin
|
||||
# Boolean
|
||||
alsaSupport ? stdenv.isLinux,
|
||||
archiveSupport ? true,
|
||||
bluraySupport ? true,
|
||||
bs2bSupport ? true,
|
||||
cacaSupport ? true,
|
||||
cddaSupport ? false,
|
||||
cmsSupport ? true,
|
||||
drmSupport ? stdenv.isLinux,
|
||||
dvbinSupport ? stdenv.isLinux,
|
||||
dvdnavSupport ? stdenv.isLinux,
|
||||
jackaudioSupport ? false,
|
||||
javascriptSupport ? true,
|
||||
libpngSupport ? true,
|
||||
openalSupport ? true,
|
||||
pipewireSupport ? stdenv.isLinux,
|
||||
pulseSupport ? config.pulseaudio or stdenv.isLinux,
|
||||
rubberbandSupport ? true,
|
||||
screenSaverSupport ? true,
|
||||
sdl2Support ? !stdenv.isDarwin,
|
||||
sixelSupport ? false,
|
||||
speexSupport ? true,
|
||||
swiftSupport ? stdenv.isDarwin,
|
||||
theoraSupport ? true,
|
||||
vaapiSupport ? x11Support || waylandSupport,
|
||||
vapoursynthSupport ? false,
|
||||
vdpauSupport ? true,
|
||||
vulkanSupport ? stdenv.isLinux,
|
||||
waylandSupport ? stdenv.isLinux,
|
||||
x11Support ? stdenv.isLinux,
|
||||
xineramaSupport ? stdenv.isLinux,
|
||||
xvSupport ? stdenv.isLinux,
|
||||
zimgSupport ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk_11_0.frameworks)
|
||||
AVFoundation Accelerate Cocoa CoreAudio CoreFoundation CoreMedia
|
||||
MediaPlayer VideoToolbox;
|
||||
AVFoundation
|
||||
Accelerate
|
||||
Cocoa
|
||||
CoreAudio
|
||||
CoreFoundation
|
||||
CoreMedia
|
||||
MediaPlayer
|
||||
VideoToolbox
|
||||
;
|
||||
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
|
||||
|
||||
overrideSDK = platform: version:
|
||||
platform // lib.optionalAttrs (platform ? darwinMinVersion) {
|
||||
overrideSDK =
|
||||
platform: version:
|
||||
platform
|
||||
// lib.optionalAttrs (platform ? darwinMinVersion) {
|
||||
darwinMinVersion = version;
|
||||
};
|
||||
|
||||
stdenv' = if swiftSupport && stdenv.isDarwin && stdenv.isx86_64
|
||||
then stdenv.override (old: {
|
||||
buildPlatform = overrideSDK old.buildPlatform "10.15";
|
||||
hostPlatform = overrideSDK old.hostPlatform "10.15";
|
||||
targetPlatform = overrideSDK old.targetPlatform "10.15";
|
||||
})
|
||||
else stdenv;
|
||||
in stdenv'.mkDerivation (finalAttrs: {
|
||||
stdenv' =
|
||||
if swiftSupport && stdenv.isDarwin && stdenv.isx86_64 then
|
||||
stdenv.override (old: {
|
||||
buildPlatform = overrideSDK old.buildPlatform "10.15";
|
||||
hostPlatform = overrideSDK old.hostPlatform "10.15";
|
||||
targetPlatform = overrideSDK old.targetPlatform "10.15";
|
||||
})
|
||||
else
|
||||
stdenv;
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "mpv";
|
||||
version = "0.37.0";
|
||||
version = "0.38.0";
|
||||
|
||||
outputs = [ "out" "dev" "doc" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
"man"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpv-player";
|
||||
repo = "mpv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-izAz9Iiam7tJAWIQkmn2cKOfoaog8oPKq4sOUtp1nvU=";
|
||||
hash = "sha256-dFajnCpGlNqUv33A8eFEn8kjtzIPkcBY5j0gNVlaiIY=";
|
||||
};
|
||||
|
||||
patches = [ ./darwin-sigtool-no-deep.patch ];
|
||||
patches = [
|
||||
# Fix build with Darwin SDK 11
|
||||
./0001-fix-darwin-build.patch
|
||||
];
|
||||
|
||||
postPatch = lib.concatStringsSep "\n" [
|
||||
# Don't reference compile time dependencies or create a build outputs cycle
|
||||
# between out and dev
|
||||
''
|
||||
substituteInPlace meson.build \
|
||||
--replace-fail "conf_data.set_quoted('CONFIGURATION', configuration)" \
|
||||
"conf_data.set_quoted('CONFIGURATION', '<ommited>')"
|
||||
substituteInPlace meson.build \
|
||||
--replace-fail "conf_data.set_quoted('CONFIGURATION', configuration)" \
|
||||
"conf_data.set_quoted('CONFIGURATION', '<ommited>')"
|
||||
''
|
||||
# A trick to patchShebang everything except mpv_identify.sh
|
||||
''
|
||||
pushd TOOLS
|
||||
mv mpv_identify.sh mpv_identify
|
||||
patchShebangs *.py *.sh
|
||||
mv mpv_identify mpv_identify.sh
|
||||
popd
|
||||
pushd TOOLS
|
||||
mv mpv_identify.sh mpv_identify
|
||||
patchShebangs *.py *.sh
|
||||
mv mpv_identify mpv_identify.sh
|
||||
popd
|
||||
''
|
||||
];
|
||||
|
||||
@ -135,81 +180,124 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
export SWIFT_LIB_DYNAMIC="${lib.getLib swift.swift}/lib/swift/macosx"
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "default_library" "shared")
|
||||
(lib.mesonBool "libmpv" true)
|
||||
(lib.mesonEnable "libarchive" archiveSupport)
|
||||
(lib.mesonEnable "manpage-build" true)
|
||||
(lib.mesonEnable "cdda" cddaSupport)
|
||||
(lib.mesonEnable "dvbin" dvbinSupport)
|
||||
(lib.mesonEnable "dvdnav" dvdnavSupport)
|
||||
(lib.mesonEnable "openal" openalSupport)
|
||||
(lib.mesonEnable "sdl2" sdl2Support)
|
||||
# Disable whilst Swift isn't supported
|
||||
(lib.mesonEnable "swift-build" swiftSupport)
|
||||
(lib.mesonEnable "macos-cocoa-cb" swiftSupport)
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Toggle explicitly because it fails on darwin
|
||||
(lib.mesonEnable "videotoolbox-pl" vulkanSupport)
|
||||
];
|
||||
mesonFlags =
|
||||
[
|
||||
(lib.mesonOption "default_library" "shared")
|
||||
(lib.mesonBool "libmpv" true)
|
||||
(lib.mesonEnable "libarchive" archiveSupport)
|
||||
(lib.mesonEnable "manpage-build" true)
|
||||
(lib.mesonEnable "cdda" cddaSupport)
|
||||
(lib.mesonEnable "dvbin" dvbinSupport)
|
||||
(lib.mesonEnable "dvdnav" dvdnavSupport)
|
||||
(lib.mesonEnable "openal" openalSupport)
|
||||
(lib.mesonEnable "sdl2" sdl2Support)
|
||||
# Disable whilst Swift isn't supported
|
||||
(lib.mesonEnable "swift-build" swiftSupport)
|
||||
(lib.mesonEnable "macos-cocoa-cb" swiftSupport)
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
# Toggle explicitly because it fails on darwin
|
||||
(lib.mesonEnable "videotoolbox-pl" vulkanSupport)
|
||||
];
|
||||
|
||||
mesonAutoFeatures = "auto";
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
docutils # for rst2man
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun rcodesign ]
|
||||
++ lib.optionals swiftSupport [ swift ]
|
||||
++ lib.optionals waylandSupport [ wayland-scanner ];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
addOpenGLRunpath
|
||||
docutils # for rst2man
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
buildPackages.darwin.sigtool
|
||||
xcbuild.xcrun
|
||||
]
|
||||
++ lib.optionals swiftSupport [ swift ]
|
||||
++ lib.optionals waylandSupport [ wayland-scanner ];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
ffmpeg
|
||||
freetype
|
||||
libass
|
||||
libplacebo
|
||||
libpthreadstubs
|
||||
libuchardet
|
||||
luaEnv
|
||||
python3
|
||||
] ++ lib.optionals alsaSupport [ alsa-lib ]
|
||||
++ lib.optionals archiveSupport [ libarchive ]
|
||||
++ lib.optionals bluraySupport [ libbluray ]
|
||||
++ lib.optionals bs2bSupport [ libbs2b ]
|
||||
++ lib.optionals cacaSupport [ libcaca ]
|
||||
++ lib.optionals cddaSupport [ libcdio libcdio-paranoia ]
|
||||
++ lib.optionals cmsSupport [ lcms2 ]
|
||||
++ lib.optionals drmSupport [ libdrm mesa ]
|
||||
++ lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
|
||||
++ lib.optionals jackaudioSupport [ libjack2 ]
|
||||
++ lib.optionals javascriptSupport [ mujs ]
|
||||
++ lib.optionals libpngSupport [ libpng ]
|
||||
++ lib.optionals openalSupport [ openalSoft ]
|
||||
++ lib.optionals pipewireSupport [ pipewire ]
|
||||
++ lib.optionals pulseSupport [ libpulseaudio ]
|
||||
++ lib.optionals rubberbandSupport [ rubberband ]
|
||||
buildInputs =
|
||||
[
|
||||
bash
|
||||
ffmpeg
|
||||
freetype
|
||||
libass
|
||||
libplacebo
|
||||
libpthreadstubs
|
||||
libuchardet
|
||||
luaEnv
|
||||
python3
|
||||
]
|
||||
++ lib.optionals alsaSupport [ alsa-lib ]
|
||||
++ lib.optionals archiveSupport [ libarchive ]
|
||||
++ lib.optionals bluraySupport [ libbluray ]
|
||||
++ lib.optionals bs2bSupport [ libbs2b ]
|
||||
++ lib.optionals cacaSupport [ libcaca ]
|
||||
++ lib.optionals cddaSupport [
|
||||
libcdio
|
||||
libcdio-paranoia
|
||||
]
|
||||
++ lib.optionals cmsSupport [ lcms2 ]
|
||||
++ lib.optionals drmSupport [
|
||||
libdrm
|
||||
mesa
|
||||
]
|
||||
++ lib.optionals dvdnavSupport [
|
||||
libdvdnav
|
||||
libdvdnav.libdvdread
|
||||
]
|
||||
++ lib.optionals jackaudioSupport [ libjack2 ]
|
||||
++ lib.optionals javascriptSupport [ mujs ]
|
||||
++ lib.optionals libpngSupport [ libpng ]
|
||||
++ lib.optionals openalSupport [ openalSoft ]
|
||||
++ lib.optionals pipewireSupport [ pipewire ]
|
||||
++ lib.optionals pulseSupport [ libpulseaudio ]
|
||||
++ lib.optionals rubberbandSupport [ rubberband ]
|
||||
++ lib.optionals screenSaverSupport [ libXScrnSaver ]
|
||||
++ lib.optionals sdl2Support [ SDL2 ]
|
||||
++ lib.optionals sixelSupport [ libsixel ]
|
||||
++ lib.optionals speexSupport [ speex ]
|
||||
++ lib.optionals theoraSupport [ libtheora ]
|
||||
++ lib.optionals vaapiSupport [ libva ]
|
||||
++ lib.optionals sdl2Support [ SDL2 ]
|
||||
++ lib.optionals sixelSupport [ libsixel ]
|
||||
++ lib.optionals speexSupport [ speex ]
|
||||
++ lib.optionals theoraSupport [ libtheora ]
|
||||
++ lib.optionals vaapiSupport [ libva ]
|
||||
++ lib.optionals vapoursynthSupport [ vapoursynth ]
|
||||
++ lib.optionals vdpauSupport [ libvdpau ]
|
||||
++ lib.optionals vulkanSupport [ shaderc vulkan-headers vulkan-loader ]
|
||||
++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
|
||||
++ lib.optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr libXpresent ]
|
||||
++ lib.optionals xineramaSupport [ libXinerama ]
|
||||
++ lib.optionals xvSupport [ libXv ]
|
||||
++ lib.optionals zimgSupport [ zimg ]
|
||||
++ lib.optionals stdenv.isLinux [ nv-codec-headers-11 ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ]
|
||||
++ lib.optionals stdenv.isDarwin [ Accelerate CoreFoundation Cocoa CoreAudio MediaPlayer VideoToolbox ]
|
||||
++ lib.optionals (stdenv.isDarwin && swiftSupport) [ AVFoundation CoreMedia ];
|
||||
++ lib.optionals vdpauSupport [ libvdpau ]
|
||||
++ lib.optionals vulkanSupport [
|
||||
shaderc
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
]
|
||||
++ lib.optionals waylandSupport [
|
||||
wayland
|
||||
wayland-protocols
|
||||
libxkbcommon
|
||||
]
|
||||
++ lib.optionals x11Support [
|
||||
libX11
|
||||
libXext
|
||||
libGLU
|
||||
libGL
|
||||
libXxf86vm
|
||||
libXrandr
|
||||
libXpresent
|
||||
]
|
||||
++ lib.optionals xineramaSupport [ libXinerama ]
|
||||
++ lib.optionals xvSupport [ libXv ]
|
||||
++ lib.optionals zimgSupport [ zimg ]
|
||||
++ lib.optionals stdenv.isLinux [ nv-codec-headers-11 ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
Accelerate
|
||||
CoreFoundation
|
||||
Cocoa
|
||||
CoreAudio
|
||||
MediaPlayer
|
||||
VideoToolbox
|
||||
]
|
||||
++ lib.optionals (stdenv.isDarwin && swiftSupport) [
|
||||
AVFoundation
|
||||
CoreMedia
|
||||
];
|
||||
|
||||
postBuild = lib.optionalString stdenv.isDarwin ''
|
||||
pushd .. # Must be run from the source dir because it uses relative paths
|
||||
@ -217,27 +305,29 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
popd
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Use a standard font
|
||||
mkdir -p $out/share/mpv
|
||||
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
|
||||
postInstall =
|
||||
''
|
||||
# Use a standard font
|
||||
mkdir -p $out/share/mpv
|
||||
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
|
||||
|
||||
pushd ../TOOLS
|
||||
cp mpv_identify.sh umpv $out/bin/
|
||||
popd
|
||||
pushd $out/share/applications
|
||||
pushd ../TOOLS
|
||||
cp mpv_identify.sh umpv $out/bin/
|
||||
popd
|
||||
pushd $out/share/applications
|
||||
|
||||
# patch out smb protocol reference, since our ffmpeg can't handle it
|
||||
substituteInPlace mpv.desktop --replace-fail "smb," ""
|
||||
# patch out smb protocol reference, since our ffmpeg can't handle it
|
||||
substituteInPlace mpv.desktop --replace-fail "smb," ""
|
||||
|
||||
sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \
|
||||
mpv.desktop > umpv.desktop
|
||||
printf "NoDisplay=true\n" >> umpv.desktop
|
||||
popd
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r mpv.app $out/Applications
|
||||
'';
|
||||
sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \
|
||||
mpv.desktop > umpv.desktop
|
||||
printf "NoDisplay=true\n" >> umpv.desktop
|
||||
popd
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r mpv.app $out/Applications
|
||||
'';
|
||||
|
||||
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
|
||||
# See the explanation in addOpenGLRunpath.
|
||||
@ -248,16 +338,19 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
inherit
|
||||
# The wrapper consults luaEnv and lua.version
|
||||
luaEnv
|
||||
lua
|
||||
# In the wrapper, we want to reference vapoursynth which has the `python3`
|
||||
# passthru attribute (which has the `sitePrefix` attribute). This way we'll
|
||||
# be sure that in the wrapper we'll use the same python3.sitePrefix used to
|
||||
# build vapoursynth.
|
||||
vapoursynthSupport
|
||||
vapoursynth
|
||||
;
|
||||
# The wrapper consults luaEnv and lua.version
|
||||
luaEnv
|
||||
lua
|
||||
# In the wrapper, we want to reference vapoursynth which has the `python3`
|
||||
# passthru attribute (which has the `sitePrefix` attribute). This way we'll
|
||||
# be sure that in the wrapper we'll use the same python3.sitePrefix used to
|
||||
# build vapoursynth.
|
||||
vapoursynthSupport
|
||||
vapoursynth
|
||||
;
|
||||
|
||||
wrapper = callPackage ./wrapper.nix { };
|
||||
scripts = callPackage ./scripts { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -271,7 +364,11 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "mpv";
|
||||
maintainers = with lib.maintainers; [
|
||||
AndersonTorres fpletz globin ma27 tadeokondrak
|
||||
AndersonTorres
|
||||
fpletz
|
||||
globin
|
||||
ma27
|
||||
tadeokondrak
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
@ -7,21 +7,23 @@
|
||||
, symlinkJoin
|
||||
, writeTextDir
|
||||
, yt-dlp
|
||||
# the unwrapped mpv derivation
|
||||
, mpv
|
||||
}:
|
||||
|
||||
# the unwrapped mpv derivation - 1st argument to `wrapMpv`
|
||||
mpv:
|
||||
|
||||
let
|
||||
# arguments to the function (exposed as `wrapMpv` in all-packages.nix)
|
||||
# arguments to the function (exposed as `mpv-unwrapped.wrapper` in top-level)
|
||||
wrapper = {
|
||||
mpv,
|
||||
extraMakeWrapperArgs ? [],
|
||||
youtubeSupport ? true,
|
||||
# a set of derivations (probably from `mpvScripts`) where each is
|
||||
# expected to have a `scriptName` passthru attribute that points to the
|
||||
# name of the script that would reside in the script's derivation's
|
||||
# a set of derivations (probably from `mpvScripts`) where each is expected
|
||||
# to have a `scriptName` passthru attribute that points to the name of the
|
||||
# script that would reside in the script's derivation's
|
||||
# `$out/share/mpv/scripts/`.
|
||||
# A script can optionally also provide an `extraWrapperArgs` passthru attribute.
|
||||
#
|
||||
# A script can optionally also provide `passthru.extraWrapperArgs`
|
||||
# attribute.
|
||||
scripts ? [],
|
||||
extraUmpvWrapperArgs ? []
|
||||
}:
|
||||
|
@ -42,13 +42,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ssm-agent";
|
||||
version = "3.3.131.0";
|
||||
version = "3.3.484.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-ssm-agent";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fYFY5HQcArSDdh1qtIo4OzeLt+mIlbwlSr4O1py3MAk=";
|
||||
hash = "sha256-zWjV56xw4eVHKx3J2DDq6b+RYjU0EL9ShQmb72SVBVk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@ -166,6 +166,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/aws/amazon-ssm-agent";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ copumpkin manveru anthonyroussel ];
|
||||
maintainers = with maintainers; [ copumpkin manveru anthonyroussel arianvp ];
|
||||
};
|
||||
}
|
||||
|
@ -7,6 +7,7 @@
|
||||
llvmPackages,
|
||||
python3,
|
||||
stdenv,
|
||||
testers,
|
||||
zlib,
|
||||
# Boolean flags
|
||||
withHTML ? true,
|
||||
@ -30,7 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
(lib.getDev llvm)
|
||||
]
|
||||
++ lib.optionals (withManual || withHTML) [
|
||||
sphinx
|
||||
@ -39,32 +39,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
libffi
|
||||
libxml2
|
||||
llvm
|
||||
zlib
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
libclang
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" "${lib.getDev libclang}")
|
||||
(lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR"
|
||||
"${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}")
|
||||
|
||||
(lib.cmakeBool "SPHINX_HTML" withHTML)
|
||||
(lib.cmakeBool "SPHINX_MAN" withManual)
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
(lib.cmakeOptionType "path" "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang")
|
||||
];
|
||||
|
||||
# 97% tests passed, 97 tests failed out of 2881
|
||||
# mostly because it checks command line and nix append -isystem and all
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# -E exclude 4 tests based on names
|
||||
# see https://github.com/CastXML/CastXML/issues/90
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd'
|
||||
runHook postCheck
|
||||
'';
|
||||
passthru.tests = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/CastXML/CastXML";
|
||||
|
@ -4,6 +4,7 @@
|
||||
, inkscape
|
||||
, just
|
||||
, xcursorgen
|
||||
, hyprcursor
|
||||
}:
|
||||
|
||||
let
|
||||
@ -13,7 +14,7 @@ let
|
||||
};
|
||||
variantName = { palette, color }: palette + color;
|
||||
variants = lib.mapCartesianProduct variantName dimensions;
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "catppuccin-cursors";
|
||||
@ -23,10 +24,10 @@ stdenvNoCC.mkDerivation {
|
||||
owner = "catppuccin";
|
||||
repo = "cursors";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aQfbziN5z62LlgVq4CNMXVMmTrzChFgWUMAmO/2/z3Y=";
|
||||
hash = "sha256-LJyBnXDUGBLOD4qPI7l0YC0CcqYTtgoMJc1H2yLqk9g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ just inkscape xcursorgen ];
|
||||
nativeBuildInputs = [ just inkscape xcursorgen hyprcursor ];
|
||||
|
||||
outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage
|
||||
|
||||
@ -37,7 +38,7 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
patchShebangs .
|
||||
|
||||
just all
|
||||
just all_with_hyprcursor
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "eigenlayer";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Layr-Labs";
|
||||
repo = "eigenlayer-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YImQNqOPtHjFJz9mLrgoU0HUWZ4Pnkiff+5A8wYXxpA=";
|
||||
hash = "sha256-VC2qUHdFulOCYuAb8vHxc+9GJV/3iiKO1hJS/7gj278=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+VKjsHFqWVqOxzC49GToxymD5AyI0j1ZDXQW2YnJysw=";
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fzf";
|
||||
version = "0.52.1";
|
||||
version = "0.53.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "fzf";
|
||||
rev = version;
|
||||
hash = "sha256-cnLPn1AKq1BaWwXsWwQfC/lnejdyd1WdH1qIJRcfdks=";
|
||||
hash = "sha256-2g1ouyXTo4EoCub+6ngYPy+OUFoZhXbVT3FI7r5Y7Ws=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Kc/bYzakx9c/bF42LYyE1t8JCUqBsJQFtczrFocx/Ps=";
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gambit-project";
|
||||
version = "16.1.1";
|
||||
version = "16.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gambitproject";
|
||||
repo = "gambit";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ElPzJDQ1q+i1OyliychSUA9pT6yGSwjn/sKV0JX5wrQ=";
|
||||
hash = "sha256-OuI2DA/5CLgHqcHwOGUE9IdrnyjlGKy8B7tWueUfUtg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
@ -6,13 +6,13 @@ nix-update-script
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glance";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glanceapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vcK8AW+B/YK4Jor86SRvJ8XFWvzeAUX5mVbXwrgxGlA=";
|
||||
hash = "sha256-37DmLZ8ESJwB2R8o5WjeypKsCQwarF3x8UYz1OQT/tM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Okme73vLc3Pe9+rNlmG8Bj1msKaVb5PaIBsAAeTer6s=";
|
||||
|
38
pkgs/by-name/he/hexxy/package.nix
Normal file
38
pkgs/by-name/he/hexxy/package.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildGoModule {
|
||||
pname = "hexxy";
|
||||
version = "0-unstable-2024-02-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sweetbbak";
|
||||
repo = "hexxy";
|
||||
# upstream does not publish releases, i.e., there are no tags
|
||||
rev = "30e0aa5549bbafeb8204fe34b0d37019f9acc975";
|
||||
hash = "sha256-KBgxZD95UT7i/eYeKLm0LVLliKgK/KiJYXVY9zzwbvk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qkBpSVLWZPRgS9bqOVUWHpyj8z/nheQJON3vJOwPUj4=";
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version"
|
||||
"branch"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A modern and beautiful alternative to xxd and hexdump";
|
||||
homepage = "https://github.com/sweetbbak/hexxy";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.NotAShelf ];
|
||||
mainProgram = "hexxy";
|
||||
};
|
||||
}
|
@ -3,15 +3,15 @@
|
||||
}:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "19067";
|
||||
version = "19096";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
hash = "sha256-+mHX80ltIFkVWIeex519b84BYzhp+h459/C2wlDR7jQ=";
|
||||
hash = "sha256-oX9B98yj9WmTLGVnDO8hOJ/rYFMTLiTaz1dWufD1wqg=";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
|
||||
hash = "sha256-lMESSSXl6hBC2MpLYnYOThy463ft2bONNppBv3OEvAQ=";
|
||||
hash = "sha256-qOMSG2eAaMHCvJXYzG07Ngb6fR9MbFQI5+1xuxGbBVU=";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
@ -17,12 +17,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-9o+gWQbpCJb+UZzPNmzGqpWD0QbGjg41is/f1POUEQs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/lib60870-C";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
preConfigure = "cd lib60870-C";
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = with lib; {
|
||||
@ -30,6 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://libiec61850.com/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ stv0g ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
|
@ -28,6 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://libiec61850.com/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ stv0g ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nix-update-script
|
||||
}:
|
||||
let
|
||||
version = "0.0.44";
|
||||
version = "0.0.46";
|
||||
in
|
||||
buildGoModule {
|
||||
|
||||
@ -13,7 +13,7 @@ buildGoModule {
|
||||
repo = "mcap";
|
||||
owner = "foxglove";
|
||||
rev = "releases/mcap-cli/v${version}";
|
||||
hash = "sha256-OAL2z28FhMXlyVzgmLCzHNCpCeK7hIkQB6jd7v3WHHA=";
|
||||
hash = "sha256-UdR5A2ZtCcnQIjPxlwcntZb78CXzJBvRy73GJUqvjuM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ofJYarmnOHONu2lZ76GvSua0ViP1gr6968xAuQ/VRNk=";
|
||||
|
@ -1,11 +1,9 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub, srcOnly, nim-unwrapped-1 }:
|
||||
{ lib, buildNimPackage, fetchFromGitHub, srcOnly, nim-unwrapped-2 }:
|
||||
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "nimlsp";
|
||||
version = "0.4.6";
|
||||
|
||||
requiredNimVersion = 1;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PMunch";
|
||||
repo = "nimlsp";
|
||||
@ -29,7 +27,7 @@ buildNimPackage (finalAttrs: {
|
||||
|
||||
nimFlags = [
|
||||
"--threads:on"
|
||||
"-d:explicitSourcePath=${srcOnly nim-unwrapped-1}"
|
||||
"-d:explicitSourcePath=${srcOnly nim-unwrapped-2}"
|
||||
"-d:tempDir=/tmp"
|
||||
];
|
||||
|
||||
@ -41,6 +39,6 @@ buildNimPackage (finalAttrs: {
|
||||
description = "Language Server Protocol implementation for Nim";
|
||||
homepage = "https://github.com/PMunch/nimlsp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ xtrayambak ];
|
||||
};
|
||||
})
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "5.4.0";
|
||||
version = "5.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_adv";
|
||||
hash = "sha256-yatzxVzZ3MxsHrwSBtHDgRcme7y7n8ZDl9gLWy7Jikg=";
|
||||
hash = "sha256-9cyYBPDYbhDVaKNLAm1LjB5/UfnYkAuT46XI0JaHg3I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "opencomposite";
|
||||
version = "0-unstable-2024-05-24";
|
||||
version = "0-unstable-2024-06-01";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "znixian";
|
||||
repo = "OpenOVR";
|
||||
rev = "762f93d91f4c23ad70c81c81486b6bcd7e9bbb5e";
|
||||
hash = "sha256-Z1Is+yjyAG8X5+FWaxtCkF7paRGV9ZlNVubuVkeO7yg=";
|
||||
rev = "49c4b89579fd49c5b40b72924d6593fcd47c5065";
|
||||
hash = "sha256-Aubf1tupyXzmff3ho/yKx9B3uJ8I0aoZi9zRV3A89Pc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -33,11 +33,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plasticity";
|
||||
version = "24.1.5";
|
||||
version = "24.1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
|
||||
hash = "sha256-1oneFWWgMYsh12knn+Atp8ttSnTdaV+5TWwp2htZsvE=";
|
||||
hash = "sha256-gGfDsAqg0PkORrOEvBWLpKgLv5a+M9Rj+oC+jF1gYqA=";
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
@ -5,11 +5,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "proton-ge-bin";
|
||||
version = "GE-Proton9-5";
|
||||
version = "GE-Proton9-7";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-bUlV533M5BL5UEOB0ED8VIMmquvVAvIm+E/ZJNjftRU=";
|
||||
hash = "sha256-/FXdyPuCe6rD5HoMOHPVlwRXu3DMJ3lEOnRloYZMA8s=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "steamcompattool" ];
|
||||
|
52
pkgs/by-name/pr/proton-pass/package.nix
Normal file
52
pkgs/by-name/pr/proton-pass/package.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
dpkg,
|
||||
makeWrapper,
|
||||
electron,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "proton-pass";
|
||||
version = "1.17.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb";
|
||||
hash = "sha256-2dnR/4LpLiQlJebv74/F7L/a5lYPh+AMPqQVIBHvxcg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r usr/share/ $out/
|
||||
cp -r usr/lib/proton-pass/resources/app.asar $out/share/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapper ${lib.getExe electron} $out/bin/proton-pass \
|
||||
--add-flags $out/share/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Desktop application for Proton Pass";
|
||||
homepage = "https://proton.me/pass";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ massimogengarelli sebtm ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "proton-pass";
|
||||
};
|
||||
})
|
@ -7,7 +7,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyprland";
|
||||
version = "2.3.5";
|
||||
version = "2.3.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.10";
|
||||
@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "hyprland-community";
|
||||
repo = "pyprland";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3zTxmjk5fHo58eV6AO9oDJHbq9O5dcsdHypAOOQF5BY=";
|
||||
hash = "sha256-Mcn5d0p+vu1I9oKHUdOH/v1+wC9UTGZaejbsgurrrhg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
|
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quarkus-cli";
|
||||
version = "3.10.2";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-8Jkfrrw+ithsGHg1Ntetx8eSkcLu/0ObOuFKIJjfahA=";
|
||||
hash = "sha256-oV6zSyrWYR/j58bZF/GPsrQEgR/TP27ipbxaVkEe+zE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -19,19 +19,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "resources";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nokyan";
|
||||
repo = "resources";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-57GsxLxnaQ9o3Dux2fTNWUmhOMs6waYvtV6260CM5fo=";
|
||||
hash = "sha256-Udl5DY68AeysYoXVlQQ0cIv3EHOtdqkW1nmGRYXaT8Y=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
name = "resources-${finalAttrs.version}";
|
||||
hash = "sha256-bHzijXjvbmYltNHevhddz5TCYKg2OMRn+Icb77F18XU=";
|
||||
hash = "sha256-XvCnYBl0pCtJ4vXuQxqBlTVMIiFNQiNabHhqaxq8AdM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sigi";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-rDVuI+sY7yG9Tni5/klnWM1KHg7iZuPQXFnLz96B0L4=";
|
||||
hash = "sha256-Tsrfan7aejP2oy9x9VoTIq0ba0s0tnx1RTlAB0v6eis=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QqAcK75BDIWlYggkZkokZ/C1SxCFviZ0t+h1q+dM8I4=";
|
||||
cargoHash = "sha256-jstxl1CcSNv1bQuAY9n2kYmoTYmfeBYUCKJKWCSEuec=";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# In case anything goes wrong.
|
||||
|
@ -22,13 +22,13 @@ assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ];
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spla";
|
||||
version = "1.5.5";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eth-cscs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-71QpwTsRogH+6Bik9DKwezl9SqwoLxQt4SZ7zw5X6DE=";
|
||||
hash = "sha256-1k9Su7loXsH7AyhYFZax+4nyNoCO5+WJbXrzGGAIy/c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
@ -1,5 +1,4 @@
|
||||
{ buildGoModule
|
||||
, cacert
|
||||
, cairo
|
||||
, cargo
|
||||
, cargo-tauri
|
||||
@ -7,15 +6,14 @@
|
||||
, fetchFromGitHub
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
, jq
|
||||
, lib
|
||||
, libsoup
|
||||
, llvmPackages_15
|
||||
, makeBinaryWrapper
|
||||
, moreutils
|
||||
, nodePackages
|
||||
, nodejs
|
||||
, pango
|
||||
, pkg-config
|
||||
, pnpm
|
||||
, rustc
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
@ -95,49 +93,25 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
pnpm-deps = stdenvNoCC.mkDerivation {
|
||||
inherit (finalAttrs) src version;
|
||||
pname = "${finalAttrs.pname}-pnpm-deps";
|
||||
dontFixup = true;
|
||||
|
||||
nativeBuildInputs = [ cacert jq moreutils nodePackages.pnpm ];
|
||||
|
||||
postInstall = ''
|
||||
export HOME=$(mktemp -d)
|
||||
pnpm config set store-dir $out
|
||||
# use --ignore-script and --no-optional to avoid downloading binaries
|
||||
# use --frozen-lockfile to avoid checking git deps
|
||||
pnpm install --frozen-lockfile --no-optional --ignore-script
|
||||
|
||||
# Remove timestamp and sort the json files
|
||||
rm -rf $out/v3/tmp
|
||||
for f in $(find $out -name "*.json"); do
|
||||
sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
|
||||
jq --sort-keys . $f | sponge $f
|
||||
done
|
||||
'';
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-jT0Bw0xiusOw/5o6EUaEV3/GqkD/l6jkwXmOqc3a/nc=";
|
||||
};
|
||||
|
||||
ui = stdenvNoCC.mkDerivation {
|
||||
inherit (finalAttrs) src version;
|
||||
pname = "${finalAttrs.pname}-ui";
|
||||
dontFixup = true;
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-3x/GKgVX0mnxTZmINe/qTtr/vI0h5IqPYt9N0l/VGzg=";
|
||||
};
|
||||
|
||||
ESBUILD_BINARY_PATH = "${lib.getExe esbuild-18-20}";
|
||||
|
||||
nativeBuildInputs = [ nodePackages.pnpm ];
|
||||
nativeBuildInputs = [ nodejs pnpm.configHook ];
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${finalAttrs.embed} src/generated
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
pnpm config set store-dir ${finalAttrs.pnpm-deps}
|
||||
pnpm install --offline --frozen-lockfile --no-optional --ignore-script
|
||||
pnpm build
|
||||
'';
|
||||
|
||||
|
@ -1,24 +1,16 @@
|
||||
{ lib
|
||||
, mpv-unwrapped
|
||||
, wrapMpv
|
||||
, ocl-icd
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
libraries = [
|
||||
ocl-icd
|
||||
];
|
||||
in
|
||||
wrapMpv
|
||||
(mpv-unwrapped.override {
|
||||
vapoursynthSupport = true;
|
||||
})
|
||||
{
|
||||
|
||||
mpv-unwrapped.wrapper {
|
||||
mpv = mpv-unwrapped.override { vapoursynthSupport = true; };
|
||||
extraMakeWrapperArgs = [
|
||||
# Add paths to required libraries
|
||||
"--prefix"
|
||||
"LD_LIBRARY_PATH"
|
||||
":"
|
||||
"/run/opengl-driver/lib:${lib.makeLibraryPath libraries}"
|
||||
"/run/opengl-driver/lib:${lib.makeLibraryPath [ ocl-icd ]}"
|
||||
];
|
||||
}
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "1.0-unstable-2024-05-30";
|
||||
version = "1.0-unstable-2024-06-05";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "987a3348a64be19fd7cd75bec7fa08c2619b478b";
|
||||
hash = "sha256-Yrlfnh9OuIEXEowM86UxkvX40522oP+yyQphmaQcY+s=";
|
||||
rev = "598846a1b820b398e820d53c060a360d5ead9e18";
|
||||
hash = "sha256-6VaWFf3hXZ7hj7DbO+abyyDnNIpKo+9SDzJjBgmrhXc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "projects" ];
|
||||
|
@ -50,11 +50,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ventoy";
|
||||
version = "1.0.98";
|
||||
version = "1.0.99";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz";
|
||||
hash = "sha256-JjBB9vG7CNs4Fbp6IIBkIpZg7l9g0e58tjhznc7OsLw=";
|
||||
hash = "sha256-RnzdGIp/c5vHBq28HWlfYf/e/JWRatsBWUfYCCnwCj0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -8,14 +8,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "onevpl-intel-gpu";
|
||||
pname = "vpl-gpu-rt";
|
||||
version = "24.2.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneVPL-intel-gpu";
|
||||
owner = "intel";
|
||||
repo = "vpl-gpu-rt";
|
||||
rev = "intel-onevpl-${version}";
|
||||
sha256 = "sha256-JtvRh4p4wPRnqFfE86tJW+yS9AKMoi3TPZO+LZ2Q7Mo=";
|
||||
};
|
||||
@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "oneAPI Video Processing Library Intel GPU implementation";
|
||||
homepage = "https://github.com/oneapi-src/oneVPL-intel-gpu";
|
||||
changelog = "https://github.com/oneapi-src/oneVPL-intel-gpu/releases/tag/${src.rev}";
|
||||
homepage = "https://github.com/intel/vpl-gpu-rt";
|
||||
changelog = "https://github.com/intel/vpl-gpu-rt/releases/tag/${src.rev}";
|
||||
license = [ lib.licenses.mit ];
|
||||
platforms = lib.platforms.linux;
|
||||
# CMake adds x86 specific compiler flags in <source>/builder/FindGlobals.cmake
|
@ -1,23 +1,32 @@
|
||||
{ lib, stdenv, fetchurl, gnome, libxslt }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
gnome,
|
||||
libxslt,
|
||||
libxml2,
|
||||
meson,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mobile-broadband-provider-info";
|
||||
version = "20230416";
|
||||
version = "20240407";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-4+FAqi23abKZ0d+GqJDpSKuZ1NOIMTAsRS0ft/hWiuw=";
|
||||
hash = "sha256-ib/v8hX0v/jpw/8uwlJQ/bCA0R6b+lnG/HGYKsAcgUo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
# fixes configure: error: xsltproc not found
|
||||
libxslt
|
||||
libxslt # for xsltproc
|
||||
libxml2 # for xmllint
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
updateScript = gnome.updateScript { packageName = pname; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -12,8 +12,8 @@
|
||||
lm_sensors,
|
||||
hddtemp,
|
||||
netcat-gnu,
|
||||
nvidiaSupport ? true,
|
||||
libXNVCtrl,
|
||||
nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
|
@ -0,0 +1,596 @@
|
||||
This patch is based on https://github.com/sternenseemann/cabal/compare/Cabal-v3.12.0.0..e836ef53c1f80bf99a70f9c4ee5976e9f3830215
|
||||
and has been postprocessed with `filterdiff --strip=1 --addoldprefix=a/libraries/Cabal/ --addnewprefix=b/libraries/Cabal/`.
|
||||
|
||||
Reasoning and explanation of the patch can be found in the comment in the diff for PathsModule.hs below.
|
||||
|
||||
diffCabal/src/Distribution/Simple/Build/PathsModule.hs b/Cabal/src/Distribution/Simple/Build/PathsModule.hs
|
||||
index 892e5bd38..391f5b130 100644
|
||||
--- a/libraries/Cabal/Cabal/src/Distribution/Simple/Build/PathsModule.hs
|
||||
+++ b/libraries/Cabal/Cabal/src/Distribution/Simple/Build/PathsModule.hs
|
||||
@@ -51,6 +51,7 @@ generatePathsModule pkg_descr lbi clbi =
|
||||
, Z.zIsWindows = isWindows
|
||||
, Z.zIsI386 = buildArch == I386
|
||||
, Z.zIsX8664 = buildArch == X86_64
|
||||
+ , Z.zOr = (||)
|
||||
, Z.zNot = not
|
||||
, Z.zManglePkgName = showPkgName
|
||||
, Z.zPrefix = show flat_prefix
|
||||
@@ -60,8 +61,110 @@ generatePathsModule pkg_descr lbi clbi =
|
||||
, Z.zDatadir = zDatadir
|
||||
, Z.zLibexecdir = zLibexecdir
|
||||
, Z.zSysconfdir = zSysconfdir
|
||||
+ , -- Sadly we can't be cleverer about this – we can't have literals in the template
|
||||
+ Z.zShouldEmitDataDir = shouldEmit "DataDir"
|
||||
+ , Z.zShouldEmitLibDir = shouldEmit "LibDir"
|
||||
+ , Z.zShouldEmitDynLibDir = shouldEmit "DynLibDir"
|
||||
+ , Z.zShouldEmitLibexecDir = shouldEmit "LibexecDir"
|
||||
+ , Z.zShouldEmitSysconfDir = shouldEmit "SysconfDir"
|
||||
+ , Z.zWarning = zWarning
|
||||
+ , Z.zShouldEmitWarning = zShouldEmitWarning
|
||||
}
|
||||
where
|
||||
+ -- GHC's NCG backend for aarch64-darwin does not support link-time dead code
|
||||
+ -- elimination to the extent that NCG does for other targets. Consequently,
|
||||
+ -- we struggle with unnecessarily retained store path references due to the
|
||||
+ -- use of `Paths_*` modules – even if `getLibDir` is not used, it'll end up
|
||||
+ -- in the final library or executables we build.
|
||||
+ --
|
||||
+ -- When using a different output for the executables and library, this
|
||||
+ -- becomes more sinister: The library will contain a reference to the bin
|
||||
+ -- output and itself due to `getLibDir` and `getBinDir`, but the executables
|
||||
+ -- will do so, too. Either due to linking dynamically or because the library
|
||||
+ -- is linked statically into the executable and retains those references.
|
||||
+ -- Since Nix disallows cyclical references between two outputs, it becomes
|
||||
+ -- impossible to use the `Paths_*` module and a separate `bin` output for
|
||||
+ -- aarch64-darwin.
|
||||
+ --
|
||||
+ -- The solution we have resorted to for now, is to trim the `Paths_*` module
|
||||
+ -- dynamically depending on what references *could* be used without causing
|
||||
+ -- a cyclical reference. That has the effect that any code that would not
|
||||
+ -- cause a cyclical reference with dead code elimination will compile and
|
||||
+ -- work for aarch64-darwin. If the code would use a `get*Dir` function that
|
||||
+ -- has been omitted, this would indicate that the code would have caused a
|
||||
+ -- cyclical reference anyways.
|
||||
+ --
|
||||
+ -- The logic for this makes some pretty big assumptions about installation
|
||||
+ -- prefixes that probably only hold fully in nixpkgs with
|
||||
+ -- `haskellPackages.mkDerivation`. Simple uses outside nixpkgs that have
|
||||
+ -- everything below the same prefix should continue to work as expected,
|
||||
+ -- though.
|
||||
+ --
|
||||
+ -- We assume the following:
|
||||
+ --
|
||||
+ -- - flat_prefix is `$out`.
|
||||
+ -- - flat_libdir etc. are always below `$out`.
|
||||
+ --
|
||||
+ -- Since in the normal case due to static linking `$bin` and `$out` will
|
||||
+ -- have the same references in libraries/executables, we need to either
|
||||
+ -- prevent usage of `getBinDir` or `getLibDir` to break the cycle in case
|
||||
+ -- `flat_bindir` is not below `$out`. We have decided to always allow usage
|
||||
+ -- of `getBinDir`, so `getLibDir` gets dropped if a separate `bin` output is
|
||||
+ -- used. This has the simple reason that `$out` which contains `flat_libdir`
|
||||
+ -- tends to be quite big – we would like to have a `bin` output that doesn't
|
||||
+ -- require keeping that around.
|
||||
+ pathEmittable :: FilePath -> Bool
|
||||
+ pathEmittable p
|
||||
+ -- If the executable installation target is below `$out` the reference
|
||||
+ -- cycle is within a single output (since libs are installed to `$out`)
|
||||
+ -- and thus unproblematic. We can use any and all `get*Dir` functions.
|
||||
+ | flat_prefix `isPrefixOf` flat_bindir = True
|
||||
+ -- Otherwise, we need to disallow all `get*Dir` functions that would cause
|
||||
+ -- a reference to `$out` which contains the libraries that would in turn
|
||||
+ -- reference `$bin`. This always include `flat_libdir` and friends, but
|
||||
+ -- can also include `flat_datadir` if no separate output for data files is
|
||||
+ -- used.
|
||||
+ | otherwise = not (flat_prefix `isPrefixOf` p)
|
||||
+
|
||||
+ -- This list maps the "name" of the directory to whether we want to include
|
||||
+ -- it in the `Paths_*` module or not. `shouldEmit` performs a lookup in this.
|
||||
+ dirs :: [(String, Bool)]
|
||||
+ dirs =
|
||||
+ map
|
||||
+ (\(name, path) -> (name, pathEmittable path))
|
||||
+ [ ("LibDir", flat_libdir)
|
||||
+ , ("DynLibDir", flat_dynlibdir)
|
||||
+ , ("DataDir", flat_datadir)
|
||||
+ , ("LibexecDir", flat_libexecdir)
|
||||
+ , ("SysconfDir", flat_sysconfdir)
|
||||
+ ]
|
||||
+
|
||||
+ shouldEmit :: String -> Bool
|
||||
+ shouldEmit name =
|
||||
+ case lookup name dirs of
|
||||
+ Just b -> b
|
||||
+ Nothing -> error "panic! BUG in Cabal Paths_ patch for aarch64-darwin, report this at https://github.com/nixos/nixpkgs/issues"
|
||||
+
|
||||
+ -- This is a comma separated list of all functions that have been emitted.
|
||||
+ -- This is included in a GHC warning which will be attached to the `Paths_*`
|
||||
+ -- module in case we are dropping any `get*Dir` functions that would
|
||||
+ -- normally exist.
|
||||
+ --
|
||||
+ -- TODO: getDataFileName is not accounted for at the moment.
|
||||
+ omittedFunctions :: String
|
||||
+ omittedFunctions =
|
||||
+ intercalate ", " $
|
||||
+ map (("get" ++) . fst) $
|
||||
+ filter (not . snd) dirs
|
||||
+
|
||||
+ zWarning :: String
|
||||
+ zWarning =
|
||||
+ show $
|
||||
+ "The following functions have been omitted by a nixpkgs-specific patch to Cabal: "
|
||||
+ ++ omittedFunctions
|
||||
+ zShouldEmitWarning :: Bool
|
||||
+ zShouldEmitWarning = any (not . snd) dirs
|
||||
+
|
||||
supports_cpp = supports_language_pragma
|
||||
supports_rebindable_syntax = ghc_newer_than (mkVersion [7, 0, 1])
|
||||
supports_language_pragma = ghc_newer_than (mkVersion [6, 6, 1])
|
||||
diffCabal/src/Distribution/Simple/Build/PathsModule/Z.hs b/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs
|
||||
index 25c924720..a8278675e 100644
|
||||
--- a/libraries/Cabal/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs
|
||||
+++ b/libraries/Cabal/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs
|
||||
@@ -19,6 +19,14 @@ data Z
|
||||
zDatadir :: FilePath,
|
||||
zLibexecdir :: FilePath,
|
||||
zSysconfdir :: FilePath,
|
||||
+ zShouldEmitLibDir :: Bool,
|
||||
+ zShouldEmitDynLibDir :: Bool,
|
||||
+ zShouldEmitLibexecDir :: Bool,
|
||||
+ zShouldEmitDataDir :: Bool,
|
||||
+ zShouldEmitSysconfDir :: Bool,
|
||||
+ zShouldEmitWarning :: Bool,
|
||||
+ zWarning :: String,
|
||||
+ zOr :: (Bool -> Bool -> Bool),
|
||||
zNot :: (Bool -> Bool),
|
||||
zManglePkgName :: (PackageName -> String)}
|
||||
deriving Generic
|
||||
@@ -54,10 +62,51 @@ render z_root = execWriter $ do
|
||||
tell "{-# OPTIONS_GHC -w #-}\n"
|
||||
tell "module Paths_"
|
||||
tell (zManglePkgName z_root (zPackageName z_root))
|
||||
- tell " (\n"
|
||||
+ tell "\n"
|
||||
+ tell " "
|
||||
+ if (zShouldEmitWarning z_root)
|
||||
+ then do
|
||||
+ tell "{-# WARNING "
|
||||
+ tell (zWarning z_root)
|
||||
+ tell " #-}"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
+ tell "\n"
|
||||
+ tell " (\n"
|
||||
tell " version,\n"
|
||||
- tell " getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir,\n"
|
||||
- tell " getDataFileName, getSysconfDir\n"
|
||||
+ tell " getBinDir,\n"
|
||||
+ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitLibDir z_root))
|
||||
+ then do
|
||||
+ tell " getLibDir,\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
+ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitDynLibDir z_root))
|
||||
+ then do
|
||||
+ tell " getDynLibDir,\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
+ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitLibexecDir z_root))
|
||||
+ then do
|
||||
+ tell " getLibexecDir,\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
+ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitDataDir z_root))
|
||||
+ then do
|
||||
+ tell " getDataFileName,\n"
|
||||
+ tell " getDataDir,\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
+ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitSysconfDir z_root))
|
||||
+ then do
|
||||
+ tell " getSysconfDir\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
tell " ) where\n"
|
||||
tell "\n"
|
||||
if (zNot z_root (zAbsolute z_root))
|
||||
@@ -106,12 +155,15 @@ render z_root = execWriter $ do
|
||||
tell (zVersionDigits z_root)
|
||||
tell " []\n"
|
||||
tell "\n"
|
||||
- tell "getDataFileName :: FilePath -> IO FilePath\n"
|
||||
- tell "getDataFileName name = do\n"
|
||||
- tell " dir <- getDataDir\n"
|
||||
- tell " return (dir `joinFileName` name)\n"
|
||||
- tell "\n"
|
||||
- tell "getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath\n"
|
||||
+ if (zOr z_root (zNot z_root (zAbsolute z_root)) (zShouldEmitDataDir z_root))
|
||||
+ then do
|
||||
+ tell "getDataFileName :: FilePath -> IO FilePath\n"
|
||||
+ tell "getDataFileName name = do\n"
|
||||
+ tell " dir <- getDataDir\n"
|
||||
+ tell " return (dir `joinFileName` name)\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
tell "\n"
|
||||
let
|
||||
z_var0_function_defs = do
|
||||
@@ -139,6 +191,7 @@ render z_root = execWriter $ do
|
||||
tell "\n"
|
||||
if (zRelocatable z_root)
|
||||
then do
|
||||
+ tell "\n"
|
||||
tell "\n"
|
||||
tell "getPrefixDirReloc :: FilePath -> IO FilePath\n"
|
||||
tell "getPrefixDirReloc dirRel = do\n"
|
||||
@@ -148,31 +201,37 @@ render z_root = execWriter $ do
|
||||
tell (zBindir z_root)
|
||||
tell ") `joinFileName` dirRel)\n"
|
||||
tell "\n"
|
||||
+ tell "getBinDir :: IO FilePath\n"
|
||||
tell "getBinDir = catchIO (getEnv \""
|
||||
tell (zManglePkgName z_root (zPackageName z_root))
|
||||
tell "_bindir\") (\\_ -> getPrefixDirReloc $ "
|
||||
tell (zBindir z_root)
|
||||
tell ")\n"
|
||||
+ tell "getLibDir :: IO FilePath\n"
|
||||
tell "getLibDir = catchIO (getEnv \""
|
||||
tell (zManglePkgName z_root (zPackageName z_root))
|
||||
tell "_libdir\") (\\_ -> getPrefixDirReloc $ "
|
||||
tell (zLibdir z_root)
|
||||
tell ")\n"
|
||||
+ tell "getDynLibDir :: IO FilePath\n"
|
||||
tell "getDynLibDir = catchIO (getEnv \""
|
||||
tell (zManglePkgName z_root (zPackageName z_root))
|
||||
tell "_dynlibdir\") (\\_ -> getPrefixDirReloc $ "
|
||||
tell (zDynlibdir z_root)
|
||||
tell ")\n"
|
||||
+ tell "getDataDir :: IO FilePath\n"
|
||||
tell "getDataDir = catchIO (getEnv \""
|
||||
tell (zManglePkgName z_root (zPackageName z_root))
|
||||
tell "_datadir\") (\\_ -> getPrefixDirReloc $ "
|
||||
tell (zDatadir z_root)
|
||||
tell ")\n"
|
||||
+ tell "getLibexecDir :: IO FilePath\n"
|
||||
tell "getLibexecDir = catchIO (getEnv \""
|
||||
tell (zManglePkgName z_root (zPackageName z_root))
|
||||
tell "_libexecdir\") (\\_ -> getPrefixDirReloc $ "
|
||||
tell (zLibexecdir z_root)
|
||||
tell ")\n"
|
||||
+ tell "getSysconfDir :: IO FilePath\n"
|
||||
tell "getSysconfDir = catchIO (getEnv \""
|
||||
tell (zManglePkgName z_root (zPackageName z_root))
|
||||
tell "_sysconfdir\") (\\_ -> getPrefixDirReloc $ "
|
||||
@@ -186,72 +245,119 @@ render z_root = execWriter $ do
|
||||
if (zAbsolute z_root)
|
||||
then do
|
||||
tell "\n"
|
||||
- tell "bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath\n"
|
||||
+ tell "bindir :: FilePath\n"
|
||||
tell "bindir = "
|
||||
tell (zBindir z_root)
|
||||
tell "\n"
|
||||
- tell "libdir = "
|
||||
- tell (zLibdir z_root)
|
||||
- tell "\n"
|
||||
- tell "dynlibdir = "
|
||||
- tell (zDynlibdir z_root)
|
||||
+ tell "getBinDir :: IO FilePath\n"
|
||||
+ tell "getBinDir = catchIO (getEnv \""
|
||||
+ tell (zManglePkgName z_root (zPackageName z_root))
|
||||
+ tell "_bindir\") (\\_ -> return bindir)\n"
|
||||
tell "\n"
|
||||
- tell "datadir = "
|
||||
- tell (zDatadir z_root)
|
||||
+ if (zShouldEmitLibDir z_root)
|
||||
+ then do
|
||||
+ tell "libdir :: FilePath\n"
|
||||
+ tell "libdir = "
|
||||
+ tell (zLibdir z_root)
|
||||
+ tell "\n"
|
||||
+ tell "getLibDir :: IO FilePath\n"
|
||||
+ tell "getLibDir = catchIO (getEnv \""
|
||||
+ tell (zManglePkgName z_root (zPackageName z_root))
|
||||
+ tell "_libdir\") (\\_ -> return libdir)\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
tell "\n"
|
||||
- tell "libexecdir = "
|
||||
- tell (zLibexecdir z_root)
|
||||
+ if (zShouldEmitDynLibDir z_root)
|
||||
+ then do
|
||||
+ tell "dynlibdir :: FilePath\n"
|
||||
+ tell "dynlibdir = "
|
||||
+ tell (zDynlibdir z_root)
|
||||
+ tell "\n"
|
||||
+ tell "getDynLibDir :: IO FilePath\n"
|
||||
+ tell "getDynLibDir = catchIO (getEnv \""
|
||||
+ tell (zManglePkgName z_root (zPackageName z_root))
|
||||
+ tell "_dynlibdir\") (\\_ -> return dynlibdir)\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
tell "\n"
|
||||
- tell "sysconfdir = "
|
||||
- tell (zSysconfdir z_root)
|
||||
+ if (zShouldEmitDataDir z_root)
|
||||
+ then do
|
||||
+ tell "datadir :: FilePath\n"
|
||||
+ tell "datadir = "
|
||||
+ tell (zDatadir z_root)
|
||||
+ tell "\n"
|
||||
+ tell "getDataDir :: IO FilePath\n"
|
||||
+ tell "getDataDir = catchIO (getEnv \""
|
||||
+ tell (zManglePkgName z_root (zPackageName z_root))
|
||||
+ tell "_datadir\") (\\_ -> return datadir)\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
tell "\n"
|
||||
+ if (zShouldEmitLibexecDir z_root)
|
||||
+ then do
|
||||
+ tell "libexecdir :: FilePath\n"
|
||||
+ tell "libexecdir = "
|
||||
+ tell (zLibexecdir z_root)
|
||||
+ tell "\n"
|
||||
+ tell "getLibexecDir :: IO FilePath\n"
|
||||
+ tell "getLibexecDir = catchIO (getEnv \""
|
||||
+ tell (zManglePkgName z_root (zPackageName z_root))
|
||||
+ tell "_libexecdir\") (\\_ -> return libexecdir)\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
tell "\n"
|
||||
- tell "getBinDir = catchIO (getEnv \""
|
||||
- tell (zManglePkgName z_root (zPackageName z_root))
|
||||
- tell "_bindir\") (\\_ -> return bindir)\n"
|
||||
- tell "getLibDir = catchIO (getEnv \""
|
||||
- tell (zManglePkgName z_root (zPackageName z_root))
|
||||
- tell "_libdir\") (\\_ -> return libdir)\n"
|
||||
- tell "getDynLibDir = catchIO (getEnv \""
|
||||
- tell (zManglePkgName z_root (zPackageName z_root))
|
||||
- tell "_dynlibdir\") (\\_ -> return dynlibdir)\n"
|
||||
- tell "getDataDir = catchIO (getEnv \""
|
||||
- tell (zManglePkgName z_root (zPackageName z_root))
|
||||
- tell "_datadir\") (\\_ -> return datadir)\n"
|
||||
- tell "getLibexecDir = catchIO (getEnv \""
|
||||
- tell (zManglePkgName z_root (zPackageName z_root))
|
||||
- tell "_libexecdir\") (\\_ -> return libexecdir)\n"
|
||||
- tell "getSysconfDir = catchIO (getEnv \""
|
||||
- tell (zManglePkgName z_root (zPackageName z_root))
|
||||
- tell "_sysconfdir\") (\\_ -> return sysconfdir)\n"
|
||||
+ if (zShouldEmitSysconfDir z_root)
|
||||
+ then do
|
||||
+ tell "sysconfdir :: FilePath\n"
|
||||
+ tell "sysconfdir = "
|
||||
+ tell (zSysconfdir z_root)
|
||||
+ tell "\n"
|
||||
+ tell "getSysconfDir :: IO FilePath\n"
|
||||
+ tell "getSysconfDir = catchIO (getEnv \""
|
||||
+ tell (zManglePkgName z_root (zPackageName z_root))
|
||||
+ tell "_sysconfdir\") (\\_ -> return sysconfdir)\n"
|
||||
+ return ()
|
||||
+ else do
|
||||
+ return ()
|
||||
tell "\n"
|
||||
return ()
|
||||
else do
|
||||
if (zIsWindows z_root)
|
||||
then do
|
||||
+ tell "\n"
|
||||
tell "\n"
|
||||
tell "prefix :: FilePath\n"
|
||||
tell "prefix = "
|
||||
tell (zPrefix z_root)
|
||||
tell "\n"
|
||||
tell "\n"
|
||||
+ tell "getBinDir :: IO FilePath\n"
|
||||
tell "getBinDir = getPrefixDirRel $ "
|
||||
tell (zBindir z_root)
|
||||
tell "\n"
|
||||
+ tell "getLibDir :: IO FilePath\n"
|
||||
tell "getLibDir = "
|
||||
tell (zLibdir z_root)
|
||||
tell "\n"
|
||||
+ tell "getDynLibDir :: IO FilePath\n"
|
||||
tell "getDynLibDir = "
|
||||
tell (zDynlibdir z_root)
|
||||
tell "\n"
|
||||
+ tell "getDataDir :: IO FilePath\n"
|
||||
tell "getDataDir = catchIO (getEnv \""
|
||||
tell (zManglePkgName z_root (zPackageName z_root))
|
||||
tell "_datadir\") (\\_ -> "
|
||||
tell (zDatadir z_root)
|
||||
tell ")\n"
|
||||
+ tell "getLibexecDir :: IO FilePath\n"
|
||||
tell "getLibexecDir = "
|
||||
tell (zLibexecdir z_root)
|
||||
tell "\n"
|
||||
+ tell "getSysconfDir :: IO FilePath\n"
|
||||
tell "getSysconfDir = "
|
||||
tell (zSysconfdir z_root)
|
||||
tell "\n"
|
||||
diffcabal-dev-scripts/src/GenPathsModule.hs b/cabal-dev-scripts/src/GenPathsModule.hs
|
||||
index 46ef779e2..e9f5e099f 100644
|
||||
--- a/libraries/Cabal/cabal-dev-scripts/src/GenPathsModule.hs
|
||||
+++ b/libraries/Cabal/cabal-dev-scripts/src/GenPathsModule.hs
|
||||
@@ -41,6 +41,16 @@ $(capture "decls" [d|
|
||||
, zLibexecdir :: FilePath
|
||||
, zSysconfdir :: FilePath
|
||||
|
||||
+ , zShouldEmitLibDir :: Bool
|
||||
+ , zShouldEmitDynLibDir :: Bool
|
||||
+ , zShouldEmitLibexecDir :: Bool
|
||||
+ , zShouldEmitDataDir :: Bool
|
||||
+ , zShouldEmitSysconfDir :: Bool
|
||||
+
|
||||
+ , zShouldEmitWarning :: Bool
|
||||
+ , zWarning :: String
|
||||
+
|
||||
+ , zOr :: Bool -> Bool -> Bool
|
||||
, zNot :: Bool -> Bool
|
||||
, zManglePkgName :: PackageName -> String
|
||||
}
|
||||
difftemplates/Paths_pkg.template.hs b/templates/Paths_pkg.template.hs
|
||||
index 8e1e03d27..cc5c86701 100644
|
||||
--- a/libraries/Cabal/templates/Paths_pkg.template.hs
|
||||
+++ b/libraries/Cabal/templates/Paths_pkg.template.hs
|
||||
@@ -14,10 +14,31 @@
|
||||
{% endif %}
|
||||
{-# OPTIONS_GHC -fno-warn-missing-import-lists #-}
|
||||
{-# OPTIONS_GHC -w #-}
|
||||
-module Paths_{{ manglePkgName packageName }} (
|
||||
+module Paths_{{ manglePkgName packageName }}
|
||||
+ {% if shouldEmitWarning %}{-# WARNING {{ warning }} #-}{% endif %}
|
||||
+ (
|
||||
version,
|
||||
- getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir,
|
||||
- getDataFileName, getSysconfDir
|
||||
+ getBinDir,
|
||||
+{# We only care about the absolute case for our emit logic, since only in this
|
||||
+ case references are incurred. We are not going to hit isWindows and relocatable
|
||||
+ has no absolute references to begin with.
|
||||
+#}
|
||||
+{% if or (not absolute) shouldEmitLibDir %}
|
||||
+ getLibDir,
|
||||
+{% endif %}
|
||||
+{% if or (not absolute) shouldEmitDynLibDir %}
|
||||
+ getDynLibDir,
|
||||
+{% endif %}
|
||||
+{% if or (not absolute) shouldEmitLibexecDir %}
|
||||
+ getLibexecDir,
|
||||
+{% endif %}
|
||||
+{% if or (not absolute) shouldEmitDataDir %}
|
||||
+ getDataFileName,
|
||||
+ getDataDir,
|
||||
+{% endif %}
|
||||
+{% if or (not absolute) shouldEmitSysconfDir %}
|
||||
+ getSysconfDir
|
||||
+{% endif %}
|
||||
) where
|
||||
|
||||
{% if not absolute %}
|
||||
@@ -56,12 +77,12 @@ catchIO = Exception.catch
|
||||
version :: Version
|
||||
version = Version {{ versionDigits }} []
|
||||
|
||||
+{% if or (not absolute) shouldEmitDataDir %}
|
||||
getDataFileName :: FilePath -> IO FilePath
|
||||
getDataFileName name = do
|
||||
dir <- getDataDir
|
||||
return (dir `joinFileName` name)
|
||||
-
|
||||
-getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath
|
||||
+{% endif %}
|
||||
|
||||
{% defblock function_defs %}
|
||||
minusFileName :: FilePath -> String -> FilePath
|
||||
@@ -90,48 +111,93 @@ splitFileName p = (reverse (path2++drive), reverse fname)
|
||||
|
||||
{% if relocatable %}
|
||||
|
||||
+{# Relocatable can not incur any absolute references, so we can ignore it.
|
||||
+ Additionally, --enable-relocatable is virtually useless in Nix builds
|
||||
+#}
|
||||
+
|
||||
getPrefixDirReloc :: FilePath -> IO FilePath
|
||||
getPrefixDirReloc dirRel = do
|
||||
exePath <- getExecutablePath
|
||||
let (dir,_) = splitFileName exePath
|
||||
return ((dir `minusFileName` {{ bindir }}) `joinFileName` dirRel)
|
||||
|
||||
+getBinDir :: IO FilePath
|
||||
getBinDir = catchIO (getEnv "{{ manglePkgName packageName }}_bindir") (\_ -> getPrefixDirReloc $ {{ bindir }})
|
||||
+getLibDir :: IO FilePath
|
||||
getLibDir = catchIO (getEnv "{{ manglePkgName packageName }}_libdir") (\_ -> getPrefixDirReloc $ {{ libdir }})
|
||||
+getDynLibDir :: IO FilePath
|
||||
getDynLibDir = catchIO (getEnv "{{ manglePkgName packageName }}_dynlibdir") (\_ -> getPrefixDirReloc $ {{ dynlibdir }})
|
||||
+getDataDir :: IO FilePath
|
||||
getDataDir = catchIO (getEnv "{{ manglePkgName packageName }}_datadir") (\_ -> getPrefixDirReloc $ {{ datadir }})
|
||||
+getLibexecDir :: IO FilePath
|
||||
getLibexecDir = catchIO (getEnv "{{ manglePkgName packageName }}_libexecdir") (\_ -> getPrefixDirReloc $ {{ libexecdir }})
|
||||
+getSysconfDir :: IO FilePath
|
||||
getSysconfDir = catchIO (getEnv "{{ manglePkgName packageName }}_sysconfdir") (\_ -> getPrefixDirReloc $ {{ sysconfdir }})
|
||||
|
||||
{% useblock function_defs %}
|
||||
|
||||
{% elif absolute %}
|
||||
|
||||
-bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath
|
||||
+bindir :: FilePath
|
||||
bindir = {{ bindir }}
|
||||
-libdir = {{ libdir }}
|
||||
-dynlibdir = {{ dynlibdir }}
|
||||
-datadir = {{ datadir }}
|
||||
-libexecdir = {{ libexecdir }}
|
||||
-sysconfdir = {{ sysconfdir }}
|
||||
-
|
||||
+getBinDir :: IO FilePath
|
||||
getBinDir = catchIO (getEnv "{{ manglePkgName packageName }}_bindir") (\_ -> return bindir)
|
||||
+
|
||||
+{% if shouldEmitLibDir %}
|
||||
+libdir :: FilePath
|
||||
+libdir = {{ libdir }}
|
||||
+getLibDir :: IO FilePath
|
||||
getLibDir = catchIO (getEnv "{{ manglePkgName packageName }}_libdir") (\_ -> return libdir)
|
||||
+{% endif %}
|
||||
+
|
||||
+{% if shouldEmitDynLibDir %}
|
||||
+dynlibdir :: FilePath
|
||||
+dynlibdir = {{ dynlibdir }}
|
||||
+getDynLibDir :: IO FilePath
|
||||
getDynLibDir = catchIO (getEnv "{{ manglePkgName packageName }}_dynlibdir") (\_ -> return dynlibdir)
|
||||
+{% endif %}
|
||||
+
|
||||
+{% if shouldEmitDataDir %}
|
||||
+datadir :: FilePath
|
||||
+datadir = {{ datadir }}
|
||||
+getDataDir :: IO FilePath
|
||||
getDataDir = catchIO (getEnv "{{ manglePkgName packageName }}_datadir") (\_ -> return datadir)
|
||||
+{% endif %}
|
||||
+
|
||||
+{% if shouldEmitLibexecDir %}
|
||||
+libexecdir :: FilePath
|
||||
+libexecdir = {{ libexecdir }}
|
||||
+getLibexecDir :: IO FilePath
|
||||
getLibexecDir = catchIO (getEnv "{{ manglePkgName packageName }}_libexecdir") (\_ -> return libexecdir)
|
||||
+{% endif %}
|
||||
+
|
||||
+{% if shouldEmitSysconfDir %}
|
||||
+sysconfdir :: FilePath
|
||||
+sysconfdir = {{ sysconfdir }}
|
||||
+getSysconfDir :: IO FilePath
|
||||
getSysconfDir = catchIO (getEnv "{{ manglePkgName packageName }}_sysconfdir") (\_ -> return sysconfdir)
|
||||
+{% endif %}
|
||||
|
||||
{% elif isWindows %}
|
||||
|
||||
+{# We are only trying to fix the problem for aarch64-darwin with this patch,
|
||||
+ so let's ignore Windows which we can reach via pkgsCross, for example.
|
||||
+#}
|
||||
+
|
||||
prefix :: FilePath
|
||||
prefix = {{ prefix }}
|
||||
|
||||
+getBinDir :: IO FilePath
|
||||
getBinDir = getPrefixDirRel $ {{ bindir }}
|
||||
+getLibDir :: IO FilePath
|
||||
getLibDir = {{ libdir }}
|
||||
+getDynLibDir :: IO FilePath
|
||||
getDynLibDir = {{ dynlibdir }}
|
||||
+getDataDir :: IO FilePath
|
||||
getDataDir = catchIO (getEnv "{{ manglePkgName packageName }}_datadir") (\_ -> {{ datadir }})
|
||||
+getLibexecDir :: IO FilePath
|
||||
getLibexecDir = {{ libexecdir }}
|
||||
+getSysconfDir :: IO FilePath
|
||||
getSysconfDir = {{ sysconfdir }}
|
||||
|
||||
getPrefixDirRel :: FilePath -> IO FilePath
|
@ -177,7 +177,9 @@
|
||||
# These cause problems as they're not eliminated by GHC's dead code
|
||||
# elimination on aarch64-darwin. (see
|
||||
# https://github.com/NixOS/nixpkgs/issues/140774 for details).
|
||||
./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
|
||||
(if lib.versionOlder version "9.10"
|
||||
then ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
|
||||
else ./Cabal-3.12-paths-fix-cycle-aarch64-darwin.patch)
|
||||
]
|
||||
# Prevents passing --hyperlinked-source to haddock. This is a custom
|
||||
# workaround as we wait for this to be configurable via userSettings or
|
||||
@ -425,8 +427,8 @@ stdenv.mkDerivation ({
|
||||
"--disable-large-address-space"
|
||||
] ++ lib.optionals enableDwarf [
|
||||
"--enable-dwarf-unwind"
|
||||
"--with-libdw-includes=${lib.getDev elfutils}/include"
|
||||
"--with-libdw-libraries=${lib.getLib elfutils}/lib"
|
||||
"--with-libdw-includes=${lib.getDev targetPackages.elfutils}/include"
|
||||
"--with-libdw-libraries=${lib.getLib targetPackages.elfutils}/lib"
|
||||
] ++ lib.optionals targetPlatform.isDarwin [
|
||||
# Darwin uses llvm-ar. GHC will try to use `-L` with `ar` when it is `llvm-ar`
|
||||
# but it doesn’t currently work because Cabal never uses `-L` on Darwin. See:
|
||||
|
@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
|
||||
"prefix=$(out)"
|
||||
"USE_BINARYBUILDER=0"
|
||||
] ++ lib.optionals stdenv.isx86_64 [
|
||||
# https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py
|
||||
"JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)"
|
||||
# https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh
|
||||
"JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)"
|
||||
] ++ lib.optionals stdenv.isAarch64 [
|
||||
"JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;armv8.2-a,crypto,fullfp16,lse,rdm"
|
||||
"JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)"
|
||||
];
|
||||
|
||||
# remove forbidden reference to $TMPDIR
|
||||
|
@ -56,7 +56,21 @@ self: super: {
|
||||
};
|
||||
in
|
||||
{
|
||||
cabal-install = super.cabal-install.overrideScope cabalInstallOverlay;
|
||||
cabal-install =
|
||||
let
|
||||
cabal-install = super.cabal-install.overrideScope cabalInstallOverlay;
|
||||
scope = cabal-install.scope;
|
||||
in
|
||||
# Some dead code is not properly eliminated on aarch64-darwin, leading
|
||||
# to bogus references to some dependencies.
|
||||
overrideCabal (old: lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) {
|
||||
postInstall = ''
|
||||
${old.postInstall or ""}
|
||||
remove-references-to -t ${scope.HTTP} "$out/bin/.cabal-wrapped"
|
||||
remove-references-to -t ${scope.Cabal} "$out/bin/.cabal-wrapped"
|
||||
'';
|
||||
}) cabal-install;
|
||||
|
||||
cabal-install-solver = super.cabal-install-solver.overrideScope cabalInstallOverlay;
|
||||
|
||||
# Needs cabal-install >= 3.8 /as well as/ matching Cabal
|
||||
|
@ -110,6 +110,12 @@ self: super: ({
|
||||
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
|
||||
'' + (drv.postPatch or "");
|
||||
}) super.x509-system;
|
||||
crypton-x509-system = overrideCabal (drv:
|
||||
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
|
||||
postPatch = ''
|
||||
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
|
||||
'' + (drv.postPatch or "");
|
||||
}) super.crypton-x509-system;
|
||||
|
||||
# https://github.com/haskell-foundation/foundation/pull/412
|
||||
foundation = dontCheck super.foundation;
|
||||
@ -335,6 +341,27 @@ self: super: ({
|
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin
|
||||
|
||||
# Workarounds for justStaticExecutables on aarch64-darwin. Since dead code
|
||||
# elimination barely works on aarch64-darwin, any package that has a
|
||||
# dependency that uses a Paths_ module will incur a reference on GHC, making
|
||||
# it fail with disallowGhcReference (which is set by justStaticExecutables).
|
||||
#
|
||||
# To address this, you can either manually remove the references causing this
|
||||
# after verifying they are indeed erroneous (e.g. cabal2nix) or just disable
|
||||
# the check, sticking with the status quo. Ideally there'll be zero cases of
|
||||
# the latter in the future!
|
||||
inherit (
|
||||
lib.mapAttrs (_: overrideCabal (old: {
|
||||
postInstall = ''
|
||||
remove-references-to -t ${self.hpack} "$out/bin/cabal2nix"
|
||||
# Note: The `data` output is needed at runtime.
|
||||
remove-references-to -t ${self.distribution-nixpkgs.out} "$out/bin/hackage2nix"
|
||||
|
||||
${old.postInstall or ""}
|
||||
'';
|
||||
})) super
|
||||
) cabal2nix cabal2nix-unstable;
|
||||
|
||||
# https://github.com/fpco/unliftio/issues/87
|
||||
unliftio = dontCheck super.unliftio;
|
||||
# This is the same issue as above; the rio tests call functions in unliftio
|
||||
@ -371,4 +398,12 @@ self: super: ({
|
||||
# same
|
||||
# https://hydra.nixos.org/build/174540882/nixlog/9
|
||||
jacinda = dontCheck super.jacinda;
|
||||
|
||||
# Greater floating point error on x86_64-darwin (!) for some reason
|
||||
# https://github.com/ekmett/ad/issues/113
|
||||
ad = overrideCabal (drv: {
|
||||
testFlags = drv.testFlags or [ ] ++ [
|
||||
"-p" "!/issue-108/"
|
||||
];
|
||||
}) super.ad;
|
||||
})
|
||||
|
@ -68,6 +68,7 @@ self: super: {
|
||||
] (super.hashable.override {
|
||||
os-string = null;
|
||||
});
|
||||
hashable-time = doDistribute (unmarkBroken super.hashable-time);
|
||||
|
||||
# Too strict lower bounds on base
|
||||
primitive-addr = doJailbreak super.primitive-addr;
|
||||
|
@ -86,7 +86,12 @@ self: super: {
|
||||
haskell-language-server = throw "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version";
|
||||
|
||||
# Needs to use ghc-lib due to incompatible GHC
|
||||
ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_6);
|
||||
ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5);
|
||||
|
||||
# ghc-lib >= 9.6 and friends no longer build with GHC 9.0
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_2_8_20230729;
|
||||
|
||||
# Test suite sometimes segfaults with GHC 9.0.1 and 9.0.2
|
||||
# https://github.com/ekmett/reflection/issues/51
|
||||
|
@ -69,6 +69,9 @@ self: super: {
|
||||
# https://github.com/mokus0/th-extras/pull/21
|
||||
th-extras = doJailbreak super.th-extras;
|
||||
|
||||
# not in Stackage, needs to match ghc-lib
|
||||
ghc-tags = doDistribute self.ghc-tags_1_7;
|
||||
|
||||
#
|
||||
# Too strict bounds without upstream fix
|
||||
#
|
||||
|
@ -55,7 +55,7 @@ self: super: {
|
||||
th-abstraction = doDistribute self.th-abstraction_0_7_0_0;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_10_1_20240511;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223;
|
||||
megaparsec = doDistribute self.megaparsec_9_6_1;
|
||||
# TODO: remove when aeson updates or launches a revision
|
||||
# see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088
|
||||
|
@ -2014,7 +2014,6 @@ broken-packages:
|
||||
- ghc-syb # failure in job https://hydra.nixos.org/build/233236783 at 2023-09-02
|
||||
- ghc-syb-utils # failure in job https://hydra.nixos.org/build/233229196 at 2023-09-02
|
||||
- ghc-symbol # failure in job https://hydra.nixos.org/build/252710738 at 2024-03-16
|
||||
- ghc-tags # failure in job https://hydra.nixos.org/build/252730131 at 2024-03-16
|
||||
- ghc-tags-plugin # failure in job https://hydra.nixos.org/build/233229916 at 2023-09-02
|
||||
- ghc-time-alloc-prof # failure in job https://hydra.nixos.org/build/233242289 at 2023-09-02
|
||||
- ghc-usage # failure in job https://hydra.nixos.org/build/233199565 at 2023-09-02
|
||||
|
@ -66,10 +66,11 @@ extra-packages:
|
||||
- ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2
|
||||
- ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4
|
||||
- ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8
|
||||
- ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2
|
||||
- ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2
|
||||
- ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0
|
||||
- ghc-lib == 9.8.* # 2024-05-19: preserve for GHC 9.8
|
||||
- ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0
|
||||
- ghc-lib-parser == 9.8.* # 2024-05-19: preserve for GHC 9.8
|
||||
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2
|
||||
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0
|
||||
- ghc-lib-parser-ex == 9.8.* # 2024-05-19: preserve for GHC 9.8
|
||||
- ghc-syntax-highlighter == 0.0.10.* # 2023-11-20:
|
||||
- gi-soup == 2.4.28 # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages)
|
||||
@ -118,6 +119,7 @@ extra-packages:
|
||||
- retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2
|
||||
- ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.*
|
||||
- ghc-tags == 1.6.* # 2023-02-18: preserve for ghc-lib == 9.4.*
|
||||
- ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.*
|
||||
- shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.*
|
||||
- algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0
|
||||
- fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10
|
||||
@ -128,6 +130,57 @@ extra-packages:
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
- Agda
|
||||
alexfmpe:
|
||||
- aeson-gadt-th
|
||||
- basic-sop
|
||||
- cli-extras
|
||||
- cli-git
|
||||
- cli-nix
|
||||
- commutative-semigroups
|
||||
- constraints-extras
|
||||
- dependent-map
|
||||
- dependent-monoidal-map
|
||||
- dependent-sum
|
||||
- dependent-sum-aeson-orphans
|
||||
- dependent-sum-template
|
||||
- gargoyle
|
||||
- gargoyle-postgresql
|
||||
- gargoyle-postgresql-connect
|
||||
- gargoyle-postgresql-nix
|
||||
- generics-sop
|
||||
- ghcjs-base
|
||||
- ghcjs-dom
|
||||
- ghcjs-dom-hello
|
||||
- ghcjs-dom-javascript
|
||||
- haveibeenpwned
|
||||
- jsaddle
|
||||
- jsaddle-clib
|
||||
- jsaddle-dom
|
||||
- jsaddle-hello
|
||||
- jsaddle-warp
|
||||
- jsaddle-webkit2gtk
|
||||
- jsaddle-wkwebview
|
||||
- json-sop
|
||||
- large-generics
|
||||
- large-records
|
||||
- lens-sop
|
||||
- linux-namespaces
|
||||
- monoidal-containers
|
||||
- nix-thunk
|
||||
- patch
|
||||
- proto-lens-arbitrary
|
||||
- proto3-suite
|
||||
- proto3-wire
|
||||
- records-sop
|
||||
- reflex
|
||||
- reflex-dom
|
||||
- reflex-dom-core
|
||||
- reflex-gadt-api
|
||||
- universe
|
||||
- universe-some
|
||||
- vessel
|
||||
- warp
|
||||
- which
|
||||
Anton-Latukha:
|
||||
- hnix
|
||||
- hnix-store-core
|
||||
@ -337,6 +390,8 @@ package-maintainers:
|
||||
- cornelis
|
||||
poscat:
|
||||
- hinit
|
||||
Profpatsch:
|
||||
- gitit
|
||||
psibi:
|
||||
- path-pieces
|
||||
- persistent
|
||||
|
@ -770,9 +770,12 @@ self: super: builtins.intersectAttrs super {
|
||||
preInstall = drv.preInstall or "" + ''
|
||||
installTargets="install"
|
||||
installFlagsArray+=(
|
||||
"BUILDER=:"
|
||||
"PREFIX="
|
||||
"DESTDIR=$out"
|
||||
# Prevent Makefile from calling cabal/Setup again
|
||||
"BUILDER=:"
|
||||
# Make Haskell build dependencies available
|
||||
"GHC=${self.buildHaskellPackages.ghc.targetPrefix}ghc -global-package-db -package-db $setupPackageConfDir"
|
||||
)
|
||||
'';
|
||||
installPhase = null;
|
||||
@ -973,7 +976,7 @@ self: super: builtins.intersectAttrs super {
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
export PATH=$PWD/dist/build/ihaskell:$PATH
|
||||
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
|
||||
export NIX_GHC_PACKAGE_PATH_FOR_TEST=$PWD/dist/package.conf.inplace/:$packageConfDir:
|
||||
'';
|
||||
}) super.ihaskell;
|
||||
|
||||
@ -1035,6 +1038,8 @@ self: super: builtins.intersectAttrs super {
|
||||
pkgs.buildPackages.makeWrapper
|
||||
];
|
||||
postInstall = ''
|
||||
${drv.postInstall or ""}
|
||||
|
||||
wrapProgram $out/bin/cabal2nix \
|
||||
--prefix PATH ":" "${
|
||||
pkgs.lib.makeBinPath [ pkgs.nix pkgs.nix-prefetch-scripts ]
|
||||
@ -1068,6 +1073,14 @@ self: super: builtins.intersectAttrs super {
|
||||
pkgs.nix-prefetch-docker
|
||||
]
|
||||
}"
|
||||
''
|
||||
# Prevent erroneous references to other libraries that use Paths_ modules
|
||||
# on aarch64-darwin. Note that references to the data outputs are not removed.
|
||||
+ lib.optionalString (with pkgs.stdenv; hostPlatform.isDarwin && hostPlatform.isAarch64) ''
|
||||
remove-references-to -t "${self.shake.out}" "$out/bin/.nvfetcher-wrapped"
|
||||
remove-references-to -t "${self.js-jquery.out}" "$out/bin/.nvfetcher-wrapped"
|
||||
remove-references-to -t "${self.js-flot.out}" "$out/bin/.nvfetcher-wrapped"
|
||||
remove-references-to -t "${self.js-dgtable.out}" "$out/bin/.nvfetcher-wrapped"
|
||||
'';
|
||||
}) super.nvfetcher);
|
||||
|
||||
|
@ -110,6 +110,28 @@ in
|
||||
# build products from that prior build as a starting point for accelerating
|
||||
# this build
|
||||
, previousIntermediates ? null
|
||||
# References to these store paths are forbidden in the produced output.
|
||||
, disallowedRequisites ? []
|
||||
# Whether to allow the produced output to refer to `ghc`.
|
||||
#
|
||||
# This is used by `haskell.lib.justStaticExecutables` to help prevent static
|
||||
# Haskell binaries from having erroneous dependencies on GHC.
|
||||
#
|
||||
# Generated `Paths_*` modules include paths for the runtime library
|
||||
# directory (and similar) of the package being built. If the `Paths_*`
|
||||
# module is imported, this creates a dependency from the static binary
|
||||
# being built to the _library_ being built (which is dynamically linked
|
||||
# and depends on the GHC used to build it).
|
||||
#
|
||||
# To avoid this:
|
||||
# 1. Build the impacted derivation.
|
||||
# 2. Run `strings` on the built binary of the impacted derivation to
|
||||
# locate the store paths it depends on.
|
||||
# 3. Add `remove-references-to -t ${bad-store-path-in-binary}` to the
|
||||
# impacted derivation's `postInstall`.
|
||||
#
|
||||
# See: https://github.com/NixOS/nixpkgs/issues/164630
|
||||
, disallowGhcReference ? false
|
||||
, # Cabal 3.8 which is shipped by default for GHC >= 9.3 always calls
|
||||
# `pkg-config --libs --static` as part of the configure step. This requires
|
||||
# Requires.private dependencies of pkg-config dependencies to be present in
|
||||
@ -215,9 +237,6 @@ let
|
||||
|
||||
parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS";
|
||||
|
||||
crossCabalFlagsString =
|
||||
lib.optionalString isCross (" " + lib.concatStringsSep " " crossCabalFlags);
|
||||
|
||||
buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
|
||||
|
||||
defaultConfigureFlags = [
|
||||
@ -370,6 +389,34 @@ let
|
||||
'';
|
||||
|
||||
intermediatesDir = "share/haskell/${ghc.version}/${pname}-${version}/dist";
|
||||
|
||||
# This is a script suitable for --test-wrapper of Setup.hs' test command
|
||||
# (https://cabal.readthedocs.io/en/3.12/setup-commands.html#cmdoption-runhaskell-Setup.hs-test-test-wrapper).
|
||||
# We use it to set some environment variables that the test suite may need,
|
||||
# e.g. GHC_PACKAGE_PATH to invoke GHC(i) at runtime with build dependencies
|
||||
# available. See the comment accompanying checkPhase below on how to customize
|
||||
# this behavior. We need to use a wrapper script since Cabal forbids setting
|
||||
# certain environment variables since they can alter GHC's behavior (e.g.
|
||||
# GHC_PACKAGE_PATH) and cause failures. While building, Cabal will set
|
||||
# GHC_ENVIRONMENT to make the packages picked at configure time available to
|
||||
# GHC, but unfortunately not at test time. The test wrapper script will be
|
||||
# executed after such environment checks, so we can take some liberties which
|
||||
# is unproblematic since we know our synthetic package db matches what Cabal
|
||||
# will see at configure time exactly. See also
|
||||
# <https://github.com/haskell/cabal/issues/7792>.
|
||||
testWrapperScript = buildPackages.writeShellScript
|
||||
"haskell-generic-builder-test-wrapper.sh"
|
||||
''
|
||||
set -eu
|
||||
|
||||
# We expect this to be either empty or set by checkPhase
|
||||
if [[ -n "''${NIX_GHC_PACKAGE_PATH_FOR_TEST}" ]]; then
|
||||
export GHC_PACKAGE_PATH="''${NIX_GHC_PACKAGE_PATH_FOR_TEST}"
|
||||
fi
|
||||
|
||||
exec "$@"
|
||||
'';
|
||||
|
||||
in lib.fix (drv:
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
@ -528,8 +575,6 @@ stdenv.mkDerivation ({
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
unset GHC_PACKAGE_PATH # Cabal complains if this variable is set during configure.
|
||||
|
||||
echo configureFlags: $configureFlags
|
||||
${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
|
||||
${lib.optionalString (!allowInconsistentDependencies) ''
|
||||
@ -538,7 +583,6 @@ stdenv.mkDerivation ({
|
||||
exit 1
|
||||
fi
|
||||
''}
|
||||
export GHC_PACKAGE_PATH="$packageConfDir:"
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
@ -556,7 +600,7 @@ stdenv.mkDerivation ({
|
||||
find dist/build -exec touch -d '1970-01-01T00:00:00Z' {} +
|
||||
''
|
||||
+ ''
|
||||
${setupCommand} build ${buildTarget}${crossCabalFlagsString}${buildFlagsString}
|
||||
${setupCommand} build ${buildTarget}${buildFlagsString}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
@ -565,12 +609,22 @@ stdenv.mkDerivation ({
|
||||
# Run test suite(s) and pass `checkFlags` as well as `checkFlagsArray`.
|
||||
# `testFlags` are added to `checkFlagsArray` each prefixed with
|
||||
# `--test-option`, so Cabal passes it to the underlying test suite binary.
|
||||
#
|
||||
# We also take care of setting GHC_PACKAGE_PATH during test suite execution,
|
||||
# so it can run GHC(i) with build dependencies available:
|
||||
# - If NIX_GHC_PACKAGE_PATH_FOR_TEST is set, it become the value of GHC_PACKAGE_PATH
|
||||
# while the test suite is executed.
|
||||
# - If it is empty, it'll be unset during test suite execution.
|
||||
# - Otherwise GHC_PACKAGE_PATH will have the package db used for configuring
|
||||
# plus GHC's core packages.
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
checkFlagsArray+=(
|
||||
"--show-details=streaming"
|
||||
"--test-wrapper=${testWrapperScript}"
|
||||
${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)}
|
||||
)
|
||||
export NIX_GHC_PACKAGE_PATH_FOR_TEST="''${NIX_GHC_PACKAGE_PATH_FOR_TEST:-$packageConfDir:}"
|
||||
${setupCommand} test ${testTarget} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
|
||||
runHook postCheck
|
||||
'';
|
||||
@ -647,7 +701,7 @@ stdenv.mkDerivation ({
|
||||
|
||||
passthru = passthru // rec {
|
||||
|
||||
inherit pname version;
|
||||
inherit pname version disallowGhcReference;
|
||||
|
||||
compiler = ghc;
|
||||
|
||||
@ -808,10 +862,19 @@ stdenv.mkDerivation ({
|
||||
// optionalAttrs (args ? dontStrip) { inherit dontStrip; }
|
||||
// optionalAttrs (postPhases != []) { inherit postPhases; }
|
||||
// optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
|
||||
// optionalAttrs (disallowedRequisites != [] || disallowGhcReference) {
|
||||
disallowedRequisites =
|
||||
disallowedRequisites
|
||||
++ (
|
||||
if disallowGhcReference
|
||||
then [ghc]
|
||||
else []
|
||||
);
|
||||
}
|
||||
|
||||
# Implicit pointer to integer conversions are errors by default since clang 15.
|
||||
# Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456.
|
||||
// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) {
|
||||
// optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion";
|
||||
}
|
||||
)
|
||||
|
118
pkgs/development/haskell-modules/hackage-packages.nix
generated
118
pkgs/development/haskell-modules/hackage-packages.nix
generated
@ -26537,6 +26537,7 @@ self: {
|
||||
description = "Derivation of Aeson instances for GADTs";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "readme";
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"aeson-generic-compat" = callPackage
|
||||
@ -46689,6 +46690,7 @@ self: {
|
||||
];
|
||||
description = "Basic examples and functions for generics-sop";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"basics" = callPackage
|
||||
@ -67187,6 +67189,7 @@ self: {
|
||||
];
|
||||
description = "Miscellaneous utilities for building and working with command line interfaces";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"cli-git" = callPackage
|
||||
@ -67203,6 +67206,7 @@ self: {
|
||||
];
|
||||
description = "Bindings to the git command-line interface";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"cli-nix" = callPackage
|
||||
@ -67219,6 +67223,7 @@ self: {
|
||||
];
|
||||
description = "Bindings to the nix command-line interface";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"cli-setup" = callPackage
|
||||
@ -70705,6 +70710,7 @@ self: {
|
||||
libraryHaskellDepends = [ base containers ];
|
||||
description = "Commutative semigroups";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"commutative-semigroups_0_2_0_1" = callPackage
|
||||
@ -70717,6 +70723,7 @@ self: {
|
||||
description = "Commutative semigroups";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"comonad" = callPackage
|
||||
@ -74500,6 +74507,7 @@ self: {
|
||||
description = "Utility package for constraints";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "readme";
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"constrictor" = callPackage
|
||||
@ -86484,6 +86492,7 @@ self: {
|
||||
description = "Dependent finite maps (partial dependent products)";
|
||||
license = "unknown";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"dependent-map" = callPackage
|
||||
@ -86501,6 +86510,7 @@ self: {
|
||||
];
|
||||
description = "Dependent finite maps (partial dependent products)";
|
||||
license = "unknown";
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"dependent-monoidal-map" = callPackage
|
||||
@ -86517,6 +86527,7 @@ self: {
|
||||
];
|
||||
description = "Dependent map that uses semigroup mappend";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"dependent-state" = callPackage
|
||||
@ -86543,6 +86554,7 @@ self: {
|
||||
description = "Dependent sum type";
|
||||
license = lib.licenses.publicDomain;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"dependent-sum" = callPackage
|
||||
@ -86556,6 +86568,7 @@ self: {
|
||||
libraryHaskellDepends = [ base constraints-extras some ];
|
||||
description = "Dependent sum type";
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"dependent-sum-aeson-orphans" = callPackage
|
||||
@ -86572,6 +86585,7 @@ self: {
|
||||
];
|
||||
description = "JSON instances for DSum, DMap, and Some";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"dependent-sum-template" = callPackage
|
||||
@ -86588,6 +86602,7 @@ self: {
|
||||
testHaskellDepends = [ base constraints-extras dependent-sum ];
|
||||
description = "Template Haskell code to generate instances of classes in dependent-sum package";
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"dependent-sum-template_0_2_0_1" = callPackage
|
||||
@ -86609,6 +86624,7 @@ self: {
|
||||
description = "Template Haskell code to generate instances of classes in some package";
|
||||
license = lib.licenses.publicDomain;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"depends" = callPackage
|
||||
@ -115749,6 +115765,7 @@ self: {
|
||||
];
|
||||
description = "Automatically spin up and spin down local daemons";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"gargoyle-postgresql" = callPackage
|
||||
@ -115770,6 +115787,7 @@ self: {
|
||||
];
|
||||
description = "Manage PostgreSQL servers with gargoyle";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"gargoyle-postgresql-connect" = callPackage
|
||||
@ -115787,6 +115805,7 @@ self: {
|
||||
];
|
||||
description = "Connect to gargoyle-managed postgresql instances";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"gargoyle-postgresql-nix" = callPackage
|
||||
@ -115807,6 +115826,7 @@ self: {
|
||||
];
|
||||
description = "Manage PostgreSQL servers with gargoyle and nix";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"garlic-bread" = callPackage
|
||||
@ -117516,6 +117536,7 @@ self: {
|
||||
];
|
||||
description = "Generic Programming using True Sums of Products";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"generics-sop_0_5_1_4" = callPackage
|
||||
@ -117538,6 +117559,7 @@ self: {
|
||||
description = "Generic Programming using True Sums of Products";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"generics-sop-lens" = callPackage
|
||||
@ -119906,6 +119928,28 @@ self: {
|
||||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"ghc-lib_9_8_2_20240223" = callPackage
|
||||
({ mkDerivation, alex, array, base, binary, bytestring, containers
|
||||
, deepseq, directory, exceptions, filepath, ghc-lib-parser
|
||||
, ghc-prim, happy, hpc, parsec, pretty, process, rts
|
||||
, semaphore-compat, stm, time, transformers, unix
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ghc-lib";
|
||||
version = "9.8.2.20240223";
|
||||
sha256 = "12lmk3ipd1pyiwzmnb0zgbw86yy7mhsy530dnackwidg3ww07nia";
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
array base binary bytestring containers deepseq directory
|
||||
exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty
|
||||
process rts semaphore-compat stm time transformers unix
|
||||
];
|
||||
libraryToolDepends = [ alex happy ];
|
||||
description = "The GHC API, decoupled from GHC versions";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"ghc-lib_9_10_1_20240511" = callPackage
|
||||
({ mkDerivation, alex, array, base, binary, bytestring, containers
|
||||
, deepseq, directory, exceptions, filepath, ghc-lib-parser
|
||||
@ -120633,7 +120677,6 @@ self: {
|
||||
license = lib.licenses.mpl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "ghc-tags";
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"ghc-tags_1_6" = callPackage
|
||||
@ -120657,7 +120700,29 @@ self: {
|
||||
license = lib.licenses.mpl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "ghc-tags";
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"ghc-tags_1_7" = callPackage
|
||||
({ mkDerivation, aeson, async, attoparsec, base, bytestring
|
||||
, containers, deepseq, directory, filepath, ghc, ghc-boot
|
||||
, ghc-paths, optparse-applicative, process, stm, temporary, text
|
||||
, time, vector, yaml
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ghc-tags";
|
||||
version = "1.7";
|
||||
sha256 = "17189yi1zffgcdwx0nb6n4pbv3jhfajhfnag84fnqwy4kbvl5ma4";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [
|
||||
aeson async attoparsec base bytestring containers deepseq directory
|
||||
filepath ghc ghc-boot ghc-paths optparse-applicative process stm
|
||||
temporary text time vector yaml
|
||||
];
|
||||
description = "Utility for generating ctags and etags with GHC API";
|
||||
license = lib.licenses.mpl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "ghc-tags";
|
||||
}) {};
|
||||
|
||||
"ghc-tags" = callPackage
|
||||
@ -120679,9 +120744,7 @@ self: {
|
||||
];
|
||||
description = "Utility for generating ctags and etags with GHC API";
|
||||
license = lib.licenses.mpl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "ghc-tags";
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"ghc-tags-core" = callPackage
|
||||
@ -121290,6 +121353,7 @@ self: {
|
||||
sha256 = "1cx9jqpbr6b30qckp2zpsfk3swa58snjb79pq0l6485nvrxa9mls";
|
||||
description = "base library for GHCJS";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"ghcjs-base-stub" = callPackage
|
||||
@ -121336,6 +121400,7 @@ self: {
|
||||
];
|
||||
description = "DOM library that supports both GHCJS and GHC";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"ghcjs-dom-hello" = callPackage
|
||||
@ -121358,6 +121423,7 @@ self: {
|
||||
description = "GHCJS DOM Hello World, an example package";
|
||||
license = lib.licenses.mit;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"ghcjs-dom-javascript" = callPackage
|
||||
@ -121369,6 +121435,7 @@ self: {
|
||||
description = "DOM library using JSFFI and GHCJS";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
@ -124459,7 +124526,9 @@ self: {
|
||||
];
|
||||
description = "Wiki using happstack, git or darcs, and pandoc";
|
||||
license = "GPL";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
maintainers = [
|
||||
lib.maintainers.Profpatsch lib.maintainers.sternenseemann
|
||||
];
|
||||
}) {};
|
||||
|
||||
"gitlab-api" = callPackage
|
||||
@ -144055,6 +144124,7 @@ self: {
|
||||
description = "Library for checking for weak/compromised passwords";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "readme";
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"haven" = callPackage
|
||||
@ -178568,6 +178638,7 @@ self: {
|
||||
];
|
||||
description = "Interface for JavaScript that works with GHCJS and GHC";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"jsaddle-clib" = callPackage
|
||||
@ -178583,6 +178654,7 @@ self: {
|
||||
];
|
||||
description = "Interface for JavaScript that works with GHCJS and GHC";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"jsaddle-dom" = callPackage
|
||||
@ -178598,6 +178670,7 @@ self: {
|
||||
];
|
||||
description = "DOM library that uses jsaddle to support both GHCJS and GHC";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"jsaddle-hello" = callPackage
|
||||
@ -178618,6 +178691,7 @@ self: {
|
||||
description = "JSaddle Hello World, an example package";
|
||||
license = lib.licenses.mit;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"jsaddle-warp" = callPackage
|
||||
@ -178640,7 +178714,9 @@ self: {
|
||||
];
|
||||
description = "Interface for JavaScript that works with GHCJS and GHC";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.maralorn ];
|
||||
maintainers = [
|
||||
lib.maintainers.alexfmpe lib.maintainers.maralorn
|
||||
];
|
||||
}) {};
|
||||
|
||||
"jsaddle-webkit2gtk" = callPackage
|
||||
@ -178661,6 +178737,7 @@ self: {
|
||||
description = "Interface for JavaScript that works with GHCJS and GHC";
|
||||
license = lib.licenses.mit;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"jsaddle-webkitgtk" = callPackage
|
||||
@ -178691,6 +178768,7 @@ self: {
|
||||
description = "Interface for JavaScript that works with GHCJS and GHC";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.darwin;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"jsc" = callPackage
|
||||
@ -179460,6 +179538,7 @@ self: {
|
||||
description = "Generics JSON (de)serialization using generics-sop";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"json-spec" = callPackage
|
||||
@ -186940,6 +187019,7 @@ self: {
|
||||
];
|
||||
description = "Generic programming API for large-records and large-anon";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"large-hashable" = callPackage
|
||||
@ -186999,6 +187079,7 @@ self: {
|
||||
description = "Efficient compilation for large records, linear in the size of the record";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
@ -189081,6 +189162,7 @@ self: {
|
||||
description = "Computing lenses generically using generics-sop";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
@ -192499,6 +192581,7 @@ self: {
|
||||
description = "Work with linux namespaces: create new or enter existing ones";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"linux-perf" = callPackage
|
||||
@ -209002,6 +209085,7 @@ self: {
|
||||
];
|
||||
description = "Containers with monoidal accumulation";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"monoidal-functors" = callPackage
|
||||
@ -218837,6 +218921,7 @@ self: {
|
||||
description = "Lightweight dependency management with Nix";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "nix-thunk";
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"nix-tools" = callPackage
|
||||
@ -231253,6 +231338,7 @@ self: {
|
||||
testHaskellDepends = [ base containers hedgehog HUnit ];
|
||||
description = "Data structures for describing changes to other data structures";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"patch-combinators" = callPackage
|
||||
@ -247283,6 +247369,7 @@ self: {
|
||||
];
|
||||
description = "Arbitrary instances for proto-lens";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"proto-lens-combinators" = callPackage
|
||||
@ -247470,6 +247557,7 @@ self: {
|
||||
description = "A higher-level API to the proto3-wire library";
|
||||
license = lib.licenses.asl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"proto3-wire" = callPackage
|
||||
@ -247495,6 +247583,7 @@ self: {
|
||||
benchmarkHaskellDepends = [ base bytestring criterion random ];
|
||||
description = "A low-level implementation of the Protocol Buffers (version 3) wire format";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"protobuf" = callPackage
|
||||
@ -255541,6 +255630,7 @@ self: {
|
||||
];
|
||||
description = "Record subtyping and record utilities with generics-sop";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"records-th" = callPackage
|
||||
@ -256446,6 +256536,7 @@ self: {
|
||||
];
|
||||
description = "Higher-order Functional Reactive Programming";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"reflex-animation" = callPackage
|
||||
@ -256549,7 +256640,9 @@ self: {
|
||||
];
|
||||
description = "Functional Reactive Web Apps with Reflex";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.maralorn ];
|
||||
maintainers = [
|
||||
lib.maintainers.alexfmpe lib.maintainers.maralorn
|
||||
];
|
||||
}) {};
|
||||
|
||||
"reflex-dom-ace" = callPackage
|
||||
@ -256648,6 +256741,7 @@ self: {
|
||||
description = "Functional Reactive Web Apps with Reflex";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
broken = true;
|
||||
}) {chrome-test-utils = null;};
|
||||
|
||||
@ -256858,6 +256952,7 @@ self: {
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "readme";
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
@ -317176,6 +317271,7 @@ self: {
|
||||
];
|
||||
description = "A class for finite and recursively enumerable types";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"universe_1_2_3" = callPackage
|
||||
@ -317193,6 +317289,7 @@ self: {
|
||||
description = "A class for finite and recursively enumerable types";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"universe-base" = callPackage
|
||||
@ -317354,6 +317451,7 @@ self: {
|
||||
testHaskellDepends = [ base some template-haskell universe-base ];
|
||||
description = "Universe instances for Some from some";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"universe-some_1_2_2" = callPackage
|
||||
@ -317372,6 +317470,7 @@ self: {
|
||||
description = "Universe instances for Some from some";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"universe-th" = callPackage
|
||||
@ -322333,6 +322432,7 @@ self: {
|
||||
description = "Functor-parametric containers";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
@ -326025,6 +326125,7 @@ self: {
|
||||
description = "A fast, light-weight web server for WAI applications";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"warp" = callPackage
|
||||
@ -326059,6 +326160,7 @@ self: {
|
||||
];
|
||||
description = "A fast, light-weight web server for WAI applications";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"warp_3_4_1" = callPackage
|
||||
@ -326096,6 +326198,7 @@ self: {
|
||||
description = "A fast, light-weight web server for WAI applications";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"warp-dynamic" = callPackage
|
||||
@ -328656,6 +328759,7 @@ self: {
|
||||
libraryHaskellDepends = [ base shelly template-haskell text ];
|
||||
description = "Determine the full path to an executable";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.alexfmpe ];
|
||||
}) {};
|
||||
|
||||
"while-lang-parser" = callPackage
|
||||
|
@ -290,7 +290,7 @@ rec {
|
||||
/* link executables statically against haskell libs to reduce
|
||||
closure size
|
||||
*/
|
||||
justStaticExecutables = overrideCabal (drv: {
|
||||
justStaticExecutables = overrideCabal (drv: {
|
||||
enableSharedExecutables = false;
|
||||
enableLibraryProfiling = false;
|
||||
isLibrary = false;
|
||||
@ -300,6 +300,7 @@ rec {
|
||||
# Remove every directory which could have links to other store paths.
|
||||
rm -rf $out/lib $out/nix-support $out/share/doc
|
||||
'';
|
||||
disallowGhcReference = true;
|
||||
});
|
||||
|
||||
/* Build a source distribution tarball instead of using the source files
|
||||
|
@ -25,13 +25,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "amdvlk";
|
||||
version = "2024.Q2.1";
|
||||
version = "2024.Q2.2";
|
||||
|
||||
src = fetchRepoProject {
|
||||
name = "${pname}-src";
|
||||
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
||||
rev = "refs/tags/v-${version}";
|
||||
sha256 = "6++NuNuISIXMv/btII2KNzORI4mNaE9MjU18zGizwFY=";
|
||||
sha256 = "MBO7XE2C4y2ZODLGnNw17n1TlKDjD5yyjuvzvTSaQIU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -6,6 +6,7 @@
|
||||
, vtk
|
||||
, ApplicationServices
|
||||
, Cocoa
|
||||
, DarwinTools # sw_vers
|
||||
, libiconv
|
||||
, enablePython ? false
|
||||
, python ? null
|
||||
@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
] ++ lib.optional stdenv.isDarwin DarwinTools;
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
|
@ -24,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-h4NzfS27+jWyHbegxF+pgN6JzJdVAoM16J6G/9uNJc4=";
|
||||
};
|
||||
|
||||
# test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277
|
||||
prePatch = lib.optionalString (stdenv.isLinux && stdenv.isAarch64) ''
|
||||
substituteInPlace unittest/algorithm/utils/CMakeLists.txt \
|
||||
--replace-fail "add_pinocchio_unit_test(force)" ""
|
||||
'';
|
||||
|
||||
# example-robot-data models are used in checks.
|
||||
# Upstream provide them as git submodule, but we can use our own version instead.
|
||||
postPatch = ''
|
||||
|
@ -2,6 +2,7 @@
|
||||
, bzip2
|
||||
, cbc
|
||||
, cmake
|
||||
, DarwinTools # sw_vers
|
||||
, eigen
|
||||
, ensureNewerSourcesForZipFilesHook
|
||||
, fetchFromGitHub
|
||||
@ -72,6 +73,8 @@ stdenv.mkDerivation rec {
|
||||
python.pythonOnBuildForHost
|
||||
swig4
|
||||
unzip
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
DarwinTools
|
||||
] ++ (with python.pythonOnBuildForHost.pkgs; [
|
||||
pip
|
||||
mypy-protobuf
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "courlan";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1wZoQzTxi+StofvVfyaArfADZkj22ECFL3pIItOt/Y0=";
|
||||
hash = "sha256-DLycrIOXDGUbk3p4I6XZLL67a2AUVOoPtstNDuXRhF0=";
|
||||
};
|
||||
|
||||
# Tests try to write to /tmp directly. use $TMPDIR instead.
|
||||
|
47
pkgs/development/python-modules/curvefitgui/default.nix
Normal file
47
pkgs/development/python-modules/curvefitgui/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pythonAtLeast,
|
||||
numpy,
|
||||
scipy,
|
||||
pyqt5,
|
||||
matplotlib,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "curvefitgui";
|
||||
version = "0-unstable-2021-08-25";
|
||||
pyproject = true;
|
||||
# For some reason, importing the main module makes the whole python
|
||||
# interpreter crash! This needs further investigation, possibly the problem
|
||||
# is with one of the dependencies.. See upstream report:
|
||||
# https://github.com/moosepy/curvefitgui/issues/2
|
||||
disabled = pythonAtLeast "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moosepy";
|
||||
repo = "curvefitgui";
|
||||
rev = "5f1e7f3b95cd77d10bd8183c9a501e47ff94fad7";
|
||||
hash = "sha256-oK0ROKxh/91OrHhuufG6pvc2EMBeMP8R5O+ED2thyW8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
pyqt5
|
||||
matplotlib
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "curvefitgui" ];
|
||||
|
||||
meta = {
|
||||
description = "Graphical interface to the non-linear curvefit function scipy.optimise.curve_fit";
|
||||
homepage = "https://github.com/moosepy/curvefitgui";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "duecredit";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IQgrmEclF/USrTjn5A0BbJ5GHgXh1R/KPJx4K4FuUuY=";
|
||||
hash = "sha256-/nOiDk+7LZcroB7fN97BsLoeZG7+XvTMrwxnJMoofUI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gprof2dot";
|
||||
version = "2022.07.29";
|
||||
version = "2024.06.06";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "jrfonseca";
|
||||
repo = "gprof2dot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-nIsBO6KTyG2VZZRXrkU/T/a9Ki1x6hda5Vv3rZv/mJM=";
|
||||
hash = "sha256-6TTshVbfYh/2Ss1uysGW0nxmNQdIiAhe4LldMS7hpCo=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ graphviz ]}" ];
|
||||
|
@ -31,14 +31,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libretranslate";
|
||||
version = "1.5.7";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreTranslate";
|
||||
repo = "LibreTranslate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lOVi/809ig+KtiNwdt9Wovn+2Q8I6amps1sZ5JJy7WE=";
|
||||
hash = "sha256-QH+H1UubDDv2SZa/razs+JYu4BbZzWHh7DLWfZEWCes=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -31,7 +31,10 @@ let
|
||||
makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)}
|
||||
'';
|
||||
})
|
||||
(addBuildTools [ makeWrapper ] (justStaticExecutables (haskellPackages.hercules-ci-cli.override overrides)));
|
||||
(addBuildTools [ makeWrapper ]
|
||||
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
|
||||
((if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
|
||||
(haskellPackages.hercules-ci-cli.override overrides)));
|
||||
in pkg // {
|
||||
meta = pkg.meta // {
|
||||
position = toString ./default.nix + ":1";
|
||||
|
@ -28,7 +28,10 @@ let
|
||||
makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)}
|
||||
'';
|
||||
})
|
||||
(addBuildTools [ makeBinaryWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent));
|
||||
(addBuildTools [ makeBinaryWrapper ]
|
||||
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
|
||||
((if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
|
||||
haskellPackages.hercules-ci-agent));
|
||||
in pkg.overrideAttrs (finalAttrs: o: {
|
||||
meta = o.meta // {
|
||||
position = toString ./default.nix + ":1";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dyff";
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "homeport";
|
||||
repo = "dyff";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4jW8KJqdhrx79Q5ioyMGOlmLosTEkEIrdBwMjfiIcsY=";
|
||||
sha256 = "sha256-RRLIogNOvbXylmdR59anMVSYCILdVr0Xeot21HqXlXU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JhjngBZK3vWlKzCCkTWJf/VrBXUW6T4FcUivn5CMBjE=";
|
||||
vendorHash = "sha256-BLwdNBthYTMSNDcT5Cf8IcAr4uUmpewLdZRgIvq5htE=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dyff"
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ktlint";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
|
||||
sha256 = "sha256:14pbjih8gkh5cp9cqpbciml4ba7nvq5vmvivyrmhff3xq93cya1f";
|
||||
sha256 = "sha256-AbLg74kzg6UNvrE5cP5/o742yj6DJZ4BZJlFsJ1zaYU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -12,16 +12,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vsce";
|
||||
version = "2.26.1";
|
||||
version = "2.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vscode-vsce";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VL7OMtboD3rUNWQbb10i1qL7MpuUsM8/DbBKLUl6DSs=";
|
||||
hash = "sha256-SmUH2YBVNEydGZLEeAjV6oO+DdbrfqraqnY9C+4GUFI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-EtzcWeqPy4XVlheBXBpSwxrsHJ678lhTgnYqzIYZn4M=";
|
||||
npmDepsHash = "sha256-pE94jQX5i576Lmm8ebAKPMpz95w9n4uGOeLXU8SHtcs=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"'
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gogdl";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "heroic-gogdl";
|
||||
rev = "10b4a19e0fbe9bc3db6b9ce3ea49fd17c9f1d37d";
|
||||
hash = "sha256-po9To5WfT0L2j48Q84ygbbIqtTfXP9uQPrl4Uu+CWGk=";
|
||||
rev = "7c9a6f43043e04763d4b06d09f420bda2baa98ce";
|
||||
hash = "sha256-9SJ/DjxqYmvaVxEGxhnalZkr9yZhEOb0AzXYPBfUss4=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -15,7 +15,11 @@
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
let
|
||||
arch =
|
||||
/**/ if stdenv.hostPlatform.isx86_64 then "x64"
|
||||
else stdenv.hostPlatform.parsed.cpu.name;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "Quake3e";
|
||||
version = "2022-04-01-dev";
|
||||
@ -52,8 +56,8 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
make install DESTDIR=$out/lib
|
||||
makeWrapper $out/lib/quake3e.x64 $out/bin/quake3e
|
||||
makeWrapper $out/lib/quake3e.ded.x64 $out/bin/quake3e.ded
|
||||
makeWrapper $out/lib/quake3e.${arch} $out/bin/quake3e
|
||||
makeWrapper $out/lib/quake3e.ded.${arch} $out/bin/quake3e.ded
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -72,8 +76,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pmiddend ];
|
||||
badPlatforms = platforms.aarch64;
|
||||
# never built on aarch64-linux since first introduction in nixpkgs
|
||||
broken = stdenv.isLinux && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
@ -32,9 +32,7 @@ let
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nvidia.com/object/unix.html";
|
||||
license = licenses.unfreeRedistributable;
|
||||
platforms = nvidia_x11.meta.platforms;
|
||||
mainProgram = "nvidia-settings";
|
||||
maintainers = with maintainers; [ abbradar aidalgol ];
|
||||
};
|
||||
|
||||
@ -73,6 +71,8 @@ let
|
||||
|
||||
meta = meta // {
|
||||
description = "NVIDIA NV-CONTROL X extension";
|
||||
# https://github.com/NVIDIA/nvidia-settings/commit/edcf9edad9f52f9b10e63d4480bbe88b22dde884
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
@ -154,5 +154,8 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = meta // {
|
||||
description = "Settings application for NVIDIA graphics cards";
|
||||
# nvml.h is licensed as part of the cuda developer license.
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
mainProgram = "nvidia-settings";
|
||||
};
|
||||
}
|
||||
|
@ -52,7 +52,8 @@ in rec {
|
||||
};
|
||||
|
||||
unifi8 = generic {
|
||||
version = "8.1.127";
|
||||
sha256 = "sha256-7Xg4I0Kuvta4oKzkduCda7aonTFzutrQJK03FLqM0KE=";
|
||||
version = "8.2.93";
|
||||
suffix = "-1c329ecd26";
|
||||
sha256 = "sha256-7zcRxflEvPRxH7MtudOqumeUpSzAaEIbjaaJVpr2Gbc=";
|
||||
};
|
||||
}
|
||||
|
@ -60,11 +60,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "networkmanager";
|
||||
version = "1.46.0";
|
||||
version = "1.48.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
|
||||
hash = "sha256-ciZJ4lNiaTszQ3FHOAKnKbDsnuKDN1CWkF+GiAjnQGg=";
|
||||
hash = "sha256-/IC5Qt444ylGjm/B37QKrWp40C3fa47DH5rMZGC4cj8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" "man" "doc" ];
|
||||
|
@ -11,10 +11,10 @@ index 148acade5c..6395fbfbe5 100644
|
||||
|
||||
LABEL="nm_drivers_end"
|
||||
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
|
||||
index a9e8c08508..875d6cc2cd 100644
|
||||
index f3441508ab..7cde8d7d39 100644
|
||||
--- a/src/core/devices/nm-device.c
|
||||
+++ b/src/core/devices/nm-device.c
|
||||
@@ -14645,14 +14645,14 @@ nm_device_start_ip_check(NMDevice *self)
|
||||
@@ -14839,14 +14839,14 @@ nm_device_start_ip_check(NMDevice *self)
|
||||
gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);
|
||||
if (gw) {
|
||||
nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
|
||||
@ -32,22 +32,22 @@ index a9e8c08508..875d6cc2cd 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
|
||||
index 79ac95598a..83f7ab1373 100644
|
||||
index 3dd2338a82..de75cc040b 100644
|
||||
--- a/src/libnm-client-impl/meson.build
|
||||
+++ b/src/libnm-client-impl/meson.build
|
||||
@@ -191,7 +191,6 @@ if enable_introspection
|
||||
@@ -190,7 +190,6 @@ if enable_introspection
|
||||
input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources,
|
||||
output: 'nm-property-infos-' + name + '.xml',
|
||||
command: [
|
||||
- python.path(),
|
||||
- python_path,
|
||||
gen_infos_cmd,
|
||||
name,
|
||||
'@OUTPUT@',
|
||||
@@ -207,7 +206,6 @@ if enable_introspection
|
||||
@@ -206,7 +205,6 @@ if enable_introspection
|
||||
'env',
|
||||
'GI_TYPELIB_PATH=' + gi_typelib_path,
|
||||
'LD_LIBRARY_PATH=' + ld_library_path,
|
||||
- python.path(),
|
||||
- python_path,
|
||||
gen_gir_cmd,
|
||||
'--lib-path', meson.current_build_dir(),
|
||||
'--gir', libnm_gir[0],
|
||||
@ -89,14 +89,14 @@ index cbe76f5f1c..8515f94994 100644
|
||||
oc_argv[oc_argc++] = path;
|
||||
oc_argv[oc_argc++] = "--authenticate";
|
||||
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
|
||||
index 7fb460dc33..790a2b75fc 100644
|
||||
index 4d5079dfb3..5a15447fde 100644
|
||||
--- a/src/libnmc-setting/meson.build
|
||||
+++ b/src/libnmc-setting/meson.build
|
||||
@@ -9,7 +9,6 @@ if enable_docs
|
||||
input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']],
|
||||
output: 'settings-docs-input.xml',
|
||||
command: [
|
||||
- python.path(),
|
||||
- python_path,
|
||||
merge_cmd,
|
||||
'@OUTPUT@',
|
||||
nm_property_infos_xml['nmcli'],
|
||||
@ -104,19 +104,19 @@ index 7fb460dc33..790a2b75fc 100644
|
||||
input: [gen_cmd, settings_docs_input_xml],
|
||||
output: 'settings-docs.h',
|
||||
command: [
|
||||
- python.path(),
|
||||
- python_path,
|
||||
gen_cmd,
|
||||
'--output', '@OUTPUT@',
|
||||
'--xml', settings_docs_input_xml
|
||||
diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build
|
||||
index 8c36e40559..cfb6649a21 100644
|
||||
index 5686a1c174..cfb6649a21 100644
|
||||
--- a/src/tests/client/meson.build
|
||||
+++ b/src/tests/client/meson.build
|
||||
@@ -6,7 +6,6 @@ test(
|
||||
args: [
|
||||
build_root,
|
||||
source_root,
|
||||
- python.path(),
|
||||
- python_path,
|
||||
'--',
|
||||
'TestNmcli',
|
||||
],
|
||||
@ -124,7 +124,7 @@ index 8c36e40559..cfb6649a21 100644
|
||||
args: [
|
||||
build_root,
|
||||
source_root,
|
||||
- python.path(),
|
||||
- python_path,
|
||||
'--',
|
||||
'TestNmCloudSetup',
|
||||
],
|
||||
|
@ -1,18 +1,31 @@
|
||||
{ lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkg-config, networkmanager, libsecret, gtk3
|
||||
, withGnome ? true, gnome, fetchpatch, libnma, glib }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
substituteAll,
|
||||
autoreconfHook,
|
||||
iodine,
|
||||
intltool,
|
||||
pkg-config,
|
||||
networkmanager,
|
||||
libsecret,
|
||||
gtk3,
|
||||
withGnome ? true,
|
||||
unstableGitUpdater,
|
||||
libnma,
|
||||
glib,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "NetworkManager-iodine";
|
||||
version = "unstable-2019-11-05";
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}";
|
||||
stdenv.mkDerivation {
|
||||
pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}";
|
||||
version = "1.2.0-unstable-2024-05-12";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "network-manager-iodine";
|
||||
rev = "2ef0abf089b00a0546f214dde0d45e63f2990b79";
|
||||
sha256 = "1ps26fr9b1yyafj7lrzf2kmaxb0ipl0mhagch5kzrjdsc5xkajz7";
|
||||
rev = "8ec0a35e12047ccf256b3951897c701661ddb8af";
|
||||
sha256 = "cNjznry8wi1UmE5khf0JCEYjs9nDU/u8lFLte53MLTM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -20,34 +33,41 @@ in stdenv.mkDerivation {
|
||||
src = ./fix-paths.patch;
|
||||
inherit iodine;
|
||||
})
|
||||
# Don't use etc/dbus-1/system.d
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/network-manager-iodine/merge_requests/2.patch";
|
||||
sha256 = "108pkf0mddj32s46k7jkmpwcaq2ylci4dqpp7wck3zm9q2jffff2";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ iodine networkmanager glib ]
|
||||
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ intltool autoreconfHook pkg-config ];
|
||||
buildInputs =
|
||||
[
|
||||
iodine
|
||||
networkmanager
|
||||
glib
|
||||
]
|
||||
++ lib.optionals withGnome [
|
||||
gtk3
|
||||
libsecret
|
||||
libnma
|
||||
];
|
||||
|
||||
# glib-2.62 deprecations
|
||||
env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||
|
||||
preConfigure = "intltoolize";
|
||||
configureFlags = [
|
||||
"--without-libnm-glib"
|
||||
"--with-gnome=${if withGnome then "yes" else "no"}"
|
||||
"--localstatedir=/" # needed for the management socket under /run/NetworkManager
|
||||
"--enable-absolute-paths"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
intltoolize
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-iodine";
|
||||
updateScript = unstableGitUpdater {
|
||||
tagPrefix = "v";
|
||||
};
|
||||
|
||||
networkManagerPlugin = "VPN/nm-iodine-service.name";
|
||||
};
|
||||
|
||||
|
@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://roy.marples.name/projects/openresolv";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.eelco ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
};
|
||||
}
|
||||
|
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "11.6.0";
|
||||
version = "11.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QeC1ql/ohUoc06jqoDudHSYX6vl2RNMcvVe+qmEkS0w=";
|
||||
hash = "sha256-CpQCgL+ymuLQkYhJ067pyJmIHjEMpIKsWPZzUClFc6o=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-9jDXEfIZ6qPZOKImqup7Y/1xqu+Hp6uR8Hm+RXggWg4=";
|
||||
vendorHash = "sha256-OZ1cpm8DKV7Xik8GYV4ThBWtwPtxW9o9pLrNW7SCiVs=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sherlock";
|
||||
version = "0-unstable-2024-05-29";
|
||||
version = "0-unstable-2024-06-04";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sherlock-project";
|
||||
repo = "sherlock";
|
||||
rev = "d42dadfc45b0eb1f509587f2babe455a094da604";
|
||||
hash = "sha256-SLQxqPHfPgu7WpyVSvm/sqJfPjPoevMJq/BWND2Pspk=";
|
||||
rev = "ef124acf34e90626f4e59ab88bba1ed6141a4126";
|
||||
hash = "sha256-haxUKdZuuJrSI4TH8jA1fT+4fhr6tlxnrEgWTuBuIC4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# From https://www.sudo.ws/about/license/
|
||||
license = with licenses; [ sudo bsd2 bsd3 zlib ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.freebsd;
|
||||
mainProgram = "sudo";
|
||||
};
|
||||
})
|
||||
|
@ -948,6 +948,7 @@ mapAliases ({
|
||||
octorpki = throw "octorpki has been removed, upstream says to use rpki-client instead"; # Added 2024-03-19
|
||||
ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22
|
||||
ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20
|
||||
onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
|
||||
opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
|
||||
opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
|
||||
openafs_1_8 = openafs; # Added 2022-08-22
|
||||
|
@ -15916,7 +15916,10 @@ with pkgs;
|
||||
|
||||
cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install;
|
||||
|
||||
stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack;
|
||||
stack =
|
||||
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
|
||||
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
|
||||
haskellPackages.stack;
|
||||
|
||||
hlint = haskell.lib.compose.justStaticExecutables haskellPackages.hlint;
|
||||
|
||||
@ -18825,7 +18828,10 @@ with pkgs;
|
||||
guile = guile_2_2;
|
||||
};
|
||||
|
||||
hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint;
|
||||
hadolint =
|
||||
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
|
||||
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
|
||||
haskellPackages.hadolint;
|
||||
|
||||
halfempty = callPackage ../development/tools/halfempty { };
|
||||
|
||||
@ -19126,7 +19132,10 @@ with pkgs;
|
||||
|
||||
msitools = callPackage ../development/tools/misc/msitools { };
|
||||
|
||||
haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci;
|
||||
haskell-ci =
|
||||
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
|
||||
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
|
||||
haskellPackages.haskell-ci;
|
||||
|
||||
nailgun = callPackage ../development/tools/nailgun { };
|
||||
|
||||
@ -19480,7 +19489,10 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
shake = haskell.lib.compose.justStaticExecutables haskellPackages.shake;
|
||||
shake =
|
||||
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
|
||||
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
|
||||
haskellPackages.shake;
|
||||
|
||||
shallot = callPackage ../tools/misc/shallot { };
|
||||
|
||||
@ -20573,7 +20585,8 @@ with pkgs;
|
||||
|
||||
elfio = callPackage ../development/libraries/elfio { };
|
||||
|
||||
emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote;
|
||||
# TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013
|
||||
emanote = haskellPackages.emanote;
|
||||
|
||||
enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
|
||||
enchant = enchant2;
|
||||
@ -20887,6 +20900,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
gdcm = callPackage ../development/libraries/gdcm {
|
||||
inherit (darwin) DarwinTools;
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa;
|
||||
};
|
||||
|
||||
@ -23207,7 +23221,10 @@ with pkgs;
|
||||
|
||||
matio = callPackage ../development/libraries/matio { };
|
||||
|
||||
matterhorn = haskell.lib.compose.justStaticExecutables haskellPackages.matterhorn;
|
||||
matterhorn =
|
||||
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
|
||||
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
|
||||
haskellPackages.matterhorn;
|
||||
|
||||
maxflow = callPackage ../development/libraries/maxflow { };
|
||||
|
||||
@ -31465,7 +31482,10 @@ with pkgs;
|
||||
hledger-iadd = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-iadd;
|
||||
hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest;
|
||||
hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui;
|
||||
hledger-web = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-web;
|
||||
hledger-web =
|
||||
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
|
||||
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
|
||||
haskellPackages.hledger-web;
|
||||
hledger-utils = with python3.pkgs; toPythonApplication hledger-utils;
|
||||
|
||||
hmm = callPackage ../applications/misc/hmm { };
|
||||
@ -31998,8 +32018,6 @@ with pkgs;
|
||||
|
||||
johnny = callPackage ../applications/misc/johnny { };
|
||||
|
||||
josm = callPackage ../applications/misc/josm { };
|
||||
|
||||
js8call = qt5.callPackage ../applications/radio/js8call { };
|
||||
|
||||
jwm = callPackage ../applications/window-managers/jwm { };
|
||||
@ -32936,16 +32954,15 @@ with pkgs;
|
||||
inherit lua;
|
||||
};
|
||||
|
||||
# Wrap avoiding rebuild
|
||||
mpv = mpv-unwrapped.wrapper { mpv = mpv-unwrapped; };
|
||||
|
||||
mpvScripts = mpv-unwrapped.scripts;
|
||||
|
||||
shaka-packager = callPackage ../applications/video/shaka-packager { };
|
||||
|
||||
# Wraps without triggering a rebuild
|
||||
wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { };
|
||||
mpv = wrapMpv mpv-unwrapped { };
|
||||
|
||||
mpvpaper = callPackage ../tools/wayland/mpvpaper { };
|
||||
|
||||
mpvScripts = callPackage ../applications/video/mpv/scripts { };
|
||||
|
||||
open-in-mpv = callPackage ../applications/video/open-in-mpv { };
|
||||
|
||||
mpv-shim-default-shaders = callPackage ../applications/video/mpv-shim-default-shaders { };
|
||||
@ -36140,7 +36157,10 @@ with pkgs;
|
||||
|
||||
bean-add = callPackage ../applications/office/beancount/bean-add.nix { };
|
||||
|
||||
bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench;
|
||||
bench =
|
||||
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
|
||||
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
|
||||
haskellPackages.bench;
|
||||
|
||||
cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
|
||||
cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { };
|
||||
@ -38161,6 +38181,7 @@ with pkgs;
|
||||
osi = callPackage ../development/libraries/science/math/osi { };
|
||||
|
||||
or-tools = callPackage ../development/libraries/science/math/or-tools {
|
||||
inherit (darwin) DarwinTools;
|
||||
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
||||
python = python3;
|
||||
protobuf = protobuf_21;
|
||||
|
@ -2654,6 +2654,8 @@ self: super: with self; {
|
||||
|
||||
curve25519-donna = callPackage ../development/python-modules/curve25519-donna { };
|
||||
|
||||
curvefitgui = callPackage ../development/python-modules/curvefitgui { };
|
||||
|
||||
cvelib = callPackage ../development/python-modules/cvelib { };
|
||||
|
||||
cvss = callPackage ../development/python-modules/cvss { };
|
||||
|
@ -265,6 +265,7 @@ let
|
||||
# top-level packages that depend on haskellPackages
|
||||
inherit (pkgsPlatforms)
|
||||
agda
|
||||
alex
|
||||
arion
|
||||
bench
|
||||
blucontrol
|
||||
@ -272,6 +273,8 @@ let
|
||||
cabal2nix
|
||||
cachix
|
||||
# carp broken on 2024-04-09
|
||||
changelog-d
|
||||
cornelis
|
||||
cedille
|
||||
client-ip-echo
|
||||
darcs
|
||||
@ -282,7 +285,10 @@ let
|
||||
dhall-lsp-server
|
||||
dhall-json
|
||||
dhall-nix
|
||||
dhall-nixpkgs
|
||||
dhall-yaml
|
||||
diagrams-builder
|
||||
echidna
|
||||
elm2nix
|
||||
emanote
|
||||
fffuu
|
||||
@ -293,6 +299,7 @@ let
|
||||
gitit
|
||||
glirc
|
||||
hadolint
|
||||
happy
|
||||
haskell-ci
|
||||
haskell-language-server
|
||||
hasura-graphql-engine
|
||||
@ -308,10 +315,12 @@ let
|
||||
hledger-web
|
||||
hlint
|
||||
hpack
|
||||
hscolour
|
||||
icepeak
|
||||
ihaskell
|
||||
jacinda
|
||||
jl
|
||||
json2yaml
|
||||
koka
|
||||
krank
|
||||
lambdabot
|
||||
@ -338,12 +347,13 @@ let
|
||||
ormolu
|
||||
# pakcs broken by set-extra on 2024-03-15
|
||||
pandoc
|
||||
petrinizer
|
||||
place-cursor-at
|
||||
pinboard-notes-backup
|
||||
pretty-simple
|
||||
purenix
|
||||
shake
|
||||
shellcheck
|
||||
shellcheck-minimal
|
||||
sourceAndTags
|
||||
spacecookie
|
||||
spago
|
||||
@ -368,7 +378,6 @@ let
|
||||
xmobar
|
||||
xmonadctl
|
||||
xmonad-with-packages
|
||||
yi
|
||||
zsh-git-prompt
|
||||
;
|
||||
|
||||
@ -378,7 +387,7 @@ let
|
||||
elm
|
||||
elm-format
|
||||
elm-instrument
|
||||
# elmi-to-json broken by hashable-time on 2024-03-16
|
||||
elmi-to-json
|
||||
;
|
||||
};
|
||||
|
||||
@ -502,28 +511,18 @@ let
|
||||
# package sets (like Cabal, jailbreak-cabal) are
|
||||
# working as expected.
|
||||
cabal-install = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
Cabal_3_10_3_0 = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
Cabal-syntax_3_10_3_0 = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
cabal2nix = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
cabal2nix-unstable = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
funcmp = released;
|
||||
@ -536,26 +535,18 @@ let
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
hoogle = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
hlint = lib.subtractLists [
|
||||
compilerNames.ghc902
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
hpack = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
hsdns = released;
|
||||
jailbreak-cabal = released;
|
||||
language-nix = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
large-hashable = [
|
||||
@ -563,8 +554,6 @@ let
|
||||
];
|
||||
nix-paths = released;
|
||||
titlecase = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
ghc-api-compat = [
|
||||
@ -575,43 +564,30 @@ let
|
||||
compilerNames.ghc8107
|
||||
];
|
||||
ghc-lib = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
ghc-lib-parser = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
ghc-lib-parser-ex = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
ghc-source-gen = [
|
||||
# Feel free to remove these as they break,
|
||||
# ghc-source-gen currently doesn't support GHC 9.4
|
||||
compilerNames.ghc8107
|
||||
compilerNames.ghc902
|
||||
compilerNames.ghc928
|
||||
];
|
||||
# broken on 2024-03-16
|
||||
# ghc-tags = lib.subtractLists [
|
||||
# compilerNames.ghc981
|
||||
# compilerNames.ghc982
|
||||
# ] released;
|
||||
ghc-tags = lib.subtractLists [
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
hashable = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
primitive = lib.subtractLists [
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
weeder = lib.subtractLists [
|
||||
compilerNames.ghc981
|
||||
compilerNames.ghc982
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user