chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-03-21 18:04:59 +00:00
committed by GitHub
parent d723427220 b9a69c9b57
commit f02955ed47
87 changed files with 643 additions and 3183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/check-maintainers-sorted.yml vendored
View File

@@ -20,7 +20,7 @@ jobs:
lib
maintainers
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true

2
.github/workflows/check-nix-format.yml vendored
View File

@@ -44,7 +44,7 @@ jobs:
rev=$(jq -r .rev ci/pinned-nixpkgs.json)
echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true
nix_path: nixpkgs=${{ env.url }}

2
.github/workflows/check-nixf-tidy.yml vendored
View File

@@ -34,7 +34,7 @@ jobs:
rev=$(jq -r .rev ci/pinned-nixpkgs.json)
echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true
nix_path: nixpkgs=${{ env.url }}

2
.github/workflows/check-shell.yml vendored
View File

@@ -27,7 +27,7 @@ jobs:
with:
ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
- name: Build shell
run: nix-build shell.nix

4
.github/workflows/codeowners-v2.yml vendored
View File

@@ -45,7 +45,7 @@ jobs:
needs: get-merge-commit
if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha
steps:
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
with:
@@ -90,7 +90,7 @@ jobs:
runs-on: ubuntu-24.04
if: github.repository_owner == 'NixOS'
steps:
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
# Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head.
# This is intentional, because we need to request the review of owners as declared in the base branch.

2
.github/workflows/editorconfig-v2.yml vendored
View File

@@ -32,7 +32,7 @@ jobs:
with:
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
# nixpkgs commit is pinned so that it doesn't break
# editorconfig-checker 2.4.0

2
.github/workflows/eval-lib-tests.yml vendored
View File

@@ -22,7 +22,7 @@ jobs:
with:
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true

10
.github/workflows/eval.yml vendored
View File

@@ -43,7 +43,7 @@ jobs:
echo "targetSha=$targetSha" >> "$GITHUB_OUTPUT"
- name: Install Nix
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true
@@ -71,7 +71,7 @@ jobs:
path: nixpkgs
- name: Install Nix
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true
@@ -108,7 +108,7 @@ jobs:
path: nixpkgs
- name: Install Nix
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true
@@ -149,7 +149,7 @@ jobs:
path: nixpkgs
- name: Install Nix
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true
@@ -254,7 +254,7 @@ jobs:
path: comparison
- name: Install Nix
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
# Important: This workflow job runs with extra permissions,
# so we need to make sure to not run untrusted code from PRs

2
.github/workflows/manual-nixos-v2.yml vendored
View File

@@ -25,7 +25,7 @@ jobs:
with:
ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true

2
.github/workflows/manual-nixpkgs-v2.yml vendored
View File

@@ -20,7 +20,7 @@ jobs:
with:
ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true

2
.github/workflows/nix-parse-v2.yml vendored
View File

@@ -32,7 +32,7 @@ jobs:
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }}
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
with:
extra_nix_config: sandbox = true
nix_path: nixpkgs=channel:nixpkgs-unstable

2
.github/workflows/nixpkgs-vet.yml vendored
View File

@@ -43,7 +43,7 @@ jobs:
git worktree add "$target" "$(git rev-parse HEAD^1)"
echo "target=$target" >> "$GITHUB_ENV"
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
- name: Fetching the pinned tool
# Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh

5
ci/OWNERS
View File

@@ -403,8 +403,9 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange
/pkgs/development/ocaml-modules @ulrikstrid
# ZFS
/nixos/tests/zfs.nix @adamcstephens @amarshall
/pkgs/os-specific/linux/zfs @adamcstephens @amarshall
/nixos/modules/tasks/filesystems/zfs.nix @adamcstephens @amarshall
/nixos/tests/zfs.nix @adamcstephens @amarshall
/pkgs/os-specific/linux/zfs @adamcstephens @amarshall
# Zig
/pkgs/development/compilers/zig @figsoda @RossComputerGuy

10
ci/eval/compare/default.nix
View File

@@ -71,7 +71,15 @@ let
getLabels
;
getAttrs = dir: builtins.fromJSON (builtins.readFile "${dir}/outpaths.json");
getAttrs =
dir:
let
raw = builtins.readFile "${dir}/outpaths.json";
# The file contains Nix paths; we need to ignore them for evaluation purposes,
# else there will be a "is not allowed to refer to a store path" error.
data = builtins.unsafeDiscardStringContext raw;
in
builtins.fromJSON data;
beforeAttrs = getAttrs beforeResultDir;
afterAttrs = getAttrs afterResultDir;

12
nixos/modules/virtualisation/build-vm.nix
View File

@@ -58,6 +58,18 @@ in
vmWithBootLoader = lib.mkDefault config.virtualisation.vmVariantWithBootLoader.system.build.vm;
};
virtualisation.vmVariant = {
options = {
virtualisation.vmVariant = lib.mkOption {
apply = _: throw "virtualisation.vmVariant*.virtualisation.vmVariant is not supported";
};
virtualisation.vmVariantWithBootLoader = lib.mkOption {
apply =
_: throw "virtualisation.vmVariant*.virtualisation.vmVariantWithBootloader is not supported";
};
};
};
};
# uses extendModules

1
nixos/modules/virtualisation/incus.nix
View File

@@ -306,6 +306,7 @@ in
};
boot.kernelModules = [
"br_netfilter"
"veth"
"xt_comment"
"xt_CHECKSUM"

18
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View File

@@ -1061,6 +1061,13 @@ let
# missing optional dependencies
ekg = addPackageRequires super.ekg [ self.denote ];
elfeed = super.elfeed.overrideAttrs (attrs: {
postPatch = attrs.postPatch or "" + ''
substituteInPlace elfeed-curl.el \
--replace-fail 'elfeed-curl-program-name "curl"' 'elfeed-curl-program-name "${lib.getExe pkgs.curl}"'
'';
});
elisp-sandbox = ignoreCompilationError super.elisp-sandbox; # elisp error
elnode = ignoreCompilationError super.elnode; # elisp error
@@ -1093,7 +1100,7 @@ let
enotify = ignoreCompilationError super.enotify; # elisp error
# https://github.com/leathekd/ercn/issues/6
ercn = addPackageRequires super.ercn [ self.dash ];
ercn = addPackageRequiresIfOlder super.ercn [ self.dash ] "20250317.2338";
# missing optional dependencies
eval-in-repl = addPackageRequires super.eval-in-repl (
@@ -1295,6 +1302,15 @@ let
# https://github.com/fred-o/jekyll-modes/issues/6
jekyll-modes = addPackageRequires super.jekyll-modes [ self.poly-markdown ];
jq-mode = super.jq-mode.overrideAttrs (attrs: {
postPatch = attrs.postPatch or "" + ''
substituteInPlace jq-mode.el \
--replace-fail 'jq-interactive-command "jq"' 'jq-interactive-command "${lib.getExe pkgs.jq}"'
substituteInPlace ob-jq.el \
--replace-fail 'org-babel-jq-command "jq"' 'org-babel-jq-command "${lib.getExe pkgs.jq}"'
'';
});
jss = ignoreCompilationError super.jss; # elisp error
# missing optional dependencies: vterm or eat

18
pkgs/applications/networking/browsers/chromium/info.json
View File

@@ -786,7 +786,7 @@
}
},
"ungoogled-chromium": {
"version": "134.0.6998.88",
"version": "134.0.6998.117",
"deps": {
"depot_tools": {
"rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
@@ -797,16 +797,16 @@
"hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U="
},
"ungoogled-patches": {
"rev": "134.0.6998.88-1",
"hash": "sha256-Mn7Cr2jCSh1yMw6racIPAbj0gX44xhonHMQLSz4La/E="
"rev": "134.0.6998.117-1",
"hash": "sha256-UEdho4QgVy+iQzH+hxnQC7T1juF25Dc4fDeKqd0FRnU="
},
"npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "7e3d5c978c6d3a6eda25692cfac7f893a2b20dd0",
"hash": "sha256-4RRB7uYI3I7c1dSypU2gzF9TCA2MJ7yStKEvm6vfSnE=",
"rev": "cbb247b860ca6b9b18dfa791157e274eab8cad6e",
"hash": "sha256-StWP7bsmD5Byn9uLZz6mo/OTChUsW1Y0RhxuofsPLbY=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -1401,8 +1401,8 @@
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566",
"hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw="
"rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
"hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1566,8 +1566,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "a57459aad9ec3ed5f78d9ded700d52e31029efd2",
"hash": "sha256-IE1X6lfMyoXsN+7ebJ3RWXAgpR98AjituL3faQbNag0="
"rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6",
"hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8="
}
}
}

4
pkgs/by-name/am/amdvlk/package.nix
View File

