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:
nixpkgs-ci[bot]
2025-03-07 12:05:58 +00:00
committed by GitHub
parent 7f555db5e5 ef0f3cb053
commit 8cb1861bb5
28 changed files with 160 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/vscode/extensions/default.nix
+2
View File
@@ -2810,6 +2810,8 @@ let
};
};
johnpapa.winteriscoming = callPackage ./johnpapa.winteriscoming { };
jgclark.vscode-todo-highlight = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-todo-highlight";
pkgs/applications/editors/vscode/extensions/johnpapa.winteriscoming/default.nix
+17
View File
@@ -0,0 +1,17 @@
{ lib, vscode-utils }:
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "winteriscoming";
publisher = "johnpapa";
version = "1.4.4";
hash = "sha256-47zCB7VDj+gYXUeblbNsWnGMJt4U4UMyqU1NYTmz2Jc=";
};
meta = {
description = "Preferred dark/light themes by John Papa";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=johnpapa.winteriscoming";
homepage = "https://github.com/johnpapa/vscode-winteriscoming";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.therobot2105 ];
};
}
pkgs/by-name/aa/aapt/package.nix
+4
View File
@@ -52,6 +52,10 @@ stdenvNoCC.mkDerivation rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ linsui ];
platforms = lib.platforms.unix;
badPlatforms = [
# The linux executable only supports x86_64
"aarch64-linux"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}
pkgs/by-name/ca/cartridges/package.nix
+2 -2
View File
@@ -19,14 +19,14 @@
python3Packages.buildPythonApplication rec {
pname = "cartridges";
version = "2.11";
version = "2.11.1";
pyproject = false;
src = fetchFromGitHub {
owner = "kra-mo";
repo = "cartridges";
tag = "v${version}";
hash = "sha256-6v/R83eYq993epcAkcf9jyNakKuGmSsGXrQYQMro6nI=";
hash = "sha256-2w7qHTEaRnVDRa0e39Dg9H7pjhgM2UATe8pGYncYILE=";
};
strictDeps = true;
pkgs/by-name/ca/castero/package.nix
+6
View File
@@ -17,6 +17,7 @@ python3.pkgs.buildPythonApplication rec {
};
build-system = with python3.pkgs; [
setuptools
wheel
];
@@ -48,6 +49,11 @@ python3.pkgs.buildPythonApplication rec {
"test_datafile_download"
"test_display_get_input_str"
"test_display_get_y_n"
# > assert mymenu.metadata == episode1.metadata
# E AssertionError: assert '' == <MagicMock name='mock.metadata' id='140737279137104'>
# E + where '' = <castero.menus.episodemenu.EpisodeMenu object at 0x7ffff3acd0d0>.metadata
# E + and <MagicMock name='mock.metadata' id='140737279137104'> = episode1.metadata
"test_menu_episode_metadata"
];
pythonImportsCheck = [
pkgs/by-name/gg/gg/package.nix
-43
View File
@@ -1,43 +0,0 @@
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
}:
buildGoModule rec {
pname = "gg";
version = "0.2.19";
src = fetchFromGitHub {
owner = "mzz2017";
repo = "gg";
rev = "v${version}";
hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU=";
};
vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14=";
ldflags = [
"-s"
"-w"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd gg \
--bash completion/bash/gg \
--fish completion/fish/gg.fish \
--zsh completion/zsh/_gg
'';
meta = with lib; {
homepage = "https://github.com/mzz2017/gg";
changelog = "https://github.com/mzz2017/gg/releases/tag/${src.rev}";
description = "Command-line tool for one-click proxy in your research and development";
license = licenses.agpl3Only;
mainProgram = "gg";
maintainers = with maintainers; [ oluceps ];
platforms = platforms.linux;
};
}
pkgs/by-name/gn/gnome-commander/package.nix
+5 -16
View File
@@ -7,10 +7,7 @@
pkg-config,
flex,
itstool,
rustPlatform,
rustc,
cargo,
wrapGAppsHook4,
wrapGAppsHook3,
desktop-file-utils,
exiv2,
libgsf,
@@ -22,14 +19,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-commander";
version = "1.18.1-unstable-2024-10-18";
version = "1.18.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gnome-commander";
rev = "28dadb1ef9342bb1a5f9a65b1a5bf3bd80e3d30a";
hash = "sha256-DxsZJht+PD3vY5vc1vzpRD8FHBPKcjK4qfke5nhvHS0=";
tag = finalAttrs.version;
hash = "sha256-dNZDlpvpN5hh/3YccZPJDEFkBLv9I8YOdFT/COp7+Uw=";
};
# hard-coded schema paths
@@ -40,21 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
'/share/gsettings-schemas/${finalAttrs.finalPackage.name}/glib-2.0/schemas'
'';
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-dOd/4n8G/zEsF0ClqhI2QBLosEz3uyzC9q5sHDVWAx4=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
flex
itstool
rustPlatform.cargoSetupHook
rustc
cargo
wrapGAppsHook4
wrapGAppsHook3
desktop-file-utils
];
pkgs/by-name/go/go-graft/package.nix
+28 -6
View File
@@ -1,4 +1,9 @@
{ lib, fetchFromGitHub, buildGoModule }:
{
lib,
fetchFromGitHub,
buildGoModule,
installShellFiles,
}:
buildGoModule rec {
pname = "go-graft";
@@ -8,20 +13,37 @@ buildGoModule rec {
owner = "mzz2017";
repo = "gg";
rev = "v${version}";
sha256 = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU=";
hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU=";
};
env.CGO_ENABLED = 0;
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" ];
ldflags = [
"-X github.com/mzz2017/gg/cmd.Version=${version}"
"-s"
"-w"
];
vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14=";
subPackages = [ "." ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd gg \
--bash completion/bash/gg \
--fish completion/fish/gg.fish \
--zsh completion/zsh/_gg
'';
meta = with lib; {
description = "Command-line tool for one-click proxy in your research and development without installing v2ray or anything else";
changelog = "https://github.com/mzz2017/gg/releases/tag/${src.rev}";
homepage = "https://github.com/mzz2017/gg";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ xyenon ];
license = licenses.agpl3Only;
maintainers = with maintainers; [
xyenon
oluceps
];
mainProgram = "gg";
platforms = platforms.linux;
};
pkgs/by-name/ke/kermit/package.nix
+2
View File
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
make -f makefile install
'';
env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int";
meta = with lib; {
homepage = "https://www.kermitproject.org/ck90.html";
description = "Portable Scriptable Network and Serial Communication Software";
pkgs/by-name/mo/mold/package.nix
+2 -2
View File
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "mold";
version = "2.36.0";
version = "2.37.0";
src = fetchFromGitHub {
owner = "rui314";
repo = "mold";
rev = "v${version}";
hash = "sha256-lJEQG2JPOwWMnYaOYBisusRNYKPLHtxtVtaRPhNl+fQ=";
hash = "sha256-Be5czR6ODN4NnJ0f3NYP2shLbawJHU/EU2aHqTBRKzE=";
};
nativeBuildInputs = [
pkgs/by-name/pr/protoc-gen-connect-es/package.nix
-39
View File
@@ -1,39 +0,0 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
npm-lockfile-fix,
}:
buildNpmPackage rec {
pname = "protoc-gen-connect-es";
version = "1.6.1";
src = fetchFromGitHub {
owner = "connectrpc";
repo = "connect-es";
tag = "v${version}";
hash = "sha256-cB1OTolnwHOqeXrj8wL5FbFnjok6s03z1jC58ABTW3o=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-VkvWHKERJwG7MVZ5Pb7ufRCBBWkcoMCoabtMETcPvrU=";
npmWorkspace = "packages/protoc-gen-connect-es";
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Protobuf plugin for generating Connect-ecompatiblenabled ECMAScript code";
homepage = "https://github.com/connectrpc/connect-es";
changelog = "https://github.com/connectrpc/connect-es/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [
felschr
jtszalay
];
};
}
pkgs/by-name/pr/protoc-gen-connect-es/update.sh
-30
View File
@@ -1,30 +0,0 @@
#! /usr/bin/env -S nix shell nixpkgs#gnugrep nixpkgs#gnused nixpkgs#coreutils nixpkgs#curl nixpkgs#wget nixpkgs#jq nixpkgs#nix-update nixpkgs#prefetch-npm-deps nixpkgs#npm-lockfile-fix nixpkgs#nodejs --command bash
set -euo pipefail
version="$(
curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/connectrpc/connect-es/releases" |
jq -r 'map(select(.prerelease == false)) | .[0].tag_name' |
grep -oP "^v\K.*"
)"
url="https://raw.githubusercontent.com/connectrpc/connect-es/v$version/"
if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
echo "Already up to date!"
exit 0
fi
tmp="$(mktemp -d)"
trap 'rm -rf -- "$tmp"' EXIT
pushd -- "$tmp"
wget "$url/package-lock.json"
npm-lockfile-fix package-lock.json
npm_hash=$(prefetch-npm-deps package-lock.json)
popd
pushd "$(dirname "${BASH_SOURCE[0]}")"
sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix
popd
nix-update protoc-gen-connect-es --version "$version"
pkgs/by-name/ra/rabbit/package.nix
+4
View File
@@ -18,6 +18,10 @@ python3.pkgs.buildPythonApplication rec {
pythonRelaxDeps = [
"numpy"
"scikit-learn"
"scipy"
"tqdm"
"urllib3"
];
build-system = with python3.pkgs; [
pkgs/by-name/sd/SDL2_mixer_2_0/package.nix
-4
View File
@@ -1,9 +1,7 @@
# SDL2_mixer_2_0 pinned for lzwolf
{
SDL2_mixer,
fetchFromGitHub,
fetchpatch,
lzwolf,
timidity,
}:
@@ -34,8 +32,6 @@ let
substituteInPlace timidity/options.h \
--replace "/usr/share/timidity" "${timidity}/share/timidity"
'';
passthru.tests.lzwolf = lzwolf;
};
in
SDL2_mixer.overrideAttrs (_: attrset)
pkgs/by-name/sw/swayosd/package.nix
+9 -7
View File
@@ -3,11 +3,12 @@
rustPlatform,
fetchFromGitHub,
pkg-config,
wrapGAppsHook3,
wrapGAppsHook4,
brightnessctl,
cargo,
coreutils,
gtk-layer-shell,
dbus,
gtk4-layer-shell,
libevdev,
libinput,
libpulseaudio,
@@ -20,22 +21,22 @@
}:
stdenv.mkDerivation rec {
pname = "swayosd";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "ErikReider";
repo = "SwayOSD";
rev = "v${version}";
hash = "sha256-GyvRWEzTxQxTAk+xCLFsHdd1SttBliOgJ6eZqAxQMME=";
hash = "sha256-V3V18BoBRJU8mtvwWXvdYPbKBDIHdu5LzVSkDkGJjFU=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-oeLhJwlOITp8YHJdZQY7oo8Z31WUT4Y70dHd3tDDsk8=";
hash = "sha256-b5Ei6k9p/KiyiSSl5zxDXrTgGAq24O5ll0BvyJ/41F8=";
};
nativeBuildInputs = [
wrapGAppsHook3
wrapGAppsHook4
pkg-config
meson
rustc
@@ -45,10 +46,11 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk-layer-shell
gtk4-layer-shell
libevdev
libinput
libpulseaudio
dbus
udev
sassc
];
pkgs/by-name/vi/vimix-cursor-theme/package.nix
-34
View File
@@ -1,34 +0,0 @@
{
stdenvNoCC,
fetchFromGitHub,
lib,
}:
stdenvNoCC.mkDerivation rec {
pname = "vimix-cursor-theme";
version = "2020-02-24";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "Vimix-cursors";
rev = version;
hash = "sha256-TfcDer85+UOtDMJVZJQr81dDy4ekjYgEvH1RE1IHMi4=";
};
installPhase = ''
sed -i 's/Vimix Cursors$/Vimix-Cursors/g' dist{,-white}/index.theme
install -dm 755 $out/share/icons/Vimix-Cursors{,-White}
cp -dr --no-preserve='ownership' dist/* $out/share/icons/Vimix-Cursors
cp -dr --no-preserve='ownership' dist-white/* $out/share/icons/Vimix-Cursors-White
'';
meta = with lib; {
description = "X-cursor theme inspired by Materia design and based on capitaine-cursors";
homepage = "https://github.com/vinceliuice/Vimix-cursors";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ redxtech ];
};
}
pkgs/by-name/ze/zed-editor/package.nix
+13 -8
View File
@@ -27,7 +27,6 @@
gitUpdater,
cargo-about,
versionCheckHook,
zed-editor,
buildFHSEnv,
cargo-bundle,
git,
@@ -59,6 +58,7 @@ let
# extension tooling without significant pain.
fhs =
{
zed-editor,
additionalPkgs ? pkgs: [ ],
}:
buildFHSEnv {
@@ -98,7 +98,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zed-editor";
version = "0.176.2";
version = "0.176.3";
outputs =
[ "out" ]
@@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
hash = "sha256-uTq9/skBMz8n2NjGBQKOIOMp/rTDL+azEUzV4jTUJvE=";
hash = "sha256-5bn70R5phHZmAf/71IK8o2laHcCo92cCiaKQ7xo0Uag=";
};
patches = [
@@ -136,7 +136,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-b4YTVrz2nOwQnVU42E+LD1YjsUAWN7+fCr2z8IVwH6o=";
cargoHash = "sha256-IaAY1u5xLomvUtb4FjE4uE0w01rMmyR/DH0QD9cOK5Y=";
nativeBuildInputs =
[
@@ -309,17 +309,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
rev-prefix = "v";
ignoredVersions = "(*-pre|0.999999.0|0.9999-temporary)";
};
fhs = fhs { };
fhsWithPackages = f: fhs { additionalPkgs = f; };
fhs = fhs { zed-editor = finalAttrs.finalPackage; };
fhsWithPackages =
f:
fhs {
zed-editor = finalAttrs.finalPackage;
additionalPkgs = f;
};
tests =
{
remoteServerVersion = testers.testVersion {
package = zed-editor.remote_server;
package = finalAttrs.finalPackage.remote_server;
command = "zed-remote-server-stable-${finalAttrs.version} version";
};
}
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
withGles = zed-editor.override { withGLES = true; };
withGles = finalAttrs.finalPackage.override { withGLES = true; };
};
};
pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+2 -2
View File
@@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "tsujan";
repo = "Kvantum";
rev = "V${finalAttrs.version}";
hash = "sha256-x2XsJ26y9y6IF9aY0fmAcvO4zmwLjvE2Lfvzw+GqchM=";
hash = "sha256-49QnPwGQo4gOxO7EUJnn0JoQl6LgrEOW3cks3IT3fnU=";
};
nativeBuildInputs = [
pkgs/development/python-modules/anybadge/default.nix
+19 -8
View File
@@ -2,34 +2,45 @@
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
packaging,
pytestCheckHook,
pythonOlder,
requests,
sh,
}:
buildPythonPackage rec {
pname = "anybadge";
version = "1.16.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jongracecox";
repo = pname;
repo = "anybadge";
tag = "v${version}";
hash = "sha256-9qGmiIGzVdWHMyurMqTqEz+NKYlc/5zt6HPsssCH4Pk=";
};
# setup.py reads its version from the TRAVIS_TAG environment variable
TRAVIS_TAG = "v${version}";
postPatch = ''
substituteInPlace setup.py \
--replace-fail '=get_version(),' "='$version',"
'';
propagatedBuildInputs = [ packaging ];
build-system = [
setuptools
];
dependencies = [
packaging
];
nativeCheckInputs = [
pytestCheckHook
requests
sh
];
disabledTests = [
@@ -44,11 +55,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "anybadge" ];
meta = with lib; {
meta = {
description = "Python tool for generating badges for your projects";
homepage = "https://github.com/jongracecox/anybadge";
changelog = "https://github.com/jongracecox/anybadge/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ fabiangd ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fabiangd ];
};
}
pkgs/development/python-modules/datafusion/default.nix
+2 -1
View File
@@ -69,7 +69,8 @@ buildPythonPackage rec {
dependencies = [
pyarrow
] ++ lib.optionals (pythonOlder "3.13") [ typing-extensions ];
typing-extensions
];
nativeCheckInputs = [
pytestCheckHook
pkgs/development/python-modules/mrsqm/default.nix
+12 -4
View File
@@ -11,11 +11,12 @@
pip,
setuptools,
pytestCheckHook,
nix-update-script,
}:
buildPythonPackage rec {
pname = "mrsqm";
version = "4";
version = "0.0.7";
pyproject = true;
build-system = [
@@ -27,8 +28,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "mlgig";
repo = "mrsqm";
tag = "r${version}";
hash = "sha256-59f18zItV3K6tXcg1v1q2Z8HYrQB8T0ntaaqjxeAEbM=";
tag = "v.${version}";
hash = "sha256-5K6vCU0HExnmYNThZNDCbEtII9bUGauxDtKkJXe/85Q=";
};
buildInputs = [ fftw ];
@@ -44,7 +45,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace-fail "'pytest-runner'" ""
--replace-fail "setup_requires=['pytest-runner']," ""
substituteInPlace pyproject.toml \
--replace-fail "numpy==" "numpy>="
'';
@@ -63,6 +64,13 @@ buildPythonPackage rec {
pythonImportsCheck = [ "mrsqm" ];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"v\\.(.*)"
];
};
meta = {
description = "MrSQM (Multiple Representations Sequence Miner) is a time series classifier";
homepage = "https://pypi.org/project/mrsqm";
pkgs/development/python-modules/sopel/default.nix
+4 -1
View File
@@ -52,7 +52,10 @@ buildPythonPackage rec {
pythonRemoveDeps = [ "sopel-help" ];
pythonRelaxDeps = [ "sqlalchemy" ];
pythonRelaxDeps = [
"sqlalchemy"
"xmltodict"
];
nativeCheckInputs = [ pytestCheckHook ];
pkgs/development/python-modules/trimesh/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "trimesh";
version = "4.6.3";
version = "4.6.4";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mikedh";
repo = "trimesh";
tag = version;
hash = "sha256-QKV0qb36BfJWbmbqTXzPFY2X6SD+B3FxWSoDltDP8fM=";
hash = "sha256-kkIGAeWFrgOIbvBnZFRQue7Fh7REKF/CHgJLBEZliLM=";
};
build-system = [ setuptools ];
pkgs/development/tools/electron/binary/info.json
+7 -7
View File
@@ -1,14 +1,14 @@
{
"32": {
"hashes": {
"aarch64-darwin": "f644ac51590a5d2e16318aca9a2ad70f9b5c45cc2edf2524b33d15dd0add4193",
"aarch64-linux": "5223d8bb21aac0a55dd09587773d93b0ca4c8c4161ac56158d93199973c8200c",
"armv7l-linux": "153a37e43175064539c63550fee2104fc21b95279daaf8fc38dd617dbfcd2c52",
"headers": "1sdvj3a05yrvy3b8bgzn8b2diz2ivlh4jsvhcffid0wbb17in2xj",
"x86_64-darwin": "e85b8ca35d0710087c2915f5dab07828733b2a1aaad04ae4907f0754346a09c6",
"x86_64-linux": "6afd83962ecbfbad19fe06d101ae00ee0662f4612c70620deb61cf6fac5b8118"
"aarch64-darwin": "67e5f8ce2c395b6b5a4c896ee1f2558b0003d0a54a7f4aef3b7760409ffc5825",
"aarch64-linux": "6b18f435855284852be2b2c1b49e58df380a56784d78b358a13ea77bbace4a8a",
"armv7l-linux": "a067329d55cc6648e9f783fd8b01b93da45ac21892b8096d758b30a87505c1a7",
"headers": "0pb06wlx5zz0asrh05c90q0np14c4swkvhzrcqmcyfz7ihczqh5a",
"x86_64-darwin": "0499216feffc2ba56438d8c4ac89cf40117baee6335099f5b12457d339f465a6",
"x86_64-linux": "0e1f1540492e48e3b8805f87c5096c3b99995c4c1b581ee57e9c836538bae813"
},
"version": "32.3.2"
"version": "32.3.3"
},
"33": {
"hashes": {
pkgs/development/tools/electron/chromedriver/info.json
+7 -7
View File
@@ -1,14 +1,14 @@
{
"32": {
"hashes": {
"aarch64-darwin": "50ffb73f7ac2705dc1500977dfe391f21895eefdb1eac642786ff9e3904f667e",
"aarch64-linux": "780c79bd0f96498c8934262c56b105c53ced1fe7a6b442d1c32bcf2737bc8782",
"armv7l-linux": "11aefc9f15b62c7102824927aa34ce07c479de9102212d00e96ff2f5ac268d89",
"headers": "1sdvj3a05yrvy3b8bgzn8b2diz2ivlh4jsvhcffid0wbb17in2xj",
"x86_64-darwin": "305ed9ef27305e8ee7a851e6ca169de360ee607497b5577174c67cfe4836f9ad",
"x86_64-linux": "27d0c689b9a8564220adae3aea2a6f42411c986795f779a729fe90aed93fee61"
"aarch64-darwin": "a5fd8e33f01833f567655900e9685ca7141be4a83ed05bbcb2f5b4e6af1c7c91",
"aarch64-linux": "2535230e99cf356285c19af32586940e3416c22546bea0b38d71e6dd2579fa8f",
"armv7l-linux": "bda58c490006c5df0e5a87038e38943ec2e8e222496bfb1ac590f4732e5ffcf6",
"headers": "0pb06wlx5zz0asrh05c90q0np14c4swkvhzrcqmcyfz7ihczqh5a",
"x86_64-darwin": "9fa0bb73f1c9d1c011f35c664beb3cdd06def063d4a72a581663776e5808579b",
"x86_64-linux": "adfb974ccb29edc2365b244e3c4d06dae6a0bd4f5cf280ff62271959a8aad10e"
},
"version": "32.3.2"
"version": "32.3.3"
},
"33": {
"hashes": {
pkgs/games/lzwolf/default.nix
-92
View File
@@ -1,92 +0,0 @@
{
stdenv,
lib,
fetchFromBitbucket,
fetchpatch,
p7zip,
cmake,
SDL2,
bzip2,
zlib,
libjpeg,
libsndfile,
mpg123,
pkg-config,
SDL2_net,
SDL2_mixer,
}:
stdenv.mkDerivation rec {
pname = "lzwolf";
# Fix-Me: Remember to remove SDL2_mixer pin (at top-level) on next lzwolf upgrade.
version = "unstable-2022-12-26";
src = fetchFromBitbucket {
owner = "linuxwolf6";
repo = "lzwolf";
rev = "a24190604296e16941c601b57afe4350462fc659";
hash = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ=";
};
patches = [
# Pull fix pending upstream inclusion for `gcc-13` support:
# https://bitbucket.org/linuxwolf6/lzwolf/pull-requests/5
(fetchpatch {
name = "gcc-13.patch";
url = "https://bitbucket.org/soturi/lzwolf/commits/41f212026dff4f089d1c0921cb49ab1a2b81e0d6/raw";
hash = "sha256-EgSdDaZovD7DyZ0BkuX8ZdsrX7J7v8/D6y5P1NWGJew=";
})
# Fixes build with gcc >= 14. Picked patch from the original ecwolf repo.
(fetchpatch {
name = "tmemory.h-const-correctness.patch";
url = "https://bitbucket.org/ecwolf/ecwolf/commits/400aaf96a36a14ab8eab18a670ba6439046f3bb0/raw";
hash = "sha256-2YwHEctBPyprs0DVsazimGEgmiCba24zh2dFfw9tOnU=";
})
];
postPatch = ''
# SDL2_net-2.2.0 changed CMake component name slightly.
substituteInPlace src/CMakeLists.txt \
--replace 'SDL2::SDL2_net' 'SDL2_net::SDL2_net'
'';
nativeBuildInputs = [
p7zip
pkg-config
cmake
];
buildInputs = [
SDL2
bzip2
zlib
libjpeg
SDL2_mixer
SDL2_net
libsndfile
mpg123
];
cmakeFlags = [
"-DGPL=ON"
];
doCheck = true;
installPhase = ''
install -Dm755 lzwolf "$out/lib/lzwolf/lzwolf"
for i in *.pk3; do
install -Dm644 "$i" "$out/lib/lzwolf/$i"
done
mkdir -p $out/bin
ln -s $out/lib/lzwolf/lzwolf $out/bin/lzwolf
'';
meta = with lib; {
homepage = "https://bitbucket.org/linuxwolf6/lzwolf";
description = "Enhanced fork of ECWolf, a Wolfenstein 3D source port";
mainProgram = "lzwolf";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
};
}
pkgs/top-level/aliases.nix
+4 -1
View File
@@ -529,6 +529,7 @@ mapAliases {
gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
gg = go-graft; # Added 2025-03-07
ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28
@@ -907,7 +908,7 @@ mapAliases {
lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01
lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01
lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17
lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02
### M ###
ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
@@ -1236,6 +1237,7 @@ mapAliases {
protobuf3_24 = protobuf_24;
protobuf3_23 = protobuf_23;
protobuf3_21 = protobuf_21;
protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18
protonup = protonup-ng; # Added 2022-11-06
protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12
proxmark3-rrg = proxmark3; # Added 2023-07-25
@@ -1567,6 +1569,7 @@ mapAliases {
vim_configurable = vim-full; # Added 2022-12-04
vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14
libviperfx = throw "'libviperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
vimix-cursor-theme = throw "'vimix-cursor-theme' has been superseded by 'vimix-cursors'"; # Added 2025-03-04
viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
pkgs/top-level/all-packages.nix
+7 -3
View File
@@ -4133,8 +4133,6 @@ with pkgs;
xz = callPackage ../tools/compression/xz { };
lzwolf = callPackage ../games/lzwolf { SDL2_mixer = SDL2_mixer_2_0; };
madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang;
mailnag = callPackage ../applications/networking/mailreaders/mailnag {
@@ -8504,7 +8502,11 @@ with pkgs;
inherit (callPackages ../development/libraries/c-blosc { })
c-blosc c-blosc2;
cachix = lib.getBin haskellPackages.cachix;
cachix = (lib.getBin haskellPackages.cachix).overrideAttrs (old: {
meta = (old.meta or {}) // {
mainProgram = old.meta.mainProgram or "cachix";
};
});
cubeb = callPackage ../development/libraries/audio/cubeb {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreServices;
@@ -15752,6 +15754,8 @@ with pkgs;
autoconf = buildPackages.autoconf269;
};
zed-editor-fhs = zed-editor.fhs;
zgv = callPackage ../applications/graphics/zgv {
# Enable the below line for terminal display. Note
# that it requires sixel graphics compatible terminals like mlterm