Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-10-22 06:05:27 +00:00 committed by GitHub
commit 5d3d06d621
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
51 changed files with 9412 additions and 924 deletions

View File

@ -26,5 +26,6 @@ jobs:
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
name: nixpkgs-ci name: nixpkgs-ci
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
- run: nix --experimental-features 'nix-command flakes' flake check --all-systems --no-build
# explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset
- run: nix-build pkgs/top-level/release.nix -A release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' - run: nix-build pkgs/top-level/release.nix -A release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]'

View File

@ -27,7 +27,7 @@
# Libraries # Libraries
/lib @infinisil /lib @infinisil
/lib/systems @alyssais @ericson2314 /lib/systems @alyssais @ericson2314 @NixOS/stdenv
/lib/generators.nix @infinisil @Profpatsch /lib/generators.nix @infinisil @Profpatsch
/lib/cli.nix @infinisil @Profpatsch /lib/cli.nix @infinisil @Profpatsch
/lib/debug.nix @infinisil @Profpatsch /lib/debug.nix @infinisil @Profpatsch
@ -49,10 +49,10 @@
/pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/splice.nix @Ericson2314
/pkgs/top-level/release-cross.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314
/pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron /pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron
/pkgs/stdenv @philiptaron /pkgs/stdenv @philiptaron @NixOS/stdenv
/pkgs/stdenv/generic @Ericson2314 /pkgs/stdenv/generic @Ericson2314 @NixOS/stdenv
/pkgs/stdenv/generic/check-meta.nix @Ericson2314 /pkgs/stdenv/generic/check-meta.nix @Ericson2314 @NixOS/stdenv
/pkgs/stdenv/cross @Ericson2314 /pkgs/stdenv/cross @Ericson2314 @NixOS/stdenv
/pkgs/build-support @philiptaron /pkgs/build-support @philiptaron
/pkgs/build-support/cc-wrapper @Ericson2314 /pkgs/build-support/cc-wrapper @Ericson2314
/pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/bintools-wrapper @Ericson2314
@ -179,7 +179,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
# C compilers # C compilers
/pkgs/development/compilers/gcc /pkgs/development/compilers/gcc
/pkgs/development/compilers/llvm @alyssais @RossComputerGuy /pkgs/development/compilers/llvm @alyssais @RossComputerGuy @NixOS/llvm
/pkgs/development/compilers/emscripten @raitobezarius /pkgs/development/compilers/emscripten @raitobezarius
/doc/languages-frameworks/emscripten.section.md @raitobezarius /doc/languages-frameworks/emscripten.section.md @raitobezarius

View File

@ -1,3 +1,35 @@
# cmake {#cmake} # 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 hooks 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 hooks 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`.

View File