@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "amdvlk";
version = "2025.Q1.2";
version = "2025.Q1.3";
src = fetchRepoProject {
name = "amdvlk-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${finalAttrs.version}";
hash = "sha256-NIRIrcCVFPxeILnfmOaE8yFBXYrXhtljXsccvoU2lf8=";
hash = "sha256-ZXou5g0emeK++NyV/hQllZAdZAMEY9TYs9c+umFdcfo=";
};
buildInputs =

4
pkgs/by-name/au/audiobookshelf/package.nix
View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
runCommand,
buildNpmPackage,
nodejs_18,
nodejs,
ffmpeg-full,
nunicode,
util-linux,
@@ -14,8 +14,6 @@
}:
let
nodejs = nodejs_18;
source = builtins.fromJSON (builtins.readFile ./source.json);
pname = "audiobookshelf";

46
pkgs/by-name/ca/capnproto/package.nix
View File

@@ -1,13 +1,34 @@
{
binutils,
lib,
stdenv,
clangStdenv,
fetchFromGitHub,
cmake,
openssl,
zlib,
}:
stdenv.mkDerivation rec {
let
# HACK: work around https://github.com/NixOS/nixpkgs/issues/177129
# Though this is an issue between Clang and GCC,
# so it may not get fixed anytime soon...
empty-libgcc_eh = clangStdenv.mkDerivation {
pname = "empty-libgcc_eh";
version = "0";
dontUnpack = true;
installPhase = ''
mkdir -p "$out"/lib
"${binutils}"/bin/ar r "$out"/lib/libgcc_eh.a
'';
};
in
# NOTE: This must be `clang` because `gcc` is known to miscompile or ICE while
# compiling `capnproto` coroutines.
#
# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102051
# See: https://gerrit.lix.systems/c/lix/+/1874
clangStdenv.mkDerivation rec {
pname = "capnproto";
version = "1.1.0";
@@ -23,8 +44,27 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
openssl
zlib
] ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.targetPlatform.isStatic) empty-libgcc_eh;
# FIXME: separate the binaries from the stuff that user systems actually use
# This runs into a terrible UX issue in Lix and I just don't want to debug it
# right now for the couple MB of closure size:
# https://git.lix.systems/lix-project/lix/issues/551
# outputs = [ "bin" "dev" "out" ];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
# Take optimization flags from CXXFLAGS rather than cmake injecting them
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
];
env = {
# Required to build the coroutine library
CXXFLAGS = "-std=c++20";
};
separateDebugInfo = true;
meta = with lib; {
homepage = "https://capnproto.org/";
description = "Cap'n Proto cerealization protocol";
@@ -35,6 +75,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
platforms = platforms.all;
maintainers = [ ];
maintainers = lib.teams.lix.members;
};
}

6
pkgs/by-name/ci/cirrus-cli/package.nix
View File

