push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
diff --git a/package-lock.json b/package-lock.json
index c856a73..59d3cc5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1240,9 +1240,10 @@
}
},
"node_modules/nan": {
- "version": "2.15.0",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
- "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
+ "version": "2.22.2",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+ "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
+ "license": "MIT"
},
"node_modules/napi-build-utils": {
"version": "1.0.2",
@@ -3189,9 +3190,9 @@
"dev": true
},
"nan": {
- "version": "2.15.0",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
- "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
+ "version": "2.22.2",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+ "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ=="
},
"napi-build-utils": {
"version": "1.0.2",

View File

@@ -0,0 +1,80 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
avahi-compat,
nodejs_22,
python3,
stdenv,
}:
buildNpmPackage rec {
pname = "fx-cast-bridge";
version = "0.3.1";
nodejs = nodejs_22;
src = fetchFromGitHub {
owner = "hensm";
repo = "fx_cast";
rev = "v${version}";
hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg=";
};
sourceRoot = "${src.name}/app";
patches = [
# to support later versions of nodejs
# generated by running `npm update nan --ignore-scripts` in the ./app dir
./bump-nan.patch
];
npmDepsHash = "sha256-23EZC9v4ODu3k+O9NDVhOdGJ/FfaiTVWtTrK8liAevk=";
nativeBuildInputs = [ python3 ];
buildInputs = [ avahi-compat ];
postPatch = ''
substituteInPlace bin/lib/paths.js \
--replace-fail "../../../" "../../"
'';
dontNpmInstall = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib/mozilla/native-messaging-hosts}
substituteInPlace dist/app/fx_cast_bridge.json \
--replace-fail "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge"
mv dist/app/fx_cast_bridge.json $out/lib/mozilla/native-messaging-hosts
rm dist/app/fx_cast_bridge.sh
mv dist/app $out/lib/fx_cast_bridge
mv node_modules $out/lib/fx_cast_bridge/node_modules
echo "#! /bin/sh
NODE_PATH=\"$out/lib/node_modules\" \\
exec ${nodejs}/bin/node \\
$out/lib/fx_cast_bridge/src/main.js \\
--_name fx_cast_bridge \"\$@\"
" >$out/bin/fx_cast_bridge
chmod +x $out/bin/fx_cast_bridge
runHook postInstall
'';
meta = {
description = "Implementation of the Chrome Sender API (Chromecast) within Firefox";
homepage = "https://hensm.github.io/fx_cast/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bot-wxt1221 ];
platforms = [
"x86_64-linux"
"aarch64-darwin"
"x86_64-darwin"
]; # aarch64-linux wasn't support in upstream according to README
broken = stdenv.hostPlatform.isDarwin;
mainProgram = "fx_cast_bridge";
};
}

View File