@ -80,8 +80,17 @@
checks = forAllSystems (system: { checks = forAllSystems (system: {
tarball = jobs.${system}.tarball; tarball = jobs.${system}.tarball;
# Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 } // lib.optionalAttrs
} // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.hostPlatform.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) { (
self.legacyPackages.${system}.stdenv.hostPlatform.isLinux
# Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64
&& !self.legacyPackages.${system}.targetPlatform.isPower64
# Exclude armv6l-linux due to "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')"
&& system != "armv6l-linux"
# Exclude riscv64-linux due to "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')"
&& system != "riscv64-linux"
)
{
# Test that ensures that the nixosSystem function can accept a lib argument # Test that ensures that the nixosSystem function can accept a lib argument
# Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules
# alternatives include: `import` a file, or put a custom library in an option or in `_module.args.<libname>` # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.<libname>`
@ -111,10 +120,20 @@
}).nixos.manual; }).nixos.manual;
}; };
devShells = forAllSystems (system: { devShells = forAllSystems (system:
/** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */ { } // lib.optionalAttrs
default = import ./shell.nix { inherit system; }; (
}); # Exclude armv6l-linux because "Package ghc-9.6.6 in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"
system != "armv6l-linux"
# Exclude riscv64-linux because "Package ghc-9.6.6 in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"
&& system != "riscv64-linux"
# Exclude FreeBSD because "Package ghc-9.6.6 in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"
&& !self.legacyPackages.${system}.stdenv.hostPlatform.isFreeBSD
)
{
/** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */
default = import ./shell.nix { inherit system; };
});
/** /**
A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values. A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values.

View File

@ -967,6 +967,21 @@ with lib.maintainers;
shortName = "Serokell employees"; shortName = "Serokell employees";
}; };
stdenv = {
members = [
artturin
emily
ericson2314
philiptaron
reckenrode
RossComputerGuy
];
scope = "Maintain the standard environment and its surrounding logic.";
shortName = "stdenv";
enableFeatureFreezePing = true;
githubTeams = [ "stdenv" ];
};
steam = { steam = {
members = [ members = [
atemu atemu

View File

@ -18,14 +18,9 @@ This installs the sway compositor along with some essential utilities.
Now you can start sway from the TTY console. Now you can start sway from the TTY console.
If you are using a wlroots-based compositor, like sway, and want to be 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: able to share your screen, make sure to configure Pipewire using
```nix
{
xdg.portal.wlr.enable = true;
}
```
and configure Pipewire using
[](#opt-services.pipewire.enable) [](#opt-services.pipewire.enable)
and related options. and related options.
For more helpful tips and tricks, see the
[wiki page about Sway](https://wiki.nixos.org/wiki/Sway).

View File

@ -376,6 +376,11 @@
- `matrix-sliding-sync` was removed because it has been replaced by the simplified sliding sync functionality introduced in matrix-synapse 114.0. - `matrix-sliding-sync` was removed because it has been replaced by the simplified sliding sync functionality introduced in matrix-synapse 114.0.
- `nodePackages.coc-tslint`, `vimPlugins.coc-tslint`, `nodePackages.coc-tslint-plugin`,
and `vimPlugins.coc-tslint-plugin` were removed due to being deprecated upstream. The
`nodePackages.coc-eslint` and `vimPlugins.coc-eslint` packages offer comparable
features for `eslint`, which replaced `tslint`.
- `teleport` has been upgraded from major version 15 to major version 16. - `teleport` has been upgraded from major version 15 to major version 16.
Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324). and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).

View File

@ -1,9 +1,9 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
msgpack (1.5.1) msgpack (1.7.2)
multi_json (1.15.0) multi_json (1.15.0)
neovim (0.9.0) neovim (0.10.0)
msgpack (~> 1.1) msgpack (~> 1.1)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -14,4 +14,4 @@ DEPENDENCIES
neovim neovim
BUNDLED WITH BUNDLED WITH
2.1.4 2.3.27

View File

@ -4,10 +4,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "sha256-fPWiGi0w4OFlMZOIf3gd21jyeYhg5t/VdLz7kK9fD8Q="; sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr";
type = "gem"; type = "gem";
}; };
version = "1.5.1"; version = "1.7.2";
}; };
multi_json = { multi_json = {
groups = ["default"]; groups = ["default"];
@ -25,9 +25,9 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "sha256-hRI43XGHGeqxMvpFjp0o79GGReiLXTkhwh5LYq6AQL4="; sha256 = "0gl34rriwwmj6p1s6ms0b311wmqaqiyc510svq31283jk0kp0qcd";
type = "gem"; type = "gem";
}; };
version = "0.9.0"; version = "0.10.0";
}; };
} }

View File

@ -10,13 +10,13 @@
}: }:
let let
version = "2024-09-30"; version = "2024-10-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yetone"; owner = "yetone";
repo = "avante.nvim"; repo = "avante.nvim";
rev = "0705234991d03170a72582085dc508600a03a779"; rev = "36b23cef16c2c624c34bea213f01c06782d2ca40";
hash = "sha256-tAigYqS3ZAtZJp7RaarbXrDxrjiYu2wjNHq6GP/BMfk="; hash = "sha256-QUFcJMbfr5BAS04ig1IHLCMLACeQhFVH9ZCH/VD8i8Y=";
}; };
meta = with lib; { meta = with lib; {
@ -71,6 +71,5 @@ vimUtils.buildVimPlugin {
''; '';
doInstallCheck = true; doInstallCheck = true;
# TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged nvimRequireCheck = "avante";
# nvimRequireCheck = "avante";
} }

View File

@ -9401,6 +9401,18 @@ final: prev:
meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; 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 { nvim-treesitter-pyfold = buildVimPlugin {
pname = "nvim-treesitter-pyfold"; pname = "nvim-treesitter-pyfold";
version = "2023-04-11"; version = "2023-04-11";
@ -18672,6 +18684,18 @@ final: prev:
meta.homepage = "https://github.com/samodostal/image.nvim/"; 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 { tinykeymap = buildVimPlugin {
pname = "tinykeymap"; pname = "tinykeymap";
version = "2024-02-17"; version = "2024-02-17";

View File

@ -1861,6 +1861,10 @@ in
nvimRequireCheck = "rustaceanvim"; nvimRequireCheck = "rustaceanvim";
}; };
scretch-nvim = super.scretch-nvim.overrideAttrs {
nvimRequireCheck = "scretch";
};
sg-nvim = super.sg-nvim.overrideAttrs ( sg-nvim = super.sg-nvim.overrideAttrs (
old: old:
let let
@ -2757,8 +2761,6 @@ in
"coc-tabnine" "coc-tabnine"
"coc-texlab" "coc-texlab"
"coc-toml" "coc-toml"
"coc-tslint"
"coc-tslint-plugin"
"coc-tsserver" "coc-tsserver"
"coc-ultisnips" "coc-ultisnips"
"coc-vetur" "coc-vetur"

View File

@ -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/,,
https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/nvim-treesitter/nvim-treesitter-context/,,
https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, 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/eddiebergman/nvim-treesitter-pyfold/,,
https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, 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/lewis6991/satellite.nvim/,HEAD,
https://github.com/davidgranstrom/scnvim/,HEAD, https://github.com/davidgranstrom/scnvim/,HEAD,
https://github.com/tiagovla/scope.nvim/,HEAD, https://github.com/tiagovla/scope.nvim/,HEAD,
https://github.com/0xJohnnyboy/scretch.nvim/,HEAD,
https://github.com/Xuyuanp/scrollbar.nvim/,, https://github.com/Xuyuanp/scrollbar.nvim/,,
https://github.com/cakebaker/scss-syntax.vim/,, https://github.com/cakebaker/scss-syntax.vim/,,
https://github.com/VonHeikemen/searchbox.nvim/,, https://github.com/VonHeikemen/searchbox.nvim/,,

View File

@ -10,43 +10,43 @@
let let
pname = "1password"; 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 = { sources = {
stable = { stable = {
x86_64-linux = { x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; 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 = { aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-7lUZiS3TSsIVqPoN5A6YqyVaaaRI9BliT51FHkwOPyw="; hash = "sha256-tHQIhLPTD2dFRK542kFnpExg36paaNuzyOED8ZKyIYk=";
}; };
x86_64-darwin = { x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-xK/B8J3VP8y1xw3KorzZzPf/LjYmYdOIjDECMJnVv6I="; hash = "sha256-pnAE1UTMXX89wshEI/wzhySb1NZY5ke5bSYmUjvU/pc=";
}; };
aarch64-darwin = { aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-iqdK6K7dcypZFGseYal2KjOaqJtUjXeCzbDdx7pDv8A="; hash = "sha256-MmHUa96keBV9+E2GQdgz/aCTXeFkVNqHV0eH8/WhvhY=";
}; };
}; };
beta = { beta = {
x86_64-linux = { x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; 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 = { aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; 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 = { x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-U14CjoUJUpd4wWidZz6xGErhHI/VPChqG8cwBTBYoYc="; hash = "sha256-UfSUPqZgbYdWyrfw41SdnnI1IeA+dYsfBAu/UQl0vVI=";
}; };
aarch64-darwin = { aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-DD1M2EFSHqG9OHX5Q/CmZLZIKYrBMS4cnX/6tLVi7H0="; hash = "sha256-ynkDnJtoKMAtegeilB0XIH+YrSS9EKYV1ceN0Ecls+A=";
}; };
}; };
}; };

View File

@ -1,41 +0,0 @@
{ lib, stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch, libxcrypt }:
stdenv.mkDerivation rec {
pname = "epic5";
version = "2.0.1";
src = fetchurl {
url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz";
sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm";
};
# Darwin needs libiconv, tcl; while Linux build don't
buildInputs = [ openssl ncurses libxcrypt ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv tcl ];
patches = [
(fetchpatch {
url = "https://sources.debian.net/data/main/e/epic5/2.0.1-1/debian/patches/openssl-1.1.patch";
sha256 = "03bpsyv1sr5icajs2qkdvv8nnn6rz6yvvj7pgiq8gz9sbp6siyfv";
})
];
configureFlags = [ "--disable-debug" "--with-ipv6" ];
postConfigure = ''
substituteInPlace bsdinstall \
--replace /bin/cp ${coreutils}/bin/cp \
--replace /bin/rm ${coreutils}/bin/rm \
--replace /bin/chmod ${coreutils}/bin/chmod \
'';
meta = with lib; {
homepage = "http://epicsol.org";
description = "IRC client that offers a great ircII interface";
license = licenses.bsd3;
maintainers = [ ];
};
}

View File

@ -18,11 +18,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "weston"; pname = "weston";
version = "14.0.0"; version = "14.0.1";
src = fetchurl { src = fetchurl {
url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; 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 ]; depsBuildBuild = [ pkg-config ];

View 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;
};
})

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "astro-language-server"; pname = "astro-language-server";
version = "2.15.0"; version = "2.15.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "withastro"; owner = "withastro";
repo = "language-tools"; repo = "language-tools";
rev = "@astrojs/language-server@${finalAttrs.version}"; rev = "@astrojs/language-server@${finalAttrs.version}";
hash = "sha256-2MaoW04mX016VIrtfnBX/jzMNCOXE10lSInSyhqot5E="; hash = "sha256-PJTcr/FIA0haatLFNHMJV24j6eK+c2DR9zpnR8aReHo=";
}; };
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmWorkspace pnpmWorkspace
prePnpmInstall prePnpmInstall
; ;
hash = "sha256-WSnXMVWuE6VC75a1bhZHGyUg6r1yMBvoQZeKdIYE7QI="; hash = "sha256-/X8ZoWK5kBPm/8clBDP+B9A5ofXnH2svmy4kMc2t5iA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -28,13 +28,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "bluespec"; pname = "bluespec";
version = "2024.01"; version = "2024.07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "B-Lang-org"; owner = "B-Lang-org";
repo = "bsc"; repo = "bsc";
rev = version; rev = version;
sha256 = "sha256-yqmtydv94p7qhps0t4EdPaSZNh/9XCuUwOzLqz0gjxE="; sha256 = "sha256-gA/vfAkkM2cuArN99JZVYEWTIJqg82HlC+BHNVS5Ot0=";
}; };
yices-src = fetchurl { yices-src = fetchurl {

View File

@ -0,0 +1,51 @@
{
lib,
stdenv,
ruby,
fetchurl,
openssl,
ncurses,
libiconv,
tcl,
libxcrypt,
perl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "epic5";
version = "3.0";
src = fetchurl {
url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz";
hash = "sha256-ltRzUME6PZkBnaDmoEsMf4Datt26WQvMZ527iswXeaE=";
};
buildInputs =
[
openssl
ncurses
libxcrypt
ruby
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
tcl
];
configureFlags = [
"--with-ipv6"
];
nativeBuildInputs = [
perl
];
meta = {
homepage = "https://epicsol.org";
description = "IRC client that offers a great ircII interface";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ bot-wxt1221 ];
platforms = lib.platforms.unix;
mainProgram = "epic5";
};
})

View File

@ -3,29 +3,31 @@
, fetchurl , fetchurl
, substituteAll , substituteAll
, bubblewrap , bubblewrap
, cairo
, cargo , cargo
, git , git
, gnome
, gtk4
, lcms2
, libheif
, libjxl
, librsvg
, libseccomp
, libxml2
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, rustc , rustc
, rustPlatform , rustPlatform
, gtk4
, cairo
, libheif
, libxml2
, libseccomp
, libjxl
, gnome
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "glycin-loaders"; pname = "glycin-loaders";
version = "1.0.1"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glycin-loaders/${lib.versions.majorMinor finalAttrs.version}/glycin-loaders-${finalAttrs.version}.tar.xz"; url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
hash = "sha256-0PAiRi/1VYVuheqUBHRHC7NrN8n/y8umOgP+XpVDcM8="; hash = "sha256-Vg7kIWfB7SKCZhjmHYPkkUDbW/R6Zam6js4s1z0qSqg=";
}; };
patches = [ patches = [
@ -49,15 +51,24 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
gtk4 # for GdkTexture gtk4 # for GdkTexture
cairo cairo
lcms2
libheif libheif
libxml2 # for librsvg crate libxml2 # for librsvg crate
librsvg
libseccomp libseccomp
libjxl libjxl
]; ];
mesonFlags = [
"-Dglycin-loaders=true"
"-Dlibglycin=false"
"-Dvapi=false"
];
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = "glycin-loaders"; attrPath = "glycin-loaders";
packageName = "glycin";
}; };
glycinPathsPatch = substituteAll { glycinPathsPatch = substituteAll {

View File

@ -1,22 +1,22 @@
{ {
"version": "1.118.1", "version": "1.118.2",
"hash": "sha256-rWBW0EwehuWnKk6qEte+dPd9l7FbLzwdkCSKMm22Orw=", "hash": "sha256-u2/Xs1SdAzmQ02pyXD9+ncamIKFcq8qMijnx7KFtrmU=",
"components": { "components": {
"cli": { "cli": {
"npmDepsHash": "sha256-0je82BtDH6cUzoMrmeIS0jLmWPbmkdIQJ/SnmbAMtbw=", "npmDepsHash": "sha256-RwfGq0fDPYo+ZP2xv+sMKmr3Tf8szbB8506c1PqiMM0=",
"version": "2.2.25" "version": "2.2.26"
}, },
"server": { "server": {
"npmDepsHash": "sha256-Jxb47Y4x9A6s4zGODIp6rze7iQ/w8Gvt31NHSATLYCM=", "npmDepsHash": "sha256-4jPvLCsI2gz+maBU3ZtrWZzJ6Zp2PTQwaCuCKr1hK/o=",
"version": "1.118.1" "version": "1.118.2"
}, },
"web": { "web": {
"npmDepsHash": "sha256-BUgkdsC6raURkyy6eN31uCMKmBbL+fCbGabfHJgJn8g=", "npmDepsHash": "sha256-j6+EkcfwpaCP048v/kZv1xthp0DSylraJTeU4+LcDbw=",
"version": "1.118.1" "version": "1.118.2"
}, },
"open-api/typescript-sdk": { "open-api/typescript-sdk": {
"npmDepsHash": "sha256-Ga/aU5hojd3SgtoiM5QLsmzS5k7CRvh13a4lkC0BZA8=", "npmDepsHash": "sha256-e+7BEFc46scLZDqCJNRhrczOEydSoiK9m7vSj/2ECaE=",
"version": "1.118.1" "version": "1.118.2"
} }
} }
} }

View 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 ];
};
}

View File

@ -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 diff --git a/src/ldcache.c b/src/ldcache.c
index 38bab05..e1abc89 100644 index 38bab055..8cd30a0f 100644
--- a/src/ldcache.c --- a/src/ldcache.c
+++ b/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 int
ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[], 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) - char *paths[], size_t size, ldcache_select_fn select, void *select_ctx)
@ -14,26 +27,17 @@ index 38bab05..e1abc89 100644
- int override; - int override;
+ char dir[PATH_MAX]; + char dir[PATH_MAX];
+ char lib[PATH_MAX]; + char lib[PATH_MAX];
- h = (struct header_libc6 *)ctx->ptr; - h = (struct header_libc6 *)ctx->ptr;
memset(paths, 0, size * sizeof(*paths)); memset(paths, 0, size * sizeof(*paths));
- for (uint32_t i = 0; i < h->nlibs; ++i) { - for (uint32_t i = 0; i < h->nlibs; ++i) {
- int32_t flags = h->libs[i].flags; - int32_t flags = h->libs[i].flags;
- char *key = (char *)ctx->ptr + h->libs[i].key; - char *key = (char *)ctx->ptr + h->libs[i].key;
- char *value = (char *)ctx->ptr + h->libs[i].value; - char *value = (char *)ctx->ptr + h->libs[i].value;
- -
- if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch) - if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch)
+ for (size_t j = 0; j < size; ++j) { - continue;
+ 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;
- -
- for (size_t j = 0; j < size; ++j) { - for (size_t j = 0; j < size; ++j) {
- if (!str_has_prefix(key, libs[j])) - if (!str_has_prefix(key, libs[j]))
@ -52,6 +56,17 @@ index 38bab05..e1abc89 100644
- } - }
- break; - 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); + paths[j] = xstrdup(ctx->err, path);
+ if (paths[j] == NULL) + if (paths[j] == NULL)
+ return (-1); + return (-1);
@ -59,7 +74,7 @@ index 38bab05..e1abc89 100644
return (0); return (0);
} }
diff --git a/src/ldcache.h b/src/ldcache.h diff --git a/src/ldcache.h b/src/ldcache.h
index 33d78dd..2b087db 100644 index 33d78dd7..2b087dbc 100644
--- a/src/ldcache.h --- a/src/ldcache.h
+++ b/src/ldcache.h +++ b/src/ldcache.h
@@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *); @@ -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 [], int ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [],
- char *[], size_t, ldcache_select_fn, void *); - char *[], size_t, ldcache_select_fn, void *);
+ char *[], size_t, const char*); + char *[], size_t, const char*);
#endif /* HEADER_LDCACHE_H */ #endif /* HEADER_LDCACHE_H */
diff --git a/src/nvc_info.c b/src/nvc_info.c 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 --- a/src/nvc_info.c
+++ b/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) if (path_resolve_full(err, path, root, ldcache) < 0)
return (-1); return (-1);
ldcache_init(&ld, err, path); ldcache_init(&ld, err, path);
- if (ldcache_open(&ld) < 0) - if (ldcache_open(&ld) < 0)
- return (-1); - return (-1);
info->nlibs = size; info->nlibs = size;
info->libs = array_new(err, size); info->libs = array_new(err, size);
if (info->libs == NULL) 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, select_libraries_fn, info) < 0)
+ info->libs, info->nlibs, info->nvrm_version) < 0) + info->libs, info->nlibs, info->nvrm_version) < 0)
goto fail; goto fail;
info->nlibs32 = size; 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) if (info->libs32 == NULL)
goto fail; goto fail;
if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
@ -99,32 +114,34 @@ index 30e3cfd..6d12a50 100644
+ info->libs32, info->nlibs32, info->nvrm_version) < 0) + info->libs32, info->nlibs32, info->nvrm_version) < 0)
goto fail; goto fail;
rv = 0; rv = 0;
fail: fail:
- if (ldcache_close(&ld) < 0) - if (ldcache_close(&ld) < 0)
- return (-1); - return (-1);
return (rv); 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]; char path[PATH_MAX];
int rv = -1; int rv = -1;
- if ((env = secure_getenv("PATH")) == NULL) { - if ((env = secure_getenv("PATH")) == NULL) {
+ if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) { + if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) {
error_setx(err, "environment variable PATH not found"); error_setx(err, "environment variable PATH not found");
return (-1); return (-1);
} }
diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c 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 --- a/src/nvc_ldcache.c
+++ b/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) if (validate_args(ctx, cnt != NULL) < 0)
return (-1); 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}; + 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] == '@') { if (*argv[0] == '@') {
/* /*
* We treat this path specially to be relative to the host filesystem. * We treat this path specially to be relative to the host filesystem.
--
2.46.0

View File

@ -1,7 +1,7 @@
diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 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 2021-11-13 14:36:58.096684602 +0000
+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 +++ nvidia-modprobe-@modprobeVersion@-patched/modprobe-utils/nvidia-modprobe-utils.c 2021-11-13 14:43:40.965146390 +0000
@@ -840,10 +840,10 @@ @@ -959,10 +959,10 @@
return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH); 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]; char field[32];
FILE *fp; FILE *fp;
diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 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 2021-11-13 14:36:58.096684602 +0000
+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 +++ nvidia-modprobe-@modprobeVersion@-patched/modprobe-utils/nvidia-modprobe-utils.h 2021-11-13 14:38:34.078700961 +0000
@@ -81,6 +81,7 @@ @@ -87,6 +87,7 @@
int nvidia_nvswitch_get_file_state(int minor); int nvidia_nvswitch_get_file_state(int minor);
int nvidia_cap_mknod(const char* cap_file_path, 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_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_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); int nvidia_get_chardev_major(const char *name);
int nvidia_msr_modprobe(void);
#endif /* NV_LINUX */

View File

@ -1,25 +1,27 @@
{ stdenv {
, lib stdenv,
, addDriverRunpath lib,
, fetchFromGitHub addDriverRunpath,
, pkg-config fetchFromGitHub,
, elfutils pkg-config,
, libcap elfutils,
, libseccomp libcap,
, rpcsvc-proto libseccomp,
, libtirpc rpcsvc-proto,
, makeWrapper libtirpc,
, substituteAll makeWrapper,
, removeReferencesTo substituteAll,
, go removeReferencesTo,
replaceVars,
go,
}: }:
let let
modprobeVersion = "495.44"; modprobeVersion = "550.54.14";
nvidia-modprobe = fetchFromGitHub { nvidia-modprobe = fetchFromGitHub {
owner = "NVIDIA"; owner = "NVIDIA";
repo = "nvidia-modprobe"; repo = "nvidia-modprobe";
rev = modprobeVersion; rev = modprobeVersion;
sha256 = "sha256-Y3ZOfge/EcmhqI19yWO7UfPqkvY1CHHvFC5l9vYyGuU="; sha256 = "sha256-iBRMkvOXacs/llTtvc/ZC5i/q9gc8lMuUHxMbu8A+Kg=";
}; };
modprobePatch = substituteAll { modprobePatch = substituteAll {
src = ./modprobe.patch; src = ./modprobe.patch;
@ -28,21 +30,25 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libnvidia-container"; pname = "libnvidia-container";
version = "1.9.0"; version = "1.16.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NVIDIA"; owner = "NVIDIA";
repo = pname; repo = "libnvidia-container";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7OTawWwjeKU8wIa8I/+aSvAJli4kEua94nJSNyCajpE="; sha256 = "sha256-hX+2B+0kHiAC2lyo6kwe7DctPLJWgRdbhlc316OO3r8=";
}; };
patches = [ patches = [
# locations of nvidia-driver libraries are not resolved via ldconfig which # Locations of nvidia driver libraries are not resolved via ldconfig which
# doesn't get used on NixOS. Additional support binaries like nvidia-smi # 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 # are not resolved via the environment PATH but via the derivation output
# path. # path.
./libnvc-ldconfig-and-path-fixes.patch (replaceVars ./fix-library-resolving.patch {
inherit (addDriverRunpath) driverLink;
})
# fix bogus struct declaration # fix bogus struct declaration
./inline-c-struct.patch ./inline-c-struct.patch
@ -54,6 +60,11 @@ stdenv.mkDerivation rec {
-e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
mk/common.mk 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} mkdir -p deps/src/nvidia-modprobe-${modprobeVersion}
cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion} cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion}
chmod -R u+w deps/src chmod -R u+w deps/src
@ -84,12 +95,26 @@ stdenv.mkDerivation rec {
HOME="$(mktemp -d)" HOME="$(mktemp -d)"
''; '';
env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getInclude libtirpc}/include/tirpc" ];
NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; 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 = [ makeFlags = [
"WITH_LIBELF=yes" "WITH_LIBELF=yes"
@ -103,10 +128,14 @@ stdenv.mkDerivation rec {
postInstall = postInstall =
let let
inherit (addDriverRunpath) driverLink; inherit (addDriverRunpath) driverLink;
libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ]; libraryPath = lib.makeLibraryPath [
"$out"
driverLink
"${driverLink}-32"
];
in 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} wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath}
''; '';
disallowedReferences = [ go ]; disallowedReferences = [ go ];

8750
pkgs/by-name/op/openvmm/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View 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"
];
};
}

