gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-07-11 18:01:02 +00:00
committed by GitHub
parent 213b201f28 9da3a027b4
commit 3e33d30aee
47 changed files with 696 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/release-notes/rl-2411.section.md
+4
View File
@@ -182,6 +182,10 @@
- `keycloak` was updated to version 25, which introduces new hostname related options.
See [Upgrading Guide](https://www.keycloak.org/docs/25.0.1/upgrading/#migrating-to-25-0-0) for instructions.
- `programs.vim.defaultEditor` now only works if `programs.vim.enable` is enabled.
- `/share/vim-plugins` now only gets linked if `programs.vim.enable` is enabled
- The `tracy` package no longer works on X11, since it's moved to Wayland
support, which is the intended default behavior by Tracy maintainers.
X11 users have to switch to the new package `tracy-x11`.
nixos/modules/config/system-path.nix
-1
View File
@@ -155,7 +155,6 @@ in
"/share/hunspell"
"/share/org"
"/share/themes"
"/share/vim-plugins"
"/share/vulkan"
"/share/kservices5"
"/share/kservicetypes5"
nixos/modules/installer/tools/nix-fallback-paths.nix
+5 -5
View File
@@ -1,7 +1,7 @@
{
x86_64-linux = "/nix/store/1w4b47zhp33md29wjhgg549pc281vv02-nix-2.18.4";
i686-linux = "/nix/store/hz02kn0ffn3wdi2xs7lndpr88v4v4fp2-nix-2.18.4";
aarch64-linux = "/nix/store/90zwqa9z2fgldc7ki1p5gfvglchjh9r6-nix-2.18.4";
x86_64-darwin = "/nix/store/bd1ix5mj9lj2yh7bqnmdjc24zlg5jivk-nix-2.18.4";
aarch64-darwin = "/nix/store/5hvsmklhqiay5i4q5vdkg60p8qpc69rz-nix-2.18.4";
x86_64-linux = "/nix/store/f409bhlpp0xkzvdz95qr2yvfjfi8r9jc-nix-2.18.5";
i686-linux = "/nix/store/ra39jzrxq3bcpf55aahwv5037akvylf5-nix-2.18.5";
aarch64-linux = "/nix/store/xiw8a4jbnw18svgdb04hyqzg5bsjspqf-nix-2.18.5";
x86_64-darwin = "/nix/store/k2gzx7i90x3h2c8g6xdi1jkwbl6ic895-nix-2.18.5";
aarch64-darwin = "/nix/store/rqwymbndaqxma6p8s5brcl9k32n5xx54-nix-2.18.5";
}
nixos/modules/programs/envision.nix
+8
View File
@@ -31,6 +31,14 @@ in
};
};
services.udev = {
enable = true;
packages = with pkgs; [
android-udev-rules
xr-hardware
];
};
environment.systemPackages = [ cfg.package ];
networking.firewall = lib.mkIf cfg.openFirewall {
nixos/modules/programs/vim.nix
+22 -16
View File
@@ -1,25 +1,31 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.programs.vim;
in {
in
{
options.programs.vim = {
defaultEditor = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
When enabled, installs vim and configures vim to be the default editor
using the EDITOR environment variable.
'';
};
enable = lib.mkEnableOption "Vi IMproved, an advanced text";
package = lib.mkPackageOption pkgs "vim" {
example = "vim-full";
};
defaultEditor = lib.mkEnableOption "vim as the default editor";
package = lib.mkPackageOption pkgs "vim" { example = "vim-full"; };
};
config = lib.mkIf cfg.defaultEditor {
environment.systemPackages = [ cfg.package ];
environment.variables = { EDITOR = lib.mkOverride 900 "vim"; };
# TODO: convert it into assert after 24.11 release
config = lib.mkIf (cfg.enable || cfg.defaultEditor) {
warnings = lib.mkIf (cfg.defaultEditor && !cfg.enable) [
"programs.vim.defaultEditor will only work if programs.vim.enable is enabled, will be encfored after the 24.11 release"
];
environment = {
systemPackages = [ cfg.package ];
variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "vim");
pathsToLink = [ "/share/vim-plugins" ];
};
};
}
nixos/modules/services/monitoring/opentelemetry-collector.nix
+27 -20
View File
@@ -6,8 +6,9 @@ let
cfg = config.services.opentelemetry-collector;
opentelemetry-collector = cfg.package;
settingsFormat = pkgs.formats.yaml {};
in {
settingsFormat = pkgs.formats.yaml { };
in
{
options.services.opentelemetry-collector = {
enable = mkEnableOption "Opentelemetry Collector";
@@ -15,7 +16,7 @@ in {
settings = mkOption {
type = settingsFormat.type;
default = {};
default = { };
description = ''
Specify the configuration for Opentelemetry Collector in Nix.
@@ -35,9 +36,9 @@ in {
config = mkIf cfg.enable {
assertions = [{
assertion = (
(cfg.settings == {}) != (cfg.configFile == null)
(cfg.settings == { }) != (cfg.configFile == null)
);
message = ''
message = ''
Please specify a configuration for Opentelemetry Collector with either
'services.opentelemetry-collector.settings' or
'services.opentelemetry-collector.configFile'.
@@ -48,21 +49,27 @@ in {
description = "Opentelemetry Collector Service Daemon";
wantedBy = [ "multi-user.target" ];
serviceConfig = let
conf = if cfg.configFile == null
then settingsFormat.generate "config.yaml" cfg.settings
else cfg.configFile;
in
{
ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}";
DynamicUser = true;
Restart = "always";
ProtectSystem = "full";
DevicePolicy = "closed";
NoNewPrivileges = true;
WorkingDirectory = "/var/lib/opentelemetry-collector";
StateDirectory = "opentelemetry-collector";
};
serviceConfig =
let
conf =
if cfg.configFile == null
then settingsFormat.generate "config.yaml" cfg.settings
else cfg.configFile;
in
{
ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}";
DynamicUser = true;
Restart = "always";
ProtectSystem = "full";
DevicePolicy = "closed";
NoNewPrivileges = true;
WorkingDirectory = "%S/opentelemetry-collector";
StateDirectory = "opentelemetry-collector";
SupplementaryGroups = [
# allow to read the systemd journal for opentelemetry-collector
"systemd-journal"
];
};
};
};
}
pkgs/applications/audio/picard/default.nix
+7 -4
View File
@@ -1,5 +1,7 @@
{ lib
, python3Packages
# Python 3.12 demonstrates a peculiar segmentation fault with pyqt5. Using
# pyqt6 with Python 3.12 should work, but this is not released yet.
, python311Packages
, fetchFromGitHub
, chromaprint
@@ -11,7 +13,7 @@
}:
let
pythonPackages = python3Packages;
pythonPackages = python311Packages;
pyqt5 =
if enablePlayback then
pythonPackages.pyqt5-multimedia
@@ -20,14 +22,15 @@ let
in
pythonPackages.buildPythonApplication rec {
pname = "picard";
version = "2.11";
# nix-update --commit picard --version-regex 'release-(.*)'
version = "2.12";
format = "setuptools";
src = fetchFromGitHub {
owner = "metabrainz";
repo = "picard";
rev = "refs/tags/release-${version}";
hash = "sha256-2RGKHJKJ/QXR6Rehch4r1UtI+frRXa4G+n0bUmCGSu8=";
hash = "sha256-+++NDJzXw4tA5eQd24r+l3UK3YS8Jy1t9WNiEU9sH0Q=";
};
nativeBuildInputs = [
pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix
+5 -1
View File
@@ -2,7 +2,7 @@
, fetchFromGitHub
, gettext
, gtk3
, python3Packages
, python311Packages
, gdk-pixbuf
, libnotify
, glib
@@ -16,6 +16,10 @@
, libcanberra-gtk3
}:
let
# https://github.com/AyatanaIndicators/ayatana-webmail/issues/38
python3Packages = python311Packages;
in
python3Packages.buildPythonApplication rec {
pname = "ayatana-webmail";
version = "22.12.15";
pkgs/applications/office/ib/controller/default.nix
+1
View File
@@ -155,6 +155,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Automation Controller for the Trader Work Station of Interactive Brokers";
broken = true; # Ref: https://github.com/NixOS/nixpkgs/issues/40784
homepage = "https://github.com/ib-controller/ib-controller";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl3;
pkgs/applications/office/ib/tws/default.nix
+1
View File
@@ -86,6 +86,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Trader Work Station of Interactive Brokers";
broken = true; # Ref: https://github.com/NixOS/nixpkgs/issues/40784
homepage = "https://www.interactivebrokers.com";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfree;
pkgs/applications/science/astronomy/stellarium/default.nix
+14
View File
@@ -20,6 +20,8 @@
, qttools
, exiv2
, nlopt
, testers
, xvfb-run
}:
stdenv.mkDerivation (finalAttrs: {
@@ -93,6 +95,18 @@ stdenv.mkDerivation (finalAttrs: {
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = ''
# Create a temporary home directory because stellarium aborts with an
# error if it can't write some configuration files.
tmpdir=$(mktemp -d)
# stellarium can't be run in headless mode, therefore we need xvfb-run.
HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run stellarium --version
'';
};
meta = {
description = "Free open-source planetarium";
mainProgram = "stellarium";
pkgs/applications/science/misc/cwltool/default.nix
+2 -1
View File
@@ -24,7 +24,8 @@ python3.pkgs.buildPythonApplication rec {
--replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \
--replace "PYTEST_RUNNER + " ""
substituteInPlace pyproject.toml \
--replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml"
--replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
--replace "mypy==1.10.0" "mypy==1.10.*"
'';
nativeBuildInputs = [
pkgs/applications/video/gpac/default.nix
+12 -4
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }:
{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }:
stdenv.mkDerivation rec {
pname = "gpac";
@@ -13,9 +13,17 @@ stdenv.mkDerivation rec {
# this is the bare minimum configuration, as I'm only interested in MP4Box
# For most other functionality, this should probably be extended
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
cctools
];
buildInputs = [ zlib ];
buildInputs = [
zlib
] ++ lib.optionals stdenv.isDarwin [
Carbon
];
enableParallelBuilding = true;
@@ -36,6 +44,6 @@ stdenv.mkDerivation rec {
homepage = "https://gpac.wp.imt.fr";
license = licenses.lgpl21;
maintainers = with maintainers; [ bluescreen303 mgdelacroix ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
pkgs/by-name/ar/artalk/package.nix
+25 -6
View File
@@ -3,8 +3,10 @@
buildGoModule,
fetchFromGitHub,
artalk,
testers,
fetchurl,
installShellFiles,
stdenv,
testers,
}:
buildGoModule rec {
pname = "artalk";
@@ -13,7 +15,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "ArtalkJS";
repo = "artalk";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-fOuZiFomXGvRUXkpEM3BpJyMOtSm6/RHd0a7dPOsoT4=";
};
web = fetchurl {
@@ -31,20 +33,37 @@ buildGoModule rec {
"-X github.com/ArtalkJS/Artalk/internal/config.Version=${version}"
"-X github.com/ArtalkJS/Artalk/internal/config.CommitHash=${version}"
];
preBuild = ''
tar -xzf ${web}
cp -r ./artalk_ui/* ./public
'';
nativeBuildInputs = [ installShellFiles ];
postInstall =
''
# work around case insensitive file systems
mv $out/bin/Artalk $out/bin/artalk.tmp
mv $out/bin/artalk.tmp $out/bin/artalk
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd artalk \
--bash <($out/bin/artalk completion bash) \
--fish <($out/bin/artalk completion fish) \
--zsh <($out/bin/artalk completion zsh)
'';
passthru.tests = {
version = testers.testVersion { package = artalk; };
};
meta = with lib; {
meta = {
description = "Self-hosted comment system";
homepage = "https://github.com/ArtalkJS/Artalk";
license = licenses.mit;
maintainers = with maintainers; [ moraxyc ];
mainProgram = "Artalk";
changelog = "https://github.com/ArtalkJS/Artalk/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ moraxyc ];
mainProgram = "artalk";
};
}
pkgs/by-name/im/imsprog/package.nix
+55
View File
@@ -0,0 +1,55 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config, bash, libusb1, qt5, wget, zenity }:
stdenv.mkDerivation (finalAttrs: {
pname = "imsprog";
version = "1.4.1";
src = fetchFromGitHub {
owner = "bigbigmdm";
repo = "IMSProg";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-eF6TGlFEnMgMw1i/sfuXIRzNySVZe7UTKVHSIqJ+cUs=";
};
strictDeps = true;
nativeBuildInputs = [
cmake
makeWrapper
pkg-config
qt5.wrapQtAppsHook
qt5.qttools
];
buildInputs = [
bash # for patching the shebang in bin/IMSProg_database_update
libusb1
qt5.qtbase
qt5.qtwayland
];
# change default hardcoded path for chip database file, udev rules et al
postPatch = ''
while IFS= read -r -d "" file ; do
substituteInPlace "$file" \
--replace-quiet '/usr/bin/' "$out/bin/" \
--replace-quiet '/usr/lib/' "$out/lib/" \
--replace-quiet '/usr/share/' "$out/share/"
done < <(grep --files-with-matches --null --recursive '/usr/' .)
'';
postFixup = ''
wrapProgram $out/bin/IMSProg_database_update \
--prefix PATH : "${lib.makeBinPath [ wget zenity ]}"
'';
meta = {
changelog = "https://github.com/bigbigmdm/IMSProg/releases/tag/v${finalAttrs.version}";
description = "A free I2C EEPROM programmer tool for CH341A device";
homepage = "https://github.com/bigbigmdm/IMSProg";
license = with lib.licenses; [ gpl3Plus gpl2Plus lgpl21Only ];
mainProgram = "IMSProg";
maintainers = with lib.maintainers; [ wucke13 ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/op/openvswitch/generic.nix
+10
View File
@@ -20,10 +20,12 @@
pkg-config,
procps,
python3,
tcpdump,
sphinxHook,
util-linux,
which,
writeScript,
makeWrapper,
}:
let
@@ -60,6 +62,7 @@ stdenv.mkDerivation rec {
libtool
pkg-config
sphinxHook
makeWrapper
];
sphinxBuilders = [ "man" ];
@@ -96,6 +99,13 @@ stdenv.mkDerivation rec {
postInstall = ''
installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash
installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash
wrapProgram $out/bin/ovs-l3ping \
--prefix PYTHONPATH : $out/share/openvswitch/python
wrapProgram $out/bin/ovs-tcpdump \
--prefix PATH : ${lib.makeBinPath [tcpdump]} \
--prefix PYTHONPATH : $out/share/openvswitch/python
'';
doCheck = true;
pkgs/by-name/vu/vue-language-server/package-lock.json
Generated
+90 -90
View File
@@ -1,19 +1,19 @@
{
"name": "@vue/language-server",
"version": "2.0.24",
"version": "2.0.26",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@vue/language-server",
"version": "2.0.24",
"version": "2.0.26",
"license": "MIT",
"dependencies": {
"@volar/language-core": "~2.4.0-alpha.2",
"@volar/language-server": "~2.4.0-alpha.2",
"@vue/language-core": "2.0.24",
"@vue/language-service": "2.0.24",
"@vue/typescript-plugin": "2.0.24",
"@volar/language-core": "~2.4.0-alpha.15",
"@volar/language-server": "~2.4.0-alpha.15",
"@vue/language-core": "2.0.26",
"@vue/language-service": "2.0.26",
"@vue/typescript-plugin": "2.0.26",
"vscode-languageserver-protocol": "^3.17.5",
"vscode-uri": "^3.0.8"
},
@@ -86,22 +86,22 @@
"integrity": "sha512-qqNS/YD0Nck5wtQLCPHAfGVgWbbGafxSPjNh0ekYPFSNNqnDH2kamnduzYly8IiADmeVx/MfAE1njMEjVeHTMA=="
},
"node_modules/@volar/language-core": {
"version": "2.4.0-alpha.7",
"resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.7.tgz",
"integrity": "sha512-3ncRpnoVHCTzJeTiUyKwFTLb3jGfe1r5+S3MwRDPEjsV4LID6Rq6EmdRoF+aKw+Iwg63x4nV+/KYZjeYrp5mNA==",
"version": "2.4.0-alpha.15",
"resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.15.tgz",
"integrity": "sha512-mt8z4Fm2WxfQYoQHPcKVjLQV6PgPqyKLbkCVY2cr5RSaamqCHjhKEpsFX66aL4D/7oYguuaUw9Bx03Vt0TpIIA==",
"dependencies": {
"@volar/source-map": "2.4.0-alpha.7"
"@volar/source-map": "2.4.0-alpha.15"
}
},
"node_modules/@volar/language-server": {
"version": "2.4.0-alpha.7",
"resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.7.tgz",
"integrity": "sha512-WxCFxHRy5SOEJAUEcStMW6OuC/V25y5AsJEyJaPq5sZ76EeJgc8BbImO6Yi7r6qXRENDjcVTE10t2JR4t5+qRw==",
"version": "2.4.0-alpha.15",
"resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.15.tgz",
"integrity": "sha512-epaF7Rllb29nr25F8hX5bq7ivgStNZzXGkhuPlHCUM+Ij/aQnsBeYQsfm7EttPqqO3abCctpRWyd+icklFEBoQ==",
"dependencies": {
"@volar/language-core": "2.4.0-alpha.7",
"@volar/language-service": "2.4.0-alpha.7",
"@volar/snapshot-document": "2.4.0-alpha.7",
"@volar/typescript": "2.4.0-alpha.7",
"@volar/language-core": "2.4.0-alpha.15",
"@volar/language-service": "2.4.0-alpha.15",
"@volar/snapshot-document": "2.4.0-alpha.15",
"@volar/typescript": "2.4.0-alpha.15",
"path-browserify": "^1.0.1",
"request-light": "^0.7.0",
"vscode-languageserver": "^9.0.1",
@@ -111,36 +111,36 @@
}
},
"node_modules/@volar/language-service": {
"version": "2.4.0-alpha.7",
"resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.7.tgz",
"integrity": "sha512-vSuH2c0o7z9zDPcmUGqK9sT4l71B8Ooj6VKKB1H6F++ZAI0I9Uch7V7wc6VQjuB2LuYmojxwKxl1bydjnGxpHg==",
"version": "2.4.0-alpha.15",
"resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.15.tgz",
"integrity": "sha512-H5T5JvvqvWhG0PvvKPTM0nczTbTKQ+U87a8r0eahlH/ySi2HvIHO/7PiNKLxKqLNsiT8SX4U3QcGC8ZaNcC07g==",
"dependencies": {
"@volar/language-core": "2.4.0-alpha.7",
"@volar/language-core": "2.4.0-alpha.15",
"vscode-languageserver-protocol": "^3.17.5",
"vscode-languageserver-textdocument": "^1.0.11",
"vscode-uri": "^3.0.8"
}
},
"node_modules/@volar/snapshot-document": {
"version": "2.4.0-alpha.7",
"resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.7.tgz",
"integrity": "sha512-gBxnWi1ioC97bpynl9M0GE8XTiIDnslgCsCSi2WgNEaknrivYs9bR6dsA2G0iMz7lHScim47pmIlhtO9eSvY7A==",
"version": "2.4.0-alpha.15",
"resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.15.tgz",
"integrity": "sha512-8lnX0eZ7/lM+hakO5kspWABi4nijppxTy9XU0f9ns2lZ/JCE0t9EurNNiOaw4MWFO9USr0H72Ut0LCB9o4rpqA==",
"dependencies": {
"vscode-languageserver-protocol": "^3.17.5",
"vscode-languageserver-textdocument": "^1.0.11"
}
},
"node_modules/@volar/source-map": {
"version": "2.4.0-alpha.7",
"resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.7.tgz",
"integrity": "sha512-yn66qcUXxUCyyW8PXMHE4z9RdfTO1OhP6BMa/JI0Ed6I6bggzkxvXsJOaMqw3EalCskGPuIWAbWgxwa3Hlp7SA=="
"version": "2.4.0-alpha.15",
"resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.15.tgz",
"integrity": "sha512-8Htngw5TmBY4L3ClDqBGyfLhsB8EmoEXUH1xydyEtEoK0O6NX5ur4Jw8jgvscTlwzizyl/wsN1vn0cQXVbbXYg=="
},
"node_modules/@volar/typescript": {
"version": "2.4.0-alpha.7",
"resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.7.tgz",
"integrity": "sha512-MjvkhcIYPDZS5vbE4bSvbWi8z/VI47AY8MkPVgfa6xqTDLLxV6+QulJ8hIC3wYxh3dfVmA5MOoL5c3cZAsWbDQ==",
"version": "2.4.0-alpha.15",
"resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.15.tgz",
"integrity": "sha512-U3StRBbDuxV6Woa4hvGS4kz3XcOzrWUKgFdEFN+ba1x3eaYg7+ytau8ul05xgA+UNGLXXsKur7fTUhDFyISk0w==",
"dependencies": {
"@volar/language-core": "2.4.0-alpha.7",
"@volar/language-core": "2.4.0-alpha.15",
"path-browserify": "^1.0.1",
"vscode-uri": "^3.0.8"
}
@@ -189,11 +189,11 @@
}
},
"node_modules/@vue/language-core": {
"version": "2.0.24",
"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.24.tgz",
"integrity": "sha512-997YD6Lq/66LXr3ZOLNxDCmyn13z9NP8LU1UZn9hGCDWhzlbXAIP0hOgL3w3x4RKEaWTaaRtsHP9DzHvmduruQ==",
"version": "2.0.26",
"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.26.tgz",
"integrity": "sha512-/lt6SfQ3O1yDAhPsnLv9iSUgXd1dMHqUm/t3RctfqjuwQf1LnftZ414X3UBn6aXT4MiwXWtbNJ4Z0NZWwDWgJQ==",
"dependencies": {
"@volar/language-core": "~2.4.0-alpha.2",
"@volar/language-core": "~2.4.0-alpha.15",
"@vue/compiler-dom": "^3.4.0",
"@vue/shared": "^3.4.0",
"computeds": "^0.0.1",
@@ -212,27 +212,27 @@
}
},
"node_modules/@vue/language-service": {
"version": "2.0.24",
"resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.0.24.tgz",
"integrity": "sha512-CoiTPlc73I/LCji9rnI0Z89GVBOoejUfBzIzEg+6TFw8Eelp2fncgLAvgR8vmOWRVaLn0XgmL2wa0jgtLLderg==",
"version": "2.0.26",
"resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.0.26.tgz",
"integrity": "sha512-Lo4RJ+fcKrF09iIygcLFm3wdTEbmMb+l+/bpA3TXrgZk8+SbOkh6LSexJBvRQfStZSKYIV6FMgJ3ME6qpXpYqA==",
"dependencies": {
"@volar/language-core": "~2.4.0-alpha.2",
"@volar/language-service": "~2.4.0-alpha.2",
"@volar/typescript": "~2.4.0-alpha.2",
"@volar/language-core": "~2.4.0-alpha.15",
"@volar/language-service": "~2.4.0-alpha.15",
"@volar/typescript": "~2.4.0-alpha.15",
"@vue/compiler-dom": "^3.4.0",
"@vue/language-core": "2.0.24",
"@vue/language-core": "2.0.26",
"@vue/shared": "^3.4.0",
"@vue/typescript-plugin": "2.0.24",
"@vue/typescript-plugin": "2.0.26",
"computeds": "^0.0.1",
"path-browserify": "^1.0.1",
"volar-service-css": "0.0.56",
"volar-service-emmet": "0.0.56",
"volar-service-html": "0.0.56",
"volar-service-json": "0.0.56",
"volar-service-pug": "0.0.56",
"volar-service-pug-beautify": "0.0.56",
"volar-service-typescript": "0.0.56",
"volar-service-typescript-twoslash-queries": "0.0.56",
"volar-service-css": "volar-2.4",
"volar-service-emmet": "volar-2.4",
"volar-service-html": "volar-2.4",
"volar-service-json": "volar-2.4",
"volar-service-pug": "volar-2.4",
"volar-service-pug-beautify": "volar-2.4",
"volar-service-typescript": "volar-2.4",
"volar-service-typescript-twoslash-queries": "volar-2.4",
"vscode-html-languageservice": "^5.2.0",
"vscode-languageserver-textdocument": "^1.0.11",
"vscode-uri": "^3.0.8"
@@ -244,12 +244,12 @@
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
},
"node_modules/@vue/typescript-plugin": {
"version": "2.0.24",
"resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.0.24.tgz",
"integrity": "sha512-UjC6iKiyJ1pn0CbcsDW3IyiNb7z7vtABI3b9tDZ8xLGDvVLduZ0qwzq22b5jg2cVEIhLdjbQ4quaEoZflltfTw==",
"version": "2.0.26",
"resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.0.26.tgz",
"integrity": "sha512-C0F2lpv1m9LO1sEIJmZEN7tSzRwPObbYHtxftDlrvUKNWuEu4OqilnRuUCNyAQRq7UrkNR3fv1Dc+OcKOj0dEg==",
"dependencies": {
"@volar/typescript": "~2.4.0-alpha.2",
"@vue/language-core": "2.0.24",
"@volar/typescript": "~2.4.0-alpha.15",
"@vue/language-core": "2.0.26",
"@vue/shared": "^3.4.0"
}
},
@@ -621,16 +621,16 @@
}
},
"node_modules/volar-service-css": {
"version": "0.0.56",
"resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.56.tgz",
"integrity": "sha512-Pdbk5QayLNWJislbik4Lo0QLLyd4pTqcgZCE2gaEQp9ozHCtrRNj3vY7KAh4BTgfiOqTSAj/UhViOXVAtdF3yg==",
"version": "0.0.59",
"resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.59.tgz",
"integrity": "sha512-gLNjJnECbalPvQB7qeJjhkDN8sR5M3ItbVYjnyio61aHaWptIiXm/HfDahcQ2ApwmvWidkMWWegjGq5L0BENDA==",
"dependencies": {
"vscode-css-languageservice": "^6.3.0",
"vscode-languageserver-textdocument": "^1.0.11",
"vscode-uri": "^3.0.8"
},
"peerDependencies": {
"@volar/language-service": "~2.4.0-alpha.1"
"@volar/language-service": "~2.4.0-alpha.12"
},
"peerDependenciesMeta": {
"@volar/language-service": {
@@ -639,9 +639,9 @@
}
},
"node_modules/volar-service-emmet": {
"version": "0.0.56",
"resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.56.tgz",
"integrity": "sha512-2WqvOMTYBOpNAHtEWj0C9d8Wyco8aY4KL+9lfdFCWJd7RYU6R6mIlbrvcdSP2De8b5Z7gwTCUm6Kcjt8qOCvjQ==",
"version": "0.0.59",
"resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.59.tgz",
"integrity": "sha512-6EynHcuMwMBETpK29TbZvIMmvzdVG+Tkokk9VWfZeI+SwDptk2tgdhEqiXXvIkqYNgbuu73Itp66lpH76cAU+Q==",
"dependencies": {
"@emmetio/css-parser": "^0.4.0",
"@emmetio/html-matcher": "^1.3.0",
@@ -649,7 +649,7 @@
"vscode-uri": "^3.0.8"
},
"peerDependencies": {
"@volar/language-service": "~2.4.0-alpha.1"
"@volar/language-service": "~2.4.0-alpha.12"
},
"peerDependenciesMeta": {
"@volar/language-service": {
@@ -658,16 +658,16 @@
}
},
"node_modules/volar-service-html": {
"version": "0.0.56",
"resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.56.tgz",
"integrity": "sha512-OwDRiASNqFxAFdO55CZ0/XKnPt7WGw8CoaM/g6QzExikPZ92ySbK/kvh1zi6WR3w+hP6C4BNeVITzOk9tjgNGw==",
"version": "0.0.59",
"resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.59.tgz",
"integrity": "sha512-hEXOsYpILDlITZxnqRLV9OepVWD63GZBsyjMxszwdzlxvGZjzbGcBBinJGGJRwFIV8djdJwnt91bkdg1V5tj6Q==",
"dependencies": {
"vscode-html-languageservice": "^5.3.0",
"vscode-languageserver-textdocument": "^1.0.11",
"vscode-uri": "^3.0.8"
},
"peerDependencies": {
"@volar/language-service": "~2.4.0-alpha.1"
"@volar/language-service": "~2.4.0-alpha.12"
},
"peerDependenciesMeta": {
"@volar/language-service": {
@@ -676,15 +676,15 @@
}
},
"node_modules/volar-service-json": {
"version": "0.0.56",
"resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.56.tgz",
"integrity": "sha512-eYXfOYTJLOw9UeA2YNtxGp/Lgu4pKk9u72I/HI+TcqLdMJKoXpOwLF6nUEhZVTy9LqTSRF0QvgXFa4q4mcLwIg==",
"version": "0.0.59",
"resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.59.tgz",
"integrity": "sha512-LfDOQhCvUpDBjA6CP9EogO0dn1yEFbInvV3Yk4OsEdyxwWUEYPLVjDacPlVUYcjCIKQN6NcTOWbVwpg4vYjw6A==",
"dependencies": {
"vscode-json-languageservice": "^5.4.0",
"vscode-uri": "^3.0.8"
},
"peerDependencies": {
"@volar/language-service": "~2.4.0-alpha.1"
"@volar/language-service": "~2.4.0-alpha.12"
},
"peerDependenciesMeta": {
"@volar/language-service": {
@@ -693,28 +693,28 @@
}
},
"node_modules/volar-service-pug": {
"version": "0.0.56",
"resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.56.tgz",
"integrity": "sha512-NaobSQiuAFBTzBE7YHAyHyCZXqVNFFbXvuXTtXsJP6LR1lvBWg7IUgg45kzV1OS146qq2cmY3lryhlNRHwCmmg==",
"version": "0.0.59",
"resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.59.tgz",
"integrity": "sha512-kmch7yoqeGNlJuDzpw/YL2b89ilzBmWDd0lJbpG412/RXc3PJVA4usUK+SQHdVoF+qi5IcZL6IDxlvRiIrDgWg==",
"dependencies": {
"@volar/language-service": "~2.4.0-alpha.1",
"@volar/language-service": "~2.4.0-alpha.12",
"muggle-string": "^0.4.1",
"pug-lexer": "^5.0.1",
"pug-parser": "^6.0.0",
"volar-service-html": "0.0.56",
"volar-service-html": "0.0.59",
"vscode-html-languageservice": "^5.3.0",
"vscode-languageserver-textdocument": "^1.0.11"
}
},
"node_modules/volar-service-pug-beautify": {
"version": "0.0.56",
"resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.56.tgz",
"integrity": "sha512-ai79ljMfKH2bjcVjUET0zAwpVjDNtMCjizkttxCkNHCMTYIc1muhHIEj1+nNAw4zrDT51lxZgW6OJMTXQ+BW9A==",
"version": "0.0.59",
"resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.59.tgz",
"integrity": "sha512-SCLWHpBdgvWww3a9Vp8FX80ookozhnHx10gkKBTYW4wp7/rzEoVAPSyO7JKBwTdXmdKQv7YXfxLMVUGv0sYUKg==",
"dependencies": {
"@johnsoncodehk/pug-beautify": "^0.2.2"
},
"peerDependencies": {
"@volar/language-service": "~2.4.0-alpha.1"
"@volar/language-service": "~2.4.0-alpha.12"
},
"peerDependenciesMeta": {
"@volar/language-service": {
@@ -723,9 +723,9 @@
}
},
"node_modules/volar-service-typescript": {
"version": "0.0.56",
"resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.56.tgz",
"integrity": "sha512-p16fn61j4IiNLhLl7ZxdnRRDpRLWiqIRhZm1xLgek4JshCCy5Z7KShYG6LVZXK3hNvXxM8f61PIl0KDCCzStKA==",
"version": "0.0.59",
"resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.59.tgz",
"integrity": "sha512-VCOpfiu+lUo5lapWLB5L5vmQGtwzmNWn5MueV915eku7blpphmE+Z7hCNcL1NApn7AetXWhiblv8ZhmUx/dGIA==",
"dependencies": {
"path-browserify": "^1.0.1",
"semver": "^7.6.2",
@@ -735,7 +735,7 @@
"vscode-uri": "^3.0.8"
},
"peerDependencies": {
"@volar/language-service": "~2.4.0-alpha.1"
"@volar/language-service": "~2.4.0-alpha.12"
},
"peerDependenciesMeta": {
"@volar/language-service": {
@@ -744,14 +744,14 @@
}
},
"node_modules/volar-service-typescript-twoslash-queries": {
"version": "0.0.56",
"resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.56.tgz",
"integrity": "sha512-VqOp3xQucUzLpJCOEQcAiAUlbv6c1laTbFsM/pc06S/+l78eHPDbnivoSwL+0MKbNoLwLsS5w0OwBfwQ2Dn2Jg==",
"version": "0.0.59",
"resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.59.tgz",
"integrity": "sha512-skm8e6yhCIkqLwJB6S9MqT5lO9LNFuMD3dYxKpmOZs1CKbXmCZZTmLfEaD5VkJae1xdleEDZFFTHl2O5HLjOGQ==",
"dependencies": {
"vscode-uri": "^3.0.8"
},
"peerDependencies": {
"@volar/language-service": "~2.4.0-alpha.1"
"@volar/language-service": "~2.4.0-alpha.12"
},
"peerDependenciesMeta": {
"@volar/language-service": {
pkgs/by-name/vu/vue-language-server/package.nix
+3 -3
View File
@@ -6,14 +6,14 @@
buildNpmPackage rec {
pname = "vue-language-server";
version = "2.0.24";
version = "2.0.26";
src = fetchurl {
url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz";
hash = "sha256-uEYDg4Sybqodb2/w2mmZqi0uWffBzSSTvttcNWt01MI=";
hash = "sha256-SKEc7ft0FxafU7vuN5MQY97gdLG65fMpMIhV2aGosRs=";
};
npmDepsHash = "sha256-6idBvR+Ua6uwwX4doB1X8ERqgBI5bJ6e9G13JhPUFP4=";
npmDepsHash = "sha256-kx3axLCVD0obVDE0RE6EM+ZnHU5mjMA+lF8H9dR0X2I=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
pkgs/development/python-modules/check-manifest/default.nix
+2
View File
@@ -7,6 +7,7 @@
git,
pep517,
pytestCheckHook,
setuptools,
tomli,
pythonOlder,
}:
@@ -26,6 +27,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
build
pep517
setuptools
] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
nativeCheckInputs = [
pkgs/development/python-modules/cupy/default.nix
+23 -11
View File
@@ -1,8 +1,8 @@
{
lib,
buildPythonPackage,
fetchPypi,
cython,
fetchFromGitHub,
cython_0,
fastrlock,
numpy,
wheel,
@@ -13,13 +13,12 @@
addOpenGLRunpath,
pythonOlder,
symlinkJoin,
fetchpatch
}:
let
inherit (cudaPackages) cudnn cutensor nccl;
cudatoolkit-joined = symlinkJoin {
name = "cudatoolkit-joined-${cudaPackages.cudaVersion}";
paths = with cudaPackages; [
outpaths = with cudaPackages; [
cuda_cccl # <nv/target>
cuda_cudart
cuda_nvcc # <crt/host_defines.h>
@@ -35,7 +34,10 @@ let
# Missing:
# cusparselt
];
];
cudatoolkit-joined = symlinkJoin {
name = "cudatoolkit-joined-${cudaPackages.cudaVersion}";
paths = outpaths ++ lib.concatMap (f: lib.map f outpaths) [lib.getLib lib.getDev (lib.getOutput "static") (lib.getOutput "stubs")];
};
in
buildPythonPackage rec {
@@ -45,11 +47,22 @@ buildPythonPackage rec {
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-5NvSsu1BWaXMDA+YpxCgFJUOssFu60VelWEo87O9DVE=";
src = fetchFromGitHub {
owner = "cupy";
repo = "cupy";
rev = "v13.2.0";
hash = "sha256-vZAtpIZztmsYeJeuq7yl7kgZse2azrIM3efHDmUswJI=";
fetchSubmodules = true;
};
patches = [
(fetchpatch {
url =
"https://github.com/cfhammill/cupy/commit/67526c756e4a0a70f0420bf0e7f081b8a35a8ee5.patch";
hash = "sha256-WZgexBdM9J0ep5s+9CGZriVq0ZidCRccox+g0iDDywQ=";
})
];
# See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both
# CUPY_NUM_BUILD_JOBS and CUPY_NUM_NVCC_THREADS to NIX_BUILD_CORES results in
# a small amount of thrashing but it turns out there are a large number of
@@ -64,7 +77,7 @@ buildPythonPackage rec {
setuptools
wheel
addOpenGLRunpath
cython
cython_0
cudaPackages.cuda_nvcc
];
@@ -77,7 +90,6 @@ buildPythonPackage rec {
NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages
CUDA_PATH = "${cudatoolkit-joined}";
LDFLAGS = "-L${cudaPackages.cuda_cudart}/lib/stubs";
propagatedBuildInputs = [
fastrlock
pkgs/development/python-modules/imap-tools/default.nix
+6 -3
View File
@@ -3,24 +3,27 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "imap-tools";
version = "1.6.0";
version = "1.7.0";
disabled = pythonOlder "3.5";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "ikvk";
repo = "imap_tools";
rev = "refs/tags/v${version}";
hash = "sha256-T4sA/PsoTfS2L0RwJyJP6BY33MJuybVqruHnwwstnXA=";
hash = "sha256-ULtDJkNSrWM0/pDblTeE7lKS/4UNYM06hWrEw51ZbVA=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
pkgs/development/python-modules/mypy/default.nix
+6 -2
View File
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
gitUpdater,
pythonAtLeast,
pythonOlder,
@@ -31,7 +32,7 @@
buildPythonPackage rec {
pname = "mypy";
version = "1.10.0";
version = "1.10.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -40,7 +41,10 @@ buildPythonPackage rec {
owner = "python";
repo = "mypy";
rev = "refs/tags/v${version}";
hash = "sha256-NCnc4C/YFKHN/kT7RTFCYs/yC00Kt1E7mWCoQuUjxG8=";
hash = "sha256-joV+elRaAICNQHkYuYtTDjvOUkHPsRkG1OLRvdxeIHc=";
};
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
build-system = [
pkgs/development/python-modules/openai-triton/default.nix
+11 -2
View File
@@ -27,7 +27,7 @@
}:
let
ptxas = "${cudaPackages.cuda_nvcc}/bin/ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py)
ptxas = lib.getExe' cudaPackages.cuda_nvcc "ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py)
in
buildPythonPackage rec {
pname = "triton";
@@ -48,9 +48,12 @@ buildPythonPackage rec {
url = "https://github.com/openai/triton/commit/52c146f66b79b6079bcd28c55312fc6ea1852519.patch";
hash = "sha256-098/TCQrzvrBAbQiaVGCMaF3o5Yc3yWDxzwSkzIuAtY=";
})
# Upstream startded pinning CUDA version and falling back to downloading from Conda
# in https://github.com/triton-lang/triton/pull/1574/files#diff-eb8b42d9346d0a5d371facf21a8bfa2d16fb49e213ae7c21f03863accebe0fcfR120-R123
./0000-dont-download-ptxas.patch
]
++ lib.optionals (!cudaSupport) [
./0000-dont-download-ptxas.patch
# openai-triton wants to get ptxas version even if ptxas is not
# used, resulting in ptxas not found error.
./0001-ptxas-disable-version-key-for-non-cuda-targets.patch
@@ -130,6 +133,12 @@ buildPythonPackage rec {
setuptools
];
NIX_CFLAGS_COMPILE = lib.optionals cudaSupport [
# Pybind11 started generating strange errors since python 3.12. Observed only in the CUDA branch.
# https://gist.github.com/SomeoneSerge/7d390b2b1313957c378e99ed57168219#file-gistfile0-txt-L1042
"-Wno-stringop-overread"
];
# Avoid GLIBCXX mismatch with other cuda-enabled python packages
preConfigure =
''
pkgs/development/python-modules/scalene/default.nix
+8 -2
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
hypothesis,
fetchPypi,
@@ -11,6 +12,7 @@
numpy,
psutil,
pynvml,
nvidia-ml-py,
pytestCheckHook,
pythonOlder,
rich,
@@ -37,9 +39,13 @@ buildPythonPackage rec {
cloudpickle
jinja2
psutil
pynvml
rich
];
pynvml
] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ];
pythonRemoveDeps = [
"nvidia-ml-py3"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "nvidia-ml-py" ];
__darwinAllowLocalNetworking = true;
pkgs/development/python-modules/schema-salad/default.nix
+6
View File
@@ -4,6 +4,7 @@
buildPythonPackage,
cachecontrol,
fetchFromGitHub,
fetchpatch,
importlib-resources,
mistune,
mypy,
@@ -56,6 +57,11 @@ buildPythonPackage rec {
++ cachecontrol.optional-dependencies.filecache
++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
patches = [ (fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/common-workflow-language/schema_salad/pull/840.patch";
hash = "sha256-fke75FCCn23LAMJ5bDWJpuBR6E9XIpjmzzXSbjqpxn8=";
} ) ];
nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen;
preCheck = ''
pkgs/development/rocm-modules/5/llvm/base.nix
+1 -1
View File
@@ -86,7 +86,7 @@ in stdenv.mkDerivation (finalAttrs: {
cmake
ninja
git
python3Packages.python
(python3Packages.python.withPackages (p: [ p.setuptools ]))
] ++ lib.optionals (buildDocs || buildMan) [
doxygen
sphinx
pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list
+4
View File
@@ -169,3 +169,7 @@
../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp
../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp
../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp
../libcxx/test/std/language.support/support.dynamic/hardware_inference_size.compile.pass.cpp
../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp
../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp
../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp
pkgs/development/tools/godot/3/mono/default.nix
+7 -1
View File
@@ -5,9 +5,15 @@
, mono
, dotnet-sdk
, writeText
, scons
, python311
}:
godot3.overrideAttrs (self: base: {
(godot3.override {
scons = scons.override {
python3 = python311;
};
}).overrideAttrs (self: base: {
pname = "godot3-mono";
godotBuildDescription = "mono build";
pkgs/development/tools/godot/3/mono/glue.nix
+6 -2
View File
@@ -1,6 +1,10 @@
{ godot3, mono }:
{ godot3, mono, scons, python311 }:
godot3.overrideAttrs (self: base: {
(godot3.override {
scons = scons.override {
python3 = python311;
};
}).overrideAttrs (self: base: {
pname = "godot3-mono-glue";
godotBuildDescription = "mono glue";
godotBuildPlatform = "server";
pkgs/misc/opensbi/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "opensbi";
version = "1.4";
version = "1.5";
src = fetchFromGitHub {
owner = "riscv-software-src";
repo = "opensbi";
rev = "v${version}";
hash = "sha256-T8ZeAzjM9aeTXitjE7s+m+jjGGtDo2jK1qO5EuKiVLU=";
hash = "sha256-vK14P97FcaVz4GDr/0055Z6s/k7BPKPQGZ/MQxbOWu0=";
};
postPatch = ''
pkgs/os-specific/linux/kernel/hardened/update.py
+1 -1
View File
@@ -158,7 +158,7 @@ def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]:
def parse_version(version_str: str) -> Version:
version: Version = []
for component in re.split('\.|\-', version_str):
for component in re.split(r'\.|\-', version_str):
try:
version.append(int(component))
except ValueError:
pkgs/os-specific/linux/kernel/kernels-org.json
+8 -8
View File
@@ -1,11 +1,11 @@
{
"testing": {
"version": "6.10-rc6",
"hash": "sha256:0ajhx148rrk26mhcv03g2gdy0s9hv0vp95rvwfwsjkb0iwm0nfvy"
"version": "6.10-rc7",
"hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19"
},
"6.1": {
"version": "6.1.97",
"hash": "sha256:1bs1pv9h5lwjadl4wjylrl3zd125ccxqkpb2drqjh8s56rgq82w9"
"version": "6.1.98",
"hash": "sha256:01ilkykg65590f1gndhnp3s75wscqah6f4l9l1p5a03pgh9ckkcp"
},
"5.15": {
"version": "5.15.162",
@@ -24,15 +24,15 @@
"hash": "sha256:109mk4zscm8611xs3bchnr94gasvw3vxsi6zhp3f2y132g670aq6"
},
"6.6": {
"version": "6.6.37",
"hash": "sha256:051j3ydf54bb027a6f7hb2y6r8y82p1hf4wd3x5gx546f1vnx5zk"
"version": "6.6.39",
"hash": "sha256:0svpgakk81082mhhq17r8nlbz36zavq23d71232rapq928hx90r7"
},
"6.8": {
"version": "6.8.12",
"hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr"
},
"6.9": {
"version": "6.9.8",
"hash": "sha256:109j8f69bsvk2a61ihs3r77jv05fm4aqvih8lyf6qcc8gdxjcj7h"
"version": "6.9.9",
"hash": "sha256:1f8y88rif3z5lp1bq00g66fd0xs1227qlqkxd2zs6fdjgr45pq1b"
}
}
pkgs/os-specific/linux/kernel/linux-libre.nix
+2 -2
View File
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19584";
sha256 = "1vhk4jnx8f98lkj2isrms2jm9c5qrpgayxbhawslqrprq1pmzlif";
rev = "19597";
sha256 = "0bxljx9dgz23ax2pjvx07sqks4s7al2qhn3zcjyxfqv69a0awa8w";
}
, ...
}:
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+3 -3
View File
@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.219-rt111"; # updated by ./update-rt.sh
version = "5.10.220-rt112"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0c6dhi6w8likvyyzw7wj2fqhz8nhv760kkic8bk66r1prhakzdwk";
sha256 = "16z1xqm7djm8pl15s5wvgc4pwq81gydcf00jpxfplw794kwszhvw";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0imnwj8210cjvmr90yhcc0nn80s3wlc5n2cdrnbg72lm4dny2qpn";
sha256 = "149m51kkzhx9fhqdf6k7chi38rm2iw3ld18qzh8afmq8dc1dcimq";
};
}; in [ rt-patch ] ++ kernelPatches;
pkgs/os-specific/linux/kernel/zen-kernels.nix
+16 -6
View File
@@ -31,7 +31,7 @@ let
# This is based on the following sources:
# - zen: https://gitlab.archlinux.org/archlinux/packaging/packages/linux-zen/-/blob/main/config
# - lqx: https://github.com/damentz/liquorix-package/blob/6.4/master/linux-liquorix/debian/config/kernelarch-x86/config-arch-64
# - lqx: https://github.com/damentz/liquorix-package/blob/6.8/master/linux-liquorix/debian/config/kernelarch-x86/config-arch-64
# - Liquorix features: https://liquorix.net/
# The list below is not exhaustive, so the kernels probably doesn't match
# the upstream, but should bring most of the improvements that will be
@@ -43,7 +43,6 @@ let
# FQ-Codel Packet Scheduling
NET_SCH_DEFAULT = yes;
DEFAULT_FQ_CODEL = yes;
DEFAULT_NET_SCH = freeform "fq_codel";
# Preempt (low-latency)
PREEMPT = lib.mkOverride 60 yes;
@@ -66,27 +65,41 @@ let
RCU_BOOST_DELAY = freeform "500";
RCU_NOCB_CPU = yes;
RCU_LAZY = yes;
RCU_DOUBLE_CHECK_CB_TIME = yes;
# BFQ I/O scheduler
IOSCHED_BFQ = lib.mkOverride 60 yes;
# Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
FUTEX = yes;
FUTEX_PI = yes;
# NT synchronization primitive emulation
NTSYNC = yes;
# Preemptive Full Tickless Kernel at 1000Hz
HZ = freeform "1000";
HZ_1000 = yes;
# Alternative zpool for zswap
Z3FOLD = yes;
} // lib.optionalAttrs (isLqx) {
# Google's BBRv3 TCP congestion Control
TCP_CONG_BBR = yes;
DEFAULT_BBR = yes;
DEFAULT_TCP_CONG = freeform "bbr";
# PDS Process Scheduler
SCHED_ALT = yes;
SCHED_PDS = yes;
# https://github.com/damentz/liquorix-package/commit/a7055b936c0f4edb8f6afd5263fe1d2f8a5cd877
RCU_BOOST = no;
RCU_LAZY = no;
# Swap storage is compressed with LZ4 using zswap
ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes;
ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no;
ZSWAP_ZPOOL_DEFAULT_Z3FOLD = yes;
# Fix error: unused option: XXX.
CFS_BANDWIDTH = lib.mkForce (option no);
@@ -96,9 +109,6 @@ let
SCHED_CORE = lib.mkForce (option no);
UCLAMP_TASK = lib.mkForce (option no);
UCLAMP_TASK_GROUP = lib.mkForce (option no);
# ERROR: modpost: "sched_numa_hop_mask" [drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko] undefined!
MLX5_CORE = no;
};
passthru.updateScript = [ ./update-zen.py (if isLqx then "lqx" else "zen") ];
pkgs/servers/monitoring/prometheus/default.nix
+3 -3
View File
@@ -31,10 +31,10 @@
}:
let
version = "2.53.0";
version = "2.53.1";
webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
hash = "sha256-oGhVpr47+blG7udu4Pcd+4Ndn0U+R47i69nheauDDoo=";
hash = "sha256-V13YfSEm0PMYvX13W3lahNSdDJ2oLnDr1VderLEEwyM=";
};
in
buildGoModule rec {
@@ -47,7 +47,7 @@ buildGoModule rec {
owner = "prometheus";
repo = "prometheus";
rev = "v${version}";
hash = "sha256-clI8/P6Gdl8WSK1DsXUj+M9f/h35GX961QtpyvGNxUY=";
hash = "sha256-7A3UJNA045l5oWLcTeEw+X/YNjeeNOvqdh/CudplLSM=";
};
vendorHash = "sha256-0TR0jFEY+ls8C9EJEhSl2vX5VVZqZ8jGWDUalOddUPM=";
pkgs/servers/x11/xorg/xwayland.nix
+2 -20
View File
@@ -2,7 +2,6 @@
, bash
, libepoxy
, fetchurl
, fetchpatch
, fontutil
, lib
, libdecor
@@ -50,30 +49,13 @@
stdenv.mkDerivation rec {
pname = "xwayland";
version = "24.1.0";
version = "24.1.1";
src = fetchurl {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
hash = "sha256-vvIcTxiAek7VccTi32CrY7VGa71QLszrJIW4kqt23MI=";
hash = "sha256-cSW+4LEDNYBdf1ulffqjWaeFCvGmhSTx2Xs2J0GlGDI=";
};
patches = [
# Backport fix for pkg-config generation to make CMake happy
# FIXME: remove when merged
# Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1543
(fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/8cb1c21a4240a5b6bf4aeeef51819639b4e0ad24.patch";
hash = "sha256-MZPP9QgYO4RFJ/vcjkpu7SVSo5Dh09ZdZjOwTopjdYQ=";
})
# Backport fix for segfault when linux-dmabuf device is not accessible
# FIXME: remove when merged
# Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1565
(fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/7605833315c05488eca30ed0a70a2a1430e89bbc.patch";
hash = "sha256-4/A6aOiOGouPe2v4wIYDQY9rWkuNZJwk0h4gpfrl6hI=";
})
];
postPatch = ''
substituteInPlace os/utils.c \
--replace-fail '/bin/sh' '${lib.getExe' bash "sh"}'
pkgs/tools/admin/oxidized/Gemfile
+2 -2
View File
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
gem 'oxidized', '0.29.1'
gem 'oxidized-web', '0.13.1'
gem 'oxidized', '0.30.1'
gem 'oxidized-web', '0.14.0'
# The version on rubygems is not up2date
gem 'oxidized-script', git: 'https://github.com/ytti/oxidized-script.git', ref: '988cded5d89f52e274afb545bd3e011e19d5d22d'
pkgs/tools/admin/oxidized/Gemfile.lock
+60 -48
View File
@@ -11,80 +11,92 @@ GEM
remote: https://rubygems.org/
specs:
asetus (0.4.0)
backports (3.24.1)
bcrypt_pbkdf (1.1.0)
charlock_holmes (0.7.7)
base64 (0.2.0)
bcrypt_pbkdf (1.1.1)
charlock_holmes (0.7.9)
date (3.3.4)
ed25519 (1.3.0)
emk-sinatra-url-for (0.2.1)
sinatra (>= 0.9.1.1)
ffi (1.15.5)
haml (5.2.2)
temple (>= 0.8.0)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
htmlentities (4.3.4)
json (2.6.3)
json (2.7.2)
multi_json (1.15.0)
net-ssh (7.1.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
net-ftp (0.3.7)
net-protocol
time
net-protocol (0.2.2)
timeout
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-ssh (7.2.3)
net-telnet (0.2.0)
oxidized (0.29.1)
nio4r (2.7.3)
oxidized (0.30.1)
asetus (~> 0.1)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
net-ftp (~> 0.2)
net-scp (~> 4.0)
net-ssh (~> 7.1)
net-telnet (~> 0.2)
psych (~> 3.3.2)
rugged (~> 1.6)
slop (~> 4.6)
oxidized-web (0.13.1)
oxidized-web (0.14.0)
charlock_holmes (~> 0.7.5)
emk-sinatra-url-for (~> 0.2)
haml (~> 5.0)
haml (~> 6.0)
htmlentities (~> 4.3)
json (>= 1.7.0)
json (~> 2.3)
oxidized (~> 0.26)
puma (~> 3.11.4)
rack-test (~> 0.7.0)
sass (~> 3.3)
sinatra (~> 1.4, >= 1.4.6)
sinatra-contrib (~> 1.4, >= 1.4.6)
puma (>= 3.11.4, < 6.5.0)
sinatra (>= 1.4.6, < 5.0)
sinatra-contrib (>= 1.4.6, < 5.0)
psych (3.3.4)
puma (3.11.4)
rack (1.6.13)
rack-protection (1.5.5)
rack
rack-test (0.7.0)
rack (>= 1.0, < 3)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rugged (1.6.3)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinatra-contrib (1.4.7)
backports (>= 2.0)
multi_json
rack-protection
rack-test
sinatra (~> 1.4.0)
tilt (>= 1.3, < 3)
puma (6.4.2)
nio4r (~> 2.0)
rack (3.1.7)
rack-protection (4.0.0)
base64 (>= 0.1.0)
rack (>= 3.0.0, < 4)
rack-session (2.0.0)
rack (>= 3.0.0)
ruby2_keywords (0.0.5)
rugged (1.7.2)
sinatra (4.0.0)
mustermann (~> 3.0)
rack (>= 3.0.0, < 4)
rack-protection (= 4.0.0)
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0)
sinatra-contrib (4.0.0)
multi_json (>= 0.0.2)
mustermann (~> 3.0)
rack-protection (= 4.0.0)
sinatra (= 4.0.0)
tilt (~> 2.0)
slop (4.10.1)
temple (0.10.1)
tilt (2.1.0)
temple (0.10.3)
thor (1.3.1)
tilt (2.4.0)
time (0.3.0)
date
timeout (0.4.1)
PLATFORMS
x86_64-linux
DEPENDENCIES
oxidized (= 0.29.1)
oxidized (= 0.30.1)
oxidized-script!
oxidized-web (= 0.13.1)
oxidized-web (= 0.14.0)
psych (~> 3.3.2)
BUNDLED WITH
2.3.26
2.5.9
pkgs/tools/admin/oxidized/gemset.nix
+149 -96
View File
@@ -9,35 +9,45 @@
};
version = "0.4.0";
};
backports = {
base64 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f3zcy0q88rw3clk0r7bai7sp4r253lndf0qmdgczq1ykbm219w3";
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "3.24.1";
version = "0.2.0";
};
bcrypt_pbkdf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445";
sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g";
type = "gem";
};
version = "1.1.0";
version = "1.1.1";
};
charlock_holmes = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p";
sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml";
type = "gem";
};
version = "0.7.7";
version = "0.7.9";
};
date = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp";
type = "gem";
};
version = "3.3.4";
};
ed25519 = {
groups = ["default"];
@@ -60,26 +70,16 @@
};
version = "0.2.1";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
version = "1.15.5";
};
haml = {
dependencies = ["temple" "tilt"];
dependencies = ["temple" "thor" "tilt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf";
sha256 = "15yxph91zswbnfy7szpdcfbdfqqn595ff290hm4f6fcnhryvhvlf";
type = "gem";
};
version = "5.2.2";
version = "6.3.0";
};
htmlentities = {
groups = ["default"];
@@ -96,10 +96,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
type = "gem";
};
version = "2.6.3";
version = "2.7.2";
};
multi_json = {
groups = ["default"];
@@ -111,15 +111,59 @@
};
version = "1.15.0";
};
mustermann = {
dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd";
type = "gem";
};
version = "3.0.0";
};
net-ftp = {
dependencies = ["net-protocol" "time"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vhwqx8k5xscl6j6gdf1xs1lz6fwm8k8s1n7pwhk22cxnxcfmnnh";
type = "gem";
};
version = "0.3.7";
};
net-protocol = {
dependencies = ["timeout"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa";
type = "gem";
};
version = "0.2.2";
};
net-scp = {
dependencies = ["net-ssh"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk";
type = "gem";
};
version = "4.0.0";
};
net-ssh = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";
sha256 = "0sqbq5aks9xxnldbd2hy20ypnd59zcra98ql0r7jjc26s5rgc18n";
type = "gem";
};
version = "7.1.0";
version = "7.2.3";
};
net-telnet = {
groups = ["default"];
@@ -131,16 +175,26 @@
};
version = "0.2.0";
};
oxidized = {
dependencies = ["asetus" "bcrypt_pbkdf" "ed25519" "net-ssh" "net-telnet" "rugged" "slop"];
nio4r = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ww8iv89zvklnvq9cv2lb6wyb5y73hinzm6xgd21za4204aanlps";
sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal";
type = "gem";
};
version = "0.29.1";
version = "2.7.3";
};
oxidized = {
dependencies = ["asetus" "bcrypt_pbkdf" "ed25519" "net-ftp" "net-scp" "net-ssh" "net-telnet" "psych" "rugged" "slop"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ry9rwksjb80wxd42zv5m5444n5hwhkbr4spa895jk2c1k5q1y0c";
type = "gem";
};
version = "0.30.1";
};
oxidized-script = {
dependencies = ["oxidized" "slop"];
@@ -156,15 +210,15 @@
version = "0.6.0";
};
oxidized-web = {
dependencies = ["charlock_holmes" "emk-sinatra-url-for" "haml" "htmlentities" "json" "oxidized" "puma" "rack-test" "sass" "sinatra" "sinatra-contrib"];
dependencies = ["charlock_holmes" "emk-sinatra-url-for" "haml" "htmlentities" "json" "oxidized" "puma" "sinatra" "sinatra-contrib"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07qmal83h1h5dqapgirq5yrnclbm3xhcjqkj80lla3dq18jmjhqs";
sha256 = "0mf1kxjg49fxf988sqd9cni8j5r8xsp3218370ppinsy39l50782";
type = "gem";
};
version = "0.13.1";
version = "0.14.0";
};
psych = {
groups = ["default"];
@@ -177,121 +231,89 @@
version = "3.3.4";
};
puma = {
dependencies = ["nio4r"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06qiqx1pcfwq4gi9pdrrq8r6hgh3rwl7nl51r67zpm5xmqlp0g10";
sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y";
type = "gem";
};
version = "3.11.4";
version = "6.4.2";
};
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
sha256 = "12z55b90vvr4sh93az2yfr3fg91jivsag8lcg0k360d99vdq568f";
type = "gem";
};
version = "1.6.13";
version = "3.1.7";
};
rack-protection = {
dependencies = ["base64" "rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xmvcxgm1jq92hqxm119gfk95wzl0d46nb2c2c6qqsm4ra2n3nyh";
type = "gem";
};
version = "4.0.0";
};
rack-session = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
sha256 = "10afdpmy9kh0qva96slcyc59j4gkk9av8ilh58cnj0qq7q3b416v";
type = "gem";
};
version = "1.5.5";
version = "2.0.0";
};
rack-test = {
dependencies = ["rack"];
ruby2_keywords = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0f50ljlbg38g21q242him0n12r0fz7r3rs9n6p8ppahzh7k22x11";
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
version = "0.7.0";
};
rb-fsevent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
type = "gem";
};
version = "0.11.2";
};
rb-inotify = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
type = "gem";
};
version = "0.10.1";
version = "0.0.5";
};
rugged = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in";
sha256 = "1sccng15h8h3mcjxfgvxy85lfpswbj0nhmzwwsqdffbzqgsb2jch";
type = "gem";
};
version = "1.6.3";
version = "1.7.2";
};
sass = {
dependencies = ["sass-listen"];
sinatra = {
dependencies = ["mustermann" "rack" "rack-protection" "rack-session" "tilt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0";
type = "gem";
};
version = "3.7.4";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
sha256 = "0za92lv4s7xhgkkm6xxf7ib0b3bsyj8drxgkrskgsb5g3mxnixjl";
type = "gem";
};
version = "4.0.0";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
type = "gem";
};
version = "1.4.8";
};
sinatra-contrib = {
dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"];
dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr";
sha256 = "0r9khg85m60w0i77jpnm2irh9m4k0ia4mlicapj8dr7s6ykqd9dh";
type = "gem";
};
version = "1.4.7";
version = "4.0.0";
};
slop = {
groups = ["default"];
@@ -308,19 +330,50 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jj8lny5hp8gm920k73r6xpb40j5mpiw1dcr8g5id4hxjggkw8by";
sha256 = "0fwia5hvc1xz9w7vprzjnsym3v9j5l9ggdvy70jixbvpcpz4acfz";
type = "gem";
};
version = "0.10.1";
version = "0.10.3";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
type = "gem";
};
version = "1.3.1";
};
tilt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs";
sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
type = "gem";
};
version = "2.1.0";
version = "2.4.0";
};
time = {
dependencies = ["date"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6";
type = "gem";
};
version = "0.3.0";
};
timeout = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg";
type = "gem";
};
version = "0.4.1";
};
}
pkgs/tools/compression/xdelta/default.nix
+2 -1
View File
@@ -54,7 +54,8 @@ in stdenv.mkDerivation rec {
file differences. This is similar to diff and patch, but it is targeted
for binary files and does not generate human readable output.
'';
homepage = "http://xdelta.org/";
# The dedicated homepage pointed to a gambling website
homepage = "https://github.com/jmacd/xdelta";
license = licenses.gpl2Plus;
mainProgram = "xdelta3";
platforms = platforms.unix;
pkgs/tools/misc/rockbox-utility/default.nix
+1
View File
@@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
description = "Open source firmware for digital music players";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres goibhniu ];
mainProgram = "RockboxUtility";
platforms = platforms.linux;
};
}
pkgs/tools/package-management/nix/default.nix
+26 -15
View File
@@ -1,5 +1,6 @@
{ lib
, config
, stdenv
, aws-sdk-cpp
, boehmgc
, callPackage
@@ -7,6 +8,7 @@
, fetchpatch
, fetchpatch2
, runCommand
, overrideSDK
, Security
, storeDir ? "/nix/store"
@@ -147,32 +149,32 @@ in lib.makeExtensible (self: ({
};
nix_2_18 = common {
version = "2.18.4";
hash = "sha256-tebjp83ABKrBW3d/6n/Irr1+xhtw8qIkqHZHJOoJaLk=";
version = "2.18.5";
hash = "sha256-xEcYQuJz6DjdYfS6GxIYcn8U+3Hgopne3CvqrNoGguQ=";
self_attribute_name = "nix_2_18";
};
nix_2_19 = common {
version = "2.19.5";
hash = "sha256-n4efeDi8KtLgkAKl5kBQ4svmdxfnRp8KrSZGrlFsr/E=";
version = "2.19.6";
hash = "sha256-XT5xiwOLgXf+TdyOjbJVOl992wu9mBO25WXHoyli/Tk=";
self_attribute_name = "nix_2_19";
};
nix_2_20 = common {
version = "2.20.7";
hash = "sha256-hWElUtAHYbL/LjyW0Vovz9zJLhv5zC6/tDu8uPkbQqY=";
version = "2.20.8";
hash = "sha256-M2tkMtjKi8LDdNLsKi3IvD8oY/i3rtarjMpvhybS3WY=";
self_attribute_name = "nix_2_20";
};
nix_2_21 = common {
version = "2.21.3";
hash = "sha256-oaRT9rGrYKxebZ6aiBFTx2OwcIDQthkzRdeez3EARH4=";
version = "2.21.4";
hash = "sha256-c6nVZ0pSrfhFX3eVKqayS+ioqyAGp3zG9ZPO5rkXFRQ=";
self_attribute_name = "nix_2_21";
};
nix_2_22 = common {
version = "2.22.2";
hash = "sha256-/ABtOUnfN6od/MtLxO5cJX90Ags/vOBQav6MyhKy4r4=";
version = "2.22.3";
hash = "sha256-l04csH5rTWsK7eXPWVxJBUVRPMZXllFoSkYFTq/i8WU=";
self_attribute_name = "nix_2_22";
};
@@ -190,17 +192,26 @@ in lib.makeExtensible (self: ({
];
};
git = common rec {
git = (common rec {
version = "2.24.0";
suffix = "pre20240627_${lib.substring 0 8 src.rev}";
suffix = "pre20240709_${lib.substring 0 8 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "b44909ac2244bda4c387b9a17748e8a94ada9e78";
hash = "sha256-tS8i/fyi2DO5GM103b+G7K/XwFWhWvb2VDjqpLH5Kxc=";
rev = "142e566adbce587a5ed97d1648a26352f0608ec5";
hash = "sha256-fYZGuB/4LOBoMSUNj/yRU1mWm9lhdTzXF0P+zmac0hw=";
};
self_attribute_name = "git";
};
}).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
# Fix the following error with the default x86_64-darwin SDK:
#
# error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
#
# Despite the use of the 10.13 deployment target here, the aligned
# allocation function Clang uses with this setting actually works
# all the way back to 10.6.
stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
});
latest = self.nix_2_23;
pkgs/tools/text/markdownlint-cli2/default.nix
+40 -16
View File
@@ -1,32 +1,56 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
{
lib,
stdenvNoCC,
fetchurl,
makeWrapper,
markdownlint-cli2,
nodejs,
runCommand,
zstd,
}:
buildNpmPackage rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "markdownlint-cli2";
version = "0.9.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "DavidAnson";
repo = "markdownlint-cli2";
rev = "v${version}";
hash = "sha256-qtdR7Rhz+HLZJX82OrN+twOsvFOv99e4BBDVV1UayPI=";
# upstream is not interested in including package-lock.json in the source
# https://github.com/DavidAnson/markdownlint-cli2/issues/198#issuecomment-1690529976
# see also https://github.com/DavidAnson/markdownlint-cli2/issues/186
# so use the tarball from the archlinux mirror
src = fetchurl {
url = "https://us.mirrors.cicku.me/archlinux/extra/os/x86_64/markdownlint-cli2-${finalAttrs.version}-1-any.pkg.tar.zst";
hash = "sha256-ioSVse3fS6n2wauZ0VsF6TQKy/ZsyLACQ4anNybIe+I=";
};
npmDepsHash = "sha256-Fx0lDcvzLRVSAX0apKmu1CBfnGmGQR9FQEdhHUtue/c=";
nativeBuildInputs = [
makeWrapper
zstd
];
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r lib share $out
makeWrapper "${lib.getExe nodejs}" "$out/bin/markdownlint-cli2" \
--add-flags "$out/lib/node_modules/markdownlint-cli2/markdownlint-cli2.js"
runHook postInstall
'';
dontNpmBuild = true;
passthru.tests = {
smoke = runCommand "${finalAttrs.pname}-test" { nativeBuildInputs = [ markdownlint-cli2 ]; } ''
markdownlint-cli2 ${markdownlint-cli2}/share/doc/markdownlint-cli2/README.md > $out
'';
};
meta = {
changelog = "https://github.com/DavidAnson/markdownlint-cli2/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/DavidAnson/markdownlint-cli2/blob/v${finalAttrs.version}/CHANGELOG.md";
description = "Fast, flexible, configuration-based command-line interface for linting Markdown/CommonMark files with the markdownlint library";
homepage = "https://github.com/DavidAnson/markdownlint-cli2";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
};
}
})
pkgs/top-level/aliases.nix
+1 -4
View File
@@ -919,10 +919,7 @@ mapAliases ({
mutt-with-sidebar = mutt; # Added 2022-09-17
mysql-client = hiPrio mariadb.client;
mysql = mariadb; # moved from top-level 2021-03-14
# floating point textures patents are expired,
# so package reduced to alias
mesa_drivers = mesa.drivers;
mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' or 'pkgs.mesa.drivers' depending on target use case."; # Converted to throw 2024-07-11
### N ###
pkgs/top-level/all-packages.nix
+7 -4
View File
@@ -20923,7 +20923,10 @@ with pkgs;
autoconf = buildPackages.autoconf269;
};
gpac = callPackage ../applications/video/gpac { };
gpac = callPackage ../applications/video/gpac {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) Carbon;
};
gpgme = callPackage ../development/libraries/gpgme { };
@@ -30468,7 +30471,7 @@ with pkgs;
gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {
unwrapped = callPackage ../applications/radio/gnuradio {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
python = python3;
python = python311;
};
};
gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
@@ -30501,7 +30504,7 @@ with pkgs;
gnuradio3_9 = callPackage ../applications/radio/gnuradio/wrapper.nix {
unwrapped = callPackage ../applications/radio/gnuradio/3.9.nix {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
python = python3;
python = python311;
};
};
gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio3_9.pkgs;
@@ -30534,7 +30537,7 @@ with pkgs;
gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix {
unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({
inherit (darwin.apple_sdk.frameworks) CoreAudio;
python = python3;
python = python311;
} // lib.optionalAttrs stdenv.isLinux {
stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv;
});
pkgs/top-level/python-packages.nix
-1
View File
@@ -9290,7 +9290,6 @@ self: super: with self; {
openai-triton = callPackage ../development/python-modules/openai-triton {
llvm = pkgs.openai-triton-llvm;
cudaPackages = pkgs.cudaPackages_12_1;
};
openai-triton-cuda = self.openai-triton.override {