@@ -0,0 +1,41 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
installShellFiles,
}:
buildGoModule (finalAttrs: {
pname = "fx";
version = "39.1.0";
src = fetchFromGitHub {
owner = "antonmedv";
repo = "fx";
tag = finalAttrs.version;
hash = "sha256-k8BrH3tRc6RM6PG93MRLR/uJGyo953vYH2v4eBBhPrI=";
};
vendorHash = "sha256-C4TqFRECIFzc6TyAJ2yj97t2BVHXBovIV3iIjNhm7ek=";
ldflags = [ "-s" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd fx \
--bash <($out/bin/fx --comp bash) \
--fish <($out/bin/fx --comp fish) \
--zsh <($out/bin/fx --comp zsh)
'';
meta = {
changelog = "https://github.com/antonmedv/fx/releases/tag/${finalAttrs.src.tag}";
description = "Terminal JSON viewer";
homepage = "https://github.com/antonmedv/fx";
license = lib.licenses.mit;
mainProgram = "fx";
maintainers = with lib.maintainers; [ figsoda ];
};
})

View File

@@ -0,0 +1,65 @@
{
stdenv,
lib,
fetchzip,
dpkg,
autoPatchelfHook,
cups,
}:
let
debPlatform =
if stdenv.hostPlatform.system == "x86_64-linux" then
"amd64"
else if stdenv.hostPlatform.system == "i686-linux" then
"i386"
else
throw "Unsupported system: ${stdenv.hostPlatform.system}";
in
stdenv.mkDerivation rec {
pname = "fxlinuxprint";
version = "1.1.2-1";
# https://support-fb.fujifilm.com/driver_downloads/fxlinuxpdf112119031.zip is gone
src = fetchzip {
url = "https://github.com/NixOS/nixpkgs/files/12232817/fxlinuxpdf112119031.zip";
sha256 = "1mv07ch6ysk9bknfmjqsgxb803sj6vfin29s9knaqv17jvgyh0n3";
};
nativeBuildInputs = [
dpkg
autoPatchelfHook
];
buildInputs = [ cups ];
sourceRoot = ".";
unpackCmd = "dpkg-deb -x $curSrc/fxlinuxprint_${version}_${debPlatform}.deb .";
dontConfigure = true;
dontBuild = true;
installPhase = ''
mkdir -p $out
mv etc $out
mv usr/lib $out
mkdir -p $out/share/cups/model
mv usr/share/ppd/FujiXerox/* $out/share/cups/model
'';
meta = with lib; {
description = "Fuji Xerox Linux Printer Driver";
longDescription = ''
DocuPrint P365/368 d
DocuPrint CM315/318 z
DocuPrint CP315/318 dw
ApeosPort-VI C2271/C3370/C3371/C4471/C5571/C6671/C7771
DocuCentre-VI C2271/C3370/C3371/C4471/C5571/C6671/C7771
DocuPrint 3205 d/3208 d/3505 d/3508 d/4405 d/4408 d
'';
homepage = "https://onlinesupport.fujixerox.com";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = [ ];
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,18 @@
diff --git a/usr/bin/fxlocalechk.tcl b/usr/bin/fxlocalechk.tcl
index f0ebc6c..c3486fe 100755
--- a/usr/bin/fxlocalechk.tcl
+++ b/usr/bin/fxlocalechk.tcl
@@ -12,12 +12,7 @@
#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#i18N
-#---- check locale with environment variable
-set locale_alias_path /usr/share/X11/locale
-
-if {[file exists $locale_alias_path/locale.alias] != 1} {
- set locale_alias_path /usr/lib/X11/locale
-}
+set locale_alias_path @libX11@/share/X11/locale
proc conv_locale {alias} {
global env envL locale_alias_path

View File

@@ -0,0 +1,28 @@
diff --git a/usr/bin/fxlputil b/usr/bin/fxlputil
index cdac66d..aa86d02 100755
--- a/usr/bin/fxlputil
+++ b/usr/bin/fxlputil
@@ -7,17 +7,19 @@
# TCL=`which fxlputil`
#fi
+wrapper=$(dirname $0)/fxlputil
+
#set LC_ALL
-locale=`tclsh $0lo.tcl`
+locale=`tclsh ${wrapper}lo.tcl`
case $locale in
"ja")
- env LC_ALL=ja_JP.UTF-8 wish $0.tcl $1
+ env LC_ALL=ja_JP.UTF-8 wish ${wrapper}.tcl $1
;;
"en")
- env LC_ALL=en_US.ISO8859-1 wish $0.tcl $1
+ env LC_ALL=en_US.ISO8859-1 wish ${wrapper}.tcl $1
;;
*)
- env LC_ALL=C wish $0.tcl $1
+ env LC_ALL=C wish ${wrapper}.tcl $1
;;
esac

View File

@@ -0,0 +1,21 @@
diff --git a/usr/bin/fxlputil.tcl b/usr/bin/fxlputil.tcl
index 02eeaf6..788ed5a 100755
--- a/usr/bin/fxlputil.tcl
+++ b/usr/bin/fxlputil.tcl
@@ -25,14 +25,8 @@ catch {namespace import combobox::*}
-lappend auto_path $cwd
-
-if {[lsearch $auto_path /usr/lib] == -1} {
- lappend auto_path /usr/lib
-}
-if {[lsearch $auto_path /usr/lib64] == -1} {
- lappend auto_path /usr/lib64
-}
+# https://stackoverflow.com/a/23287132
+lappend auto_path [file join [file dirname [file dirname [info script]]] lib]
package require fxlputil

View File

@@ -0,0 +1,87 @@
{
stdenv,
lib,
fetchzip,
replaceVars,
dpkg,
autoPatchelfHook,
cups,
tcl,
tk,
xorg,
makeWrapper,
}:
let
debPlatform =
if stdenv.hostPlatform.system == "x86_64-linux" then
"amd64"
else if stdenv.hostPlatform.system == "i686-linux" then
"i386"
else
throw "Unsupported system: ${stdenv.hostPlatform.system}";
in
stdenv.mkDerivation rec {
pname = "fxlinuxprintutil";
version = "1.1.1-1";
# https://support-fb.fujifilm.com/driver_downloads/fxlinuxpdf112119031.zip is gone
src = fetchzip {
url = "https://github.com/NixOS/nixpkgs/files/12232817/fxlinuxpdf112119031.zip";
sha256 = "1mv07ch6ysk9bknfmjqsgxb803sj6vfin29s9knaqv17jvgyh0n3";
};
patches = [
# replaces references to “path/to/fxlputil” via $0 that are broken by our wrapProgram
# with /nix/store/fxlinuxprintutil/bin/fxlputil
./fxlputil.patch
# replaces the code that looks for Tcl packages in the working directory and /usr/lib
# or /usr/lib64 with /nix/store/fxlinuxprintutil/lib
./fxlputil.tcl.patch
# replaces the code that looks for X11s locale.alias in /usr/share/X11/locale or
# /usr/lib/X11/locale with /nix/store/libX11/share/X11/locale
(replaceVars ./fxlocalechk.tcl.patch {
inherit (xorg) libX11;
})
];
nativeBuildInputs = [
dpkg
autoPatchelfHook
makeWrapper
];
buildInputs = [
cups
tcl
tk
];
sourceRoot = ".";
unpackCmd = "dpkg-deb -x $curSrc/fxlinuxprintutil_${version}_${debPlatform}.deb .";
dontConfigure = true;
dontBuild = true;
installPhase = ''
mkdir -p $out
mv usr/bin $out
mv usr/lib $out
wrapProgram $out/bin/fxlputil --prefix PATH : ${
lib.makeBinPath [
tcl
tk
]
}
'';
meta = with lib; {
description = "Optional configuration tool for fxlinuxprint";
homepage = "https://onlinesupport.fujixerox.com";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = [ ];
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,33 @@
{
lib,
stdenv,
libusb1,
}:
stdenv.mkDerivation rec {
pname = "fxload";
version = libusb1.version;
dontUnpack = true;
dontBuild = true;
dontConfigure = true;
dontInstall = true;
dontPatch = true;
dontPatchELF = true;
# fxload binary exist inside the `examples/bin` directory of `libusb1`
postFixup = ''
mkdir -p $out/bin
ln -s ${passthru.libusb}/examples/bin/fxload $out/bin/fxload
'';
passthru.libusb = libusb1.override { withExamples = true; };
meta = with lib; {
homepage = "https://github.com/libusb/libusb";
description = "Tool to upload firmware to into an21, fx, fx2, fx2lp and fx3 ez-usb devices";
mainProgram = "fxload";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ logger ];
};
}