View File

@ -11,13 +11,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "pupdate"; pname = "pupdate";
version = "3.18.0"; version = "3.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mattpannella"; owner = "mattpannella";
repo = "pupdate"; repo = "pupdate";
rev = "${version}"; rev = "${version}";
hash = "sha256-GTdca47Jp/q1IpX1IAMZgOgHjBPNSotFSL9O6bfTfnM="; hash = "sha256-ogQ7pYLfeyoxg0p7nxUvYhmgDw5xtd7qkFM08B4FDBU=";
}; };
buildInputs = [ buildInputs = [

View 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 ];
};
}

View File

@ -7,17 +7,17 @@
buildGoModule rec { buildGoModule rec {
pname = "risor"; pname = "risor";
version = "1.6.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "risor-io"; owner = "risor-io";
repo = "risor"; repo = "risor";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-IUmkb23Fx+bjzXrXWfKPOo0HFt7HjtjQoCRtH77HGBg="; hash = "sha256-QtYqepNH+c0WDGKTLtMz/VUz0oDOgCbwe4D9I4wal5s=";
}; };
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-+XYwFYbvZvk0TWoRtCKQIzbQeznQkolB+NFqUiZMkpA="; vendorHash = "sha256-JrBuHA+u5bI2kcbWaY6/894kh5Xdix0ov6nN5r9rJRE=";
subPackages = [ subPackages = [
"cmd/risor" "cmd/risor"

View File

@ -19,7 +19,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libjcat"; pname = "libjcat";
version = "0.2.1"; version = "0.2.2";
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "hughsie"; owner = "hughsie";
repo = "libjcat"; repo = "libjcat";
rev = version; rev = version;
sha256 = "sha256-tCXz62MEqYBnrx2RxlTBwKGTahfhUCVdet4VnXw5klQ="; sha256 = "sha256-Vn5Qjyo2FHCmQC2pmb1qgU81VaFKsXnSIwlSYk/8Rig=";
}; };
patches = [ patches = [

View File

@ -1,6 +1,5 @@
{ lib, stdenv { lib, stdenv
, cmake , cmake
, fetchpatch2
, fetchurl , fetchurl
, perl , perl
, zlib , zlib
@ -18,22 +17,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "libzip"; pname = "libzip";
version = "1.10.1"; version = "1.11.1";
src = fetchurl { src = fetchurl {
url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz"; 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" ]; outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ cmake perl groff ]; nativeBuildInputs = [ cmake perl groff ];

View File

@ -76,6 +76,8 @@ mapAliases {
inherit (pkgs) coc-pyright; # added 2024-07-14 inherit (pkgs) coc-pyright; # added 2024-07-14
coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
coffee-script = pkgs.coffeescript; # added 2023-08-18 coffee-script = pkgs.coffeescript; # added 2023-08-18
inherit (pkgs) concurrently; # added 2024-08-05 inherit (pkgs) concurrently; # added 2024-08-05

View File

@ -60,8 +60,6 @@
, "coc-tabnine" , "coc-tabnine"
, "coc-texlab" , "coc-texlab"
, "coc-toml" , "coc-toml"
, "coc-tslint"
, "coc-tslint-plugin"
, "coc-tsserver" , "coc-tsserver"
, "coc-ultisnips" , "coc-ultisnips"
, "coc-vetur" , "coc-vetur"

View File

@ -61714,102 +61714,6 @@ in
bypassCache = true; bypassCache = true;
reconstructLock = true; reconstructLock = true;
}; };
coc-tslint = nodeEnv.buildNodePackage {
name = "coc-tslint";
packageName = "coc-tslint";
version = "1.0.17";
src = fetchurl {
url = "https://registry.npmjs.org/coc-tslint/-/coc-tslint-1.0.17.tgz";
sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw==";
};
dependencies = [
sources."@babel/code-frame-7.24.7"
sources."@babel/helper-validator-identifier-7.24.7"
sources."@babel/highlight-7.24.7"
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."builtin-modules-1.1.1"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."commander-2.20.3"
sources."concat-map-0.0.1"
sources."diff-4.0.2"
sources."escape-string-regexp-1.0.5"
sources."esprima-4.0.1"
sources."fs.realpath-1.0.0"
sources."function-bind-1.1.2"
sources."glob-7.2.3"
sources."has-flag-3.0.0"
sources."hasown-2.0.2"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."is-core-module-2.15.1"
sources."js-tokens-4.0.0"
sources."js-yaml-3.14.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.8"
sources."mkdirp-0.5.6"
sources."once-1.4.0"
sources."path-is-absolute-1.0.1"
sources."path-parse-1.0.7"
sources."picocolors-1.1.0"
sources."resolve-1.22.8"
sources."semver-5.7.2"
sources."sprintf-js-1.0.3"
sources."supports-color-5.5.0"
sources."supports-preserve-symlinks-flag-1.0.0"
sources."tslib-1.14.1"
sources."tslint-5.20.1"
sources."tsutils-2.29.0"
sources."typescript-3.9.10"
sources."wrappy-1.0.2"
];
buildInputs = globalBuildInputs;
meta = {
description = "tslint extension for coc.nvim";
homepage = "https://github.com/neoclide/coc-tslint#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
coc-tslint-plugin = nodeEnv.buildNodePackage {
name = "coc-tslint-plugin";
packageName = "coc-tslint-plugin";
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.2.0.tgz";
sha512 = "WEl0FM8ui0Oip6YqyOYApf8vErXFudj2ftjSYqm5WNLNuPq53JSNi+5w+WNqHwX2UWE8MOB2mQszqwU2fyE8Ag==";
};
dependencies = [
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."concat-map-0.0.1"
sources."get-caller-file-1.0.3"
sources."minimatch-3.1.2"
sources."mock-require-3.0.3"
sources."normalize-path-2.1.1"
sources."remove-trailing-separator-1.1.0"
sources."typescript-tslint-plugin-0.5.4"
sources."vscode-jsonrpc-4.0.0"
sources."vscode-languageserver-5.2.1"
sources."vscode-languageserver-protocol-3.14.1"
sources."vscode-languageserver-types-3.14.0"
sources."vscode-uri-1.0.8"
];
buildInputs = globalBuildInputs;
meta = {
description = "TSLint extension for coc.nvim as tsserver plugin";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
coc-tsserver = nodeEnv.buildNodePackage { coc-tsserver = nodeEnv.buildNodePackage {
name = "coc-tsserver"; name = "coc-tsserver";
packageName = "coc-tsserver"; packageName = "coc-tsserver";

View File

@ -19,13 +19,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "faster-whisper"; pname = "faster-whisper";
version = "1.0.3"; version = "unstable-2024-07-26";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SYSTRAN"; owner = "SYSTRAN";
repo = "faster-whisper"; repo = "faster-whisper";
rev = "refs/tags/v${version}"; # rev = "refs/tags/v${version}";
rev = "d57c5b40b06e59ec44240d93485a95799548af50";
hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo=";
}; };

View File

@ -1,10 +1,11 @@
{ {
lib, lib,
betamax,
betamax-matchers, betamax-matchers,
betamax-serializers, betamax-serializers,
betamax,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
flit-core,
mock, mock,
prawcore, prawcore,
pytestCheckHook, pytestCheckHook,
@ -16,19 +17,21 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "praw"; pname = "praw";
version = "7.7.1"; version = "7.8.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "praw-dev"; owner = "praw-dev";
repo = pname; repo = "praw";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-L7wTHD/ypXVc8GMfl9u16VNb9caLJoXpaMEIzaVVUgo="; hash = "sha256-oJkpFGJswG//5dnfdwkUdAkn8FOuqT/tDoTT5UncOGA=";
}; };
propagatedBuildInputs = [ build-system = [ flit-core ];
dependencies = [
mock mock
prawcore prawcore
update-checker update-checker

View File

@ -67,13 +67,24 @@
}, },
"32": { "32": {
"hashes": { "hashes": {
"aarch64-darwin": "b5f6db900997ba931c98addaef28744a0a6af0f2ec2e8e5755f7f50db2fe8bbc", "aarch64-darwin": "906fbf9e7a5ee6d49ea107fdfd0e98bc80884fbf1f6ff38d824453f58c6ec259",
"aarch64-linux": "702326c51679ed705bc22d7e4049b29cef2d66366d3387c401836aaae0fa450c", "aarch64-linux": "6500fdbff988e0cda909643ba8439660a207c9a2d393fa63f680a0337e530342",
"armv7l-linux": "d9511449c328f90f47e499f44c6d84c6204d4a3a2caec5c5d52f176cfc77f50d", "armv7l-linux": "7ffcce19ebdb30a9db78671c7f222edde66181a37c895834682d224e459200fc",
"headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm",
"x86_64-darwin": "150ac6a59e31ad516685bdbb9cee67c7e927b872ad94ffc900fbf6616433f8ab", "x86_64-darwin": "56e2e4252b4d4e92075345f0b9dbefc8db49bdc6a4c45a87000f3cc705057907",
"x86_64-linux": "b51e5f1296f8971d7eb4ca86606b6f5d31fb3dab8caa91dcfbfa522be5679691" "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"
} }
} }

View File

@ -34,13 +34,24 @@
}, },
"32": { "32": {
"hashes": { "hashes": {
"aarch64-darwin": "7fb7b8736fcd9dbde92628e4aa951fd2c54d3136bf20c1821ce2a1b85fef3046", "aarch64-darwin": "29acb63bb116a08e97797042505d48eecfa396f5d84a12114573aa70acaa48ec",
"aarch64-linux": "405664c1b6529cd6c2af65778f2c84bfe262ad0b8d9d044a39d2eff2ed218828", "aarch64-linux": "6b311318f5a537e21d2d832609ce8306b4806e4c62aaa132ee87e063d45f5b00",
"armv7l-linux": "32682f487ed9307d0f40d35c4b998cee75272effd228093be3e008ca7b39e16e", "armv7l-linux": "ac1529a8f6e4c77fdae3bc92bc5bfcb40c3b19def0772de9d1874da7223517b7",
"headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm",
"x86_64-darwin": "a9e43916cbe91c9a905f2bf38d326d5dc462c3d8a7d88f52c25c1e7c1b9ce7cc", "x86_64-darwin": "a1fd00f8634c6b4d9e28ce8ac69684ea24f5274c9f17c0e39bd149b34568b84b",
"x86_64-linux": "d98aa7a90ebfe519700e47fa6bcb94a157483fac615920c5ee467dcc41c46702" "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"
} }
} }

View File

@ -1858,7 +1858,7 @@
"version": "31.6.0" "version": "31.6.0"
}, },
"32": { "32": {
"chrome": "128.0.6613.162", "chrome": "128.0.6613.186",
"chromium": { "chromium": {
"deps": { "deps": {
"gn": { "gn": {
@ -1868,15 +1868,15 @@
"version": "2024-06-11" "version": "2024-06-11"
} }
}, },
"version": "128.0.6613.162" "version": "128.0.6613.186"
}, },
"chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=", "chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=",
"deps": { "deps": {
"src": { "src": {
"fetcher": "fetchFromGitiles", "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; ", "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" "url": "https://chromium.googlesource.com/chromium/src.git"
}, },
"src/chrome/test/data/perf/canvas_bench": { "src/chrome/test/data/perf/canvas_bench": {
@ -1905,10 +1905,10 @@
}, },
"src/electron": { "src/electron": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",
"hash": "sha256-RkSdNjEmXO4xsCRzp5y5suG8svNT5LSI/eVbAUDbi5c=", "hash": "sha256-6Yt3fz2XqFoSh+V/tI9ygFdHf76p2vGOR7+6FgTnfWg=",
"owner": "electron", "owner": "electron",
"repo": "electron", "repo": "electron",
"rev": "v32.1.2" "rev": "v32.2.1"
}, },
"src/media/cdm/api": { "src/media/cdm/api": {
"fetcher": "fetchFromGitiles", "fetcher": "fetchFromGitiles",
@ -2080,14 +2080,14 @@
}, },
"src/third_party/dawn": { "src/third_party/dawn": {
"fetcher": "fetchFromGitiles", "fetcher": "fetchFromGitiles",
"hash": "sha256-6ljZh99QPH8/9JAV1tVm6BVAYsJWqkJjzlM2AG2m01g=", "hash": "sha256-UTtU0GIlkOtXA3vJy0MA99wLARHl7WMM7IBNmXxE6d4=",
"rev": "5f86f5a316f4e082b2419d8b954ebb79c2be590d", "rev": "a79093138c06b0ca942f99ddc39b225dafa4776d",
"url": "https://dawn.googlesource.com/dawn.git" "url": "https://dawn.googlesource.com/dawn.git"
}, },
"src/third_party/dawn/third_party/dxc": { "src/third_party/dawn/third_party/dxc": {
"fetcher": "fetchFromGitiles", "fetcher": "fetchFromGitiles",
"hash": "sha256-oIByfTUMy1EY3J0/m0iOqJbHd+DzpVAmZbaIdllcF04=", "hash": "sha256-p4DZNVQ8C4YB52BfBKEFXCqenQk0ONkzkctM9vyz4aw=",
"rev": "3ea0e7f6b5f464814d6b896eaf69cbd5ebe7fac4", "rev": "ee5422d3f33c0bfd8643ce7782eb3a216cf15dea",
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
}, },
"src/third_party/dawn/third_party/dxheaders": { "src/third_party/dawn/third_party/dxheaders": {
@ -2152,10 +2152,10 @@
}, },
"src/third_party/electron_node": { "src/third_party/electron_node": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",
"hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=",
"owner": "nodejs", "owner": "nodejs",
"repo": "node", "repo": "node",
"rev": "v20.17.0" "rev": "v20.18.0"
}, },
"src/third_party/emoji-segmenter/src": { "src/third_party/emoji-segmenter/src": {
"fetcher": "fetchFromGitiles", "fetcher": "fetchFromGitiles",
@ -2569,8 +2569,8 @@
}, },
"src/third_party/skia": { "src/third_party/skia": {
"fetcher": "fetchFromGitiles", "fetcher": "fetchFromGitiles",
"hash": "sha256-B5zb35NkwR3yT58344iAOM1Kywn8Yr/TuNBSJcrxwh4=", "hash": "sha256-vclLETDkiiBinfvse++0CF9/1+qZeG5vcukTTmqPYiU=",
"rev": "938144dd79c6e3664a3c0bbd019daedddf655ffa", "rev": "cd98397d0c2c3eb1d5a8d76aade3c87c2e0d28ac",
"url": "https://skia.googlesource.com/skia.git" "url": "https://skia.googlesource.com/skia.git"
}, },
"src/third_party/smhasher/src": { "src/third_party/smhasher/src": {
@ -2788,14 +2788,14 @@
}, },
"src/v8": { "src/v8": {
"fetcher": "fetchFromGitiles", "fetcher": "fetchFromGitiles",
"hash": "sha256-weN8PR9qaRcws9T5PhWyJntrJJ4sKoLwP3gTSLHU574=", "hash": "sha256-VwRVnondH9YM8pYRQo0l0jM0Zb531kpQTo6ngvEPOBg=",
"rev": "485b9d9f88ef1c4787b183b8ccc6cdcfbc07ab1a", "rev": "d213b3bbc0ecf17ccd2849fdef3bccb1946b01b3",
"url": "https://chromium.googlesource.com/v8/v8.git" "url": "https://chromium.googlesource.com/v8/v8.git"
} }
}, },
"electron_yarn_hash": "0jb1rs1in1bp71syim7a7p0n669kbc6as90y3zi6nd0q340cwgqa", "electron_yarn_hash": "19iw16qs4h6b1bcmkkqxhhcgxnl2r6qf57w7dr76vbl0zhmhlyf9",
"modules": "128", "modules": "128",
"node": "20.17.0", "node": "20.18.0",
"version": "32.1.2" "version": "32.2.1"
} }
} }

