Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
ffc1886a16
|
|
@ -144,4 +144,4 @@ All new projects should use the CUDA redistributables available in [`cudaPackage
|
|||
| Find libraries | `configurePhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain CMake configuration files |
|
||||
| Find libraries | `buildPhase` or `patchelf` | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contain the libraries |
|
||||
|
||||
In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`cudaPackages.autoAddOpenGLRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.autoAddOpenGLRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary.
|
||||
In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`cudaPackages.autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.autoAddDriverRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary.
|
||||
|
|
|
|||
|
|
@ -20962,6 +20962,12 @@
|
|||
githubId = 15619766;
|
||||
name = "wldhx";
|
||||
};
|
||||
w-lfchen = {
|
||||
email = "w-lfchen@posteo.net";
|
||||
github = "w-lfchen";
|
||||
githubId = 115360611;
|
||||
name = "Wölfchen";
|
||||
};
|
||||
wmertens = {
|
||||
email = "Wout.Mertens@gmail.com";
|
||||
github = "wmertens";
|
||||
|
|
|
|||
|
|
@ -459,3 +459,6 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform.
|
||||
|
||||
- The oil shell's c++ version is now available as `oils-for-unix`. The python version is still available as `oil`
|
||||
|
||||
- `documentation.man.mandoc` now by default uses `MANPATH` to set the directories where mandoc will search for manual pages.
|
||||
This enables mandoc to find manual pages in Nix profiles. To set the manual search paths via the `mandoc.conf` configuration file like before, use `documentation.man.mandoc.settings.manpath` instead.
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ in
|
|||
show-trace = true;
|
||||
|
||||
system-features = [ "big-parallel" "kvm" "recursive-nix" ];
|
||||
sandbox-paths = { "/bin/sh" = "''${pkgs.busybox-sandbox-shell.out}/bin/busybox"; };
|
||||
sandbox-paths = [ "/bin/sh=''${pkgs.busybox-sandbox-shell.out}/bin/busybox" ];
|
||||
}
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ let
|
|||
)
|
||||
output
|
||||
);
|
||||
|
||||
makeLeadingSlashes = map (path: if builtins.substring 0 1 path != "/" then "/${path}" else path);
|
||||
in
|
||||
{
|
||||
meta.maintainers = [ lib.maintainers.sternenseemann ];
|
||||
|
|
@ -29,6 +31,7 @@ in
|
|||
type = with lib.types; listOf str;
|
||||
default = [ "share/man" ];
|
||||
example = lib.literalExpression "[ \"share/man\" \"share/man/fr\" ]";
|
||||
apply = makeLeadingSlashes;
|
||||
description = ''
|
||||
Change the paths included in the MANPATH environment variable,
|
||||
i. e. the directories where {manpage}`man(1)`
|
||||
|
|
@ -41,6 +44,28 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
cachePath = lib.mkOption {
|
||||
type = with lib.types; listOf str;
|
||||
default = cfg.manPath;
|
||||
defaultText = lib.literalExpression "config.documentation.man.mandoc.manPath";
|
||||
example = lib.literalExpression "[ \"share/man\" \"share/man/fr\" ]";
|
||||
apply = makeLeadingSlashes;
|
||||
description = ''
|
||||
Change the paths where mandoc {manpage}`makewhatis(8)`generates the
|
||||
manual page index caches. {option}`documentation.man.generateCaches`
|
||||
should be enabled to allow cache generation. This list should only
|
||||
include the paths to manpages installed in the system configuration,
|
||||
i. e. /run/current-system/sw/share/man. {manpage}`makewhatis(8)`
|
||||
creates a database in each directory using the files
|
||||
`mansection/[arch/]title.section` and `catsection/[arch/]title.0`
|
||||
in it. If a directory contains no manual pages, no database is
|
||||
created in that directory.
|
||||
This option only needs to be set manually if extra paths should be
|
||||
indexed or {option}`documentation.man.manPath` contains paths that
|
||||
can't be indexed.
|
||||
'';
|
||||
};
|
||||
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.mandoc;
|
||||
|
|
@ -178,19 +203,14 @@ in
|
|||
# TODO(@sternenseemman): fix symlinked directories not getting indexed,
|
||||
# see: https://inbox.vuxu.org/mandoc-tech/20210906171231.GF83680@athene.usta.de/T/#e85f773c1781e3fef85562b2794f9cad7b2909a3c
|
||||
extraSetup = lib.mkIf config.documentation.man.generateCaches ''
|
||||
for man_path in ${
|
||||
lib.concatMapStringsSep " " (path:
|
||||
"$out/" + lib.escapeShellArg path
|
||||
) cfg.manPath} ${lib.concatMapStringsSep " " (path:
|
||||
lib.escapeShellArg path) cfg.settings.manpath
|
||||
}
|
||||
for man_path in ${lib.concatMapStringsSep " " (path: "$out" + lib.escapeShellArg path) cfg.cachePath}
|
||||
do
|
||||
[[ -d "$man_path" ]] && ${makewhatis} -T utf8 $man_path
|
||||
done
|
||||
'';
|
||||
|
||||
# tell mandoc the paths containing man pages
|
||||
profileRelativeSessionVariables."MANPATH" = map (path: if builtins.substring 0 1 path != "/" then "/${path}" else path) cfg.manPath;
|
||||
profileRelativeSessionVariables."MANPATH" = lib.mkIf (cfg.manPath != [ ]) cfg.manPath;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,14 +51,6 @@ in
|
|||
setuid = false;
|
||||
setgid = true;
|
||||
};
|
||||
|
||||
"1Password-KeyringHelper" = {
|
||||
source = "${package}/share/1password/1Password-KeyringHelper";
|
||||
owner = "root";
|
||||
group = "onepassword";
|
||||
setuid = true;
|
||||
setgid = true;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwig-studio";
|
||||
version = "5.1.3";
|
||||
version = "5.1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||
sha256 = "sha256-1/iKezOD2HCym6JBXRa9rGpjolJjrxRZA4vwfgZyVng=";
|
||||
sha256 = "sha256-U1Qp7/7kAr1IEcv256I2J/sb5MYxfR20Pi5N8WaVh2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "spotify-player";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aome510";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fGDIlkTaRg+J6YcP9iBcJFuYm9F0UOA+v/26hhdg9/o=";
|
||||
hash = "sha256-1aq+J1dP+hGJHq3boxZLUFfLLSFDY2uN6BwYXqHjCtk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oZNydOnD2+6gLAsT3YTSlWSQ06EftS7Tl/AvlTbL84U=";
|
||||
cargoHash = "sha256-nULTz1H52L1kiTtViYfvxL+jrJ0uDk68oe8t5Hd7aCU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, avahi, libjpeg, libpng
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, avahi, libjpeg, libpng, libtiff
|
||||
, libxml2, gnutls, sane-backends }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sane-airscan";
|
||||
version = "0.99.27";
|
||||
version = "0.99.29";
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ];
|
||||
buildInputs = [ avahi gnutls libjpeg libpng libxml2 libtiff sane-backends ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexpevzner";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-29IPoLF4rmq8sGTi5RmpT1Fq8RJJlaepTt+2GWDU3es=";
|
||||
sha256 = "sha256-9ErTC9NztyO9o6y2FjQPl2lu1gICasZYm2tnaCVCLt8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "structorizer";
|
||||
version = "3.32-16";
|
||||
version = "3.32-17";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "fesch";
|
||||
repo = "Structorizer.Desktop";
|
||||
rev = version;
|
||||
hash = "sha256-K/ofwwlkZF13V0IZEL166n58ylm+qdh1jbXzH7LwXog=";
|
||||
hash = "sha256-yJPF4N402wzc4kNWgcu7quhQ9QaERMfqHdQrf1IGwrQ=";
|
||||
};
|
||||
|
||||
patches = [ ./makeStructorizer.patch ./makeBigJar.patch ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
let
|
||||
|
||||
pname = "1password";
|
||||
version = if channel == "stable" then "8.10.27" else "8.10.28-11.BETA";
|
||||
version = if channel == "stable" then "8.10.27" else "8.10.28-21.BETA";
|
||||
|
||||
sources = {
|
||||
stable = {
|
||||
|
|
@ -33,19 +33,19 @@ let
|
|||
beta = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
|
||||
hash = "sha256-pchfBeZcXoyfSHutQqgAWkf6uzTEIQ/AbKDOC2N+BN8=";
|
||||
hash = "sha256-Pz9tpGsKLmf37r0fnBxcE7qGjN3RZSF/iwQUnqev0Jk=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
|
||||
hash = "sha256-rcjoyuEL8p4nCvjboPF0BV1lV5/+zo/rP9AP0ORB0N0=";
|
||||
hash = "sha256-ezzdwUUcSBqJUKlG1By5HXbgrTFDpaGIJipU+V1FUBc=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
hash = "sha256-D3kYUpL69HMQnjJyzQ2/Ahiyt94uwxM86n7U9uQ/mVs=";
|
||||
hash = "sha256-zFO8ypDqPGcJY/2eKke/ljQ4S3syI7jyZSexbYzBA+c=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
hash = "sha256-FJbFsMS/f7PHTvu9PxDgFQB3v47AsyESdKctr+S1LXk=";
|
||||
hash = "sha256-LAhGmXqfcgjiDbE0RLhzpi15rluM8/fZ3GZ52yHdMKg=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -110,8 +110,8 @@ in stdenv.mkDerivation {
|
|||
cp -a resources/icons $out/share
|
||||
|
||||
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
||||
patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}
|
||||
patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}
|
||||
patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign}
|
||||
patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign}
|
||||
for file in $(find $out -type f -name \*.so\* ); do
|
||||
patchelf --set-rpath ${rpath}:$out/share/1password $file
|
||||
done
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@
|
|||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.5.8";
|
||||
version = "1.5.11";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
homepage = "https://obsidian.md";
|
||||
downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
|
||||
license = licenses.obsidian;
|
||||
maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 ];
|
||||
maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ];
|
||||
};
|
||||
|
||||
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-5olNmOLE9AgVUyRY8PylUPGYIMS+KoDG3g2BMCySdyE=" else "sha256-oc2iA2E3ac/uUNv6unzfac5meHqQzmzDVl/M9jNpS/M=";
|
||||
hash = if stdenv.isDarwin then "sha256-RtIEjVaqYygylhZwFB9ObZPPhSSzvJTJniGVFzAa/VY=" else "sha256-QDxMgisyYc2lJ0OKn2hR0VA8OeAwysCq6Z4Q59qRvtU=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "otpclient";
|
||||
version = "3.5.2";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paolostivanin";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0BpdyZIUvDRGadomYRhEq5YLoPXsF9d3tewIi+q6wFs=";
|
||||
hash = "sha256-3Nv2ci8MBjvWc7gF5UOJnyfSV8XK0REN1XwI8RUYgWI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.20.3";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
hash = "sha256-NimwuQj/EvWtXt87LgHWwcZ2hAd548o/agXY4TVK63o=";
|
||||
hash = "sha256-d+4WiMjP9L9tMrShTadXA1k/l1U3jYj/ihP0g3HuYRE=";
|
||||
};
|
||||
vendorHash = "sha256-4HzUsTLt4R35TS4jKOmrKW0At9q8W61TU+NTQ/K7Axk=";
|
||||
vendorHash = "sha256-8nvcxBF+ygWkMLbGwJvj1NjGL06xh6mNZvaEbZJw0TM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "7.1.1";
|
||||
version = "7.2.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-YQLDm6T67vio66PLehlLQDxsAkhm22dhpjUR1eBwsg8=";
|
||||
hash = "sha256-IJ808xvPqGivccqH/mOMSHu/mU/JLFJ798UztwXWtm0=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@ let
|
|||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-5AxEkGmThLEEw1XGrWuabRcVgYH8OT2cXxyeFrYeBOI=";
|
||||
x86_64-linux = "sha256-L76UTgy1tGxj5KVXefz2uj2M/sse2n0byqRtW/wvwz8=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
displayname = "XPipe";
|
||||
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "8.3";
|
||||
version = "8.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appflowy";
|
||||
version = "0.4.9";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-+Olmp2z5cLDgZikY2n9LI2A9W03pYdCtUE9hdr9Tp2Q=";
|
||||
hash = "sha256-yXrdV/m6Ss9DyYleA5K7Wz1RUa8fznDJl5Yvco+jaiA=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pkg-config
|
||||
# Although not always needed, it is needed if cmakeFlags include
|
||||
# GPU_API=cuda, and it doesn't users that don't enable the GPU package.
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ let
|
|||
maintainers = with maintainers; [ d-xo ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
broken = stdenv.isLinux; # last successful build 2023-04-11
|
||||
};
|
||||
in
|
||||
if stdenv.isDarwin
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-replay-source";
|
||||
version = "1.6.13";
|
||||
version = "1.6.13-unstable-2024-02-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-replay-source";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-i64rpIVnUplA9AKZtR3xeByeawca7B00kGmEcKi7DWQ=";
|
||||
rev = "6590fde1c8e4f8c733016646a8165d52e28d094b";
|
||||
hash = "sha256-foIzWNlU72FWXZVWR8TEiqJJMfl1vWYDTyhV6thYJbA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "phosh";
|
||||
version = "0.36.0";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchurl {
|
||||
# Release tarball which includes subprojects gvc and libcall-ui
|
||||
url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-rhhvVCOqw/jqNSpo9Hlrcgh4Bxnoud/Z3yAq4n/ixIQ=";
|
||||
hash = "sha256-kmZX2pPOYSh2hiMrRLH6744Q8rHHhE9jmG+SksepUYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "amfora";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "makeworld-the-better-one";
|
||||
repo = "amfora";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-93xNzYPoy8VsbY2JyvDXt4J/gIbI2wzrCD83JUaP150=";
|
||||
sha256 = "sha256-KOuKgxH3n4rdF+oj/TwEcRqX1sn4A9e23FNwQMhMVO4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XtiGj2Tr6sSBduIjBspeZpYaSTd6x6EVf3VEVMXDAD0=";
|
||||
vendorHash = "sha256-T/hnlQMDOZV+QGl7xp29sBGfb4VXcXqN6PDoBFdpp4M=";
|
||||
|
||||
postInstall = lib.optionalString (!stdenv.isDarwin) ''
|
||||
sed -i "s:amfora:$out/bin/amfora:" amfora.desktop
|
||||
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "centrifugo";
|
||||
version = "5.2.2";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "centrifugal";
|
||||
repo = "centrifugo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jBXg4/Uw5pFk1aCNpmHkXeUYrFwZqwtg0zYQ5zkp5QI=";
|
||||
hash = "sha256-QA10JOy/EDzmLgQKnnPOYL5GpxfYjYmtA394JZjdrAo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-s04XSTs1ISfhezvz8RfcXPlx8cstHXdRBFPIEZlKI7k=";
|
||||
vendorHash = "sha256-fomEiAWIr9Mp0E1kdZlVVSrs2yw3ydMXSmjN/31RzCA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
Add the -m option to man's command line to augment the list of paths
|
||||
searched by man. The string "OUT" must be substituted with chawan's $out
|
||||
path after patching.
|
||||
The required -m option is only available in the mandoc implementation.
|
||||
--- a/adapter/protocol/man
|
||||
+++ b/adapter/protocol/man
|
||||
@@ -75,7 +75,7 @@ EOF
|
||||
|
||||
$section =~ s:([^-\w\200-\377.,])::g;
|
||||
$man =~ s:([^-\w\200-\377.,])::g;
|
||||
- open(F, "GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 $MAN $section $man 2> /dev/null |");
|
||||
+ open(F, "GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 $MAN -m OUT/share/man $section $man 2> /dev/null |");
|
||||
}
|
||||
|
||||
$ok = 0;
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, makeBinaryWrapper
|
||||
, curlMinimal
|
||||
, mandoc
|
||||
, ncurses
|
||||
, nim
|
||||
, pandoc
|
||||
, perl
|
||||
, pkg-config
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "chawan";
|
||||
version = "0-unstable-2024-03-01";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~bptato";
|
||||
repo = "chawan";
|
||||
rev = "87ba9a87be15abbe06837f1519cfb76f4bf759f3";
|
||||
hash = "sha256-Xs+Mxe5/uoxPMf4FuelpO+bRJ1KdfASVI7rWqtboJZw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Include chawan's man pages in mancha's search path
|
||||
./mancha-augment-path.diff
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration"
|
||||
);
|
||||
|
||||
buildInputs = [ curlMinimal ncurses perl zlib ];
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
nim
|
||||
pandoc
|
||||
pkg-config
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace adapter/protocol/man \
|
||||
--replace-fail "OUT" $out
|
||||
'';
|
||||
|
||||
buildFlags = [ "all" "manpage" ];
|
||||
installFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"PREFIX=/"
|
||||
];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
makeWrapperArgs = ''
|
||||
--set MANCHA_CHA $out/bin/cha \
|
||||
--set MANCHA_MAN ${mandoc}/bin/man
|
||||
'';
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/cha ${makeWrapperArgs}
|
||||
wrapProgram $out/bin/mancha ${makeWrapperArgs}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Lightweight and featureful terminal web browser";
|
||||
homepage = "https://sr.ht/~bptato/chawan/";
|
||||
license = lib.licenses.publicDomain;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ jtbx ];
|
||||
mainProgram = "cha";
|
||||
broken = stdenv.isDarwin; # pending PR #292043
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, lib, cmake, fetchFromGitHub }:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clangbuildanalyzer";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aras-p";
|
||||
repo = "ClangBuildAnalyzer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-kmgdk634zM0W0OoRoP/RzepArSipa5bNqdVgdZO9gxo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Tool for analyzing Clang's -ftime-trace files";
|
||||
homepage = "https://github.com/aras-p/ClangBuildAnalyzer";
|
||||
maintainers = with lib.maintainers; [ lf- ];
|
||||
license = lib.licenses.unlicense;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "ClangBuildAnalyzer";
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, flutter
|
||||
, gst_all_1
|
||||
, libunwind
|
||||
, makeWrapper
|
||||
, mimalloc
|
||||
, orc
|
||||
, nix-update-script
|
||||
, mpv-unwrapped
|
||||
, libplacebo
|
||||
}:
|
||||
|
||||
flutter.buildFlutterApplication rec {
|
||||
pname = "flet-client-flutter";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flet-dev";
|
||||
repo = "flet";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7zAcjek4iZRsNRVA85KBtU7PGbnLDZjnEO8Q5xwBiwM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/client";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMIMALLOC_LIB=${mimalloc}/lib/mimalloc.o"
|
||||
];
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
mimalloc
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
mpv-unwrapped
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-vaapi
|
||||
gst_all_1.gstreamer
|
||||
libunwind
|
||||
orc
|
||||
mimalloc
|
||||
]
|
||||
++ mpv-unwrapped.buildInputs
|
||||
++ libplacebo.buildInputs
|
||||
;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "A framework that enables you to easily build realtime web, mobile, and desktop apps in Python. The frontend part";
|
||||
homepage = "https://flet.dev/";
|
||||
changelog = "https://github.com/flet-dev/flet/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ heyimnova lucasew ];
|
||||
mainProgram = "flet";
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -170,7 +170,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
broken = true; # last successful build 2024-01-26
|
||||
description = "a generic build tool";
|
||||
homepage = "https://github.com/just-buildsystem/justbuild";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -86,10 +86,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [ cmake ninja pkg-config git ]
|
||||
++ optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
|
||||
# TODO: Replace with autoAddDriverRunpath
|
||||
# once https://github.com/NixOS/nixpkgs/pull/275241 has been merged
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = optionals effectiveStdenv.isDarwin darwinBuildInputs
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minijinja";
|
||||
version = "1.0.12";
|
||||
version = "1.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "minijinja";
|
||||
rev = version;
|
||||
hash = "sha256-v5YTPcUiCUQvTURqgKepdOjKZ5rFLr+mF7X+s5GvxdM=";
|
||||
hash = "sha256-VVd90j8ZOubtHX15jMGAIA3LF4tg4SzFxO046QVwDjc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OhfrlT2DZU3ahH9PKqpEK8f34J2E6zNUai3hYBPg7v4=";
|
||||
cargoHash = "sha256-f9hXH0c8vVpexYyuQuS0D8jzEqJSrHOwp/FropTKTJg=";
|
||||
|
||||
# The tests relies on the presence of network connection
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ buildGoModule rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.10"; sha256 = "0w45j4ypqnwmsh3byzaghn43ycfkfnn8415i5lw2q5ip7vp3a9fm"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.14"; sha256 = "0111svcswbw97k3igqi45dzz08f6vi20zr5gp23p8qmisk2bazqj"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.14"; sha256 = "0b95h42kflbjlfw0ky58cxd0745wf7ad9phfgdyn3w7x3bjfn0x3"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.16"; sha256 = "12bk984wylqyyl3fcgxg640pqf6bjbqfkgp1fldrprncca0fx80k"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.16"; sha256 = "1yd9zf1vbfci52f6yyig8ar2w8wpwiafbf65ah11qqrm32rwd7z6"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; sha256 = "0vssdz6rng0k85qsv2xn6x0dldaalnnx718n7plwxg3j1pddr1z7"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.10"; sha256 = "1gh3fad9ya56qwzhk7590bdzkky76yx1jjj60rqr013b97qbd3gs"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.10"; sha256 = "1x09mp8q3mrj5fijqk7qp5qivrysqnbc2bkj2ssvawb9rjy6497w"; })
|
||||
|
|
@ -48,9 +48,9 @@
|
|||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.8.0"; sha256 = "0gmbxn91h4r23fhzpl1dh56cpva4sg2h659kdbdazayrajfj50fw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.9.2"; sha256 = "097lb4acla3x0m2s0w47f6321q3k2phnhpbh338d79an4b5ffks1"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; sha256 = "0idaksbib90zgi8xlycmdzk77dlxichspp23wpnfrzfxkdfafqrj"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.9.2"; sha256 = "002llvcwkaqnpzsipp9s20piw61i89spamr0wlxrvss41zh90klg"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; sha256 = "1gljgi69k0fz8vy8bn6xlyxabj6q4vls2zza9wz7ng6ix3irm89r"; })
|
||||
|
|
@ -58,10 +58,10 @@
|
|||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.0"; sha256 = "1x183b0gz1vcfiljggrn30g6jvixlwks0lfpl4hl9nnjbpg0fdvq"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.0"; sha256 = "03nnqmz0w42wiqgf5y0wkn6w0n3m93q8ihqmrrz7rdh85v06f999"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.0"; sha256 = "1b24pf0ippwbdjc3k1wzr13lr1zqlcbymi2hpvfmxmk4i6vzn4mv"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.0"; sha256 = "1qdcqcnczaqfd0cii3bcymbc7rvkypm25idxgx7hfc81h9ysh79h"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.4.0"; sha256 = "138jyzwap55a8wgg26zwzm0lifc3im1cs65cjgrpw3b13szfqd5g"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.4.0"; sha256 = "0dv05mh0g3g39plza0qlsaak52z1drkansh65nhfjwhj968v7rr1"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.4.0"; sha256 = "16r0qyxbn7gibwpgprlxra5c183ps3njrxp5si28k50jhyjm7rxf"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.4.0"; sha256 = "056dg7iwgdp4kmw87rq7yzp5a2l02krssxdpga4rxrkj21iranm9"; })
|
||||
(fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.0"; sha256 = "1zl39k27r4zq75r1x1zr1yl4nzxpkxdnnv6dwd4qp0xr22my85aq"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
|
|
@ -145,7 +145,7 @@
|
|||
(fetchNuGet { pname = "securifybv.ShellLink"; version = "0.1.0"; sha256 = "1v52d01590m8y06bybis6hlg296wk3y7ilqyh01ram62v5wrjvq2"; })
|
||||
(fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; })
|
||||
(fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; })
|
||||
(fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.14"; sha256 = "0gdzvkrg63a4nqh4z2dxqiwmw07if08vdffmmgbck6j4nblx11qh"; })
|
||||
(fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.16"; sha256 = "0af7qhv5mxmynh08snqb345n0ykc9mywqgqlb6lng1f001n9038z"; })
|
||||
(fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; sha256 = "1mkqc2aicvknmpyfry2v7jjxh3apaxa6dmk1vfbwxnkysl417x0k"; })
|
||||
(fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; })
|
||||
(fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; })
|
||||
|
|
@ -168,9 +168,9 @@
|
|||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; sha256 = "119mlbh5hmlis7vb111s95dwg5p1anm2hmv7cm6fz7gy18473d7v"; })
|
||||
(fetchNuGet { pname = "SPB"; version = "0.0.4-build32"; sha256 = "0fk803f4llcc7g111g7wdn6fwqjrlyr64p97lv9xannbk9bxnk0r"; })
|
||||
(fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.14"; sha256 = "1x4cc9npxfl22wgy34pxglp7aja7h6q4vkc5ms0xknr2j9b7x5j6"; })
|
||||
(fetchNuGet { pname = "Svg.Model"; version = "1.0.0.14"; sha256 = "03g343r1adaclnybj35p33bskwkn2scr9gka1l3cf13d3rz1hxal"; })
|
||||
(fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.14"; sha256 = "18rnn88gfkry72vzknwa89vfkclsn06hz4wqx3iy1x81pf1az4qq"; })
|
||||
(fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.16"; sha256 = "1xm30503b8921dn1mvpbhfx4g88hk0mq20zrp41bykhwcfmircqg"; })
|
||||
(fetchNuGet { pname = "Svg.Model"; version = "1.0.0.16"; sha256 = "0nd0ibjc2l50rd9xx2lh1zsfva6qp97zk6gl5iv2ds72dm669smz"; })
|
||||
(fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.16"; sha256 = "1msyivfdkjdiiw1ngfmplk1wwcv1glkfsx7qvfn4wsgahc775wzr"; })
|
||||
(fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
|
||||
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; })
|
||||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; })
|
||||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; })
|
||||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; })
|
||||
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; })
|
||||
(fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; })
|
||||
|
|
@ -232,7 +232,7 @@
|
|||
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; sha256 = "10a8vm0c3n5cili5nix6bdmiaxr69qisvk356pb81f2s8bgq40bm"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
|
||||
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; })
|
||||
|
|
@ -268,7 +268,7 @@
|
|||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; })
|
||||
(fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; })
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.1231"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.1239"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "1217a8e69b9b4feadb34c2d38209d765c9542819";
|
||||
sha256 = "1gr4cg7mbnvql7xxf9zwc0mi2a7575h28c4gfydpcdrvx0vaqknb";
|
||||
rev = "d26ef2eec309a7a7b30b103c245044d1cdc08add";
|
||||
sha256 = "0kdhxkgnnzhvmwlnzb5d0xx2f240y5h0vc1fhwiqk2cvwly5nd6y";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simdutf";
|
||||
version = "4.0.9";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdutf";
|
||||
repo = "simdutf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-LRMnjiO/J+DaSIBksrudjnkoEZtVG/RmW9S6w1gAB60=";
|
||||
hash = "sha256-ZCpLSMmgZSLAlVKzXFsaENnZwQAeKbNfKkj241PM26c=";
|
||||
};
|
||||
|
||||
# Fix build on darwin
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ rustPlatform.buildRustPackage {
|
|||
] ++ optionals enableCuda [
|
||||
# TODO: Replace with autoAddDriverRunpath
|
||||
# once https://github.com/NixOS/nixpkgs/pull/275241 has been merged
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gfortran
|
||||
, hdf5
|
||||
, python3
|
||||
, emacs
|
||||
, swig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trexio";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TREX-CoE";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SE5cylLThpwDWyAcQZgawcdYGc/8iiIwL6EyQ+hOIYY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs tools/*
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gfortran
|
||||
emacs
|
||||
swig
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hdf5
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "File format and library for the storage of quantum chemical wave functions";
|
||||
homepage = "https://trex-coe.github.io/trexio/";
|
||||
downloadPage = "https://github.com/TREX-CoE/trexio";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "adw-gtk3";
|
||||
version = "5.2";
|
||||
version = "5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lassekongo83";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-S6Yo67DTyRzS9uz/6g87SRmfPIBmAKfy4c23M5aENNg=";
|
||||
sha256 = "sha256-DpJLX9PJX1Q8dDOx7YOXQzgNECsKp5uGiCVTX6iSlbI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { };
|
||||
handy_window = callPackage ./handy-window { };
|
||||
matrix = callPackage ./matrix { };
|
||||
media_kit_libs_linux = callPackage ./media_kit_libs_linux { };
|
||||
olm = callPackage ./olm { };
|
||||
system_tray = callPackage ./system-tray { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
{ stdenv
|
||||
}:
|
||||
|
||||
# Implementation notes
|
||||
|
||||
# The patch exploits the fact that the download part is enclosed with "# ---"
|
||||
# To use this module you will need to pass the CMake variable MIMALLOC_LIB
|
||||
# example: -DMIMALLOC_LIB=${pkgs.mimalloc}/lib/mimalloc.o
|
||||
|
||||
# Direct link for the original CMakeLists.txt: https://raw.githubusercontent.com/media-kit/media-kit/main/libs/linux/media_kit_libs_linux/linux/CMakeLists.txt
|
||||
|
||||
{version, src, ...}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "media_kit_libs_linux";
|
||||
inherit version src;
|
||||
inherit (src) passthru;
|
||||
|
||||
doBuild = false;
|
||||
|
||||
postPatch = ''
|
||||
awk -i inplace 'BEGIN {opened = 0}; /# --*[^$]*/ { print (opened ? "]===]" : "#[===["); opened = !opened }; {print $0}' linux/CMakeLists.txt
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out"
|
||||
cp -r ./* "$out"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
autoAddOpenGLRunpathHook,
|
||||
autoAddDriverRunpath,
|
||||
backendStdenv,
|
||||
cmake,
|
||||
cudatoolkit,
|
||||
|
|
@ -31,7 +31,7 @@ backendStdenv.mkDerivation (
|
|||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
autoAddOpenGLRunpathHook
|
||||
autoAddDriverRunpath
|
||||
pkg-config
|
||||
]
|
||||
# CMake has to run as a native, build-time dependency for libNVVM samples.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
cudaVersion,
|
||||
runPatches ? [],
|
||||
autoPatchelfHook,
|
||||
autoAddOpenGLRunpathHook,
|
||||
autoAddDriverRunpath,
|
||||
addOpenGLRunpath,
|
||||
alsa-lib,
|
||||
curlMinimal,
|
||||
|
|
@ -76,7 +76,7 @@ backendStdenv.mkDerivation rec {
|
|||
rsync
|
||||
addOpenGLRunpath
|
||||
autoPatchelfHook
|
||||
autoAddOpenGLRunpathHook
|
||||
autoAddDriverRunpath
|
||||
markForCudatoolkitRootHook
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder version "11") [libsForQt5.wrapQtAppsHook]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
# General callPackage-supplied arguments
|
||||
autoAddOpenGLRunpathHook,
|
||||
autoAddCudaCompatRunpathHook,
|
||||
autoAddDriverRunpath,
|
||||
autoAddCudaCompatRunpath,
|
||||
autoPatchelfHook,
|
||||
backendStdenv,
|
||||
fetchurl,
|
||||
|
|
@ -193,16 +193,16 @@ backendStdenv.mkDerivation (
|
|||
# in typically /lib/opengl-driver by adding that
|
||||
# directory to the rpath of all ELF binaries.
|
||||
# Check e.g. with `patchelf --print-rpath path/to/my/binary
|
||||
autoAddOpenGLRunpathHook
|
||||
autoAddDriverRunpath
|
||||
markForCudatoolkitRootHook
|
||||
]
|
||||
# autoAddCudaCompatRunpathHook depends on cuda_compat and would cause
|
||||
# autoAddCudaCompatRunpath depends on cuda_compat and would cause
|
||||
# infinite recursion if applied to `cuda_compat` itself (beside the fact
|
||||
# that it doesn't make sense in the first place)
|
||||
++ lib.optionals (pname != "cuda_compat" && flags.isJetsonBuild) [
|
||||
# autoAddCudaCompatRunpathHook must appear AFTER autoAddOpenGLRunpathHook.
|
||||
# autoAddCudaCompatRunpath must appear AFTER autoAddDriverRunpath.
|
||||
# See its documentation in ./setup-hooks/extension.nix.
|
||||
autoAddCudaCompatRunpathHook
|
||||
autoAddCudaCompatRunpath
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
let
|
||||
inherit (cudaPackages)
|
||||
autoAddOpenGLRunpathHook
|
||||
autoAddDriverRunpath
|
||||
backendStdenv
|
||||
cuda_cccl
|
||||
cuda_cudart
|
||||
|
|
@ -44,7 +44,7 @@ backendStdenv.mkDerivation (
|
|||
nativeBuildInputs =
|
||||
[
|
||||
which
|
||||
autoAddOpenGLRunpathHook
|
||||
autoAddDriverRunpath
|
||||
python3
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit]
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
let
|
||||
inherit (cudaPackages)
|
||||
autoAddOpenGLRunpathHook
|
||||
autoAddDriverRunpath
|
||||
backendStdenv
|
||||
cuda_cccl
|
||||
cuda_cudart
|
||||
|
|
@ -29,7 +29,7 @@ backendStdenv.mkDerivation {
|
|||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
autoAddOpenGLRunpathHook
|
||||
autoAddDriverRunpath
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit]
|
||||
++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [cuda_nvcc];
|
||||
|
|
|
|||
|
|
@ -3,25 +3,25 @@
|
|||
# coming from the cuda_compat package by adding it to the RUNPATH.
|
||||
echo "Sourcing auto-add-cuda-compat-runpath-hook"
|
||||
|
||||
elfHasDynamicSection() {
|
||||
patchelf --print-rpath "$1" >& /dev/null
|
||||
addCudaCompatRunpath() {
|
||||
local libPath
|
||||
local origRpath
|
||||
|
||||
if [[ $# -eq 0 ]]; then
|
||||
echo "addCudaCompatRunpath: no library path provided" >&2
|
||||
exit 1
|
||||
elif [[ $# -gt 1 ]]; then
|
||||
echo "addCudaCompatRunpath: too many arguments" >&2
|
||||
exit 1
|
||||
elif [[ "$1" == "" ]]; then
|
||||
echo "addCudaCompatRunpath: empty library path" >&2
|
||||
exit 1
|
||||
else
|
||||
libPath="$1"
|
||||
fi
|
||||
|
||||
origRpath="$(patchelf --print-rpath "$libPath")"
|
||||
patchelf --set-rpath "@libcudaPath@:$origRpath" "$libPath"
|
||||
}
|
||||
|
||||
autoAddCudaCompatRunpathPhase() (
|
||||
local outputPaths
|
||||
mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done)
|
||||
find "${outputPaths[@]}" -type f -print0 | while IFS= read -rd "" f; do
|
||||
if isELF "$f"; then
|
||||
# patchelf returns an error on statically linked ELF files
|
||||
if elfHasDynamicSection "$f" ; then
|
||||
echo "autoAddCudaCompatRunpathHook: patching $f"
|
||||
local origRpath="$(patchelf --print-rpath "$f")"
|
||||
patchelf --set-rpath "@libcudaPath@:$origRpath" "$f"
|
||||
elif (( "${NIX_DEBUG:-0}" >= 1 )) ; then
|
||||
echo "autoAddCudaCompatRunpathHook: skipping a statically-linked ELF file $f"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
)
|
||||
|
||||
postFixupHooks+=(autoAddCudaCompatRunpathPhase)
|
||||
postFixupHooks+=("autoFixElfFiles addCudaCompatRunpath")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
# shellcheck shell=bash
|
||||
# Run addDriverRunpath on all dynamically linked ELF files
|
||||
echo "Sourcing auto-add-driver-runpath-hook"
|
||||
|
||||
if [ -z "${dontUseAutoAddDriverRunpath-}" ]; then
|
||||
echo "Using autoAddDriverRunpath"
|
||||
postFixupHooks+=("autoFixElfFiles addDriverRunpath")
|
||||
fi
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
# shellcheck shell=bash
|
||||
# Run addOpenGLRunpath on all dynamically linked, ELF files
|
||||
echo "Sourcing auto-add-opengl-runpath-hook"
|
||||
|
||||
elfHasDynamicSection() {
|
||||
patchelf --print-rpath "$1" >& /dev/null
|
||||
}
|
||||
|
||||
autoAddOpenGLRunpathPhase() (
|
||||
local outputPaths
|
||||
mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done)
|
||||
find "${outputPaths[@]}" -type f -print0 | while IFS= read -rd "" f; do
|
||||
if isELF "$f"; then
|
||||
# patchelf returns an error on statically linked ELF files
|
||||
if elfHasDynamicSection "$f" ; then
|
||||
echo "autoAddOpenGLRunpathHook: patching $f"
|
||||
addOpenGLRunpath "$f"
|
||||
elif (( "${NIX_DEBUG:-0}" >= 1 )) ; then
|
||||
echo "autoAddOpenGLRunpathHook: skipping a statically-linked ELF file $f"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
)
|
||||
|
||||
if [ -z "${dontUseAutoAddOpenGLRunpath-}" ]; then
|
||||
echo "Using autoAddOpenGLRunpathPhase"
|
||||
postFixupHooks+=(autoAddOpenGLRunpathPhase)
|
||||
fi
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
# shellcheck shell=bash
|
||||
# List all dynamically linked ELF files in the outputs and apply a generic fix
|
||||
# action provided as a parameter (currently used to add the CUDA or the
|
||||
# cuda_compat driver to the runpath of binaries)
|
||||
echo "Sourcing cuda/fix-elf-files.sh"
|
||||
|
||||
# Returns the exit code of patchelf --print-rpath.
|
||||
# A return code of 0 (success) means the ELF file has a dynamic section, while
|
||||
# a non-zero return code means the ELF file is statically linked (or is not an
|
||||
# ELF file).
|
||||
elfHasDynamicSection() {
|
||||
local libPath
|
||||
|
||||
if [[ $# -eq 0 ]]; then
|
||||
echo "elfHasDynamicSection: no library path provided" >&2
|
||||
exit 1
|
||||
elif [[ $# -gt 1 ]]; then
|
||||
echo "elfHasDynamicSection: too many arguments" >&2
|
||||
exit 1
|
||||
elif [[ "$1" == "" ]]; then
|
||||
echo "elfHasDynamicSection: empty library path" >&2
|
||||
exit 1
|
||||
else
|
||||
libPath="$1"
|
||||
shift 1
|
||||
fi
|
||||
|
||||
patchelf --print-rpath "$libPath" >& /dev/null
|
||||
return $?
|
||||
}
|
||||
|
||||
# Run a fix action on all dynamically linked ELF files in the outputs.
|
||||
autoFixElfFiles() {
|
||||
local fixAction
|
||||
local outputPaths
|
||||
|
||||
if [[ $# -eq 0 ]]; then
|
||||
echo "autoFixElfFiles: no fix action provided" >&2
|
||||
exit 1
|
||||
elif [[ $# -gt 1 ]]; then
|
||||
echo "autoFixElfFiles: too many arguments" >&2
|
||||
exit 1
|
||||
elif [[ "$1" == "" ]]; then
|
||||
echo "autoFixElfFiles: empty fix action" >&2
|
||||
exit 1
|
||||
else
|
||||
fixAction="$1"
|
||||
fi
|
||||
|
||||
mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done)
|
||||
|
||||
find "${outputPaths[@]}" -type f -print0 | while IFS= read -rd "" f; do
|
||||
if ! isELF "$f"; then
|
||||
continue
|
||||
elif elfHasDynamicSection "$f"; then
|
||||
# patchelf returns an error on statically linked ELF files, and in
|
||||
# practice fixing actions all involve patchelf
|
||||
echo "autoFixElfFiles: using $fixAction to fix $f" >&2
|
||||
$fixAction "$f"
|
||||
elif (( "${NIX_DEBUG:-0}" >= 1 )); then
|
||||
echo "autoFixElfFiles: skipping a statically-linked ELF file $f"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
|
@ -1,4 +1,19 @@
|
|||
final: _: {
|
||||
# Helper hook used in both autoAddCudaCompatRunpath and
|
||||
# autoAddDriverRunpath that applies a generic patching action to all elf
|
||||
# files with a dynamic linking section.
|
||||
autoFixElfFiles =
|
||||
final.callPackage
|
||||
(
|
||||
{makeSetupHook}:
|
||||
makeSetupHook
|
||||
{
|
||||
name = "auto-fix-elf-files";
|
||||
}
|
||||
./auto-fix-elf-files.sh
|
||||
)
|
||||
{};
|
||||
|
||||
# Internal hook, used by cudatoolkit and cuda redist packages
|
||||
# to accommodate automatic CUDAToolkit_ROOT construction
|
||||
markForCudatoolkitRootHook =
|
||||
|
|
@ -32,31 +47,36 @@ final: _: {
|
|||
{}
|
||||
);
|
||||
|
||||
autoAddOpenGLRunpathHook =
|
||||
autoAddDriverRunpath =
|
||||
final.callPackage
|
||||
(
|
||||
{addOpenGLRunpath, makeSetupHook}:
|
||||
{addDriverRunpath, autoFixElfFiles, makeSetupHook}:
|
||||
makeSetupHook
|
||||
{
|
||||
name = "auto-add-opengl-runpath-hook";
|
||||
propagatedBuildInputs = [addOpenGLRunpath];
|
||||
propagatedBuildInputs = [addDriverRunpath autoFixElfFiles];
|
||||
}
|
||||
./auto-add-opengl-runpath-hook.sh
|
||||
./auto-add-driver-runpath-hook.sh
|
||||
)
|
||||
{};
|
||||
|
||||
# autoAddCudaCompatRunpathHook hook must be added AFTER `setupCudaHook`. Both
|
||||
# Deprecated: an alias kept for compatibility. Consider removing after 24.11
|
||||
autoAddOpenGLRunpathHook = final.autoAddDriverRunpath;
|
||||
|
||||
# autoAddCudaCompatRunpath hook must be added AFTER `setupCudaHook`. Both
|
||||
# hooks prepend a path with `libcuda.so` to the `DT_RUNPATH` section of
|
||||
# patched elf files, but `cuda_compat` path must take precedence (otherwise,
|
||||
# it doesn't have any effect) and thus appear first. Meaning this hook must be
|
||||
# executed last.
|
||||
autoAddCudaCompatRunpathHook =
|
||||
autoAddCudaCompatRunpath =
|
||||
final.callPackage
|
||||
(
|
||||
{makeSetupHook, cuda_compat ? null }:
|
||||
{makeSetupHook, autoFixElfFiles, cuda_compat ? null }:
|
||||
makeSetupHook
|
||||
{
|
||||
name = "auto-add-cuda-compat-runpath-hook";
|
||||
propagatedBuildInputs = [autoFixElfFiles];
|
||||
|
||||
substitutions = {
|
||||
# Hotfix Ofborg evaluation
|
||||
libcudaPath = if final.flags.isJetsonBuild then "${cuda_compat}/compat" else null;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
]
|
||||
++ lib.optionals enableCuda [
|
||||
cudaPackages.cuda_nvcc
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake ]
|
||||
++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]
|
||||
++ lib.optionals cudaSupport [ cudaPackages.autoAddOpenGLRunpathHook ]
|
||||
++ lib.optionals cudaSupport [ cudaPackages.autoAddDriverRunpath ]
|
||||
++ lib.optionals rLibrary [ R ];
|
||||
|
||||
buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ariadne";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "mirumee";
|
||||
repo = "ariadne";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GMBtW2gZbF1m0BrKhYEkSaZYt5tIGmP/ipy6WC1H1pg=";
|
||||
hash = "sha256-zdM6LKtrD6m3hWn90yAgsinCvaa86BaTdhgf/VzGDLA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -3,36 +3,54 @@
|
|||
, attrs
|
||||
, buildPythonPackage
|
||||
, defusedxml
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, pytest-vcr
|
||||
, syrupy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "connect-box";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "connect_box";
|
||||
inherit version;
|
||||
hash = "sha256-x1ozcj3IL+iI/QtS12yEudCqNknCmyb5ew88Z39xaLA=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-ecosystem";
|
||||
repo = "python-connect-box";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zUvZRnxVzg9izvUbp7QVcyu6Bw3dUXHOr0kOQRWEZVc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
attrs
|
||||
defusedxml
|
||||
];
|
||||
|
||||
# No tests are present
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
pytest-vcr
|
||||
syrupy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"connect_box"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--vcr-record=none"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interact with a Compal CH7465LG cable modem/router";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flet-client-flutter
|
||||
|
||||
# build-system
|
||||
, poetry-core
|
||||
|
|
@ -12,14 +12,10 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flet-core";
|
||||
version = "0.21.1";
|
||||
inherit (flet-client-flutter) version src;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "flet_core";
|
||||
inherit version;
|
||||
hash = "sha256-PZY4aRj/zBuHHIPHkEbZ1oXGnJyeCOqP9Pp8jYbOZ4I=";
|
||||
};
|
||||
sourceRoot = "${src.name}/sdk/python/packages/flet-core";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
|
|
@ -37,6 +33,6 @@ buildPythonPackage rec {
|
|||
description = "The library is the foundation of Flet framework and is not intended to be used directly";
|
||||
homepage = "https://flet.dev/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.heyimnova ];
|
||||
maintainers = with lib.maintainers; [ heyimnova lucasew ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
import os
|
||||
if 'FLET_VIEW_PATH' not in os.environ:
|
||||
os.environ["FLET_VIEW_PATH"] = "@flet-client-flutter@/bin"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flet-client-flutter
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, flet-core
|
||||
|
|
@ -10,14 +10,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flet-runtime";
|
||||
version = "0.21.1";
|
||||
inherit (flet-client-flutter) version src;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "flet_runtime";
|
||||
inherit version;
|
||||
hash = "sha256-48diTMTWbiZNF4jU6ABgWYsdhNNs3bte7brgdEJE3es=";
|
||||
};
|
||||
sourceRoot = "${src.name}/sdk/python/packages/flet-runtime";
|
||||
|
||||
postPatch = ''
|
||||
substitute ${./_setup_runtime.py} src/flet_runtime/_setup_runtime.py \
|
||||
--replace @flet-client-flutter@ ${flet-client-flutter}
|
||||
|
||||
echo -e "import flet_runtime._setup_runtime\n$(cat src/flet_runtime/__init__.py)" > src/flet_runtime/__init__.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
|
|
@ -43,6 +47,6 @@ buildPythonPackage rec {
|
|||
description = "A base package for Flet desktop and Flet mobile";
|
||||
homepage = "https://flet.dev/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.wegank ];
|
||||
maintainers = with lib.maintainers; [ lucasew wegank ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flet-client-flutter
|
||||
, pythonRelaxDepsHook
|
||||
|
||||
# build-system
|
||||
|
|
@ -24,13 +24,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flet";
|
||||
version = "0.21.1";
|
||||
inherit (flet-client-flutter) version src;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YAMZku8jbdQ8JvUr5aLATIGIiTDmG6CGvfUKo28q7ks=";
|
||||
};
|
||||
sourceRoot = "${src.name}/sdk/python/packages/flet";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
|
|
@ -39,6 +37,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonRelaxDeps = [
|
||||
"websockets"
|
||||
"cookiecutter"
|
||||
"watchdog"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -54,6 +54,8 @@ buildPythonPackage rec {
|
|||
packaging
|
||||
qrcode
|
||||
cookiecutter
|
||||
fastapi
|
||||
uvicorn
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
|
@ -67,7 +69,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://flet.dev/";
|
||||
changelog = "https://github.com/flet-dev/flet/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.heyimnova ];
|
||||
maintainers = with lib.maintainers; [ heyimnova lucasew ];
|
||||
mainProgram = "flet";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,19 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "git-filter-repo";
|
||||
version = "2.38.0";
|
||||
format = "setuptools";
|
||||
docs_version = "01ead411966a83dfcfb35f9d2e8a9f7f215eaa65";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
|
|
@ -18,6 +22,13 @@ buildPythonPackage rec {
|
|||
hash = "sha256-/hdT4Y8L1tPJtXhoyAEa59BWpuurcGcGOWoV71MScl4=";
|
||||
};
|
||||
|
||||
docs = fetchFromGitHub {
|
||||
owner = "newren";
|
||||
repo = "git-filter-repo";
|
||||
rev = docs_version;
|
||||
hash = "sha256-Z/3w3Rguo8sfuc/OQ25eFbMfiOHjxQqPY6S32zuvoY4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/newren/git-filter-repo/pull/498
|
||||
(fetchpatch {
|
||||
|
|
@ -28,8 +39,13 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage ${docs}/man1/git-filter-repo.1
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
|
|
@ -44,6 +60,20 @@ buildPythonPackage rec {
|
|||
mainProgram = "git-filter-repo";
|
||||
homepage = "https://github.com/newren/git-filter-repo";
|
||||
license = with licenses; [ mit /* or */ gpl2Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
maintainers = with maintainers; [ aiotter fab ];
|
||||
};
|
||||
|
||||
passthru.updateScript = writeScript "update-${pname}" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl jq nix-update
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
# Update program
|
||||
nix-update ${pname}
|
||||
|
||||
# Update docs
|
||||
docs_latest=$(curl -s https://api.github.com/repos/newren/git-filter-repo/commits/heads/docs/status | jq -r '.sha')
|
||||
[[ "${docs_version}" = "$docs_latest" ]] || update-source-version ${pname} "$docs_latest" --version-key=docs_version --source-key=docs
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaVersion;
|
||||
inherit (cudaPackagesGoogle) autoAddDriverRunpath cudaVersion;
|
||||
|
||||
version = "0.4.24";
|
||||
|
||||
|
|
@ -180,7 +180,7 @@ buildPythonPackage {
|
|||
# Prebuilt wheels are dynamically linked against things that nix can't find.
|
||||
# Run `autoPatchelfHook` to automagically fix them.
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]
|
||||
++ lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ];
|
||||
++ lib.optionals cudaSupport [ autoAddDriverRunpath ];
|
||||
# Dynamic link dependencies
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
}@inputs:
|
||||
|
||||
let
|
||||
inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaFlags cudaVersion cudnn nccl;
|
||||
inherit (cudaPackagesGoogle) autoAddDriverRunpath cudaFlags cudaVersion cudnn nccl;
|
||||
|
||||
pname = "jaxlib";
|
||||
version = "0.4.24";
|
||||
|
|
@ -420,7 +420,7 @@ buildPythonPackage {
|
|||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ];
|
||||
nativeBuildInputs = lib.optionals cudaSupport [ autoAddDriverRunpath ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lxmf";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "markqvist";
|
||||
repo = "lxmf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sEim7bCLLkHo6A1onbDQruyNigVKtim5DDAQI8CYUVo=";
|
||||
hash = "sha256-JDD1X0/5xuqGN/Qw67tTFqfoWUd7Ah80/mimK01tG6Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,38 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, asn1crypto
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, unicrypto
|
||||
, asyauth
|
||||
, asysocks
|
||||
, minikerberos
|
||||
, asn1crypto
|
||||
, winacl
|
||||
, prompt-toolkit
|
||||
, tqdm
|
||||
, winacl
|
||||
, winsspi
|
||||
, pythonOlder
|
||||
, wcwidth
|
||||
, tabulate
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msldap";
|
||||
version = "0.5.9";
|
||||
format = "setuptools";
|
||||
version = "0.5.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XzxONiKW4OHrpEftqfIwmIp7KgiCb3s+007JYS68/jM=";
|
||||
hash = "sha256-Zb/g5QLJTSb0XTZvVnzbYkYvJ/ZVvQri8CKP48n5ibg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
unicrypto
|
||||
asyauth
|
||||
asysocks
|
||||
minikerberos
|
||||
asn1crypto
|
||||
winacl
|
||||
prompt-toolkit
|
||||
tqdm
|
||||
winacl
|
||||
winsspi
|
||||
wcwidth
|
||||
tabulate
|
||||
];
|
||||
|
||||
# Project doesn't have tests
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
nativeBuildInputs = [
|
||||
unzip
|
||||
autoPatchelfHook
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
preUnpack = ''
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ in buildPythonPackage {
|
|||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
addOpenGLRunpath
|
||||
autoPatchelfHook
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux (with cudaPackages; [
|
||||
|
|
|
|||
|
|
@ -338,7 +338,7 @@ in buildPythonPackage rec {
|
|||
pythonRelaxDepsHook
|
||||
removeReferencesTo
|
||||
] ++ lib.optionals cudaSupport (with cudaPackages; [
|
||||
autoAddOpenGLRunpathHook
|
||||
autoAddDriverRunpath
|
||||
cuda_nvcc
|
||||
])
|
||||
++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-deprecated";
|
||||
version = "1.2.9.20240106";
|
||||
version = "1.2.9.20240311";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types-Deprecated";
|
||||
inherit version;
|
||||
hash = "sha256-r+uBnpoD0KV5XxjIj+YgfEjtE8Y56TKBvZ2be7bTQxA=";
|
||||
hash = "sha256-BoDomYmoFCcH3oED8V0YJEWlM8EEf9m36MVFkQHpuQo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2.3.0";
|
||||
srcHash = "sha256-r5TV5WJW2klSlrOG6EjfUgLyHhMI+BMUTY/2JIUgd0Q=";
|
||||
version = "2.4.0";
|
||||
srcHash = "sha256-QQJ3VGt7iPlAIGb10VS7Jev9rCsAU4L/o8UURitP7b8=";
|
||||
# The tarball contains vendored dependencies
|
||||
vendorHash = null;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ let
|
|||
buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
|
||||
|
||||
# the version of infisical
|
||||
version = "0.18.0";
|
||||
version = "0.18.3";
|
||||
|
||||
# the platform-specific, statically linked binary
|
||||
src =
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
|
||||
, "x86_64-linux": "sha256-FDkDZJ4Uq/FZonfbuzYFbY7g00jGhyw36VizyqfkZO8="
|
||||
, "x86_64-darwin": "sha256-gi/5W49tp3vhxDuMxooALKzt73jLFBtPonR/9ZExSgc="
|
||||
, "aarch64-linux": "sha256-War89zjbKxDdyXa1AUhwpKCKbOPFaJR7lsDXUk+PmmI="
|
||||
, "aarch64-darwin": "sha256-F3CD3gxBn0so89zImM6gi8+3WnNNuMdj/o3x3h1OrjM="
|
||||
, "x86_64-linux": "sha256-gmWl+IM9xBpl7T2I9FgssUInVMejKJzxKCfQ7mEGGVM="
|
||||
, "x86_64-darwin": "sha256-VBEx9VGuBm8Ua0FhAEBptrQSOOiU56/uvmNpIEA5ltE="
|
||||
, "aarch64-linux": "sha256-93PIUVo5U/qzjVXN4CYx9wqRzeA/G3+gPXVe6gIUoOI="
|
||||
, "aarch64-darwin": "sha256-G2jWCfShjkLC3rjx3aUUtaAXSfm26YXBzQLLwoPX/SE="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackfire";
|
||||
version = "2.26.0";
|
||||
version = "2.26.1";
|
||||
|
||||
src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
|
@ -57,23 +57,23 @@ stdenv.mkDerivation rec {
|
|||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
|
||||
sha256 = "MCEMWKKTvmenMsQ6Vxmi8rQ25kuOeUEES43tHaexAA8=";
|
||||
sha256 = "Ujl9Uicz3erD6+eerlyk7JU07X9gkqVTAgEZipwWPLQ=";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
|
||||
sha256 = "afDtzRpdvgbA/1zRbnQJsKrvSTfGLbjIgA88pAch7mA=";
|
||||
sha256 = "aVXxPvS8ZbMYFVg5IlUwNCJTh3mPpG/r71mHvKw/tuQ=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
|
||||
sha256 = "Noqle0K/H0wKwl4U8idoMT5wWY12W7p7nHMybbf3Ztc=";
|
||||
sha256 = "I82I9+0IFPLkyfQJM1q/yYtX1QQhxPK0ZMm2tJaeDA8=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
|
||||
sha256 = "5AWsUUHTpCakG3WLUq+SZDjj0lvnYllzbBojpOgUQtA=";
|
||||
sha256 = "yT3zZqtP7mInyjnfaalONvMNGywGylXsmReE3kzgKVg=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
|
||||
sha256 = "67xVi+FXztNIJe+kjXSwYHsX/1PWHP0QeFI8AwnrdP0=";
|
||||
sha256 = "TlOa7/W1ChHV4Wwu6jEp9Jxl+PA/l48Te1H+u9sfiWc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.29.1";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Eq8NLfgFoO/Upq+eO8kKDMtxgEMQYTG9B6TdCZjGdzc=";
|
||||
hash = "sha256-5+UE1Ka2pciuNrkrPDCJMp12+IUbgq7k3cKSP5pahw4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AMI997Tz1l7qUmdGPVOtb2KENX27ZfM0P7snzP3aRXU=";
|
||||
cargoHash = "sha256-GuajrFdPlgneL95eWT3n2MdzfsbuID/pI9ED8TlVOCo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
|||
|
|
@ -105,10 +105,10 @@ in gcc11Stdenv.mkDerivation rec {
|
|||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
# autoAddOpenGLRunpathHook does not actually depend on or incur any dependency
|
||||
# autoAddDriverRunpath does not actually depend on or incur any dependency
|
||||
# of cudaPackages. It merely adds an impure, non-Nix PATH to the RPATHs of
|
||||
# executables that need to use cuda at runtime.
|
||||
cudaPackages_12.autoAddOpenGLRunpathHook
|
||||
cudaPackages_12.autoAddDriverRunpath
|
||||
|
||||
cmake
|
||||
git
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcm";
|
||||
version = "202401";
|
||||
version = "202403";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opcm";
|
||||
repo = "pcm";
|
||||
rev = version;
|
||||
hash = "sha256-S4E9q4pdF9pT0ehKkeOMbJEFlTV9zB15BZA0R+cjVi8=";
|
||||
hash = "sha256-qefqtuxRaQEsWpXNAuGxuIT3LiH2b8xQb54B0RkzKGA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -32,20 +32,20 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.102.0";
|
||||
version = "1.103.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RJsuvNqqUiiVw6uKkG81rqo1ZoszUHK4UIJh8MReFqo=";
|
||||
hash = "sha256-NwHX4pOM2PUf2MldaPTOzP9gOcTmILxM1Sx2HPkLBcw=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-PoPJnSZ9QpcpVbqDMlqwgAqu0K8oornpihErLHXb6Gc=";
|
||||
hash = "sha256-AyV0JPPJkJ4jdaw0FUXPqGF3Qkce1+RK70FkXAw+bLA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ buildGoModule rec {
|
|||
vendorHash = "sha256-Fjvx15e/psxoqoS6c6GhiQfe7g2aI40EmPR26xLhrzg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
# Tests try to interact with running DCGM service.
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "23.3.8";
|
||||
version = "23.3.9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a5V9kvRm7Np0pE/gMHtlkgbIlKfY9ehFVU35QDwpHh0=";
|
||||
sha256 = "sha256-CvHAjUwW1pkagebZQRXY51DazFCWRCD1seB46AwDVX8=";
|
||||
};
|
||||
server = callPackage ./server.nix { inherit src version; };
|
||||
in
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "weaviate";
|
||||
version = "1.24.1";
|
||||
version = "1.24.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9FA0GxLgzw3D329JdQ044QC/D9ncxsadmCHlppnf9fI=";
|
||||
hash = "sha256-kovhusZ/4/wLr8FeBY6jBPdD1V718yI41fTjbtjGleM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G5ya2O5IY7+DE4UeXuH5lTT0jbjIc9W09ePLsJsjQ78=";
|
||||
vendorHash = "sha256-0CPdBrEjBJiX/Fv0DhFaZqkixuEPW2Pttl5wCNxieYc=";
|
||||
|
||||
subPackages = [ "cmd/weaviate-server" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ stdenv'.mkDerivation rec {
|
|||
autoPatchelfHook
|
||||
makeWrapper
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@ in
|
|||
meta = with lib; {
|
||||
description = "NoMachine remote desktop client (nxplayer)";
|
||||
homepage = "https://www.nomachine.com/";
|
||||
mainProgram = "nxplayer";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = {
|
||||
fullName = "NoMachine 7 End-User License Agreement";
|
||||
|
|
|
|||
|
|
@ -45,9 +45,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
] ++ lib.optionals cudaSupport ( with cudaPackages ;[
|
||||
cuda_nvcc
|
||||
|
||||
# TODO: Replace with autoAddDriverRunpath
|
||||
# once https://github.com/NixOS/nixpkgs/pull/275241 has been merged
|
||||
autoAddOpenGLRunpathHook
|
||||
autoAddDriverRunpath
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,15 +6,16 @@
|
|||
, libev
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mbidled";
|
||||
version = "unstable-2022-10-30";
|
||||
version = "unstable-2023-09-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zsugabubus";
|
||||
repo = "mbidled";
|
||||
rev = "b06152f015a470876b042e538804ebb1ac247c09";
|
||||
sha256 = "sha256-eHm10onJ7v6fhvJiGXZhuN3c9cj+NoVIW2XQb2fdmuA=";
|
||||
rev = "c724a34cc01b829b19a60655fc1652a378db7f27";
|
||||
sha256 = "sha256-XQXLPjEEesBd+bATsKE2nvoNcuqtRA1JIsV7306CssA=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -22,11 +23,13 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libev openssl
|
||||
libev
|
||||
openssl
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nix-update";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-/Lv4wO4mCOwk8lNdfiQq2U+PhgeEeSnh89I2N7fxEpE=";
|
||||
hash = "sha256-Nu9/mzL/notnR6Tvtj938Mo0TmYJutA2oJ6/rg2uZCo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "10.7.3";
|
||||
version = "10.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TFwMquMyHnUGyHGKBrialsDKL5Mubsop1Sudyu/IGjE=";
|
||||
hash = "sha256-EfVbYIGkjH0tHaMgnoyAGw7ZlAPVBlhbKTjryFRBF1A=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-+hlJqcX3cGo/ej5HPPZBZCTUHvB9+/iPTebNKdokLQ0=";
|
||||
vendorHash = "sha256-xrWGILBxZEoNi4PHG1vixLpOVaW0LRKkTkJsx5mWBns=";
|
||||
|
||||
subPackages = [
|
||||
"apps/cnspec"
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
, testers
|
||||
, cudaSupport ? config.cudaSupport
|
||||
, cudaPackages
|
||||
, rocmSupport ? config.rocmSupport
|
||||
, rocmPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
cudaPackages.autoAddDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
|
@ -37,6 +39,11 @@ stdenv.mkDerivation rec {
|
|||
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/bin/btop)
|
||||
'';
|
||||
|
||||
postPhases = lib.optionals rocmSupport [ "postPatchelf" ];
|
||||
postPatchelf = lib.optionalString rocmSupport ''
|
||||
patchelf --add-rpath ${lib.getLib rocmPackages.rocm-smi}/lib $out/bin/btop
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = btop;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24180,7 +24180,9 @@ with pkgs;
|
|||
|
||||
protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { };
|
||||
protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { };
|
||||
protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { };
|
||||
protobuf_23 = callPackage ../development/libraries/protobuf/23.nix {
|
||||
abseil-cpp = abseil-cpp_202301;
|
||||
};
|
||||
protobuf_21 = callPackage ../development/libraries/protobuf/21.nix {
|
||||
abseil-cpp = abseil-cpp_202103;
|
||||
};
|
||||
|
|
@ -29932,8 +29934,6 @@ with pkgs;
|
|||
amarok = libsForQt5.callPackage ../applications/audio/amarok { };
|
||||
amarok-kf5 = amarok; # for compatibility
|
||||
|
||||
amfora = callPackage ../applications/networking/browsers/amfora { };
|
||||
|
||||
AMB-plugins = callPackage ../applications/audio/AMB-plugins { };
|
||||
|
||||
ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue