Merge 6d7dc316d6 into haskell-updates
This commit is contained in:
@@ -51,6 +51,9 @@
|
||||
|
||||
- `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities.
|
||||
|
||||
- `buildGoModule` removes the compatibility layer of `CGO_ENABLED` not specified via `env`.
|
||||
Specifying `CGO_ENABLED` directly now results in an error.
|
||||
|
||||
- `buildGoModule` now warns if `<pkg>.passthru.overrideModAttrs` is lost during the overriding of its result packages.
|
||||
|
||||
- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
|
||||
@@ -179,6 +182,10 @@
|
||||
NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar.
|
||||
It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30).
|
||||
|
||||
- `python3Packages.heif-image-plugin` has been dropped due to lack of upstream maintenance and breakage. Use `python3Packages.pillow-heif` instead.
|
||||
|
||||
- `python3Packages.pyheif` has been dropped due to lack of upstream maintenance and breakage. Use `python3Packages.pillow-heif` instead.
|
||||
|
||||
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -4261,12 +4261,6 @@
|
||||
github = "carlthome";
|
||||
githubId = 1595907;
|
||||
};
|
||||
cartr = {
|
||||
email = "carter.sande@duodecima.technology";
|
||||
github = "cartr";
|
||||
githubId = 5241813;
|
||||
name = "Carter Sande";
|
||||
};
|
||||
casaca = {
|
||||
name = "J McNutt";
|
||||
email = "jmacasac@hotmail.com";
|
||||
@@ -11612,7 +11606,7 @@
|
||||
name = "jasonxue";
|
||||
keys = [
|
||||
{
|
||||
fingerprint = "067A 9B58 DAC4 1C31 D688 81A9 EC23 DBDD B617 6861";
|
||||
fingerprint = "D6D8 A0A8 6FAC 3D8E D85C 523D F7BA 32A3 FCB0 260A";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@@ -407,7 +407,6 @@ with lib.maintainers;
|
||||
members = [ ];
|
||||
githubTeams = [
|
||||
"nixpkgs-committers"
|
||||
"release-engineers"
|
||||
];
|
||||
scope = "Dummy team for the #everyone else' section during feture freezes, not to be used as package maintainers!";
|
||||
shortName = "Everyone else";
|
||||
|
||||
@@ -49,7 +49,7 @@ in
|
||||
|
||||
memoryPercent = lib.mkOption {
|
||||
default = 50;
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.positive;
|
||||
description = ''
|
||||
Maximum total amount of memory that can be stored in the zram swap devices
|
||||
(as a percentage of your total memory). Defaults to 1/2 of your total
|
||||
|
||||
@@ -254,6 +254,7 @@ in
|
||||
ayatana-indicators = runTest ./ayatana-indicators.nix;
|
||||
babeld = runTest ./babeld.nix;
|
||||
bazarr = runTest ./bazarr.nix;
|
||||
bcache = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./bcache.nix;
|
||||
bcachefs = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./bcachefs.nix;
|
||||
beanstalkd = runTest ./beanstalkd.nix;
|
||||
bees = runTest ./bees.nix;
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "bcache";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ pineapplehunter ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
virtualisation.emptyDiskImages = [ 4096 ];
|
||||
networking.hostId = "deadbeef";
|
||||
boot.supportedFilesystems = [ "ext4" ];
|
||||
environment.systemPackages = [ pkgs.parted ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.succeed("modprobe bcache")
|
||||
machine.succeed("bcache version")
|
||||
machine.succeed("ls /dev")
|
||||
|
||||
machine.succeed(
|
||||
"mkdir /tmp/mnt",
|
||||
"udevadm settle",
|
||||
"parted --script /dev/vdb mklabel gpt",
|
||||
"parted --script /dev/vdb mkpart primary 0% 50% mkpart primary 50% 100%",
|
||||
"udevadm settle",
|
||||
"bcache make -C /dev/vdb1",
|
||||
"bcache make -B /dev/vdb2",
|
||||
"udevadm settle",
|
||||
"bcache attach /dev/vdb1 /dev/vdb2",
|
||||
"bcache set-cachemode /dev/vdb2 writeback",
|
||||
"udevadm settle",
|
||||
"bcache show",
|
||||
"ls /sys/fs/bcache",
|
||||
"mkfs.ext4 /dev/bcache0",
|
||||
"mount /dev/bcache0 /tmp/mnt",
|
||||
"umount /tmp/mnt",
|
||||
"udevadm settle",
|
||||
)
|
||||
'';
|
||||
}
|
||||
@@ -1096,7 +1096,7 @@ let
|
||||
${
|
||||
if systemdStage1 then
|
||||
''
|
||||
target.wait_for_text("Enter key for rpool/root")
|
||||
target.wait_for_text("Enter key for rpool${optionalString (!parentDataset) "/root"}")
|
||||
''
|
||||
else
|
||||
''
|
||||
|
||||
@@ -85,8 +85,8 @@ let
|
||||
# the future, see link below to find new ones
|
||||
# https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/
|
||||
featureGates = {
|
||||
AnonymousAuthConfigurableEndpoints = true;
|
||||
ConsistentListFromCache = false;
|
||||
AllowParsingUserUIDFromCertAuth = true;
|
||||
ClusterTrustBundle = false;
|
||||
};
|
||||
masterAddress = "${masterName}.${config.networking.domain}";
|
||||
};
|
||||
|
||||
@@ -49,13 +49,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clementine";
|
||||
version = "1.4.1-51-gea6466943";
|
||||
version = "1.4.1-55-g03726250a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clementine-player";
|
||||
repo = "Clementine";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-aTsu8yYvvLWMZhAN0jYVlrlMtQ2+hTZOxFv8gmC2ZDs=";
|
||||
hash = "sha256-tfXZH3E9VZUVnGbKYIWln76fJNwDvc+H4IGDL5U+3pI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS";
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "BUILD_WITH_PULSE" pulseaudioSupport) ];
|
||||
|
||||
# Upstream systemd unit files are pretty awful, so we provide our own in a
|
||||
# NixOS module. It might make sense to get that upstreamed...
|
||||
postInstall = ''
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
# Basic
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
# JavaScript dependency
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
# Updater
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
melpaBuild (finalAttrs: {
|
||||
|
||||
pname = "eaf-camera";
|
||||
version = "0-unstable-2025-03-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eaf";
|
||||
repo = "eaf-camera";
|
||||
rev = "264e34489c175d25a9611446ad82a1d1adbfb896";
|
||||
hash = "sha256-tw4OA1Sbvj3eqm3B4Ou6Gxk3wegmS7wMy2/U+UGTCcY=";
|
||||
};
|
||||
|
||||
env.npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-MmNg4Qf1UhtUIpHjCcwk9MB59XGRhW9SzhO4yUcW1Ik=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
npm run build
|
||||
'';
|
||||
|
||||
files = ''
|
||||
("*.el"
|
||||
"*.py"
|
||||
"*.js"
|
||||
"src")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
LISPDIR=$out/share/emacs/site-lisp/elpa/${finalAttrs.ename}-${finalAttrs.melpaVersion}
|
||||
touch node_modules/.nosearch
|
||||
cp -r node_modules $LISPDIR/
|
||||
cp -r dist $LISPDIR/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
eafPythonDeps = ps: [ ];
|
||||
eafOtherDeps = [ ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Camera application for the EAF";
|
||||
homepage = "https://github.com/emacs-eaf/eaf-camera";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
thattemperature
|
||||
];
|
||||
};
|
||||
|
||||
})
|
||||
+79
@@ -0,0 +1,79 @@
|
||||
{
|
||||
# Basic
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
# Dependencies
|
||||
fd,
|
||||
# JavaScript dependency
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
# Updater
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
melpaBuild (finalAttrs: {
|
||||
|
||||
pname = "eaf-file-manager";
|
||||
version = "0-unstable-2025-03-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eaf";
|
||||
repo = "eaf-file-manager";
|
||||
rev = "57f2e8a7f6282fbb4689b3fc8b99458ed3667dc6";
|
||||
hash = "sha256-IET9b3nS/Z4dxqFVyNITVoMDo6E/+sm3E7cfO7pozRo=";
|
||||
};
|
||||
|
||||
env.npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-dzfw+CgoM1CulPoa0KEzUX9dlBiquX4BkYNwU3vMb+Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
npm run build
|
||||
'';
|
||||
|
||||
files = ''
|
||||
("*.el"
|
||||
"*.py"
|
||||
"*.js"
|
||||
"src")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
LISPDIR=$out/share/emacs/site-lisp/elpa/${finalAttrs.ename}-${finalAttrs.melpaVersion}
|
||||
touch node_modules/.nosearch
|
||||
cp -r node_modules $LISPDIR/
|
||||
cp -r dist $LISPDIR/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
eafPythonDeps =
|
||||
ps: with ps; [
|
||||
pypinyin
|
||||
pygments
|
||||
exif
|
||||
];
|
||||
eafOtherDeps = [
|
||||
fd
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "File manager application for the EAF";
|
||||
homepage = "https://github.com/emacs-eaf/eaf-file-manager";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
thattemperature
|
||||
];
|
||||
};
|
||||
|
||||
})
|
||||
@@ -18,18 +18,18 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "1.3.18";
|
||||
version = "1.3.19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelb";
|
||||
repo = "sniprun";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2Q7Jnt7pVCuNne442KPh2cSjA6V6WSZkgUj99UpmnOM=";
|
||||
hash = "sha256-a2hEV83NOnt+9BwDk94Ns+rIC9DeHFdu2dZG1XPtdnY=";
|
||||
};
|
||||
sniprun-bin = rustPlatform.buildRustPackage {
|
||||
pname = "sniprun-bin";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-cu7wn75rQcwPLjFl4v05kVMsiCD0mAlIBt49mvIaPPU=";
|
||||
cargoHash = "sha256-Ps9Ugq8ISbuXO3Dxo1WQUVPCxf24oSHvem2Xg0sIgOQ=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -3784,8 +3784,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "prisma";
|
||||
publisher = "Prisma";
|
||||
version = "6.15.0";
|
||||
hash = "sha256-MFHOKQp1mjygjAo5moahAnQFRo01D7r78eFlM1+k998=";
|
||||
version = "6.16.2";
|
||||
hash = "sha256-woL6jWlrNb9lsQ6NqXx3YOo/eAinpAuz2bXw6mJw8Dc=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
|
||||
|
||||
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "mongodb-vscode";
|
||||
publisher = "mongodb";
|
||||
version = "1.13.3";
|
||||
hash = "sha256-SCKo1yUnv3FVy19DHEUH1dkubGLjzZbF3Gq9YTsVpxw=";
|
||||
version = "1.14.0";
|
||||
hash = "sha256-cd/dJO2I9heMVNJjGlBO1+c3wGVF+EuycDa+s/aDBxM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.27.1";
|
||||
hash = "sha256-+gCQ9p/FI7LlORC0sMwD501iCh5cDurqv2UzOs43ckU=";
|
||||
version = "3.30.3";
|
||||
hash = "sha256-zhPqqXJvYhfSGbisdoPR7cawP2mEIWlj08ttccXZ6VA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-pce-fast";
|
||||
version = "0-unstable-2025-08-01";
|
||||
version = "0-unstable-2025-09-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-pce-fast-libretro";
|
||||
rev = "c95e401e1dd37522b6d84d0017702cfece2be840";
|
||||
hash = "sha256-xCjavWWWyNTnJyzCr+N2l3On2iflg+HzXCxOxLZvSew=";
|
||||
rev = "1524cc63104aece5a90ed7dd181b444a16313134";
|
||||
hash = "sha256-hNcYdkqZauoCrNMHy4YaH0ZsqUofoYb8USi0r5bbmkk=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -133,9 +133,9 @@ rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "10.14";
|
||||
version = "10.15";
|
||||
url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
|
||||
hash = "sha256-pPo7Wu/hwLc5GpGiw8czuN/QS7MVyOq8+yr0E5aeXks=";
|
||||
hash = "sha256-MH4hI3xui96iZvlG0x8J7SexlX35oDUW2Ccf0T4cJh0=";
|
||||
|
||||
patches = [
|
||||
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
||||
@@ -145,7 +145,7 @@ rec {
|
||||
# see https://gitlab.winehq.org/wine/wine-staging
|
||||
staging = fetchFromGitLab {
|
||||
inherit version;
|
||||
hash = "sha256-u+pHt+pzyZjKRAp4C5frngQMgByu6kqjflXBEF2HYi0=";
|
||||
hash = "sha256-VzHM4Qm0XDP7suCT5dmJgoDJmZ1DLg6qqOUVQzNc0g4=";
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = "wine-staging";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pineapple-pictures";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BLumia";
|
||||
repo = "pineapple-pictures";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-bJOBqxJ5pl1O0QEFQtkPn55y4g5I7Zwb3S0PTJ1SoFk=";
|
||||
hash = "sha256-QQ0lWYwfCCQUtVQxC6koORiQ3px99+Uy8qHtRx3fbSg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
ninja,
|
||||
qtbase,
|
||||
@@ -20,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "CopyQ";
|
||||
version = "10.0.0";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lH3WJ6cK2eCnmcLVLnYUypABj73UZjGqqDPp92QE+V4=";
|
||||
hash = "sha256-/t+8YsqeX0tlxwQDDNTalttCDIgGhpLbzYe3UqY04xM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -51,15 +50,6 @@ stdenv.mkDerivation (rec {
|
||||
kdePackages.knotifications
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Can be removed after next release
|
||||
name = "fix-qchar-construction-for-qt-6.9.patch";
|
||||
url = "https://github.com/hluk/CopyQ/commit/f08c0d46a239362c5d3525ef9c3ba943bb00f734.patch";
|
||||
hash = "sha256-dsDIUVJHFFqzZ3tFOcYdwol/tm4viHM0CRs6wYfVKbQ=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "WITH_QT6" true)
|
||||
];
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "helm-dt";
|
||||
version = "0.4.6";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-labs";
|
||||
repo = "distribution-tooling-for-helm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SB1XjWB2vYUUT9EvUCZM0dt4Q9J38lh6x6RQWjZCQXU=";
|
||||
hash = "sha256-G2gJNsrw3NIQaZf+htSLHHCPeKWtbXQw5B7d+yI53uE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aGFWyDq0HUlOF85VBRD7KN8/qm4iPsXau8W636h6meo=";
|
||||
vendorHash = "sha256-CIVgNS74V75etC9WBzoxu6aoMHlUYxWd22h2NG1uNn0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -16,17 +16,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "2.11.5";
|
||||
version = "2.12.0";
|
||||
tags = lib.optionals enableGateway [ "gateway" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kumahq";
|
||||
repo = "kuma";
|
||||
tag = version;
|
||||
hash = "sha256-gNojkBMdTbBLnN5Xpbpm7chLfCT+7S8mJTilEABuVis=";
|
||||
hash = "sha256-5syQFcYBY/xKipIsAJdjVrXYXt7NNjjCeXiDVNO9NTo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Sy67XRPob++DH+pKFY5lZOfc3f1MaP3nI1znnvjYB+M=";
|
||||
vendorHash = "sha256-KgZYKopW+FOdwBIGxa2RLiEbefZ/1vAhcsWtcYhgdFs=";
|
||||
|
||||
# no test files
|
||||
doCheck = false;
|
||||
|
||||
@@ -216,13 +216,13 @@
|
||||
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
|
||||
},
|
||||
"btp": {
|
||||
"hash": "sha256-6Bmu7yJPMPk/3oMjS35GnLi309XcH2pw0D6ppLbk6zo=",
|
||||
"hash": "sha256-pz5+Hhu3pBTjBOVzpUXI589PZzKJtoUrOpTC8/TNEE0=",
|
||||
"homepage": "https://registry.terraform.io/providers/SAP/btp",
|
||||
"owner": "SAP",
|
||||
"repo": "terraform-provider-btp",
|
||||
"rev": "v1.15.1",
|
||||
"rev": "v1.16.1",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-r4Q7b7ZzK+ZDXhIabTSgP7HY5Q51Hz5ErnW+nV+ZIqA="
|
||||
"vendorHash": "sha256-pCBmeisWcyw/Box1yrWwYj+hSrsqmToiiom2jS8I1SU="
|
||||
},
|
||||
"buildkite": {
|
||||
"hash": "sha256-w+ljPDKyVlylr87tFhuu/7oCkY/fFeK+LPr7mY7rbP0=",
|
||||
@@ -534,11 +534,11 @@
|
||||
"vendorHash": "sha256-HavrYEqMGuJnZBQlVwZfZiXTISqALjjOHB8z1EpNkOE="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-l08jmxkWsTrk32cJM28OuwSZgSKIB3EPODaUf7821uY=",
|
||||
"hash": "sha256-HDTjSxx3TE69B7DvJbn/b67IH/S4IXvXGVTFwrgAWZE=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v7.1.1",
|
||||
"rev": "v7.3.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-9tXElUSD6WSfEn6Urt0GZFkxGXj/iUO83ZkKw3GfAgo="
|
||||
},
|
||||
@@ -768,13 +768,13 @@
|
||||
"vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
|
||||
},
|
||||
"linode": {
|
||||
"hash": "sha256-CSxYyKDHYCAZyVQaPabQ/qks4aEIxN/Oc109luEcaXc=",
|
||||
"hash": "sha256-f0xTxJj6Ua+B9LLSNvcoFCVLRNyty1gcKEiHTDSiR04=",
|
||||
"homepage": "https://registry.terraform.io/providers/linode/linode",
|
||||
"owner": "linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v3.2.0",
|
||||
"rev": "v3.3.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-nRJmUQW9vCmqnVgsw4JGozLbxkVVDYUa0Hot5mA4vaM="
|
||||
"vendorHash": "sha256-2sopDJO/eBW6xQdfqkafEEL2jsyJsB3Q7G1pgqr2EBs="
|
||||
},
|
||||
"linuxbox": {
|
||||
"hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
|
||||
@@ -885,11 +885,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-Lmt3ZIrFW/NPLlWlOlXH/sxh4CpBPAJfsJOjjQy9uZA=",
|
||||
"hash": "sha256-4pDuH+baDAR9cIXeiKtXlr2KCYGUS+UuV27SARUDYmw=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.68.0",
|
||||
"rev": "v3.69.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-7eRDz/MAKYnUsBAJOSssqzdSfsRSboQX4E/8qBjnGDk="
|
||||
},
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -10,9 +10,6 @@ lib.extendMkDerivation {
|
||||
constructDrv = stdenv.mkDerivation;
|
||||
excludeDrvArgNames = [
|
||||
"overrideModAttrs"
|
||||
# Compatibility layer to the directly-specified CGO_ENABLED.
|
||||
# TODO(@ShamrockLee): Remove after Nixpkgs 25.05 branch-off
|
||||
"CGO_ENABLED"
|
||||
];
|
||||
extendDrvArgs =
|
||||
finalAttrs:
|
||||
@@ -226,19 +223,7 @@ lib.extendMkDerivation {
|
||||
GO111MODULE = "on";
|
||||
GOTOOLCHAIN = "local";
|
||||
|
||||
CGO_ENABLED =
|
||||
args.env.CGO_ENABLED or (
|
||||
if args ? CGO_ENABLED then
|
||||
# Compatibility layer to the CGO_ENABLED attribute not specified as env.CGO_ENABLED
|
||||
# TODO(@ShamrockLee): Remove and convert to
|
||||
# CGO_ENABLED = args.env.CGO_ENABLED or go.CGO_ENABLED
|
||||
# after the Nixpkgs 25.05 branch-off.
|
||||
lib.warn
|
||||
"${finalAttrs.finalPackage.meta.position}: buildGoModule: specify CGO_ENABLED with env.CGO_ENABLED instead."
|
||||
args.CGO_ENABLED
|
||||
else
|
||||
go.CGO_ENABLED
|
||||
);
|
||||
CGO_ENABLED = args.env.CGO_ENABLED or go.CGO_ENABLED;
|
||||
};
|
||||
|
||||
GOFLAGS =
|
||||
|
||||
@@ -62,16 +62,12 @@ The above expression is called using these arguments by default:
|
||||
```
|
||||
|
||||
But the package might need `pkgs.libbar_2` instead.
|
||||
While the function could be changed to take `libbar_2` directly as an argument,
|
||||
this would change the `.override` interface, breaking code like `.override { libbar = ...; }`.
|
||||
So instead it is preferable to use the same generic parameter name `libbar`
|
||||
and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-packages.nix):
|
||||
While the `libbar` argument could explicitly be overridden in `all-packages.nix` with `libbar_2`, this would hide important information about this package from its interface.
|
||||
The fact that the package requires a certain version of `libbar` to work should not be hidden in a separate place.
|
||||
It is preferable to use `libbar_2` as a argument name instead.
|
||||
|
||||
```nix
|
||||
{
|
||||
libfoo = callPackage ../by-name/so/some-package/package.nix { libbar = libbar_2; };
|
||||
}
|
||||
```
|
||||
This approach also has the benefit that, if the expectation of the package changes to require a different version of `libbar`, a downstream user with an override of this argument will receive an error.
|
||||
This is comparable to a merge conflict in git: It's much better to be forced to explicitly address the conflict instead of silently keeping the override - which might lead to a different problem that is likely much harder to debug.
|
||||
|
||||
## Manual migration guidelines
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "acr";
|
||||
version = "2.2.2";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = "acr";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-qaFJ79EZmqlFJ0D87bJK6ecfG3yHDPWeN7U3+kNaHnI=";
|
||||
hash = "sha256-ASdXxkHqrxs4xVKB9LJDU5Y12+1Gv+NgFHC+tEC5p+E=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.300";
|
||||
version = "3.0.302";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aliyun";
|
||||
repo = "aliyun-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PB53qvkavN2xgWCjPTi1JuKE+KioL6QscjFEVVKTO10=";
|
||||
hash = "sha256-RC0rrD9ApcZqhkg3NfvY0Gx9iXtsS8ixcTriZIfRSQE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "all-the-package-names";
|
||||
version = "2.0.2197";
|
||||
version = "2.0.2208";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nice-registry";
|
||||
repo = "all-the-package-names";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NuNgEsjB/5QDvfqfR22BUsVmwlSnmnCMwKAV/Oiz0Ww=";
|
||||
hash = "sha256-uDUPQkYptxQ1fQBfrp92dpJLnjPvq4CjAWtV76o02+E=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-DdE2870xe7ut0A+1/Rx/Xb3KOsNjB0heC8gkUZ0TGJ4=";
|
||||
npmDepsHash = "sha256-BAUXCfIkx1uSvazihjb8nKt540cfToYYuL3TiHIlUZ0=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "alt-tab-macos";
|
||||
version = "7.28.0";
|
||||
version = "7.29.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
|
||||
hash = "sha256-Wdn/NwVHePYyO9VGu8qXbzCFWXcX1jM9pN4p+BNOxsI=";
|
||||
hash = "sha256-XrxL4T50irSanXd5vU020dwZCGiJIQdUw8dTYSmrGjI=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8f525118..ba8027c2 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -9,22 +9,15 @@ add_project_dependencies(incdir_dep, language: 'c')
|
||||
cc = meson.get_compiler('c')
|
||||
dir_base = meson.current_source_dir()
|
||||
builddir_base = meson.current_build_dir()
|
||||
-# FIXME: make art install a pkgconfig file
|
||||
-libart_dep = [
|
||||
- cc.find_library('art', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]),
|
||||
- cc.find_library('nativebridge', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ])
|
||||
-]
|
||||
+libart_dep = dependency('art-standalone')
|
||||
libdl_bio_dep = [
|
||||
cc.find_library('dl_bio')
|
||||
]
|
||||
libc_bio_dep = [
|
||||
cc.find_library('c_bio')
|
||||
]
|
||||
-libandroidfw_dep = [
|
||||
- cc.find_library('androidfw', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]),
|
||||
-]
|
||||
-if fs.is_file('/usr' / get_option('libdir') / 'java/core-all_classes.jar')
|
||||
- bootclasspath_dir = '/usr' / get_option('libdir') / 'java'
|
||||
+if fs.is_file('@artStandalonePackageDir@' / get_option('libdir') / 'java/core-all_classes.jar')
|
||||
+ bootclasspath_dir = '@artStandalonePackageDir@' / get_option('libdir') / 'java'
|
||||
elif fs.is_file('/usr/local' / get_option('libdir') / 'java/core-all_classes.jar')
|
||||
bootclasspath_dir = '/usr/local' / get_option('libdir') / 'java'
|
||||
elif fs.is_file(get_option('prefix') / get_option('libdir') / 'java/core-all_classes.jar')
|
||||
@@ -179,7 +172,7 @@ libtranslationlayer_so = shared_library('translation_layer_main', [
|
||||
dependency('gtk4', version: '>=4.14'), dependency('gl'), dependency('egl'), dependency('wayland-client'), dependency('jni'),
|
||||
dependency('libportal'), dependency('sqlite3'), dependency('libavcodec', version: '>=59'), dependency('libdrm'),
|
||||
dependency('gudev-1.0'), dependency('libswscale'), dependency('webkitgtk-6.0'),
|
||||
- libandroidfw_dep, wayland_protos_dep
|
||||
+ libart_dep, wayland_protos_dep
|
||||
],
|
||||
link_with: [ libandroid_so ],
|
||||
link_args: [
|
||||
@@ -0,0 +1,16 @@
|
||||
diff --git a/src/main-executable/main.c b/src/main-executable/main.c
|
||||
index 545da00f..2f87447d 100644
|
||||
--- a/src/main-executable/main.c
|
||||
+++ b/src/main-executable/main.c
|
||||
@@ -390,7 +390,10 @@ static void open(GtkApplication *app, GFile **files, gint nfiles, const gchar *h
|
||||
|
||||
ret = stat(MICROG_APK_PATH_LOCAL, &dont_care);
|
||||
errno_localdir = errno;
|
||||
- if (!ret) {
|
||||
+ char *env_microg = getenv("MICROG_APK_PATH");
|
||||
+ if (env_microg && access(env_microg, F_OK) == 0) {
|
||||
+ microg_apk = strdup(env_microg);
|
||||
+ } else if (stat(MICROG_APK_PATH_LOCAL, &dont_care) == 0) {
|
||||
microg_apk = strdup(MICROG_APK_PATH_LOCAL); // for running out of builddir; using strdup so we can always safely call free on this
|
||||
} else {
|
||||
char *microg_install_dir = malloc(strlen(dex_install_dir) + strlen(REL_MICROG_APK_INSTALL_PATH) + 1); // +1 for NULL
|
||||
@@ -30,27 +30,24 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "android-translation-layer";
|
||||
version = "0-unstable-2025-08-06";
|
||||
version = "0-unstable-2025-09-14";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "android_translation_layer";
|
||||
repo = "android_translation_layer";
|
||||
rev = "d52985a6df81d73a8f6dfbdee337f7ff90b724cb";
|
||||
hash = "sha256-fJ8S04YucoCzHiIQdiQd+Il0YGNFsOkSiGWjZKNMTIM=";
|
||||
rev = "9de91586994af5078decda17db92ce50c5673951";
|
||||
hash = "sha256-iRjP++WzLsV7oDGNdF3m9JJJS7zLrG5W46U3h39H5uk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# meson: use pkg-config from art-standalone instead of manual library search
|
||||
# See: https://gitlab.com/android_translation_layer/android_translation_layer/-/merge_requests/164
|
||||
(replaceVars ./configure-art-path.patch {
|
||||
artStandalonePackageDir = "${art-standalone}";
|
||||
})
|
||||
|
||||
# Required gio-unix dependency is missing in meson.build
|
||||
./add-gio-unix-dep.patch
|
||||
|
||||
# Patch custon Dex install dir
|
||||
./configure-dex-install-dir.patch
|
||||
|
||||
# Patch atl to load microg apk from custom path
|
||||
./configure-microg-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -85,10 +82,20 @@ stdenv.mkDerivation {
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -D $src/com.google.android.gms.apk $out/share/com.google.android.gms.apk
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/android-translation-layer \
|
||||
--prefix LD_LIBRARY_PATH : ${art-standalone}/lib/art \
|
||||
--prefix PATH : ${lib.makeBinPath [ bintools ]}
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
art-standalone # dex2oat
|
||||
bintools # addr2line
|
||||
]
|
||||
} \
|
||||
--set MICROG_APK_PATH "$out/share/com.google.android.gms.apk"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ansible-navigator";
|
||||
version = "25.8.0";
|
||||
version = "25.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.10";
|
||||
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "ansible_navigator";
|
||||
hash = "sha256-X10bz1csJnCvbKBl1jdgNaiRPn8VNNpf4YQ/h+28V+c=";
|
||||
hash = "sha256-DgRm1y/87gAGRcTX1ZB2Cb4eRWZFdR0KEvzcYPGosYY=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -34,14 +34,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "anydesk";
|
||||
version = "7.0.2";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
|
||||
"https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
|
||||
];
|
||||
hash = "sha256-qE49rV/QPYkbyAppDML/n6brzmiA93w47bDOwiKDuUo=";
|
||||
hash = "sha256-CplmZZrlnMjmnpOvzFMiSGMnnSNXnXiUtleXi0X52lo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "apachetomcatscanner";
|
||||
version = "3.7.2";
|
||||
version = "3.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p0dalirius";
|
||||
repo = "ApacheTomcatScanner";
|
||||
tag = version;
|
||||
hash = "sha256-mzpJq0er13wcekTac3j4cnRokHh6Q0seM8vwZsM2tN8=";
|
||||
hash = "sha256-gMyJClEE/i8AKHcSyvvMPwCooLwl/hvcRZgZqF59RUY=";
|
||||
};
|
||||
|
||||
# Posted a PR for discussion upstream that can be followed:
|
||||
|
||||
@@ -23,28 +23,25 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "art-standalone";
|
||||
version = "0-unstable-2025-07-09";
|
||||
version = "0-unstable-2025-09-03";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "android_translation_layer";
|
||||
repo = "art_standalone";
|
||||
rev = "1eee3dce3ba6f324bb7a32a170b2da14889af39d";
|
||||
hash = "sha256-OAO0k/LkQ+MKqR4HkFXD18LSXQZNPogjjRot4UVoE5A=";
|
||||
rev = "10d60509c9073791f9eca1d2b8443d40a40edc05";
|
||||
hash = "sha256-Xg6s58jymma1sNb6P7pwWFpYq1O6GoynrgPeLZRD+rI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Do not hardocde addr2line binary path
|
||||
./no-hardcode-path-addr2line.patch
|
||||
|
||||
# Add support for pkg-config
|
||||
# See: https://gitlab.com/android_translation_layer/art_standalone/-/merge_requests/37
|
||||
./pkg-config-support.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x dalvik/dx/etc/{dx,dexmerger}
|
||||
patchShebangs .
|
||||
sed -i "s|/bin/bash|${runtimeShell}|" build/core/config.mk build/core/main.mk
|
||||
substituteInPlace build/core/config.mk build/core/main.mk \
|
||||
--replace-fail "/bin/bash" "${runtimeShell}"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -102,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://gitlab.com/android_translation_layer/art_standalone";
|
||||
# No license specified yet
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.all;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 42df5b18..3321adae 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -32,6 +32,8 @@ ____dalvikvm_bin_64 := $(____TOPDIR)/out/host/linux-x86/bin/dalvikvm64
|
||||
__RPATH_BIN := \$${ORIGIN}/../$(____LIBDIR)/art/:\$${ORIGIN}/../$(____LIBDIR)/java/dex/art/natives
|
||||
__RPATH_LIB := \$${ORIGIN}
|
||||
|
||||
+__VERSION ?= 0.0.0
|
||||
+
|
||||
# Jack compiler was google's first attempt at a solution for desugaring Java 8 and newer bytecode into bytecode compatible with older dex file formats.
|
||||
# Thankfully, google realized that this was a bad idea, and in a typical google fashion, axed the project.
|
||||
# They experimented with other approaches, but currently (2022) the way to do this is to use d8/r8 instead of dx;
|
||||
@@ -112,6 +114,15 @@ install:
|
||||
# our stable C API for libandroidfw, used by ATL
|
||||
install -Dt $(____INSTALL_INCLUDEDIR)/androidfw $(____TOPDIR)/libandroidfw/include/androidfw/androidfw_c_api.h
|
||||
|
||||
+ # install pkg-config file
|
||||
+ mkdir -p $(____INSTALL_LIBDIR)/pkgconfig
|
||||
+ sed -e 's|@prefix@|$(____PREFIX)|g' \
|
||||
+ -e 's|@libdir@|$(____LIBDIR)|g' \
|
||||
+ -e 's|@includedir@|$(____INCLUDEDIR)|g' \
|
||||
+ -e 's|@version@|$(__VERSION)|g' \
|
||||
+ art-standalone.pc.in > $(____INSTALL_LIBDIR)/pkgconfig/art-standalone.pc
|
||||
+
|
||||
+
|
||||
# TODO: figure out sharing dependencies and have this in a separate repo
|
||||
install_adbd:
|
||||
install -Dt $(____INSTALL_BINDIR) $(____TOPDIR)/out/host/linux-x86/bin/adbd
|
||||
diff --git a/art-standalone.pc.in b/art-standalone.pc.in
|
||||
new file mode 100644
|
||||
index 00000000..210cd031
|
||||
--- /dev/null
|
||||
+++ b/art-standalone.pc.in
|
||||
@@ -0,0 +1,10 @@
|
||||
+prefix=@prefix@
|
||||
+exec_prefix=${prefix}
|
||||
+libdir=${prefix}/@libdir@
|
||||
+includedir=${prefix}/@includedir@
|
||||
+
|
||||
+Name: art-standalone
|
||||
+Description: Android ART runtime (standalone build, minimal ATL deps)
|
||||
+Version: @version@
|
||||
+Libs: -L${libdir}/art -lart -lnativebridge -landroidfw
|
||||
+Cflags: -I${includedir} -I${includedir}/androidfw
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.88";
|
||||
version = "2.0.91";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = "automatic-timezoned";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YaSbXMY/MT8GznQtjG9MoC6fi6WV3QHV9UwsjGWaAFQ=";
|
||||
sha256 = "sha256-8KrUJ+WZ9AP9LWCsxWc+IE+rhnqkLp1NS/s9Tbef8u4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DKcQ3O9Db0CRjHZVrceMPFSqkIwgFO7z5AmFd88rr1U=";
|
||||
cargoHash = "sha256-scCOAcM5Dr3SOblg7HPqWPgxVYCsWLNS+g4XvCWZcug=";
|
||||
|
||||
meta = {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
This patch does two things:
|
||||
1) Drops probe-bcache, so now util-linux detecting functionality is used.
|
||||
2) Drops bcache-register, moving registering device functionality into rule
|
||||
using 'sh'.
|
||||
This reduces things that need to be present in initrd, replacing them with
|
||||
already existing functionality and reducing overall initrd size.
|
||||
|
||||
diff --git a/69-bcache.rules b/69-bcache.rules
|
||||
index 9cc7f0d..6a52893 100644
|
||||
--- a/69-bcache.rules
|
||||
+++ b/69-bcache.rules
|
||||
@@ -10,16 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end"
|
||||
# It recognised bcache (util-linux 2.24+)
|
||||
ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found"
|
||||
# It recognised something else; bail
|
||||
-ENV{ID_FS_TYPE}=="?*", GOTO="bcache_backing_end"
|
||||
-
|
||||
-# Backing devices: scan, symlink, register
|
||||
-IMPORT{program}="probe-bcache -o udev $tempnode"
|
||||
-ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end"
|
||||
-ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
|
||||
+GOTO="bcache_backing_end"
|
||||
|
||||
LABEL="bcache_backing_found"
|
||||
RUN{builtin}+="kmod load bcache"
|
||||
-RUN+="bcache-register $tempnode"
|
||||
+RUN+="@shell@ -c 'echo $tempnode > /sys/fs/bcache/register_quiet'"
|
||||
LABEL="bcache_backing_end"
|
||||
|
||||
# Cached devices: symlink
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c824ae3..c5f7309 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -9,7 +9,6 @@ all: make-bcache probe-bcache bcache-super-show bcache-register
|
||||
|
||||
install: make-bcache probe-bcache bcache-super-show
|
||||
$(INSTALL) -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/
|
||||
- $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
|
||||
$(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/
|
||||
$(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
|
||||
$(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
|
||||
@@ -1,22 +0,0 @@
|
||||
diff --git a/bcache.c b/bcache.c
|
||||
index 8f37445..79806d8 100644
|
||||
--- a/bcache.c
|
||||
+++ b/bcache.c
|
||||
@@ -26,7 +26,7 @@
|
||||
* x^7 + x^4 + x + 1
|
||||
*/
|
||||
|
||||
-static const uint64_t crc_table[256] = {
|
||||
+const uint64_t crc_table[256] = {
|
||||
0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
|
||||
0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
|
||||
0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
|
||||
@@ -115,7 +115,7 @@ static const uint64_t crc_table[256] = {
|
||||
0x9AFCE626CE85B507ULL
|
||||
};
|
||||
|
||||
-inline uint64_t crc64(const void *_data, size_t len)
|
||||
+uint64_t crc64(const void *_data, size_t len)
|
||||
{
|
||||
uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
|
||||
const unsigned char *data = _data;
|
||||
@@ -1,23 +1,22 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchgit,
|
||||
pkg-config,
|
||||
util-linux,
|
||||
bash,
|
||||
replaceVars,
|
||||
udevCheckHook,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcache-tools";
|
||||
version = "1.0.8";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g2p";
|
||||
repo = "bcache-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6gy0ymecMgEHXbwp/nXHlrUEeDFnmFXWZZPlzP292g4=";
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git";
|
||||
rev = "bcache-tools-${version}";
|
||||
hash = "sha256-8BiHC8qxk4otFPyKnvGNk57JSZytEOy51AGertWo2O0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,34 +27,36 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
# * Remove broken install rules (they ignore $PREFIX) for stuff we don't need
|
||||
# anyway (it's distro specific stuff).
|
||||
# * Fixup absolute path to modprobe.
|
||||
prePatch = ''
|
||||
# * Remove distro specific install rules which are not used in NixOS.
|
||||
# * Remove binaries for udev which are not needed on modern systems.
|
||||
sed -e "/INSTALL.*initramfs\/hook/d" \
|
||||
-e "/INSTALL.*initcpio\/install/d" \
|
||||
-e "/INSTALL.*dracut\/module-setup.sh/d" \
|
||||
-e "s/pkg-config/$PKG_CONFIG/" \
|
||||
-e "/INSTALL.*probe-bcache/d" \
|
||||
-i Makefile
|
||||
# * Remove probe-bcache which is handled by util-linux
|
||||
sed -e "/probe-bcache/d" \
|
||||
-i 69-bcache.rules
|
||||
# * Replace bcache-register binary with a write to sysfs
|
||||
substituteInPlace 69-bcache.rules \
|
||||
--replace-fail "bcache-register \$tempnode" "${bash}/bin/sh -c 'echo \$tempnode > /sys/fs/bcache/register'"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(replaceVars ./bcache-udev-modern.patch {
|
||||
shell = "${bash}/bin/sh";
|
||||
})
|
||||
./fix-static.patch
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"UDEVLIBDIR=${placeholder "out"}/lib/udev/"
|
||||
"PREFIX="
|
||||
"DESTDIR=$(out)"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p "$out/sbin" "$out/lib/udev/rules.d" "$out/share/man/man8"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) bcache;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "User-space tools required for bcache (Linux block layer cache)";
|
||||
longDescription = ''
|
||||
Bcache is a Linux kernel block layer cache. It allows one or more fast
|
||||
@@ -67,9 +68,13 @@ stdenv.mkDerivation rec {
|
||||
User documentation is in Documentation/bcache.txt in the Linux kernel
|
||||
tree.
|
||||
'';
|
||||
homepage = "https://bcache.evilpiepirate.org/";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
homepage = "https://www.kernel.org/doc/html/latest/admin-guide/bcache.html";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
bjornfor
|
||||
pineapplehunter
|
||||
];
|
||||
mainProgram = "bcache-tools";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bento";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "warpstreamlabs";
|
||||
repo = "bento";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HLUDZx8Uk40mVxS8g9xHZi6AwWu4JkxXPjsIXrMr9K4=";
|
||||
hash = "sha256-F5RUOcD6nKH5NS0nK78d94FtXduI/6AVJJ0qArP8Ziw=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-Dwf4q5lXO2gtvfB0Ib5LmaXg/MSNir+RzLU4rfE/mB4=";
|
||||
vendorHash = "sha256-hBjj3voqWvwURGsgIgySLyxfm0JKu4qHe/HLcUO0Fa0=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/bento"
|
||||
|
||||
@@ -8,19 +8,20 @@
|
||||
autoAddDriverRunpath,
|
||||
apple-sdk_15,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
rocmPackages,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
rocmSupport ? config.rocmSupport,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "btop";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
repo = "btop";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZLT+Hc1rvBFyhey+imbgGzSH/QaVxIh/jvDKVSmDrA0=";
|
||||
};
|
||||
|
||||
@@ -55,10 +56,12 @@ stdenv.mkDerivation rec {
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Monitor of resources";
|
||||
homepage = "https://github.com/aristocratos/btop";
|
||||
changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/aristocratos/btop/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
@@ -68,4 +71,4 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
mainProgram = "btop";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buf";
|
||||
version = "1.57.0";
|
||||
version = "1.57.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "buf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D1/VMlvaaYNKyd8Uh5BZot/NABYzEvdjxtVFeKF4+6o=";
|
||||
hash = "sha256-3OzMUROqrQnO1ofwL5hcbx9NgS3WCXwsonp0jKQ/Qlw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6DRuSHZnQZTDiVvPNKgAnEaG4Zb70EPdNr2N13BVJQ0=";
|
||||
vendorHash = "sha256-tX+OBzIIuqCgz7ioDD5OnKpkT6mCdN8/owaOu9kP/kU=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cadaver";
|
||||
version = "0.27";
|
||||
version = "0.28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://notroj.github.io/cadaver/cadaver-${version}.tar.gz";
|
||||
hash = "sha256-Eq/GKyPhKRJw6V6CHcqw1XRrpEYcv8hNCMKuursqtU8=";
|
||||
hash = "sha256-M+OlS9VLHrMltIMWp8rMJAR8Uz74jm75i4jfu2DhJzQ=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -25,12 +25,38 @@
|
||||
"@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a",
|
||||
"@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27",
|
||||
"@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622",
|
||||
"@img/sharp-darwin-arm64@npm:0.34.3": "c5ed848f3cecaced50be6d1805cfb23586299f119a9917880c3f590b7ddd54b930e493c73480d13452503101168f92a0dc85ccc5b19b330470a5fe69e1fcf206",
|
||||
"@img/sharp-darwin-x64@npm:0.34.3": "7e892ca052c8eb9002fb6e86e0a7893aff909e0f203f6ada7a67f4ca7e189631203189700a498ab3401280f5c042f5b08c3f7bc713192a97228864e9c4527743",
|
||||
"@img/sharp-libvips-darwin-arm64@npm:1.2.0": "35d0d475da11fdfd7f5b5f7f1de4376ac04de6d6e0879833f71b2fa305b9d58c96ee464cf234060506ef9b1e2eabe5c09c302e818f8899b2ced1fcb7f85c01eb",
|
||||
"@img/sharp-libvips-darwin-x64@npm:1.2.0": "e853f3b8a19d815af553b703e1d6d70abec525c61f3f19cc8a9d50d3749bc563b7f255307709b7c0836f76b110948489d3a9a3932d2fbc1775a083a56979bf56",
|
||||
"@img/sharp-libvips-linux-arm64@npm:1.2.0": "ec53e3e62c9351e28ea0e4c26a1d8ab257ac003e8184b1757b79c2a240baecec2452e0dbca08c8227fd01c498801c428230261fdb86198e873e07347d741c3c7",
|
||||
"@img/sharp-libvips-linux-arm@npm:1.2.0": "a2f9822cb2ac5b315f2a02c59ebdb235f6c45251207795f83f1a92db696a9deced882dc752bdddd1eab98da5d7d1d1e9968ae142313ff09960b7ae30b760ba07",
|
||||
"@img/sharp-libvips-linux-ppc64@npm:1.2.0": "e90e1c46e6020f3a96562dd526549af2fabff46a1576f2e7af003be4b5efeb6fc8caa8e303e2eeb58129c938be31e0bf067736072479f2298152230cecd5fce4",
|
||||
"@img/sharp-libvips-linux-s390x@npm:1.2.0": "2cf62c8b285effd3a3ec8854bc5fd78af162459294a6d9847af33d6bdeacfbad81cb0bec68b76889b148306a8a28492b4d44e6c96b778d0879349180191d758d",
|
||||
"@img/sharp-libvips-linux-x64@npm:1.2.0": "ca342d07d1f0d22559f26bdcc0354f87a845ef19c69c22e37d9e23d71de15159f50d01183e8e7ea75e0ccfb6c7be9406741414a1f3534ec4aba10e51f0d7dffd",
|
||||
"@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "aa248f0c8602b0a17fdb5c1b00ce7dbb09f05b94a45ee7f226eaebfa459d4ee3fd407c62244902e15699927943c511a7fe045b575185ecc9b585987b64ae6cb1",
|
||||
"@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "811071647c5129a1ead1e54b8f4672061bbbc1177d1d49127c755848e81f21bcbf5bf438c0e53118e731be5e000235904de3b5cf305053de015b56609a059371",
|
||||
"@img/sharp-linux-arm64@npm:0.34.3": "3e8d53f54789b3d98dc14bf696917ff50f8c8c355aedc0dc90890ca764259bafec7390eabe262ce843eab8b74e0c128858128ce614e0b85dcba28d6b9ce3ea3f",
|
||||
"@img/sharp-linux-arm@npm:0.34.3": "563c48ee129e5f3c6afed71ffba9c79a4369e7967e7b3a4a97d9b1e5aefa511873d3cd7a568ec42cd5968ea76f89ab93ee65c1363170af50559b620bfdb89d5b",
|
||||
"@img/sharp-linux-ppc64@npm:0.34.3": "5973f8c522f33f826efff4052e253ec554882db54421a00f2636594e9ccc27e16dfb865f8de101678cb07b1a2d31b516ce4a88b65132ecc1101d07b6cc1bd571",
|
||||
"@img/sharp-linux-s390x@npm:0.34.3": "284d2fcd9cc297b27ec135b0c63d5a6170cb17be378d92c75ec19b6034e7ed5801cab04ca17d445a80b073d67c4f9fe809334f5d4edf533c2d81d66d5d882ef3",
|
||||
"@img/sharp-linux-x64@npm:0.34.3": "a370c04ca6d4145e6d6529d84b133d80e88d408e4483ba168e5993e5b4c0cbd2db57d4e53aca0bfa43320b571ff8bd70c22d8d7f5fadb5e5df1ded91393ae71d",
|
||||
"@img/sharp-linuxmusl-arm64@npm:0.34.3": "c63d8afda1a7d4810bdc19473b6235313d923f8763a8dfc182465b63b8e4805769a9e92a8b2136f0235e07ae1b1ab63adfa904bb833d64f0495108dfc180a475",
|
||||
"@img/sharp-linuxmusl-x64@npm:0.34.3": "9500e8f5d0ab96395a8d522920f25d4376d928ec58e88b3a5dbce5249c26efec046d20845bee8e9233fbff5287cfa979cfc079bc608342d257a6827be6cc0322",
|
||||
"@img/sharp-wasm32@npm:0.34.3": "840dd97d3151b2189c3d0ee0746c139cbdd0441d5d5dfc87d2dd9970fc2c5448a3815c3110c64009998d165ca6dc7b5d58811b98b2c1e4ab0a1eb5ad97275f1e",
|
||||
"@img/sharp-win32-arm64@npm:0.34.3": "adc7d18a8334ca1fea09c877dc9493e75a9018f73dc63038c8ccef7535a272c0aa3c2a9867a49a223703747149fb1fe57ef8580dd6098f0f33c602a876a48e1b",
|
||||
"@img/sharp-win32-ia32@npm:0.34.3": "eef220adf1240429f72d9a9aadc22ccb741889785fa025396cfed41603364990b5f3841cee4d60525b22e65f36c7416297581300c873268fe2b7bb67087ada73",
|
||||
"@img/sharp-win32-x64@npm:0.34.3": "5a5d2624bea7a31393b5a89738ad22a2b020a67f5e5b9eb40063510b514e8516b0fb4e320ff9eb1d32fa2ee3b4c3a0387333d051da28d93957116cbbd63b5fe0",
|
||||
"@libsql/darwin-arm64@npm:0.4.7": "161ac6b537e39e33c65a7f06c16152ccd5077129b8321b5d0082e008054c47dbc32563d39a47e223d09994457211582ff3760ffa5523f2dd3cfac1dd726a577a",
|
||||
"@libsql/darwin-x64@npm:0.4.7": "45c85d00566507f19474f9ae4b6453fa8fff10994147751df2dd2177edf9961520af54156d2d41b23cdfaaf2b219ea4ebd4b44a868e890088fc2283c1224752b",
|
||||
"@libsql/linux-arm64-gnu@npm:0.4.7": "c4126b0d717b45a8d1d66797bd7447fdaf53631277dac0250e0aa0267e279493b114b3823407e49da0e2928d6595d3a28370acb99c43424e8bc7e11434cae5f8",
|
||||
"@libsql/linux-arm64-musl@npm:0.4.7": "13eef982caf2b73cebabde76b8e209ddea27d2ff0e6228a56704a50ad41975ff03a15d90bec6ccc908cb16355d685903719676f7a91c92d20a68eecff4a4f0b6",
|
||||
"@libsql/linux-x64-gnu@npm:0.4.7": "524bf04f98f7a91e343b294262a627a965f626082b63b998c8019d105380caa2435e240f6085103751f87919ac2415aba97075696822915bf1a4e4492d9376f5",
|
||||
"@libsql/linux-x64-musl@npm:0.4.7": "227cddb499cbbf677c1dfaeeb8bd787d4c6d4cbf50c94ac1632348f26b412d2f8bacdb0131050c507d1961f96f8bbff2d8b7949f26f1dcebb61e115da9253aa0",
|
||||
"@napi-rs/system-ocr-darwin-arm64@npm:1.0.2": "a1a0ea7044baa9589f26e55c661b1491c4dfe8c5cced82c31d00e86d297dacc61bd76042438069d97dd810808f7d3dd78fc449b898c90653af19b298084cf0f5",
|
||||
"@napi-rs/system-ocr-darwin-x64@npm:1.0.2": "92b68b7e6a4be82b24fcc952d2c820e07bf68fb625d3c69edbcbf13227be508302f87ba9b0ff50d415c76ac16493d11040b6cc55a5b25f4414f3af5c00ab4597",
|
||||
"@napi-rs/system-ocr-win32-arm64-msvc@npm:1.0.2": "5c6945c5053380ee33df277df77ac813cc44763e9f305ea0b0990d3960269676ffe88bdd33038fa378d055c9986b7ecc31cbabc7f8fb51e077c59364a9ea29ec",
|
||||
"@napi-rs/system-ocr-win32-x64-msvc@npm:1.0.2": "9d6ebdaa753cea6f6e2e5b1b01ba293a7cd79ffd265bf5144f96f09bd596df21612662d7f62973886dd75725a029971cc3f11451ab95933bca5441b02593f352",
|
||||
"@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a",
|
||||
"@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79",
|
||||
"@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b",
|
||||
@@ -44,20 +70,33 @@
|
||||
"@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628",
|
||||
"@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c",
|
||||
"@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963",
|
||||
"@rolldown/binding-android-arm64@npm:1.0.0-beta.29": "60ff5920b683896ed304fd527460a0513106456b0e83c4414505970c86367d048c9a447ff0e518321f111be7e86ab81f8238ac751b1993c6a3e4b333705f3cba",
|
||||
"@rolldown/binding-darwin-arm64@npm:1.0.0-beta.29": "c6961c23612697643ba0b4267a8c5ca6f7b02683b6354491f6be7deb4b6840cdc482d62ec3169317ee6d19a7333632151622f5098b8c1f44546d953990bd5b0d",
|
||||
"@rolldown/binding-darwin-x64@npm:1.0.0-beta.29": "8b96e418ea28bbe320333b8815f779d6d9f00b438044bb7608945460e428bc5bd89ce372c399665eee6b42e266843652ffe4d43f5feb51035a56875e051dcb5c",
|
||||
"@rolldown/binding-freebsd-x64@npm:1.0.0-beta.29": "a6100a5e7d54968685133dd276c31c96d62789bc5ff213e70e3457d401b267f8524f71aade404f0c51d432046783d6d8da80f46b71272c6e0020f5b303512815",
|
||||
"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.29": "e99a4073fc2f8ef7a878ab124f5370d37102d549d250a7287864cafc70886bd8ee34b535960660d4a8056aa3547740a68b56eaeaa2d8eb0acd4ad7795c75d9f8",
|
||||
"@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.29": "bfdcec47cc34ee1e9c71944b5f5486ca970106555f3b23eed4a7b359d45c1e5efe5828d3e518908e0913ff7b5f2a7815d966c528830173aac628ba12367f6c0f",
|
||||
"@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.29": "a9d9bbff330df732da670c6ceb8310619febf777861a516b190223f1aa45ec2434bc920d6be012052430780aa7eed5af017e6e52b8b5b16e8c57964dec6b5c15",
|
||||
"@rolldown/binding-linux-arm64-ohos@npm:1.0.0-beta.29": "693bbd389b476d0a59a482974120b2565ede119a6d00b8f626a6d7a32e3b2b8c41473670ca5ed6c44dbe92ff9bd73a4b95503246158295fe8ac440c20272811d",
|
||||
"@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.29": "aff1e841dce325fdc9dbc1d31e469caea2136c123ffd7996e2045861cf9d2147027eaa95df40ed03d5463bf9ab7b6e25bab09496a4a22a90f024574f465bce0e",
|
||||
"@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.29": "9e9ff51e53293f6edf933948de3f1ec29b3d69d38611e6db6be7abe8b385286710e36b4576d6b62875b5b88c9d0500ed8b51c12dbea9c615673bdd62cf954d89",
|
||||
"@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.29": "c8d8547804e1e73dabfd904e451836afd08371b9a3ca683968f9d63c5b63eadb7bc7ed976cf85569c8e5a0e8ad4152038738e83ff5f2e3aff5be04bb55645496",
|
||||
"@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.29": "73e1dd24300d846f5747d18a7fd6c2538153eed05a82b79bd97f2f0c3a3d581f2b511f5a1adb6a6f1f661731eccb2841ec628b079db661c0d1a85fa91f5c4271",
|
||||
"@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.29": "d8f18bf33a729a2213c7c874c3efe39cdc73701e2fcc5d430f8430b87dcac6c4bdd6b2357c029fa9cc254a61a74066d5707d45eff190114807495ce102c2ffdb",
|
||||
"@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.29": "fb8a44f8969b5d1040767ebc487a51ab74d0ac1f6e4ae771ac053de652575c7687fe5c21e640001fea2c1bd9a55bc48c90adbb21b850078ad7f9db4e0d7b7bae",
|
||||
"@rolldown/binding-android-arm64@npm:1.0.0-beta.34": "98334e08fe3f9acafa1e0c337d74138a93892dbb2b03e53b79ab3fff5cecb34406493af97e454b3c76e27ac1f9f65496d54cf7c904a2cdba4bf1eabddb5bbd50",
|
||||
"@rolldown/binding-darwin-arm64@npm:1.0.0-beta.34": "d753421b3ee4da8ed6b67072064947a17122e138609652ce5534e97aff420e63a463c2fab0a678a1b0483b1e323c8392d671e5c8b415ade92f54e98235ebde62",
|
||||
"@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
|
||||
"@rolldown/binding-darwin-x64@npm:1.0.0-beta.34": "cf850d66c40157d49976ee646096d4979b6c8c50aed67375936d3e485bafaadc694df232293bcbd2bcad247e983dac6ed0d26bb756e0abaa685c0e04282ed806",
|
||||
"@rolldown/binding-darwin-x64@npm:1.0.0-beta.9-commit.d91dfb5": "a7b89d92f33ad9a718de70c56452dc481962e5396b32d66cbc08e588f45fa090ed6e3b7d8fc2ec641acf3de2a550b6d05416b14179ed4fcc8d336fdbd697d40b",
|
||||
"@rolldown/binding-freebsd-x64@npm:1.0.0-beta.34": "3c0585c8ca34a77631f7606c15e653db95b3f56bdeb1a656f350d0ae82b1d136d4b74cc2d87e4efd1994571b59710b349ca373b2c3a6880fc7294cb39febc5cf",
|
||||
"@rolldown/binding-freebsd-x64@npm:1.0.0-beta.9-commit.d91dfb5": "7da382e43eeada73dec31bb63680432f129fa17efed7ed211da0c9915a89c9dfa2e8ec35aa7f07a4be99a36eb14df67059a375ac4bc5e6a5cdc16e02f7a9bd3c",
|
||||
"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.34": "69d123591deefdc017ac863cc95c37186eec31fe92fd9e7b2fe5080fa569bb201ae1f0c42bdd57fb0561f9210e296bc83a0e82df6d21a1ea419af0b47620db70",
|
||||
"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.9-commit.d91dfb5": "cb5a7635fc2c39049c1fba8376d3b23f58240dbe2cbdc127d0dc8f2b8900537298bb8b52abde5b6e941cf22d8f69466433048db573c683947bf797f92f28baee",
|
||||
"@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.34": "4cdea4f975d4424c488a83d0cf8027091b639a2b5ce9f11d5792c83f19906fdb63f4f162750b3406b3cd82b2c19dd7035d25c1ac4ca897b44f071a1a8dfc4251",
|
||||
"@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "8ff267e66b1f59e9317d5b9d89e00a3e11172ae5b5cca17985e92cd52672ef59cd2d6292263700ff8edb02b53420865f655e6ed7f4b4ad8680e4ee0d99dcf5a7",
|
||||
"@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.34": "bd8369aa12b55ea1be91b0bd6a392861dbb1fe59db6ff2f346a15336ae42abf4627e4f875b57057421a72e1e47b785f70a912050f9fe780905d9603b203b8fc1",
|
||||
"@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "7b320fbdc870cb7f2f75e89058ac50a675c05236df12739b98ce287ad07cce53474699bf19b729577c3de62d80c2fbd988cbbb8bc29e06c88fc42a8ece176b19",
|
||||
"@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.34": "7308f80b58203ba3e10e7a6a1354f684f8961f1ffb1cfbb6a110c245b855ae8d762ee796986b86b0de0fd4b4b1572e09dceb256234866f1d4727a457d2702cdf",
|
||||
"@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "99679e1c7e290c7d747d6deb420357522fb0fab1fd022cf79f84534243af2eac15988c8ef5d1b50c679fdc915788360bf744c4e0c9e47952aa0985f23ee58e80",
|
||||
"@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.34": "27154a7af28f34f97f1c325727c1caf97c6270ea812f349720333aa5eb8ec1379741ab2705758a55f52891b1d79f4b68892078f290b36aa5edb8bc3679f36435",
|
||||
"@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "2ce172ea44980ca6b86636a13cce7d70104e25f75caaa0c4d6d9199721825a896a74b11bc32fecbc2756aa829d7e10f4701b2f3544b77cfa4da3c2cea0d72e1c",
|
||||
"@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.34": "00d2a12a4984502ed5ed6950562cded24cde56ed615c6ac5c198880fb72c86506e1f4b7743443da5480d7f268b9d74e7eb789d429749f416f3ab6b4bb5ba167c",
|
||||
"@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.34": "8bb90733a13691de5315fc3924b0ce6cb96ece6c8b24406c0818c931a880b9d55c3e5c66a5e707382a4329c406878400fd041098b42d0921035efca2a163e96a",
|
||||
"@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.9-commit.d91dfb5": "3516b21ab1982990435d550a23c153393ce1a2c9308b6df6614438c14ef1206d50c5e7dd214c403a42c9f4e695b574122abc8009df5171ebb79e685da14e7562",
|
||||
"@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.34": "9feac1757ce2724d289be23539b497bb206cc5582d69397626d40ac1d1831c6bbcc68498502921489990ffcb879036528d130a0969d3b4608b207d9dedd5ae0a",
|
||||
"@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "17086030865bbfb6668d04f882926035fc1f72db81c3415a8f81e6196b9f849eabd6f2a62066e83f87255fcec106fe274353c8f5ff9c782417b6eddc664a129c",
|
||||
"@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.34": "0302a7fbe7d77352545ad3970e2b7f1c091f7fbd02d278d07e7c825377291a435eef84d67bc3a1e0e8e3fdfef3b6c59d8b9670318e683df08758f5ba7a801c5a",
|
||||
"@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "ecd226ec05f9f863d97de98ca4d7cb9026bcb0cd2fff12e325209664eaca1fa131744ad72d1352b522567adfe4967ca73e50987f96ab475b50e9b96456dd50cf",
|
||||
"@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.34": "70bbbc04e01c437a58c89f7b8ec249a9e43eb7b4336323efaf7abf46fa6445f087ee1286edb454658b9f4f4e54daf906059cc8484613be2d5b174c905dc44518",
|
||||
"@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
|
||||
"@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
|
||||
"@swc/core-darwin-arm64@npm:1.11.21": "6f228ce5497f8b797d9b838af6d51c8fc27d1643d13b033ed762ab5247047da91efa3e61f38040b5ff326bfb6af0ed663f5ec8319574db1c0e355d64c9c2b665",
|
||||
"@swc/core-darwin-x64@npm:1.11.21": "8f7fcf910f17ab6d30fe55d7498f0ff2ac47e1e0fad749e01151891d5257f49c6354dae31917cc5097230940f9a068fcd981441e7c9581b1373e9e9c4d1ff9aa",
|
||||
"@swc/core-linux-arm-gnueabihf@npm:1.11.21": "5f0d964b13b3c138fe0b3249b852db4330707d4584ed5d5b0b71fb72023e3b35f3faa88c6b8f49970f7adee57976e7e1fc9115be194b91f435249b6531602e1c",
|
||||
|
||||
@@ -19,13 +19,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cherry-studio";
|
||||
version = "1.5.7";
|
||||
version = "1.5.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CherryHQ";
|
||||
repo = "cherry-studio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wC4fNDG5xx4uBiBZu7KjuATlSpESwI0dRO/8nZ7DXas=";
|
||||
hash = "sha256-XJFqoluI3ZwmqxhKpJANqOxkYP3Va7pXXyWOHSLopwc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-hNgiqU4pM0xEBAK6HGArMhAD8My2qIh5gyPV9sDnoeg=";
|
||||
hash = "sha256-k23HzIN8QAkV/IREM5fHHeaMjO+cIthpLNrLKn4g7tY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "12.0.0";
|
||||
version = "12.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XP2knKGKrhZMWJ4eoLC6Z0Qtu+7tOOUIy7r6+oRiTnA=";
|
||||
hash = "sha256-lkpmJPFOxsk59ta3ts0vNB2dXtDJXNxxWIKDnIQAv+M=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cproto";
|
||||
version = "4.7x";
|
||||
version = "4.7y";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
# No version listings and apparently no versioned tarball over http(s).
|
||||
"ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
|
||||
];
|
||||
sha256 = "sha256-+yS3JU2KURiRPTt6VDMZdeYFU6/HC4jk58KZggNHjP4=";
|
||||
sha256 = "sha256-C9HYvo/wpMpD+Uf5V1DTT2TtqTyeLKeRAP1gFAt8YzE=";
|
||||
};
|
||||
|
||||
# patch made by Joe Khoobyar copied from gentoo bugs
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
openShiftVersion = "4.19.3";
|
||||
okdVersion = "4.19.0-okd-scos.1";
|
||||
microshiftVersion = "4.19.0";
|
||||
openShiftVersion = "4.19.8";
|
||||
okdVersion = "4.19.0-okd-scos.15";
|
||||
microshiftVersion = "4.19.7";
|
||||
writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
|
||||
gitCommit = "a6f712ab378699f42208db01a49a9ec96887bede";
|
||||
gitHash = "sha256-Iw+pR7BUj3geNa6rWIPtTTFCLWcIsADTmlPBCgFcKa0=";
|
||||
gitCommit = "5d2dd491c18f39e1edd91b9bc6d5f12a1f0d9ba5";
|
||||
gitHash = "sha256-7kgZUU582Zu2kpYSRdbAEfFud0gxlj/DWfmtN4sps2w=";
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crc";
|
||||
version = "2.53.0";
|
||||
version = "2.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crc-org";
|
||||
|
||||
@@ -21,18 +21,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "crosvm";
|
||||
version = "0-unstable-2025-09-09";
|
||||
version = "0-unstable-2025-09-19";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "3202c663eaa555678bd142320d51c63acce266bc";
|
||||
hash = "sha256-t53RWPx/z9pHvCd+kuXR+AkOKcnaFNwVs3kePalbnbE=";
|
||||
rev = "c16dbcf9147bd77fa409b6d97c4c78b08be38d10";
|
||||
hash = "sha256-rMjSG9S/roOEU8/wmP5Y5AK2akTP07U/5p9l3ONrtFc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-94m7vl3a35pUKxDlQDPY6Ag5HniZyLZ1+vfcJj7cKhk=";
|
||||
cargoHash = "sha256-l1uyCGyLhrP5JNABQ+3uvPRYNOl9YB3ndOcxNTDaSv0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -5,18 +5,9 @@
|
||||
set(CMAKE_POLICY_WARNING_CMP0126 new)
|
||||
|
||||
include(${CMAKE_SOURCE_DIR}/cmake/compiler_options.cmake)
|
||||
-include(${CMAKE_SOURCE_DIR}/cmake/CPM.cmake)
|
||||
|
||||
+find_package(Catch2 REQUIRED)
|
||||
|
||||
-CPMAddPackage(Catch2
|
||||
- VERSION 3.7.0
|
||||
- GITHUB_REPOSITORY catchorg/Catch2
|
||||
- OPTIONS
|
||||
- "CATCH_INSTALL_DOCS Off"
|
||||
- "CATCH_INSTALL_EXTRAS Off"
|
||||
- "CATCH_ENABLE_REPRODUCIBLE_BUILD Off"
|
||||
-)
|
||||
-
|
||||
enable_testing()
|
||||
|
||||
set(TEST_SRCS
|
||||
@@ -3,26 +3,29 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
catch2_3,
|
||||
asio,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "crow";
|
||||
version = "1.2";
|
||||
version = "1.2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crowcpp";
|
||||
repo = "crow";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-fokj+KiS6frPVOoOvETxW3ue95kCcYhdhOlN3efzBd4=";
|
||||
owner = "CrowCpp";
|
||||
repo = "Crow";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iQ2owNry4LOmMxyO5L7O7XZB5vwUf+ZuZL76hZ6FThk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./cpm.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ asio ];
|
||||
nativeBuildInputs = [
|
||||
asio
|
||||
cmake
|
||||
python3
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -30,6 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [
|
||||
python3
|
||||
];
|
||||
checkInputs = [
|
||||
catch2_3
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Fast and Easy to use microframework for the web";
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cyberduck";
|
||||
version = "9.1.2.42722";
|
||||
version = "9.2.4.43667";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://update.cyberduck.io/Cyberduck-${finalAttrs.version}.zip";
|
||||
hash = "sha256-oGerVv6CteMl+MJ9AfGYmo6Iv6i7BFUCF+E3My6UH6I=";
|
||||
hash = "sha256-fTJoNdgp6EWdloejk7XG2lJh1NErxFRmvx2fZiwvWuc=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -53,6 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
emilytrau
|
||||
DimitarNestorov
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
mainProgram = "cyberduck";
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "datafusion-cli";
|
||||
version = "49.0.2";
|
||||
version = "50.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "datafusion-cli-source";
|
||||
owner = "apache";
|
||||
repo = "arrow-datafusion";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/vqesGd0O/oZCx2UJLrFS1EeiLu7HkhHWhvGBEIZKdQ=";
|
||||
hash = "sha256-CXElFGaWC+oU5EZcDfWkSE/cXxY4GO2AJy9FerWqVkI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-E7RT9n7zLoRGD4eNx5Fm89NtCxl2KujxfVhAeP+56vY=";
|
||||
cargoHash = "sha256-bC+IYH8iAVJTEFf2sm0JYY/XhgrbDfeO9HsWTf3OtCw=";
|
||||
|
||||
buildAndTestSubdir = "datafusion-cli";
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "delve";
|
||||
version = "1.25.1";
|
||||
version = "1.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-delve";
|
||||
repo = "delve";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-I7GGpLGhOp29+2V3CSSGnItSwhyrM+2yZxQsGRN812U=";
|
||||
hash = "sha256-CtOaaYxqa4GwfDQ1yuUwRQPy948Xyha046TLTaq526w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -29,17 +29,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deno";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = "deno";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true; # required for tests
|
||||
hash = "sha256-N5TDKQKgmVCUevjJKIXJYje3bIBPXKLX53kQP7DdSUA=";
|
||||
hash = "sha256-W0wQ4SXIAxIBjjk2z3sNTJjAYdY73dDaiPWDeUVWo/w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oGkM9kvPM3HU8SGj7Hpe6xcy5dzjGxEyKjck68CpeBA=";
|
||||
cargoHash = "sha256-5votu/4MUusRvlZc4+vZQ/wbcI0XSZ8qkq5JaMGJHB8=";
|
||||
|
||||
patches = [
|
||||
# Patch out the remote upgrade (deno update) check.
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dsdcc";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4exb";
|
||||
repo = "dsdcc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-DMCk29O2Lmt2tjo6j5e4ZdZeDL3ZFUh66Sm6TGrIaeU=";
|
||||
hash = "sha256-4wSf4pOEheuhW4ReEDo5i3poiHMC0wgSUk2lXBYWjOs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xinux-org";
|
||||
repo = "e-imzo";
|
||||
repo = "e-imzo-manager";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JXALTSgxIULDHdw90RjxlNQiLT+GKrzpkqPlMY0h+8c=";
|
||||
};
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/xinux-org/e-imzo";
|
||||
homepage = "https://github.com/xinux-org/e-imzo-manager";
|
||||
mainProgram = "E-IMZO-Manager";
|
||||
description = "GTK application for managing E-IMZO keys";
|
||||
license = with lib.licenses; [ agpl3Plus ];
|
||||
|
||||
@@ -27,14 +27,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eduke32";
|
||||
version = "0-unstable-2025-08-13";
|
||||
version = "0-unstable-2025-09-13";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "voidpoint.io";
|
||||
owner = "terminx";
|
||||
repo = "eduke32";
|
||||
rev = "126f35ca8c24368f101996523935d08b269f45be";
|
||||
hash = "sha256-TuCb2LLeg/MZ3fG1fqGNNeJb8qLjom0nXger8cMgk1c=";
|
||||
rev = "e5aad188685d005f8ad65478384693fc0dc0c83f";
|
||||
hash = "sha256-0iICExzsw/l/QjGJDJ6X+08+dzwsA+6tjaOWKNrXsjs=";
|
||||
deepClone = true;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "endlessh-go";
|
||||
version = "2024.0119.1";
|
||||
version = "2025.0914.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shizunge";
|
||||
repo = "endlessh-go";
|
||||
rev = version;
|
||||
hash = "sha256-CLmlcuRb5dt1oPNdBfx0ql1Zmn/HahcmhVA0k50i6yA=";
|
||||
hash = "sha256-ABrmvP8xfH1DWzepnzrIsNJDE9sDoXPQteA/ToyRtoo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-unIyU60IrbiKDIjUf9F2pqqGNIA4gFp5XyQlvx6+xxQ=";
|
||||
vendorHash = "sha256-HumLc9u7jVFk7228SYHptBEOSRdLp4r5QECYlYrO6KY=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fileshelter";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epoupon";
|
||||
repo = "fileshelter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-21ANNJB7rbGAdlS7ELyGAEIjvK8biFlH27yVHrLKpwY=";
|
||||
hash = "sha256-M6Asq3FWK7JpiLwxtNfuzeltO7iWxLOZIYg5lwJCByM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "newt";
|
||||
version = "1.4.4";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "newt";
|
||||
tag = version;
|
||||
hash = "sha256-wY9zaBDDNqXAAHlFYADS16yp9TOLIIFkjevQL3K0ySE=";
|
||||
hash = "sha256-uIlBAqe93MqMSN0Nghlfa1cLbMlcg3iMCzIu0U16h5o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XYj2hMsK7Gfrk25bRz/ooDkrXmuUdBQSF/ojF7OTQ4I=";
|
||||
vendorHash = "sha256-FeDNv1mLTvXYUDOHzyPP7uA+fOt/j0VT7CM6IyoMuTQ=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace main.go \
|
||||
|
||||
@@ -28,16 +28,16 @@ in
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "pangolin";
|
||||
version = "1.9.4";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "pangolin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2tTe8HlkTMHK6W+rLaiOKA/m4yLq63BQP5Pu+Jcxu88=";
|
||||
hash = "sha256-q5HnXJCx8wvHT+D/Pa+752xh57m/odesRjoqSdCHfrI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-K3G8t+RwG87Sc7zp/zQZNJmBgezk95bpUpHzqnVaThQ=";
|
||||
npmDepsHash = "sha256-ivG/7KTmWPjnXzO+ISc+2bsNqW/0VPhFbg1229A64cw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
esbuild
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.98";
|
||||
version = "1.99";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QF3BmQBmzEba9MLimwLBV9Z0XNZ6FEOidk5JE2DvGdM=";
|
||||
hash = "sha256-7FA6pd8rnobvOWHqHqJseJgUniAYhpzqmJnmqYyvpm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatus";
|
||||
version = "5.23.2";
|
||||
version = "5.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TwiN";
|
||||
repo = "gatus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-b/UQwwyspOKrW9mRoq0zJZ41lNLM+XvGFlpxz+9ZMco=";
|
||||
hash = "sha256-UtimuNuxAKychkyBuv4dWD9g7NfuuhysaHyFzfSqzEo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jMNsd7AiWG8vhUW9cLs5Ha2wmdw9SHjSDXIypvCKYqk=";
|
||||
vendorHash = "sha256-IP0OID0u9s0u65W18WzSXjZDTsvPHSzGHisI4vWaNMk=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.5.3";
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fs/69CmnDtCrPAv/wxORGyigNdQQw/R7gv9D47hhfnM=";
|
||||
hash = "sha256-A4O94X0TCc8lgX52+VQ1lSGREmpPIFLpu65Vwxsqso8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-JWP5eM+e6YVOIYIU43iSTuPxmYf8Sgho1VT9GzGoJrU=";
|
||||
npmDepsHash = "sha256-d33dWwrCND/5veeIQ8iz87nTxu6wd7FskrGgvwBuruk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "google-cloud-sql-proxy";
|
||||
version = "2.17.1";
|
||||
version = "2.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "cloud-sql-proxy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XisVCgxPZ8NsxrC3RFqBzaZP7YcueIx6vJmn6XBH9bk=";
|
||||
hash = "sha256-c37/364fAm4FR3TQ55zKRUVWr2rr7SZUMRlTJKEIc8c=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-uFbyap8xCb1YVFiFstvXZrc1P18LtQ4PJewMRCOfeWk=";
|
||||
vendorHash = "sha256-nrrf7+6uaKHvrJg8mrqjbyJxDjZhO4KKPd9+nIX+8A0=";
|
||||
|
||||
checkFlags = [
|
||||
"-short"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "goverter";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmattheis";
|
||||
repo = "goverter";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7uzkSI6ZqkCu+rhC2KMHU2i0geedy6gOKiLZwsFDExM=";
|
||||
hash = "sha256-OJMZovYTPOW+jeml3J6+V7qiyNVZPxl1eHYJ1fEhdHk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wStuQhxrzd+LyHQi+k6ez6JT1xzZcPjJa09WqX70bys=";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
goocanvas2 = goocanvas3;
|
||||
}).overrideAttrs
|
||||
(finalAttrs: {
|
||||
version = "2.2.1-unstable-2024-09-17";
|
||||
version = "2.2.1-unstable-2025-09-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "csete";
|
||||
repo = "gpredict";
|
||||
rev = "91a4a3fb15e7eab0374d1bb7c859d386818b48ee";
|
||||
hash = "sha256-/XCJ+jCSY4o0OLVVY6OGvnmMw6aI/iQOhjyLYWPj7Ec=";
|
||||
rev = "34af48e6bfd9647559abb1df4907a65d064fc870";
|
||||
hash = "sha256-G4bS7w/USIzYOa+aYv3YQCbUQolV22Z/7+71GHHSUpk=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hmcl";
|
||||
version = "3.6.16";
|
||||
version = "3.6.17";
|
||||
|
||||
src = fetchurl {
|
||||
# HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.
|
||||
# See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28
|
||||
url = "https://github.com/HMCL-dev/HMCL/releases/download/release-${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";
|
||||
hash = "sha256-C3a8pjMllkmTpChucFBunW8uixnnvqrXg06BhLAg6Y8=";
|
||||
hash = "sha256-LNEb5YpvuMQGPy1114+y+59ZZNfBuC/Il813NkqHDMg=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2025-09-04";
|
||||
version = "0-unstable-2025-09-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "b08f8737776f10920c330657bee8b95834b7a70f";
|
||||
hash = "sha256-4ve/3ah5H/SpL2m3qmZ9GU+VinQYp2MN1G7GamimTds=";
|
||||
rev = "11cc5449c50e0e5b785be3dfcb88245232633eb8";
|
||||
hash = "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
}:
|
||||
ags.bundle {
|
||||
pname = "hyprpanel";
|
||||
version = "0-unstable-2025-08-19";
|
||||
version = "0-unstable-2025-09-11";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -45,8 +45,8 @@ ags.bundle {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jas-SinghFSU";
|
||||
repo = "HyprPanel";
|
||||
rev = "6385f2e15df908e0c13bed800f4b091300e5b981";
|
||||
hash = "sha256-ukXfV1cAsxoar0IVEO2/s3qnVEZpZf0wvqE3PIESobw=";
|
||||
rev = "0a961ce8a959c521f41546af7f355e04adee5503";
|
||||
hash = "sha256-pz69vejsrB+7N+jyKxZcckTjJtzw9BCAIRzHNbFUIp0=";
|
||||
};
|
||||
|
||||
# keep in sync with https://github.com/Jas-SinghFSU/HyprPanel/blob/master/flake.nix#L42
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
yq,
|
||||
python3Packages,
|
||||
fetchFromGitea,
|
||||
iproute2,
|
||||
@@ -12,18 +14,50 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.1";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "liske";
|
||||
repo = "ifstate";
|
||||
tag = version;
|
||||
hash = "sha256-QxjziDlkbTxAVd3qA8u4+JT8NWJxBMVAp7G5Zma9d10=";
|
||||
};
|
||||
docs = stdenv.mkDerivation {
|
||||
pname = "ifstate-docs";
|
||||
|
||||
inherit version src;
|
||||
|
||||
nativeBuildInputs = [ yq ];
|
||||
|
||||
buildInputs =
|
||||
with python3Packages;
|
||||
(
|
||||
[
|
||||
mkdocs-material
|
||||
mkdocs-glightbox
|
||||
mkdocs-minify-plugin
|
||||
]
|
||||
++ mkdocs-material.optional-dependencies.imaging
|
||||
);
|
||||
|
||||
postPatch = ''
|
||||
# git-revision-date requires a git repository
|
||||
# privacy and social plugin require internet
|
||||
yq -yi 'del(.plugins[] | select((type == "object" and (has("git-revision-date-localized") or has("social"))) or (type == "string" and . == "privacy")))' mkdocs.yaml
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
mkdir -p $out
|
||||
mkdocs build -d $out
|
||||
runHook postBuild
|
||||
'';
|
||||
};
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "ifstate";
|
||||
version = "2.0.1";
|
||||
pyproject = true;
|
||||
inherit version src;
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "liske";
|
||||
repo = "ifstate";
|
||||
tag = version;
|
||||
hash = "sha256-QxjziDlkbTxAVd3qA8u4+JT8NWJxBMVAp7G5Zma9d10=";
|
||||
};
|
||||
pyproject = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libifstate/routing/__init__.py \
|
||||
@@ -71,6 +105,7 @@ let
|
||||
};
|
||||
# needed for access in schema validaten in module
|
||||
jsonschema = "${self}/${python3Packages.python.sitePackages}/libifstate/schema/2/ifstate.conf.schema.json";
|
||||
inherit docs;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -48,7 +48,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ipxe";
|
||||
version = "1.21.1-unstable-2025-08-29";
|
||||
version = "1.21.1-unstable-2025-09-18";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mtools
|
||||
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipxe";
|
||||
repo = "ipxe";
|
||||
rev = "969ce2c559a6841a949a1b73a3967b1889e0c999";
|
||||
hash = "sha256-a9Nmo9ZAzbsePwS/LFh3qMMfsezu0194WV98BXhiT0Y=";
|
||||
rev = "6464f2edb855274cd3e311eff0aa718935b3eef6";
|
||||
hash = "sha256-K1BiZqthdkIbRiBHUYTu7aIJ8LJ1xpGmVCa255GkFmM=";
|
||||
};
|
||||
|
||||
# Calling syslinux on a FAT image isn't going to work on Aarch64.
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "iroh";
|
||||
version = "0.91.2";
|
||||
version = "0.92.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = "iroh";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-O1hWQNBLUqkBPoaW1lxmTrai+lktIAFgPX2Qa3y5HPc=";
|
||||
hash = "sha256-Xdiw77zJd0WfrEqo4Y6BwyD9qAKFEIUS511CQvtU9xs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CgEit1HR6w0Y5SmSpErJnag3vaNgyocymLaM4RjYIBo=";
|
||||
cargoHash = "sha256-Bq53DOZZ+MJlzJVHL6uPAH/YXkeSFFHhTlC2ZkvW7FM=";
|
||||
|
||||
# Some tests require network access which is not available in nix build sandbox.
|
||||
doCheck = false;
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
luajitPackages,
|
||||
libpulseaudio,
|
||||
features ? [ ],
|
||||
systemd,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -30,16 +31,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ironbar";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakeStanger";
|
||||
repo = "ironbar";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UtBO1XaghmzKv9qfhfoLi4ke+mf+Mtgh4f4UpCeEVDg=";
|
||||
hash = "sha256-8Ol/EvG7BPNyrJ3SdwSYtJcTLCr4TRmsMczKXD6Wuws=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-l+Y/ntuqaasDL0cEHSwscFxAs1jC0bm9oTU0J/K60AY=";
|
||||
cargoHash = "sha256-nBoe4Xq1MAKNUyf61WSA2r83nNJeZiBXL0PJRc+XXpc=";
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
@@ -52,6 +53,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hicolor-icon-theme
|
||||
gsettings-desktop-schemas
|
||||
libxkbcommon
|
||||
systemd
|
||||
]
|
||||
++ lib.optionals (hasFeature "http") [ openssl ]
|
||||
++ lib.optionals (hasFeature "volume") [ libpulseaudio ]
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "iw4x-launcher";
|
||||
version = "1.0.2-2";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iw4x";
|
||||
repo = "launcher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XX4NXBNavOjq+PiEYP5inwBxvajbJdgQz7cUx2ia/H4=";
|
||||
hash = "sha256-HALxUqfTGB7sQhp0G1vXAtxmh6CHRb143Wws6G6gvBY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jNj9l5IX/E6PNGGVukX+gJXZiZhv8FxPM7bCeMFZWFA=";
|
||||
cargoHash = "sha256-LS+b3ViCIuSVaoaXqwuPrZsvWlntheScrVPf+wtP7Io=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "klog-rs";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobifroe";
|
||||
repo = "klog";
|
||||
rev = version;
|
||||
hash = "sha256-dPFxjSq5P7MyXUAugZqPEYRJ2VcFuVs774f3AKdH7kk=";
|
||||
hash = "sha256-VyUUzhVwJ1tNLICXwy7f85queH+pn4vL5HTL8IHcQ7w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9dJ2MCAd6DhNaqgUtuBifMbTTZoCoLNLjyR9b0fwfcc=";
|
||||
cargoHash = "sha256-KJxssCN9/WoRR1Cv67CK5muVy+cqEEfzSioQtptplQs=";
|
||||
checkFlags = [
|
||||
# this integration test depends on a running kubernetes cluster
|
||||
"--skip=k8s::tests::test_get_pod_list"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "komodo";
|
||||
version = "1.19.3";
|
||||
version = "1.19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moghtech";
|
||||
repo = "komodo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-D6W9+JDvLpyALOAjFRcWtJcZMav0ypKmhhVhqlh4AgM=";
|
||||
hash = "sha256-zUfCcd5ptHQZmg6L5M23d7YuLjjFjutNCtxziXMpF/Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uZYNdKhZ91JN6NR3gWVP82rhy6db1qI/h+qmiVwxYT8=";
|
||||
cargoHash = "sha256-9bNbTk9kHLgHoYMRU4Le7WtEbrqQKjJVnetsoe0YTqE=";
|
||||
|
||||
# disable for check. document generation is fail
|
||||
# > error: doctest failed, to rerun pass `-p komodo_client --doc`
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube-router";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudnativelabs";
|
||||
repo = "kube-router";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bt7BnMIq/tkRL8d1pf/gG5qBq/1yiMqXDpBrIICo780=";
|
||||
hash = "sha256-l4wUS5Yz9mQd3fickrs4nBs9lR9oke0dBpJubf7Y+PQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BH0yLr7oVtpMPfljDIjzpQiABtwRKOPXNvejh8l8lE8=";
|
||||
vendorHash = "sha256-fXZ6jRlFdjYPV5wqSdWAMlHj1dkkEpbCtcKMuuoje1U=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubernetes";
|
||||
version = "1.33.4";
|
||||
version = "1.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KENE4d40LvrJf56S/2fYwbXT6e2KSk2a94ugVVT8vlQ=";
|
||||
hash = "sha256-rKy4X01pX+kovJ8b2JHV0KuzHJ7PYZ08eDEO3GeuPoc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -9,18 +9,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubescape";
|
||||
version = "3.0.40";
|
||||
version = "3.0.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubescape";
|
||||
repo = "kubescape";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zrfXeKvgpRgu64kh0sNfashegSkmu7c/6/FtG0OHwOY=";
|
||||
hash = "sha256-RRpZCEzuST8Q98O/Cdnl90efjdQLzupAZwfT2tkOzv0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-2yW8e83t19uy7HzWrFwsoXdD1HXZxe48I5CGAgg2gDk=";
|
||||
vendorHash = "sha256-nRS6Ytb/zMsqRWehiPX3E9dX3Rv1gANs3hCEEbu5leY=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubevirt";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevirt";
|
||||
repo = "kubevirt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vPlQ03AR44UVlRkZe34ZhdhBInZloOeEgjHXq7RC5Lw=";
|
||||
hash = "sha256-1q9zqgFkH/Hijp1+2GwlCD/whmoN9S+892ojOI/aSC4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kyverno";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyverno";
|
||||
repo = "kyverno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tP+klX3FuVBci4SEr4IV0JnyMBnGUTXMsy1xjZ6eHSo=";
|
||||
hash = "sha256-Mv01ILbWFLypXGl0zCUVa3kdSZGBQH8fAP3txyUArsE=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazyhetzner";
|
||||
version = "0.0.4";
|
||||
version = "0.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grammeaway";
|
||||
repo = "lazyhetzner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MPPe4Epr77aqAFOeDGj4lTAauR489hVqGz8uiIqdyW8=";
|
||||
hash = "sha256-1FXltNM+M8Txp1xoTqKcNI14dvbRQHl7izXtBQLYZTc=";
|
||||
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lazysql";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgerojas26";
|
||||
repo = "lazysql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-M6G0Bp9s1XhgZL9BZDzbJmUmE+UHidpsGIaNt1i7CGw=";
|
||||
hash = "sha256-6tPSr28Ja7LuwWrcqSYLxxQj8e9XCgTWxzudjXOriBg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NGwCTEh1/5dJWOCSe18FZYYu8v7Mj6MWVEWyNNA1T68=";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazyssh";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Adembc";
|
||||
repo = "lazyssh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0R/H+HaJ13dQhLbFgLAvv4MhXADT3UqWeyTgegKjFxM=";
|
||||
hash = "sha256-g+arg/fB8YUmMtgVv5dmaYvj0uI1OeFngrHJAcKJkLU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/RgjcAy2H9sWMWDA3QxMkT4LkzxvZqOZzKeR9u9bsH0=";
|
||||
vendorHash = "sha256-OMlpqe7FJDqgppxt4t8lJ1KnXICOh6MXVXoKkYJ74Ks=";
|
||||
|
||||
ldflags = [
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lf";
|
||||
version = "37";
|
||||
version = "38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gokcehan";
|
||||
repo = "lf";
|
||||
tag = "r${version}";
|
||||
hash = "sha256-I7HmhksPj6I/MScjc+w/KYBZho6br+Sdshq71W0DUFQ=";
|
||||
hash = "sha256-a3Ql0E3ZVbveGXGO+n2G2WBVjBk5HuJx9NiaZ7ZAVMc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T/UAhm+EnoT1rSdoWJXdSwbKKnXMdRit00E2/KmE3UU=";
|
||||
vendorHash = "sha256-kZFmCkYd6ijJC/vedUoWZW1TUW1oGD9qA0GCQzfiTUE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libretro-shaders-slang";
|
||||
version = "0-unstable-2025-09-05";
|
||||
version = "0-unstable-2025-09-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "slang-shaders";
|
||||
rev = "10b7e86738a8c3eeff7114bcc4ef110d382dd0fd";
|
||||
hash = "sha256-Js8RdmP7wjWHK5Z5Yejy53dD04ehgeeH2dY0OjcNIVo=";
|
||||
rev = "39ca959b131e75dcd0cb4016e545b4e91b7081ae";
|
||||
hash = "sha256-8G54UuuuZpi/sqEWfK/XNXEjjL9LGmffNAnQ+g/XQPM=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -18,16 +18,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lockbook-desktop";
|
||||
version = "0.9.27";
|
||||
version = "25.9.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lockbook";
|
||||
repo = "lockbook";
|
||||
tag = version;
|
||||
hash = "sha256-D194oIp6EE0Ub0+4iw4SlTxoyJ9I8xZa67TTh241BvE=";
|
||||
hash = "sha256-S2FApDKP2P4c9z6szM4irmu/ThmGnfgzzqJjI9qRc6w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KTT4z9lSrxpbCAyEccFMdqrCJKNYhv/8Jb6HeKzJYHs=";
|
||||
cargoHash = "sha256-94YNSY7s5mS3j/HhPx5HAMqiKXBXWbToysREmTHKgCk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lockbook";
|
||||
version = "0.9.27";
|
||||
version = "25.9.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lockbook";
|
||||
repo = "lockbook";
|
||||
tag = version;
|
||||
hash = "sha256-D194oIp6EE0Ub0+4iw4SlTxoyJ9I8xZa67TTh241BvE=";
|
||||
hash = "sha256-S2FApDKP2P4c9z6szM4irmu/ThmGnfgzzqJjI9qRc6w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KTT4z9lSrxpbCAyEccFMdqrCJKNYhv/8Jb6HeKzJYHs=";
|
||||
cargoHash = "sha256-94YNSY7s5mS3j/HhPx5HAMqiKXBXWbToysREmTHKgCk=";
|
||||
|
||||
doCheck = false; # there are no cli tests
|
||||
cargoBuildFlags = [
|
||||
|
||||
Generated
+2210
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
protobuf,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "luwen";
|
||||
version = "0.7.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenstorrent";
|
||||
repo = "luwen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2l+rcWP9Ms0bvvSvZIA4DjH6bIloQGxzRTE1ShP6hEE=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
cp ${./Cargo.lock} $sourceRoot/Cargo.lock
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
];
|
||||
|
||||
# Vendor a lockfile until upstream manages to consistently have checksums in their's.
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
meta = {
|
||||
description = "Tenstorrent system interface tools";
|
||||
homepage = "https://github.com/tenstorrent/luwen";
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
};
|
||||
})
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "maa-cli";
|
||||
version = "0.5.8";
|
||||
version = "0.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaaAssistantArknights";
|
||||
repo = "maa-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kQw4s9EPKSaVPJRSiMXcW0KNUaXGaYrio/3z3ud0lLA=";
|
||||
hash = "sha256-TLm8B1cQ00l9aRADYU3Qv7nA04kDaxsXX86qvsTRWwk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "git2" ];
|
||||
|
||||
cargoHash = "sha256-urw26D0aKXvW98LjrK9rYEeMsv4L6qVSlGaNptFw5M0=";
|
||||
cargoHash = "sha256-pJlTcxF6nzV4HfMTs/gAzSUubDy2UlhzEIVeSWs6uX0=";
|
||||
|
||||
# maa-cli would only search libMaaCore.so and resources in itself's path
|
||||
# https://github.com/MaaAssistantArknights/maa-cli/issues/67
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "maptool";
|
||||
version = "1.17.1";
|
||||
version = "1.18.5";
|
||||
repoBase = "https://github.com/RPTools/maptool";
|
||||
src = fetchurl {
|
||||
url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst";
|
||||
hash = "sha256-yPuZUPRP0O+5Grj53xteZovowuFxOo4q6qL3mnjgIu0=";
|
||||
hash = "sha256-67szWKgx3B5HacpzYThxGDHKHK5qz2GQ15+ZEuEGlAU=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@@ -124,7 +124,7 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
dest=$out/bin
|
||||
install -dm755 "$dest"
|
||||
makeWrapper ${jre}/bin/java "$dest"/${binName} \
|
||||
makeWrapper ${lib.getExe jre} "$dest"/${binName} \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ]} \
|
||||
--add-flags "${lib.concatStringsSep " " jvmArgs} net.rptools.maptool.client.LaunchInstructions"
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "marge-bot";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "marge-org";
|
||||
repo = "marge-bot";
|
||||
rev = version;
|
||||
hash = "sha256-Sz/jr5q5A0NikJPaU9r0+BYNJojLvZS3vDPte/nUIf8=";
|
||||
hash = "sha256-JaxUEXBxaZIh6fmOjSAa5FZnrO2uAnY3zKoO/mBukUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,21 +18,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-authentication-service";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "matrix-authentication-service";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lvBlwp2a2JPGgaCKt5HOxm9xoy+HyZeJGw6G5NiLgAw=";
|
||||
hash = "sha256-Du9gEQDRNcFJt15Vml4mltXliHTdfUTNvGETTwoSFS4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PQ/Op567xD1u8J01r5quzDsDjGw7kxbGL4oaM4b6Obc=";
|
||||
cargoHash = "sha256-KHoC1kX4/PbSEsHLwiwF/YcbJ97dsPOA5rz3b2nNV04=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-iyLUKcxpq5G7P2TlQ/GmJdZtEbeX+/NkhdEQOi44s5I=";
|
||||
hash = "sha256-vl7enIRs26HOWr/XPCRw8/f26NwqxgObRdKqEKcYDe8=";
|
||||
};
|
||||
|
||||
npmRoot = "frontend";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "motion";
|
||||
version = "4.7.0";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Motion-Project";
|
||||
repo = "motion";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-bGjiO14a7xKRgoeo5JlexXlKggE+agRMmQViBXagmt8=";
|
||||
sha256 = "sha256-NAzVFWWbys+jYYOifCOOoucAKfa19njIzXBQbtgGX9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user