@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.138.3";
version = "0.139.2";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = "cirrus-cli";
rev = "v${version}";
hash = "sha256-Fc3f3hVHuwO0hhH5ZDoQBKPPfxnt3TOWMRgefZa7bJU=";
hash = "sha256-JuOx1O2JcxfrZN6JBbuG+aFOnqgVUR4BLbJYoJ08kbQ=";
};
vendorHash = "sha256-GjCwH0Xe9wyacfokI5EzF2TKUnSMKCdOljahChPBlso=";
vendorHash = "sha256-NVB31L9IFr4/HQK9hOeeKzVNl/+sCIsABTJqjY8itx4=";
ldflags = [
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

4
pkgs/by-name/fa/fastddsgen/package.nix
View File

@@ -9,7 +9,7 @@
let
pname = "fastddsgen";
version = "4.0.3";
version = "4.0.4";
gradle = gradle_7;
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
repo = "Fast-DDS-Gen";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-jim6Yqo0Gw8oj7AFzI7BEkvS2WZiT1KawbclIFyPpac=";
hash = "sha256-5M1N0f1kVaIC5dkLb5ft0Da8CqzVRQlyr1otQdMvtow=";
};
nativeBuildInputs = [

6
pkgs/by-name/fe/fend/package.nix
View File

@@ -17,17 +17,17 @@
rustPlatform.buildRustPackage rec {
pname = "fend";
version = "1.5.5";
version = "1.5.6";
src = fetchFromGitHub {
owner = "printfn";
repo = "fend";
rev = "v${version}";
hash = "sha256-yRNfkP6DgXK1pLq50D9dMbbJaOX4ouQACJrfP5XrAJs=";
hash = "sha256-FaPP7344rb5789CeDv9L4lysiTrK+7UoEbH8IK/6N3k=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-A/NqG5hrtTmbC3cpiRr16hQ6qyqfRhbrMGtB8KFcr1o=";
cargoHash = "sha256-BFWk91FPJaHccr9LeLq5NQlVrkglMz1W0MPTz0HzOfI=";
nativeBuildInputs = [
pandoc

13
pkgs/by-name/fr/freeimage/CVE-2020-24292.patch Normal file
View File

@@ -0,0 +1,13 @@
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:45.524031668 +0200
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:47.717009813 +0200
@@ -301,6 +301,9 @@ LoadStandardIcon(FreeImageIO *io, fi_han
int width = bmih.biWidth;
int height = bmih.biHeight / 2; // height == xor + and mask
unsigned bit_count = bmih.biBitCount;
+ if (bit_count != 1 && bit_count != 2 && bit_count != 4 && bit_count != 8 && bit_count != 16 && bit_count != 24 && bit_count != 32) {
+ return NULL;
+ }
unsigned line = CalculateLine(width, bit_count);
unsigned pitch = CalculatePitch(line);

14
pkgs/by-name/fr/freeimage/CVE-2020-24293.patch Normal file
View File

@@ -0,0 +1,14 @@
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.287014100 +0200
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.832008666 +0200
@@ -780,6 +780,10 @@ int psdThumbnail::Read(FreeImageIO *io,
FreeImage_Unload(_dib);
}
+ if (_WidthBytes != _Width * _BitPerPixel / 8) {
+ throw "Invalid PSD image";
+ }
+
if(_Format == 1) {
// kJpegRGB thumbnail image
_dib = FreeImage_LoadFromHandle(FIF_JPEG, io, handle);

21
pkgs/by-name/fr/freeimage/CVE-2020-24295.patch Normal file
View File

@@ -0,0 +1,21 @@
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.936007630 +0200
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.940007590 +0200
@@ -1466,6 +1466,7 @@ FIBITMAP* psdParser::ReadImageData(FreeI
const unsigned dstBpp = (depth == 1) ? 1 : FreeImage_GetBPP(bitmap)/8;
const unsigned dstLineSize = FreeImage_GetPitch(bitmap);
BYTE* const dst_first_line = FreeImage_GetScanLine(bitmap, nHeight - 1);//<*** flipped
+ const unsigned dst_buffer_size = dstLineSize * nHeight;
BYTE* line_start = new BYTE[lineSize]; //< fileline cache
@@ -1481,6 +1482,9 @@ FIBITMAP* psdParser::ReadImageData(FreeI
const unsigned channelOffset = GetChannelOffset(bitmap, c) * bytes;
BYTE* dst_line_start = dst_first_line + channelOffset;
+ if (channelOffset + lineSize > dst_buffer_size) {
+ throw "Invalid PSD image";
+ }
for(unsigned h = 0; h < nHeight; ++h, dst_line_start -= dstLineSize) {//<*** flipped
io->read_proc(line_start, lineSize, 1, handle);
ReadImageLine(dst_line_start, line_start, lineSize, dstBpp, bytes);

19
pkgs/by-name/fr/freeimage/CVE-2021-33367.patch Normal file
View File

@@ -0,0 +1,19 @@
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp
--- freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp 2023-09-28 19:34:45.003036859 +0200
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp 2023-09-28 19:34:47.505011926 +0200
@@ -770,8 +770,13 @@ jpeg_read_exif_dir(FIBITMAP *dib, const
//
const WORD entriesCount0th = ReadUint16(msb_order, ifd0th);
-
- DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th));
+
+ const BYTE* de_addr = DIR_ENTRY_ADDR(ifd0th, entriesCount0th);
+ if(de_addr+4 >= (BYTE*)(dwLength + ifd0th - tiffp)) {
+ return TRUE; //< no thumbnail
+ }
+
+ DWORD next_offset = ReadUint32(msb_order, de_addr);
if((next_offset == 0) || (next_offset >= dwLength)) {
return TRUE; //< no thumbnail
}

15
pkgs/by-name/fr/freeimage/CVE-2021-40263.patch Normal file
View File

@@ -0,0 +1,15 @@
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.713009853 +0200
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:48.043006563 +0200
@@ -2142,6 +2142,11 @@ Load(FreeImageIO *io, fi_handle handle,
uint32_t tileRowSize = (uint32_t)TIFFTileRowSize(tif);
uint32_t imageRowSize = (uint32_t)TIFFScanlineSize(tif);
+ if (width / tileWidth * tileRowSize * 8 > bitspersample * samplesperpixel * width) {
+ free(tileBuffer);
+ throw "Corrupted tiled TIFF file";
+ }
+
// In the tiff file the lines are saved from up to down
// In a DIB the lines must be saved from down to up

14
pkgs/by-name/fr/freeimage/CVE-2021-40266.patch Normal file
View File

@@ -0,0 +1,14 @@
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.501011966 +0200
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.610010879 +0200
@@ -372,6 +372,10 @@ static void
ReadPalette(TIFF *tiff, uint16_t photometric, uint16_t bitspersample, FIBITMAP *dib) {
RGBQUAD *pal = FreeImage_GetPalette(dib);
+ if (!pal) {
+ return;
+ }
+
switch(photometric) {
case PHOTOMETRIC_MINISBLACK: // bitmap and greyscale image types
case PHOTOMETRIC_MINISWHITE:

14
pkgs/by-name/fr/freeimage/CVE-2023-47995.patch Normal file
View File

@@ -0,0 +1,14 @@
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:17.818579271 +0100
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:18.776573816 +0100
@@ -1086,6 +1086,10 @@ Load(FreeImageIO *io, fi_handle handle,
jpeg_read_header(&cinfo, TRUE);
+ if (cinfo.image_width > JPEG_MAX_DIMENSION || cinfo.image_height > JPEG_MAX_DIMENSION) {
+ throw FI_MSG_ERROR_DIB_MEMORY;
+ }
+
// step 4: set parameters for decompression
unsigned int scale_denom = 1; // fraction by which to scale image

16
pkgs/by-name/fr/freeimage/CVE-2023-47997.patch Normal file
View File

@@ -0,0 +1,16 @@
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.669574426 +0100
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.673574403 +0100
@@ -1484,6 +1484,12 @@ Load(FreeImageIO *io, fi_handle handle,
(int)bitspersample, (int)samplesperpixel, (int)photometric);
throw (char*)NULL;
}
+ if (planar_config == PLANARCONFIG_SEPARATE && bitspersample < 8) {
+ FreeImage_OutputMessageProc(s_format_id,
+ "Unable to handle this format: bitspersample = 8, TIFFTAG_PLANARCONFIG = PLANARCONFIG_SEPARATE"
+ );
+ throw (char*)NULL;
+ }
// ---------------------------------------------------------------------------------

0
pkgs/development/libraries/freeimage/libtiff-4.4.0.diff → pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff
View File

81
pkgs/development/libraries/freeimage/default.nix → pkgs/by-name/fr/freeimage/package.nix
View File

@@ -14,17 +14,16 @@
jxrlib,
pkg-config,
fixDarwinDylibNames,
autoSignDarwinBinariesHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "freeimage";
version = "unstable-2021-11-01";
version = "3.18.0-unstable-2024-04-18";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/freeimage/svn/";
rev = "1900";
sha256 = "rWoNlU/BWKZBPzRb1HqU6T0sT7aK6dpqKPe88+o/4sA=";
rev = "1911";
hash = "sha256-JznVZUYAbsN4FplnuXxCd/ITBhH7bfGKWXep2A6mius=";
};
sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk";
@@ -33,9 +32,23 @@ stdenv.mkDerivation (finalAttrs: {
prePatch = ''
rm -rf Source/Lib* Source/OpenEXR Source/ZLib
'';
# Tell patch to work with trailing carriage returns
patchFlags = [
"-p1"
"--binary"
];
patches = [
./unbundle.diff
./libtiff-4.4.0.diff
./CVE-2020-24292.patch
./CVE-2020-24293.patch
./CVE-2020-24295.patch
./CVE-2021-33367.patch
./CVE-2021-40263.patch
./CVE-2021-40266.patch
./CVE-2023-47995.patch
./CVE-2023-47997.patch
];
postPatch =
@@ -58,10 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isDarwin [
cctools
fixDarwinDylibNames
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
autoSignDarwinBinariesHook
];
buildInputs = [
libtiff
libtiff.dev_private
@@ -107,18 +118,50 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "http://freeimage.sourceforge.net/";
license = "GPL";
knownVulnerabilities = [
"CVE-2021-33367"
"CVE-2021-40262"
"CVE-2021-40263"
"CVE-2021-40264"
"CVE-2021-40265"
"CVE-2021-40266"
"CVE-2023-47992"
"CVE-2023-47993"
"CVE-2023-47994"
"CVE-2023-47995"
"CVE-2024-31570"
"CVE-2024-28584"
"CVE-2024-28583"
"CVE-2024-28582"
"CVE-2024-28581"
"CVE-2024-28580"
"CVE-2024-28579"
"CVE-2024-28578"
"CVE-2024-28577"
"CVE-2024-28576"
"CVE-2024-28575"
"CVE-2024-28574"
"CVE-2024-28573"
"CVE-2024-28572"
"CVE-2024-28571"
"CVE-2024-28570"
"CVE-2024-28569"
"CVE-2024-28568"
"CVE-2024-28567"
"CVE-2024-28566"
"CVE-2024-28565"
"CVE-2024-28564"
"CVE-2024-28563"
"CVE-2024-28562"
"CVE-2024-9029"
# "CVE-2023-47997"
"CVE-2023-47996"
# "CVE-2023-47995"
"CVE-2023-47994"
"CVE-2023-47993"
"CVE-2023-47992"
# "CVE-2021-40266"
"CVE-2021-40265"
"CVE-2021-40264"
# "CVE-2021-40263"
"CVE-2021-40262"
# "CVE-2021-33367"
# "CVE-2020-24295"
"CVE-2020-24294"
# "CVE-2020-24293"
# "CVE-2020-24292"
"CVE-2020-21426"
"CVE-2019-12214"
"CVE-2019-12212"
];
maintainers = with lib.maintainers; [ l-as ];
platforms = with lib.platforms; unix;

2
pkgs/development/libraries/freeimage/unbundle.diff → pkgs/by-name/fr/freeimage/unbundle.diff
View File

File diff suppressed because one or more lines are too long

4
pkgs/by-name/fs/fsautocomplete/deps.json generated
View File

@@ -86,8 +86,8 @@
},
{
"pname": "FSharp.Analyzers.SDK",
"version": "0.29.0",
"hash": "sha256-hhyLzVyNO7lAm9RbQao15+d8gt9yYK2+Rem3yAoA+zw="
"version": "0.29.1",
"hash": "sha256-bhkxMzJs1eOdrgWsiyUxJy3D9nKe1w3ajSCn1AVCggw="
},
{
"pname": "FSharp.Compiler.Service",

4
pkgs/by-name/fs/fsautocomplete/package.nix
View File

@@ -9,13 +9,13 @@
buildDotnetModule (finalAttrs: {
pname = "fsautocomplete";
version = "0.77.2";
version = "0.77.4";
src = fetchFromGitHub {
owner = "fsharp";
repo = "FsAutoComplete";
rev = "v${finalAttrs.version}";
hash = "sha256-rCfiWzVsK9lvo4uMNrgWdXsjrvBQDZOyFpKxKdbT/3g=";
hash = "sha256-QTLaaztZghcQRQSE/GXQGpo7W7bHNNXGwYNIaV41PvY=";
};
nugetDeps = ./deps.json;

55
pkgs/by-name/ge/genealogos-cli/package.nix Normal file
View File

@@ -0,0 +1,55 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
crate ? "cli",
}:
rustPlatform.buildRustPackage rec {
pname = "genealogos-${crate}";
version = "1.0.0";
src = fetchFromGitHub {
owner = "tweag";
repo = "genealogos";
tag = "v${version}";
hash = "sha256-EQrKInsrqlpjySX6duylo++2qwglB3EqGfLFJucOQM8=";
# Genealogos' fixture tests contain valid nix store paths, and are thus incompatible with a fixed-output-derivation.
# To avoid this, we just remove the tests
postFetch = ''
rm -r $out/genealogos/tests/
'';
};
useFetchCargoVendor = true;
cargoHash = "sha256-R3HQXPpTtqgXfc7nLNdJp5zUMEpfccKWOQtS5Y786Jc=";
cargoBuildFlags = [
"-p"
"genealogos-${crate}"
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
# Since most tests were removed, just skip testing
doCheck = false;
meta = {
description = "Nix sbom generator";
homepage = "https://github.com/tweag/genealogos";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ erin ];
changelog = "https://github.com/tweag/genealogos/blob/${src.tag}/CHANGELOG.md";
mainProgram =
{
api = "genealogos-api";
cli = "genealogos";
}
.${crate};
platforms = lib.platforms.unix;
};
}

6
pkgs/by-name/ha/havn/package.nix
View File

@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "havn";
version = "0.1.18";
version = "0.2.0";
src = fetchFromGitHub {
owner = "mrjackwills";
repo = "havn";
tag = "v${version}";
hash = "sha256-G6nhWcrnMYysIHSocIeQsBGG51D1ozZPF/LGsDNG/+k=";
hash = "sha256-zZiBVuA6rjsCfn0Ih3Sum0VsmtyXbfPG9fwK2zkwJaA=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-LQAE/fgq2ixSrveTAKyd5zh1bl6znLhij04DD5wOTqw=";
cargoHash = "sha256-j84DF6LJ9q56u4QgMFk9c6089Ghk5K0EatvonGjImjU=";
checkFlags = [
# Skip tests that require network access

6
pkgs/by-name/mi/minify/package.nix
View File

@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "minify";
version = "2.21.3";
version = "2.22.2";
src = fetchFromGitHub {
owner = "tdewolff";
repo = pname;
rev = "v${version}";
hash = "sha256-WnkC6wydFDZDt6tPpsDipK/6Hwj3lfzx+20nDTUfn7g=";
hash = "sha256-pwAILZTSYk+AUi/XwC3bvK3KxZJkmCSprG9sbIhtdCc=";
};
vendorHash = "sha256-jZJpaUsHLjPrVTzzxfb9oqm8d6LM28OKdm1v4m7zxC8=";
vendorHash = "sha256-PxmtYVMkZcJvaM9CYSy5OSUkpyhL1VLwkXoY7uIe7Q8=";
nativeBuildInputs = [ installShellFiles ];

8
pkgs/by-name/os/osu-lazer-bin/package.nix
View File

@@ -10,23 +10,23 @@
let
pname = "osu-lazer-bin";
version = "2025.316.0";
version = "2025.321.0";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-u5d8MjBRWd4Y/6avRyBIzgR9J+GJANjGYhkXhu7imbI=";
hash = "sha256-oc5IbLhOGn7nug47YHpEqTkQoGWQXrVS77xQMW9khqw=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-isgYm4+GXAC6A9P1UjNLcohNr1Zi4C/94V2jtLixGVI=";
hash = "sha256-c1EHrkLbxYUwwgMdgGTHHkop6STFLVH8vRQ41MzGeeI=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-348B6gtYLRTGlyCNsWiOrqg98bF/cPIsPBroisApzfc=";
hash = "sha256-mNxoEx/wgJ1OUm7y9JLd5vHSwfcB49QjKDVQWZaMDJQ=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

8
pkgs/by-name/os/osu-lazer/deps.json generated
View File

@@ -651,8 +651,8 @@
},
{
"pname": "ppy.osu.Framework",
"version": "2025.313.0",
"hash": "sha256-daN3BmGYAyh+I0l5l7fFMaMoksYR3mhb9sPMg70GZxo="
"version": "2025.321.0",
"hash": "sha256-+TD1TcZfAzFMlVsT19hCfhoMfU4MQcL8K18N/wHZhns="
},
{
"pname": "ppy.osu.Framework.NativeLibs",
@@ -666,8 +666,8 @@
},
{
"pname": "ppy.osu.Game.Resources",
"version": "2025.313.0",
"hash": "sha256-DbPR7XwlhC9wDkgUCRUt2QrYRoscqJaRGvtUZ9LGyvM="
"version": "2025.321.0",
"hash": "sha256-vjNwUVBSOrWEc8z8QXD+CPSZMj9BCKuKIQZXxqaXldc="
},
{
"pname": "ppy.osuTK.NS20",

4
pkgs/by-name/os/osu-lazer/package.nix
View File

@@ -21,13 +21,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2025.316.0";
version = "2025.321.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = version;
hash = "sha256-EbuJ3LrfW+JtNqFx9HSR5xWDZdXP72NXvKC05ek7zhc=";
hash = "sha256-37foEm4MO8kuir72qARQ7LKiICRiRq1vorABh3OaL3g=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";

6
pkgs/by-name/sh/shadps4/package.nix
View File

@@ -38,13 +38,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shadps4";
version = "0.6.0-unstable-2025-03-10";
version = "0.6.0-unstable-2025-03-18";
src = fetchFromGitHub {
owner = "shadps4-emu";
repo = "shadPS4";
rev = "ba1eb298dec48f88431068390232e3978ae07bda";
hash = "sha256-LUo8IOwjlnk3jUeEAbGVmafO8XJuCGzHaZig2HAmNI0=";
rev = "171f755c139764d83e6fc712fcbbcc9d4c5c5956";
hash = "sha256-vYOI4ffKN8QPg6om3T0PUu2I/K84Y7Hn2iUfVHi7N7o=";
fetchSubmodules = true;
};

6
pkgs/by-name/tl/tlafmt/package.nix
View File

@@ -5,18 +5,18 @@
}:
rustPlatform.buildRustPackage rec {
pname = "tlafmt";
version = "0.3.0";
version = "0.3.2";
src = fetchFromGitHub {
owner = "domodwyer";
repo = "tlafmt";
tag = "v${version}";
hash = "sha256-jBY7erB2LuKwCkshVHLV5kFVRJ8lkT63z1gt1Tikei4=";
hash = "sha256-V7KTzjCLOdt31UO01iTHVk2zpPc+GdSpsrEfwwbjZrk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-765tp4wUh7G92vaoViufo6Kk2c/w2d1XjZ3aN5UUAv0=";
cargoHash = "sha256-KUN7Et3wW5oLu+FK7ySWKSqpo1IL0ggww74IpFX0aSQ=";
meta = {
description = "Formatter for TLA+ specs";

36
pkgs/by-name/tr/triforce-lv2/package.nix Normal file
View File

@@ -0,0 +1,36 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage rec {
pname = "triforce-lv2";
version = "0.2.0";
src = fetchFromGitHub {
owner = "chadmed";
repo = "triforce";
rev = version;
hash = "sha256-Rv4FHDmmTELYwrxfWDt/TghspLQBGgiREaq3KV98EQY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-ltrvwvrzRPtgB4y/TeIHhIQdWAfo2NHTeDYvDqTuPXE=";
installPhase = ''
export LIBDIR=$out/lib
mkdir -p $LIBDIR
make
make install
'';
meta = with lib; {
homepage = "https://github.com/chadmed/triforce";
description = "Minimum Variance Distortionless Response adaptive beamformer for the microphone array found in some Apple Silicon laptops";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ yuka ];
platforms = platforms.linux;
};
}

11
pkgs/by-name/ts/tsukimi/package.nix
View File

@@ -18,21 +18,22 @@
cargo,
dbus,
desktop-file-utils,
versionCheckHook,
}:
stdenv.mkDerivation rec {
pname = "tsukimi";
version = "0.19.4";
version = "0.20.0";
src = fetchFromGitHub {
owner = "tsukinaha";
repo = "tsukimi";
tag = "v${version}";
hash = "sha256-7Us+mz0FHetka4uVDCWkAGyGMZRhQDotRsySljYZgCo=";
hash = "sha256-OxRxl/+JP3eqxc5b0pb6QbAAHrZgHrq1cawas2UrUro=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
hash = "sha256-JaBFL7XHVjf4NP41n9qtb5oQyaP1bYQETPYMCR9XEvQ=";
hash = "sha256-kt3otu5N3KAzJT992v80Mbgr0sOoPnonc1+pu5ANIxE=";
};
nativeBuildInputs = [
@@ -64,7 +65,9 @@ stdenv.mkDerivation rec {
gst-libav
]);
doCheck = false; # tests require networking
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

6
pkgs/by-name/uv/uv/package.nix
View File

@@ -20,17 +20,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "uv";
version = "0.6.8";
version = "0.6.9";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
tag = finalAttrs.version;
hash = "sha256-PURQ/iDg9dvogwh/A2utmg8ufiPXafI+6jsT6UL9JsY=";
hash = "sha256-i/NnJpLAf7pDxzIuV+30yhbPJT9+2iZcr8x4qDfxUXc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-eZqyHzkLPjNtDe8X++2GaWYynJ3AYYCk3SlBtEJS6yM=";
cargoHash = "sha256-NcSXp0KhNREyqA59MmzcZJ6UzJzlynGz+PUXA22pLi8=";
buildInputs = [
rust-jemalloc-sys

4
pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix
View File

@@ -15,13 +15,13 @@
buildPythonApplication rec {
pname = "gnome-extensions-cli";
version = "0.10.4";
version = "0.10.5";
format = "pyproject";
src = fetchPypi {
pname = "gnome_extensions_cli";
inherit version;
hash = "sha256-S+kSVvWVbg/ATaF0xacPeUnu84Xx2ot6AOLmdGQIeWo=";
hash = "sha256-Rli4gsxbD84SSyx6hdPz5MKHsYw4jX7XgAkAydg0lGI=";
};
nativeBuildInputs = [

34
pkgs/development/compilers/dotnet/versions/9.0.nix
View File

@@ -482,39 +482,39 @@ rec {
};
sdk_9_0_2xx = buildNetSdk {
version = "9.0.201";
version = "9.0.202";
srcs = {
linux-arm = {
url = "https://download.visualstudio.microsoft.com/download/pr/a2cf96fc-f298-41e2-9dc6-8c0861916597/d505f4b28a7765d7bea6d2883a7fe170/dotnet-sdk-9.0.201-linux-arm.tar.gz";
hash = "sha512-aBIYY1ghrUlYayCg7rA9Ap0V8s8seVB0vT4np3P5CheotrrJ30TggyM87PNiu/7n0Ma4OiSRfmlr3orX5S8RVQ==";
url = "https://download.visualstudio.microsoft.com/download/pr/e41720b8-c635-4b25-bcb1-dcf307a917d6/fea66a31e0dec0411b3e123661f443fc/dotnet-sdk-9.0.202-linux-arm.tar.gz";
hash = "sha512-LohoPuOJS3JYHOOCnv0sxSFJaPB4Lhf1BKebyA7MMe/p1TYDA1ReRVN/mS9ayMR6rsjspeqKTvrN6XQt5sj/4A==";
};
linux-arm64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/6d91bd91-9bb6-4b3f-9256-83f8c982e817/9248655502cac509f9c738509913770c/dotnet-sdk-9.0.201-linux-arm64.tar.gz";
hash = "sha512-TreMdgg1XKJ4CZCTRZLElXntWfCYM3fEwsmaQJGXAmRkK4/uksZekbrrbGvCIGbWlYCF6s0ahQBVtS9tBENtWw==";
url = "https://download.visualstudio.microsoft.com/download/pr/52daf653-e6d8-4915-aea1-9c2e2be169a5/9f3e289918eb9054770b69c0b100bb8f/dotnet-sdk-9.0.202-linux-arm64.tar.gz";
hash = "sha512-aRb9N5B8ZWO667XJ+CpnYdE9U6BEJFG65zrWKjanJ0R3EBei0/Zl7sqlx29qADbd1QPC4ZWo6jB5c6KSdIuH1Q==";
};
linux-x64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/82a7fc96-b53b-4af4-ac3a-ef0a6c9325d5/84e522c31482538cddf696d03c5b20af/dotnet-sdk-9.0.201-linux-x64.tar.gz";
hash = "sha512-k6gITvONqBDDyWUEwg6iAgprdVtzoZ96zGzXOotirOCt2hRFLRHmRY9z3H1Y/60i/NFR8RHSMgyyOhD9VNy3cg==";
url = "https://download.visualstudio.microsoft.com/download/pr/c2220b38-c512-4447-b564-a18048d14327/965cdfe500a937c2d28bc9d2db45cd1f/dotnet-sdk-9.0.202-linux-x64.tar.gz";
hash = "sha512-DrUjAAI9nfZJSq372DgN3fhOLyF9RErZ/ogCkq+/N4vjcA1/vsoxNuyVliujVeRKv8n4pnnNDQjmj4XLAyDOcw==";
};
linux-musl-arm = {
url = "https://download.visualstudio.microsoft.com/download/pr/905c96fd-1e89-4024-834f-dd2690ec6eab/6b3cec8a13b42bf55f65f65badf0b89f/dotnet-sdk-9.0.201-linux-musl-arm.tar.gz";
hash = "sha512-ONvoFPTs1SgfeCEFlmHuAmX7IZzeCF+s/M1Z6fs0DAOBhEkGTf6kYi3gwMbjkMoZeVFb3ne/MMvnquYUwc1PKw==";
url = "https://download.visualstudio.microsoft.com/download/pr/c2399a26-a81c-4039-bc90-62a6ac27416e/25e7626b936ba69c2f0fcf1c5403f172/dotnet-sdk-9.0.202-linux-musl-arm.tar.gz";
hash = "sha512-OBlNZ0l9xy6/fVp+pnZGJNHFJKwmJhzoiKEK+UCrZhlzMGywC/iQmjaUIVwME0rpAZXm7hGBgEb5IOD/Zag2Yg==";
};
linux-musl-arm64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/26b8a5c2-b79c-425f-8356-d8f0d231bf45/0da5d6f19a28a5d07ebda7fe5a1ec536/dotnet-sdk-9.0.201-linux-musl-arm64.tar.gz";
hash = "sha512-DKnTE6zKGUcW/62/ck4yV3AEKOkrW9CSBV2d9jHNOiZ/PFe6dV115B+3sCeEgyG7Crbf7gN04OReVJkLNLxnqA==";
url = "https://download.visualstudio.microsoft.com/download/pr/fc1b0d83-d63a-4469-b0a4-d36b3c2d7c65/c8522a9bf1a9e3c1c8ee3d1e65153641/dotnet-sdk-9.0.202-linux-musl-arm64.tar.gz";
hash = "sha512-IQcf9GhTtBVVacWnD9gYa4JQdZ2x15RRmOUjAjvjzQ6XBYSZSR8fLS13FWphkZtih8cN9VILTsASqp7BcoifbQ==";
};
linux-musl-x64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/1de65d68-6aaf-46dc-b103-5461e03b8d81/160ce3ce92da0cc3eaf465279b6b61f1/dotnet-sdk-9.0.201-linux-musl-x64.tar.gz";
hash = "sha512-dW/ohdWRYEDHeZXO7QLoUqk+7pRIn7JSHZYT2oCxoGbAVTUmxbPWwkvNAxwQ6YSK2A0nt1lF5GmZCeat/Tm6yw==";
url = "https://download.visualstudio.microsoft.com/download/pr/c99de83d-6caa-4ec0-ae22-b542cef5833a/90ef16f45a552623155d86732478f958/dotnet-sdk-9.0.202-linux-musl-x64.tar.gz";
hash = "sha512-i2U40wVt2fIx2WTaotB61xQJtObrmR1AasHwdiYAEIVXNya6NSlLVPLoWW06d+AY1y6l307GH7t5+qBFEKSfow==";
};
osx-arm64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/2dfd9746-db33-464f-93f7-6101f0f85968/6d20c7591ed80ad5c8b8039860b4626d/dotnet-sdk-9.0.201-osx-arm64.tar.gz";
hash = "sha512-Il3C3Gfx/EHAUgnkmjFWUbIBlv8Ch/le4IPkyTLJDu17ePaCh6iJpB+z7RH0jQt19ihf0OgWEvmEtZz6c9Cnww==";
url = "https://download.visualstudio.microsoft.com/download/pr/98cc1e45-e17c-4e63-afb1-86583dce24fe/948df23085579a4ce3f38620540eb088/dotnet-sdk-9.0.202-osx-arm64.tar.gz";
hash = "sha512-Y7rd4WFK6op1UfjlbEt7o3mxXzfmwAgTPiLAjfBgfquMPC8DBuRB6f5gwhZt7JUycqDL0VDrWwt32sWyh4gBFQ==";
};
osx-x64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/abc40bfa-5976-482c-9143-e8ac8ed267dd/8ec0035953d18fcb07aa3bb033ca35a2/dotnet-sdk-9.0.201-osx-x64.tar.gz";
hash = "sha512-azGDM5p7T81pdXMfDEB5p/oaYYvPejNYOqNe2NvtXYQeXxfOEYQWwh/qcrq/q9D8LMBCZvNq+dbHvIxVIMtagQ==";
url = "https://download.visualstudio.microsoft.com/download/pr/bc0334a2-641c-4e60-b07b-b1f65c05da0f/f1e9820b1ad0ddf0104103cd5d4fe69b/dotnet-sdk-9.0.202-osx-x64.tar.gz";
hash = "sha512-+ke1cSRipwSu7TeiOZB0ER5vX2+wN3ypO/qpF3sx+VCM3X9JLV6iTgzTw6D7l3u7XlgqDr/YS6oOxNCnq9BRjQ==";
};
};
inherit commonPackages hostPackages targetPackages;

3
pkgs/development/interpreters/python/cpython/default.nix
View File

@@ -434,6 +434,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
for path in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace-warn $path /no-such-path
done
'' + optionalString (stdenv.hostPlatform.isDarwin && pythonOlder "3.12") ''
# Fix _ctypes module compilation
export NIX_CFLAGS_COMPILE+=" -DUSING_APPLE_OS_LIBFFI=1"
'' + optionalString stdenv.hostPlatform.isDarwin ''
# Override the auto-detection in setup.py, which assumes a universal build
export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}

6
pkgs/development/libraries/onnxruntime/default.nix
View File

@@ -81,7 +81,7 @@ let
hash = "sha256-9oORW0YlQ6SphqfbjcYb0dTlHc+1gzy9quH/Lj6By8Q=";
};
cutlass = fetchFromGitHub {
cutlass = fetchFromGitHub {
owner = "NVIDIA";
repo = "cutlass";
tag = "v3.5.1";
@@ -95,8 +95,8 @@ let
hash = "sha256-YJdZ0cMtUncH5Z6TtAWBH0xtAIu2UcbjnVcCM4tfg20=";
};
isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild;
in
effectiveStdenv.mkDerivation rec {
pname = "onnxruntime";
inherit src version;
@@ -128,6 +128,8 @@ effectiveStdenv.mkDerivation rec {
]) ++ lib.optionals cudaSupport [
cudaPackages.cuda_nvcc
cudaPackages.cudnn-frontend
] ++ lib.optionals isCudaJetson [
cudaPackages.autoAddCudaCompatRunpath
];
buildInputs = [

5
pkgs/development/lisp-modules/imported.nix
View File

@@ -6,6 +6,7 @@
lib,
fetchzip,
build-asdf-system,
stdenv,
...
}:
@@ -15920,6 +15921,8 @@ lib.makeScope pkgs.newScope (self: {
lispLibs = [ (getAttr "cffi" self) ];
meta = {
hydraPlatforms = [ ];
# darwin cannot find libpango.dylib
broken = stdenv.isDarwin;
};
}
);
@@ -39537,6 +39540,8 @@ lib.makeScope pkgs.newScope (self: {
];
meta = {
hydraPlatforms = [ ];
# darwin cannot find libpango.dylib
broken = stdenv.isDarwin;
};
}
);

10
pkgs/development/lua-modules/generated-packages.nix
View File

@@ -2590,14 +2590,14 @@ buildLuarocksPackage {
lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "lze";
version = "0.8.1-1";
version = "0.9.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lze-0.8.1-1.rockspec";
sha256 = "01pxnkijnsj7n66pni850m4x7i1jblrp7w1lw243ikl1di3dgggs";
url = "mirror://luarocks/lze-0.9.1-1.rockspec";
sha256 = "1w4pdacfnfwi94gmrhd13xp81bx14ggxixc1h95h47hcv5cf27p9";
}).outPath;
src = fetchzip {
url = "https://github.com/BirdeeHub/lze/archive/v0.8.1.zip";
sha256 = "179djx0d5l6390x7pdim5bs0qg4jdgjnc4bnsks3yyl3sdscwa2l";
url = "https://github.com/BirdeeHub/lze/archive/v0.9.1.zip";
sha256 = "1zs79rjkayfm45gdgfw8r2962apl2cr8vyq7h51cffrljldhkb58";
};
disabled = luaOlder "5.1";

4
pkgs/development/octave-modules/image/default.nix
View File

@@ -6,11 +6,11 @@
buildOctavePackage rec {
pname = "image";
version = "2.14.0";
version = "2.16.0";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "sha256-dRXqIRqMuO9dnTurhaNunfVHXosFqRmgeODVJ0YHcTM=";
sha256 = "sha256-m7JsyljrH77fs/hOPS5+HuteFtfr4yNbfBB9lPWNFBc=";
};
meta = with lib; {

4
pkgs/development/python-modules/bc-detect-secrets/default.nix
View File

@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "bc-detect-secrets";
version = "1.5.37";
version = "1.5.38";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bridgecrewio";
repo = "detect-secrets";
tag = version;
hash = "sha256-uh9fxt9JdsVHCRbqNGbFxjm5pgRg4gWf2n+OYhx55RM=";
hash = "sha256-KD+ceZaUqjx8f4intjQaz3lY0a9hms6UpjwWsDu/GGM=";
};
build-system = [ setuptools ];

2
pkgs/development/python-modules/cpe/default.nix
View File

@@ -31,7 +31,7 @@ buildPythonPackage rec {
changelog = "https://github.com/nilp0inter/cpe/releases/tag/v${version}";
description = "Common platform enumeration for python";
homepage = "https://github.com/nilp0inter/cpe";
license = lib.licenses.lgpl3Only;
license = lib.licenses.lgpl3Plus;
maintainers = with lib.maintainers; [ tochiaha ];
};
}

4
pkgs/development/python-modules/cyclopts/default.nix
View File

@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclopts";
version = "3.10.0";
version = "3.10.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "BrianPugh";
repo = "cyclopts";
tag = "v${version}";
hash = "sha256-rwoyuo1xJNwtu/ox5SzfWNXjPFKGGpFJ8Htk4kSLKvs=";
hash = "sha256-OJpAY0h3MEbzm4Z3MExQjPM8RCpGW8moWLMKSvClRmw=";
};
build-system = [

4
pkgs/development/python-modules/google-cloud-workflows/default.nix
View File

@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-workflows";
version = "1.17.0";
version = "1.18.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_workflows";
inherit version;
hash = "sha256-RPQLMizULGQBwxdKfvInbEA9O7+JsWjg9dFwkFj29IM=";
hash = "sha256-QXfMocOyZg/IpqJbmPyr4pCajKJ+jepHi7Gw/oVZg+A=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/google-cloud-workstations/default.nix
View File

@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-cloud-workstations";
version = "0.5.13";
version = "0.5.14";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_workstations";
inherit version;
hash = "sha256-ullBxDAloLnKL/7zTfbtzRCgBcrXOAdo+TpvmIGKsCU=";
hash = "sha256-LwIsVouAh/obOaGx+EvT8gmEJ+NdQNSsfkwEtoxE07I=";
};
build-system = [ setuptools ];

5
pkgs/development/python-modules/iterfzf/default.nix
View File

@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "iterfzf";
version = "1.5.0.60.2";
version = "1.6.0.60.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "dahlia";
repo = "iterfzf";
tag = version;
hash = "sha256-9WN49tY9wWBVQGXCpvNQlRaRCZWSfV4xrZPoIOVjK9g=";
hash = "sha256-M6ri90GNHOmr0HtQ/tGxqpG7f+D5rsH/SAlbaVtmTwU=";
};
postPatch = ''
@@ -48,6 +48,7 @@ buildPythonPackage rec {
# AttributeError
"test_no_query"
"test_select_one_ambiguous"
"test_supports_color_kwarg"
];
pythonImportsCheck = [ "iterfzf" ];

4
pkgs/development/python-modules/klayout/default.nix
View File

@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "klayout";
version = "0.29.8";
version = "0.29.12";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-21EPhFb/JMZdyuHDXIxhnLTpHUPxKU24cnodH9oX2q8=";
hash = "sha256-6eJpoxdrUuMBn78QTqvh8zfUH0B8YvWTQR28hZ7HLCY=";
};
build-system = [

4
pkgs/development/python-modules/lacuscore/default.nix
View File

@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "lacuscore";
version = "1.13.0";
version = "1.13.5";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "ail-project";
repo = "LacusCore";
tag = "v${version}";
hash = "sha256-4+YA+kWdohroFO1EMw7Nwy5w+bTGRrkaOwv1iaV9pZ0=";
hash = "sha256-fMFTGzw7j4VylmKaG8K9FNFnKsyQ9R6g2c//DcUztfc=";
};
pythonRelaxDeps = [

64
pkgs/development/python-modules/mkdocs-awesome-nav/default.nix Normal file
View File

@@ -0,0 +1,64 @@
{
lib,
gitMinimal,
buildPythonPackage,
fetchFromGitHub,
flit-core,
mkdocs,
mkdocs-exclude,
mkdocs-material,
natsort,
pydantic,
pytestCheckHook,
pythonOlder,
wcmatch,
}:
buildPythonPackage rec {
pname = "mkdocs-awesome-nav";
version = "3.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "lukasgeiter";
repo = "mkdocs-awesome-nav";
tag = "v${version}";
hash = "sha256-EgHiphpMAL+1ZC+I8PxRHMk1gcyAgHcUm4eoVu67+Qc=";
};
build-system = [ flit-core ];
dependencies = [
mkdocs
natsort
pydantic
wcmatch
];
nativeCheckInputs = [
gitMinimal
mkdocs-exclude
mkdocs-material
pytestCheckHook
];
disabledTestPaths = [
# depends on yet-unpackaged mktheapidocs plugin
"tests/compatibility/test_mktheapidocs.py"
# depends on yet-unpackaged mkdocs-monorepo-plugin
"tests/compatibility/test_monorepo.py"
# depends on yet-unpackaged mkdocs-multirepo-plugin
"tests/compatibility/test_multirepo.py"
# depends on yet-unpackaged mkdocs-static-i18n plugin
"tests/compatibility/test_static_i18n_folder.py"
"tests/compatibility/test_static_i18n_suffix.py"
];
meta = with lib; {
description = "Plugin for customizing the navigation structure of your MkDocs site";
homepage = "https://github.com/lukasgeiter/mkdocs-awesome-nav";
changelog = "https://github.com/lukasgeiter/mkdocs-awesome-nav/blob/v${version}/CHANGELOG";
license = licenses.mit;
maintainers = with maintainers; [ phaer ];
};
}

51
pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix
View File

@@ -1,51 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
mkdocs,
wcmatch,
natsort,
pytestCheckHook,
beautifulsoup4,
mock-open,
importlib-metadata,
pythonOlder,
}:
buildPythonPackage rec {
pname = "mkdocs-awesome-pages-plugin";
version = "2.10.1";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "lukasgeiter";
repo = "mkdocs-awesome-pages-plugin";
tag = "v${version}";
hash = "sha256-p/oG2SvGZrRbIS2yhW3M1+t+OO0przeNsFUtqObNDUA=";
};
propagatedBuildInputs = [
mkdocs
wcmatch
natsort
];
nativeBuildInputs = [ poetry-core ];
nativeCheckInputs = [
pytestCheckHook
beautifulsoup4
mock-open
importlib-metadata
];
meta = with lib; {
description = "An MkDocs plugin that simplifies configuring page titles and their order";
homepage = "https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin";
changelog = "https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin/blob/v${version}/CHANGELOG";
license = licenses.mit;
maintainers = with maintainers; [ phaer ];
};
}

4
pkgs/development/python-modules/playwrightcapture/default.nix
View File

@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "playwrightcapture";
version = "1.28.0";
version = "1.28.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "Lookyloo";
repo = "PlaywrightCapture";
tag = "v${version}";
hash = "sha256-WgxGS54OMv6JRsB9IRmKzQIPeoVcvpl28V5vvvEQ6WU=";
hash = "sha256-zbEpTK1kH2bweQqWHPNtWekwZTdNqqLYnx0VDKyFiUA=";
};
pythonRelaxDeps = [

4
pkgs/development/python-modules/pyhomee/default.nix
View File

@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pyhomee";
version = "1.2.7";
version = "1.2.8";
pyproject = true;
src = fetchFromGitHub {
owner = "Taraman17";
repo = "pyHomee";
tag = "v${version}";
hash = "sha256-ZXb8xDSV6LNcMRUlbLQgK3QTEpiA3pof8sl7uD0blbY=";
hash = "sha256-GBDnfMkQB8BSiYDyoz2l2XHPuMpf6WsjalNYvSREqK8=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/pylacus/default.nix
View File

@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pylacus";
version = "1.13.0";
version = "1.13.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "ail-project";
repo = "PyLacus";
tag = "v${version}";
hash = "sha256-uN2Mw3jOoGRkWZDI1CAdFfzKfxDhp6aAFXIsQSLRetI=";
hash = "sha256-oA2AuodhRox36gSp9adTdFIHQtmSoSaWmZYpvPnoHSQ=";
};
build-system = [ poetry-core ];

4
pkgs/development/python-modules/semchunk/default.nix
View File

@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "semchunk";
version = "3.1.2";
version = "3.1.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-JF/7/sj/IJ6gwtTIQ1BCb6jUYKJaRgzB7Y7rNrtjKVw=";
hash = "sha256-PKFv8EFHdRE2VEnd88h+LOhKrv8p9X5sH9kKawXqdsY=";
};
build-system = [

10
pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
View File

@@ -5,11 +5,12 @@
fetchPypi,
buildPythonPackage,
betterproto,
pydantic,
}:
buildPythonPackage rec {
pname = "sigstore-protobuf-specs";
version = "0.3.5";
version = "0.3.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -17,12 +18,15 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "sigstore_protobuf_specs";
inherit version;
hash = "sha256-yl0XAXrefexbuaABweDkXa5G+L2lk+j6sG6mjurBzpw=";
hash = "sha256-yuBBtAUCYAuKYz9DwldpXQIiqU76HlEQp+x62njDnZk=";
};
nativeBuildInputs = [ flit-core ];
propagatedBuildInputs = [ betterproto ];
propagatedBuildInputs = [
betterproto
pydantic
];
# Module has no tests
doCheck = false;

4
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
View File

@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1342";
version = "3.0.1343";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = version;
hash = "sha256-Hjb458+cOIIaPj7OnKmbcliI+caRx0JYoio+d5SrAuw=";
hash = "sha256-N6gpd1t9cCZkZLRabapzX7h2ui/rA01Gy9Lu138oADE=";
};
build-system = [ setuptools ];

6
pkgs/development/python-modules/typing-validation/default.nix
View File

@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "typing-validation";
version = "1.2.11";
version = "1.2.12";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "hashberg-io";
repo = "typing-validation";
tag = "v${version}";
hash = "sha256-0scXoAPkx/VBIbNRMtFoRRbmGpC2RzNRmQG4mRXSxrs=";
hash = "sha256-N0VAxlxB96NA01c/y4xtoLKoiqAxfhJJV0y/3w6H9ek=";
};
build-system = [
@@ -48,7 +48,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Simple library for runtime type-checking";
homepage = "https://github.com/hashberg-io/typing-validation";
changelog = "https://github.com/hashberg-io/typing-validation/releases/tag/v${version}";
changelog = "https://github.com/hashberg-io/typing-validation/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ vizid ];
};

6
pkgs/development/python-modules/typst/default.nix
View File

@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "typst";
version = "0.13.1";
version = "0.13.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -22,13 +22,13 @@ buildPythonPackage rec {
owner = "messense";
repo = "typst-py";
tag = "v${version}";
hash = "sha256-/nWEs+qeAvejGyjBVSATnUWMVb6AdiCGOE7VjuYl0PU=";
hash = "sha256-Cqi8GupcC7n/OfiFLrNXw0ydXpOqOpWTgIGJXdib5L8=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
hash = "sha256-aeAEqO6vtcLdCRClqhJ3ooJY9jf70iUJDL/GDZw/UXs=";
hash = "sha256-bcO+irLT4Sy8IZ/YQZFD2jVjZAUCO0j+TitigHo4xbM=";
};
build-system = [

6
pkgs/development/python-modules/wadler-lindig/default.nix
View File

@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "wadler-lindig";
version = "0.1.3";
version = "0.1.4";
pyproject = true;
src = fetchFromGitHub {
owner = "patrick-kidger";
repo = "wadler_lindig";
rev = "v${version}";
hash = "sha256-akb1x9UYbfEwnVS6ahpb42XnEl3y7kk3WkhwD8p7AA4=";
tag = "v${version}";
hash = "sha256-ykRyJ5kCxYb3jBb8/8ogGjpgXMcb/mvvvHaSy9fecxA=";
};
build-system = [

20
pkgs/development/tools/coder/default.nix
View File

@@ -14,21 +14,21 @@ let
channels = {
stable = {
version = "2.18.5";
version = "2.19.1";
hash = {
x86_64-linux = "sha256-thoe1TYT4b2tm1t9ZTGGMl9AzW/zP74LavIYweUs8Yw=";
x86_64-darwin = "sha256-HOHNzUKSt1ZO2onmydeHDeYdekwxfyy19Ps4q8xdurI=";
aarch64-linux = "sha256-dU6XdW/uOHMgSTnokvw9bDGULQM4urm8Szc7RRUEEcs=";
aarch64-darwin = "sha256-u1/yWTZv0NgviED6+VywONPv4CJsgWBpXjstyL1dBg4=";
x86_64-linux = "sha256-w8yET4jpuNn/DswFlJ8QpKS5YjI9gs0OTmQ0D1f5JZE=";
x86_64-darwin = "sha256-2ttVjvemACsRLoRE7wMmgsUUDM2AFNo5lXG1kCL8Ae8=";
aarch64-linux = "sha256-8BJrMj0s2MzgCueWlWsGKntEkBwW7rBYZF+5O3lVLN0=";
aarch64-darwin = "sha256-9v0OzQMGq92lNKsOevpE1jjwto+ETgfmVmK5p+JdVBI=";
};
};
mainline = {
version = "2.18.5";
version = "2.20.0";
hash = {
x86_64-linux = "sha256-thoe1TYT4b2tm1t9ZTGGMl9AzW/zP74LavIYweUs8Yw=";
x86_64-darwin = "sha256-HOHNzUKSt1ZO2onmydeHDeYdekwxfyy19Ps4q8xdurI=";
aarch64-linux = "sha256-dU6XdW/uOHMgSTnokvw9bDGULQM4urm8Szc7RRUEEcs=";
aarch64-darwin = "sha256-u1/yWTZv0NgviED6+VywONPv4CJsgWBpXjstyL1dBg4=";
x86_64-linux = "sha256-Vk2Qhk4eNf9Akwza0QNuAc/lh2BtU0sd6QSS2IIyZo4=";
x86_64-darwin = "sha256-TVQYQOqJj9gnTt5HaVVjyr7sBPD3mAPpy5vNw9RJ7dc=";
aarch64-linux = "sha256-hBp7lVaJk30KD8eQ4ehoI1/DW28SWQisGtY4lJNVETw=";
aarch64-darwin = "sha256-pvFZELrXk1bf5nfbDskY3bpSCv22Ls0Leo11Dgu/dfI=";
};
};
};

2876
pkgs/development/tools/genealogos/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

63
pkgs/development/tools/genealogos/default.nix
View File

@@ -1,63 +0,0 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
}:
let
mkGenealogosPackage =
{
crate ? "cli",
}:
rustPlatform.buildRustPackage rec {
pname = "genealogos-${crate}";
version = "1.0.0";
src = fetchFromGitHub {
owner = "tweag";
repo = "genealogos";
rev = "v${version}";
hash = "sha256-EQrKInsrqlpjySX6duylo++2qwglB3EqGfLFJucOQM8=";
# Genealogos' fixture tests contain valid nix store paths, and are thus incompatible with a fixed-output-derivation.
# To avoid this, we just remove the tests
postFetch = ''
rm -r $out/genealogos/tests/
'';
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"nixtract-0.3.0" = "sha256-fXM6Gle4dt1iJgI6NuPl9l00i5sXGYkE+sUvFdps44s=";
};
};
cargoBuildFlags = [
"-p"
"genealogos-${crate}"
];
cargoTestFlags = cargoBuildFlags;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
# Since most tests were removed, just skip testing
doCheck = false;
meta = with lib; {
description = "A Nix sbom generator";
homepage = "https://github.com/tweag/genealogos";
license = licenses.mit;
maintainers = with maintainers; [ erin ];
changelog = "https://github.com/tweag/genealogos/blob/${src.rev}/CHANGELOG.md";
mainProgram = "genealogos";
platforms = lib.platforms.unix;
};
};
in
{
genealogos-cli = mkGenealogosPackage { };
genealogos-api = mkGenealogosPackage { crate = "api"; };
}

6
pkgs/games/ldmud/default.nix
View File

@@ -7,7 +7,7 @@
, libiconv
, pcre
, libgcrypt
, libxcrypt
, libxcrypt-legacy
, json_c
, libxml2
, ipv6Support ? false
@@ -37,11 +37,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA=";
};
patches = [ ./libxml2-2.12.0-compat.patch ./mysql-compat.patch ];
sourceRoot = "${src.name}/src";
nativeBuildInputs =
[ autoreconfHook pkg-config bison ];
buildInputs = [ libgcrypt libxcrypt pcre json_c libxml2 ]
buildInputs = [ libgcrypt libxcrypt-legacy pcre json_c libxml2 ]
++ lib.optional mccpSupport zlib ++ lib.optional mysqlSupport libmysqlclient
++ lib.optional postgresSupport libpq
++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl

18
pkgs/games/ldmud/libxml2-2.12.0-compat.patch Normal file
View File

@@ -0,0 +1,18 @@
diff --git src/pkg-xml2.c src/pkg-xml2.c
index 048ca38c..9ea4de35 100644
--- src/pkg-xml2.c
+++ src/pkg-xml2.c
@@ -507,8 +507,13 @@ f_xml_generate (svalue_t *sp)
return sp;
}
+#if LIBXML_VERSION >= 21200
+static void
+xml_pkg_error_handler(void * userData, const xmlError *error)
+#else
static void
xml_pkg_error_handler(void * userData, xmlErrorPtr error)
+#endif
{
if (error)
{

13
pkgs/games/ldmud/mysql-compat.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git src/autoconf/configure.ac src/autoconf/configure.ac
index 156e97f4..6d70bf33 100644
--- src/autoconf/configure.ac
+++ src/autoconf/configure.ac
@@ -1410,7 +1410,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <mysql.h>
#include <errmsg.h>
-struct MYSQL * foo(void)
+struct st_mysql * foo(void)
{
static MYSQL var;

4
pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix
View File

@@ -8,13 +8,13 @@
buildHomeAssistantComponent rec {
owner = "jmcollin78";
domain = "versatile_thermostat";
version = "7.2.4";
version = "7.2.5";
src = fetchFromGitHub {
inherit owner;
repo = domain;
rev = "refs/tags/${version}";
hash = "sha256-djrhF4BMjQNYHAQNUobqcN5M+ptA/oEjDRR8ZRbBmH8=";
hash = "sha256-my2jy9pab0b8ZPBu9ZD1WWhJQp0pJUXlC9G0Ow969Sc=";
};
passthru.updateScript = gitUpdater { ignoredVersions = "(Alpha|Beta|alpha|beta).*"; };

8
pkgs/servers/mail/mailpit/source.nix
View File

@@ -1,6 +1,6 @@
{
version = "1.22.1";
hash = "sha256-1A3gQZ4kdVmKYe8LP0IYJJnYksXSH0OAIlGWAU2gPhA=";
npmDepsHash = "sha256-5Y3qLwK8v7pkDyW3PXfedhmduaplNh0G4jNJo+aaWZY=";
vendorHash = "sha256-YKl3Wvm0WYvyL7Sm5OZ1XiWhF/xf5ZHGg+F0LnaEY/U=";
version = "1.23.2";
hash = "sha256-Yz+m6fmfv6OU6daEZjqEWxVnWruHONfdssU8cpJMt18=";
npmDepsHash = "sha256-hZSNTALU/DVT8U0RePcDDcBStTPbyKQ3bTBU0FMHh1k=";
vendorHash = "sha256-oyfIiy0o/nEm1nQCLKfaHeRKndZFh9aFI/g9227Pzo8=";
}

4
pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
View File

@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "check_ssl_cert";
version = "2.87.1";
version = "2.88.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
tag = "v${version}";
hash = "sha256-pEMCYqPtk+18uNVUxRQ4awrRMuCqrQ6G8Ds6m3lhL9w=";
hash = "sha256-0iWGtruO4/SD6GT0sRVgj5wDi8PPB5Ui9HQGRcAf2ao=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/servers/tt-rss/default.nix
View File

@@ -8,12 +8,12 @@
stdenv.mkDerivation rec {
pname = "tt-rss";
version = "0-unstable-2025-02-26";
version = "0-unstable-2025-03-14";
src = fetchgit {
url = "https://git.tt-rss.org/fox/tt-rss.git";
rev = "532570ca17f1120a4bfc07195080e5e6a3c469fd";
hash = "sha256-eu0YfIwghuTETsYA3Lrs4LmK95gxxhFUZV/tEZHPo1U=";
rev = "28cb97ddc5834ce8cfe24602a293b90348851495";
hash = "sha256-l4aGTxL9d+go9R7cn14XOoOr8JTrJSScgDIIHGvaB9Q=";
};
installPhase = ''

8
pkgs/top-level/all-packages.nix
View File

@@ -998,7 +998,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa VideoToolbox;
};
inherit (callPackage ../development/tools/genealogos { }) genealogos-cli genealogos-api;
genealogos-api = genealogos-cli.override {
crate = "api";
};
# This is to workaround gfal2-python broken against Python 3.12 or later.
# TODO: Remove these lines after solving the breakage.
@@ -8711,10 +8713,6 @@ with pkgs;
fplll = callPackage ../development/libraries/fplll { };
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { };
freeimage = callPackage ../development/libraries/freeimage {
inherit (darwin) autoSignDarwinBinariesHook;
};
freeipa = callPackage ../os-specific/linux/freeipa {
# NOTE: freeipa and sssd need to be built with the same version of python
kerberos = krb5.override {

1
pkgs/top-level/python-aliases.nix
View File

@@ -387,6 +387,7 @@ mapAliases ({
mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12
mistune_2_0 = mistune; # added 2022-08-12
mitmproxy-wireguard = throw "mitmproxy-wireguard has been removed because it was replaced by upstream with mitmproxy-rs"; # added 2023-11-06
mkdocs-awesome-pages-plugin = mkdocs-awesome-nav; # added 2025-03-10
mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28
mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21
mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30

2
pkgs/top-level/python-packages.nix
View File

@@ -8503,7 +8503,7 @@ self: super: with self; {
mkdocs-autolinks-plugin = callPackage ../development/python-modules/mkdocs-autolinks-plugin { };
mkdocs-autorefs = callPackage ../development/python-modules/mkdocs-autorefs { };
mkdocs-awesome-pages-plugin = callPackage ../development/python-modules/mkdocs-awesome-pages-plugin { };
mkdocs-awesome-nav = callPackage ../development/python-modules/mkdocs-awesome-nav { };
mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { };