Merge master into staging-next
This commit is contained in:
@@ -223,6 +223,7 @@ in
|
||||
"char-nvidia-uvm"
|
||||
# ROCm
|
||||
"char-drm"
|
||||
"char-fb"
|
||||
"char-kfd"
|
||||
# WSL (Windows Subsystem for Linux)
|
||||
"/dev/dxg"
|
||||
|
||||
@@ -31,6 +31,23 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
tmpfsHugeMemoryPages = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"never"
|
||||
"always"
|
||||
"within_size"
|
||||
"advise"
|
||||
];
|
||||
default = "never";
|
||||
example = "within_size";
|
||||
description = ''
|
||||
never - Do not allocate huge memory pages. This is the default.
|
||||
always - Attempt to allocate huge memory page every time a new page is needed.
|
||||
within_size - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended.
|
||||
advise - Only allocate huge memory pages if requested with madvise(2).
|
||||
'';
|
||||
};
|
||||
|
||||
useTmpfs = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
@@ -60,6 +77,7 @@ in
|
||||
"nosuid"
|
||||
"nodev"
|
||||
"size=${toString cfg.tmpfsSize}"
|
||||
"huge=${cfg.tmpfsHugeMemoryPages}"
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
libusb1,
|
||||
libjpeg,
|
||||
libmodule,
|
||||
pcre,
|
||||
libXdmcp,
|
||||
util-linux,
|
||||
libpthreadstubs,
|
||||
@@ -23,6 +22,7 @@
|
||||
enableGamma ? true,
|
||||
libdrm,
|
||||
libXrandr,
|
||||
libiio,
|
||||
wayland,
|
||||
enableScreen ? true,
|
||||
enableYoctolight ? true,
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clightd";
|
||||
version = "5.8";
|
||||
version = "5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FedeDP";
|
||||
repo = "Clightd";
|
||||
rev = version;
|
||||
hash = "sha256-Lmno/TJVCQVNzfpKNZzuDf2OM6w6rbz+zJTr3zVo/CM=";
|
||||
hash = "sha256-LOhBBd7QL5kH4TzMFgrh70C37WsFdsiKArP+tIEiPWo=";
|
||||
};
|
||||
|
||||
# dbus-1.pc has datadir=/etc
|
||||
@@ -81,8 +81,8 @@ stdenv.mkDerivation rec {
|
||||
libusb1
|
||||
libjpeg
|
||||
libmodule
|
||||
libiio
|
||||
|
||||
pcre
|
||||
libXdmcp
|
||||
util-linux
|
||||
libpthreadstubs
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||
zettlr = {
|
||||
version = "3.4.3";
|
||||
hash = "sha256-Xb9zszbkHWAaIcu74EGQH0PVbuXIZXH/dja1F1Hkx1c=";
|
||||
version = "3.4.4";
|
||||
hash = "sha256-ApgmHl9WoAmWl03tqv01D0W8orja25f7KZUFLhlZloQ=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,13 +12,13 @@ let
|
||||
let
|
||||
self = {
|
||||
inherit pname;
|
||||
version = "0-unstable-2023-11-25";
|
||||
version = "0-unstable-2025-05-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Eisa01";
|
||||
repo = "mpv-scripts";
|
||||
rev = "48d68283cea47ff8e904decc9003b3abc3e2123e";
|
||||
hash = "sha256-edJfotlC5T8asqPIygR67BEWjP4i54Wx54StLfjpc48=";
|
||||
rev = "4701419f9b9063a5425f3942ec62cc029599430d";
|
||||
hash = "sha256-QXpuqViVXIGCDbX0OVjDW7E67odZTMbk1iXfz7bBasU=";
|
||||
# avoid downloading screenshots and videos
|
||||
sparseCheckout = [
|
||||
"scripts/"
|
||||
|
||||
@@ -9,18 +9,18 @@
|
||||
let
|
||||
self = rustPlatform.buildRustPackage {
|
||||
pname = "asciinema";
|
||||
version = "3.0.0-rc.3";
|
||||
version = "3.0.0-rc.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "asciinema-source-${self.version}";
|
||||
owner = "asciinema";
|
||||
repo = "asciinema";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-TYJ17uVj8v1u630MTb033h0X3aYRXY9d89GjAxG8muk=";
|
||||
hash = "sha256-w1LV21EqHNC+LYMLpljGQrxmBJ8ztCQ7g3YbJ6ME5j0=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-dgeHQs1IYD8m8gOtPEn+l0A2RbSmwTyzrbiusD3dUX0=";
|
||||
cargoHash = "sha256-Q6HoKrcwa67lAsl4zgNYilo4LzPxySz2lE85ZdOSPpM=";
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
|
||||
@@ -56,7 +56,10 @@ let
|
||||
'';
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
mainProgram = "asciinema";
|
||||
maintainers = with lib.maintainers; [ jiriks74 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
jiriks74
|
||||
llakala
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -15,24 +15,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "autotrace";
|
||||
version = "0.31.9";
|
||||
version = "0.31.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "autotrace";
|
||||
repo = "autotrace";
|
||||
rev = version;
|
||||
hash = "sha256-8qqB6oKmbz95dNLtdLvb69cEj/P7TzdoKEyJ8+4ITzs=";
|
||||
hash = "sha256-PbEK5+7jcYIwYmgxBIOpNyj2KJNPfqKBKb+wYwoLKSo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/autotrace/autotrace/pull/105
|
||||
name = "imagemagick7-support.patch";
|
||||
url = "https://github.com/autotrace/autotrace/compare/170488e1871d50aad7a800b901e33ded7d31773a...c26a2a059926c595a00839c8d9961e9381206579.patch";
|
||||
hash = "sha256-Q82LRF/BsJ/Ii2s+7yaYHs9agMKYVYIMnbwqz8P92s0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gettext
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
pipewire,
|
||||
pkg-config,
|
||||
portaudio,
|
||||
SDL2,
|
||||
sndio,
|
||||
spirv-tools,
|
||||
soundtouch,
|
||||
@@ -34,10 +35,7 @@
|
||||
vulkan-headers,
|
||||
xorg,
|
||||
zstd,
|
||||
enableSDL2 ? true,
|
||||
SDL2,
|
||||
enableQt ? true,
|
||||
enableQtTranslations ? enableQt,
|
||||
enableQtTranslations ? true,
|
||||
qt6,
|
||||
enableCubeb ? true,
|
||||
cubeb,
|
||||
@@ -53,20 +51,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "azahar";
|
||||
version = "2120.3";
|
||||
version = "2121.1";
|
||||
|
||||
src = fetchzip {
|
||||
# TODO: use this when https://github.com/azahar-emu/azahar/issues/779 is resolved
|
||||
# url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
|
||||
url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250414-00e3bbb.tar.xz";
|
||||
hash = "sha256-3QKicmpmWDM7x9GDJ8sxm2Xu+0Yfho4LkSWMp+ixzRk=";
|
||||
url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-jadQsuU1SfvUc5DO5XqZXTe53U9XGOHScDGx66Oh18Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
pkg-config
|
||||
] ++ lib.optionals enableQt [ qt6.wrapQtAppsHook ];
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
@@ -91,7 +88,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
openssl
|
||||
pipewire
|
||||
portaudio
|
||||
qt6.qtbase
|
||||
qt6.qtmultimedia
|
||||
qt6.qttools
|
||||
qt6.qtwayland
|
||||
soundtouch
|
||||
SDL2
|
||||
sndio
|
||||
spirv-tools
|
||||
vulkan-headers
|
||||
@@ -99,17 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xorg.libXext
|
||||
zstd
|
||||
]
|
||||
++ optionals enableQt (
|
||||
with qt6;
|
||||
[
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qttools
|
||||
qtwayland
|
||||
]
|
||||
)
|
||||
++ optionals enableQtTranslations [ qt6.qttools ]
|
||||
++ optionals enableSDL2 [ SDL2 ]
|
||||
++ optionals enableCubeb [ cubeb ]
|
||||
++ optionals useDiscordRichPresence [ rapidjson ];
|
||||
|
||||
@@ -147,10 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(cmakeBool "DISABLE_SYSTEM_LODEPNG" true)
|
||||
(cmakeBool "DISABLE_SYSTEM_VMA" true)
|
||||
(cmakeBool "DISABLE_SYSTEM_XBYAK" true)
|
||||
(cmakeBool "ENABLE_QT" enableQt)
|
||||
(cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
|
||||
(cmakeBool "ENABLE_SDL2" enableSDL2)
|
||||
(cmakeBool "ENABLE_SDL2_FRONTEND" enableSDL2)
|
||||
(cmakeBool "ENABLE_CUBEB" enableCubeb)
|
||||
(cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
|
||||
];
|
||||
|
||||
@@ -7,17 +7,19 @@
|
||||
file,
|
||||
readline,
|
||||
python3,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clifm";
|
||||
version = "1.24";
|
||||
version = "1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leo-arch";
|
||||
repo = "clifm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RAxhjDNaNkMSIJaca1NNiMQNaEZ3WDAvaWzN3u/PceA=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q4BzkLclJJGybx6tnOhfRE3X5iFtuYTfbAvSLO7isX4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -35,12 +37,18 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/leo-arch/clifm";
|
||||
description = "CliFM is a CLI-based, shell-like, and non-curses terminal file manager written in C: simple, fast, extensible, and lightweight as hell";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ nadir-ishiguro ];
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://github.com/leo-arch/clifm/releases/tag/v${finalAttrs.version}";
|
||||
description = "A CLI-based, shell-like, and non-curses terminal file manager";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ nadir-ishiguro ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "clifm";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,23 +15,25 @@ let
|
||||
|
||||
# vv Also update this vv
|
||||
tag = "nixpkgs-dependabot-cli-${version}";
|
||||
|
||||
updateJobProxy = dockerTools.pullImage {
|
||||
imageName = "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy";
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
|
||||
imageDigest = "sha256:cc4a9b7db8ddf3924b6c25cc8a74d9937bf803e64733035809862a1c0a6df984";
|
||||
sha256 = "0wkr0rac7dp1080s4zik5yzi5967gkfylly2148ipgw50sp0sq8s";
|
||||
imageDigest = "sha256:3030ba5ff8f556e47016fca94d81c677b5c6abde99fef228341e1537588e503a";
|
||||
hash = "sha256-RiXUae5ONScoDu85L6BEf3T4JodBYha6v+d9kWl8oWc=";
|
||||
|
||||
# Don't update this, it's used to refer to the imported image later
|
||||
finalImageName = "dependabot-update-job-proxy";
|
||||
finalImageTag = tag;
|
||||
};
|
||||
|
||||
updaterGitHubActions = dockerTools.pullImage {
|
||||
imageName = "ghcr.io/dependabot/dependabot-updater-github-actions";
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
|
||||
imageDigest = "sha256:6665b3e26ef97577e83f2dfd0007a73c02b003126e72c0b4b196fe570088ed93";
|
||||
sha256 = "0q7w3yp49wb70gkjjl2syvs75hm1jkva2qslzckwxh73z0kq2z0q";
|
||||
imageDigest = "sha256:a356576adbec11bc34b142b6ef69a5856a09dc3654bdc9f9b046c08ee2d73ff8";
|
||||
hash = "sha256-zqydb2v39xiSBT5ayWEacD0NIH6LoFX8lkRcCKppH08=";
|
||||
|
||||
# Don't update this, it's used to refer to the imported image later
|
||||
finalImageName = "dependabot-updater-github-actions";
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.2";
|
||||
version = "3.2.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit version;
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
||||
owner = "dagargo";
|
||||
repo = "elektroid";
|
||||
rev = version;
|
||||
hash = "sha256-8tKs0i1dkoLlk1a33n7+6eIXqjNu3PHUTznrEC/HPIM=";
|
||||
hash = "sha256-gK6WQA0KenyksLLFHejCXDTpBm2uhJwn6/E4TXUdeJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
let
|
||||
pname = "exact-audio-copy";
|
||||
version = "1.6.0";
|
||||
version = "1.8.0";
|
||||
|
||||
eac_exe = fetchurl {
|
||||
url = "http://www.exactaudiocopy.de/eac-${lib.versions.majorMinor version}.exe";
|
||||
sha256 = "8291d33104ebab2619ba8d85744083e241330a286f5bd7d54c7b0eb08f2b84c1";
|
||||
sha256 = "205530cfbfdff82343858f38b0e709e586051fb8900ecd513d7992a3c1ef031b";
|
||||
};
|
||||
|
||||
cygwin_dll = fetchurl {
|
||||
url = "https://cygwin.com/snapshots/x86/cygwin1-20220301.dll.xz";
|
||||
sha256 = "0zxn0r5q69fhciy0mrplhxj1hxwy3sq4k1wdy6n6kyassm4zyz1x";
|
||||
cygwin = fetchurl {
|
||||
url = "https://mirrors.kernel.org/sourceware/cygwin/x86_64/release/cygwin/cygwin-3.6.1-1-x86_64.tar.xz";
|
||||
sha256 = "45d1c76a15426209c20a8d4df813e94fbd17bd5d85ad4d742515ff432400143e";
|
||||
};
|
||||
|
||||
patched_eac = stdenv.mkDerivation {
|
||||
@@ -40,9 +40,11 @@ let
|
||||
cd $_tmp
|
||||
7z x -aoa ${eac_exe}
|
||||
chmod -R 755 .
|
||||
cp ${cygwin_dll} cygwin1.dll.xz
|
||||
xz --decompress cygwin1.dll.xz
|
||||
mv cygwin1.dll CDRDAO/
|
||||
cp ${cygwin} cygwin1.tar.xz
|
||||
tar xf cygwin1.tar.xz
|
||||
mv usr/bin/cygwin1.dll CDRDAO/
|
||||
rm -rf usr
|
||||
rm cygwin1.tar.xz
|
||||
cp -r * $out
|
||||
7z x EAC.exe
|
||||
convert .rsrc/1033/ICON/29.ico -thumbnail 128x128 -alpha on -background none -flatten "$out/eac.ico.128.png"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fex";
|
||||
version = "2504";
|
||||
version = "2505";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FEX-Emu";
|
||||
repo = "FEX";
|
||||
tag = "FEX-${finalAttrs.version}";
|
||||
|
||||
hash = "sha256-oXducy4uvf/3Ox6AadPWNl9450D9TiPIr53P91/qEvw=";
|
||||
hash = "sha256-H/BE+x/lwpED10UrbukWHiKJo0L75/KDV2T5q/J0NiM=";
|
||||
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
||||
@@ -56,24 +56,24 @@
|
||||
|
||||
let
|
||||
pname = "gitkraken";
|
||||
version = "11.0.0";
|
||||
version = "11.1.0";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
hash = "sha256-rUOBCxquTw5wh5cK0AEGmIMq808tZQe5E90V7lGRuNY=";
|
||||
hash = "sha256-42NP+23PlyIiqzwjpktz8ipJ5tjzbbszSB9qkeE5jVU=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
|
||||
hash = "sha256-L2OLlHY8iix7HcI5TowZapqtrsvB/KWigdndQWIIIFU=";
|
||||
hash = "sha256-/GiHFVz9RyC/bliA8m2YwCwnUQfxT9C0qR+YPr6zdqQ=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
|
||||
hash = "sha256-Rk6hSQ12CQl+vDYl17p0fQ74RpfOYhjMqrKZJ0/d1dw=";
|
||||
hash = "sha256-CfhloCczC2z1AHNh0vGXk9Np+BnFI0U/QrPIFBWsYjs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ for arch in "${!tarballs[@]}"; do
|
||||
hash=$(nix-hash --sri --type sha256 "$(nix-prefetch-url --print-path --unpack "${tarballs[${arch}]}" | tail -n1)")
|
||||
echo >&2 "=== Updating package.nix for ${arch}..."
|
||||
# update-source-version expects to be at the root of nixpkgs
|
||||
(cd "${nixpkgs}" && update-source-version gitkraken "${version}" "${hash}" --system="${arch}" --version-key="srcs.${arch}")
|
||||
(cd "${nixpkgs}" && update-source-version gitkraken "${version}" "${hash}" --system="${arch}" --ignore-same-version)
|
||||
done
|
||||
|
||||
echo >&2 "=== Done!"
|
||||
|
||||
@@ -2,17 +2,18 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "google-play";
|
||||
version = "1.6.3";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "3052";
|
||||
repo = "google";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Wf7k76TXBr10FIclo/Ny8MLDDSNXu54JTDS0vfw4UXA=";
|
||||
owner = "UlyssesZh";
|
||||
repo = "google-play";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Qv79fM59AQ+Y0OfWXKW1Jub07J5net3pP8ANm7CtB6A=";
|
||||
};
|
||||
|
||||
subPackages = [
|
||||
@@ -20,14 +21,16 @@ buildGoModule rec {
|
||||
"internal/badging"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-NVN5qoGXiL6lOPZejUhK55EuzF7R0KsIT+2oCzK+Qg0=";
|
||||
vendorHash = "sha256-+n08a22VEHjKUyk/XxTXBu9yYggSgIxCFx8PFtA2OCc=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "CLI app to download APK from Google Play or send API requests";
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
# https://polyformproject.org/licenses/noncommercial/1.0.0
|
||||
license = lib.licenses.unfree;
|
||||
homepage = "https://github.com/3052/google";
|
||||
homepage = "https://github.com/UlyssesZh/google-play";
|
||||
mainProgram = "play";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpupad";
|
||||
version = "2.5.5";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "houmain";
|
||||
repo = "gpupad";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ajT4mctCfNJVUfhVsHzEoz2M9HjMJ6uNgf1hieDjhtY=";
|
||||
hash = "sha256-U2qLMIEss7WWHjfV9HbbSd1MBCcSsuToe8r+mIZ0xXg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
version ? "0.9.9.25",
|
||||
hash ? "sha256-yxZIp33lBQZebo9UyqLqtAMM9oRJ23jr0YdIcjwnimY=",
|
||||
version ? "0.9.10.3",
|
||||
hash ? "sha256-xduDagiL/DyUZ1SSx+abBzdTwOYRu/dg0kePAnguJzo=",
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl nix-update
|
||||
#!nix-shell -I nixpkgs=./. --pure -i bash -p curl cacert git nix nix-update
|
||||
|
||||
versionList=$(curl -s "https://www.hifile.app/otherdownloads" | grep -A 10 '<h1>All downloads</h1>' | grep -oP 'HiFile-\K[0-9.]+(?=\.AppImage)')
|
||||
|
||||
# Get the latest version by sorting the list of versions
|
||||
latestVersion=$(echo "$versionList" | sort -V | tail -n 1)
|
||||
|
||||
latestVersion=$(curl -s "https://www.hifile.app/otherdownloads" | grep -A 10 '<h1>All downloads</h1>' | grep -m 1 '<li>.*AppImage.*' | sed -n 's/.*HiFile-\([0-9.]*\)\.AppImage.*/\1/p')
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hifile.version" | tr -d '"')
|
||||
|
||||
echo "latest version: $latestVersion"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hl-log-viewer";
|
||||
version = "0.30.3";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pamburus";
|
||||
repo = "hl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-18FzXUvpMHu3EfECgcslhReinMM6Oa1qdTKbbqFiv1w=";
|
||||
hash = "sha256-rKvcJ7mPCuX+QGdDDeYIk+PtojFgIde5IA7mORmDekw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qx3NxWgCsCurU+TObQIvn1Xyn5IRP/iNem3s201MD4A=";
|
||||
cargoHash = "sha256-YsDgLPr2V628QCDIOPcx2XQlaomicWZKZ24vXNgxRVE=";
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
pkg-config,
|
||||
help2man,
|
||||
libjack2,
|
||||
libsamplerate,
|
||||
dbus,
|
||||
qt6,
|
||||
meson,
|
||||
@@ -16,7 +17,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
pname = "jacktrip";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -24,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
repo = "jacktrip";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-WXUqMKCfZ/ZQLKpfye5cwju4IynitcBPEJwlQ2/+aoo=";
|
||||
hash = "sha256-3Ae84x3QL+dfoJJJ0+XrBgo1wKwNYrR9AVQCnahS1sE=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
@@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6.qtbase
|
||||
qt6.qtwayland
|
||||
libjack2
|
||||
libsamplerate
|
||||
dbus
|
||||
];
|
||||
|
||||
@@ -56,10 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# Can't link to libsamplerate
|
||||
# https://github.com/jacktrip/jacktrip/issues/1380
|
||||
mesonFlags = [ "-Dlibsamplerate=disabled" ];
|
||||
|
||||
qmakeFlags = [ "jacktrip.pro" ];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
|
||||
@@ -1,34 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ant,
|
||||
copyDesktopItems,
|
||||
fetchFromGitHub,
|
||||
jdk,
|
||||
jre,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
stdenv,
|
||||
stripJavaArchivesHook,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jailer";
|
||||
version = "16.2";
|
||||
version = "16.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wisser";
|
||||
repo = "Jailer";
|
||||
rev = "bc00c6883bac0d09b549e35a10e202da477e4cb1";
|
||||
hash = "sha256-nXxTKbhvrBlorNqiF3wZDEgf1VrBamWw8ZSQSUqpGT8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HyhozW8lMsC/LxExKfxG64L6ZKKqrgYQ8PX0606B6O0=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
rm jailer.jar
|
||||
ant
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
jdk
|
||||
@@ -38,6 +32,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
rm jailer.jar
|
||||
ant
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -82,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Tool for database subsetting and relational data browsing";
|
||||
license = lib.licenses.asl20;
|
||||
homepage = "https://github.com/Wisser/Jailer";
|
||||
changelog = "https://github.com/Wisser/Jailer/releases/tag/${finalAttrs.version}";
|
||||
changelog = "https://github.com/Wisser/Jailer/releases/tag/v${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ guillaumematheron ];
|
||||
mainProgram = "jailer";
|
||||
};
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "jjui";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idursun";
|
||||
repo = "jjui";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FfodDPHMNiB4vh+v+m2k6x9o82idHM68Os9OuXpyVGY=";
|
||||
};
|
||||
|
||||
@@ -22,11 +22,11 @@ buildGoModule rec {
|
||||
meta = {
|
||||
description = "A TUI for Jujutsu VCS";
|
||||
homepage = "https://github.com/idursun/jjui";
|
||||
changelog = "https://github.com/idursun/jjui/releases/tag/v${version}";
|
||||
changelog = "https://github.com/idursun/jjui/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
adda
|
||||
];
|
||||
mainProgram = "jjui";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Generated
+115
-410
@@ -6,13 +6,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-BqpHqQIObTb7DHTyZAgCD9A5I0pZkHhSoPTN2g6/G9E="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.0.2023020321",
|
||||
"hash": "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="
|
||||
"version": "2.1.22045.20230930",
|
||||
"hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
@@ -21,98 +21,103 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-Iob8OyWhwXhmHKCdnea7dtL9VQvcrf6/gUGHJ30CKXA="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.DataGrid",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-2iVuMPRw7sbsYPGSG4XjQFGFky5WB5B05Jh1+I852ZI="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-UKVibxhJoGNvEGh8J/Z0sq8J81FT8yth/yXVPSFHF/8="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-0cUxPYJP2W11wnM6j4qNB3IvHlsUp9EZlY8I/NoAmd4="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-O20fC/9YXO3/MZNlh1EgWLHFSyi/ao083MKwjetgxmo="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.HtmlRenderer",
|
||||
"version": "11.0.0",
|
||||
"hash": "sha256-DBD113eQJNHeEgFmx/tVRSnHxhGBQIKWVKxr1QRilr4="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Markup.Xaml.Loader",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-odkZZXqTbL+h9aPSQiO+haFF89xgFg4XKsvzVWxLjVE="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-KVUAXXT+f4VrtJ8widfEIzN25GBbtXWog/tpM354gdg="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-wTqdxPU3Ql7jC4JFkChbUfaRR0nqUKrYKn8oexdFyig="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-rKOgkNLCwEVVcyLCimvhDUDKXnrDOguUryaGVOPFFwE="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Fluent",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-ETOaNvRzTAC0uEVVB3noiyYM9N9nPrPnMwCqiFgID/4="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-27evmgSrIx+EopF6E3N1cT7BvAUc/s99TVEMfmG83cQ="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-ncZLGKhpfjuuVPz4Fs+P6L3dM0KRnwAC3xJRqyvpKw8="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.0.5",
|
||||
"hash": "sha256-rvs3hwRh3F5E1j3JqcodWJTHV3BTWMKkvzq170tuPa4="
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60="
|
||||
},
|
||||
{
|
||||
"pname": "CommunityToolkit.Mvvm",
|
||||
"version": "8.2.2",
|
||||
"hash": "sha256-vdprWEw+J6yJZLWZTUFTrQAHWLuPVXPBaYmePD7kcwY="
|
||||
"version": "8.4.0",
|
||||
"hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp",
|
||||
"version": "2.8.2.3",
|
||||
"hash": "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Linux",
|
||||
"version": "2.8.2.3",
|
||||
"hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.macOS",
|
||||
"version": "2.8.2.3",
|
||||
"hash": "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
|
||||
"version": "2.8.2.3",
|
||||
"hash": "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Win32",
|
||||
"version": "2.8.2.3",
|
||||
"hash": "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
|
||||
},
|
||||
{
|
||||
"pname": "ini-parser-netstandard",
|
||||
@@ -125,428 +130,128 @@
|
||||
"hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Analyzers",
|
||||
"version": "3.0.0",
|
||||
"hash": "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="
|
||||
"pname": "Microsoft.Extensions.Configuration",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Common",
|
||||
"version": "3.8.0",
|
||||
"hash": "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp",
|
||||
"version": "3.8.0",
|
||||
"hash": "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp.Scripting",
|
||||
"version": "3.8.0",
|
||||
"hash": "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Scripting.Common",
|
||||
"version": "3.8.0",
|
||||
"hash": "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CSharp",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="
|
||||
"pname": "Microsoft.Extensions.Configuration.Binder",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Diagnostics",
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Http",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-PHLmTf8/qmhLO/8IdotsRCoIA2cczhefgw7gOf8Iy6Q="
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w="
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "2.1.2",
|
||||
"hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Targets",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.SystemEvents",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Collections",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Globalization",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.IO",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Reflection",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Reflection.Extensions",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Reflection.Primitives",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Resources.ResourceManager",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Runtime",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Runtime.Handles",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Runtime.InteropServices",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Text.Encoding",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Threading.Tasks",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.native.System",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.unix.System.Diagnostics.Debug",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.unix.System.Private.Uri",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.unix.System.Runtime.Extensions",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
|
||||
"pname": "ObservableCollections",
|
||||
"version": "3.3.3",
|
||||
"hash": "sha256-HH/xNIVQpvlWONL8RChuaeW2l6zC47Xx/JNSE5/JRR4="
|
||||
},
|
||||
{
|
||||
"pname": "SharpCompress",
|
||||
"version": "0.33.0",
|
||||
"hash": "sha256-6UWirVcwUai816UZ9J5P3dYMvJLl7K1Puvf5uaWDJMk="
|
||||
"version": "0.39.0",
|
||||
"hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
"version": "2.88.6",
|
||||
"hash": "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Linux",
|
||||
"version": "2.88.6",
|
||||
"hash": "sha256-VjgGoi73tVvqO/UXmQb1w9ioAbFu2dxH8oHz1l5H4zE="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.macOS",
|
||||
"version": "2.88.6",
|
||||
"hash": "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.WebAssembly",
|
||||
"version": "2.88.6",
|
||||
"hash": "sha256-CIb9fHVgHwIa0R1WafKJ3+GqtDHHRgDohA3ayTHvlws="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Win32",
|
||||
"version": "2.88.6",
|
||||
"hash": "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections.Immutable",
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="
|
||||
},
|
||||
{
|
||||
"pname": "System.ComponentModel.Annotations",
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.Debug",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Drawing.Common",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Dynamic.Runtime",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="
|
||||
},
|
||||
{
|
||||
"pname": "System.Globalization",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
|
||||
"pname": "System.Buffers",
|
||||
"version": "4.6.0",
|
||||
"hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="
|
||||
},
|
||||
{
|
||||
"pname": "System.Linq",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
|
||||
},
|
||||
{
|
||||
"pname": "System.Linq.Expressions",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.4",
|
||||
"hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
|
||||
},
|
||||
{
|
||||
"pname": "System.ObjectModel",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
|
||||
},
|
||||
{
|
||||
"pname": "System.Private.Uri",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Emit",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Emit.ILGeneration",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Emit.Lightweight",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Extensions",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Metadata",
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Primitives",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.TypeExtensions",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
|
||||
},
|
||||
{
|
||||
"pname": "System.Resources.ResourceManager",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "4.7.1",
|
||||
"hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.Extensions",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.Handles",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.InteropServices",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding.CodePages",
|
||||
"version": "4.5.1",
|
||||
"hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading.Tasks",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading.Tasks.Extensions",
|
||||
"version": "4.5.4",
|
||||
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus.Protocol",
|
||||
"version": "0.15.0",
|
||||
"hash": "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="
|
||||
"version": "0.20.0",
|
||||
"hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
|
||||
},
|
||||
{
|
||||
"pname": "WindowsShortcutFactory",
|
||||
"version": "1.2.0",
|
||||
"hash": "sha256-TScGgF++Av8QRSanZ3bIPhYaUEv6RQyAET3NvbKDxWQ="
|
||||
},
|
||||
{
|
||||
"pname": "ZstdSharp.Port",
|
||||
"version": "0.8.4",
|
||||
"hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo="
|
||||
}
|
||||
]
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "knossosnet";
|
||||
version = "1.2.4";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KnossosNET";
|
||||
repo = "Knossos.NET";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vlSiM6kskV4wfBZF7Rv5ICyqKG0Zhz/iU8kflYOaf0U=";
|
||||
hash = "sha256-XaCBuZ4Hf2ISw3hVQ1s2Hp8PLxp2eFr+I7U5ttUDQvU=";
|
||||
};
|
||||
|
||||
patches = [ ./dotnet-8-upgrade.patch ];
|
||||
|
||||
@@ -42,14 +42,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "9.2.3";
|
||||
version = "9.3.0";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-KcA1zXynt5nqnQq32Y3/5TXUYbOx6LubJJ1+KT7Fo2Q=";
|
||||
hash = "sha256-9rbkmPFt3BLehnkYAoktfO4AHq1C0wzGPJZm67KxbQs=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "monetdb";
|
||||
version = "11.51.7";
|
||||
version = "11.53.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-lWURVG+5NSWBTxXC5slYSedMZC1Z/HGfzZ43tR7z4dE=";
|
||||
hash = "sha256-8q8Q3b7D6BR+UMmcu4T5y+Xtwmr1URHc0Cq97tfDD6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
$out/bin/Mz.py \
|
||||
$out/bin/Mtest.py \
|
||||
$out/bin/sqlsample.pl \
|
||||
$out/bin/malsample.pl \
|
||||
$out/bin/Mconvert.py
|
||||
$out/bin/malsample.pl
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) monetdb; };
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "multiqc";
|
||||
version = "1.26";
|
||||
version = "1.28";
|
||||
|
||||
# Two data sources. One for the code, another for the test data
|
||||
srcs = [
|
||||
@@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "MultiQC";
|
||||
repo = "MultiQC";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MPAw6gG/3LzdskkDXOTDEM1NpG0sH9GvklYFQ1ZXWIs=";
|
||||
hash = "sha256-rYZaecoVAO1RE44XCw60aVwvWhKcZ/RrG3WpVRcLbuA=";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "MultiQC";
|
||||
repo = "test-data";
|
||||
rev = "67435083a8bfa228dca3dda7d835facef15fc2c7";
|
||||
hash = "sha256-oYmPIJSy6dOKPcMr3B4foGoWcerA29x0XeGoU4dSYsA=";
|
||||
rev = "d775b73c106d48726653f2fd02e473b7acbd93d8";
|
||||
hash = "sha256-uxBpMx22gWJmnbF9tVuVIdYdiqUh7n51swzu5hnfZQ0=";
|
||||
name = "test-data";
|
||||
})
|
||||
];
|
||||
@@ -53,6 +53,8 @@ python3Packages.buildPythonApplication rec {
|
||||
pydantic
|
||||
typeguard
|
||||
tqdm
|
||||
python-dotenv
|
||||
jsonschema
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
|
||||
@@ -6,29 +6,25 @@
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nezha-agent";
|
||||
version = "1.10.0";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "agent";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Pmfq9yk78mesxSzg7YdrL8KjHL6vRHPrAuNM7StRmus=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-j0GIfte5z7uyhsnWqsRexWZHJxnqf1cFl1Hq4jnONAo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g7F/kkA9BXJj8oTFt0IrvloOyGNIE//tQg+ND7aJokg=";
|
||||
vendorHash = "sha256-+0goz1TpHcNd0T45mRc0QornXdHFPy5Y+uH0aOiql+A=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X github.com/nezhahq/agent/pkg/monitor.Version=${version}"
|
||||
"-X github.com/nezhahq/agent/pkg/monitor.Version=${finalAttrs.version}"
|
||||
"-X main.arch=${stdenv.hostPlatform.system}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
go generate ./...
|
||||
'';
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
# Skip tests that require network access
|
||||
@@ -69,4 +65,4 @@ buildGoModule rec {
|
||||
maintainers = with lib.maintainers; [ moraxyc ];
|
||||
mainProgram = "nezha-agent";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -37,13 +37,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openomf";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omf2097";
|
||||
repo = "openomf";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-c4J/MqVO65+F4rfd8w+J+42jNWROByB1hdAHarwAIVY=";
|
||||
hash = "sha256-vp/aiKFAWiBb8pxjivB54fr84CLW9vaBa1U8Ye/cF4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -199,6 +199,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
# Generate translation files
|
||||
postBuild = "( cd .. && ./run_gettext.sh )";
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix LD_LIBRARY_PATH : "$out/lib:${
|
||||
|
||||
@@ -8,19 +8,19 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pixi-pack";
|
||||
version = "0.5.0";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Quantco";
|
||||
repo = "pixi-pack";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-th7hlxjnar9VoWINpxblzUGbxxz8hPKmLERd1y+mHKY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ccKJtGKhfYiJm8/2yOlCZtRECvax1dTgtNOtabzfhI4=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-AEqhJWztOI4byViex4d0m85wBlGGYMykPNjgUfPAt6Q=";
|
||||
cargoHash = "sha256-+rwG9lPK0Ec7CCtVccwGrFOqfZqeXNA3WsN1QivABQA=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -43,11 +43,11 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Pack and unpack conda environments created with pixi";
|
||||
homepage = "https://github.com/Quantco/pixi-pack";
|
||||
changelog = "https://github.com/Quantco/pixi-pack/releases/tag/v${version}";
|
||||
changelog = "https://github.com/Quantco/pixi-pack/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
xiaoxiangmoe
|
||||
];
|
||||
mainProgram = "pixi-pack";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
}:
|
||||
haskellPackages.mkDerivation rec {
|
||||
pname = "pshash";
|
||||
version = "0.1.14.6";
|
||||
version = "0.1.15.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "thornoar";
|
||||
repo = "pshash";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gqIdfIC8f9aF4ojHBhKOTvIr34kuTGQ5R/q1D+0c4bA=";
|
||||
hash = "sha256-i3jDt9ghA21OkkKjBk5a7Xok+ESskMPNA8WP+MUZxVk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -15,17 +15,18 @@
|
||||
nix-update-script,
|
||||
moreutils,
|
||||
jq,
|
||||
gst_all_1,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "readest";
|
||||
version = "0.9.38";
|
||||
version = "0.9.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "readest";
|
||||
repo = "readest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lr1bLNm68jeCjllVWpM07fkRy/PY1C3Ud8XMUQwIef4=";
|
||||
hash = "sha256-GpdlxDwjWveFvkGP2pju5cMlXPbjOOxEIdmpxz6RNTw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -78,6 +79,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
gtk3
|
||||
librsvg
|
||||
openssl
|
||||
# TTS
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "regolith";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bedrock-OSS";
|
||||
repo = "regolith";
|
||||
tag = version;
|
||||
hash = "sha256-gTEQ2hu581tD1I/3iLHzE/2nekAG49/M6V6QeqPhYsA=";
|
||||
hash = "sha256-ZAOQluoeE6c32ETtikBPoDppk1RpuSVjh9p42fT5W48=";
|
||||
};
|
||||
|
||||
# Requires network access.
|
||||
|
||||
@@ -16,23 +16,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdl3-ttf";
|
||||
version = "3.2.0";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "SDL_ttf";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-eq7yWw7PWIeXWjuNHaQUiV+x0qng4FJNscsYRALK40I=";
|
||||
hash = "sha256-g7LfLxs7yr7bezQWPWn8arNuPxCfYLCO4kzXmLRUUSY=";
|
||||
};
|
||||
|
||||
# fix CMake path handling (remove on next update)
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libsdl-org/SDL_ttf/commit/ad2ffa825d4535ddfb57861a7e33dff4a9bc6a94.patch?full_index=1";
|
||||
hash = "sha256-emf7UnfB6Rl1+R74lsoIvm9ezDZtjHUS/t4k/RxbaYg=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "snowflake-cli";
|
||||
version = "3.5.0";
|
||||
version = "3.7.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snowflakedb";
|
||||
repo = "snowflake-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iEvgvz6EBPzfOLe60QQi1S3FIyFWYFVn8slWEpIusAI=";
|
||||
hash = "sha256-UhxjyXG2FQFhzhGjnmWSZr1LiW2/RHFvIAbvJP0I7oc=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -49,6 +49,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pytest-randomly
|
||||
pytest-factoryboy
|
||||
pytest-xdist
|
||||
pytest-httpserver
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
rec {
|
||||
version = "0.16.0-dev.1";
|
||||
version = "0.16.0-dev.2";
|
||||
tag = version;
|
||||
hash = "sha256-fW8ntGSK6MX6shXqnKxLD52vDovFol+/tZtr0Hw5Btc=";
|
||||
cargoHash = "sha256-1pcDM7VUVqigBeJ+loEUEOOPlggOsYir/Dge663UtSQ=";
|
||||
hash = "sha256-ZCyK6wqFRcKBGo1dgmN9pkvixkLev/STQg7HcrHfG0c=";
|
||||
cargoHash = "sha256-zqhVwg9+iqjrK2cCGaT4QIN+6CUKZ5ecogA1Oqd8OqQ=";
|
||||
updateScript = ./update-unstable.sh;
|
||||
}
|
||||
|
||||
@@ -21,10 +21,7 @@ buildGoModule rec {
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
"-X github.com/prometheus/common/version.Branch=master"
|
||||
"-X github.com/prometheus/common/version.BuildDate=unknown"
|
||||
"-X github.com/prometheus/common/version.Revision=${src.rev}"
|
||||
"-X github.com/prometheus/common/version.Version=${version}-0"
|
||||
"-X golift.io/version.Version=${version}"
|
||||
];
|
||||
|
||||
passthru.tests = { inherit (nixosTests.prometheus-exporters) unpoller; };
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
import ./common-hadrian.nix {
|
||||
version = "9.10.2";
|
||||
sha256 = "55fd40a005575ac6b33ea928beda81e8c56ffea354b6ac474ee9f9911f23a8de";
|
||||
}
|
||||
@@ -201,6 +201,7 @@
|
||||
lib.versionOlder version "9.11"
|
||||
&& !(lib.versionAtLeast version "9.6.7" && lib.versionOlder version "9.8")
|
||||
&& !(lib.versionAtLeast version "9.8.4" && lib.versionOlder version "9.9")
|
||||
&& !(lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.11")
|
||||
)
|
||||
[
|
||||
# Determine size of time related types using hsc2hs instead of assuming CLong.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
mkDerivation,
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
extra-cmake-modules,
|
||||
doxygen,
|
||||
graphviz,
|
||||
@@ -12,21 +12,26 @@
|
||||
plasma-framework,
|
||||
knewstuff,
|
||||
kpackage,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alkimia";
|
||||
version = "8.1.2";
|
||||
version = "8.1.95";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-z4Ru6HucxjD1jgvdIzNCloELo7zBdR/i9HIhYYl+4zo=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "office";
|
||||
repo = "alkimia";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nvaPdEgjunDUQeIDYnBQaC8SB+W/aUg6HxUDl9G127g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
doxygen
|
||||
graphviz
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
# qtwebengine is not a mandatory dependency, but it adds some features
|
||||
@@ -40,6 +45,7 @@ mkDerivation rec {
|
||||
knewstuff
|
||||
kpackage
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ mpir ];
|
||||
|
||||
meta = {
|
||||
@@ -55,4 +61,4 @@ mkDerivation rec {
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = qtbase.meta.platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -39,14 +39,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-cpp-python";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abetlen";
|
||||
repo = "llama-cpp-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-F1E1c2S1iIL3HX/Sot/uIIrOWvfPU1dCrHx14A1Jn9E=";
|
||||
hash = "sha256-iw9teWZ612gUNM2Zm5WGdFTq7aNo8QRRIGeHoFpXdfQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
# src = /home/gaetan/llama-cpp-python;
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rns";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markqvist";
|
||||
repo = "Reticulum";
|
||||
tag = version;
|
||||
hash = "sha256-Z6Af/PNQkbo+0xn0kEh2I8T03D/gQpuRNHBhLX3mkms=";
|
||||
hash = "sha256-jpmh7emJa9qy5Ge2sYgxSz2wYECG6POIEVo4hkAZI+8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -391,11 +391,36 @@ in
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
|
||||
llvmPackages = pkgs.llvmPackages_15;
|
||||
};
|
||||
ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix {
|
||||
bootPkgs =
|
||||
# For GHC 9.6 no armv7l bindists are available.
|
||||
if stdenv.buildPlatform.isAarch32 then
|
||||
bb.packages.ghc963
|
||||
else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then
|
||||
bb.packages.ghc963
|
||||
else if stdenv.buildPlatform.isDarwin then
|
||||
# it seems like the GHC 9.6.* bindists are built with a different
|
||||
# toolchain than we are using (which I'm guessing from the fact
|
||||
# that 9.6.4 bindists pass linker flags our ld doesn't support).
|
||||
# With both 9.6.3 and 9.6.4 binary it is impossible to link against
|
||||
# the clock package (probably a hsc2hs problem).
|
||||
bb.packages.ghc963
|
||||
else
|
||||
bb.packages.ghc963Binary;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
# Need to use apple's patched xattr until
|
||||
# https://github.com/xattr/xattr/issues/44 and
|
||||
# https://github.com/xattr/xattr/issues/55 are solved.
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
# 2023-01-15: Support range >= 11 && < 16
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
|
||||
llvmPackages = pkgs.llvmPackages_15;
|
||||
};
|
||||
ghc910 = compiler.ghc9101;
|
||||
ghc9121 = callPackage ../development/compilers/ghc/9.12.1.nix {
|
||||
bootPkgs =
|
||||
# No suitable bindist packaged yet
|
||||
bb.packages.ghc9101;
|
||||
bb.packages.ghc9102;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
# Need to use apple's patched xattr until
|
||||
# https://github.com/xattr/xattr/issues/44 and
|
||||
@@ -408,7 +433,7 @@ in
|
||||
ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {
|
||||
bootPkgs =
|
||||
# No suitable bindist packaged yet
|
||||
bb.packages.ghc9101;
|
||||
bb.packages.ghc9102;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
# Need to use apple's patched xattr until
|
||||
# https://github.com/xattr/xattr/issues/44 and
|
||||
@@ -595,6 +620,11 @@ in
|
||||
ghc = bh.compiler.ghc9101;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
|
||||
};
|
||||
ghc9102 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc9102;
|
||||
ghc = bh.compiler.ghc9102;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
|
||||
};
|
||||
ghc910 = packages.ghc9101;
|
||||
ghc9121 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc9121;
|
||||
|
||||
@@ -78,6 +78,7 @@ let
|
||||
ghc983
|
||||
ghc984
|
||||
ghc9101
|
||||
ghc9102
|
||||
# exclude ghc9121 due to severe miscompilation bug
|
||||
ghc9122
|
||||
];
|
||||
@@ -590,6 +591,7 @@ let
|
||||
hlint = lib.subtractLists [
|
||||
compilerNames.ghc902
|
||||
compilerNames.ghc9101
|
||||
compilerNames.ghc9102
|
||||
compilerNames.ghc9122
|
||||
] released;
|
||||
hpack = released;
|
||||
@@ -623,6 +625,7 @@ let
|
||||
];
|
||||
weeder = lib.subtractLists [
|
||||
compilerNames.ghc9101
|
||||
compilerNames.ghc9102
|
||||
compilerNames.ghc9122
|
||||
] released;
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user