View File

@ -33,8 +33,8 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
postPhases = [ "postPatchelf" ]; postPhases = lib.optionals (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) [ "postPatchelf" ];
postPatchelf = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' postPatchelf = ''
completions_dir=$(mktemp -d) completions_dir=$(mktemp -d)
SHELL="bash" $out/bin/bun completions $completions_dir SHELL="bash" $out/bin/bun completions $completions_dir

View File

@ -16,12 +16,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pax-utils"; pname = "pax-utils";
version = "1.3.7"; version = "1.3.8";
src = fetchgit { src = fetchgit {
url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; url = "https://anongit.gentoo.org/git/proj/pax-utils.git";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-WyNng+UtfRz1+Eu4gwXLxUvBAg+m3mdrc8GdEPYRKVE="; hash = "sha256-fOdiZcS1ZWGN8U5v65LzGIZJD6hCl5dbLMHDpSyms+8=";
}; };
strictDeps = true; strictDeps = true;

View File

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "wyoming-faster-whisper"; pname = "wyoming-faster-whisper";
version = "2.1.0"; version = "2.2.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rhasspy"; owner = "rhasspy";
repo = "wyoming-faster-whisper"; repo = "wyoming-faster-whisper";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-zWa872YkPh8B7dE//leth+ixIa1wHSRcjkvH2lXzolc="; hash = "sha256-G46ycjpRu4MD00FiBM1H0DrPpXaaPlZ8yeoyZ7WYD48=";
}; };
nativeBuildInputs = with python3Packages; [ nativeBuildInputs = with python3Packages; [

View File

@ -24,7 +24,7 @@ index 9cc7f0d..6a52893 100644
LABEL="bcache_backing_found" LABEL="bcache_backing_found"
RUN{builtin}+="kmod load bcache" RUN{builtin}+="kmod load bcache"
-RUN+="bcache-register $tempnode" -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" LABEL="bcache_backing_end"
# Cached devices: symlink # Cached devices: symlink

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash }: { lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash, substituteAll }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bcache-tools"; pname = "bcache-tools";
@ -26,7 +26,10 @@ stdenv.mkDerivation rec {
''; '';
patches = [ patches = [
./bcache-udev-modern.patch (substituteAll {
src = ./bcache-udev-modern.patch;
shell = "${bash}/bin/sh";
})
./fix-static.patch ./fix-static.patch
]; ];

View File

@ -1,5 +1,4 @@
{ lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook
, fetchpatch
, enableShared ? !stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic
, enableStatic ? stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic
, enableDarwinSandbox ? true , enableDarwinSandbox ? true
@ -9,49 +8,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}"; pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}";
version = "1.1.0"; version = "1.1.2";
outputs = [ "out" "lib" "dev" "man" ]; outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl { src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; 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 ] nativeBuildInputs = [ which dieHook ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
@ -70,6 +35,13 @@ stdenv.mkDerivation rec {
runHook postConfigure 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 = [ makeFlags = [
"bins" # prevents shared object from being built unnecessarily "bins" # prevents shared object from being built unnecessarily
]; ];
@ -109,8 +81,10 @@ stdenv.mkDerivation rec {
installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) '' installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) ''
runHook preInstallCheck runHook preInstallCheck
echo '# TEST' > test.md echo '# TEST' > test.md
$out/bin/lowdown test.md $out/bin/lowdown test.md
runHook postInstallCheck runHook postInstallCheck
''; '';

File diff suppressed because it is too large Load Diff

View File

@ -5352,8 +5352,6 @@ with pkgs;
libnvme = callPackage ../os-specific/linux/libnvme { }; libnvme = callPackage ../os-specific/linux/libnvme { };
libnvidia-container = callPackage ../applications/virtualization/libnvidia-container { };
librenms = callPackage ../servers/monitoring/librenms { }; librenms = callPackage ../servers/monitoring/librenms { };
libxnd = callPackage ../development/libraries/libxnd { }; libxnd = callPackage ../development/libraries/libxnd { };
@ -14307,7 +14305,7 @@ with pkgs;
inherit (python3Packages) filecheck; inherit (python3Packages) filecheck;
}; };
bluespec = callPackage ../development/compilers/bluespec { bluespec = callPackage ../by-name/bl/bluespec/package.nix {
gmp-static = gmp.override { withStatic = true; }; gmp-static = gmp.override { withStatic = true; };
}; };
@ -16919,13 +16917,16 @@ with pkgs;
electron_30-bin electron_30-bin
electron_31-bin electron_31-bin
electron_32-bin electron_32-bin
electron_33-bin
; ;
inherit (callPackages ../development/tools/electron/chromedriver { }) inherit (callPackages ../development/tools/electron/chromedriver { })
electron-chromedriver_29 electron-chromedriver_29
electron-chromedriver_30 electron-chromedriver_30
electron-chromedriver_31 electron-chromedriver_31
electron-chromedriver_32; electron-chromedriver_32
electron-chromedriver_33
;
electron_24 = electron_24-bin; electron_24 = electron_24-bin;
electron_27 = electron_27-bin; electron_27 = electron_27-bin;
@ -16934,6 +16935,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_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_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_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 = electron_32;
electron-bin = electron_32-bin; electron-bin = electron_32-bin;
electron-chromedriver = electron-chromedriver_32; electron-chromedriver = electron-chromedriver_32;
@ -28945,8 +28947,6 @@ with pkgs;
ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; ephemeral = callPackage ../applications/networking/browsers/ephemeral { };
epic5 = callPackage ../applications/networking/irc/epic5 { };
epick = callPackage ../applications/graphics/epick { epick = callPackage ../applications/graphics/epick {
inherit (darwin.apple_sdk.frameworks) AppKit; inherit (darwin.apple_sdk.frameworks) AppKit;
}; };