Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -29,6 +29,9 @@
|
||||
|
||||
- Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now.
|
||||
|
||||
- `nodePackages.prebuild-install` was removed because it appeared to be unmaintained upstream.
|
||||
See [upstream's recommendations for alternatives](https://github.com/prebuild/prebuild-install#note).
|
||||
|
||||
- `python3packages.pillow-avif-plugin` has been removed as the functionality is included in `python3packages.pillow` directly since version 11.3.
|
||||
|
||||
## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
|
||||
|
||||
@@ -1003,13 +1003,13 @@
|
||||
"vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
|
||||
},
|
||||
"okta_okta": {
|
||||
"hash": "sha256-vrH7PS6ZHFYMnzq6ApFMV31guaIxj6G7/YhB+EdoS6k=",
|
||||
"hash": "sha256-2PiDzxS+O9iIqLxIfFGwfBLYP4f79m82tIBI2GeBUDs=",
|
||||
"homepage": "https://registry.terraform.io/providers/okta/okta",
|
||||
"owner": "okta",
|
||||
"repo": "terraform-provider-okta",
|
||||
"rev": "v6.5.1",
|
||||
"rev": "v6.5.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ZrjjQCpFE4f8oBd+YGClaG68W/Tx1fnRikHmHLtOg+k="
|
||||
"vendorHash": "sha256-fPv5fezuiVNXCa8IedyaH1cnjMzEOiA7gl/r5K7cX3A="
|
||||
},
|
||||
"oktadeveloper_oktaasa": {
|
||||
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "orftvthek";
|
||||
namespace = "plugin.video.orftvthek";
|
||||
version = "1.0.2+matrix.1";
|
||||
version = "1.0.3+matrix.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "s0faking";
|
||||
repo = namespace;
|
||||
rev = version;
|
||||
sha256 = "sha256-bCVsR7lH0REJmG3OKU8mRRvw/PhSrLfhufmVBmw05+k=";
|
||||
sha256 = "sha256-HWx1Uj/yOJ5Tggyd8EJHyBfpUAbtfk89XpWTKzl6Ie0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
anki-utils.buildAnkiAddon (finalAttrs: {
|
||||
pname = "local-audio-yomichan";
|
||||
version = "0-unstable-2025-08-07";
|
||||
version = "0-unstable-2025-12-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yomidevs";
|
||||
repo = "local-audio-yomichan";
|
||||
rev = "14d33271303d0f6c99675a0b91f3041c49aba125";
|
||||
rev = "2cbabbc75b4195b75033adf059d2a5ff037f60a6";
|
||||
sparseCheckout = [ "plugin" ];
|
||||
hash = "sha256-Ce0ejEWTDMpbhPnOlY18I/hQD4VodkLncvg15VCJ0gI=";
|
||||
hash = "sha256-bsvxossIkZb8SuaNUzQX/xll3yb173TigXnrg5GA390=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/plugin";
|
||||
processUserFiles = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "autoprefixer";
|
||||
version = "10.4.22";
|
||||
version = "10.4.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postcss";
|
||||
repo = "autoprefixer";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-cIUotZ+RFmwD6mf31k69VwZtX7bSIUVvwoUutkyt3qU=";
|
||||
hash = "sha256-sz4tE0WqSHJ4ExJ0yL24mTux5/eGuhIyKyrZqs4hSxQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-gqxspt7fX8+Ss/uUBq834fTfV5tVKZREC4e1WtE+7WM=";
|
||||
hash = "sha256-xPG67b54h+KmDrCgMmTVVVnBah9L6rgjh+EWnEzzI0w=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "aws-vault";
|
||||
version = "7.8.1";
|
||||
version = "7.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ByteNess";
|
||||
repo = "aws-vault";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QB967n8UEDaqgQl2HaBHag66r75M6aERkkf+9PeZQlw=";
|
||||
hash = "sha256-I2FjIiPRDsOSRD/ufcmv1DRlMNMhL9QMR8CpnpjGDM8=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-gpStE66S/0oyt7hpyllwx2pxgfua3AUR0OIPvgAMq0k=";
|
||||
vendorHash = "sha256-MPVssudvDjGlIgVw3ddHjQ2sJAOWy5p51hK26aVooWY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bazaar";
|
||||
version = "0.6.0";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kolunmi";
|
||||
repo = "bazaar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-78X2Vxytxan0OD7cNgL1y4LUBaqgoKb+k80sCIi9ag4=";
|
||||
hash = "sha256-fiSCRBbS6vNyLWRnaeyQE48NO/LYCk5OdAX8f85H2YM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-mutants";
|
||||
version = "25.3.1";
|
||||
version = "26.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcefrog";
|
||||
repo = "cargo-mutants";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-T+BMLjp74IO71u/ftNfz67FPSt1LYCgsRP65gL0wScg=";
|
||||
hash = "sha256-TtB+g5WgEqKP9sYJY3P/WDbpT9lD23RDi0/A7khwDIw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q9+p1MbjF2pyw254X+K6GQSLKNbqjmFXDyZjCI31b7s=";
|
||||
cargoHash = "sha256-FVwRS9OcQ0CjH8h10BzP7rTNHFIvefagIHMxVrfMaHo=";
|
||||
|
||||
# too many tests require internet access
|
||||
doCheck = false;
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "copilot-language-server";
|
||||
version = "1.400.0";
|
||||
version = "1.405.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
|
||||
hash = "sha256-gevYxwbDUNrVxa+sgKJcX3/p7l7V3NCyHXEo8q55B0E=";
|
||||
hash = "sha256-aeSiaK0loCN7IAAALlK2x4RBViYgplXRsiNMVLXlxws=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dsearch";
|
||||
version = "0.0.7";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "danksearch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rtfymtzsxEuto1mOm8A5ubREJzXKCai6dw9Na1Fa21Q=";
|
||||
hash = "sha256-gU349UQcr6Cl23tPt1yHD7EcWM8Uw6HZmbeVXyLwGj0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-65NFlAtix5ehyaRok3/0Z6+j6U7ccc0Kdye0KFepLLM=";
|
||||
vendorHash = "sha256-UGKcwrYQ+S1oC8lJ1EagU1Okfz/2ruj4bn/7APC2FWg=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -61,14 +61,14 @@ let
|
||||
|
||||
linuxDrv = llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "duckstation";
|
||||
version = "0.1-10193";
|
||||
version = "0.1-10339";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stenzek";
|
||||
repo = "duckstation";
|
||||
tag = "v${finalAttrs.version}";
|
||||
deepClone = true;
|
||||
hash = "sha256-UaptzX6f9mOQz4hDDRSYhHRIgQi0AfSMvv2RgOehkFs=";
|
||||
hash = "sha256-U/RYyXazuu5qTMC+q4r8oGJN0vMaVBONRk0STcSJl9A=";
|
||||
|
||||
postFetch = ''
|
||||
cd $out
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"duckstation": {
|
||||
"version": "0.1-10193",
|
||||
"hash_darwin": "sha256-aNESdC+z9NgCYZZAfMIh+iD4j6trHpoWMakj4l9JlMs="
|
||||
"version": "0.1-10339",
|
||||
"hash_darwin": "sha256-azs9Bqba2ymAQkGDtHOHFcCVUZAEo/0VcnHn6Gx/KXo="
|
||||
},
|
||||
"discord_rpc": {
|
||||
"rev": "cc59d26d1d628fbd6527aac0ac1d6301f4978b92",
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fedifetcher";
|
||||
version = "7.1.16";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanos";
|
||||
repo = "FediFetcher";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8eSzXstOOEx+yzwjcSgQfv8c0d+1gsVemzGG/U1TWEo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
defusedxml
|
||||
python-dateutil
|
||||
requests
|
||||
xxhash
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -vD find_posts.py $out/bin/fedifetcher
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
checkPhase = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
runHook preCheck
|
||||
|
||||
$out/bin/fedifetcher --help>/dev/null
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tool for Mastodon that automatically fetches missing replies and posts from other fediverse instances";
|
||||
longDescription = ''
|
||||
FediFetcher is a tool for Mastodon that automatically fetches missing
|
||||
replies and posts from other fediverse instances, and adds them to your
|
||||
own Mastodon instance.
|
||||
'';
|
||||
homepage = "https://blog.thms.uk/fedifetcher";
|
||||
changelog = "https://github.com/nanos/FediFetcher/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.c3d2 ];
|
||||
mainProgram = "fedifetcher";
|
||||
};
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
makeWrapper,
|
||||
libaio,
|
||||
pkg-config,
|
||||
@@ -24,6 +25,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-m4JskjSc/KHjID+6j/hbhnGzehPxMxA3m2Iyn49bJDU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/axboe/fio/pull/2029
|
||||
(fetchpatch {
|
||||
url = "https://github.com/axboe/fio/commit/ccce76d2850d6e52da3d7986c950af068fbfe0fd.patch";
|
||||
hash = "sha256-0jN3q1vTiU6YkdXrcTAOzqRqgu8sW8AWO4KkANi0XKo=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
zlib
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go2rtc";
|
||||
version = "1.9.12";
|
||||
version = "1.9.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexxIT";
|
||||
repo = "go2rtc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NM8xH3HpfHOWVcOEM/bcWIwBSeKNLqhNfFTXE75xjH8=";
|
||||
hash = "sha256-/o7cn5VuORl03zwinxmRD0Y0eDToLX1ODTe1LHQSCXQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iOMIbeNh2+tNSMc5BR2h29a7uAru9ER/tPBI59PeeDY=";
|
||||
vendorHash = "sha256-PlYL97TSYAzSO5KSBEk4DCdvOZ9YHoTv55P16Mzyzzg=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n64recomp";
|
||||
version = "0-unstable-2025-12-03";
|
||||
version = "0-unstable-2025-12-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "N64Recomp";
|
||||
repo = "N64Recomp";
|
||||
rev = "07fcdac76da3e47105238d45defe83d56c2821f5";
|
||||
hash = "sha256-KvoJB6M9GX0nm9D4X7P43w8PgHNkGCfj9yuzqc17y8s=";
|
||||
rev = "98bf104b1b5ed83126af8bcab0cc964782617dbf";
|
||||
hash = "sha256-qDV52g04tOCQW+Nqzm8pnXwqs4q027TnHyuGYsGzIhU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
xorg,
|
||||
}:
|
||||
let
|
||||
version = "2.20.1";
|
||||
version = "2.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-16eW8Yca/HgIr0wiFQq6Q5czCgA7gac1sR1q2g+ZkEc=";
|
||||
hash = "sha256-jsHGQ1xjHu+yagy73/eCB/3h7ZHasMdt4rWQuFvDfis=";
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
@@ -80,7 +80,7 @@ let
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-+fE+IUyhoENnweFggLuS9LHwcLTZrLS1TBzuXHkaNAk=";
|
||||
hash = "sha256-pG7olcBq5P52CvZYLqUjb+RwxjbQbSotlS50pvgm7WQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,86 +1,105 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
maven,
|
||||
makeDesktopItem,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
temurin-jre-bin-21,
|
||||
javaPackages,
|
||||
wrapGAppsHook3,
|
||||
dpkg,
|
||||
xorg,
|
||||
temurin-bin-21,
|
||||
glib,
|
||||
libxxf86vm,
|
||||
libxtst,
|
||||
gtk3,
|
||||
libGL,
|
||||
alsa-lib,
|
||||
nix-update-script,
|
||||
desktop-file-utils,
|
||||
|
||||
# native
|
||||
copyDesktopItems,
|
||||
wrapGAppsHook3,
|
||||
gettext,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
let
|
||||
mavenOurJdk = maven.override {
|
||||
jdk_headless = temurin-jre-bin-21;
|
||||
};
|
||||
in
|
||||
mavenOurJdk.buildMavenPackage rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${finalAttrs.version}/pdfsam-basic_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-iM0avC0YwxaB2prWbiKJZ9Fzd/HcdDWJg5IWRmNlVkM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "torakiki";
|
||||
repo = "pdfsam";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9IzYnWYE0OD1b4xybl3NdaBvVSw6C4+1ORUnrotqSuc=";
|
||||
};
|
||||
|
||||
mvnParameters = "-Drelease -Dmaven.test.skip";
|
||||
mvnHash = "sha256-Y/wz/XuzDpT7qnk/pRBkv6PeI0GmqKXh54gqb7cWHHw=";
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libxxf86vm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
# Used as the main java implementation. Also the build relies upon jlink
|
||||
# which is included in this package.
|
||||
temurin-bin-21
|
||||
gettext
|
||||
wrapGAppsHook3
|
||||
desktop-file-utils
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
desktop-file-edit usr/share/applications/pdfsam-basic.desktop \
|
||||
--set-key="Exec" --set-value="pdfsam-basic %F" \
|
||||
--set-key="Path" --set-value="$out/share/pdfsam-basic" \
|
||||
--set-icon="pdfsam-basic"
|
||||
mkdir $out
|
||||
cp -r usr/share $out/share
|
||||
mkdir $out/share/pdfsam-basic
|
||||
cp -r opt/pdfsam-basic/lib $out/share/pdfsam-basic/lib
|
||||
install -Dm0644 opt/pdfsam-basic/splash.png $out/share/pdfsam-basic/splash.png
|
||||
install -Dm0644 opt/pdfsam-basic/icon.svg $out/share/icons/hicolor/scalable/apps/pdfsam-basic.svg
|
||||
mkdir $out/bin
|
||||
makeWrapper ${temurin-jre-bin-21}/bin/java $out/bin/pdfsam-basic \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--set JAVA_HOME ${temurin-jre-bin-21} \
|
||||
--set PDFSAM_JAVA_PATH ${temurin-jre-bin-21} \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
javaPackages.openjfx25 # PDFSam Basic requires JDK 21 and JavaFX 23 https://github.com/torakiki/pdfsam/issues/785#issuecomment-3446564717
|
||||
xorg.libXxf86vm
|
||||
xorg.libXtst
|
||||
gtk3
|
||||
libGL
|
||||
alsa-lib
|
||||
]
|
||||
} \
|
||||
--add-flags ${
|
||||
lib.escapeShellArg (
|
||||
lib.escapeShellArgs [
|
||||
"--enable-preview"
|
||||
"--module-path"
|
||||
"${placeholder "out"}/share/pdfsam-basic/lib"
|
||||
"--module"
|
||||
"org.pdfsam.basic/org.pdfsam.basic.App"
|
||||
"-Xmx512M"
|
||||
"-splash:${placeholder "out"}/share/pdfsam-basic/splash.png"
|
||||
"-Dapp.name=\"pdfsam-basic\""
|
||||
"-Dapp.pid=\"$$\""
|
||||
"-Dapp.home=\"${placeholder "out"}/share/pdfsam-basic\""
|
||||
"-Dbasedir=\"${placeholder "out"}/share/pdfsam-basic\""
|
||||
"-Dprism.lcdtext=false"
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
install -Dm0644 pdfsam-basic/src/deb/icon.svg $out/share/icons/pdfsam-basic.svg
|
||||
mkdir $out/lib
|
||||
tar -xf pdfsam-basic/target/pdfsam-basic-${version}-linux-x64.tar.gz -C $out/lib
|
||||
mv $out/lib/pdfsam-basic-${version}-linux-x64 $out/lib/pdfsam-basic
|
||||
# Based upon upstream's default $out/lib/pdfsam-basic/bin/pdfsam.sh file,
|
||||
# but with Nix specific dynamically loaded libraries
|
||||
makeWrapper ${temurin-jre-bin-21}/bin/java $out/bin/pdfsam-basic \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath [
|
||||
libxxf86vm
|
||||
libxtst
|
||||
gtk3
|
||||
libGL
|
||||
]
|
||||
}" \
|
||||
--argv0 pdfsam-basic \
|
||||
--add-flags --enable-preview \
|
||||
--add-flags "--module-path $out/lib/pdfsam-basic/lib" \
|
||||
--add-flags "--module org.pdfsam.basic/org.pdfsam.basic.App" \
|
||||
--add-flags "-Xmx512M" \
|
||||
--add-flags "-Dprism.lcdtext=false" \
|
||||
--add-flags "-splash:$out/lib/pdfsam-basic/splash.png" \
|
||||
--add-flags "-Dapp.name=pdfsam-basic" \
|
||||
--add-flags "-Dapp.home=$out/lib/pdfsam-basic" \
|
||||
--add-flags "-Dbasedir=$out/lib/pdfsam-basic"
|
||||
# Remove bundled executables, shared objects etc, that are not needed on
|
||||
# Nix (we just need the jar files).
|
||||
rm -r $out/lib/pdfsam-basic/{doc,bin,runtime}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
# Based on upstream's desktop file:
|
||||
# https://github.com/torakiki/pdfsam/blob/master/pdfsam-basic/src/deb/pdfsam-basic.desktop
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "PDFsam Basic";
|
||||
exec = "pdfsam-basic";
|
||||
icon = "pdfsam-basic";
|
||||
comment = meta.description;
|
||||
desktopName = "PDFsam Basic";
|
||||
genericName = "PDF Split and Merge";
|
||||
mimeTypes = [ "application/pdf" ];
|
||||
categories = [ "Office" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/torakiki/pdfsam";
|
||||
@@ -92,6 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
license = lib.licenses.agpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ _1000101 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
doronbehar
|
||||
_1000101
|
||||
];
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pywal16";
|
||||
version = "3.8.12";
|
||||
version = "3.8.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eylles";
|
||||
repo = "pywal16";
|
||||
tag = version;
|
||||
hash = "sha256-5m7VXpiKkdGCKv+UzBZ91sVRbpveRr7YlPPXwrIP3bM=";
|
||||
hash = "sha256-BKLvEmasMTcuH5olgZHzFN3DZT4lXD1FNBU8l8QGQAM=";
|
||||
};
|
||||
|
||||
build-system = [ python3.pkgs.setuptools ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-ice";
|
||||
version = "2025.04.06";
|
||||
version = "2025.12.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iDvel";
|
||||
repo = "rime-ice";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-s3r8cdEliiPnKWs64Wgi0rC9Ngl1mkIrLnr2tIcyXWw=";
|
||||
hash = "sha256-GyiOlTr1Nw2ANTE7/fdyrPQkvRFWOyal3oAcDvsqF5A=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ruffle";
|
||||
version = "0.2.0-nightly-2025-12-06";
|
||||
version = "0.2.0-nightly-2025-12-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ruffle-rs";
|
||||
repo = "ruffle";
|
||||
tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version;
|
||||
hash = "sha256-p+PmU08XY6RCGKPgoViEXPUlDwWmXnrdkLGxrLtzYx8=";
|
||||
hash = "sha256-RLT0ba9FlqxE12RiIcOPIxbyUYJ3g/CH19SIR+bkLbE=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"OpenH264Version(${major}, ${minor}, ${patch})"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-mPy6wEhWfhUyJ9euqbEcATZt8cr21t+J+atpBt7ixUo=";
|
||||
cargoHash = "sha256-WhkEmAJwf+jITSf0k5oszqGPOGekP0ExCpsN1vxCF6w=";
|
||||
cargoBuildFlags = lib.optional withRuffleTools "--workspace";
|
||||
|
||||
env =
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "scaleway-cli";
|
||||
version = "2.47.0";
|
||||
version = "2.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scaleway";
|
||||
repo = "scaleway-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SV3fwEOGLttfpCsQTMfzsSviJ+YIDzZZXUHBCDPtF6g=";
|
||||
hash = "sha256-ME5kza09t/FQaQcXlyMyjaZb3A7Bpbw1vdHjATWpas4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KbjdNGIvvKnv4bbV8YhXYCY0F94C/CUtXiyEnnF2eeA=";
|
||||
vendorHash = "sha256-Z7AAoHRo22y6WaknOWCSopyo+JWo1ITivF+53RHh2gs=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sing-box";
|
||||
version = "1.12.12";
|
||||
version = "1.12.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SagerNet";
|
||||
repo = "sing-box";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4TQLaDjZYcm8FVBo06c4rKuXEO2xRGm6cIzpkPwtL/g=";
|
||||
hash = "sha256-P2sGnBvChGnQpCSGGiJWK20Tz6KCt6sWEPrJHQjLcSE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-R9dN2/MmuAeYB9UkNDbhc48SelBMR80nMnptNKD0y9c=";
|
||||
|
||||
@@ -21,13 +21,13 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uutils-coreutils";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "coreutils";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4C4i3oHw9WHwuq9DOufRvc/tOdwqHmYF/gUr2VkRmwM=";
|
||||
hash = "sha256-U9godsxtyWOFhrE8CaQesWoeKWmitADp2jyJU/1fPKA=";
|
||||
};
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
@@ -36,15 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
name = "uutils-coreutils-${finalAttrs.version}";
|
||||
hash = "sha256-Xei7FIcJr5lr8+uC6veE2hnLPr1UjC/ooZxW6TWKsT8=";
|
||||
inherit (finalAttrs) pname src version;
|
||||
hash = "sha256-V53qD7SujN8bEdNwcBshdkNeYdk+4Whr+XiYHO1iLXs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./selinux_no_auto_detect.diff
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals (lib.meta.availableOn stdenv.hostPlatform acl) [
|
||||
acl
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
diff --git a/GNUmakefile b/GNUmakefile
|
||||
index e4bc5f435..b677d119c 100644
|
||||
--- a/GNUmakefile
|
||||
+++ b/GNUmakefile
|
||||
@@ -76,19 +76,6 @@ ifeq ($(OS),Windows_NT)
|
||||
endif
|
||||
LN ?= ln -sf
|
||||
|
||||
-ifdef SELINUX_ENABLED
|
||||
- override SELINUX_ENABLED := 0
|
||||
-# Now check if we should enable it (only on non-Windows)
|
||||
- ifneq ($(OS),Windows_NT)
|
||||
- ifeq ($(shell if [ -x /sbin/selinuxenabled ] && /sbin/selinuxenabled 2>/dev/null; then echo 0; else echo 1; fi),0)
|
||||
- override SELINUX_ENABLED := 1
|
||||
-$(info /sbin/selinuxenabled successful)
|
||||
- else
|
||||
-$(info SELINUX_ENABLED=1 but /sbin/selinuxenabled failed)
|
||||
- endif
|
||||
- endif
|
||||
-endif
|
||||
-
|
||||
# Possible programs
|
||||
PROGS := \
|
||||
arch \
|
||||
@@ -224,8 +211,10 @@ endif
|
||||
|
||||
ifneq ($(OS),Windows_NT)
|
||||
PROGS := $(PROGS) $(UNIX_PROGS)
|
||||
+ ifeq ($(SELINUX_ENABLED),1)
|
||||
# Build the selinux command even if not on the system
|
||||
- PROGS := $(PROGS) $(SELINUX_PROGS)
|
||||
+ PROGS := $(PROGS) $(SELINUX_PROGS)
|
||||
+ endif
|
||||
endif
|
||||
|
||||
UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
|
||||
@@ -7,9 +7,8 @@ lib: {
|
||||
jlamur
|
||||
bearfm
|
||||
];
|
||||
platforms = lib.map (lib.removeSuffix ".nix") (
|
||||
lib.filter (name: name != "meta.nix" && name != "package.nix") (
|
||||
builtins.attrNames (builtins.readDir ./.)
|
||||
)
|
||||
);
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
}
|
||||
|
||||
@@ -283,6 +283,7 @@ mapAliases {
|
||||
inherit (pkgs) pnpm; # added 2024-06-26
|
||||
poor-mans-t-sql-formatter-cli = throw "'poor-mans-t-sql-formatter-cli' has been removed because it was unmaintained upstream"; # Added 2025-11-14
|
||||
postcss-cli = throw "postcss-cli has been removed because it was broken"; # added 2025-03-24
|
||||
prebuild-install = throw "prebuild-install was removed because it appeared to be unmaintained upstream. See upstream's recommendations for alternatives here: https://github.com/prebuild/prebuild-install#note"; # Added 2025-12-14
|
||||
inherit (pkgs) prettier; # added 2025-05-31
|
||||
prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14
|
||||
prettier-plugin-toml = throw "prettier-plugin-toml was removed because it provides no executable"; # added 2025-03-23
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
, "lcov-result-merger"
|
||||
, "node2nix"
|
||||
, "postcss"
|
||||
, "prebuild-install"
|
||||
, "sass"
|
||||
, "semver"
|
||||
, "vega-cli"
|
||||
|
||||
-54
@@ -21658,60 +21658,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
prebuild-install = nodeEnv.buildNodePackage {
|
||||
name = "prebuild-install";
|
||||
packageName = "prebuild-install";
|
||||
version = "7.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz";
|
||||
sha512 = "8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."base64-js-1.5.1"
|
||||
sources."bl-4.1.0"
|
||||
sources."buffer-5.7.1"
|
||||
sources."chownr-1.1.4"
|
||||
sources."decompress-response-6.0.0"
|
||||
sources."deep-extend-0.6.0"
|
||||
sources."detect-libc-2.0.3"
|
||||
sources."end-of-stream-1.4.4"
|
||||
sources."expand-template-2.0.3"
|
||||
sources."fs-constants-1.0.0"
|
||||
sources."github-from-package-0.0.0"
|
||||
sources."ieee754-1.2.1"
|
||||
sources."inherits-2.0.4"
|
||||
sources."ini-1.3.8"
|
||||
sources."mimic-response-3.1.0"
|
||||
sources."minimist-1.2.8"
|
||||
sources."mkdirp-classic-0.5.3"
|
||||
sources."napi-build-utils-2.0.0"
|
||||
sources."node-abi-3.74.0"
|
||||
sources."once-1.4.0"
|
||||
sources."pump-3.0.2"
|
||||
sources."rc-1.2.8"
|
||||
sources."readable-stream-3.6.2"
|
||||
sources."safe-buffer-5.2.1"
|
||||
sources."semver-7.7.1"
|
||||
sources."simple-concat-1.0.1"
|
||||
sources."simple-get-4.0.1"
|
||||
sources."string_decoder-1.3.0"
|
||||
sources."strip-json-comments-2.0.1"
|
||||
sources."tar-fs-2.1.2"
|
||||
sources."tar-stream-2.2.0"
|
||||
sources."tunnel-agent-0.6.0"
|
||||
sources."util-deprecate-1.0.2"
|
||||
sources."wrappy-1.0.2"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "A command line tool to easily install prebuilt binaries for multiple version of node/iojs on a specific platform";
|
||||
homepage = "https://github.com/prebuild/prebuild-install";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
sass = nodeEnv.buildNodePackage {
|
||||
name = "sass";
|
||||
packageName = "sass";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peakrdl-rust";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "darsor";
|
||||
repo = "PeakRDL-rust";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MD0iMdNFvu/V/yWnivJ9cbE0/d77bsoCVScpMMGMG/I=";
|
||||
hash = "sha256-9OEzfIvuVilbFlv0z07S6b7wVM95e+vdcDU8MphRlao=";
|
||||
};
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import ./generic.nix {
|
||||
version = "1.8.4";
|
||||
hash = "sha256-pTDpVYUnw4JJ0lRNS21fRikAvKmfr9RtmlojT/b89XQ=";
|
||||
cargoHash = "sha256-3X9ukrPo4bhMC9L7yjmcE8F684glYI/wd2kiH5kPFX8=";
|
||||
version = "1.8.5";
|
||||
hash = "sha256-lJX/eObXi468iFOzeFjAnNkPiQ8VbBnfqD1518LDm2s=";
|
||||
cargoHash = "sha256-LjlXd2zJ2eXr/dyCsbwlzv3Qntg2b0mudtWGtc0V7Lc=";
|
||||
}
|
||||
|
||||
@@ -571,6 +571,7 @@ mapAliases {
|
||||
fcitx5-skk-qt = throw "'fcitx5-skk-qt' has been renamed to/replaced by 'qt6Packages.fcitx5-skk-qt'"; # Converted to throw 2025-10-27
|
||||
fcitx5-unikey = throw "'fcitx5-unikey' has been renamed to/replaced by 'qt6Packages.fcitx5-unikey'"; # Converted to throw 2025-10-27
|
||||
fcitx5-with-addons = throw "'fcitx5-with-addons' has been renamed to/replaced by 'qt6Packages.fcitx5-with-addons'"; # Converted to throw 2025-10-27
|
||||
fedifetcher = throw "'fedifetcher' has been removed because there is now a similar native feature in Mastodon."; # Added 2025-12-08
|
||||
fennel = throw "'fennel' has been renamed to/replaced by 'luaPackages.fennel'"; # Converted to throw 2025-10-27
|
||||
fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
|
||||
FIL-plugins = throw "'FIL-plugins' has been renamed to/replaced by 'fil-plugins'"; # Converted to throw 2025-10-27
|
||||
|
||||
Reference in New Issue
Block a user