mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Fabián Heredia Montiel
commit
1b7dd985dc
41 changed files with 9307 additions and 769 deletions
|
|
@ -1,3 +1,35 @@
|
|||
# cmake {#cmake}
|
||||
|
||||
Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. `cmakeFlags` controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator.
|
||||
Overrides the default configure phase to run the CMake command.
|
||||
|
||||
By default, we use the Make generator of CMake.
|
||||
But when Ninja is also available as a `nativeBuildInput`, this setup hook will detect that and use the ninja generator.
|
||||
|
||||
Dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake.
|
||||
Some additional flags are passed in to give similar behavior to configure-based packages.
|
||||
|
||||
By default, parallel building is enabled as CMake supports parallel building almost everywhere.
|
||||
|
||||
You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`.
|
||||
|
||||
## Variables controlling CMake {#cmake-variables-controlling}
|
||||
|
||||
### CMake Exclusive Variables {#cmake-exclusive-variables}
|
||||
|
||||
#### `cmakeFlags` {#cmake-flags}
|
||||
|
||||
Controls the flags passed to `cmake setup` during configure phase.
|
||||
|
||||
#### `cmakeBuildDir` {#cmake-build-dir}
|
||||
|
||||
Directory where CMake will put intermediate files.
|
||||
|
||||
Setting this can be useful for debugging multiple CMake builds while in the same source directory, for example, when building for different platforms.
|
||||
Different values for each build will prevent build artefacts from interefering with each other.
|
||||
This setting has no tangible effect when running the build in a sandboxed derivation.
|
||||
|
||||
The default value is `build`.
|
||||
|
||||
#### `dontUseCmakeConfigure` {#dont-use-cmake-configure}
|
||||
|
||||
When set to true, don't use the predefined `cmakeConfigurePhase`.
|
||||
|
|
|
|||
|
|
@ -18,14 +18,9 @@ This installs the sway compositor along with some essential utilities.
|
|||
Now you can start sway from the TTY console.
|
||||
|
||||
If you are using a wlroots-based compositor, like sway, and want to be
|
||||
able to share your screen, you might want to activate this option:
|
||||
|
||||
```nix
|
||||
{
|
||||
xdg.portal.wlr.enable = true;
|
||||
}
|
||||
```
|
||||
|
||||
and configure Pipewire using
|
||||
able to share your screen, make sure to configure Pipewire using
|
||||
[](#opt-services.pipewire.enable)
|
||||
and related options.
|
||||
|
||||
For more helpful tips and tricks, see the
|
||||
[wiki page about Sway](https://wiki.nixos.org/wiki/Sway).
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
msgpack (1.5.1)
|
||||
msgpack (1.7.2)
|
||||
multi_json (1.15.0)
|
||||
neovim (0.9.0)
|
||||
neovim (0.10.0)
|
||||
msgpack (~> 1.1)
|
||||
multi_json (~> 1.0)
|
||||
|
||||
|
|
@ -14,4 +14,4 @@ DEPENDENCIES
|
|||
neovim
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
2.3.27
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "sha256-fPWiGi0w4OFlMZOIf3gd21jyeYhg5t/VdLz7kK9fD8Q=";
|
||||
sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.1";
|
||||
version = "1.7.2";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
|
|
@ -25,9 +25,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "sha256-hRI43XGHGeqxMvpFjp0o79GGReiLXTkhwh5LYq6AQL4=";
|
||||
sha256 = "0gl34rriwwmj6p1s6ms0b311wmqaqiyc510svq31283jk0kp0qcd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2024-09-30";
|
||||
version = "2024-10-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yetone";
|
||||
repo = "avante.nvim";
|
||||
rev = "0705234991d03170a72582085dc508600a03a779";
|
||||
hash = "sha256-tAigYqS3ZAtZJp7RaarbXrDxrjiYu2wjNHq6GP/BMfk=";
|
||||
rev = "36b23cef16c2c624c34bea213f01c06782d2ca40";
|
||||
hash = "sha256-QUFcJMbfr5BAS04ig1IHLCMLACeQhFVH9ZCH/VD8i8Y=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -71,6 +71,5 @@ vimUtils.buildVimPlugin {
|
|||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
# TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
|
||||
# nvimRequireCheck = "avante";
|
||||
nvimRequireCheck = "avante";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9401,6 +9401,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/";
|
||||
};
|
||||
|
||||
nvim-treesitter-pairs = buildVimPlugin {
|
||||
pname = "nvim-treesitter-pairs";
|
||||
version = "2024-10-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "nvim-treesitter-pairs";
|
||||
rev = "f8c195d4d8464cba6971bf8de2d6a5c8c109b37a";
|
||||
sha256 = "sha256-VHq7ohBDThkBwqUIEVBb4RujBkftu96DQe/y6l7egzM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/nvim-treesitter-pairs/";
|
||||
};
|
||||
|
||||
nvim-treesitter-pyfold = buildVimPlugin {
|
||||
pname = "nvim-treesitter-pyfold";
|
||||
version = "2023-04-11";
|
||||
|
|
@ -18672,6 +18684,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/samodostal/image.nvim/";
|
||||
};
|
||||
|
||||
scretch-nvim = buildVimPlugin {
|
||||
pname = "scretch.nvim";
|
||||
version = "2024-10-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xJohnnyboy";
|
||||
repo = "scretch.nvim";
|
||||
rev = "0b2fbd0ed285f74baab7396a4a08c7bb7a3653c1";
|
||||
sha256 = "sha256-BqCVe7dY6WNJZS2XTNcnvB9d+HoM0wUItmmVskEaVHQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/0xJohnnyboy/scretch.nvim/";
|
||||
};
|
||||
|
||||
tinykeymap = buildVimPlugin {
|
||||
pname = "tinykeymap";
|
||||
version = "2024-02-17";
|
||||
|
|
|
|||
|
|
@ -1861,6 +1861,10 @@ in
|
|||
nvimRequireCheck = "rustaceanvim";
|
||||
};
|
||||
|
||||
scretch-nvim = super.scretch-nvim.overrideAttrs {
|
||||
nvimRequireCheck = "scretch";
|
||||
};
|
||||
|
||||
sg-nvim = super.sg-nvim.overrideAttrs (
|
||||
old:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -789,6 +789,7 @@ https://github.com/nvim-tree/nvim-tree.lua/,,
|
|||
https://github.com/nvim-treesitter/nvim-treesitter/,,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter-context/,,
|
||||
https://github.com/RRethy/nvim-treesitter-endwise/,HEAD,
|
||||
https://github.com/theHamsta/nvim-treesitter-pairs/,HEAD,
|
||||
https://github.com/eddiebergman/nvim-treesitter-pyfold/,,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,,
|
||||
|
|
@ -904,6 +905,7 @@ https://github.com/vmware-archive/salt-vim/,,
|
|||
https://github.com/lewis6991/satellite.nvim/,HEAD,
|
||||
https://github.com/davidgranstrom/scnvim/,HEAD,
|
||||
https://github.com/tiagovla/scope.nvim/,HEAD,
|
||||
https://github.com/0xJohnnyboy/scretch.nvim/,HEAD,
|
||||
https://github.com/Xuyuanp/scrollbar.nvim/,,
|
||||
https://github.com/cakebaker/scss-syntax.vim/,,
|
||||
https://github.com/VonHeikemen/searchbox.nvim/,,
|
||||
|
|
|
|||
|
|
@ -10,43 +10,43 @@
|
|||
|
||||
let
|
||||
pname = "1password";
|
||||
version = if channel == "stable" then "8.10.40" else "8.10.44-21.BETA";
|
||||
version = if channel == "stable" then "8.10.46" else "8.10.48-17.BETA";
|
||||
|
||||
sources = {
|
||||
stable = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
hash = "sha256-viY0SOUhrOvmue6Nolau356rIqwDo2nLzMilFFmNb9g=";
|
||||
hash = "sha256-oewS90rSBqxA0V+ttcmUXznUZ3+mb5FKtmYD4kUDmTk=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
|
||||
hash = "sha256-7lUZiS3TSsIVqPoN5A6YqyVaaaRI9BliT51FHkwOPyw=";
|
||||
hash = "sha256-tHQIhLPTD2dFRK542kFnpExg36paaNuzyOED8ZKyIYk=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
hash = "sha256-xK/B8J3VP8y1xw3KorzZzPf/LjYmYdOIjDECMJnVv6I=";
|
||||
hash = "sha256-pnAE1UTMXX89wshEI/wzhySb1NZY5ke5bSYmUjvU/pc=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
hash = "sha256-iqdK6K7dcypZFGseYal2KjOaqJtUjXeCzbDdx7pDv8A=";
|
||||
hash = "sha256-MmHUa96keBV9+E2GQdgz/aCTXeFkVNqHV0eH8/WhvhY=";
|
||||
};
|
||||
};
|
||||
beta = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
|
||||
hash = "sha256-enorJfbn+xJVy1fG3wjhO3LkSsMncHA9/yA13kG+h4Y=";
|
||||
hash = "sha256-4SPZJP/ebnyAMEWrIGonb+5nYXuM8KCPK9modC/Cr/Y=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
|
||||
hash = "sha256-EUnIIi6DB5kBVid9ExBpNApKItHnRKQziBy/GFt0xag=";
|
||||
hash = "sha256-V5Nt81Trw6l7DAUtCX2Yv/fL2wBJpJER0iaOBmMfQ5o=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
hash = "sha256-U14CjoUJUpd4wWidZz6xGErhHI/VPChqG8cwBTBYoYc=";
|
||||
hash = "sha256-UfSUPqZgbYdWyrfw41SdnnI1IeA+dYsfBAu/UQl0vVI=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
hash = "sha256-DD1M2EFSHqG9OHX5Q/CmZLZIKYrBMS4cnX/6tLVi7H0=";
|
||||
hash = "sha256-ynkDnJtoKMAtegeilB0XIH+YrSS9EKYV1ceN0Ecls+A=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weston";
|
||||
version = "14.0.0";
|
||||
version = "14.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz";
|
||||
hash = "sha256-R/0DJbC5SOmwA6OP306zqFgfP9x0C4kys1roeTv05KU=";
|
||||
hash = "sha256-qBUFBbEmpZ33gf6MMMjm+H2nAT4XkDnrhEpbu8x8ebM=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
|
|
|||
55
pkgs/by-name/an/ani-skip/package.nix
Normal file
55
pkgs/by-name/an/ani-skip/package.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
gnugrep,
|
||||
gnused,
|
||||
curl,
|
||||
fzf,
|
||||
lib,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "ani-skip";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "synacktraa";
|
||||
repo = "ani-skip";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-VEEG3d6rwTAS7/+gBKHFKIg9zFfBu5eBOu6Z23621gM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
runtimeInputs = [
|
||||
gnugrep
|
||||
gnused
|
||||
curl
|
||||
fzf
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D skip.lua $out/share/mpv/scripts/skip.lua
|
||||
install -Dm 755 ani-skip $out/bin/ani-skip
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/ani-skip \
|
||||
--replace-fail '--script-opts=%s' "--script=$out/share/mpv/scripts/skip.lua --script-opts=%s"
|
||||
|
||||
wrapProgram $out/bin/ani-skip \
|
||||
--prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/synacktraa/ani-skip";
|
||||
description = "Automated solution to bypassing anime opening and ending sequences";
|
||||
mainProgram = "ani-skip";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.diniamo ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "astro-language-server";
|
||||
version = "2.15.0";
|
||||
version = "2.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "withastro";
|
||||
repo = "language-tools";
|
||||
rev = "@astrojs/language-server@${finalAttrs.version}";
|
||||
hash = "sha256-2MaoW04mX016VIrtfnBX/jzMNCOXE10lSInSyhqot5E=";
|
||||
hash = "sha256-PJTcr/FIA0haatLFNHMJV24j6eK+c2DR9zpnR8aReHo=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pnpmWorkspace
|
||||
prePnpmInstall
|
||||
;
|
||||
hash = "sha256-WSnXMVWuE6VC75a1bhZHGyUg6r1yMBvoQZeKdIYE7QI=";
|
||||
hash = "sha256-/X8ZoWK5kBPm/8clBDP+B9A5ofXnH2svmy4kMc2t5iA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "bluespec";
|
||||
version = "2024.01";
|
||||
version = "2024.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "B-Lang-org";
|
||||
repo = "bsc";
|
||||
rev = version;
|
||||
sha256 = "sha256-yqmtydv94p7qhps0t4EdPaSZNh/9XCuUwOzLqz0gjxE=";
|
||||
sha256 = "sha256-gA/vfAkkM2cuArN99JZVYEWTIJqg82HlC+BHNVS5Ot0=";
|
||||
};
|
||||
|
||||
yices-src = fetchurl {
|
||||
|
|
@ -3,29 +3,31 @@
|
|||
, fetchurl
|
||||
, substituteAll
|
||||
, bubblewrap
|
||||
, cairo
|
||||
, cargo
|
||||
, git
|
||||
, gnome
|
||||
, gtk4
|
||||
, lcms2
|
||||
, libheif
|
||||
, libjxl
|
||||
, librsvg
|
||||
, libseccomp
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustc
|
||||
, rustPlatform
|
||||
, gtk4
|
||||
, cairo
|
||||
, libheif
|
||||
, libxml2
|
||||
, libseccomp
|
||||
, libjxl
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glycin-loaders";
|
||||
version = "1.0.1";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glycin-loaders/${lib.versions.majorMinor finalAttrs.version}/glycin-loaders-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-0PAiRi/1VYVuheqUBHRHC7NrN8n/y8umOgP+XpVDcM8=";
|
||||
url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Vg7kIWfB7SKCZhjmHYPkkUDbW/R6Zam6js4s1z0qSqg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -49,15 +51,24 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
gtk4 # for GdkTexture
|
||||
cairo
|
||||
lcms2
|
||||
libheif
|
||||
libxml2 # for librsvg crate
|
||||
librsvg
|
||||
libseccomp
|
||||
libjxl
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dglycin-loaders=true"
|
||||
"-Dlibglycin=false"
|
||||
"-Dvapi=false"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "glycin-loaders";
|
||||
attrPath = "glycin-loaders";
|
||||
packageName = "glycin";
|
||||
};
|
||||
|
||||
glycinPathsPatch = substituteAll {
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
{
|
||||
"version": "1.118.1",
|
||||
"hash": "sha256-rWBW0EwehuWnKk6qEte+dPd9l7FbLzwdkCSKMm22Orw=",
|
||||
"version": "1.118.2",
|
||||
"hash": "sha256-u2/Xs1SdAzmQ02pyXD9+ncamIKFcq8qMijnx7KFtrmU=",
|
||||
"components": {
|
||||
"cli": {
|
||||
"npmDepsHash": "sha256-0je82BtDH6cUzoMrmeIS0jLmWPbmkdIQJ/SnmbAMtbw=",
|
||||
"version": "2.2.25"
|
||||
"npmDepsHash": "sha256-RwfGq0fDPYo+ZP2xv+sMKmr3Tf8szbB8506c1PqiMM0=",
|
||||
"version": "2.2.26"
|
||||
},
|
||||
"server": {
|
||||
"npmDepsHash": "sha256-Jxb47Y4x9A6s4zGODIp6rze7iQ/w8Gvt31NHSATLYCM=",
|
||||
"version": "1.118.1"
|
||||
"npmDepsHash": "sha256-4jPvLCsI2gz+maBU3ZtrWZzJ6Zp2PTQwaCuCKr1hK/o=",
|
||||
"version": "1.118.2"
|
||||
},
|
||||
"web": {
|
||||
"npmDepsHash": "sha256-BUgkdsC6raURkyy6eN31uCMKmBbL+fCbGabfHJgJn8g=",
|
||||
"version": "1.118.1"
|
||||
"npmDepsHash": "sha256-j6+EkcfwpaCP048v/kZv1xthp0DSylraJTeU4+LcDbw=",
|
||||
"version": "1.118.2"
|
||||
},
|
||||
"open-api/typescript-sdk": {
|
||||
"npmDepsHash": "sha256-Ga/aU5hojd3SgtoiM5QLsmzS5k7CRvh13a4lkC0BZA8=",
|
||||
"version": "1.118.1"
|
||||
"npmDepsHash": "sha256-e+7BEFc46scLZDqCJNRhrczOEydSoiK9m7vSj/2ECaE=",
|
||||
"version": "1.118.2"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
67
pkgs/by-name/in/inspector/package.nix
Normal file
67
pkgs/by-name/in/inspector/package.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
gettext,
|
||||
wrapGAppsHook4,
|
||||
desktop-file-utils,
|
||||
gobject-introspection,
|
||||
libadwaita,
|
||||
python3Packages,
|
||||
iproute2,
|
||||
util-linux,
|
||||
coreutils,
|
||||
usbutils,
|
||||
pciutils,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "inspector";
|
||||
version = "0.2.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nokse22";
|
||||
repo = "inspector";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tjQCF2Tyv7/NWgrwHu+JPpnLECfDmQS77EVLBt+cRTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
gettext
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
python3Packages.pygobject3
|
||||
iproute2
|
||||
util-linux
|
||||
coreutils
|
||||
usbutils
|
||||
pciutils
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Nokse22/inspector";
|
||||
description = "Gtk4 Libadwaita wrapper for various system info cli commands";
|
||||
license = with lib.licenses; [
|
||||
gpl3Plus
|
||||
cc0
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "inspector";
|
||||
maintainers = with lib.maintainers; [ mksafavi ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,22 @@
|
|||
From 8799541f99785d2bd881561386676fb0985e939e Mon Sep 17 00:00:00 2001
|
||||
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
|
||||
Date: Thu, 10 Oct 2024 14:32:42 +0200
|
||||
Subject: [PATCH] fix library resolving
|
||||
|
||||
Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
|
||||
---
|
||||
src/ldcache.c | 46 +++++++++++++++++-----------------------------
|
||||
src/ldcache.h | 2 +-
|
||||
src/nvc_info.c | 10 +++-------
|
||||
src/nvc_ldcache.c | 2 +-
|
||||
4 files changed, 22 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/src/ldcache.c b/src/ldcache.c
|
||||
index 38bab05..e1abc89 100644
|
||||
index 38bab055..8cd30a0f 100644
|
||||
--- a/src/ldcache.c
|
||||
+++ b/src/ldcache.c
|
||||
@@ -108,40 +108,27 @@ ldcache_close(struct ldcache *ctx)
|
||||
|
||||
@@ -108,40 +108,28 @@ ldcache_close(struct ldcache *ctx)
|
||||
|
||||
int
|
||||
ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[],
|
||||
- char *paths[], size_t size, ldcache_select_fn select, void *select_ctx)
|
||||
|
|
@ -14,26 +27,17 @@ index 38bab05..e1abc89 100644
|
|||
- int override;
|
||||
+ char dir[PATH_MAX];
|
||||
+ char lib[PATH_MAX];
|
||||
|
||||
|
||||
- h = (struct header_libc6 *)ctx->ptr;
|
||||
memset(paths, 0, size * sizeof(*paths));
|
||||
|
||||
|
||||
- for (uint32_t i = 0; i < h->nlibs; ++i) {
|
||||
- int32_t flags = h->libs[i].flags;
|
||||
- char *key = (char *)ctx->ptr + h->libs[i].key;
|
||||
- char *value = (char *)ctx->ptr + h->libs[i].value;
|
||||
-
|
||||
- if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch)
|
||||
+ for (size_t j = 0; j < size; ++j) {
|
||||
+ snprintf(dir, 100, "/run/opengl-driver%s/lib",
|
||||
+ arch == LD_I386_LIB32 ? "-32" : "");
|
||||
+ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100))
|
||||
+ strcat(dir, "/vdpau");
|
||||
+ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version);
|
||||
+ if (path_resolve_full(ctx->err, path, "/", lib) < 0)
|
||||
+ return (-1);
|
||||
+ if (!file_exists(ctx->err, path))
|
||||
continue;
|
||||
- continue;
|
||||
-
|
||||
- for (size_t j = 0; j < size; ++j) {
|
||||
- if (!str_has_prefix(key, libs[j]))
|
||||
|
|
@ -52,6 +56,17 @@ index 38bab05..e1abc89 100644
|
|||
- }
|
||||
- break;
|
||||
- }
|
||||
+ for (size_t j = 0; j < size; ++j) {
|
||||
+ snprintf(dir, 100, "@driverLink@/lib");
|
||||
+
|
||||
+ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100))
|
||||
+ strcat(dir, "/vdpau");
|
||||
+ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version);
|
||||
+ if (path_resolve_full(ctx->err, path, "/", lib) < 0)
|
||||
+ return (-1);
|
||||
+ if (!file_exists(ctx->err, path))
|
||||
+ continue;
|
||||
+
|
||||
+ paths[j] = xstrdup(ctx->err, path);
|
||||
+ if (paths[j] == NULL)
|
||||
+ return (-1);
|
||||
|
|
@ -59,7 +74,7 @@ index 38bab05..e1abc89 100644
|
|||
return (0);
|
||||
}
|
||||
diff --git a/src/ldcache.h b/src/ldcache.h
|
||||
index 33d78dd..2b087db 100644
|
||||
index 33d78dd7..2b087dbc 100644
|
||||
--- a/src/ldcache.h
|
||||
+++ b/src/ldcache.h
|
||||
@@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *);
|
||||
|
|
@ -68,19 +83,19 @@ index 33d78dd..2b087db 100644
|
|||
int ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [],
|
||||
- char *[], size_t, ldcache_select_fn, void *);
|
||||
+ char *[], size_t, const char*);
|
||||
|
||||
|
||||
#endif /* HEADER_LDCACHE_H */
|
||||
diff --git a/src/nvc_info.c b/src/nvc_info.c
|
||||
index 30e3cfd..6d12a50 100644
|
||||
index b7b8adfa..d42f2beb 100644
|
||||
--- a/src/nvc_info.c
|
||||
+++ b/src/nvc_info.c
|
||||
@@ -167,15 +167,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
|
||||
@@ -217,15 +217,13 @@ find_library_paths(struct error *err, struct dxcore_context *dxcore, struct nvc_
|
||||
if (path_resolve_full(err, path, root, ldcache) < 0)
|
||||
return (-1);
|
||||
ldcache_init(&ld, err, path);
|
||||
- if (ldcache_open(&ld) < 0)
|
||||
- return (-1);
|
||||
|
||||
|
||||
info->nlibs = size;
|
||||
info->libs = array_new(err, size);
|
||||
if (info->libs == NULL)
|
||||
|
|
@ -89,9 +104,9 @@ index 30e3cfd..6d12a50 100644
|
|||
- info->libs, info->nlibs, select_libraries_fn, info) < 0)
|
||||
+ info->libs, info->nlibs, info->nvrm_version) < 0)
|
||||
goto fail;
|
||||
|
||||
|
||||
info->nlibs32 = size;
|
||||
@@ -183,13 +181,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
|
||||
@@ -233,13 +231,11 @@ find_library_paths(struct error *err, struct dxcore_context *dxcore, struct nvc_
|
||||
if (info->libs32 == NULL)
|
||||
goto fail;
|
||||
if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
|
||||
|
|
@ -99,32 +114,34 @@ index 30e3cfd..6d12a50 100644
|
|||
+ info->libs32, info->nlibs32, info->nvrm_version) < 0)
|
||||
goto fail;
|
||||
rv = 0;
|
||||
|
||||
|
||||
fail:
|
||||
- if (ldcache_close(&ld) < 0)
|
||||
- return (-1);
|
||||
return (rv);
|
||||
}
|
||||
|
||||
@@ -203,7 +199,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r
|
||||
|
||||
@@ -253,7 +249,7 @@ find_binary_paths(struct error *err, struct dxcore_context* dxcore, struct nvc_d
|
||||
char path[PATH_MAX];
|
||||
int rv = -1;
|
||||
|
||||
|
||||
- if ((env = secure_getenv("PATH")) == NULL) {
|
||||
+ if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) {
|
||||
error_setx(err, "environment variable PATH not found");
|
||||
return (-1);
|
||||
}
|
||||
diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c
|
||||
index 6ff380f..cbe6a69 100644
|
||||
index db3b2f69..ae5def43 100644
|
||||
--- a/src/nvc_ldcache.c
|
||||
+++ b/src/nvc_ldcache.c
|
||||
@@ -340,7 +340,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt)
|
||||
@@ -367,7 +367,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt)
|
||||
if (validate_args(ctx, cnt != NULL) < 0)
|
||||
return (-1);
|
||||
|
||||
- argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
|
||||
|
||||
- argv = (char * []){cnt->cfg.ldconfig, "-f", "/etc/ld.so.conf", "-C", "/etc/ld.so.cache", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
|
||||
+ argv = (char * []){cnt->cfg.ldconfig, "-f", "/tmp/ld.so.conf.nvidia-host", "-C", "/tmp/ld.so.cache.nvidia-host", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
|
||||
if (*argv[0] == '@') {
|
||||
/*
|
||||
* We treat this path specially to be relative to the host filesystem.
|
||||
--
|
||||
2.46.0
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c
|
||||
--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000
|
||||
@@ -840,10 +840,10 @@
|
||||
--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2021-11-13 14:36:58.096684602 +0000
|
||||
+++ nvidia-modprobe-@modprobeVersion@-patched/modprobe-utils/nvidia-modprobe-utils.c 2021-11-13 14:43:40.965146390 +0000
|
||||
@@ -959,10 +959,10 @@
|
||||
return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH);
|
||||
}
|
||||
|
||||
|
|
@ -17,13 +17,14 @@ diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils
|
|||
char field[32];
|
||||
FILE *fp;
|
||||
diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h
|
||||
--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000
|
||||
@@ -81,6 +81,7 @@
|
||||
--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2021-11-13 14:36:58.096684602 +0000
|
||||
+++ nvidia-modprobe-@modprobeVersion@-patched/modprobe-utils/nvidia-modprobe-utils.h 2021-11-13 14:38:34.078700961 +0000
|
||||
@@ -87,6 +87,7 @@
|
||||
int nvidia_nvswitch_get_file_state(int minor);
|
||||
int nvidia_cap_mknod(const char* cap_file_path, int *minor);
|
||||
int nvidia_cap_get_file_state(const char* cap_file_path);
|
||||
+int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name);
|
||||
int nvidia_cap_imex_channel_mknod(int minor);
|
||||
int nvidia_cap_imex_channel_file_state(int minor);
|
||||
int nvidia_get_chardev_major(const char *name);
|
||||
|
||||
#endif /* NV_LINUX */
|
||||
int nvidia_msr_modprobe(void);
|
||||
|
|
@ -1,25 +1,27 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, addDriverRunpath
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, elfutils
|
||||
, libcap
|
||||
, libseccomp
|
||||
, rpcsvc-proto
|
||||
, libtirpc
|
||||
, makeWrapper
|
||||
, substituteAll
|
||||
, removeReferencesTo
|
||||
, go
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
addDriverRunpath,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
elfutils,
|
||||
libcap,
|
||||
libseccomp,
|
||||
rpcsvc-proto,
|
||||
libtirpc,
|
||||
makeWrapper,
|
||||
substituteAll,
|
||||
removeReferencesTo,
|
||||
replaceVars,
|
||||
go,
|
||||
}:
|
||||
let
|
||||
modprobeVersion = "495.44";
|
||||
modprobeVersion = "550.54.14";
|
||||
nvidia-modprobe = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-modprobe";
|
||||
rev = modprobeVersion;
|
||||
sha256 = "sha256-Y3ZOfge/EcmhqI19yWO7UfPqkvY1CHHvFC5l9vYyGuU=";
|
||||
sha256 = "sha256-iBRMkvOXacs/llTtvc/ZC5i/q9gc8lMuUHxMbu8A+Kg=";
|
||||
};
|
||||
modprobePatch = substituteAll {
|
||||
src = ./modprobe.patch;
|
||||
|
|
@ -28,21 +30,25 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnvidia-container";
|
||||
version = "1.9.0";
|
||||
version = "1.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = pname;
|
||||
repo = "libnvidia-container";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7OTawWwjeKU8wIa8I/+aSvAJli4kEua94nJSNyCajpE=";
|
||||
sha256 = "sha256-hX+2B+0kHiAC2lyo6kwe7DctPLJWgRdbhlc316OO3r8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# locations of nvidia-driver libraries are not resolved via ldconfig which
|
||||
# doesn't get used on NixOS. Additional support binaries like nvidia-smi
|
||||
# Locations of nvidia driver libraries are not resolved via ldconfig which
|
||||
# doesn't get used on NixOS.
|
||||
# TODO: The latter doesn't really apply anymore.
|
||||
# Additional support binaries like nvidia-smi
|
||||
# are not resolved via the environment PATH but via the derivation output
|
||||
# path.
|
||||
./libnvc-ldconfig-and-path-fixes.patch
|
||||
(replaceVars ./fix-library-resolving.patch {
|
||||
inherit (addDriverRunpath) driverLink;
|
||||
})
|
||||
|
||||
# fix bogus struct declaration
|
||||
./inline-c-struct.patch
|
||||
|
|
@ -54,6 +60,11 @@ stdenv.mkDerivation rec {
|
|||
-e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
|
||||
mk/common.mk
|
||||
|
||||
sed -i \
|
||||
-e 's/^GIT_TAG ?=.*/GIT_TAG = ${version}/' \
|
||||
-e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.rev}/' \
|
||||
versions.mk
|
||||
|
||||
mkdir -p deps/src/nvidia-modprobe-${modprobeVersion}
|
||||
cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion}
|
||||
chmod -R u+w deps/src
|
||||
|
|
@ -84,12 +95,26 @@ stdenv.mkDerivation rec {
|
|||
HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getInclude libtirpc}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [
|
||||
"-L${lib.getLib libtirpc}/lib"
|
||||
"-ltirpc"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper removeReferencesTo ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
go
|
||||
rpcsvc-proto
|
||||
makeWrapper
|
||||
removeReferencesTo
|
||||
];
|
||||
|
||||
buildInputs = [ elfutils libcap libseccomp libtirpc ];
|
||||
buildInputs = [
|
||||
elfutils
|
||||
libcap
|
||||
libseccomp
|
||||
libtirpc
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"WITH_LIBELF=yes"
|
||||
|
|
@ -103,10 +128,14 @@ stdenv.mkDerivation rec {
|
|||
postInstall =
|
||||
let
|
||||
inherit (addDriverRunpath) driverLink;
|
||||
libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ];
|
||||
libraryPath = lib.makeLibraryPath [
|
||||
"$out"
|
||||
driverLink
|
||||
"${driverLink}-32"
|
||||
];
|
||||
in
|
||||
''
|
||||
remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.1.9.0
|
||||
remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.${version}
|
||||
wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath}
|
||||
'';
|
||||
disallowedReferences = [ go ];
|
||||
8750
pkgs/by-name/op/openvmm/Cargo.lock
generated
Normal file
8750
pkgs/by-name/op/openvmm/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
57
pkgs/by-name/op/openvmm/package.nix
Normal file
57
pkgs/by-name/op/openvmm/package.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
protobuf,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "openvmm";
|
||||
version = "0-unstable-2024-10-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "openvmm";
|
||||
rev = "2e5acb8ab89b75d6ff59d537e9f21445d830386d";
|
||||
hash = "sha256-Fi5hDFV2SfpqJjXSc7YwlNDnoL5TTgiqmFMt+ls2Uu4=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
env = {
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
PROTOC = "protoc";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
protobuf
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"bitvec-1.1.0" = "sha256-uXOTbrGCSnl/F6IJPZuViZKXg4BEMG4+lVcLxK5KIwc=";
|
||||
"ms-tpm-20-ref-0.1.0" = "sha256-eB3MWRlOPtxG55sLH7HIWzSjVEY05IIBZOltTpsGpnE=";
|
||||
"mshv-bindings-0.1.1" = "sha256-CZEhFb9qDR260OFA/mlTldEMFlF8bhawVAxXFWqPIcU=";
|
||||
"pbjson-build-0.5.1" = "sha256-itmY3c35O7j0Otb1qyr2IDUw1MBWOCB3WwyU60ajBO4=";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/microsoft/openvmm";
|
||||
description = "modular, cross-platform Virtual Machine Monitor (VMM), written in Rust";
|
||||
license = licenses.mit;
|
||||
mainProgram = "openvmm";
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "pupdate";
|
||||
version = "3.18.0";
|
||||
version = "3.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattpannella";
|
||||
repo = "pupdate";
|
||||
rev = "${version}";
|
||||
hash = "sha256-GTdca47Jp/q1IpX1IAMZgOgHjBPNSotFSL9O6bfTfnM=";
|
||||
hash = "sha256-ogQ7pYLfeyoxg0p7nxUvYhmgDw5xtd7qkFM08B4FDBU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
33
pkgs/by-name/tl/tlsinfo/package.nix
Normal file
33
pkgs/by-name/tl/tlsinfo/package.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tlsinfo";
|
||||
version = "0.1.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paepckehh";
|
||||
repo = "tlsinfo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-II5/UDWVeEoupM1Ijty2A9M/qwWA2/b4Y68lTkxnJ9o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IyinAjgK4vm+TkSGQq+XnY9BESsNvXgz84BRzNyZtJY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/paepckehh/tlsinfo/releases/tag/v${version}";
|
||||
homepage = "https://paepcke.de/tlsinfo";
|
||||
description = "Tool to analyze and troubleshoot TLS connections";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "tlsinfo";
|
||||
maintainers = with lib.maintainers; [ paepcke ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,17 +7,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "risor";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "risor-io";
|
||||
repo = "risor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IUmkb23Fx+bjzXrXWfKPOo0HFt7HjtjQoCRtH77HGBg=";
|
||||
hash = "sha256-QtYqepNH+c0WDGKTLtMz/VUz0oDOgCbwe4D9I4wal5s=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-+XYwFYbvZvk0TWoRtCKQIzbQeznQkolB+NFqUiZMkpA=";
|
||||
vendorHash = "sha256-JrBuHA+u5bI2kcbWaY6/894kh5Xdix0ov6nN5r9rJRE=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/risor"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libjcat";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "hughsie";
|
||||
repo = "libjcat";
|
||||
rev = version;
|
||||
sha256 = "sha256-tCXz62MEqYBnrx2RxlTBwKGTahfhUCVdet4VnXw5klQ=";
|
||||
sha256 = "sha256-Vn5Qjyo2FHCmQC2pmb1qgU81VaFKsXnSIwlSYk/8Rig=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, cmake
|
||||
, fetchpatch2
|
||||
, fetchurl
|
||||
, perl
|
||||
, zlib
|
||||
|
|
@ -18,22 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libzip";
|
||||
version = "1.10.1";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-lmmuXf46xbOJdTbchGaodMjPLA47H90I11snOIQpk2M=";
|
||||
hash = "sha256-wOb6UqYroR79MCYikNxpcJR67zLgzClO5Q6QBc6sCSo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/nih-at/libzip/issues/404
|
||||
(fetchpatch2 {
|
||||
name = "Check-for-zstd_TARGET-before-using-it-in-a-regex.patch";
|
||||
url = "https://github.com/nih-at/libzip/commit/c719428916b4d19e838f873b1a177b126a080d61.patch";
|
||||
hash = "sha256-4ksbXEM8kNvs3wtbIaXLEQNSKaxl0es/sIg0EINaTHE=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
nativeBuildInputs = [ cmake perl groff ];
|
||||
|
|
|
|||
|
|
@ -19,13 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "faster-whisper";
|
||||
version = "1.0.3";
|
||||
version = "unstable-2024-07-26";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SYSTRAN";
|
||||
repo = "faster-whisper";
|
||||
rev = "refs/tags/v${version}";
|
||||
# rev = "refs/tags/v${version}";
|
||||
rev = "d57c5b40b06e59ec44240d93485a95799548af50";
|
||||
hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{
|
||||
lib,
|
||||
betamax,
|
||||
betamax-matchers,
|
||||
betamax-serializers,
|
||||
betamax,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
flit-core,
|
||||
mock,
|
||||
prawcore,
|
||||
pytestCheckHook,
|
||||
|
|
@ -16,19 +17,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "praw";
|
||||
version = "7.7.1";
|
||||
format = "setuptools";
|
||||
version = "7.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praw-dev";
|
||||
repo = pname;
|
||||
repo = "praw";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L7wTHD/ypXVc8GMfl9u16VNb9caLJoXpaMEIzaVVUgo=";
|
||||
hash = "sha256-oJkpFGJswG//5dnfdwkUdAkn8FOuqT/tDoTT5UncOGA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ flit-core ];
|
||||
|
||||
dependencies = [
|
||||
mock
|
||||
prawcore
|
||||
update-checker
|
||||
|
|
|
|||
|
|
@ -67,13 +67,24 @@
|
|||
},
|
||||
"32": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "b5f6db900997ba931c98addaef28744a0a6af0f2ec2e8e5755f7f50db2fe8bbc",
|
||||
"aarch64-linux": "702326c51679ed705bc22d7e4049b29cef2d66366d3387c401836aaae0fa450c",
|
||||
"armv7l-linux": "d9511449c328f90f47e499f44c6d84c6204d4a3a2caec5c5d52f176cfc77f50d",
|
||||
"headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk",
|
||||
"x86_64-darwin": "150ac6a59e31ad516685bdbb9cee67c7e927b872ad94ffc900fbf6616433f8ab",
|
||||
"x86_64-linux": "b51e5f1296f8971d7eb4ca86606b6f5d31fb3dab8caa91dcfbfa522be5679691"
|
||||
"aarch64-darwin": "906fbf9e7a5ee6d49ea107fdfd0e98bc80884fbf1f6ff38d824453f58c6ec259",
|
||||
"aarch64-linux": "6500fdbff988e0cda909643ba8439660a207c9a2d393fa63f680a0337e530342",
|
||||
"armv7l-linux": "7ffcce19ebdb30a9db78671c7f222edde66181a37c895834682d224e459200fc",
|
||||
"headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm",
|
||||
"x86_64-darwin": "56e2e4252b4d4e92075345f0b9dbefc8db49bdc6a4c45a87000f3cc705057907",
|
||||
"x86_64-linux": "4fc58e6e79e5b5793ec9b5d35c8926fcad5352b6a1b21b3edf42343487c90185"
|
||||
},
|
||||
"version": "32.1.2"
|
||||
"version": "32.2.1"
|
||||
},
|
||||
"33": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "75f3267e5517bb35cbfc11f2d5673947cfa8a510dc3a78c46356a948650027f2",
|
||||
"aarch64-linux": "6c321b5f8f8fc694c09f6c904ad0a40a0eff1b84b2b771f6eae292e197e3a8c1",
|
||||
"armv7l-linux": "d54e4820ab965acaa21940e15b79278fdbff4df083f162cd2a192541cf5a7063",
|
||||
"headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f",
|
||||
"x86_64-darwin": "945a07cec9eb2bdfa6a7ae6971f1df564447a5eeea3d533abae3ef5eac1966a1",
|
||||
"x86_64-linux": "497ff71b2cacfc0a001fcfd3d852fd758e20604622ddfa2932dc32074c48af66"
|
||||
},
|
||||
"version": "33.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,13 +34,24 @@
|
|||
},
|
||||
"32": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "7fb7b8736fcd9dbde92628e4aa951fd2c54d3136bf20c1821ce2a1b85fef3046",
|
||||
"aarch64-linux": "405664c1b6529cd6c2af65778f2c84bfe262ad0b8d9d044a39d2eff2ed218828",
|
||||
"armv7l-linux": "32682f487ed9307d0f40d35c4b998cee75272effd228093be3e008ca7b39e16e",
|
||||
"headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk",
|
||||
"x86_64-darwin": "a9e43916cbe91c9a905f2bf38d326d5dc462c3d8a7d88f52c25c1e7c1b9ce7cc",
|
||||
"x86_64-linux": "d98aa7a90ebfe519700e47fa6bcb94a157483fac615920c5ee467dcc41c46702"
|
||||
"aarch64-darwin": "29acb63bb116a08e97797042505d48eecfa396f5d84a12114573aa70acaa48ec",
|
||||
"aarch64-linux": "6b311318f5a537e21d2d832609ce8306b4806e4c62aaa132ee87e063d45f5b00",
|
||||
"armv7l-linux": "ac1529a8f6e4c77fdae3bc92bc5bfcb40c3b19def0772de9d1874da7223517b7",
|
||||
"headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm",
|
||||
"x86_64-darwin": "a1fd00f8634c6b4d9e28ce8ac69684ea24f5274c9f17c0e39bd149b34568b84b",
|
||||
"x86_64-linux": "2329d1307729c714bef71d9f8250ed510b5a1ae07beefddee2371af70f712297"
|
||||
},
|
||||
"version": "32.1.2"
|
||||
"version": "32.2.1"
|
||||
},
|
||||
"33": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "c0717f7dc5a2e3f99688389e643e9dc2e513a948df537abadc24230e1c93a1a3",
|
||||
"aarch64-linux": "32887c18a8acb0d36eba6e3d9d9f763dda9155f98a948958b446681b9da63ed3",
|
||||
"armv7l-linux": "c52961bcc5d2764d8a144a4fc2b9c25e904c8345deec9253dcaca7d560508a56",
|
||||
"headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f",
|
||||
"x86_64-darwin": "13086ff2417512f9c87982857e67f25ee05f55e3bb18b5d373264c153a50e166",
|
||||
"x86_64-linux": "b07f166b53bdf64282e8ba73bf6a6bc86844dd38c183ee7ecbad5d281ee380ea"
|
||||
},
|
||||
"version": "33.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1858,7 +1858,7 @@
|
|||
"version": "31.6.0"
|
||||
},
|
||||
"32": {
|
||||
"chrome": "128.0.6613.162",
|
||||
"chrome": "128.0.6613.186",
|
||||
"chromium": {
|
||||
"deps": {
|
||||
"gn": {
|
||||
|
|
@ -1868,15 +1868,15 @@
|
|||
"version": "2024-06-11"
|
||||
}
|
||||
},
|
||||
"version": "128.0.6613.162"
|
||||
"version": "128.0.6613.186"
|
||||
},
|
||||
"chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=",
|
||||
"deps": {
|
||||
"src": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
"hash": "sha256-52pb9e5XYaiIpUlazoXbmEJ/3l4uPWt9sVmF0+cVBKQ=",
|
||||
"hash": "sha256-6Rtd3eu9z7yvzmMaSGjvTCXt29f9cAXFc1IVT0otQ2I=",
|
||||
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"rev": "128.0.6613.162",
|
||||
"rev": "128.0.6613.186",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
"src/chrome/test/data/perf/canvas_bench": {
|
||||
|
|
@ -1905,10 +1905,10 @@
|
|||
},
|
||||
"src/electron": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"hash": "sha256-RkSdNjEmXO4xsCRzp5y5suG8svNT5LSI/eVbAUDbi5c=",
|
||||
"hash": "sha256-6Yt3fz2XqFoSh+V/tI9ygFdHf76p2vGOR7+6FgTnfWg=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"rev": "v32.1.2"
|
||||
"rev": "v32.2.1"
|
||||
},
|
||||
"src/media/cdm/api": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
|
|
@ -2080,14 +2080,14 @@
|
|||
},
|
||||
"src/third_party/dawn": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
"hash": "sha256-6ljZh99QPH8/9JAV1tVm6BVAYsJWqkJjzlM2AG2m01g=",
|
||||
"rev": "5f86f5a316f4e082b2419d8b954ebb79c2be590d",
|
||||
"hash": "sha256-UTtU0GIlkOtXA3vJy0MA99wLARHl7WMM7IBNmXxE6d4=",
|
||||
"rev": "a79093138c06b0ca942f99ddc39b225dafa4776d",
|
||||
"url": "https://dawn.googlesource.com/dawn.git"
|
||||
},
|
||||
"src/third_party/dawn/third_party/dxc": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
"hash": "sha256-oIByfTUMy1EY3J0/m0iOqJbHd+DzpVAmZbaIdllcF04=",
|
||||
"rev": "3ea0e7f6b5f464814d6b896eaf69cbd5ebe7fac4",
|
||||
"hash": "sha256-p4DZNVQ8C4YB52BfBKEFXCqenQk0ONkzkctM9vyz4aw=",
|
||||
"rev": "ee5422d3f33c0bfd8643ce7782eb3a216cf15dea",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
|
||||
},
|
||||
"src/third_party/dawn/third_party/dxheaders": {
|
||||
|
|
@ -2152,10 +2152,10 @@
|
|||
},
|
||||
"src/third_party/electron_node": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=",
|
||||
"hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=",
|
||||
"owner": "nodejs",
|
||||
"repo": "node",
|
||||
"rev": "v20.17.0"
|
||||
"rev": "v20.18.0"
|
||||
},
|
||||
"src/third_party/emoji-segmenter/src": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
|
|
@ -2569,8 +2569,8 @@
|
|||
},
|
||||
"src/third_party/skia": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
"hash": "sha256-B5zb35NkwR3yT58344iAOM1Kywn8Yr/TuNBSJcrxwh4=",
|
||||
"rev": "938144dd79c6e3664a3c0bbd019daedddf655ffa",
|
||||
"hash": "sha256-vclLETDkiiBinfvse++0CF9/1+qZeG5vcukTTmqPYiU=",
|
||||
"rev": "cd98397d0c2c3eb1d5a8d76aade3c87c2e0d28ac",
|
||||
"url": "https://skia.googlesource.com/skia.git"
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
|
|
@ -2788,14 +2788,14 @@
|
|||
},
|
||||
"src/v8": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
"hash": "sha256-weN8PR9qaRcws9T5PhWyJntrJJ4sKoLwP3gTSLHU574=",
|
||||
"rev": "485b9d9f88ef1c4787b183b8ccc6cdcfbc07ab1a",
|
||||
"hash": "sha256-VwRVnondH9YM8pYRQo0l0jM0Zb531kpQTo6ngvEPOBg=",
|
||||
"rev": "d213b3bbc0ecf17ccd2849fdef3bccb1946b01b3",
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "0jb1rs1in1bp71syim7a7p0n669kbc6as90y3zi6nd0q340cwgqa",
|
||||
"electron_yarn_hash": "19iw16qs4h6b1bcmkkqxhhcgxnl2r6qf57w7dr76vbl0zhmhlyf9",
|
||||
"modules": "128",
|
||||
"node": "20.17.0",
|
||||
"version": "32.1.2"
|
||||
"node": "20.18.0",
|
||||
"version": "32.2.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ stdenvNoCC.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
postPhases = [ "postPatchelf" ];
|
||||
postPatchelf = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
|
||||
postPhases = lib.optionals (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) [ "postPatchelf" ];
|
||||
postPatchelf = ''
|
||||
completions_dir=$(mktemp -d)
|
||||
|
||||
SHELL="bash" $out/bin/bun completions $completions_dir
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pax-utils";
|
||||
version = "1.3.7";
|
||||
version = "1.3.8";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://anongit.gentoo.org/git/proj/pax-utils.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WyNng+UtfRz1+Eu4gwXLxUvBAg+m3mdrc8GdEPYRKVE=";
|
||||
hash = "sha256-fOdiZcS1ZWGN8U5v65LzGIZJD6hCl5dbLMHDpSyms+8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "wyoming-faster-whisper";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = "wyoming-faster-whisper";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zWa872YkPh8B7dE//leth+ixIa1wHSRcjkvH2lXzolc=";
|
||||
hash = "sha256-G46ycjpRu4MD00FiBM1H0DrPpXaaPlZ8yeoyZ7WYD48=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ index 9cc7f0d..6a52893 100644
|
|||
LABEL="bcache_backing_found"
|
||||
RUN{builtin}+="kmod load bcache"
|
||||
-RUN+="bcache-register $tempnode"
|
||||
+RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'"
|
||||
+RUN+="@shell@ -c 'echo $tempnode > /sys/fs/bcache/register_quiet'"
|
||||
LABEL="bcache_backing_end"
|
||||
|
||||
# Cached devices: symlink
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash, substituteAll }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcache-tools";
|
||||
|
|
@ -26,7 +26,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
patches = [
|
||||
./bcache-udev-modern.patch
|
||||
(substituteAll {
|
||||
src = ./bcache-udev-modern.patch;
|
||||
shell = "${bash}/bin/sh";
|
||||
})
|
||||
./fix-static.patch
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook
|
||||
, fetchpatch
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, enableDarwinSandbox ? true
|
||||
|
|
@ -9,49 +8,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}";
|
||||
version = "1.1.0";
|
||||
version = "1.1.2";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
|
||||
hash = "sha512-EpAWTz7Zy+2qqJGgzLrt0tK7WEZ+hHbdyqzAmMiaqc6uNXscR88git6/UbTjvB9Yanvetvw9huSuyhcORCEIug==";
|
||||
hash = "sha512-KHQi5NpMU6Kw4Ij+BoGE52aU0vIP1pgMhjnBAUdMh6GV/xHCxfTXJduqh9bSfVMeOim08aZSIM7iq1io0VS8LA==";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Improve UTF-8 handling on macOS by not treating bytes >=0x80, which tend to be
|
||||
# UTF-8 continuation bytes, as control characters.
|
||||
#
|
||||
# This leaves control characters U+0080 through U+009F in the output
|
||||
# (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net
|
||||
# win.
|
||||
#
|
||||
# See: https://github.com/kristapsdz/lowdown/pull/140
|
||||
(fetchpatch {
|
||||
url = "https://github.com/kristapsdz/lowdown/commit/5a02866dd682363a8e4f6b344c223cfe8b597da9.diff";
|
||||
hash = "sha256-7tGhZJQQySeBv4h6A4r69BBbQkPRX/3JTw/80A8YXjQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/kristapsdz/lowdown/commit/c033a6886e4d6efb948782fbc389fe5f673acf36.diff";
|
||||
hash = "sha256-7DvKFerAMoPifuTn7rOX4ru888HfBkpspH1opIbzj08=";
|
||||
})
|
||||
|
||||
# Don't output a newline after .SH
|
||||
#
|
||||
# This fixes `makewhatis` output on macOS and (as a result) `man`
|
||||
# completions for `fish` on macOS.
|
||||
#
|
||||
# See: https://github.com/kristapsdz/lowdown/pull/138
|
||||
(fetchpatch {
|
||||
url = "https://github.com/kristapsdz/lowdown/commit/e05929a09a697de3d2eb14d0f0a087a6fae22e11.diff";
|
||||
hash = "sha256-P03W+hFeBKwfJB+DhGCPq0DtiOiLLc+0ZvWrWqXFvVU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/kristapsdz/lowdown/commit/9906f8ceac586c54eb39ae78105fd84653a89c33.diff";
|
||||
hash = "sha256-nBnAgTb8RDe/QpUhow3lyeR7UIVJX2o4lmP78e2fw/E=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ which dieHook ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
|
||||
|
||||
|
|
@ -70,6 +35,13 @@ stdenv.mkDerivation rec {
|
|||
runHook postConfigure
|
||||
'';
|
||||
|
||||
# Fix rpath change on darwin to avoid failure like:
|
||||
# error: install_name_tool: changing install names or
|
||||
# rpaths can't be redone for: liblowdown.1.dylib (for architecture
|
||||
# arm64) because larger
|
||||
# https://github.com/NixOS/nixpkgs/pull/344532#issuecomment-238475791
|
||||
env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
|
||||
|
||||
makeFlags = [
|
||||
"bins" # prevents shared object from being built unnecessarily
|
||||
];
|
||||
|
|
@ -109,8 +81,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) ''
|
||||
runHook preInstallCheck
|
||||
|
||||
echo '# TEST' > test.md
|
||||
$out/bin/lowdown test.md
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -5352,8 +5352,6 @@ with pkgs;
|
|||
|
||||
libnvme = callPackage ../os-specific/linux/libnvme { };
|
||||
|
||||
libnvidia-container = callPackage ../applications/virtualization/libnvidia-container { };
|
||||
|
||||
librenms = callPackage ../servers/monitoring/librenms { };
|
||||
|
||||
libxnd = callPackage ../development/libraries/libxnd { };
|
||||
|
|
@ -14307,7 +14305,7 @@ with pkgs;
|
|||
inherit (python3Packages) filecheck;
|
||||
};
|
||||
|
||||
bluespec = callPackage ../development/compilers/bluespec {
|
||||
bluespec = callPackage ../by-name/bl/bluespec/package.nix {
|
||||
gmp-static = gmp.override { withStatic = true; };
|
||||
};
|
||||
|
||||
|
|
@ -16908,13 +16906,16 @@ with pkgs;
|
|||
electron_30-bin
|
||||
electron_31-bin
|
||||
electron_32-bin
|
||||
electron_33-bin
|
||||
;
|
||||
|
||||
inherit (callPackages ../development/tools/electron/chromedriver { })
|
||||
electron-chromedriver_29
|
||||
electron-chromedriver_30
|
||||
electron-chromedriver_31
|
||||
electron-chromedriver_32;
|
||||
electron-chromedriver_32
|
||||
electron-chromedriver_33
|
||||
;
|
||||
|
||||
electron_24 = electron_24-bin;
|
||||
electron_27 = electron_27-bin;
|
||||
|
|
@ -16923,6 +16924,7 @@ with pkgs;
|
|||
electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin;
|
||||
electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin;
|
||||
electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin;
|
||||
electron_33 = electron_33-bin;
|
||||
electron = electron_32;
|
||||
electron-bin = electron_32-bin;
|
||||
electron-chromedriver = electron-chromedriver_32;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue