mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 04:46:43 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ddb6f2f628
@ -1044,6 +1044,7 @@
|
||||
./services/security/vaultwarden/default.nix
|
||||
./services/security/yubikey-agent.nix
|
||||
./services/system/cachix-agent/default.nix
|
||||
./services/system/cachix-watch-store.nix
|
||||
./services/system/cloud-init.nix
|
||||
./services/system/dbus.nix
|
||||
./services/system/earlyoom.nix
|
||||
|
||||
@ -204,7 +204,7 @@ in
|
||||
'';
|
||||
in {
|
||||
description = "Bitcoin daemon";
|
||||
after = [ "network.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
|
||||
@ -30,7 +30,7 @@ let
|
||||
linux_5_4_hardened
|
||||
linux_5_10_hardened
|
||||
linux_5_15_hardened
|
||||
linux_5_19_hardened
|
||||
linux_6_0_hardened
|
||||
|
||||
linux_testing;
|
||||
};
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, cairo
|
||||
, cmake
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, gettext
|
||||
, ghostscript
|
||||
, glib
|
||||
@ -78,6 +79,12 @@ stdenv.mkDerivation rec {
|
||||
# e.g., those from the "Effects" menu.
|
||||
python3 = "${python3Env}/bin/python";
|
||||
})
|
||||
|
||||
# Fix build with Poppler 22.09
|
||||
(fetchpatch {
|
||||
url = "https://github.com/archlinux/svntogit-packages/raw/b2f65dfb60ae0c8cd6cd9affd3d71064082a6201/trunk/inkscape-1.2.1-poppler-22.09.0.patch";
|
||||
sha256 = "pArvsS/qoCTMAisF8yj3agZKrb90zRFZkck1TX0KeGc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
, fetchFromGitHub
|
||||
, alsa-lib
|
||||
, appstream-glib
|
||||
, clang
|
||||
, cmake
|
||||
, desktop-file-utils
|
||||
, gio-sharp
|
||||
, glib
|
||||
@ -22,24 +24,26 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rnote";
|
||||
version = "0.5.4";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flxzt";
|
||||
repo = "rnote";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-CZLZblC10k5ynzDDXi/bOe6Rc6M94eywXjyu0ABOVq4=";
|
||||
hash = "sha256-w4y+t8idcaNwvC2Wp9SRjcd4m23Zt+yHG2fjOA2rBU8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-Udat35KqrMWR0Ckx34BWoF0HiJHZ5CP2CGFD6FNCWRA=";
|
||||
hash = "sha256-Hybbbokru4vz5ly3oZuNGdBa+lYbhdYjESUpRxIUqJc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib # For appstream-util
|
||||
clang
|
||||
cmake
|
||||
desktop-file-utils # For update-desktop-database
|
||||
meson
|
||||
ninja
|
||||
@ -52,6 +56,8 @@ stdenv.mkDerivation rec {
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
gio-sharp
|
||||
@ -63,6 +69,8 @@ stdenv.mkDerivation rec {
|
||||
poppler
|
||||
];
|
||||
|
||||
LIBCLANG_PATH = "${clang.cc.lib}/lib";
|
||||
|
||||
postPatch = ''
|
||||
pushd build-aux
|
||||
chmod +x meson_post_install.py
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.0.0";
|
||||
version = "1.0.3";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
@ -25,7 +25,7 @@ let
|
||||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
sha256 = if stdenv.isDarwin then "sha256-KVWqdXzbQT93Dj4yesdnfFwAdYin1vfpPsj/ur1AGA0=" else "sha256-H1Cl9SBz/mwN8gezFkcV4KxI7+xVjQV2AtyLKyjVpI8=";
|
||||
sha256 = if stdenv.isDarwin then "sha256-DYF9fEpZaP4tD/eeZAegDahR7UZyroqNB9bn2U7sgXs=" else "sha256-MpQk5g4184ZkCAjLU5Ug0ReWgVADskS1QuMcnPdNofs=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config
|
||||
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config
|
||||
, libtool, openssl, qtbase, qttools, sphinx }:
|
||||
|
||||
mkDerivation rec {
|
||||
@ -12,6 +12,12 @@ mkDerivation rec {
|
||||
sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk";
|
||||
};
|
||||
|
||||
# Adaptions to stay OpenSSL 3.0 compatible
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/chris2511/xca/commit/f5ac099e948ea354deac75ff9fa09d51453476e1.patch";
|
||||
hash = "sha256-4rRO2y9hZq879HTsgBgbXGRYEcgfG4niJKyK3l3PMZ8=";
|
||||
}) ];
|
||||
|
||||
buildInputs = [ libtool openssl qtbase ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ];
|
||||
|
||||
@ -63,6 +63,11 @@ mkDerivation rec {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
|
||||
sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
|
||||
})
|
||||
# For Poppler 22.09
|
||||
(fetchpatch {
|
||||
url = "https://github.com/archlinux/svntogit-community/raw/ea402a588c65d11973b148cf203b3463213431cf/trunk/scribus-1.5.8-poppler-22.09.0.patch";
|
||||
sha256 = "IRQ6rSzH6ZWln6F13Ayk8k7ADj8l3lIJlGm/zjEURQM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,17 +17,19 @@
|
||||
, protobuf
|
||||
, speex
|
||||
, speexdsp
|
||||
, cppzmq
|
||||
, zeromq
|
||||
}:
|
||||
|
||||
gnuradio3_8.pkgs.mkDerivation rec {
|
||||
pname = "qradiolink";
|
||||
version = "0.8.6-2";
|
||||
version = "0.8.7-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qradiolink";
|
||||
repo = "qradiolink";
|
||||
rev = version;
|
||||
sha256 = "1694yyw0vc77m5pbc5rwl6khd8000dbrliz3q4vsa9dqnfnz1777";
|
||||
sha256 = "sha256-4WkAEJvWu1+ZYDeipRl1oJWn5IR1nTXJ8We0trhbkQE=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
@ -62,6 +64,8 @@ gnuradio3_8.pkgs.mkDerivation rec {
|
||||
gnuradio3_8.qt.qtmultimedia
|
||||
libftdi
|
||||
libsndfile
|
||||
cppzmq
|
||||
zeromq
|
||||
gnuradio3_8.qwt
|
||||
] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
|
||||
@ -1,35 +1,37 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, perl, flex, bison, python3, autoconf
|
||||
, which, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verilator";
|
||||
version = "4.226";
|
||||
version = "5.002";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X6Kwpcm+ugu+4gVkWfsqdCPFTESHzJ1jjCPnGqE3/vo=";
|
||||
hash = "sha256-RNoKAEF7zl+WqqbxGP/VvdQqQP8VI3hoQku3b/g0XpU=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ perl ];
|
||||
nativeBuildInputs = [ flex bison python3 autoconf ];
|
||||
checkInputs = [ which ];
|
||||
|
||||
# these tests need some interpreter paths patched early on...
|
||||
# see https://github.com/NixOS/nix/issues/1205
|
||||
doCheck = false;
|
||||
doCheck = stdenv.isLinux; # darwin tests are broken for now...
|
||||
checkTarget = "test";
|
||||
|
||||
preConfigure = ''
|
||||
autoconf
|
||||
'';
|
||||
preConfigure = "autoconf";
|
||||
|
||||
postPatch = ''
|
||||
preCheck = ''
|
||||
patchShebangs \
|
||||
src/flexfix \
|
||||
src/vlcovgen
|
||||
src/vlcovgen \
|
||||
bin/verilator \
|
||||
bin/verilator_coverage \
|
||||
test_regress/driver.pl \
|
||||
test_regress/t/*.pl
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
34
pkgs/data/fonts/alice/default.nix
Normal file
34
pkgs/data/fonts/alice/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib, stdenv, fetchzip }:
|
||||
|
||||
stdenv.mkDerivation (attrs: {
|
||||
pname = "Alice";
|
||||
version = "2.003";
|
||||
|
||||
outputs = [ "out" "woff2" ];
|
||||
|
||||
src = fetchzip {
|
||||
url = with attrs; "https://github.com/cyrealtype/${pname}/releases/download/v${version}/${pname}-v${version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-p+tE3DECfJyBIPyafGZ8jDYQ1lPb+iAnEwLyaUy7DW0=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf
|
||||
install -m444 -Dt $out/share/fonts/opentype fonts/otf/*.otf
|
||||
install -m444 -Dt $woff2/share/fonts/woff2 fonts/webfonts/*.woff2
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source font by Ksenia Erulevich";
|
||||
homepage = "https://github.com/cyrealtype/Alice";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ncfavier ];
|
||||
};
|
||||
})
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nordzy-icon-theme";
|
||||
version = "1.7.3";
|
||||
version = "1.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alvatip";
|
||||
repo = "Nordzy-icon";
|
||||
rev = version;
|
||||
sha256 = "sha256-hKWfUlZqDKFwy4/jnZ9hnAClR7tuAa8sVf5DKmRa/XY=";
|
||||
sha256 = "sha256-VKcbQ6DeQ0zGOPJgfmZMNsHjsMwoCk7jUT2Oc8xuwGc=";
|
||||
};
|
||||
|
||||
# In the post patch phase we should first make sure to patch shebangs.
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchFromGitLab
|
||||
, cairo
|
||||
, cmake
|
||||
@ -43,28 +42,20 @@ let
|
||||
owner = "poppler";
|
||||
repo = "test";
|
||||
rev = "920c89f8f43bdfe8966c8e397e7f67f5302e9435";
|
||||
sha256 = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos=";
|
||||
hash = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "poppler-${suffix}";
|
||||
version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
version = "22.11.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
|
||||
sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs=";
|
||||
hash = "sha256-CTuphE7XdChVFzYcFeIaMbpN8nikmSY9RAPMp08tqCg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-38784.patch";
|
||||
url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch";
|
||||
sha256 = "sha256-M12zaHxcgQB/37tHffllqzd+Juq9BH5gpKVGaRY00vI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
|
||||
@ -141,12 +141,12 @@ rec {
|
||||
headers = "11cv0p52864k4knwlwakiq8v6rxdv3iz6kvwhn0w8mpap2h5pzii";
|
||||
};
|
||||
|
||||
electron_21 = mkElectron "21.0.1" {
|
||||
armv7l-linux = "07cb5a4642248c3662b64fdba8ff7a245674e09bdc52a45e9067e8b508bf4866";
|
||||
aarch64-linux = "86d7eca977042c5fd9204d5aefe2dad5aae81538de1707f04cac59c912edf780";
|
||||
x86_64-linux = "4fd6d7b5a65f44a43165ae77d0484db992b30d6efba478a192e984506fbd52b6";
|
||||
x86_64-darwin = "f1ee563ac2b2defbf856e444c0f8fdbd7afae1a81dc0a29ebb190e2f68f48efd";
|
||||
aarch64-darwin = "0027d3ffe795e44a959e23f0e9e91452e742ea697fc1141eb93f31b840c3a26f";
|
||||
headers = "0ra6gd09ly184m6icj6k4wzp6qrjlbc2hdmy06xp2wcdgzc8dsn8";
|
||||
electron_21 = mkElectron "21.2.1" {
|
||||
armv7l-linux = "1f68ffacbcd0086c5bcbc726e3a0bd707b03acdf5c82d5cc44666b6e9a0d8a78";
|
||||
aarch64-linux = "78c1c6ecf5959e67fa6c67d82dc7deb170bc10d34d45265d6e972dd5b996bcb9";
|
||||
x86_64-linux = "d8aa2ea7b1a1421ca245ced1a9bdd77408bf7aee6f75c19d5e0e73dc120442b7";
|
||||
x86_64-darwin = "f20c0be6cb51bad1bb591ec1116be622e631cbc89876b2258c55579bbe52de30";
|
||||
aarch64-darwin = "2ac1bde2bbb4a265422e00eb5e1d81302b0c349b2db6e7bf1ee6f236a68b3d53";
|
||||
headers = "1c1g6jc0p678d5sr2w4irhfkj02vm4kb92b7cvimz8an0jwy58x7";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pahole";
|
||||
version = "1.23";
|
||||
version = "1.24";
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Dt3ZcUfjwdtTTv6qRFRgwK5GFWXdpN7fvb9KhpS1O94=";
|
||||
sha256 = "sha256-OPseVKt5kIKgK096+ufKrWMS1E/7Z0uxNqCMN6wKfKg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -39,16 +39,6 @@
|
||||
"sha256": "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh",
|
||||
"version": "5.15.76"
|
||||
},
|
||||
"5.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.19.17-hardened1.patch",
|
||||
"sha256": "0fs9zdwxbcc3fi4w1qylvvv387ih3g0dnagw5pvq3r2k2g5fflya",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.17-hardened1/linux-hardened-5.19.17-hardened1.patch"
|
||||
},
|
||||
"sha256": "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9",
|
||||
"version": "5.19.17"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.19.17";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = versions.majorMinor version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, kernel
|
||||
, commitDate ? "2022-09-28"
|
||||
, currentCommit ? "24c6361e202cc09de0159505eb3ab3ca265520d8"
|
||||
, diffHash ? "sha256-Y3uKkVMCaLGJpYb27ef3FfbqEQ32mgCVpWtYzvYamr8="
|
||||
, commitDate ? "2022-10-31"
|
||||
, currentCommit ? "77c27f28aa58e9d9037eb68c87d3283f68c371f7"
|
||||
, diffHash ? "sha256-TUpI9z0ac3rjn2oT5Z7oQXevDKbGwTVjyigS5/aGwgQ="
|
||||
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
||||
, argsOverride ? {}
|
||||
, ...
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
, enablePython ? true
|
||||
|
||||
# for determining the latest compatible linuxPackages
|
||||
, linuxPackages_5_19 ? pkgs.linuxKernel.packages.linux_5_19
|
||||
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
|
||||
, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0
|
||||
}:
|
||||
|
||||
@ -218,7 +218,7 @@ in {
|
||||
zfsStable = common {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible = kernel.kernelOlder "5.20";
|
||||
latestCompatibleLinuxPackages = linuxPackages_5_19;
|
||||
latestCompatibleLinuxPackages = linuxPackages_5_15;
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.1.6";
|
||||
|
||||
301
pkgs/tools/cd-dvd/ventoy-bin/000-nixos-sanitization.patch
Normal file
301
pkgs/tools/cd-dvd/ventoy-bin/000-nixos-sanitization.patch
Normal file
@ -0,0 +1,301 @@
|
||||
A shameless merge of many patches floating around; indeed it was made by reading
|
||||
and applying them manually.
|
||||
|
||||
diff -Naur ventoy-1.0.81-old/CreatePersistentImg.sh ventoy-1.0.81-new/CreatePersistentImg.sh
|
||||
--- ventoy-1.0.81-old/CreatePersistentImg.sh 2022-10-25 08:26:21.000000000 -0300
|
||||
+++ ventoy-1.0.81-new/CreatePersistentImg.sh 2022-11-02 10:29:07.355891607 -0300
|
||||
@@ -119,17 +119,13 @@
|
||||
sync
|
||||
|
||||
if [ -n "$config" ]; then
|
||||
- if [ -d ./persist_tmp_mnt ]; then
|
||||
- rm -rf ./persist_tmp_mnt
|
||||
- fi
|
||||
-
|
||||
- mkdir ./persist_tmp_mnt
|
||||
- if mount $freeloop ./persist_tmp_mnt; then
|
||||
- echo '/ union' > ./persist_tmp_mnt/$config
|
||||
+ path_to_persist_mnt="`mktemp -d`"
|
||||
+ if mount $freeloop "$path_to_persist_mnt"; then
|
||||
+ echo '/ union' > "$path_to_persist_mnt"/$config
|
||||
sync
|
||||
- umount ./persist_tmp_mnt
|
||||
+ umount "$path_to_persist_mnt"
|
||||
fi
|
||||
- rm -rf ./persist_tmp_mnt
|
||||
+ rm -rf "$path_to_persist_mnt"
|
||||
fi
|
||||
|
||||
if [ ! -z "$passphrase" ]; then
|
||||
diff -Naur ventoy-1.0.81-old/tool/ventoy_lib.sh ventoy-1.0.81-new/tool/ventoy_lib.sh
|
||||
--- ventoy-1.0.81-old/tool/ventoy_lib.sh 2022-10-25 08:26:21.000000000 -0300
|
||||
+++ ventoy-1.0.81-new/tool/ventoy_lib.sh 2022-11-02 09:46:29.764568349 -0300
|
||||
@@ -6,6 +6,8 @@
|
||||
VENTOY_SECTOR_SIZE=512
|
||||
VENTOY_SECTOR_NUM=65536
|
||||
|
||||
+LOGFILE="/var/log/ventoy.log"
|
||||
+
|
||||
ventoy_false() {
|
||||
[ "1" = "2" ]
|
||||
}
|
||||
@@ -29,7 +31,7 @@
|
||||
}
|
||||
|
||||
vtdebug() {
|
||||
- echo "$*" >> ./log.txt
|
||||
+ echo "$*" >> $LOGFILE
|
||||
}
|
||||
|
||||
vtoy_gen_uuid() {
|
||||
@@ -51,31 +53,7 @@
|
||||
}
|
||||
|
||||
check_tool_work_ok() {
|
||||
-
|
||||
- if echo 1 | hexdump > /dev/null; then
|
||||
- vtdebug "hexdump test ok ..."
|
||||
- else
|
||||
- vtdebug "hexdump test fail ..."
|
||||
- ventoy_false
|
||||
- return
|
||||
- fi
|
||||
-
|
||||
- if mkexfatfs -V > /dev/null; then
|
||||
- vtdebug "mkexfatfs test ok ..."
|
||||
- else
|
||||
- vtdebug "mkexfatfs test fail ..."
|
||||
- ventoy_false
|
||||
- return
|
||||
- fi
|
||||
-
|
||||
- if vtoycli fat -T; then
|
||||
- vtdebug "vtoycli fat test ok ..."
|
||||
- else
|
||||
- vtdebug "vtoycli fat test fail ..."
|
||||
- ventoy_false
|
||||
- return
|
||||
- fi
|
||||
-
|
||||
+
|
||||
vtdebug "tool check success ..."
|
||||
ventoy_true
|
||||
}
|
||||
@@ -311,7 +289,7 @@
|
||||
else
|
||||
vtdebug "format disk by fdisk ..."
|
||||
|
||||
-fdisk $DISK >>./log.txt 2>&1 <<EOF
|
||||
+fdisk $DISK >>$LOGFILE 2>&1 <<EOF
|
||||
o
|
||||
n
|
||||
p
|
||||
diff -Naur ventoy-1.0.81-old/tool/VentoyWorker.sh ventoy-1.0.81-new/tool/VentoyWorker.sh
|
||||
--- ventoy-1.0.81-old/tool/VentoyWorker.sh 2022-10-25 08:26:21.000000000 -0300
|
||||
+++ ventoy-1.0.81-new/tool/VentoyWorker.sh 2022-11-02 10:33:25.813135227 -0300
|
||||
@@ -106,7 +106,7 @@
|
||||
if check_tool_work_ok; then
|
||||
vtdebug "check tool work ok"
|
||||
else
|
||||
- vterr "Some tools can not run on current system. Please check log.txt for details."
|
||||
+ vterr "Some tools can not run on current system. Please check $LOGFILE for details."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -159,19 +159,6 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-
|
||||
-#check tmp_mnt directory
|
||||
-if [ -d ./tmp_mnt ]; then
|
||||
- vtdebug "There is a tmp_mnt directory, now delete it."
|
||||
- umount ./tmp_mnt >/dev/null 2>&1
|
||||
- rm -rf ./tmp_mnt
|
||||
- if [ -d ./tmp_mnt ]; then
|
||||
- vterr "tmp_mnt directory exists, please delete it first."
|
||||
- exit 1
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-
|
||||
if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then
|
||||
vtdebug "install Ventoy ..."
|
||||
|
||||
@@ -567,16 +554,16 @@
|
||||
PART1_TYPE=$(dd if=$DISK bs=1 count=1 skip=450 status=none | hexdump -n1 -e '1/1 "%02X"')
|
||||
|
||||
#reserve disk uuid
|
||||
- rm -f ./diskuuid.bin
|
||||
- dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of=./diskuuid.bin
|
||||
+ path_to_diskuuid="`mktemp`"
|
||||
+ dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of="$path_to_diskuuid"
|
||||
|
||||
dd status=none conv=fsync if=./boot/boot.img of=$DISK bs=1 count=440
|
||||
- dd status=none conv=fsync if=./diskuuid.bin of=$DISK bs=1 count=16 seek=384
|
||||
- rm -f ./diskuuid.bin
|
||||
+ dd status=none conv=fsync if="$path_to_diskuuid" of=$DISK bs=1 count=16 seek=384
|
||||
+ rm -f "$path_to_diskuuid"
|
||||
|
||||
#reserve data
|
||||
- rm -f ./rsvdata.bin
|
||||
- dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of=./rsvdata.bin
|
||||
+ path_to_rsvdata="`mktemp`"
|
||||
+ dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of="$path_to_rsvdata"
|
||||
|
||||
if [ "$PART1_TYPE" = "EE" ]; then
|
||||
vtdebug "This is GPT partition style ..."
|
||||
@@ -598,8 +585,8 @@
|
||||
xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2047 seek=1
|
||||
fi
|
||||
|
||||
- dd status=none conv=fsync if=./rsvdata.bin seek=2040 bs=512 count=8 of=${DISK}
|
||||
- rm -f ./rsvdata.bin
|
||||
+ dd status=none conv=fsync if="$path_to_rsvdata" seek=2040 bs=512 count=8 of=${DISK}
|
||||
+ rm -f "$path_to_rsvdata"
|
||||
|
||||
check_umount_disk "$DISK"
|
||||
|
||||
diff -Naur ventoy-1.0.81-old/Ventoy2Disk.sh ventoy-1.0.81-new/Ventoy2Disk.sh
|
||||
--- ventoy-1.0.81-old/Ventoy2Disk.sh 2022-10-25 08:26:21.000000000 -0300
|
||||
+++ ventoy-1.0.81-new/Ventoy2Disk.sh 2022-11-02 09:50:17.649369332 -0300
|
||||
@@ -32,48 +32,4 @@
|
||||
echo '**********************************************'
|
||||
echo ''
|
||||
|
||||
-
|
||||
-if ! [ -f ./boot/boot.img ]; then
|
||||
- if [ -d ./grub ]; then
|
||||
- echo "Don't run Ventoy2Disk.sh here, please download the released install package, and run the script in it."
|
||||
- else
|
||||
- echo "Please run under the correct directory!"
|
||||
- fi
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-echo "############# Ventoy2Disk $* [$TOOLDIR] ################" >> ./log.txt
|
||||
-date >> ./log.txt
|
||||
-
|
||||
-#decompress tool
|
||||
-echo "decompress tools" >> ./log.txt
|
||||
-cd ./tool/$TOOLDIR
|
||||
-
|
||||
-ls *.xz > /dev/null 2>&1
|
||||
-if [ $? -eq 0 ]; then
|
||||
- [ -f ./xzcat ] && chmod +x ./xzcat
|
||||
-
|
||||
- for file in $(ls *.xz); do
|
||||
- echo "decompress $file" >> ./log.txt
|
||||
- xzcat $file > ${file%.xz}
|
||||
- [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
|
||||
- [ -f ./$file ] && rm -f ./$file
|
||||
- done
|
||||
-fi
|
||||
-
|
||||
-cd ../../
|
||||
-chmod +x -R ./tool/$TOOLDIR
|
||||
-
|
||||
-
|
||||
-if [ -f /bin/bash ]; then
|
||||
- /bin/bash ./tool/VentoyWorker.sh $*
|
||||
-else
|
||||
- ash ./tool/VentoyWorker.sh $*
|
||||
-fi
|
||||
-
|
||||
-if [ -n "$OLDDIR" ]; then
|
||||
- CURDIR=$(pwd)
|
||||
- if [ "$CURDIR" != "$OLDDIR" ]; then
|
||||
- cd "$OLDDIR"
|
||||
- fi
|
||||
-fi
|
||||
+./tool/VentoyWorker.sh $*
|
||||
diff -Naur ventoy-1.0.81-old/VentoyPlugson.sh ventoy-1.0.81-new/VentoyPlugson.sh
|
||||
--- ventoy-1.0.81-old/VentoyPlugson.sh 2022-10-25 08:26:21.000000000 -0300
|
||||
+++ ventoy-1.0.81-new/VentoyPlugson.sh 2022-11-02 09:51:36.758360872 -0300
|
||||
@@ -43,39 +43,6 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-
|
||||
-if ! [ -f "$OLDDIR/tool/plugson.tar.xz" ]; then
|
||||
- echo "Please run under the correct directory!"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-echo "############# VentoyPlugson $* [$TOOLDIR] ################" >> ./VentoyPlugson.log
|
||||
-date >> ./VentoyPlugson.log
|
||||
-
|
||||
-echo "decompress tools" >> ./VentoyPlugson.log
|
||||
-cd ./tool/$TOOLDIR
|
||||
-
|
||||
-ls *.xz > /dev/null 2>&1
|
||||
-if [ $? -eq 0 ]; then
|
||||
- [ -f ./xzcat ] && chmod +x ./xzcat
|
||||
-
|
||||
- for file in $(ls *.xz); do
|
||||
- echo "decompress $file" >> ./VentoyPlugson.log
|
||||
- xzcat $file > ${file%.xz}
|
||||
- [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
|
||||
- [ -f ./$file ] && rm -f ./$file
|
||||
- done
|
||||
-fi
|
||||
-
|
||||
-cd ../../
|
||||
-chmod +x -R ./tool/$TOOLDIR
|
||||
-
|
||||
-if ! [ -f "$OLDDIR/tool/$TOOLDIR/Plugson" ]; then
|
||||
- echo "$OLDDIR/tool/$TOOLDIR/Plugson does not exist!"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-
|
||||
PATH=./tool/$TOOLDIR:$PATH
|
||||
|
||||
HOST="127.0.0.1"
|
||||
@@ -217,11 +184,3 @@
|
||||
|
||||
wait $wID
|
||||
fi
|
||||
-
|
||||
-
|
||||
-if [ -n "$OLDDIR" ]; then
|
||||
- CURDIR=$(pwd)
|
||||
- if [ "$CURDIR" != "$OLDDIR" ]; then
|
||||
- cd "$OLDDIR"
|
||||
- fi
|
||||
-fi
|
||||
diff -Naur ventoy-1.0.81-old/VentoyWeb.sh ventoy-1.0.81-new/VentoyWeb.sh
|
||||
--- ventoy-1.0.81-old/VentoyWeb.sh 2022-10-25 08:26:21.000000000 -0300
|
||||
+++ ventoy-1.0.81-new/VentoyWeb.sh 2022-11-02 09:53:13.773791254 -0300
|
||||
@@ -15,12 +15,6 @@
|
||||
echo ""
|
||||
}
|
||||
|
||||
-uid=$(id -u)
|
||||
-if [ $uid -ne 0 ]; then
|
||||
- print_err "Please use sudo or run the script as root."
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
OLDDIR=$(pwd)
|
||||
|
||||
if uname -m | egrep -q 'aarch64|arm64'; then
|
||||
@@ -85,8 +79,8 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-LOGFILE=log.txt
|
||||
-#delete the log.txt if it's more than 8MB
|
||||
+LOGFILE=/var/log/ventoy.log
|
||||
+#delete the logfile if it's more than 8MB
|
||||
if [ -f $LOGFILE ]; then
|
||||
logsize=$(stat -c '%s' $LOGFILE)
|
||||
if [ $logsize -gt 8388608 ]; then
|
||||
@@ -94,7 +88,6 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-
|
||||
if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then
|
||||
xz -d ./tool/$TOOLDIR/V2DServer.xz
|
||||
chmod +x ./tool/$TOOLDIR/V2DServer
|
||||
@ -1,214 +0,0 @@
|
||||
Author: DuckSoft <realducksoft@gmail.com>
|
||||
|
||||
I just cannot stand such a dirty package.
|
||||
Let me do some optimisations.
|
||||
|
||||
If you are interested to improve this patch, welcome to mail me.
|
||||
|
||||
diff -rup old/tool/ventoy_lib.sh new/tool/ventoy_lib.sh
|
||||
--- tool/ventoy_lib.sh 2021-12-02 16:59:42.148650182 +0100
|
||||
+++ tool/ventoy_lib.sh 2021-12-02 17:01:17.214720518 +0100
|
||||
@@ -29,7 +29,7 @@ vterr() {
|
||||
}
|
||||
|
||||
vtdebug() {
|
||||
- echo "$*" >> ./log.txt
|
||||
+ echo "$*" >>/var/log/ventoy.log
|
||||
}
|
||||
|
||||
vtoy_gen_uuid() {
|
||||
@@ -52,30 +52,6 @@ vtoy_gen_uuid() {
|
||||
|
||||
check_tool_work_ok() {
|
||||
|
||||
- if echo 1 | hexdump > /dev/null; then
|
||||
- vtdebug "hexdump test ok ..."
|
||||
- else
|
||||
- vtdebug "hexdump test fail ..."
|
||||
- ventoy_false
|
||||
- return
|
||||
- fi
|
||||
-
|
||||
- if mkexfatfs -V > /dev/null; then
|
||||
- vtdebug "mkexfatfs test ok ..."
|
||||
- else
|
||||
- vtdebug "mkexfatfs test fail ..."
|
||||
- ventoy_false
|
||||
- return
|
||||
- fi
|
||||
-
|
||||
- if vtoycli fat -T; then
|
||||
- vtdebug "vtoycli fat test ok ..."
|
||||
- else
|
||||
- vtdebug "vtoycli fat test fail ..."
|
||||
- ventoy_false
|
||||
- return
|
||||
- fi
|
||||
-
|
||||
vtdebug "tool check success ..."
|
||||
ventoy_true
|
||||
}
|
||||
@@ -311,7 +287,7 @@ format_ventoy_disk_mbr() {
|
||||
else
|
||||
vtdebug "format disk by fdisk ..."
|
||||
|
||||
-fdisk $DISK >>./log.txt 2>&1 <<EOF
|
||||
+fdisk $DISK >>/var/log/ventoy.log 2>&1 <<EOF
|
||||
o
|
||||
n
|
||||
p
|
||||
diff -rup old/tool/VentoyWorker.sh new/tool/VentoyWorker.sh
|
||||
--- tool/VentoyWorker.sh 2021-12-02 16:59:31.485642239 +0100
|
||||
+++ tool/VentoyWorker.sh 2021-12-02 17:02:00.326752183 +0100
|
||||
@@ -105,7 +105,7 @@ vtdebug "MODE=$MODE FORCE=$FORCE RESERVE
|
||||
if check_tool_work_ok; then
|
||||
vtdebug "check tool work ok"
|
||||
else
|
||||
- vterr "Some tools can not run on current system. Please check log.txt for details."
|
||||
+ vterr "Some tools can not run on current system. Please check /var/log/ventoy.log for details."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
diff -rup old/Ventoy2Disk.sh new/Ventoy2Disk.sh
|
||||
--- Ventoy2Disk.sh 2021-12-02 16:59:05.205622608 +0100
|
||||
+++ Ventoy2Disk.sh 2021-12-02 17:03:29.037816991 +0100
|
||||
@@ -32,48 +32,4 @@ echo " https://www.ventoy.net"
|
||||
echo '**********************************************'
|
||||
echo ''
|
||||
|
||||
-
|
||||
-if ! [ -f ./boot/boot.img ]; then
|
||||
- if [ -d ./grub ]; then
|
||||
- echo "Don't run Ventoy2Disk.sh here, please download the released install package, and run the script in it."
|
||||
- else
|
||||
- echo "Please run under the correct directory!"
|
||||
- fi
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-echo "############# Ventoy2Disk $* [$TOOLDIR] ################" >> ./log.txt
|
||||
-date >> ./log.txt
|
||||
-
|
||||
-#decompress tool
|
||||
-echo "decompress tools" >> ./log.txt
|
||||
-cd ./tool/$TOOLDIR
|
||||
-
|
||||
-ls *.xz > /dev/null 2>&1
|
||||
-if [ $? -eq 0 ]; then
|
||||
- [ -f ./xzcat ] && chmod +x ./xzcat
|
||||
-
|
||||
- for file in $(ls *.xz); do
|
||||
- echo "decompress $file" >> ./log.txt
|
||||
- xzcat $file > ${file%.xz}
|
||||
- [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
|
||||
- [ -f ./$file ] && rm -f ./$file
|
||||
- done
|
||||
-fi
|
||||
-
|
||||
-cd ../../
|
||||
-chmod +x -R ./tool/$TOOLDIR
|
||||
-
|
||||
-
|
||||
-if [ -f /bin/bash ]; then
|
||||
- /bin/bash ./tool/VentoyWorker.sh $*
|
||||
-else
|
||||
- ash ./tool/VentoyWorker.sh $*
|
||||
-fi
|
||||
-
|
||||
-if [ -n "$OLDDIR" ]; then
|
||||
- CURDIR=$(pwd)
|
||||
- if [ "$CURDIR" != "$OLDDIR" ]; then
|
||||
- cd "$OLDDIR"
|
||||
- fi
|
||||
-fi
|
||||
+./tool/VentoyWorker.sh $*
|
||||
diff -rup old/VentoyPlugson.sh new/VentoyPlugson.sh
|
||||
--- VentoyPlugson.sh 2021-12-02 17:54:36.055868878 +0100
|
||||
+++ VentoyPlugson.sh 2021-12-02 18:04:40.919633986 +0100
|
||||
@@ -25,8 +19,6 @@ if echo $machine | egrep -q 'aarch64|arm
|
||||
TOOLDIR=aarch64
|
||||
elif echo $machine | egrep -q 'x86_64|amd64'; then
|
||||
TOOLDIR=x86_64
|
||||
-elif echo $machine | egrep -q 'mips64'; then
|
||||
- TOOLDIR=mips64el
|
||||
elif echo $machine | egrep -q 'i[3-6]86'; then
|
||||
TOOLDIR=i386
|
||||
else
|
||||
@@ -35,38 +27,6 @@ else
|
||||
fi
|
||||
|
||||
|
||||
-if ! [ -f "$OLDDIR/tool/plugson.tar.xz" ]; then
|
||||
- echo "Please run under the correct directory!"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-echo "############# VentoyPlugson $* [$TOOLDIR] ################" >> ./VentoyPlugson.log
|
||||
-date >> ./VentoyPlugson.log
|
||||
-
|
||||
-echo "decompress tools" >> ./VentoyPlugson.log
|
||||
-cd ./tool/$TOOLDIR
|
||||
-
|
||||
-ls *.xz > /dev/null 2>&1
|
||||
-if [ $? -eq 0 ]; then
|
||||
- [ -f ./xzcat ] && chmod +x ./xzcat
|
||||
-
|
||||
- for file in $(ls *.xz); do
|
||||
- echo "decompress $file" >> ./VentoyPlugson.log
|
||||
- xzcat $file > ${file%.xz}
|
||||
- [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
|
||||
- [ -f ./$file ] && rm -f ./$file
|
||||
- done
|
||||
-fi
|
||||
-
|
||||
-cd ../../
|
||||
-chmod +x -R ./tool/$TOOLDIR
|
||||
-
|
||||
-if ! [ -f "$OLDDIR/tool/$TOOLDIR/Plugson" ]; then
|
||||
- echo "$OLDDIR/tool/$TOOLDIR/Plugson does not exist!"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-
|
||||
PATH=./tool/$TOOLDIR:$PATH
|
||||
|
||||
HOST="127.0.0.1"
|
||||
@@ -208,11 +168,3 @@ if [ -f /proc/$wID/maps ]; then
|
||||
|
||||
wait $wID
|
||||
fi
|
||||
-
|
||||
-
|
||||
-if [ -n "$OLDDIR" ]; then
|
||||
- CURDIR=$(pwd)
|
||||
- if [ "$CURDIR" != "$OLDDIR" ]; then
|
||||
- cd "$OLDDIR"
|
||||
- fi
|
||||
-fi
|
||||
diff -rup old/VentoyWeb.sh new/VentoyWeb.sh
|
||||
--- VentoyWeb.sh 2021-12-02 16:58:51.885612627 +0100
|
||||
+++ VentoyWeb.sh 2021-12-02 17:04:43.437871014 +0100
|
||||
@@ -15,12 +15,6 @@ print_err() {
|
||||
echo ""
|
||||
}
|
||||
|
||||
-uid=$(id -u)
|
||||
-if [ $uid -ne 0 ]; then
|
||||
- print_err "Please use sudo or run the script as root."
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
OLDDIR=$(pwd)
|
||||
|
||||
if uname -m | egrep -q 'aarch64|arm64'; then
|
||||
@@ -85,8 +79,8 @@ if ps -ef | grep "V2DServer.*$HOST.*$POR
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-LOGFILE=log.txt
|
||||
-#delete the log.txt if it's more than 8MB
|
||||
+LOGFILE=/var/log/ventoy.log
|
||||
+#delete the ventoy.log if it's more than 8MB
|
||||
if [ -f $LOGFILE ]; then
|
||||
logsize=$(stat -c '%s' $LOGFILE)
|
||||
if [ $logsize -gt 8388608 ]; then
|
||||
@ -1,5 +0,0 @@
|
||||
--- VentoyPlugson.sh
|
||||
+++ VentoyPlugson.sh
|
||||
@@ -27,0 +28,2 @@ elif echo $machine | egrep -q 'x86_64|am
|
||||
+elif echo $machine | egrep -q 'mips64'; then
|
||||
+ TOOLDIR=mips64el
|
||||
@ -1,54 +0,0 @@
|
||||
--- CreatePersistentImg.sh
|
||||
+++ CreatePersistentImg.sh
|
||||
@@ -110,7 +110,3 @@ if [ -n "$config" ]; then
|
||||
- if [ -d ./persist_tmp_mnt ]; then
|
||||
- rm -rf ./persist_tmp_mnt
|
||||
- fi
|
||||
-
|
||||
- mkdir ./persist_tmp_mnt
|
||||
- if mount $freeloop ./persist_tmp_mnt; then
|
||||
- echo '/ union' > ./persist_tmp_mnt/$config
|
||||
+ path_to_persist_mnt="`mktemp -d`"
|
||||
+ if mount $freeloop "$path_to_persist_mnt"; then
|
||||
+ echo '/ union' > "$path_to_persist_mnt"/$config
|
||||
@@ -118 +114 @@ if [ -n "$config" ]; then
|
||||
- umount ./persist_tmp_mnt
|
||||
+ umount "$path_to_persist_mnt"
|
||||
@@ -120 +116 @@ if [ -n "$config" ]; then
|
||||
- rm -rf ./persist_tmp_mnt
|
||||
+ rm -rf "$path_to_persist_mnt"
|
||||
--- tool/VentoyWorker.sh
|
||||
+++ tool/VentoyWorker.sh
|
||||
@@ -162,12 +161,0 @@ fi
|
||||
-#check tmp_mnt directory
|
||||
-if [ -d ./tmp_mnt ]; then
|
||||
- vtdebug "There is a tmp_mnt directory, now delete it."
|
||||
- umount ./tmp_mnt >/dev/null 2>&1
|
||||
- rm -rf ./tmp_mnt
|
||||
- if [ -d ./tmp_mnt ]; then
|
||||
- vterr "tmp_mnt directory exists, please delete it first."
|
||||
- exit 1
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-
|
||||
@@ -569,2 +557,2 @@ else
|
||||
- rm -f ./diskuuid.bin
|
||||
- dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of=./diskuuid.bin
|
||||
+ path_to_diskuuid="`mktemp`"
|
||||
+ dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of="$path_to_diskuuid"
|
||||
@@ -573,2 +561,2 @@ else
|
||||
- dd status=none conv=fsync if=./diskuuid.bin of=$DISK bs=1 count=16 seek=384
|
||||
- rm -f ./diskuuid.bin
|
||||
+ dd status=none conv=fsync if="$path_to_diskuuid" of=$DISK bs=1 count=16 seek=384
|
||||
+ rm -f "$path_to_diskuuid"
|
||||
@@ -577,2 +565,2 @@ else
|
||||
- rm -f ./rsvdata.bin
|
||||
- dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of=./rsvdata.bin
|
||||
+ path_to_rsvdata="`mktemp`"
|
||||
+ dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of="$path_to_rsvdata"
|
||||
@@ -600,2 +588,2 @@ else
|
||||
- dd status=none conv=fsync if=./rsvdata.bin seek=2040 bs=512 count=8 of=${DISK}
|
||||
- rm -f ./rsvdata.bin
|
||||
+ dd status=none conv=fsync if="$path_to_rsvdata" seek=2040 bs=512 count=8 of=${DISK}
|
||||
+ rm -f "$path_to_rsvdata"
|
||||
@ -47,25 +47,23 @@ let
|
||||
mipsel-linux = "mips64el";
|
||||
}.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
|
||||
|
||||
inherit (lib) optional optionalString;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ventoy-bin";
|
||||
version = "1.0.81";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz";
|
||||
src = let
|
||||
inherit (finalAttrs) version;
|
||||
in fetchurl {
|
||||
url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";
|
||||
hash = "sha256-15y05g+F+oEFYUUy7SE57GZ1RSHqdZnk2iOPsy1L0GI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./000-sanitize.patch
|
||||
./001-add-mips64.diff
|
||||
./002-fix-for-read-only-file-system.diff
|
||||
./000-nixos-sanitization.patch
|
||||
];
|
||||
|
||||
patchFlags = [ "-p0" ];
|
||||
|
||||
postPatch = ''
|
||||
# Fix permissions.
|
||||
find -type f -name \*.sh -exec chmod a+x '{}' \;
|
||||
@ -79,8 +77,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optional (withQt5 || withGtk3) copyDesktopItems
|
||||
++ lib.optional withQt5 wrapQtAppsHook;
|
||||
++ optional (withQt5 || withGtk3) copyDesktopItems
|
||||
++ optional withQt5 wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
@ -97,12 +95,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
which
|
||||
xz
|
||||
]
|
||||
++ lib.optional withCryptsetup cryptsetup
|
||||
++ lib.optional withExt4 e2fsprogs
|
||||
++ lib.optional withGtk3 gtk3
|
||||
++ lib.optional withNtfs ntfs3g
|
||||
++ lib.optional withXfs xfsprogs
|
||||
++ lib.optional withQt5 qtbase;
|
||||
++ optional withCryptsetup cryptsetup
|
||||
++ optional withExt4 e2fsprogs
|
||||
++ optional withGtk3 gtk3
|
||||
++ optional withNtfs ntfs3g
|
||||
++ optional withXfs xfsprogs
|
||||
++ optional withQt5 qtbase;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
@ -163,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
''
|
||||
# VentoGUI uses the `ventoy_gui_type` file to determine the type of GUI.
|
||||
# See: https://github.com/ventoy/Ventoy/blob/v1.0.78/LinuxGUI/Ventoy2Disk/ventoy_gui.c#L1096
|
||||
+ lib.optionalString (withGtk3 || withQt5) ''
|
||||
+ optionalString (withGtk3 || withQt5) ''
|
||||
echo "${defaultGuiType}" > "$VENTOY_PATH/ventoy_gui_type"
|
||||
makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \
|
||||
--prefix PATH : "${lib.makeBinPath finalAttrs.buildInputs}" \
|
||||
@ -171,13 +169,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir "$out"/share/{applications,pixmaps}
|
||||
ln -s "$VENTOY_PATH"/WebUI/static/img/VentoyLogo.png "$out"/share/pixmaps/
|
||||
''
|
||||
+ lib.optionalString (!withGtk3) ''
|
||||
+ optionalString (!withGtk3) ''
|
||||
rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade}
|
||||
''
|
||||
+ lib.optionalString (!withQt5) ''
|
||||
+ optionalString (!withQt5) ''
|
||||
rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5"
|
||||
''
|
||||
+ lib.optionalString (!withGtk3 && !withQt5) ''
|
||||
+ optionalString (!withGtk3 && !withQt5) ''
|
||||
rm "$VENTOY_PATH"/VentoyGUI.*
|
||||
'' +
|
||||
''
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uhubctl";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvp";
|
||||
repo = "uhubctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F3fOoZYnfIWMrESyVJ/9z6Vou1279avhs600rQayUVA=";
|
||||
sha256 = "sha256-Rt9hTT0Tn8v+J1XqZm8iXTTY4nKow2qjRPNmNCiWNoY=";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, bison
|
||||
, pam
|
||||
, libxcrypt
|
||||
|
||||
, withPAM ? true
|
||||
, withTimestamp ? true
|
||||
@ -38,7 +39,9 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ bison ];
|
||||
buildInputs = [ pam ];
|
||||
buildInputs = [ ]
|
||||
++ lib.optional withPAM pam
|
||||
++ lib.optional (!withPAM) libxcrypt;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Executes the given command as another user";
|
||||
|
||||
@ -17368,7 +17368,9 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
pahole = callPackage ../development/tools/misc/pahole {};
|
||||
pahole = callPackage ../development/tools/misc/pahole {
|
||||
libbpf = libbpf_1;
|
||||
};
|
||||
|
||||
panopticon = callPackage ../development/tools/analysis/panopticon {};
|
||||
|
||||
@ -25946,6 +25948,8 @@ with pkgs;
|
||||
|
||||
alegreya-sans = callPackage ../data/fonts/alegreya-sans { };
|
||||
|
||||
alice = callPackage ../data/fonts/alice { };
|
||||
|
||||
alkalami = callPackage ../data/fonts/alkalami { };
|
||||
|
||||
amber-theme = callPackage ../data/themes/amber { };
|
||||
@ -27143,7 +27147,7 @@ with pkgs;
|
||||
|
||||
msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
|
||||
|
||||
amarok = libsForQt5_openssl_1_1.callPackage ../applications/audio/amarok { };
|
||||
amarok = libsForQt5.callPackage ../applications/audio/amarok { };
|
||||
amarok-kf5 = amarok; # for compatibility
|
||||
|
||||
amfora = callPackage ../applications/networking/browsers/amfora { };
|
||||
@ -32959,7 +32963,7 @@ with pkgs;
|
||||
|
||||
kodi-cli = callPackage ../tools/misc/kodi-cli { };
|
||||
|
||||
xca = libsForQt5_openssl_1_1.callPackage ../applications/misc/xca { };
|
||||
xca = libsForQt5.callPackage ../applications/misc/xca { };
|
||||
|
||||
xcalib = callPackage ../tools/X11/xcalib { };
|
||||
|
||||
|
||||
@ -166,12 +166,7 @@ in {
|
||||
|
||||
linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||
|
||||
linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
];
|
||||
};
|
||||
linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||
|
||||
linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix {
|
||||
kernelPatches = [
|
||||
@ -193,7 +188,7 @@ in {
|
||||
else testing;
|
||||
|
||||
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
|
||||
kernel = linux_5_19;
|
||||
kernel = linux_6_0;
|
||||
kernelPatches = kernel.kernelPatches;
|
||||
};
|
||||
|
||||
@ -248,7 +243,7 @@ in {
|
||||
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
|
||||
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
|
||||
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||
linux_5_19_hardened = hardenedKernelFor kernels.linux_5_19 { };
|
||||
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||
linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { };
|
||||
|
||||
}));
|
||||
@ -535,7 +530,7 @@ in {
|
||||
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
|
||||
linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
|
||||
linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
|
||||
linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19);
|
||||
linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01
|
||||
linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0);
|
||||
};
|
||||
|
||||
@ -575,7 +570,7 @@ in {
|
||||
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
|
||||
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
|
||||
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||
linux_5_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_19 { });
|
||||
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||
linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { });
|
||||
|
||||
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user