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-09-16 18:04:30 +00:00
committed by GitHub
parent 1e68c5c8e0 3540ebe553
commit 2de7a0ec5f
140 changed files with 4150 additions and 1521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/update-terraform-providers.yml
+1 -1
View File
@@ -46,7 +46,7 @@ jobs:
run: |
git clean -f
- name: create PR
uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7.0.1
uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7.0.3
with:
body: |
Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
maintainers/maintainer-list.nix
+19
View File
@@ -351,6 +351,12 @@
githubId = 22131756;
name = "Aaqa Ishtyaq";
};
aarnphm = {
email = "contact@aarnphm.xyz";
github = "aarnphm";
githubId = 29749331;
name = "Aaron Pham";
};
aaronarinder = {
email = "aaronarinder@gmail.com";
github = "aaronArinder";
@@ -17635,6 +17641,13 @@
github = "renesat";
githubId = 11363539;
};
rennsax = {
name = "Bojun Ren";
email = "bj.ren.coding@outlook.com";
github = "rennsax";
githubId = 93167100;
keys = [ { fingerprint = "9075 CEF8 9850 D261 6599 641A A2C9 36D5 B88C 139C"; } ];
};
renzo = {
email = "renzocarbonara@gmail.com";
github = "k0001";
@@ -21504,6 +21517,12 @@
githubId = 4044033;
name = "Thomas Sowell";
};
ttrei = {
email = "reinis.taukulis@gmail.com";
github = "ttrei";
githubId = 27609929;
name = "Reinis Taukulis";
};
ttuegel = {
email = "ttuegel@mailbox.org";
github = "ttuegel";
nixos/modules/installer/cd-dvd/iso-image.nix
+1 -1
View File
@@ -722,7 +722,7 @@ in
"/nix/.ro-store" = lib.mkImageMediaOverride
{ fsType = "squashfs";
device = "/iso/nix-store.squashfs";
options = [ "loop" ];
options = [ "loop" "threads=multi" ];
neededForBoot = true;
};
nixos/modules/installer/netboot/netboot.nix
+1 -1
View File
@@ -47,7 +47,7 @@ with lib;
fileSystems."/nix/.ro-store" = mkImageMediaOverride
{ fsType = "squashfs";
device = "../nix-store.squashfs";
options = [ "loop" ];
options = [ "loop" "threads=multi" ];
neededForBoot = true;
};
nixos/modules/programs/nautilus-open-any-terminal.nix
+6
View File
@@ -22,6 +22,12 @@ in
nautilus-python
nautilus-open-any-terminal
];
environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4";
environment.pathsToLink = [
"/share/nautilus-python/extensions"
];
programs.dconf = lib.optionalAttrs (cfg.terminal != null) {
enable = true;
profiles.user.databases = [{
nixos/modules/services/backup/syncoid.nix
+4 -4
View File
@@ -312,7 +312,7 @@ in
systemd.services = lib.mapAttrs'
(name: c:
lib.nameValuePair "syncoid-${lib.escapeUnitName name}" (lib.mkMerge [
lib.nameValuePair "syncoid-${escapeUnitName name}" (lib.mkMerge [
{
description = "Syncoid ZFS synchronization from ${c.source} to ${c.target}";
after = [ "zfs.target" ];
@@ -376,15 +376,15 @@ in
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
RootDirectory = "/run/syncoid/${lib.escapeUnitName name}";
RootDirectory = "/run/syncoid/${escapeUnitName name}";
RootDirectoryStartOnly = true;
BindPaths = [ "/dev/zfs" ];
BindReadOnlyPaths = [ builtins.storeDir "/etc" "/run" "/bin/sh" ];
# Avoid useless mounting of RootDirectory= in the own RootDirectory= of ExecStart='s mount namespace.
InaccessiblePaths = [ "-+/run/syncoid/${lib.escapeUnitName name}" ];
InaccessiblePaths = [ "-+/run/syncoid/${escapeUnitName name}" ];
MountAPIVFS = true;
# Create RootDirectory= in the host's mount namespace.
RuntimeDirectory = [ "syncoid/${lib.escapeUnitName name}" ];
RuntimeDirectory = [ "syncoid/${escapeUnitName name}" ];
RuntimeDirectoryMode = "700";
SystemCallFilter = [
"@system-service"
nixos/modules/services/continuous-integration/buildbot/master.nix
+4 -4
View File
@@ -16,10 +16,10 @@ let
c = BuildmasterConfig = dict(
workers = [${lib.concatStringsSep "," cfg.workers}],
protocols = { 'pb': {'port': ${toString cfg.pbPort} } },
title = '${lib.escapeStr cfg.title}',
titleURL = '${lib.escapeStr cfg.titleUrl}',
buildbotURL = '${lib.escapeStr cfg.buildbotUrl}',
db = dict(db_url='${lib.escapeStr cfg.dbUrl}'),
title = '${escapeStr cfg.title}',
titleURL = '${escapeStr cfg.titleUrl}',
buildbotURL = '${escapeStr cfg.buildbotUrl}',
db = dict(db_url='${escapeStr cfg.dbUrl}'),
www = dict(port=${toString cfg.port}),
change_source = [ ${lib.concatStringsSep "," cfg.changeSource} ],
schedulers = [ ${lib.concatStringsSep "," cfg.schedulers} ],
pkgs/applications/audio/musescore/default.nix
+2 -2
View File
@@ -50,13 +50,13 @@ let
} else portaudio;
in stdenv'.mkDerivation (finalAttrs: {
pname = "musescore";
version = "4.4.1";
version = "4.4.2";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${finalAttrs.version}";
sha256 = "sha256-eLtpLgXSc8L5y1Mg3s1wrxr09+/vBxNqJEtl9IoKYSM=";
sha256 = "sha256-wgujiFvaWejSEXTbq/Re/7Ca1jIqso2uZej3Lb3V4I8=";
};
patches = [
# https://github.com/musescore/MuseScore/pull/24326
pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix
+1 -1
View File
@@ -22,7 +22,7 @@ melpaBuild {
meta = {
inherit (gn.meta) homepage license;
maintainers = with lib.maintainers; [ ];
maintainers = with lib.maintainers; [ rennsax ];
description = "Major mode for editing GN files; taken from GN sources";
};
}
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+3 -3
View File
@@ -29,13 +29,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
version = "0-unstable-2024-09-05";
version = "0-unstable-2024-09-11";
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
rev = "bd0cea9639bb902d22ec05189681eef1f1df7e17";
hash = "sha256-QBtYSZAmdRhZqaR0/y0A1Q8fx62+owfdRiIVZOgWxkQ=";
rev = "fb64891c2585f9fc0b7f2062cc2b98321aa4e4ca";
hash = "sha256-ChpZhFEKvN+1oYHbQKBUMbTjk/U++kCDnImMVtcYVBc=";
};
patches = [
pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock
Generated
+1638
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/avante-nvim/default.nix
+75
View File
@@ -0,0 +1,75 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
stdenv,
vimUtils,
darwin,
}:
let
version = "2024-09-15";
src = fetchFromGitHub {
owner = "yetone";
repo = "avante.nvim";
rev = "f9520c4fdfed08e9cc609d6cd319b358e4ea33a5";
hash = "sha256-8zTDGPnhNI2rQA0uJc8gQRj4JCyg+IkO/D3oHYy4f9U=";
};
meta = with lib; {
description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE";
homepage = "https://github.com/yetone/avante.nvim";
license = licenses.asl20;
maintainers = with lib.maintainers; [
ttrei
aarnphm
];
};
avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";
inherit version src meta;
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"mlua-0.10.0-beta.1" = "sha256-ZEZFATVldwj0pmlmi0s5VT0eABA15qKhgjmganrhGBY=";
};
};
nativeBuildInputs = [
pkg-config
];
buildInputs =
[
openssl
]
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
buildFeatures = [ "luajit" ];
};
in
vimUtils.buildVimPlugin {
pname = "avante.nvim";
inherit version src meta;
postInstall =
let
ext = stdenv.hostPlatform.extensions.sharedLibrary;
in
''
mkdir -p $out/build
ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext}
ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext}
'';
doInstallCheck = true;
# TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
# nvimRequireCheck = "avante";
}
pkgs/applications/editors/vim/plugins/overrides.nix
+8
View File
@@ -154,6 +154,14 @@
dependencies = with super; [ plenary-nvim ];
};
avante-nvim = (callPackage ./avante-nvim { }).overrideAttrs {
dependencies = with self; [
dressing-nvim
nui-nvim
plenary-nvim
];
};
barbecue-nvim = super.barbecue-nvim.overrideAttrs {
dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ];
meta = {
pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
+35
View File
@@ -0,0 +1,35 @@
From 3a0181ab0fb6c40f613894e65009e148c6e652c9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 16 Sep 2024 10:24:08 +0200
Subject: [PATCH] Remove outdated musl hack in rlimit_nofile_safe
This was incorrect, because RLIM_FMT is not the format specifier for uintmax_t.
Since 53e84063a ("Change RLIM_FMT to '%llu' for non-glibc builds (#269)"),
RLIM_FMT is correct for musl, so there's no longer any need for this casting
version.
Link: https://github.com/elogind/elogind/pull/288
---
src/basic/rlimit-util.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
index 091c111df..59bdc35a0 100644
--- a/src/basic/rlimit-util.c
+++ b/src/basic/rlimit-util.c
@@ -428,11 +428,7 @@ int rlimit_nofile_safe(void) {
rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open());
rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max);
if (setrlimit(RLIMIT_NOFILE, &rl) < 0)
-#ifdef __GLIBC__ /// To be compatible with musl-libc, elogind uses an (uintmax_t) cast.
return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur);
-#else // __GLIBC__
- return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur);
-#endif // __GLIBC__
return 1;
}
--
2.45.2
pkgs/applications/misc/elogind/default.nix
+69 -7
View File
@@ -1,16 +1,24 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchurl
, fetchpatch
, meson
, ninja
, m4
, gperf
, getent
, acl
, audit
, dbus
, libcap
, libselinux
, pam
, gettext
, pkg-config
, udev
, eudev
, util-linux
, libxslt
, python3Packages
, docbook5
@@ -27,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "elogind";
version = "246.10";
version = "255.5";
src = fetchFromGitHub {
owner = "elogind";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+Nv6FL9Yjmfxs24+2mUTP//wbjzGUq4ftgJLfuEqBJg=";
hash = "sha256-4KZr/NiiGVwzdDROhiX3GEQTUyIGva6ezb+xC2U3bkg=";
};
nativeBuildInputs = [
@@ -48,12 +56,63 @@ stdenv.mkDerivation rec {
libxslt.bin # xsltproc
docbook5 docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 docbook_xml_dtd_45 # needed for docbook without Internet
# fixes: man/meson.build:111:0: ERROR: Could not execute command "/build/source/tools/xml_helper.py".
python3Packages.python
python3Packages.lxml
python3Packages.jinja2
];
buildInputs = [ libcap ] ++ (if enableSystemd then [ udev ] else [ eudev ]);
buildInputs = [ acl audit dbus libcap libselinux pam util-linux ]
++ (if enableSystemd then [ udev ] else [ eudev ]);
postPatch = ''
substituteInPlace meson.build --replace-fail "install_emptydir(elogindstatedir)" ""
'';
patches = [
(fetchurl {
url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r.patch";
hash = "sha256-amqXP12mLtrkWuAURb3/aoQeeTSRYlYqL2q2zrKbhxk=";
})
(fetchurl {
url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r_1.patch";
hash = "sha256-tVUlmPValUPApqRX+Cqkzn7bkIILYSuCouvgRsdl9XE=";
})
(fetchpatch {
url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/xxx-musl-fixes.patch";
includes = [
"src/basic/cgroup-util.c"
"src/basic/missing_prctl.h"
"src/libelogind/sd-journal/journal-file.h"
];
hash = "sha256-kY+B1t87E/TtWa83r0VoiojhRrrB667ZhUAHtHE7m28=";
})
(fetchurl {
url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/gshadow.patch";
hash = "sha256-YBy1OeWD1EluLTeUvqUvZKyrZyoUbGg1mxwqG5+VNO0=";
})
(fetchurl {
name = "FTW.patch";
url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a";
hash = "sha256-SGvP0GT43vfyHxrmvl4AbsWQz8CPmNGyH001s3lTxng=";
})
(fetchurl {
name = "malloc_info.patch";
url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a";
hash = "sha256-8aOw+BTtl5Qta8aqLmliKSHEirTjp1xLM195EmBdEDI=";
})
(fetchpatch {
name = "malloc_trim.patch";
url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a";
stripLen = 3;
extraPrefix = [ "src/libelogind/" ];
hash = "sha256-rtSnCEK+frhnlwl/UW3YHxB8MUCAq48jEzQRURpxdXk=";
})
(fetchurl {
name = "malloc_info.patch";
url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a";
hash = "sha256-ZyOCmM5LcwJ7mHiZr0lQjV4G+XMxjhsUm7g7L3OzDDM=";
})
./0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
];
# Inspired by the systemd `preConfigure`.
# Conceptually we should patch all files required during the build, but not scripts
@@ -68,8 +127,11 @@ stdenv.mkDerivation rec {
'';
mesonFlags = [
"-Drootprefix=${placeholder "out"}"
"-Dsysconfdir=${placeholder "out"}/etc"
(lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d")
(lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services")
(lib.mesonOption "sysconfdir" "${placeholder "out"}/etc")
(lib.mesonBool "utmp" (!stdenv.hostPlatform.isMusl))
(lib.mesonEnable "xenctrl" false)
];
meta = with lib; {
pkgs/applications/misc/mupdf/default.nix
+3
View File
@@ -212,5 +212,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ fpletz ];
platforms = platforms.unix;
mainProgram = "mupdf";
# ImportError: cannot import name '_mupdf' from partially initialized module 'mupdf'
# (most likely due to a circular import)
broken = enablePython;
};
}
pkgs/applications/networking/cluster/pachyderm/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pachyderm";
version = "2.11.1";
version = "2.11.2";
src = fetchFromGitHub {
owner = "pachyderm";
repo = "pachyderm";
rev = "v${version}";
hash = "sha256-dg93x73Lg0JGE/q67ae+ugLrVXDRftsZRLslaPryui8=";
hash = "sha256-CNYFaUZBUwa+RF4JFXSmsdHalCPeowM4FYeWBojOOjA=";
};
vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc=";
pkgs/applications/office/qpdfview/default.nix
+3
View File
@@ -40,6 +40,9 @@ mkDerivation rec {
ghostscript
];
# needed for qmakeFlags+=( below
__structuredAttrs = true;
preConfigure = ''
lrelease qpdfview.pro
qmakeFlags+=(*.pro)
pkgs/by-name/ce/ceph-csi/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "ceph-csi";
version = "3.12.1";
version = "3.12.2";
src = fetchFromGitHub {
owner = "ceph";
repo = "ceph-csi";
rev = "v${version}";
hash = "sha256-ujshfbqOyyOZUYuR5edLPGOKlteu1gxmn0xo+QzZLVM=";
hash = "sha256-AyGdXPszvYO/ocfcWKeRaUXgwB0IHFVG9uc+c2iaEvA=";
};
preConfigure = ''
pkgs/by-name/ci/cinny-desktop/package.nix
+3 -3
View File
@@ -22,18 +22,18 @@
rustPlatform.buildRustPackage rec {
pname = "cinny-desktop";
# We have to be using the same version as cinny-web or this isn't going to work.
version = "4.1.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "cinnyapp";
repo = "cinny-desktop";
rev = "refs/tags/v${version}";
hash = "sha256-3HwKDD0O1Yx2OIjyO5FhV4d1INAIFXMO7FjSL7cOVmI=";
hash = "sha256-W73ma8ScF3LGv45yhZCV80zhh7URLuWhbi+JumyTp+4=";
};
sourceRoot = "${src.name}/src-tauri";
cargoHash = "sha256-CwB4S/5UuDH1LlJ4CY77XUCriplT3ZFfdg1j41AUoTI=";
cargoHash = "sha256-ved2W4+Dt7pN9j9vIaDlAkaY517nBEgPKgu8ArcHXsM=";
postPatch =
let
pkgs/by-name/ci/cinny-unwrapped/package.nix
+3 -3
View File
@@ -14,16 +14,16 @@
buildNpmPackage rec {
pname = "cinny-unwrapped";
version = "4.1.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "cinnyapp";
repo = "cinny";
rev = "v${version}";
hash = "sha256-GC+TvTPfirov4GxkTp0N3tkDQEAEdmPB71NzOBZQiqs=";
hash = "sha256-+sJQosQMji2iLGgOMRykSJm0zIhghsOsROJZvTQk2zQ=";
};
npmDepsHash = "sha256-dP+m/ocGn8szZuakrz8slSReNeepOF4Jf7L0/gnXWGU=";
npmDepsHash = "sha256-VSTpe1CA6lv5MoqXyk1iZSwzRc6Axy5cM8PmqPOyheA=";
# Fix error: no member named 'aligned_alloc' in the global namespace
env.NIX_CFLAGS_COMPILE = lib.optionalString (
pkgs/by-name/f2/f2fs-tools/package.nix
+2
View File
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
})
];
enableParallelBuilding = true;
meta = {
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/";
description = "Userland tools for the f2fs filesystem";
pkgs/by-name/fa/fantomas/package.nix
+2 -2
View File
@@ -2,9 +2,9 @@
buildDotnetGlobalTool {
pname = "fantomas";
version = "6.3.13";
version = "6.3.15";
nugetHash = "sha256-ZVNYG0GtFlNYLE1J8Ts4GEfJlEgoMaQwGdHdCX3ru50=";
nugetHash = "sha256-Gjw7MxjUNckMWSfnOye4UTe5fZWnor6RHCls3PNsuG8=";
meta = with lib; {
description = "F# source code formatter";
pkgs/by-name/fi/firefoxpwa/Cargo.lock
Generated
+623 -415
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/fi/firefoxpwa/package.nix
+2 -2
View File
@@ -28,13 +28,13 @@
rustPlatform.buildRustPackage rec {
pname = "firefoxpwa";
version = "2.12.1";
version = "2.12.3";
src = fetchFromGitHub {
owner = "filips123";
repo = "PWAsForFirefox";
rev = "v${version}";
hash = "sha256-0Yyd0mJK/eDallg9ERimvZIRCOTeDkzeAVUfDeNP928=";
hash = "sha256-+dQr8eMOvCKt3ZEVU/EbEroVSpLQsBC+1Wix01IrOyc=";
};
sourceRoot = "${src.name}/native";
pkgs/by-name/fl/flexget/package.nix
+7 -10
View File
@@ -5,7 +5,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.11.43";
version = "3.11.45";
pyproject = true;
# Fetch from GitHub in order to use `requirements.in`
@@ -13,21 +13,17 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-KX7Bvu4rt+Q7x2XkBiZMngAgqRKYu90EVi2oQ21o5AI=";
hash = "sha256-QtxtkXKBYf46cS+TAxJGQNQktHpLgGDIf7Czfznzr1s=";
};
postPatch = ''
# remove dependency constraints but keep environment constraints
sed 's/[~<>=][^;]*//' -i requirements.txt
'';
# relax dep constrains, keep environment constraints
pythonRelaxDeps = true;
build-system = with python3.pkgs; [
setuptools
wheel
];
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
# See https://github.com/Flexget/Flexget/blob/master/pyproject.toml
# and https://github.com/Flexget/Flexget/blob/develop/requirements.txt
apscheduler
beautifulsoup4
colorama
@@ -48,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
rich
rpyc
sqlalchemy
zstandard
# WebUI requirements
cherrypy
pkgs/os-specific/linux/fscryptctl/default.nix → pkgs/by-name/fs/fscryptctl/package.nix
+21 -14
View File
@@ -1,21 +1,28 @@
{ lib, stdenv, fetchFromGitHub }:
{
lib,
stdenv,
fetchFromGitHub,
pandoc,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "fscryptctl";
version = "1.0.0";
goPackagePath = "github.com/google/fscrypt";
version = "1.2.0";
src = fetchFromGitHub {
owner = "google";
repo = "fscryptctl";
rev = "v${version}";
sha256 = "1hwj726mm0yhlcf6523n07h0yq1rvkv4km64h3ydpjcrcxklhw6l";
rev = "v${finalAttrs.version}";
hash = "sha256-5suEdSpX8alDkSnSnyiIjUmZq98eK0ZPVAtDKhOs65c=";
};
nativeBuildInputs = [ pandoc ];
strictDeps = true;
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; {
meta = {
description = "Small C tool for Linux filesystem encryption";
mainProgram = "fscryptctl";
longDescription = ''
@@ -32,10 +39,10 @@ stdenv.mkDerivation rec {
As fscryptctl is intended for advanced users, you should read the kernel
documentation for filesystem encryption before using fscryptctl.
'';
inherit (src.meta) homepage;
changelog = "https://github.com/google/fscryptctl/releases/tag/v${version}";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
inherit (finalAttrs.src.meta) homepage;
changelog = "https://github.com/google/fscryptctl/blob/master/NEWS.md";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ primeos ];
};
}
})
pkgs/by-name/gl/glibtool/package.nix
+7
View File
@@ -0,0 +1,7 @@
{ libtool }:
libtool.overrideAttrs {
pname = "glibtool";
meta.mainProgram = "glibtool";
configureFlags = [ "--program-prefix=g" ];
}
pkgs/by-name/hd/hdr10plus_tool/Cargo.lock
Generated
+538 -490
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/hd/hdr10plus_tool/package.nix
+2 -5
View File
@@ -9,20 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "hdr10plus_tool";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "quietvoid";
repo = "hdr10plus_tool";
rev = "refs/tags/${version}";
hash = "sha256-EyKCdrilb6Ha9avEe5L4Snbufq8pEiTvr8tcdj0M6Zs=";
hash = "sha256-eP77LHADP9oenMACctPKU6xPzg4atC0dPOqyrFse/1s=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"plotters-0.3.5" = "sha256-cz8/chdq8C/h1q5yFcQp0Rzg89XHnQhIN1Va52p6Z2Y=";
};
};
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/li/libvmi/package.nix
+3 -3
View File
@@ -24,14 +24,14 @@
let
pname = "libvmi";
version = "0.14.0-unstable-2024-08-06";
version = "0.14.0-unstable-2024-09-04";
libVersion = "0.0.15";
src = fetchFromGitHub {
owner = "libvmi";
repo = "libvmi";
rev = "bdb9ffb8f1f70b425454bc41da2be353cc6cbf5c";
hash = "sha256-5K+9Qq5vGeYYy8kqWIeO25iNJoD/HvtyircH6odr/qA=";
rev = "033a0ec5468c29a93888385fd722798a2ca639b7";
hash = "sha256-NPcOqmTO4EligGsOTfyO6Bc1duyAoMuX85ICVIOWFE8=";
};
in
pkgs/by-name/lm/lms/package.nix
+9 -6
View File
@@ -17,16 +17,18 @@
libSM,
libICE,
stb,
openssl,
}:
stdenv.mkDerivation rec {
pname = "lms";
version = "3.56.0";
version = "3.57.0";
src = fetchFromGitHub {
owner = "epoupon";
repo = "lms";
rev = "v${version}";
hash = "sha256-o/wgh/PtFcTOmfl5H1cc1cTsWFvEnVQYhh4hPTnLNMU=";
hash = "sha256-KeskFVTZMxsFefbjnRBfrbS88Wt+2kwzboDziBsZJrY=";
};
strictDeps = true;
@@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
libSM
libICE
stb
openssl
];
postPatch = ''
@@ -77,12 +80,12 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath [libSM libICE]}"
'';
meta = with lib; {
meta = {
homepage = "https://github.com/epoupon/lms";
description = "Lightweight Music Server - Access your self-hosted music using a web interface";
license = licenses.gpl3Plus;
platforms = platforms.linux;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
mainProgram = "lms";
maintainers = with maintainers; [ mksafavi ];
maintainers = with lib.maintainers; [ mksafavi ];
};
}
pkgs/by-name/ma/maa-assistant-arknights/pin.json
+4 -4
View File
@@ -1,10 +1,10 @@
{
"stable": {
"version": "5.5.11452",
"hash": "sha256-SIOzKgxuVKnMnjybY0LValAOBKso+XishfDVK5JfVPs="
"version": "5.6.1",
"hash": "sha256-g2xa1xFzGtbzwECw9tXKeq0izuPwRr+a8+AUvBGq+xc="
},
"beta": {
"version": "5.5.11452",
"hash": "sha256-SIOzKgxuVKnMnjybY0LValAOBKso+XishfDVK5JfVPs="
"version": "5.6.1",
"hash": "sha256-g2xa1xFzGtbzwECw9tXKeq0izuPwRr+a8+AUvBGq+xc="
}
}
pkgs/by-name/mu/muse-sounds-manager/package.nix
+78
View File
@@ -0,0 +1,78 @@
{
lib,
stdenv,
fetchurl,
autoPatchelfHook,
dpkg,
fontconfig,
zlib,
icu,
libX11,
libXext,
libXi,
libXrandr,
libICE,
libSM,
openssl,
}:
stdenv.mkDerivation rec {
pname = "muse-sounds-manager";
version = "1.1.0.587";
# Use web.archive.org since upstream does not provide a stable (versioned) URL.
# To see if there are new versions on the Web Archive, visit
# http://web.archive.org/cdx/search/cdx?url=https://muse-cdn.com/Muse_Sounds_Manager_Beta.deb
# then replace the date in the URL below with date when the SHA1
# changes (currently A3NX3WHFZWXCHZVME2ABUL2VRENTWOD5) and replace
# the version above with the version in the .deb metadata (or in the
# settings of muse-sounds-manager).
src = fetchurl {
url = "https://web.archive.org/web/20240826143936/https://muse-cdn.com/Muse_Sounds_Manager_Beta.deb";
hash = "sha256-wzZAIjme1cv8+jMLiKT7kUQvCb+UhsvOnLDV4hCL3hw=";
};
nativeBuildInputs = [
autoPatchelfHook
dpkg
];
buildInputs = [
fontconfig
stdenv.cc.cc
zlib
] ++ runtimeDependencies;
runtimeDependencies = map lib.getLib [
icu
libX11
libXext
libXi
libXrandr
libICE
libSM
openssl
];
unpackPhase = "dpkg -x $src .";
installPhase = ''
runHook preInstall
mkdir -p $out
mv usr/* opt $out/
substituteInPlace $out/bin/muse-sounds-manager --replace-fail /opt/ $out/opt/
runHook postInstall
'';
meta = {
description = "Manage Muse Sounds (Muse Hub) libraries for MuseScore";
homepage = "https://musescore.org/";
license = lib.licenses.unfree;
mainProgram = "muse-sounds-manager";
maintainers = with lib.maintainers; [ orivej ];
platforms = [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}
pkgs/by-name/pm/pmtiles/package.nix
+3 -3
View File
@@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "pmtiles";
version = "1.20.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = "protomaps";
repo = "go-pmtiles";
rev = "v${version}";
hash = "sha256-ZwTZtMNgQE0AIbxdjA+8CFKSp1B9QnV5wmP+z/JoIpg=";
hash = "sha256-scicNAl1Lu8oD/g/63CXLeys+yorpH6Unhk5p4V78eY=";
};
vendorHash = "sha256-Buzk+rPSPrs0q+g6MWVb47cAIKMxsNXlj3CWA0JINXM=";
vendorHash = "sha256-8HShM4YznUAc6rJyDbdL5vv0dOk+d4IRKQpmEhWiNjo=";
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
pkgs/by-name/re/rectangle/package.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "rectangle";
version = "0.82";
version = "0.83";
src = fetchurl {
url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
hash = "sha256-Uwo98Mf7Ce6vbRRoNSsxtJh1zS5/p8Sicd/vcjczmVk=";
hash = "sha256-R364m1X0NQky/W9NzszUzP+2f06ZqBuJKh5m2uOXLmo=";
};
sourceRoot = ".";
pkgs/by-name/sc/scrcpy/package.nix
+3 -3
View File
@@ -16,12 +16,12 @@
}:
let
version = "2.6.1";
version = "2.7";
prebuilt_server = fetchurl {
name = "scrcpy-server";
inherit version;
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
hash = "sha256-ynq1Cy4loOWvdZnDA4PjZZg/pbgI5lzi4cG7pb/o3Ds=";
hash = "sha256-ojxWWfNsJg8QXAItJ7yz6v/6JgcOe6qe2mbQE3ehrbo=";
};
in
stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = "scrcpy";
rev = "refs/tags/v${version}";
hash = "sha256-p5OQKi6JEam+bmtMKUY9WsQlI7tpExsIZQgGdgOj2sE=";
hash = "sha256-OBMm/GkiIdZaJd9X62vY4M6FVKiHTBwqRtH220bYej4=";
};
# display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
pkgs/by-name/uw/uwsm/package.nix
+13 -6
View File
@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "uwsm";
version = "0.18.2";
version = "0.19.0";
src = fetchFromGitHub {
owner = "Vladimir-csp";
repo = "uwsm";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-/LmSc1AKNZ/VZ2rkUsOvwqpJmPgb6dThTtOu44BriQs=";
hash = "sha256-gptZld9BIQaujg9fGAgKD7wXjKeL5quXnSGOKn25jn8=";
};
nativeBuildInputs = [
@@ -60,12 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
"uuctl" = uuctlSupport;
"man-pages" = true;
})
(lib.mesonOption "python-bin" python.interpreter)
];
passthru = {
updateScript = nix-update-script { };
};
postInstall =
let
wrapperArgs = ''
@@ -85,9 +82,19 @@ stdenv.mkDerivation (finalAttrs: {
''}
'';
outputs = [
"out"
"man"
];
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Universal wayland session manager";
homepage = "https://github.com/Vladimir-csp/uwsm";
changelog = "https://github.com/Vladimir-csp/uwsm/releases/tag/v${finalAttrs.version}";
mainProgram = "uwsm";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
pkgs/by-name/wa/waylock/build.zig.zon.nix
+6 -6
View File
@@ -4,17 +4,17 @@
linkFarm "zig-packages" [
{
name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017";
name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz";
hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg=";
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE=";
};
}
{
name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d";
name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz";
hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA=";
url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz";
hash = "sha256-T+EZiStBfmxFUjaX05WhYkFJ8tRok/UQtpc9QY9NxZk=";
};
}
]
pkgs/by-name/wa/waylock/package.nix
+4 -4
View File
@@ -10,12 +10,12 @@
wayland,
wayland-scanner,
wayland-protocols,
zig_0_12,
zig_0_13,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "waylock";
version = "1.1.0";
version = "1.2.1";
src = fetchFromGitea {
domain = "codeberg.org";
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
repo = "waylock";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-U8xJucLpmeLdmSUc+AVSH/mlv6UOXsxotJPTMK7lnkA=";
hash = "sha256-i1Nd39666xrkzi7r08ZRIXJXvK9wmzb8zdmvmWEQaHE=";
};
deps = callPackage ./build.zig.zon.nix { };
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
scdoc
wayland-scanner
zig_0_12.hook
zig_0_13.hook
];
buildInputs = [
pkgs/development/compilers/dotnet/9/deps.nix
Generated
+8 -12
View File
@@ -1,14 +1,10 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "35169a2067db5037669cbd0c11b759b50b692ccc14b79095a94b505c73c89638"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.linux-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "88a997c651cee3e8e21c368214d105d431de9c4c0586ec76c4e3359212516c3d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "97dc9f86b3d5aa38e373c3af5c285fe02839b7e58ad04f65f8b7dcbf052f61d6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { hash = "sha256-3/wIVCbqYuAIODNUiA3MP1sCsjjk/6o8T9Ly3FGCm6k="; pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.linux-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { hash = "sha256-BcAIRDlYXwot6zLZnYq2cunSGfL7kV4E7dkrIQy0FAw="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { hash = "sha256-fz/yPLIQq/YKNxrBBoioTsqd2tktKhHso7Lpji2Hp/k="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "c225017aca3f2c4bd55faaf6dddc5b24a0b796d4ab8e8c9ba548d03e3de39e7e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.osx-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "816e910d9d0576404e4a2935bdb41ea551abb78a8a55fc33c01de9eb89f8d109"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "3acf49996decbf6b32c10ae39e181055ee071979ed0561d2569db84e58f360ff"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; sha256 = "7942962d93494931a1ed2cf7e11a20fe407a186a94bd8cd30e18c5449f195264"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.osx-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "fb72e3b48e47a43498f5e11ecb7094831a6fe3552f74fffb4482af150f09e39e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "b732ad55b1086e76458c79bfca10991d091abe0fc86367ba7606accf497d4afe"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "a0c6f109957b1aef641201cc95da7637b3ed15d945c75edcd978e77a5054976e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "96e02f1574f73caaa06f44bb0b7083e4dfcdc90f98d81e9dc94a7d1167b5b6ee"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
(fetchNuGet { hash = "sha256-Cnf16Gdf6i0o9RHafH3ADxAe9rYI1BF7X7shte+gNYo="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
(fetchNuGet { hash = "sha256-fAmxww6qryPdO4OztPXaG17wqdmMYV6I7jQgnKMbZSE="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "13fcc80223606a4b26ba78a8b82e2f2c730fc1cdc74883de0bb7a866057efcd0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "5506ee2b8732e36941e3265236540346ac67e0d4597c036f347835e58379ce6f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "3b6cdb847784016e0d2269ee2a578b7f8de2df0eea4f31f379d74aa459d7a7cd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "131879f89cc784e3cbad29b8b8358da314c8ee95747dedc2683e389ba0d422a1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
]
pkgs/development/compilers/dotnet/9/release-info.json
+3 -3
View File
@@ -1,5 +1,5 @@
{
"tarballHash": "sha256-DOBRHD6WnvLoCCm9PwtWqfL5CHR8xK3bU3zHsgmuDAM=",
"artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.7.24380.1.centos.9-x64.tar.gz",
"artifactsHash": "sha256-G1gMBCUMO3BiluShVu4sjLc6nLE9V/taXwIIlSOqhJc="
"tarballHash": "sha256-t4BQcN1rCG5XKfsJJqnpBHzyXtCrWbQaxpJ8gBpRrVk=",
"artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.1.24452.1.centos.9-x64.tar.gz",
"artifactsHash": "sha256-HRu23+7cJVAoTaFm0hnHk1lOC8HiBIvTs9TgWKVS8xw="
}
pkgs/development/compilers/dotnet/9/release.json
+6 -6
View File
@@ -1,10 +1,10 @@
{
"release": "9.0.0-preview.7",
"release": "9.0.0-rc.1",
"channel": "9.0",
"tag": "v9.0.0-preview.7.24405.7",
"sdkVersion": "9.0.100-preview.7.24407.1",
"runtimeVersion": "9.0.0-preview.7.24405.7",
"aspNetCoreVersion": "9.0.0-preview.7.24406.2",
"tag": "v9.0.0-rc.1.24431.7",
"sdkVersion": "9.0.100-rc.1.24452.1",
"runtimeVersion": "9.0.0-rc.1.24431.7",
"aspNetCoreVersion": "9.0.0-rc.1.24452.1",
"sourceRepository": "https://github.com/dotnet/dotnet",
"sourceVersion": "aecea31eada5f5506de2112d72b3bd238a5317b4"
"sourceVersion": "f2e150252ab0fe4f796fac30ba5ffeb22c1c4156"
}
pkgs/development/compilers/dotnet/packages.nix
+1 -3
View File
@@ -82,9 +82,7 @@ in {
'';
passthru = {
inherit (vmr) icu targetRid;
# ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215
hasILCompiler = false;
inherit (vmr) icu targetRid hasILCompiler;
};
meta = vmr.meta // {
pkgs/development/compilers/dotnet/update.sh
+5 -1
View File
@@ -264,7 +264,11 @@ sdk_packages () {
local newpkgs=()
local pkg
for pkg in "${pkgs[@]}"; do
[[ "$pkg" = *Microsoft.NETCore.DotNetHost* ]] || newpkgs+=("$pkg")
case "$pkg" in
*Microsoft.NETCore.DotNetHost*);;
Microsoft.NETCore.App.Runtime.Mono.*);;
*) newpkgs+=("$pkg");;
esac
done
pkgs=("${newpkgs[@]}")
fi
pkgs/development/compilers/dotnet/versions/9.0.nix
+94 -102
View File
@@ -1,148 +1,140 @@
{ buildAspNetCore, buildNetRuntime, buildNetSdk }:
# v9.0 (preview)
# v9.0 (go-live)
let
packages = { fetchNuGet }: [
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-preview.7.24406.2"; sha256 = "1jr7mhmjxc1cdxi21isz5g545yzxfv0pjxr1zrjnsfa7vanv8dyy"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "16adkc5yc1xd47q0bvg8zyhmyyqy8zli7gi8c1fmigxppyr214jr"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "1xqlfafqljnqnqy8524yfw7h17xby0qlqjj5fgb6bpx325v2n8rs"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "0mw4l8hb8bhb0hnx6jvz7989602qldsr1hb1xcfhw1d8xismgbii"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "17l0nkr6pgr5wi7md5kj0avvr3hgz8b67krccdmpi2x094ircl18"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "111n5jhak4lf9c5rdak0nbb6zvxzjvrvhy26k49ar6jg4narp88l"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "1bm9xqrmr4qnrsvzdq5w0fi76dndb70b3n9ampkq2gic87kl1cci"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "0gvnabw0i6vy3iir3bqwvg1vy93q5ifkpy3ax6vxlfqzf8pxrb9p"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-preview.7.24406.2"; sha256 = "1qhyj7nhj4mjj4hfhmfn7pgfz17h74wzaq5366qz5ibl45xrbi6k"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-preview.7.24406.2"; sha256 = "1vl88ywvl33mn9iz0x1mm8wiq7aviimpb2sjsb55dy53g4k86z4x"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.7.24406.2"; sha256 = "0j183nvfqf4d5sd0cza9zj273j2x744yjzv785d0xchqxlps0n2l"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "11iwchmhklaks9wf8df100p0hicwm2in88id4bb9g9syjyc7jg6v"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "1aw9smdvpr0fx52zk7nr23mi2l5z7v7d6r7ycvldm7bdp44gn2w6"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0hn3kpy5wswk7ndgwzjjvnf1w92ss6lcdgy79ackfx7mn7japyw5"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0ri5pn0x6rh6g9g2m165c4wlj2hlnchjh9l5jp7q6ccnjaqkp55j"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1kvwg5c4x849lw6dip9v9fxr3iwk6siwi80lla08jpkysshwjkwn"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0kldzbdcg3lhb4adgriq6v875cpq4b43v8nj39lr7s98q9sb5lx4"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1hpvw1nxpinsdihp0n12ap7m66qjbhq95cls7wbg44n6nyd1yaq8"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0ax6xw2ikz95nszwwn1ra77inlyzkmdcxcbg95qc0i3clf18d33m"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0apgg5lalz2r3bgvx6sg2pd20mgnyphpgfqw21g9wqq19fyx2kn5"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-preview.7.24405.7"; sha256 = "0qnlq06cagbzza3di41pv9mxcl9rqhkclqrdwfy0zwz8k0a9jj7a"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "025s5mss3jr7cnmsqqnv3spqv11a1240x34pwrbb50j250r7zyr3"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1g7rsqybpaifq5vr00pak029bg6gwyi33mvxkxr2wgawfbkggf34"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "18may21khp4m55d2r4w1j2b4p5wg319c8d9z9x0d9c3qlvv4rjl6"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0mnqqz1bwfv8a5c7agcmpr4rckdlllavsv91k387jh2lc5g503cv"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1h3kkqv33mzmng14b3h1fqqh777xck65ifmdzarma1v6r8hqw57n"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0kmdivwynf9m4al61kggv7iz6hph2sa2n9v0vyh5hrgls7k401lk"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1zx29hrcfzv01mr37qkm5ax43g2zyd1lslb5smy8mgwyjf4nvhzs"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1cm8ki8hkk7vmjsb7cwi61q30rjc0cjffcn95qzxppvb7rb3393y"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-preview.7.24405.7"; sha256 = "02v2dxs355cskcjb80k4vmxdw0g4g5v316h9rp0jmblm8kjvdnhz"; })
(fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0mb9kvi2whvbd3b2ny1z4cy93z3i6cr0b833dkn2w480hgkcksbn"; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0qlgx6byb3l534k5gw9jhpzcrnldcyix4gd46v3kz8a4g007bxw0"; })
(fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0fs86sapdib43p8pza2pb1qzdinvk8vzzh2mxhwia90mlxq9nmm3"; })
(fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0rcqhx7kaifcy0k3np3xar2pma8cs16d4626m4wnas0ndd6z4k6n"; })
(fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1zn4cam3fkzv8wr52sdrsi1bbqp8z2m1y7vs10s20f9va0k2yl7k"; })
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1lqs32l1bh74mbiyank4b2lzfvxrrm4ynj0hrlvl80hzrmq06ckm"; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1ah2bfaqcvwdazh4hyaxdjmlkx33kcmc722cblgasc9ybff5x41p"; })
(fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0i3kdgglwjq7spsynpvzc3bq9kxaa3b4jzm5zas09icqxvx7jvd5"; })
(fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1ayavdmw3883vdpr0lhs0kcav9f7ijnyh5h3m5ky38964bh5km8v"; })
(fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "03a3b21cx8yyb0d85q2f24sbzqahbyx7nyq08q834372ip8hyxw0"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "06iphzybm88nf890xficcjqyg5cmdp4jaiad1rikfjqn2g83gdf3"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0b4zp49xznypmv0ndh0vm2hnbkdnd0kh2i5gl3mjbmhjmmqbfwc3"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "0cs2krwqxrv7rdiiqrkvlfk37x6g5j7z6pp6xm149yfs12gkxdrz"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0mzdrim92ni6pgki7cslpz3w0f3048r2840bgpirdljbdz61hlyx"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-preview.7.24405.7"; sha256 = "1bxzzdsdb0xh63yx2vdns9s6i44nw7z1snqmzhg229v8srcz31md"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "1021rjnh4k86s30m50czgnypxxhlsdzldd3rl82915fjkj62wsy2"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0x4nm5cz6vqkyxs981y0c19crpbmlh3d70smch5mx3gipd3sy215"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0iaq2bw9mfga0c941vbkrd8lnlhzbvv62nifh2gc2nng19jwnmwl"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0fs8kwvfnhhr28lmsxa9rvncxbqi9pl74m8n3lasw413gnad59ix"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "16gw1hrnnfq4i5n0axz1nwx87nns7nsd48albdbp0c6x81rf9h1v"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1kf3hr2bcczx2g55zxa0p0lwfwgaj8hxi58f6alswn9520f46a6c"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "162g502facbqh1kzfc6m1n2hbwvxjc247vzy2hq7i1b2ii7qqllg"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "9.0.0-preview.7.24405.7"; sha256 = "1wzv5gs7ndiw890b6hc3xa1wmk2657q8dd8jkn10vpfvz1nwm3n1"; })
(fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1dfjyi7fbzw0apidc27liy48zqjrgs5m88dz1221wnsnnlb5smc6"; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1pyhhj2ypi4308ylq4qpaad95c92lqrp8cif5xi7vzfvakhimmfq"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "0shpgkbf94mq6nj3q8alrx7iciavm6w5sa3iyvkkm63zgls8ny32"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1dx8rwyhxq8hnqci835vvs8zbxainp08fq99ij77nzpbi6zqhpc8"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0cnk150d4cwcwc1dfnhlyyb6rvjyhl7vrvvi6xby1g5fcvrwni30"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "1labhjgjr9zgm632c76a2a7x7p17jzs0xspcbl90mw65bacy125j"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0ijcdszw57mfsacq57q7wmjnknfla5jhcj1xda9zskz7by5yrb1w"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1511lkh212ra48mdkb0glmzs46ha4hyvw4w3amqsnldgv0cg826j"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0riza61a8x3wmpvns95d8lvfqdwlvs6ha7hja4jakxkdpjdq71p6"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "17kvzypc53k03i65vj0841qhw6zgagpfnags7gjph6pv5drgh6a7"; })
(fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "011lklbi7ymjybihsfv5d2ldmqk3jwawcgy9119pk4igd4vzvrmd"; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "191iam6az00fd1y0r5fvxwj6wc7qm2hwhm2va5f9fkwlhsq2088j"; })
(fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "174pd1ja3cxxgvbd1hrk2samwmgazx2cjsi6irj2nlrc2vlh2swj"; })
(fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0p2cml2avj3qlrwyyiky6ajlbhrb14870xvnj3n4avxp9xb773bp"; })
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0pf46ym3kgll1vkap8f4syc2d36yfj8sb9596gm0hycv8kd5xrqj"; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "1anqzv6qg7i25izxgx081237rlqd8dfvk97cybcyjaazlygjn502"; })
(fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0l5xpyibs38yh5ra9q8jl4mzj5mybmfhid1f5p9yhzrsswcp3y8s"; })
(fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0pyych7c5j7fhd4f9gsfgkz9ncdsvaj8bp61c755lj1si34aa71l"; })
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.7.24405.7"; sha256 = "1l96la9apwnpgbgsbhgkd5v56aysr15x0v26fg0xcw79ms6vgpkc"; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "1ihwyj3s5rah4q59kgdj21k4varjnc1khahlwf5x76k9smc56908"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "05idm7kclnb8nw0nwv9wr40sm5fw7wk3zy2khiaiyvwf5c7klbkq"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1pxyk6yblg9y58w4lp9nb1dwwh0yvis4lq8b5w65ikihfyarm844"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1prajkaxj7j0jdf6s52pkmgxi8d8al6h7kvl9viwgqc3jqz2kib6"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "02kz3kagy2zq19vxq2rilnnc8lnal4g6l9zzsba3045daij0gp61"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1r8577sjl8bifagq8cz7lx2jzdhhn3r668h313mz7fxwl2bqwv1a"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1bdjl8kh80p3y51yngzvvz2kc9algsg5mx9givyapkcvj465pvhc"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "09ispgilx7ss1b43wqcy7c9k1145p622h22vg6z3c0g90i0n2qgw"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1lnz66r42mrxyfjdv5hswwmxv14fikn5p2il512vq0rmqq3fjwg7"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; sha256 = "0l3wb3v7grmpipd6p40dajzc574qmffv01g68n5c5qy38fs5kicl"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; sha256 = "1091fxvfq9zicgrx9cnk3x7xsg4389qxnj2cbfa6fq96p6rizhi1"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "16q6865rwblb2jiqvpiasw6fcq1n4h221pi3xgjdc62vkx0k5xd0"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "01c2ya9wmf7qkpxyjlnlflihxqpi6wrfq4slp3dylyaylypgha45"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "01qlklw2y6ci1mm8p4fcx4f7sx4lzx9rbn7d9pn1j85j2bb88rp9"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qidj6b5qymfggpgflg3173jalzmvxz662g9pkj02cd1kbm6qp5a"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x7vfky0ar1i3521xaai20a08j43cg2azdfghxg5dxaa1ynl53j5"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1i597rmx8ab3lbl4xkff5vnvkrikpm1zk1vd5b7bk8jyz1ls2wa2"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "008w5dlmnpc73mxk580l79a84djxnchyw8cjabh8d0255fk6p3a3"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bcfx38p4zqbvqvp3mrjm8yzcbh88i4vwd5af90z1ikfaml6841r"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "00lhshwp5gj8ckdq276lrjp7025xhmi33vlj1284xhfvbbfam58c"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1wqqq09ixbshswx59fq6ignj88izazw1k8sqp2iarxfv0jkv8fng"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "07qgqja3c1f62yfi3lqjjsyazp1hlkk41wkpk117b2xm8hw6yx4q"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0a0kmkrq99hk6sm690qwam6i0fdgzpx8yiawa6h4ylpazy8jxfxv"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qbaijdf4k3z71820r01z3sib5l7nlr6mjf75gil39yhd9s6slc7"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v56060wm998yy34pdr8cqp8vbc3m97yzsvc50rm6rkhdld44vql"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "08afgp9k7nr02jikd5xaim53qiqdn4r556v2sfmgv17mvix7vhmz"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ldmhq12xka64hn327p503m6ji12djkjax9lnr5lcflx527k5i3f"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "13qk3ppy0ym4x81jwxa0322hlzxhhg6vkb5n0xzyzy5ks8rfqnx0"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "17f4wkf7pq1c2hacl1z53am96wg5ydq9z0gsdz5zabkyfgs4knin"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1p39yik8xx87xv3jykljxv9jsazkkgcw47ckppzfzadf6967nh2r"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "0kqw9hnircqdbgpvk4m634nrn4lxj2p40a6qlscsqvw5yq06qvsz"; })
(fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "05y2i9grw8my2kg2svrrmpk2zflvcqidmkyycf58p9a3bmd2xp32"; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "00gsj3xwfpsc02rv4h75hrjq140ppr1bjqz5ics9xygj9gqrf40h"; })
(fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "12vld4zgmlm1s73vn3csss9v81zh53xv0hhw138rrizsl8sxb0x5"; })
(fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "09yn2lqvij53mv0w4n6fqpxhh15hp3fap1ymjjv4bv11y0gsml22"; })
(fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1xvhiswcni1z6czcmra2q25i6ih4pf5crfajgzb6mhvxxambk50x"; })
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02mlwynhl24avpyvllsgpmnrp6q05a3q5ia34anfs9fjxdbf31yr"; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1gxvgw12g617vj5gki2ag51ll4bxqfffbg5bkqjbnxig4ilh0xmi"; })
(fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v7fmdv74lgybk7bvighf5i1qwhlsb44lmxmkxn6f5ijc7jd1v5a"; })
(fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ql7115ihqqv09qzd23jd4ng7dnhk0vjiy892w2vnlaghkka1klr"; })
(fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02v6yklh3kw6xl8aacxjbsijrh0x8654hnjf3aa0qi5ffpng9czh"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0bi1vrf5g26gmwv5js7rc4g5anva0m0gsinr7cvqixd2g13jl708"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1r3p996mj6hvl7gi6kffbnmm744i24smlxb9ay8hbkjmagv7pjp2"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0llqrym4z3jrqf79hpl7w25vqnhrjsjmywayp5vr4c0y2bjpl3sk"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1hqfam3749yy15fyvqza54vvsx883kk0gq9fs2y78idmj0pr4g95"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; sha256 = "109f84rqdqj5vl0fxyb7nhq5lil9s1b7l6cv5y8z4gg139dv0z38"; })
(fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "08qm6yp5swc7zryk5qkkwbsxybn8if6zmrai280bll8ygn932594"; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0n5dgj0lhxcjzy8bbzkavz2d3ixf4d1diyq4i6nysgri81kk8wd6"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "10lr36pv80c31vpzpnl3jxs655xm2d2b1gj26891hzpwp0v1z9l6"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "07j0samh7jlkjphj2dlkphj0jrhs694qw2md6hr7mpinjr065ji4"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0j1nkhmkg3p9n626j04lqr1vv3xnpnzvnhr39j4cn0ixyr7pbfqd"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "1rq2ixq8r6r29mn2xi31jpck1xicgwg3zjzlvs5zdib8w7rxiznl"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "11pxn2gwss6s8rmkgzvrljjwndif3pdlpfy0l3y5fbq60rrv6gy9"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "044j6xkzylzawfjghqr5fkr63k0xhxvs7azmw8pbgh6mprmva4w9"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "16izyfqy0d2mvjl45z75ymhvjyrk5njrcfv1k7h223b1c1rn8p8d"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fvhwlyvz0fm9cd0pw7l9a64shc565yk47hp873y7dai4lsch03v"; })
(fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fnk9q8iplj70jqy490fgg67z6sx5kyblkwd8z730s9yc3jr3919"; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0yxnbm7p8s9s1j7rl7cmvg1j6xnxrp64qp4dsi9c5hzn0fxg3jjk"; })
(fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1lzfk31aq4kfaypbqrzv74vw1pw27576a1yxpdyxls84lmd10dsy"; })
(fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0cq9i0cfd4gg5vgywf2jvyn8mbqnwjz6gi20x7ij85bad9hanm82"; })
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0zv3brnkvn8v8ml2597vl7z1ydy71j6q7ycjkygy4l0b053870sw"; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0vgr2xnskksrnrwlzk0n7qrajwkmz7cyvaifb0jbcx3kyzchxiz7"; })
(fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v22m76v8f5kwd5baww7l81ap33jrw4ccsz0lyki3hj2ssmzvr3i"; })
(fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x8nafwsh0y0dycdpwjix1rxfkwk25irsqrbzcbqbdx3aas6jpk5"; })
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bbpncqbd2f73n8nznhi2m2i5z8n2hds0ryz616n0nzcc4y3gnkz"; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "08k1fzwvqyiqik98r0b03f089y4n06p5nfr73688rijgzm55l8zh"; })
];
in rec {
release_9_0 = "9.0.0-preview.7";
release_9_0 = "9.0.0-rc.1";
aspnetcore_9_0 = buildAspNetCore {
version = "9.0.0-preview.7.24406.2";
version = "9.0.0-rc.1.24452.1";
srcs = {
x86_64-linux = {
url = "https://download.visualstudio.microsoft.com/download/pr/bdb8a419-432c-4f1c-b5ad-ae6e27617b5c/65b26a64e3dda62c456a7a45df73dc1e/aspnetcore-runtime-9.0.0-preview.7.24406.2-linux-x64.tar.gz";
sha512 = "44f86c407b501a700aaeae2ce95cf544d85c08b41cdd12cee22bfcfdd03c4f6a16e495d9f8315f5e56a66b7e6187a4fc39d899f967a65f73883e40172343275c";
url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz";
sha512 = "f8fd285d67bb044d631596869d6301e10a2a243c81c9a05096a66aff4fb3431529812c7482e6cf0e065e8e065fc50b16b50d7f2a495ab30077a68bd45b3ba376";
};
aarch64-linux = {
url = "https://download.visualstudio.microsoft.com/download/pr/28370706-3338-4dd5-9992-6cd1d86ba666/354c9434538f587c3198fe57fa0d2e00/aspnetcore-runtime-9.0.0-preview.7.24406.2-linux-arm64.tar.gz";
sha512 = "706925fde5bb93b98e347540fe0983ce0819a2ca2520ed2d5bfc4515cb6852587a30f29852b512509b660daf8ee76ff3c8bb2d2fd78e47c6ae156e6f00cde918";
url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz";
sha512 = "84610a38fb9a98eb7bd26ba89a9c4998682ec3fffb5eade5bbafbafd63cac7d9a5279618bb5b2575d27feec098da5fe6f7150c67253f3f37762601590396e122";
};
x86_64-darwin = {
url = "https://download.visualstudio.microsoft.com/download/pr/d0813855-fdde-47df-8d71-119af034e409/40989f36db96de19bc682d62cbadd8e3/aspnetcore-runtime-9.0.0-preview.7.24406.2-osx-x64.tar.gz";
sha512 = "0f309d6b849ccec8e13812de9ff70fac5cc78785b71f356fc63e5070296305766892a3dfd74bae9b4775ec4449335d03d046494a416304f56e5ba7746f3316ca";
url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz";
sha512 = "ff4a6e35b41f5200521ea4b257b293e4d48f1786ccaa9cd85b55ba96ad36036dbc149d2ff820f1dff5f2d9acf6c38b6c3540e700c2c2db5fe6d82d4f85f461ae";
};
aarch64-darwin = {
url = "https://download.visualstudio.microsoft.com/download/pr/b2836c76-8c1d-4030-b7f6-0cd5ec1b640b/ea922caf251b0245b96ba2afd7ebb2b4/aspnetcore-runtime-9.0.0-preview.7.24406.2-osx-arm64.tar.gz";
sha512 = "8200af559c76f5bf12f5e0495c285a837dbe29c7ac2d6c562540f7077aa68fa65dc05205b4b219e72f78d55c20a75a514f6ccf3f53d6ecf34fd2cea0817a7ede";
url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz";
sha512 = "03f7e03352d1ad2d54e9de4c1cdd7a94c2311bb36d4c6296661fab286cddebf3f57204f73892efd53f43cfb13ba73cafae95d0522c47be03203d5fb69a0ecfe9";
};
};
};
runtime_9_0 = buildNetRuntime {
version = "9.0.0-preview.7.24405.7";
version = "9.0.0-rc.1.24431.7";
srcs = {
x86_64-linux = {
url = "https://download.visualstudio.microsoft.com/download/pr/41a47c9d-c08b-4abe-a2d1-920b51fe16b0/f6af3aa0615cc1625bfc77cd38e16d02/dotnet-runtime-9.0.0-preview.7.24405.7-linux-x64.tar.gz";
sha512 = "9ede46bc2e6f87a9f592f888562a4cdda6ffa01ca9822f6d4ae586a7c478d3e4fe6c70758a4e9ecbba86445978c68f805d1d6d6f4d37fc653a2b7510309dd5dc";
url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz";
sha512 = "9f9a85b8d9f6362ed2c2d0edefd04999181b2c386647644fbc1d9f248255387324399edb1c40bc7fa8c47adc22e2d71db5f25ce794521d59e46c40593b5f6cc5";
};
aarch64-linux = {
url = "https://download.visualstudio.microsoft.com/download/pr/248e66b8-594d-4738-8b01-2aa045faf3fd/686e989ba0365848fb4f81f8d780812c/dotnet-runtime-9.0.0-preview.7.24405.7-linux-arm64.tar.gz";
sha512 = "f7440b679315c6d35b12d839a1cf52c961784d56524f52e96a7834bbda7bf4e5bfd726081148cf71fb19b3107c7b1f39681a2fae7e87f1d9fa0634b70a47f4b2";
url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz";
sha512 = "8542bb9381e4eca6f0ebceddec68525cc59e34f7244613cf33cb2151f570c3345cb6d081c492b01070e762d3440f02d4558234532d58ff3dc919057e06b7bdac";
};
x86_64-darwin = {
url = "https://download.visualstudio.microsoft.com/download/pr/dc29a044-d48d-43cd-a56c-2b8cba456df2/888138574a36ee8c2fe1af2e33c1119d/dotnet-runtime-9.0.0-preview.7.24405.7-osx-x64.tar.gz";
sha512 = "17352746d1b780272766c6ea20bdb0961f8004bafc529877644fa536bc0e7441eb48d65cd05c4eb9017249651361c773d89b1ec1c1720bd4fce0fe965614d48a";
url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz";
sha512 = "f62f867eab633737c450ffb0543a726f1ba2f46a4265cb47978d88dad0c6b80a8db5ccf6f583842f85cb613b96d2f7c6806d669826f4b92b906e71d8d10e53e8";
};
aarch64-darwin = {
url = "https://download.visualstudio.microsoft.com/download/pr/a71e7742-36b6-4f68-a573-b3437fc53a77/571d8fff000e17abd5d820cafc600b63/dotnet-runtime-9.0.0-preview.7.24405.7-osx-arm64.tar.gz";
sha512 = "ade75303e39c33af6d7ea10369bb87d5d446619d2ffa630db1e8342b1577efe6831d8f32316fb0e0536e56e0adb7978c4e1b75ddef9a2d1cda8657b8fc457356";
url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz";
sha512 = "a825fca9edde53ab6abc0efe0c44d6fb25c5c77aeb2d35b6c414d42f364453ceb069ed9db8865c2bb82523989fceb7cccbf86047699590ff756a6b9c54c21d74";
};
};
};
sdk_9_0_1xx = buildNetSdk {
version = "9.0.100-preview.7.24407.12";
version = "9.0.100-rc.1.24452.12";
srcs = {
x86_64-linux = {
url = "https://download.visualstudio.microsoft.com/download/pr/84a39cad-2147-4a3e-b8fd-ec6fca0f80dd/d86fc06f750e758770f5a2237e01f5c5/dotnet-sdk-9.0.100-preview.7.24407.12-linux-x64.tar.gz";
sha512 = "3bc1bddb8bebbfa9e256487871c3984ebe2c9bc77b644dd25e4660f12c76042f500931135a080a97f265bc4c5504433150bde0a3ca19c3f7ad7127835076fc8e";
url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz";
sha512 = "e8130817b779d0104a6eee33d98d97c3fad1c336013435f47c0e9e22370172b75da37ade76e49dec7cbe696884390d2e6941cc69e2bad5593d6d1c6b41083051";
};
aarch64-linux = {
url = "https://download.visualstudio.microsoft.com/download/pr/9dce0bb1-16ab-4670-9af4-57b6bd1c0c21/ba6055b1ad714158742dd1b2373adaed/dotnet-sdk-9.0.100-preview.7.24407.12-linux-arm64.tar.gz";
sha512 = "c8ae08858c9ccf16d7b4879b7201ea22bd59e97f1924d4ff2b25079168c906d88a2864e6796244b67db612a36170969fef212879aa3b2232418795c7e7e6d526";
url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz";
sha512 = "f5742537128801c199a127266175066058788a26e8a603cbd26a1c16e9ef33a5d418e4790a3cea722d7de483eee8b68e0de4bb1dfdf279713369ed3b4d163a11";
};
x86_64-darwin = {
url = "https://download.visualstudio.microsoft.com/download/pr/4a7fc24d-481e-4202-8654-06cf5fba0ebd/a4084481acd9aa803ad1ebf3cd668646/dotnet-sdk-9.0.100-preview.7.24407.12-osx-x64.tar.gz";
sha512 = "b410a65d69f991ea55c81e5f7ea58c98ceef309d63ddd21a7689848a4a4516cdb898f8e36702a554a51fc22420cfbffe7a662a785175bbc1ebe1c33fcf6ffbf8";
url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz";
sha512 = "0d1f0718eeef006c3ecfbefeebf9df0772ec22c74db4bb635b6463b8aedfd3957274b908b51ec019ced69d3e7af4ae9252f18e87b14a4411e1089a4cc41e37d0";
};
aarch64-darwin = {
url = "https://download.visualstudio.microsoft.com/download/pr/49e6076a-438d-44de-a34d-6ad47af02423/f20bca6b909e3bd42679c14c8288fd0f/dotnet-sdk-9.0.100-preview.7.24407.12-osx-arm64.tar.gz";
sha512 = "0af77ffeb27e44b2e695caabfa85254f94c77807be6d96fc6abdda1d71be266857320c5dc02d5df968da8963a52cd2aea4b4cad6dfc6540ad26b7b532bf83fd9";
url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz";
sha512 = "af30b31cd937e9fc97e164b83628c2c1ecd21329b75f742d9f5232aa68427d25b5d702cc565aa860d3c738c8727790569bf66a3ed74e5cef719ae589d302846f";
};
};
inherit packages;
pkgs/development/compilers/dotnet/vmr.nix
+2 -8
View File
@@ -222,14 +222,6 @@ in stdenv.mkDerivation rec {
-r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \
eng/init-source-only.proj
# AOT is currently broken in binary SDKs, and the resulting executable is
# unable to find ICU
xmlstarlet ed \
--inplace \
-s //Project -t elem -n PropertyGroup \
-s \$prev -t elem -n NativeAotSupported -v false \
src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
# error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings]
substituteInPlace \
src/runtime/src/coreclr/ilasm/CMakeLists.txt \
@@ -442,6 +434,8 @@ in stdenv.mkDerivation rec {
passthru = {
inherit releaseManifest buildRid targetRid;
icu = _icu;
# ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215
hasILCompiler = lib.versionAtLeast version "9";
};
meta = with lib; {
pkgs/development/compilers/openjdk/openjfx/11/default.nix
+3 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_6-headless, python3, ruby
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_7-headless, python3, ruby
, openjdk11-bootstrap
, withMedia ? true
, withWebKit ? false
@@ -27,9 +27,10 @@ in stdenv.mkDerivation {
patches = [
../backport-ffmpeg-6-support-jfx11.patch
../backport-ffmpeg-7-support-jfx11.patch
];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ];
nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
pkgs/development/compilers/openjdk/openjfx/17/default.nix
+3 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
, ffmpeg_6-headless, python3, ruby
, ffmpeg_7-headless, python3, ruby
, withMedia ? true
, withWebKit ? false
}:
@@ -27,9 +27,10 @@ in stdenv.mkDerivation {
patches = [
../backport-ffmpeg-6-support-jfx11.patch
../backport-ffmpeg-7-support-jfx11.patch
];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ];
nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
pkgs/development/compilers/openjdk/openjfx/21/default.nix
+6 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, pkgs, fetchFromGitHub, writeText
, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
, libXxf86vm, glib, alsa-lib, ffmpeg_6, python3, ruby
, libXxf86vm, glib, alsa-lib, ffmpeg_7, python3, ruby
, withMedia ? true
, withWebKit ? false
}:
@@ -25,7 +25,11 @@ in stdenv.mkDerivation {
hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ];
patches = [
../backport-ffmpeg-7-support-jfx21.patch
];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ];
nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
pkgs/development/compilers/openjdk/openjfx/22/default.nix
+14 -4
View File
@@ -2,6 +2,7 @@
, lib
, pkgs
, fetchFromGitHub
, fetchpatch2
, writeText
, openjdk21_headless
, gradle
@@ -15,7 +16,7 @@
, libXxf86vm
, glib
, alsa-lib
, ffmpeg_6
, ffmpeg_7
, python3
, ruby
, withMedia ? true
@@ -25,7 +26,7 @@
let
pname = "openjfx-modular-sdk";
major = "22";
update = ".0.1";
update = ".0.2";
build = "-ga";
repover = "${major}${update}${build}";
jdk = openjdk21_headless;
@@ -38,10 +39,19 @@ in stdenv.mkDerivation {
owner = "openjdk";
repo = "jfx22u";
rev = repover;
hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q=";
hash = "sha256-7Q9nZ2p3KfQPt1A2ULwk64OU/5/ghEkcsf9ECD6Ln2g=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ];
patches = [
# 8338701: Provide media support for libavcodec version 61
# <https://github.com/openjdk/jfx/pull/1552>
(fetchpatch2 {
url = "https://github.com/openjdk/jfx/commit/6115b396bacf62f39dcaa93c7c0adcd60b428b8c.patch?full_index=1";
hash = "sha256-6EES4qsumFgXePZSDEetJC1Li65zquz3UjwRbq/6YJM=";
})
];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ];
nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
pkgs/development/compilers/openjdk/openjfx/22/deps.json
Generated
+2 -2
View File
@@ -7,8 +7,8 @@
}
},
"https://github.com": {
"unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": {
"zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="
"unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": {
"zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk="
}
},
"https://repo.maven.apache.org/maven2": {
pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch
+155
View File
@@ -0,0 +1,155 @@
Backported from <https://github.com/openjdk/jfx/pull/1552>.
Original author: Alexander Matveev <alexander.matveev@oracle.com>
diff --git a/build.gradle b/build.gradle
index d1ae3b401f..848a385f36 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3343,6 +3343,7 @@
media name: "ffmpeg-4.0.2", ext: "tar.gz"
media name: "ffmpeg-5.1.2", ext: "tar.gz"
media name: "ffmpeg-6.0", ext: "tar.gz"
+ media name: "ffmpeg-7.0.2", ext: "tar.gz"
}
implementation project(":base")
implementation project(":graphics")
@@ -3689,8 +3690,8 @@
doLast {
project.ext.libav = [:]
project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg"
- project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ]
- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ]
+ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ]
+ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ]
libav.versions.each { version ->
def libavDir = "${libav.basedir}/ffmpeg-${version}"
@@ -3770,7 +3771,7 @@
project.ext.libav.libavffmpeg.versions = [ "56" ]
project.ext.libav.ffmpeg = [:]
project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg"
- project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ]
+ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ]
project.ext.libav.versions.each { version ->
def libavDir = "${project.ext.libav.basedir}-${version}"
diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
index b05bb68341..2add519ed4 100644
--- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
+++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -126,6 +126,7 @@
dependencies.add("avplugin-ffmpeg-58");
dependencies.add("avplugin-ffmpeg-59");
dependencies.add("avplugin-ffmpeg-60");
+ dependencies.add("avplugin-ffmpeg-61");
}
if (HostUtils.isMacOSX()) {
dependencies.add("fxplugins");
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
index ee64e4bafd..0204db4250 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
@@ -146,7 +146,7 @@
// For ffmpeg (libavcodec-ffmpeg.so)
static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 };
// For libav or ffmpeg (libavcodec.so)
-static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 };
+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 };
/*
* Callback passed to dl_iterate_phdr(): finds the path of
diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
index bb93df5f96..a09b954714 100644
--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,5 +50,14 @@
// Do not call avcodec_register_all() and av_register_all()
// Not required since 58 and removed in 59
#define NO_REGISTER_ALL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0))
+
+// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead.
+// reordered_opaque is removed since 61.
+#define NO_REORDERED_OPAQUE (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
+
+// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same
+// except frame_num is 64-bit and frame_number is 32-bit. Since 61.
+#define USE_FRAME_NUM (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
+
#endif /* AVDEFINES_H */
diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
index fe1f96b9cb..9179ef8b68 100644
--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
@@ -397,10 +397,17 @@
if (av_new_packet(&decoder->packet, info.size) == 0)
{
memcpy(decoder->packet.data, info.data, info.size);
+#if NO_REORDERED_OPAQUE
+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
+ else
+ decoder->packet.pts = AV_NOPTS_VALUE;
+#else // NO_REORDERED_OPAQUE
if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
else
base->context->reordered_opaque = AV_NOPTS_VALUE;
+#endif // NO_REORDERED_OPAQUE
#if USE_SEND_RECEIVE
num_dec = avcodec_send_packet(base->context, &decoder->packet);
if (num_dec == 0)
@@ -432,10 +439,17 @@
av_init_packet(&decoder->packet);
decoder->packet.data = info.data;
decoder->packet.size = info.size;
+#if NO_REORDERED_OPAQUE
+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
+ else
+ decoder->packet.pts = AV_NOPTS_VALUE;
+#else // NO_REORDERED_OPAQUE
if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
else
base->context->reordered_opaque = AV_NOPTS_VALUE;
+#endif // NO_REORDERED_OPAQUE
#if USE_SEND_RECEIVE
num_dec = avcodec_send_packet(base->context, &decoder->packet);
@@ -480,10 +494,20 @@
}
else
{
+#if USE_FRAME_NUM
+ GST_BUFFER_OFFSET(outbuf) = base->context->frame_num;
+#else // USE_FRAME_NUM
GST_BUFFER_OFFSET(outbuf) = base->context->frame_number;
+#endif // USE_FRAME_NUM
+#if NO_REORDERED_OPAQUE
+ if (base->frame->pts != AV_NOPTS_VALUE)
+ {
+ GST_BUFFER_TIMESTAMP(outbuf) = base->frame->pts;
+#else // NO_REORDERED_OPAQUE
if (base->frame->reordered_opaque != AV_NOPTS_VALUE)
{
GST_BUFFER_TIMESTAMP(outbuf) = base->frame->reordered_opaque;
+#endif // NO_REORDERED_OPAQUE
GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same
}
pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch
+213
View File
@@ -0,0 +1,213 @@
Backported from <https://github.com/openjdk/jfx/pull/1552>.
Original author: Alexander Matveev <alexander.matveev@oracle.com>
diff --git a/build.gradle b/build.gradle
index f9dbc53076..77856226a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2946,6 +2946,7 @@
media name: "ffmpeg-4.0.2", ext: "tar.gz"
media name: "ffmpeg-5.1.2", ext: "tar.gz"
media name: "ffmpeg-6.0", ext: "tar.gz"
+ media name: "ffmpeg-7.0.2", ext: "tar.gz"
}
implementation project(":base")
implementation project(":graphics")
@@ -3292,8 +3293,8 @@
doLast {
project.ext.libav = [:]
project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg"
- project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ]
- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ]
+ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ]
+ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ]
libav.versions.each { version ->
def libavDir = "${libav.basedir}/ffmpeg-${version}"
@@ -3373,7 +3374,7 @@
project.ext.libav.libavffmpeg.versions = [ "56" ]
project.ext.libav.ffmpeg = [:]
project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg"
- project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ]
+ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ]
project.ext.libav.versions.each { version ->
def libavDir = "${project.ext.libav.basedir}-${version}"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 887b9d100c..a10610b0f5 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -28,6 +28,11 @@
<sha256 value="f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="" name="ffmpeg-7.0.2" version="">
+ <artifact name="ffmpeg-7.0.2-.tar.gz">
+ <sha256 value="1233b3a93dd7517cc3c56b72a67f64041c044848d981e3deff4bebffa25f1054" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="" name="icu4c-73_1-data-bin-l" version="">
<artifact name="icu4c-73_1-data-bin-l-.zip">
<sha256 value="4038298ee02a0c38917185ef8ff4ebde9c8b552c777fd03e4df6c6b4b1825e20" origin="Generated by Gradle"/>
diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
index 097004bd17..0c2ae1ddbc 100644
--- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
+++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -127,6 +127,7 @@
dependencies.add("avplugin-ffmpeg-58");
dependencies.add("avplugin-ffmpeg-59");
dependencies.add("avplugin-ffmpeg-60");
+ dependencies.add("avplugin-ffmpeg-61");
}
if (PlatformUtil.isMac()) {
dependencies.add("fxplugins");
diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
index 22c8be9300..38bae197fe 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
@@ -146,7 +146,7 @@
// For ffmpeg (libavcodec-ffmpeg.so)
static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 };
// For libav or ffmpeg (libavcodec.so)
-static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 };
+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 };
/*
* Callback passed to dl_iterate_phdr(): finds the path of
diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
index 60fa7b631c..f49ad56e1e 100644
--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -53,5 +53,13 @@
// Not required since 58 and removed in 59
#define NO_REGISTER_ALL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0))
+// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead.
+// reordered_opaque is removed since 61.
+#define NO_REORDERED_OPAQUE (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
+
+// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same
+// except frame_num is 64-bit and frame_number is 32-bit. Since 61.
+#define USE_FRAME_NUM (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
+
#endif /* AVDEFINES_H */
diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
index c9fa787e63..8a5cd78f2d 100644
--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
@@ -554,7 +554,11 @@
if (ret < 0)
return FALSE;
+#if NO_REORDERED_OPAQUE
+ decoder->dest_frame->pts = base->frame->pts;
+#else // NO_REORDERED_OPAQUE
decoder->dest_frame->reordered_opaque = base->frame->reordered_opaque;
+#endif // NO_REORDERED_OPAQUE
return TRUE;
}
@@ -679,7 +683,7 @@
GstMapInfo info2;
gboolean unmap_buf = FALSE;
gboolean set_frame_values = TRUE;
- int64_t reordered_opaque = AV_NOPTS_VALUE;
+ int64_t pts = AV_NOPTS_VALUE;
unsigned int out_buf_size = 0;
gboolean copy_error = FALSE;
uint8_t* data0 = NULL;
@@ -711,10 +715,17 @@
if (av_new_packet(&decoder->packet, info.size) == 0)
{
memcpy(decoder->packet.data, info.data, info.size);
+#if NO_REORDERED_OPAQUE
+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
+ else
+ decoder->packet.pts = AV_NOPTS_VALUE;
+#else // NO_REORDERED_OPAQUE
if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
else
base->context->reordered_opaque = AV_NOPTS_VALUE;
+#endif // NO_REORDERED_OPAQUE
#if USE_SEND_RECEIVE
num_dec = avcodec_send_packet(base->context, &decoder->packet);
if (num_dec == 0)
@@ -746,10 +757,17 @@
av_init_packet(&decoder->packet);
decoder->packet.data = info.data;
decoder->packet.size = info.size;
+#if NO_REORDERED_OPAQUE
+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
+ else
+ decoder->packet.pts = AV_NOPTS_VALUE;
+#else // NO_REORDERED_OPAQUE
if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
else
base->context->reordered_opaque = AV_NOPTS_VALUE;
+#endif // NO_REORDERED_OPAQUE
#if USE_SEND_RECEIVE
num_dec = avcodec_send_packet(base->context, &decoder->packet);
@@ -796,7 +814,11 @@
goto _exit;
}
- reordered_opaque = decoder->dest_frame->reordered_opaque;
+#if NO_REORDERED_OPAQUE
+ pts = decoder->dest_frame->pts;
+#else // NO_REORDERED_OPAQUE
+ pts = decoder->dest_frame->reordered_opaque;
+#endif // NO_REORDERED_OPAQUE
data0 = decoder->dest_frame->data[0];
data1 = decoder->dest_frame->data[1];
data2 = decoder->dest_frame->data[2];
@@ -806,7 +828,11 @@
if (set_frame_values)
{
- reordered_opaque = base->frame->reordered_opaque;
+#if NO_REORDERED_OPAQUE
+ pts = base->frame->pts;
+#else // NO_REORDERED_OPAQUE
+ pts = base->frame->reordered_opaque;
+#endif // NO_REORDERED_OPAQUE
data0 = base->frame->data[0];
data1 = base->frame->data[1];
data2 = base->frame->data[2];
@@ -825,10 +851,14 @@
}
else
{
+#if USE_FRAME_NUM
+ GST_BUFFER_OFFSET(outbuf) = base->context->frame_num;
+#else // USE_FRAME_NUM
GST_BUFFER_OFFSET(outbuf) = base->context->frame_number;
- if (reordered_opaque != AV_NOPTS_VALUE)
+#endif // USE_FRAME_NUM
+ if (pts != AV_NOPTS_VALUE)
{
- GST_BUFFER_TIMESTAMP(outbuf) = reordered_opaque;
+ GST_BUFFER_TIMESTAMP(outbuf) = pts;
GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same
}
pkgs/development/cuda-modules/tensorrt/fixup.nix
+1 -2
View File
@@ -99,9 +99,8 @@ finalAttrs: prevAttrs: {
cudnn =
let
desiredName = mkVersionedPackageName "cudnn" package.cudnnVersion;
desiredIsAvailable = final ? desiredName;
in
if package.cudnnVersion == null || !desiredIsAvailable then final.cudnn else final.${desiredName};
if package.cudnnVersion == null || (final ? desiredName) then final.cudnn else final.${desiredName};
};
meta = prevAttrs.meta // {
pkgs/development/cuda-modules/tensorrt/releases.nix
+16
View File
@@ -125,6 +125,22 @@
filename = "TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz";
hash = "sha256-D4FXpfxTKZQ7M4uJNZE3M1CvqQyoEjnNrddYDNHrolQ=";
}
{
version = "10.3.0.26";
minCudaVersion = "11.0";
maxCudaVersion = "11.8";
cudnnVersion = "8.9";
filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-11.8.tar.gz";
hash = "sha256-1O9TwlUP0eLqTozMs53EefmjriiaHjxb4A4GIuN9jvc=";
}
{
version = "10.3.0.26";
minCudaVersion = "12.0";
maxCudaVersion = "12.5";
cudnnVersion = "8.9";
filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-12.5.tar.gz";
hash = "sha256-rf8c1avl2HATgGFyNR5Y/QJOW/D8YdSe9LhM047ZkIE=";
}
];
};
}
pkgs/development/libraries/coin3d/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "coin3d";
repo = "coin";
rev = "v${finalAttrs.version}";
hash = "sha256-EeLfIu+InGy56zqjhbNle4hPjQmzwqzHA4ODBMjb9kg=";
hash = "sha256-dUFmcUOdNc3ZFtr+Hnh3Q3OY/JA/WxmiRJiU2RFSSus=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/gtk4-layer-shell/default.nix
+2
View File
@@ -7,6 +7,7 @@
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
, wayland-protocols
, wayland-scanner
, wayland
, gtk4
@@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
docbook_xml_dtd_43
vala
wayland-scanner
wayland-protocols
];
buildInputs = [
pkgs/development/python-modules/aiostreammagic/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiostreammagic";
version = "2.3.0";
version = "2.3.1";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "noahhusby";
repo = "aiostreammagic";
rev = "refs/tags/${version}";
hash = "sha256-qfiLYl2FYT4SNv02aGQoRJPvMzBiPKj/yozdkTFOykU=";
hash = "sha256-IMCs4EgOign56mThQ3ljnHs7/lt5874Ni1kavkHnKws=";
};
pythonRelaxDeps = [ "websockets" ];
pkgs/development/python-modules/command-runner/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "command-runner";
version = "1.6.0";
version = "1.7.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "netinvent";
repo = "command_runner";
rev = "refs/tags/v${version}";
hash = "sha256-QzqkcF2/YExK/dz+b0Uk0Af/rAXRMuRIeEynyFgDql8=";
hash = "sha256-rdbZtqNndtIxrLA90eWzR6dB8EyFrBALduBUkOVq4oE=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/django-modeltranslation/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
let
# 0.18.12 was yanked from PyPI, it refers to this issue:
# https://github.com/deschler/django-modeltranslation/issues/701
version = "0.19.8";
version = "0.19.9";
in
buildPythonPackage {
pname = "django-modeltranslation";
@@ -23,7 +23,7 @@ buildPythonPackage {
owner = "deschler";
repo = "django-modeltranslation";
rev = "refs/tags/v${version}";
hash = "sha256-23htGjPtupmg/oSO/5SuxOfbDmRQKrqx2/lvfqYp7dA=";
hash = "sha256-2GTz+niXfEsi++KyL6+HtwdzO1YFhpKQsDK3F8GAl4A=";
};
disabled = pythonOlder "3.6";
pkgs/development/python-modules/pyhanko/default.nix
+34 -25
View File
@@ -1,32 +1,40 @@
{
lib,
aiohttp,
asn1crypto,
stdenv,
buildPythonPackage,
certomancer,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
asn1crypto,
click,
cryptography,
defusedxml,
fetchFromGitHub,
fonttools,
freezegun,
oscrypto,
pillow,
pyhanko-certvalidator,
pytest-aiohttp,
pytestCheckHook,
python-barcode,
python-pae,
python-pkcs11,
pythonOlder,
pyyaml,
qrcode,
requests,
requests-mock,
setuptools,
tzlocal,
# optional-dependencies
oscrypto,
defusedxml,
fonttools,
uharfbuzz,
pillow,
python-barcode,
python-pkcs11,
aiohttp,
xsdata,
# tests
certomancer,
freezegun,
pytest-aiohttp,
pytestCheckHook,
python-pae,
requests-mock,
}:
buildPythonPackage rec {
@@ -34,8 +42,6 @@ buildPythonPackage rec {
version = "0.25.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "MatthiasValvekens";
repo = "pyHanko";
@@ -56,7 +62,7 @@ buildPythonPackage rec {
tzlocal
];
passthru.optional-dependencies = {
optional-dependencies = {
extra-pubkey-algs = [ oscrypto ];
xmp = [ defusedxml ];
opentype = [
@@ -76,11 +82,11 @@ buildPythonPackage rec {
aiohttp
certomancer
freezegun
python-pae
pytest-aiohttp
requests-mock
pytestCheckHook
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
python-pae
requests-mock
] ++ lib.flatten (lib.attrValues optional-dependencies);
disabledTestPaths = [
# ModuleNotFoundError: No module named 'csc_dummy'
@@ -115,12 +121,15 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pyhanko" ];
meta = with lib; {
meta = {
description = "Sign and stamp PDF files";
mainProgram = "pyhanko";
homepage = "https://github.com/MatthiasValvekens/pyHanko";
changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/v${version}/docs/changelog.rst";
license = licenses.mit;
license = lib.licenses.mit;
maintainers = [ ];
# Most tests fail with:
# OSError: One or more parameters passed to a function were not valid.
broken = stdenv.isDarwin;
};
}
pkgs/development/python-modules/pymupdf/default.nix
-3
View File
@@ -194,8 +194,5 @@ buildPythonPackage rec {
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ teto ];
platforms = lib.platforms.unix;
# ImportError: cannot import name '_mupdf' from partially initialized module 'mupdf'
# (most likely due to a circular import)
broken = true;
};
}
pkgs/development/python-modules/pynmeagps/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pynmeagps";
version = "1.0.39";
version = "1.0.41";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "semuconsulting";
repo = "pynmeagps";
rev = "refs/tags/v${version}";
hash = "sha256-aBNvrqGDCUOn3wiTwqmanUQzBuiPNDSguZhlznYXUkY=";
hash = "sha256-c80OACBwohlTBGvBZValv+AMOKLd32PrPf/JzqETjDU=";
};
postPatch = ''
pkgs/development/python-modules/python-bidi/default.nix
+6 -3
View File
@@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
rustPlatform,
libiconv,
pytestCheckHook,
}:
@@ -24,6 +25,8 @@ buildPythonPackage rec {
hash = "sha256-34R8T8cXiX1iRx/Zb51Eb/nf0wLpN38hz0VnsmzPzws=";
};
buildInputs = [ libiconv ];
build-system = [
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
@@ -35,11 +38,11 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
meta = {
homepage = "https://github.com/MeirKriheli/python-bidi";
description = "Pure python implementation of the BiDi layout algorithm";
mainProgram = "pybidi";
platforms = platforms.unix;
maintainers = with maintainers; [ freezeboy ];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ freezeboy ];
};
}
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1231";
version = "3.0.1232";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-XDFAUIP/oA71dK+QMUrh9ZmusJFzrpuI+0ExW+A6FIU=";
hash = "sha256-aPqhdOJH+cOqohf6zvo5X5nf+Kb6HLZ+UCc3SQ13C6w=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/textual/default.nix
+11 -4
View File
@@ -4,8 +4,10 @@
fetchFromGitHub,
jinja2,
markdown-it-py,
platformdirs,
poetry-core,
pytest-aiohttp,
pytest-xdist,
pytestCheckHook,
pythonOlder,
rich,
@@ -18,7 +20,7 @@
buildPythonPackage rec {
pname = "textual";
version = "0.72.0";
version = "0.79.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -27,12 +29,13 @@ buildPythonPackage rec {
owner = "Textualize";
repo = "textual";
rev = "refs/tags/v${version}";
hash = "sha256-iNl9bos1GBLmHRvSgqYD8b6cptmmMktXkDXQbm3xMtc=";
hash = "sha256-QD9iRgl6hwlFL5DLYyXL5aA/Xsvpe5/KXdEdMS+3L/8=";
};
build-system = [ poetry-core ];
dependencies = [
platformdirs
markdown-it-py
rich
typing-extensions
@@ -41,13 +44,13 @@ buildPythonPackage rec {
optional-dependencies = {
syntax = [
tree-sitter
tree-sitter-languages
];
] ++ lib.optionals (!tree-sitter-languages.meta.broken) [ tree-sitter-languages ];
};
nativeCheckInputs = [
jinja2
pytest-aiohttp
pytest-xdist
pytestCheckHook
syrupy
time-machine
@@ -68,6 +71,10 @@ buildPythonPackage rec {
"test_language_binary_missing"
];
# Some tests in groups require state from previous tests
# See https://github.com/Textualize/textual/issues/4924#issuecomment-2304889067
pytestFlagsArray = [ "--dist=loadgroup" ];
pythonImportsCheck = [ "textual" ];
__darwinAllowLocalNetworking = true;
pkgs/development/python-modules/weatherflow4py/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "weatherflow4py";
version = "1.0.4";
version = "1.0.6";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "jeeftor";
repo = "weatherflow4py";
rev = "refs/tags/v${version}";
hash = "sha256-6LSxv1Lh9UUo0Y7I/BvxEPtIkOjIAYon32mcoS1Gxxs=";
hash = "sha256-NazRT/gSaxat90eA66ajjVPvN9UFNEX4y1hfOtu9UoE=";
};
build-system = [ poetry-core ];
pkgs/development/tools/altair-graphql-client/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
let
pname = "altair";
version = "7.3.5";
version = "7.3.6";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-Cqtb48OabU2rGbbZIEfLS2J3o3UMkt1U75U8JU097rs=";
sha256 = "sha256-jXFEpcmv8bkm7Yyo2GUwoakMlAwArCoZ1jIDeyF87Ms=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
pkgs/development/tools/coder/default.nix
+5 -5
View File
@@ -14,12 +14,12 @@ let
channels = {
stable = {
version = "2.14.2";
version = "2.14.3";
hash = {
x86_64-linux = "sha256-Qglz8F80QICwWOVwDELegewYHkPhhrTEuGKJgiw2mYg=";
x86_64-darwin = "sha256-uyslQIAXOROSdtyiLSUcxEwYzK+iDup8/jRI74QGcEo=";
aarch64-linux = "sha256-rzTBfO8+DSxJjhjIhl8qNji8bWe/EGZ4dG17D8wjlkA=";
aarch64-darwin = "sha256-+lFWz6qDuhtDNn7DID/lmpqltpEwftVP3U+2CseVMnY=";
x86_64-linux = "sha256-CDQmixywYDLj3ABqTEnaUftITSFGA/wGAfe0IFoU64g=";
x86_64-darwin = "sha256-TDpoby2lBw8W6zJrHgF/AQFQL+j9dv3d21VLsiSd1sk=";
aarch64-linux = "sha256-L+2YOMgH1cCl4o1VFZk1dC258/XStgiH9lr9PEQOPSo=";
aarch64-darwin = "sha256-hG3HsJ+DIjwB5ehT+Hd3EZduvjNXYTZLYbAYCRWWiQ8=";
};
};
mainline = {
pkgs/development/tools/fastddsgen/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
let
pname = "fastddsgen";
version = "4.0.0";
version = "4.0.1";
gradle = gradle_7;
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
repo = "Fast-DDS-Gen";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-Gs2O/8AIjpvN55HtA3gEwfBqxNZ3rqpVlJnTwOm4wXM=";
hash = "sha256-6kZndC5v/75FKY78jwmMuFXWpWzxZkCesYK4GLYxUY8=";
};
nativeBuildInputs = [
pkgs/development/tools/micronaut/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "micronaut";
version = "4.6.1";
version = "4.6.2";
src = fetchzip {
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
sha256 = "sha256-hIjFKYuA5OBHQuNu4BzGhO1USs3adLeQvCv3I/2WkGs=";
sha256 = "sha256-y+/qdZ9Kl6rVoziss+UipkU4/QSqZuD7J3efWdWNfl8=";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
pkgs/development/tools/parsing/tree-sitter/default.nix
+3 -3
View File
@@ -27,8 +27,8 @@ let
# 2) nix-build -A tree-sitter.updater.update-all-grammars
# 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
# 4) run the ./result script that is output by that (it updates ./grammars)
version = "0.22.6";
hash = "sha256-jBCKgDlvXwA7Z4GDBJ+aZc52zC+om30DtsZJuHado1s=";
version = "0.23.0";
hash = "sha256-QNi2u6/jtiMo1dLYoA8Ev1OvZfa8mXCMibSD70J4vVI=";
src = fetchFromGitHub {
owner = "tree-sitter";
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage {
pname = "tree-sitter";
inherit src version;
cargoHash = "sha256-44FIO0kPso6NxjLwmggsheILba3r9GEhDld2ddt601g=";
cargoHash = "sha256-H4baEmGsQx+W9EXblt8R1CTYfkgR+dQDAsIwPVsqR68=";
buildInputs =
lib.optionals stdenv.isDarwin [ Security CoreServices ];
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/polarmutex/tree-sitter-beancount",
"rev": "6c665e7cf15d76a1687959643868a78fb381458d",
"date": "2024-03-09T18:30:23-05:00",
"path": "/nix/store/al4c5f670bl596mlp3vk1njz7w8bhq98-tree-sitter-beancount",
"sha256": "0cwiw69br9y8w5iysdh31i4vlvfgj79zvpkz93y1spyxx6vlylc5",
"hash": "sha256-hVFPt+ndXx38SH/e/dORz226SQwDNu1j4cinvJLhkTM=",
"rev": "321b12d0b02923c36e8cd9768afe6db5ced98e33",
"date": "2024-07-19T21:09:17-04:00",
"path": "/nix/store/v8yv84fm0n134mr5vmwbpr4cpyl71vxz-tree-sitter-beancount",
"sha256": "1milrdb8ka5vkypl0b44xgfdn0haydg2fz7489djcwpjkx7gfrsg",
"hash": "sha256-T2f3Tp/yciZbQuR8J17zCgLb3OuELECvn7uoiVbLNNY=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/sogaiu/tree-sitter-clojure",
"rev": "3a1ace906c151dd631cf6f149b5083f2b60e6a9e",
"date": "2024-05-15T19:51:17+09:00",
"path": "/nix/store/naaja1ijjxpsln6fr62sd4m3sgygb309-tree-sitter-clojure",
"sha256": "1j41ba48sid6blnfzn6s9vsl829qxd86lr6yyrnl95m42x8q5cx4",
"hash": "sha256-pLOCUReklkRt9t5kalDrOAlE9U7a2O8sXaZFjYhagcg=",
"rev": "f4236d4da8aa92bc105d9c118746474c608e6af7",
"date": "2024-05-22T23:05:15+09:00",
"path": "/nix/store/vl1d7aql1bcvn65khrgs13rfk90q08ik-tree-sitter-clojure",
"sha256": "16hnb5d8shz216sv9hj5hxpg63ri86w5pf9bzi5z3f37zh7vlljj",
"hash": "sha256-UlK6D/xnuPFL/Cu5W7hBMQ/zbodFwrS1CeJDjVpZFpo=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/uyha/tree-sitter-cmake",
"rev": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3",
"date": "2024-03-19T09:50:27+02:00",
"path": "/nix/store/2fcf8g6rryigpy6grr284qzgmqw1gkd5-tree-sitter-cmake",
"sha256": "16klinbjr9k5piwqvfvl48wmprk9wlypqnmihryy2wj2m2xzlyqa",
"hash": "sha256-Cnv6u6hCcuF9hrFafD3laeZbOSJ0u415vGWmLJeNdJo=",
"rev": "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71",
"date": "2024-06-20T12:32:15+07:00",
"path": "/nix/store/ldbzx710y8wy6dwca0hh8l4aa3cihbr2-tree-sitter-cmake",
"sha256": "10lj4f0h8bcbyl03rxgfhizj4vn6fz47jw6clfjz0c1ayxzql9av",
"hash": "sha256-WyWKf/cqMPClo8xwech3xm4if4Tu9TwA9YstBIEjkoI=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-cpp",
"rev": "2369fa991eba294e9238e28280ffcd58132f94bc",
"date": "2024-04-30T23:37:25-04:00",
"path": "/nix/store/6zvwyr1034vawcvw8yra4rcjb6m7shlj-tree-sitter-cpp",
"sha256": "1dbb8w4dyzgp7czqnrdfyjbm6zyyxbxqmfzmrj6kd37vcxldxq5d",
"hash": "sha256-reDeaGf7jDaNzPW7ivvq3n9Tl/SuZYs/O/d93whHa7U=",
"rev": "30f973c2244f0bff444186185f475c3bd76bc3a5",
"date": "2024-09-02T20:54:34-04:00",
"path": "/nix/store/rmnzl3zg6jpqcxlya59xgyvwq53kabk3-tree-sitter-cpp",
"sha256": "0jd6rprbcbc6bd5rppxw21vlg8sv2h8f9bpby45bbb8w3n7ysjmg",
"hash": "sha256-r0rtjx0crbUK8euu5BAUW6NHdxC835tLW4YttvLNpkk=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-css",
"rev": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af",
"date": "2024-05-05T18:14:34-04:00",
"path": "/nix/store/iw66hs4n4wmf9mjaj4zb78diwfkb8y4d-tree-sitter-css",
"sha256": "1mq5yzcj16bv9jphgj0v16fsa9bzf7y204c78mf79ls2rqsanljp",
"hash": "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc=",
"rev": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7",
"date": "2024-09-02T04:29:00-04:00",
"path": "/nix/store/46v1b4mfmsgd7sk48n6l613vjcxpl3gg-tree-sitter-css",
"sha256": "1apypprrqn23ghay11w35vz31crpjdby6imjhnxq9cqj9rvhxgx3",
"hash": "sha256-o78Od04Ss4S7hbJG41eTN7Mw/i6Dh+AVfENYnPO9/qo=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/thehamsta/tree-sitter-cuda",
"rev": "4ec5afdf98041d137c25b555958a1f825c7c1272",
"date": "2024-04-02T22:40:43+02:00",
"path": "/nix/store/2n6dkgdvhfd34qa48b5824qbw1pc7899-tree-sitter-cuda",
"sha256": "1n840xzsx56w3hys263f216ih901jh456yxdmm0i274ijwngn38h",
"hash": "sha256-EA37LJeRHBFBra17UwiUASQYTRBuGKE9HNyUrn8HBNk=",
"rev": "cbce8aedc6fa35313a4cecd206196011a08a85c4",
"date": "2024-08-22T22:57:54+02:00",
"path": "/nix/store/4ygv7b9ap52kb03cv7mihsq86g6vgfpc-tree-sitter-cuda",
"sha256": "12q2zpfll8n72yccxkqjh36cmmpj2fyivkq6fghzbs9kf4mvwy12",
"hash": "sha256-Ini+K3Ez6fXhcwbPHb0T8tbKzIASz86YF8ciSt39Aos=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/usernobody14/tree-sitter-dart",
"rev": "ac0bb849ccd1a923963af47573b5e396736ff582",
"date": "2024-04-28T11:52:00-06:00",
"path": "/nix/store/7sfa8zsg3p14rm0dbgv030s86lk8fv3w-tree-sitter-dart",
"sha256": "0vm0yd2km73cyl2dph5qwb1fbgjjambn9mi4k7jxh495wrmk8hn8",
"hash": "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4=",
"rev": "9ac03bb2154316624fb4c41fe0f372a5f1597b43",
"date": "2024-09-01T14:20:26-06:00",
"path": "/nix/store/g3q5dd40gjm0iwf19afz3vz5amvr7dsg-tree-sitter-dart",
"sha256": "0nn7in0qr23vjkyk7ynyaw3rlbisx8vsvwf2yqclshdm72qabd7i",
"hash": "sha256-8bSlsDi1QU0Z9sLxrTfqOi6aB1fe+jP9lHuIjIGNx1o=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/glehmann/tree-sitter-earthfile",
"rev": "450546b6db9a37a178fd87aeda93a287301e9570",
"date": "2024-05-16T21:54:01+02:00",
"path": "/nix/store/9fsxiz65a2n0kyy7a10q9lqzhhdz1p6x-tree-sitter-earthfile",
"sha256": "0vhj9x7zr102f363l9kpgb58py3n4c3q3fl1c3b2dh5dadks0r6h",
"hash": "sha256-0GSgZ1OtwCbWYIG6gQcjdviLynp3JjrMcAKE/E9PEm4=",
"rev": "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce",
"date": "2024-09-07T22:41:52+02:00",
"path": "/nix/store/y2sjzjb5naajjzpshv4y1g38cala5sfw-tree-sitter-earthfile",
"sha256": "1kzl8639pm3pxvkh2flmy5azzi7r48a1mirh2iqkvjc55fv30frb",
"hash": "sha256-KzswtiuFyT1xFDDHGhQi+cT/VfGVOgHn7nfUm4ZB9M8=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/elixir-lang/tree-sitter-elixir",
"rev": "de690fa8a028f122af46d9d2685679fe5f2d7d60",
"date": "2024-04-08T19:02:42+02:00",
"path": "/nix/store/q46fy2kd4gvab4bpfv3zacg4qgkfc6dz-tree-sitter-elixir",
"sha256": "03fg2qj0i3n1dx8abkngg4nxqwpz86m5nr7q70hp5jw5bxccxxkf",
"hash": "sha256-bvbOWF+Fy3IhOPhkW6pB/3LcLXnPzqVQb8GOCCQWzw0=",
"rev": "ac7b59b312ae5c8cc487d10366e11bda2393e31c",
"date": "2024-09-06T23:39:25+07:00",
"path": "/nix/store/nf8lwh6gamwzqnc7mvjy1mh2khx5ijcf-tree-sitter-elixir",
"sha256": "1kciqsj1z8f5bq46jyqscwqa94hqcdwwclg0v0i4ggn6jyxkwq41",
"hash": "sha256-gWA+u5fGvkci2OBRxnljGJKkMGcae2kIXsWhH6TGkc0=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
"rev": "38d5004a797298dc42c85e7706c5ceac46a3f29f",
"date": "2024-05-05T21:28:26-04:00",
"path": "/nix/store/i2kni0fn6yqgags7l329bbg3n45dc9ww-tree-sitter-embedded-template",
"sha256": "178cvdmlvzq2c29n0x8aganqbx3vz6w9m90gwhk63qxa2rxw5wr0",
"hash": "sha256-IPPCexaq42Em5A+kmrj5e/SFrXoKdWCTYAL/TWvbDJ0=",
"rev": "62b0a6e45900a7dff7c37da95fec20a09968ba52",
"date": "2024-09-02T02:11:42-04:00",
"path": "/nix/store/skq9pzdng2gblx99v9mxw3y90qxzs3q6-tree-sitter-embedded-template",
"sha256": "0sn821pbg3gay9v51i6r3xdwi985chzgn6php2svydy82ab2hiqp",
"hash": "sha256-F0colhLIN7+1uPAa+z5kBaXIWx/ZxFB28uqNt24QyGo=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/stadelmanma/tree-sitter-fortran",
"rev": "f73d473e3530862dee7cbb38520f28824e7804f6",
"date": "2023-08-30T10:25:35+01:00",
"path": "/nix/store/mkvh0z39lc89c3bgd91asxjwwiwskyp8-tree-sitter-fortran",
"sha256": "1nvxdrzkzs1hz0fki5g7a2h7did66jghaknfakqn92fa20pagl1b",
"hash": "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds=",
"rev": "8f842945abefb76b9a68c0835619b37060b8f098",
"date": "2024-08-27T18:09:38-04:00",
"path": "/nix/store/j9q4x7llgyq4vc2pri7rqxjvl98anggl-tree-sitter-fortran",
"sha256": "1x20nldx2vi113dsy44g1dmayi0cpnm2vlhq9blbycm0cwal0xgf",
"hash": "sha256-7nVAFWegMr/oShjSLaq9DESvaguPEK/bCCFu0Ru1QPQ=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/alexlafroscia/tree-sitter-glimmer",
"rev": "3e66b67efeba1a2001859f6e02d16e0bbdbf4a9b",
"date": "2023-10-05T16:33:40-04:00",
"path": "/nix/store/sizww81ylny2pnafn3d901qv15k3rlp2-tree-sitter-glimmer",
"sha256": "0ggxs83jq59z6vk4bvr7scfscmak41lgz038pcwczpm3hwfhasjq",
"hash": "sha256-WGoFHYej3s84u2iA/2ggU1WmHdMn70XmNj8VLAfS/T0=",
"rev": "51970d4bb249d918dbd26289cc4208bee4068004",
"date": "2024-08-20T13:58:19-04:00",
"path": "/nix/store/ff20fkmpcslz5b9883gk7q6nlri8x6qd-tree-sitter-glimmer",
"sha256": "135pf610rb5nppn5k5699z5azxa7zqvx17x6v5nrp7fdwsy0whg2",
"hash": "sha256-4kEOvObNnZtt2aaf0Df+R/Wvyk/JlFnsvbasDIJxt4w=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/thehamsta/tree-sitter-glsl",
"rev": "8c9fb41836dc202bbbcf0e2369f256055786dedb",
"date": "2024-05-11T23:58:08+02:00",
"path": "/nix/store/knbraa6ipp3gm9b2ja01zlk1i27pswp0-tree-sitter-glsl",
"sha256": "1vpdfpznkh7p47wqya3bqqih2wn1nmyqx4jmyv05v88x5f138hv9",
"hash": "sha256-aUM0gisdoV3A9lWSjn21wXIBI8ZrKI/5IffAaf917e4=",
"rev": "66aec57f7119c7e8e40665b723cd7af5594f15ee",
"date": "2024-09-12T12:52:04+02:00",
"path": "/nix/store/xzxngsr3nhs1586c47iwdx9k20yaansc-tree-sitter-glsl",
"sha256": "0gp3bn31xz5rq52amx059r9sllk3749f1ajmbs1fkjb833f2kvqh",
"hash": "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/camdencheek/tree-sitter-go-mod",
"rev": "bbe2fe3be4b87e06a613e685250f473d2267f430",
"date": "2024-01-16T04:55:23-07:00",
"path": "/nix/store/xi1fr4l79pnqaa7md7gk4nqvg4ccgyzy-tree-sitter-go-mod",
"sha256": "1clw1wyjxiicdjav5g2b9m9q7vlg5k1iy1fqwmf2yc4fxrfnmyrq",
"hash": "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI=",
"rev": "3b01edce2b9ea6766ca19328d1850e456fde3103",
"date": "2024-09-11T15:20:34-06:00",
"path": "/nix/store/waxmvqpiild2qbkqx7kmkc60g08822b3-tree-sitter-go-mod",
"sha256": "1vbg4fn54a7lbwcrvjdx3nrwgw5y925chbbb7sd6kwms1434yyhb",
"hash": "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
"rev": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19",
"date": "2024-05-05T18:23:47+02:00",
"path": "/nix/store/knnf5zfxjwnml5cdbp3x6kjkw7q4nhsd-tree-sitter-haskell",
"sha256": "0hi72f7d4y89i6zkzg9r2j16ykxcb4vh4gwaxg9hcqa95wpv9qw6",
"hash": "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I=",
"rev": "558b997049fddcb07fc513528189c57d6129a260",
"date": "2024-09-02T05:58:07-04:00",
"path": "/nix/store/gqvq3azd0g60ghzhbqj5ghqb8q8gsvai-tree-sitter-haskell",
"sha256": "1jjknp2l8afggzxrp032998hw66r831069q4vy3i1hn9s4fw5y86",
"hash": "sha256-BvnCHdHJwhCH3wQnA8JA2RgOUUpigJv7f88pRMW1U8o=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/ntbbloodbath/tree-sitter-http",
"rev": "b639716df0698940b53de81e6fcefa2b6cd30724",
"date": "2024-03-16T17:35:45-04:00",
"path": "/nix/store/ynn327dwmxxakcbfrpq94b7m6sl5301h-tree-sitter-http",
"sha256": "0l2yzq0j3w20m9vy9z627jgnfylk1d8crldz3n8xmhisaxwl47ia",
"hash": "sha256-Kh5CeVc6wtqRHb/RzFALk3pnnzzC/OR3qkDwIQH+XlA=",
"rev": "b88cd0c7dba0128b8f28fcb25cca13eea0d193b3",
"date": "2024-08-21T01:10:49+09:00",
"path": "/nix/store/l6knlfkxvh3dnmc2asism5qr0xdsfna4-tree-sitter-http",
"sha256": "0k6rkpjjzs3jxgwljya3rjnzz0cpi68bm1xfpar2kf71fydd03m6",
"hash": "sha256-pg7QmnfhuCmyuq6HupCJl4H/rcxDeUn563LoL+Wd2Uw=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/sogaiu/tree-sitter-janet-simple",
"rev": "25d0687433ed0ed8e320861c2c625711ce1716f9",
"date": "2024-05-17T12:45:28+09:00",
"path": "/nix/store/ffqfh3ggcszd5lnx4gx5d2wpilsv6qz5-tree-sitter-janet-simple",
"sha256": "0xzqllz8gi2lb44y4hiqxk25p96yl7ysy8r6k1c11sv9gjf65ja4",
"hash": "sha256-RMlinHxp6xBYmCYjr/2h3qRbxOw4QuIJWVTEhz6l+Hc=",
"rev": "12bfab7db8a5f5b1d774ef84b5831acd34936071",
"date": "2024-08-27T15:31:21+09:00",
"path": "/nix/store/v5rcba220xk49qj3ghh9ggdpfqc91snv-tree-sitter-janet-simple",
"sha256": "05df573vih9p8nlqahlijgg66xr6rvzjd0g7n0qhdlzkcwd63p4x",
"hash": "sha256-ndxhGmfz0wYxsOeBJv/OJndj3pORQoWpRTfBuMcprhU=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
"rev": "e88537c2703546f3f0887dd3f16898e1749cdba5",
"date": "2024-05-10T14:09:58-04:00",
"path": "/nix/store/s29hw61sfkgxs4pixpnsjbfqi1w73f06-tree-sitter-javascript",
"sha256": "0ly10ib6f7lj6l4za7pz8xz7pn4cjp7d5c56bf4n538zlgv136py",
"hash": "sha256-/poR9qMfjWKJW6aw0s6VjNh7fkf/HvUJNZIeZ1YEwVM=",
"rev": "b6f0624c1447bc209830b195999b78a56b10a579",
"date": "2024-09-02T05:16:11-04:00",
"path": "/nix/store/q6l4f361yzqcnsl29qhm1dcir75fk0hq-tree-sitter-javascript",
"sha256": "03lyqswy7h9iw2mhjlsa7an3g76hqi074c06pvdjb57h637zisf5",
"hash": "sha256-xen4zzDwlCXbvgYwckDE0Jw3rDpKUwmr4DHB47nGng4=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
"rev": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14",
"date": "2024-05-05T20:47:41-04:00",
"path": "/nix/store/7i5mj175rsgz6gsxji0hbchxw6mvvsjp-tree-sitter-jsdoc",
"sha256": "030r6ksv6v0wnlb8yi22n0blls21cipzvgi4flnjllpm9vrsxxii",
"hash": "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw=",
"rev": "bc09606fc786ead131a301e4b7524888f2d5c517",
"date": "2024-09-02T04:15:15-04:00",
"path": "/nix/store/l1jmw9y271rl00y9lhjwscdmidl3mn31-tree-sitter-jsdoc",
"sha256": "080dzr7547vsapxdd7vs4id3m9mfnzqfzjzkssgyb1vpcdmrhl5m",
"hash": "sha256-tVCYa2N3h+Wf1vPL7/C3rqY6WiR6n9b6VXofUk7+DSA=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-json",
"rev": "94f5c527b2965465956c2000ed6134dd24daf2a7",
"date": "2024-05-06T15:10:02-04:00",
"path": "/nix/store/nl87jvkhqfwshind35dvh204bmjkdv1h-tree-sitter-json",
"sha256": "14za39wy4cw0r6r2m5a1i1za9m2wcyrlmh6yi2zl15b86i3dkbyp",
"hash": "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM=",
"rev": "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571",
"date": "2024-09-02T05:26:12-04:00",
"path": "/nix/store/qcm8dvbv4d4i989b7c8rc11fnbfh9nr6-tree-sitter-json",
"sha256": "0z9nq267cx0c6dpkq3hm24jcxv37l3lhpwabxpmmpmx2f758yjyc",
"hash": "sha256-zEuPynGi11vr7UvxC+mgZ+zOJBEVDjxvMwx0dozANn0=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/sourcegraph/tree-sitter-jsonnet",
"rev": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596",
"date": "2023-08-15T11:57:41-04:00",
"path": "/nix/store/4hf1f6klnr5wd4p1va1x5v8ndmcc7z7b-tree-sitter-jsonnet",
"sha256": "0vw4k1hxq6dhy3ahh40h06k67h073ryxl7513cn81lb6sfgf6c4f",
"hash": "sha256-jjDjntNm0YAsG6Ec2n0eB8BjpgEQEAjV8LAZ3GGYhG8=",
"rev": "ddd075f1939aed8147b7aa67f042eda3fce22790",
"date": "2024-08-15T10:26:01+02:00",
"path": "/nix/store/l4ypaa5lbid6qk21kb4b4x6vh6ki97rq-tree-sitter-jsonnet",
"sha256": "1bfdjxp0h95d124bzlhlvc9b5q19cdj716aym41nyl6z5a992c9q",
"hash": "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-julia",
"rev": "acd5ca12cc278df7960629c2429a096c7ac4bbea",
"date": "2024-04-17T13:39:34-05:00",
"path": "/nix/store/3cjbxyngm4mbki1mydjv5q34w16kfhgp-tree-sitter-julia",
"sha256": "12dwy7ljhddg804jwkkzh6mn0mbjazihhsbcwn3gd5175qqr9lym",
"hash": "sha256-1dOUMS4nlPaG5WxpCONXclVgq4F/Ti4JQK81KOnxvIk=",
"rev": "3520b57e418f734f582215181ecd926a6178c90f",
"date": "2024-09-05T13:11:36-05:00",
"path": "/nix/store/4zljgvbaih9ds4kcb52qk5r1si4dpy8m-tree-sitter-julia",
"sha256": "0lp3js2dmmfv9bsgsjrxj4j1yaj47hmzrkhv07s9yc8cwq749yr0",
"hash": "sha256-IPtEDuYMMZ/0ARvO/Cs8RCofJJE9S/30StvV2oSW41I=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/IndianBoy42/tree-sitter-just",
"rev": "fd814fc6c579f68c2a642f5e0268cf69daae92d7",
"date": "2024-05-02T02:56:00-04:00",
"path": "/nix/store/4q0rpglj1sa6lay5i1fdnws2pyl8hh71-tree-sitter-just",
"sha256": "09faimq5mhldc91r89707fsmdfjqg6dicc2ccr6q9qn5sy0drr6a",
"hash": "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU=",
"rev": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21",
"date": "2024-07-30T00:40:16-04:00",
"path": "/nix/store/20pg64wfg1rrl33prc91z19gbpq0cai1-tree-sitter-just",
"sha256": "1a5n6f6ig1qsrac46w5z6ib28kifhaqz23amhf79ws7yva3i4lhi",
"hash": "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/fwcd/tree-sitter-kotlin",
"rev": "d5dc99a9bdc3fe895e6bcd39caddcfa4820f4c03",
"date": "2024-05-08T00:38:43+02:00",
"path": "/nix/store/gj5w748yk7iyx9s7bzyqj6m9i9sx6rrv-tree-sitter-kotlin",
"sha256": "0lqwjg778xy561hhf90c9m8zdjmv58z5kxgy0cjgys4xqsfbfri6",
"hash": "sha256-Jma3nMadaP8kA/71WT4qu8r2UU0MJAdhMMV3dM6THFM=",
"rev": "e1a2d5ad1f61f5740677183cd4125bb071cd2f30",
"date": "2024-08-03T01:29:18+02:00",
"path": "/nix/store/jppx5kglmzyh10qmy13d5948hl68lxvc-tree-sitter-kotlin",
"sha256": "0bv21rcypi9dx87kgfr89mg8qfc7ik1g1fcb8am7ss17by8badwk",
"hash": "sha256-kze1kF8naH2qQou58MKMhzmMXk0ouzcP6i3F61kOYi8=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/MunifTanjim/tree-sitter-lua",
"rev": "a24dab177e58c9c6832f96b9a73102a0cfbced4a",
"date": "2024-03-11T11:40:44+02:00",
"path": "/nix/store/dia2ry7m40yxfn4l4191c0by58vb2yn8-tree-sitter-lua",
"sha256": "1184dazb4agqf3v55sz8i7xmynsn4rkddhbph3mgmh5qsnk88mmq",
"hash": "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU=",
"rev": "99fc677e6971c425e8d407f59c77ab897e585c92",
"date": "2024-09-09T11:10:03-04:00",
"path": "/nix/store/iiih0sfdls1h8q7ca12y0rhc7g5jl76w-tree-sitter-lua",
"sha256": "0wrbxmb6j8xyckf5jw14jf97cb9fn7yhalap6xxgsag84ypfsqj3",
"hash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"url": "https://github.com/alemuller/tree-sitter-make",
"rev": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd",
"date": "2021-12-16T17:14:17+00:00",
"date": "2021-12-16T17:14:17Z",
"path": "/nix/store/v01s3lfi1w3bm433gf6zi0wb0r603906-tree-sitter-make",
"sha256": "07gz4x12xhigar2plr3jgazb2z4f9xp68nscmvy9a7wafak9l2m9",
"hash": "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=",
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
+5 -5
View File
@@ -1,10 +1,10 @@
{
"url": "https://github.com/MDeiml/tree-sitter-markdown",
"rev": "62516e8c78380e3b51d5b55727995d2c511436d8",
"date": "2024-03-22T11:52:05+02:00",
"path": "/nix/store/4hi3bz1ny9dz3yq7mr6d74gsfmcnh9rw-tree-sitter-markdown",
"sha256": "08wl8y8xgrr10m1p6xpmv0jbmnif30wgd2q5m28ghh1v37q2ixfp",
"hash": "sha256-1/Uo8Bk7QPiQqAWL9jgYLtq6JNj1dnNDBSHn15FHlCM=",
"rev": "1c8dea73bc0c996d92dd9ebc30dd388716b1c5db",
"date": "2024-09-11T16:28:36+03:00",
"path": "/nix/store/g4696miy9vzcw0qwd00rar36qn08jn2l-tree-sitter-markdown",
"sha256": "13xfyclim1yql6swbk4y12sxgvn799ldbzjl35n5rrkz7wgnwm9s",
"hash": "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

Some files were not shown because too many files have changed in this diff Show More