Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -3402,16 +3402,6 @@
|
||||
githubId = 5949913;
|
||||
name = "Carlos Fernandez Sanz";
|
||||
};
|
||||
cge = {
|
||||
email = "cevans@evanslabs.org";
|
||||
github = "cgevans";
|
||||
githubId = 2054509;
|
||||
name = "Constantine Evans";
|
||||
keys = [
|
||||
{ fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9"; }
|
||||
{ fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD"; }
|
||||
];
|
||||
};
|
||||
Ch1keen = {
|
||||
email = "gihoong7@gmail.com";
|
||||
github = "Ch1keen";
|
||||
@@ -14537,6 +14527,11 @@
|
||||
github = "dev-nis";
|
||||
githubId = 132921300;
|
||||
};
|
||||
nishimara = {
|
||||
name = "nishimara";
|
||||
github = "Nishimara";
|
||||
githubId = 59232119;
|
||||
};
|
||||
nitsky = {
|
||||
name = "nitsky";
|
||||
github = "nitsky";
|
||||
@@ -18363,6 +18358,12 @@
|
||||
githubId = 1151264;
|
||||
name = "Sebastian Graf";
|
||||
};
|
||||
shackra = {
|
||||
name = "Jorge Javier Araya Navarro";
|
||||
email = "jorge@esavara.cr";
|
||||
github = "shackra";
|
||||
githubId = 1055216;
|
||||
};
|
||||
shadaj = {
|
||||
github = "shadaj";
|
||||
githubId = 543055;
|
||||
|
||||
@@ -22,6 +22,8 @@ let
|
||||
'';
|
||||
|
||||
systemdBootBuilder = pkgs.substituteAll rec {
|
||||
name = "systemd-boot";
|
||||
|
||||
src = checkedSource;
|
||||
|
||||
isExecutable = true;
|
||||
|
||||
@@ -687,7 +687,9 @@ in {
|
||||
ocis = handleTest ./ocis.nix {};
|
||||
oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix {};
|
||||
oh-my-zsh = handleTest ./oh-my-zsh.nix {};
|
||||
ollama = handleTest ./ollama.nix {};
|
||||
ollama = runTest ./ollama.nix;
|
||||
ollama-cuda = runTestOn ["x86_64-linux" "aarch64-linux"] ./ollama-cuda.nix;
|
||||
ollama-rocm = runTestOn ["x86_64-linux" "aarch64-linux"] ./ollama-rocm.nix;
|
||||
ombi = handleTest ./ombi.nix {};
|
||||
openarena = handleTest ./openarena.nix {};
|
||||
openldap = handleTest ./openldap.nix {};
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "ollama-cuda";
|
||||
meta.maintainers = with lib.maintainers; [ abysssol ];
|
||||
|
||||
nodes.cuda =
|
||||
{ ... }:
|
||||
{
|
||||
services.ollama.enable = true;
|
||||
services.ollama.acceleration = "cuda";
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
cuda.wait_for_unit("multi-user.target")
|
||||
cuda.wait_for_open_port(11434)
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "ollama-rocm";
|
||||
meta.maintainers = with lib.maintainers; [ abysssol ];
|
||||
|
||||
nodes.rocm =
|
||||
{ ... }:
|
||||
{
|
||||
services.ollama.enable = true;
|
||||
services.ollama.acceleration = "rocm";
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
rocm.wait_for_unit("multi-user.target")
|
||||
rocm.wait_for_open_port(11434)
|
||||
'';
|
||||
}
|
||||
+38
-41
@@ -1,56 +1,53 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
{ lib, ... }:
|
||||
let
|
||||
mainPort = 11434;
|
||||
altPort = 11435;
|
||||
|
||||
curlRequest = port: request:
|
||||
"curl http://127.0.0.1:${toString port}/api/generate -d '${builtins.toJSON request}'";
|
||||
|
||||
prompt = {
|
||||
model = "tinydolphin";
|
||||
prompt = "lorem ipsum";
|
||||
options = {
|
||||
seed = 69;
|
||||
temperature = 0;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "ollama";
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ abysssol ];
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; [ abysssol ];
|
||||
|
||||
nodes = {
|
||||
cpu = { ... }: {
|
||||
services.ollama.enable = true;
|
||||
};
|
||||
cpu =
|
||||
{ ... }:
|
||||
{
|
||||
services.ollama.enable = true;
|
||||
};
|
||||
|
||||
rocm = { ... }: {
|
||||
services.ollama.enable = true;
|
||||
services.ollama.acceleration = "rocm";
|
||||
};
|
||||
|
||||
cuda = { ... }: {
|
||||
services.ollama.enable = true;
|
||||
services.ollama.acceleration = "cuda";
|
||||
};
|
||||
|
||||
altAddress = { ... }: {
|
||||
services.ollama.enable = true;
|
||||
services.ollama.port = altPort;
|
||||
};
|
||||
altAddress =
|
||||
{ ... }:
|
||||
{
|
||||
services.ollama.enable = true;
|
||||
services.ollama.port = altPort;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
vms = [ cpu, rocm, cuda, altAddress ];
|
||||
import json
|
||||
|
||||
def curl_request_ollama(prompt, port):
|
||||
json_prompt = json.dumps(prompt)
|
||||
return f"""curl http://127.0.0.1:{port}/api/generate -d '{json_prompt}'"""
|
||||
|
||||
prompt = {
|
||||
"model": "tinydolphin",
|
||||
"prompt": "lorem ipsum",
|
||||
"options": {
|
||||
"seed": 69,
|
||||
"temperature": 0,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
vms = [
|
||||
(cpu, ${toString mainPort}),
|
||||
(altAddress, ${toString altPort}),
|
||||
]
|
||||
|
||||
start_all()
|
||||
for vm in vms:
|
||||
vm.wait_for_unit("multi-user.target")
|
||||
|
||||
stdout = cpu.succeed("""${curlRequest mainPort prompt}""", timeout=100)
|
||||
|
||||
stdout = altAddress.succeed("""${curlRequest altPort prompt}""", timeout=100)
|
||||
for (vm, port) in vms:
|
||||
vm.wait_for_unit("multi-user.target")
|
||||
vm.wait_for_open_port(port)
|
||||
stdout = vm.succeed(curl_request_ollama(prompt, port), timeout = 100)
|
||||
'';
|
||||
})
|
||||
}
|
||||
|
||||
@@ -406,8 +406,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-neovim";
|
||||
publisher = "asvetliakov";
|
||||
version = "1.17.2";
|
||||
hash = "sha256-IA09vUleY7hazu65kadES4iq3XojyJ3sXOOGaw0vJnU=";
|
||||
version = "1.18.4";
|
||||
hash = "sha256-mTmfIEXObDWi82z+59JaCjUDqFd9nOO/6QDtlHGuVvk=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
|
||||
@@ -1644,8 +1644,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "elixir-ls";
|
||||
publisher = "JakeBecker";
|
||||
version = "0.22.0";
|
||||
hash = "sha256-pus5rOyVgheiblvWrkM3H/GZifBzUGR++JiHN4aU/3I=";
|
||||
version = "0.22.1";
|
||||
hash = "sha256-zi+Rcy63AUqDnVZCbPuljs+aBHsyOTHgbiJ+h9dB9us=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
|
||||
|
||||
@@ -18,8 +18,7 @@
|
||||
cudaSupport ? config.cudaSupport,
|
||||
dbus,
|
||||
embree,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
fetchgit,
|
||||
fetchzip,
|
||||
ffmpeg,
|
||||
fftw,
|
||||
@@ -55,7 +54,6 @@
|
||||
llvmPackages,
|
||||
makeWrapper,
|
||||
mesa,
|
||||
ocl-icd,
|
||||
openal,
|
||||
opencollada,
|
||||
opencolorio,
|
||||
@@ -102,41 +100,46 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "blender";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-T7s69k0/hN9ccQN0hFQibBiFwawu1Tc9DOoegOgsCEg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./draco.patch
|
||||
(fetchpatch {
|
||||
url = "https://projects.blender.org/blender/blender/commit/ae35b5758791bebb21741f9b505b9fca347ae50e.patch";
|
||||
hash = "sha256-xUi55+7aiwEjtjqOi8to1YxdPlsBUThCCkCa5T6LIQc=";
|
||||
srcs = [
|
||||
(fetchzip {
|
||||
name = "source";
|
||||
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-STG4IuEhkdA+sDPIpCAkSflyd3rSUZ9ZCS9PdB4vyTY=";
|
||||
})
|
||||
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
(fetchgit {
|
||||
name = "assets";
|
||||
url = "https://projects.blender.org/blender/blender-assets.git";
|
||||
rev = "6864f1832e71a31e1e04f72bb7a5a1f53f0cd01c";
|
||||
fetchLFS = true;
|
||||
hash = "sha256-vepK0inPMuleAJBSipwoI99nMBBiFaK/eSMHDetEtjY=";
|
||||
})
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
chmod -R u+w *
|
||||
rm -r assets/working
|
||||
mv assets --target-directory source/release/datafiles/
|
||||
'';
|
||||
|
||||
sourceRoot = "source";
|
||||
|
||||
patches = [ ./draco.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
postPatch =
|
||||
(
|
||||
if stdenv.isDarwin then
|
||||
''
|
||||
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
||||
substituteInPlace source/creator/CMakeLists.txt \
|
||||
--replace-fail '${"$"}{LIBDIR}/python' \
|
||||
'${python3}' \
|
||||
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
|
||||
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlidec.dylib'
|
||||
''
|
||||
else
|
||||
''
|
||||
substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
|
||||
''
|
||||
)
|
||||
(lib.optionalString stdenv.isDarwin ''
|
||||
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
||||
substituteInPlace source/creator/CMakeLists.txt \
|
||||
--replace-fail '${"$"}{LIBDIR}/python' \
|
||||
'${python3}' \
|
||||
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
|
||||
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlidec.dylib'
|
||||
'')
|
||||
+ (lib.optionalString hipSupport ''
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
|
||||
@@ -375,7 +378,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
PYTHON
|
||||
|
||||
mkdir $out
|
||||
for engine in BLENDER_EEVEE CYCLES; do
|
||||
for engine in BLENDER_EEVEE_NEXT CYCLES; do
|
||||
echo "Rendering with $engine..."
|
||||
# Beware that argument order matters
|
||||
${lib.getExe finalAttrs.finalPackage} \
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
# enable boost for cycles, audaspace or i18n
|
||||
# otherwise if the user disabled
|
||||
|
||||
--- a/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
|
||||
+++ b/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
|
||||
--- a/scripts/addons_core/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
|
||||
+++ b/scripts/addons_core/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
|
||||
@@ -17,7 +17,7 @@ def dll_path() -> Path:
|
||||
"""
|
||||
lib_name = 'extern_draco'
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "127.0.2651.31";
|
||||
version = "127.0.2651.49";
|
||||
revision = "1";
|
||||
hash = "sha256-SERogsWM4mtIEVAVtwaRu2VOjK012yWBb2FygDfKO80=";
|
||||
hash = "sha256-fMB7CuC5u8RNbbtFEZWFIIBwZTPkTP9LVs7DCXltGEA=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
@@ -13,8 +13,8 @@
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "126.0.2592.87";
|
||||
version = "126.0.2592.102";
|
||||
revision = "1";
|
||||
hash = "sha256-ntcewiAc/hDUF9wiURCXm8TxqatvEPXaTUn8kblzK0o=";
|
||||
hash = "sha256-xCjtsZoetxlOV77VSbt09cGbpfHUYhTA6WXuZAvD/a4=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.11.4";
|
||||
version = "2.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G7kJrFyAsaAWXKn2Nya66unkYlU3EU1ZDbdXpC8aR+k=";
|
||||
hash = "sha256-0Td4TMi9HTvf+GeW2f/ufRW0Y3KBrBSDWhgPW4noXi4=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-IDnOB3GxWKeA/N4Mr+qQh9sJgYsWK38F2yw6jDuHY30=";
|
||||
vendorHash = "sha256-y6B//zal2OyzZ1slC+x3vxHasFTM+xD+/6Sd2AFHFgY=";
|
||||
|
||||
# Set target as ./cmd per cli-local
|
||||
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.87";
|
||||
version = "1.0.88";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9uoh0rdBgIONqiGwak9Hvrf3davqcvuB6KbhmyU16fk=";
|
||||
sha256 = "sha256-fPCafa0V5lbzXocUa1gabLxAcPbg8rqOExMT0QnGUk8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bEyknQc7TCxbWj7VsjJ2WGz65BG8HaP8ldL2kb+bbtc=";
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TVRWcgBt6MmHOh3LYSjJtp5qf/+ar+LWDGfHKQhDFZ8=";
|
||||
hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-30fMLczb4+BVSxZSbhQ2S1MrQ2+Ykyqf+Dio8n0LGE0=";
|
||||
vendorHash = "sha256-8UIey+r1tdVRN1RBK5xxcAzaHb0VFdgenUXSFgoWh1g=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "discordo";
|
||||
version = "0-unstable-2024-04-27";
|
||||
version = "0-unstable-2024-07-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = pname;
|
||||
rev = "d76a7db668900a7fc41ead7db194e20f126071ac";
|
||||
hash = "sha256-uEMz7n0IFTGK1fZC1/vuwJpyySGdTUIMUjunCmycnzM=";
|
||||
rev = "31905f3e790e63cd0f2366526afe41fb278c226e";
|
||||
hash = "sha256-IhGZGHV/A1m653WlVCwxtb9OZbMolQ3GHOr2fXehjNk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hSrGN3NHPpp5601l4KcmNHVYOGWfLjFeWWr9g11nM3I=";
|
||||
vendorHash = "sha256-5ZsvoIDwxZCGkMRxlCyp2Iv6fcvvpmzG+krz3MZSiTM=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocketchat-desktop";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
|
||||
hash = "sha256-ryfYaePwL4W6x8sKlxACadLUvXEqyqJ0enlSnmVmpUo=";
|
||||
hash = "sha256-GWU2qGeQB8bou0+Ja6Cs4bQM1stAL+dlKC3QNTA0EIY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appflowy";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-u8Y676sBLDI57z7Zpe72ELaibe83EFwB0oq+ondRIcU=";
|
||||
hash = "sha256-PVlHPjr6aUkTp9x4MVC8cgebmdaUQXX6eV0/LfAmiJc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -562,6 +562,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
passthru = {
|
||||
inherit srcs;
|
||||
jdk = jre';
|
||||
python = python311; # for unoconv
|
||||
updateScript = [
|
||||
./update.sh
|
||||
# Pass it this file name as argument
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
, useChineseVersion ? false
|
||||
}:
|
||||
let
|
||||
pkgVersion = "11.1.0.11719";
|
||||
pkgVersion = "11.1.0.11720";
|
||||
url =
|
||||
if useChineseVersion then
|
||||
"https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}_amd64.deb"
|
||||
@@ -31,9 +31,9 @@ let
|
||||
"https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}.XA_amd64.deb";
|
||||
hash =
|
||||
if useChineseVersion then
|
||||
"sha256-LgE5du2ZnMsAqgoQkY63HWyWYA5TLS5I8ArRYrpxffs="
|
||||
"sha256-wf0zgFrhqHXV68Qsa20X8FbMA83XeYr/dSCBg1IjVlg="
|
||||
else
|
||||
"sha256-6fXzHSMzZDGuBubOXsHA0YEUGKcy5QIPg3noyxUbdjA=";
|
||||
"sha256-MvJ5XQx9fmNIFKvzSEbu1BAdxiASJ6HR+qsDFLm53dU=";
|
||||
uri = builtins.replaceStrings [ "https://wps-linux-personal.wpscdn.cn" ] [ "" ] url;
|
||||
securityKey = "7f8faaaa468174dc1c9cd62e5f218a5b";
|
||||
in
|
||||
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = [ lib.maintainers.cge ];
|
||||
maintainers = [ ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
|
||||
@@ -1,34 +1,28 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, obs-studio }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
obs-studio,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-source-record";
|
||||
version = "0.3.2";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-source-record";
|
||||
rev = version;
|
||||
sha256 = "sha256-H65uQ9HnKmHs52v3spG92ayeYH/TvmwcMoePMmBMqN8=";
|
||||
sha256 = "sha256-VgG9Fn75aKTkth4TC9rhfj/HIOO2lIO4n3ZYmemkzx8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix obs 29.1 compatibility
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/exeldro/obs-source-record/pull/83.diff";
|
||||
hash = "sha256-eWOjHHfoXZeoPtqvVyexSi/UQqHm8nu4FEEjma64Ly4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
obs-studio
|
||||
];
|
||||
buildInputs = [ obs-studio ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_OUT_OF_TREE=On"
|
||||
];
|
||||
cmakeFlags = [ "-DBUILD_OUT_OF_TREE=On" ];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/{data,obs-plugins}
|
||||
@@ -37,7 +31,10 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "OBS Studio plugin to make sources available to record via a filter";
|
||||
homepage = "https://github.com/exeldro/obs-source-record";
|
||||
maintainers = with maintainers; [ robbins ];
|
||||
maintainers = with maintainers; [
|
||||
robbins
|
||||
shackra
|
||||
];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JaUCj9HY0MhHLkPTRd72NaGlBdPCPc+y2XjhVQ/3+NA=";
|
||||
hash = "sha256-pEPm4NtuJeoULmESIZfWVW4jzS1eC6hUb5/62Tjsv0I=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -319,7 +319,7 @@ rec {
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-fpjSnUq3T6WZO/FLeT377FWxwevbULob9dPiSBxZdHI=";
|
||||
mobyRev = "v${version}";
|
||||
mobyHash = "sha256-v5uhFQPbBIpfnKtAkmbq4w+TbaG01tqTSWNBE3NvPKU=";
|
||||
mobyHash = "sha256-xinRILDSuubAAJh/dmpaU3csTf0VgukJIfSUkcHpa28=";
|
||||
runcRev = "v1.1.13";
|
||||
runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8=";
|
||||
containerdRev = "v1.7.18";
|
||||
|
||||
@@ -31,6 +31,10 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
hardeningDisable = [
|
||||
"zerocallusedregs"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Dynamic real-time view of running eBPF programs";
|
||||
homepage = "https://github.com/Netflix/bpftop";
|
||||
|
||||
@@ -28,13 +28,13 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bruno";
|
||||
version = "1.20.4";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0YWkZdfthHpX4Duc0kP9/QBBTQk1Jx0Hrjd/aoRUIKU=";
|
||||
hash = "sha256-k8pRSAQpE//qH7XRjSTXmxundgK5dmOQTRKP9D2RUdY=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
@@ -158,7 +158,7 @@ buildNpmPackage' rec {
|
||||
homepage = "https://www.usebruno.com";
|
||||
inherit (electron.meta) platforms;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gepbird kashw2 lucasew mattpolzin water-sucks ];
|
||||
maintainers = with maintainers; [ gepbird kashw2 lucasew mattpolzin water-sucks redyf ];
|
||||
mainProgram = "bruno";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
let
|
||||
argset = {
|
||||
pname = "chezmoi";
|
||||
version = "2.50.0";
|
||||
version = "2.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${argset.version}";
|
||||
hash = "sha256-l1c55vItMIfPbcwVWnpx3mlzT75KRlbd8V8DzQoQB2w=";
|
||||
hash = "sha256-18y1AmCCoxu365bsLwUrPTUqT/Hy6e2WC2xt0o4K8/8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5jc7i+vX6aGq//Zl924FIdjAVyqlusZfWRbc8aj3iLw=";
|
||||
vendorHash = "sha256-wWvvNc7W+7/Hwy4/hwCyY0k/Qm5M7Z6PPCa9DXbXY0E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libusb1,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
let
|
||||
dediprogVersion = "1.14.20.x";
|
||||
dediprogHash = "sha256-hQvBZIwaWEC41vj2flaekIUP9Fwtj/JPi3XwRxfUbD0=";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dediprog-sf100-linux";
|
||||
version = finalAttrs.dediprogVersion;
|
||||
|
||||
inherit dediprogVersion dediprogHash;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DediProgSW";
|
||||
repo = "SF100Linux";
|
||||
rev = "V${finalAttrs.dediprogVersion}";
|
||||
hash = finalAttrs.dediprogHash;
|
||||
};
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
udevRules = pkgs.writeText "dediprog.rules" ''
|
||||
ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="dada", MODE="660", GROUP="plugdev"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm0755 ./dpcmd -t $out/bin
|
||||
install -Dm0644 ./ChipInfoDb.dedicfg -t $out/share/DediProg
|
||||
install -Dm0644 ${finalAttrs.udevRules} -D $out/lib/udev/rules.d/60-dediprog.rules
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/DediProgSW/SF100Linux";
|
||||
description = "Linux software for DediProg SF100/SF600 programmers";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ thillux ];
|
||||
};
|
||||
})
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "fantomas";
|
||||
version = "6.3.9";
|
||||
version = "6.3.10";
|
||||
|
||||
nugetHash = "sha256-XRPC5cXMoTJLLHe3f5A3+uXakbL+D7DlX0sA52KMZKw=";
|
||||
nugetHash = "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "F# source code formatter";
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-keyring";
|
||||
version = "46.1";
|
||||
version = "46.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-sdOukTL/L4s/JaGQeQiSlo49Cs+VKkh+QPZEqFUM4/Y=";
|
||||
hash = "sha256-vybJZriot/MoXsyLs+RnucIPlTW5TcRRycVZ3c/2GSU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,28 +1,45 @@
|
||||
diff --git a/time/chrono/+freebsd.ha b/time/chrono/+freebsd.ha
|
||||
index 26d78ab1..6861bfe8 100644
|
||||
index af49080e..3dde7963 100644
|
||||
--- a/time/chrono/+freebsd.ha
|
||||
+++ b/time/chrono/+freebsd.ha
|
||||
@@ -2,7 +2,7 @@
|
||||
@@ -2,8 +2,8 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
|
||||
def LOCALTIME_PATH: str = "/etc/localtime";
|
||||
-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/";
|
||||
+def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
-def TZDB_PATH: str = "/usr/share/zoneinfo/";
|
||||
+def TZDB_PATH: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI
|
||||
// leap second data.
|
||||
-export def UTC_LEAPSECS_PATH: str = "/var/db/ntpd.leap-seconds.list";
|
||||
+export def UTC_LEAPSECS_PATH: str = "@tzdata@/share/zoneinfo/leap-seconds.list";
|
||||
diff --git a/time/chrono/+linux.ha b/time/chrono/+linux.ha
|
||||
index 600f606c..8d5617e2 100644
|
||||
index 2756fd6f..1ea22385 100644
|
||||
--- a/time/chrono/+linux.ha
|
||||
+++ b/time/chrono/+linux.ha
|
||||
@@ -2,8 +2,8 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
|
||||
def LOCALTIME_PATH: str = "/etc/localtime";
|
||||
-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/";
|
||||
+def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
-def TZDB_PATH: str = "/usr/share/zoneinfo/";
|
||||
+def TZDB_PATH: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI
|
||||
// leap second data.
|
||||
-export def UTC_LEAPSECS_FILE: str = "/usr/share/zoneinfo/leap-seconds.list";
|
||||
+export def UTC_LEAPSECS_FILE: str = "@tzdata@/share/zoneinfo/leap-seconds.list";
|
||||
-export def UTC_LEAPSECS_PATH: str = "/usr/share/zoneinfo/leap-seconds.list";
|
||||
+export def UTC_LEAPSECS_PATH: str = "@tzdata@/share/zoneinfo/leap-seconds.list";
|
||||
diff --git a/time/chrono/+openbsd.ha b/time/chrono/+openbsd.ha
|
||||
index 2756fd6f..1ea22385 100644
|
||||
--- a/time/chrono/+openbsd.ha
|
||||
+++ b/time/chrono/+openbsd.ha
|
||||
@@ -2,8 +2,8 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
def LOCALTIME_PATH: str = "/etc/localtime";
|
||||
-def TZDB_PATH: str = "/usr/share/zoneinfo/";
|
||||
+def TZDB_PATH: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI
|
||||
// leap second data.
|
||||
-export def UTC_LEAPSECS_PATH: str = "/usr/share/zoneinfo/leap-seconds.list";
|
||||
+export def UTC_LEAPSECS_PATH: str = "@tzdata@/share/zoneinfo/leap-seconds.list";
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
diff --git a/cmd/hare/build.ha b/cmd/hare/build.ha
|
||||
index b2ac6518..417b46c6 100644
|
||||
index ce19af9e..8631b325 100644
|
||||
--- a/cmd/hare/build.ha
|
||||
+++ b/cmd/hare/build.ha
|
||||
@@ -37,7 +37,7 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
|
||||
@@ -36,7 +36,7 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
|
||||
case let ncpu: size =>
|
||||
yield ncpu;
|
||||
},
|
||||
- version = build::get_version(os::tryenv("HAREC", "harec"))?,
|
||||
+ version = build::get_version(os::tryenv("HAREC", "@harec@"))?,
|
||||
arch = arch.qbe_name,
|
||||
+ version = build::get_version(os::tryenv("HAREC", "@harec_bin@"))?,
|
||||
arch = arch,
|
||||
platform = build::get_platform(os::sysname())?,
|
||||
...
|
||||
@@ -145,8 +145,8 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
|
||||
@@ -143,8 +143,8 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
|
||||
set_arch_tags(&ctx.ctx.tags, arch);
|
||||
|
||||
ctx.cmds = ["",
|
||||
- os::tryenv("HAREC", "harec"),
|
||||
- os::tryenv("QBE", "qbe"),
|
||||
+ os::tryenv("HAREC", "@harec@"),
|
||||
+ os::tryenv("QBE", "@qbe@"),
|
||||
+ os::tryenv("HAREC", "@harec_bin@"),
|
||||
+ os::tryenv("QBE", "@qbe_bin@"),
|
||||
os::tryenv("AS", arch.as_cmd),
|
||||
os::tryenv("LD", arch.ld_cmd),
|
||||
];
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/mime/system.ha b/mime/system.ha
|
||||
index 73ff3496..42e7b640 100644
|
||||
--- a/mime/system.ha
|
||||
+++ b/mime/system.ha
|
||||
@@ -11,7 +11,7 @@ use strings;
|
||||
use types;
|
||||
|
||||
// Path to the system MIME database.
|
||||
-export def SYSTEM_DB: str = "/etc/mime.types";
|
||||
+export def SYSTEM_DB: str = "@mailcap@/etc/mime.types";
|
||||
|
||||
@init fn init() void = {
|
||||
// Done in a separate function so we can discard errors here
|
||||
@@ -0,0 +1,30 @@
|
||||
diff --git a/mime/+freebsd.ha b/mime/+freebsd.ha
|
||||
index e536d9bd..022f18c4 100644
|
||||
--- a/mime/+freebsd.ha
|
||||
+++ b/mime/+freebsd.ha
|
||||
@@ -2,4 +2,4 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
// Path to the system MIME database.
|
||||
-export def SYSTEM_DB: str = "/etc/mime.types";
|
||||
+export def SYSTEM_DB: str = "@mailcap@/etc/mime.types";
|
||||
diff --git a/mime/+linux.ha b/mime/+linux.ha
|
||||
index e536d9bd..022f18c4 100644
|
||||
--- a/mime/+linux.ha
|
||||
+++ b/mime/+linux.ha
|
||||
@@ -2,4 +2,4 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
// Path to the system MIME database.
|
||||
-export def SYSTEM_DB: str = "/etc/mime.types";
|
||||
+export def SYSTEM_DB: str = "@mailcap@/etc/mime.types";
|
||||
diff --git a/mime/+openbsd.ha b/mime/+openbsd.ha
|
||||
index 611b2dce..022f18c4 100644
|
||||
--- a/mime/+openbsd.ha
|
||||
+++ b/mime/+openbsd.ha
|
||||
@@ -2,4 +2,4 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
// Path to the system MIME database.
|
||||
-export def SYSTEM_DB: str = "/usr/share/misc/mime.types";
|
||||
+export def SYSTEM_DB: str = "@mailcap@/etc/mime.types";
|
||||
@@ -8,7 +8,6 @@
|
||||
tzdata,
|
||||
mailcap,
|
||||
substituteAll,
|
||||
fetchpatch,
|
||||
callPackage,
|
||||
enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit),
|
||||
pkgsCross,
|
||||
@@ -78,7 +77,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hare";
|
||||
version = "0.24.0";
|
||||
version = "0.24.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -89,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "~sircmpwn";
|
||||
repo = "hare";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-3T+BdNj+Th8QXrcsPMWlN9GBfuMF1ulneWHpDEtyBU8=";
|
||||
hash = "sha256-61lckI0F+Ez5LR/8g6ftS0W7Q/+EU/1flTDFleBg6pc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -98,28 +97,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = ./001-tzdata.patch;
|
||||
inherit tzdata;
|
||||
})
|
||||
# Use correct comment syntax for debug+riscv64.
|
||||
(fetchpatch {
|
||||
url = "https://git.sr.ht/~sircmpwn/hare/commit/80e45e4d931a6e90d999846b86471cac00d2a6d5.patch";
|
||||
hash = "sha256-S7nXpiO0tYnKpmpj+fLkolGeHb1TrmgKlMF0+j0qLPQ=";
|
||||
})
|
||||
# Don't build haredoc since it uses the build `hare` bin, which breaks
|
||||
# cross-compilation.
|
||||
./002-dont-build-haredoc.patch
|
||||
# Hardcode harec and qbe.
|
||||
(substituteAll {
|
||||
src = ./003-hardcode-qbe-and-harec.patch;
|
||||
harec = lib.getExe harec;
|
||||
qbe = lib.getExe qbe;
|
||||
})
|
||||
# Display toolchains when using `hare version -v`.
|
||||
(fetchpatch {
|
||||
url = "https://git.sr.ht/~sircmpwn/hare/commit/e35f2284774436f422e06f0e8d290b173ced1677.patch";
|
||||
hash = "sha256-A59bGO/9tOghV8/MomTxd8xRExkHVdoMom2d+HTfQGg=";
|
||||
harec_bin = lib.getExe harec;
|
||||
qbe_bin = lib.getExe qbe;
|
||||
})
|
||||
# Use mailcap `/etc/mime.types` for Hare's mime module
|
||||
(substituteAll {
|
||||
src = ./003-use-mailcap-for-mimetypes.patch;
|
||||
src = ./004-use-mailcap-for-mimetypes.patch;
|
||||
inherit mailcap;
|
||||
})
|
||||
];
|
||||
|
||||
@@ -18,13 +18,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "harec";
|
||||
version = "0.24.0";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "harec";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-NOfoCT/wKZ3CXYzXZq7plXcun+MXQicfzBOmetXN7Qs=";
|
||||
hash = "sha256-YCUBdPYr/44stW9k54QoUEhNkti6ULJkVBphx7xhmKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qbe ];
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2024-07-05";
|
||||
version = "0-unstable-2024-07-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "c514e862cd5705e51edb6fe8d01146fdeec661f2";
|
||||
hash = "sha256-1GHh1/WO+f42TXxb1WiZFMuepM7ITA9iT+6yJBbBNsY=";
|
||||
rev = "90ae324e2c56af10f20549ab72014804a3064c7f";
|
||||
hash = "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }:
|
||||
buildGoModule rec {
|
||||
pname = "immich-go";
|
||||
version = "0.19.1";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simulot";
|
||||
repo = "immich-go";
|
||||
rev = "${version}";
|
||||
hash = "sha256-IFNl6qlhXfrdNcHhgoqHZxcWPp8TSpSplirPxSqvjPA=";
|
||||
hash = "sha256-zQ3uH9i6doF343UGRnbRWxdiHNvEMyVrKOLpBQQhT8E=";
|
||||
|
||||
# Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
|
||||
# The intention here is to write the information into files in the `src`'s
|
||||
|
||||
+29
-20
@@ -1,19 +1,20 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, flutter313
|
||||
, makeDesktopItem
|
||||
, nixosTests
|
||||
, pkg-config
|
||||
, libayatana-appindicator
|
||||
, undmg
|
||||
, makeBinaryWrapper
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
flutter313,
|
||||
makeDesktopItem,
|
||||
nixosTests,
|
||||
pkg-config,
|
||||
libayatana-appindicator,
|
||||
undmg,
|
||||
makeBinaryWrapper,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "localsend";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
linux = flutter313.buildFlutterApplication rec {
|
||||
inherit pname version;
|
||||
@@ -22,7 +23,7 @@ let
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CO0uFcZnOfE31EZxRUpgtod3+1lyXPpbytHB45DEM98=";
|
||||
hash = "sha256-u/vPVuY2YX+LQGzqiohtaYcUu7lEmGkcsWDMBIaXKok=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/app";
|
||||
@@ -74,10 +75,13 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
|
||||
hash = "sha256-L7V48QoOA0cjx45n+9Xav/zzCzCsZB3TBip0WGusMXg=";
|
||||
hash = "sha256-45IV2rDaL5tAOLLqPrMHHHFJaiFqmDyTyro6RilI0Zo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg makeBinaryWrapper ];
|
||||
nativeBuildInputs = [
|
||||
undmg
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -89,7 +93,10 @@ let
|
||||
|
||||
meta = metaCommon // {
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "x86_64-darwin" "aarch64-darwin" ];
|
||||
platforms = [
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -98,9 +105,11 @@ let
|
||||
homepage = "https://localsend.org/";
|
||||
license = licenses.mit;
|
||||
mainProgram = "localsend";
|
||||
maintainers = with maintainers; [ sikmir linsui pandapip1 ];
|
||||
maintainers = with maintainers; [
|
||||
sikmir
|
||||
linsui
|
||||
pandapip1
|
||||
];
|
||||
};
|
||||
in
|
||||
if stdenv.isDarwin
|
||||
then darwin
|
||||
else linux
|
||||
if stdenv.isDarwin then darwin else linux
|
||||
+167
-158
@@ -40,25 +40,15 @@
|
||||
"source": "hosted",
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "archive",
|
||||
"sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.10"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "args",
|
||||
"sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
|
||||
"sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.2"
|
||||
"version": "2.5.0"
|
||||
},
|
||||
"async": {
|
||||
"dependency": "transitive",
|
||||
@@ -134,11 +124,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "build_runner",
|
||||
"sha256": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21",
|
||||
"sha256": "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.8"
|
||||
"version": "2.4.9"
|
||||
},
|
||||
"build_runner_core": {
|
||||
"dependency": "transitive",
|
||||
@@ -164,11 +154,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "built_value",
|
||||
"sha256": "fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e",
|
||||
"sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.9.1"
|
||||
"version": "8.9.2"
|
||||
},
|
||||
"characters": {
|
||||
"dependency": "transitive",
|
||||
@@ -190,16 +180,6 @@
|
||||
"source": "hosted",
|
||||
"version": "2.0.3"
|
||||
},
|
||||
"cli_util": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "cli_util",
|
||||
"sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.4.1"
|
||||
},
|
||||
"clock": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -269,16 +249,6 @@
|
||||
"source": "hosted",
|
||||
"version": "1.2.4"
|
||||
},
|
||||
"console": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "console",
|
||||
"sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.1.0"
|
||||
},
|
||||
"convert": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -333,31 +303,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "csv",
|
||||
"sha256": "63ed2871dd6471193dffc52c0e6c76fb86269c00244d244297abbb355c84a86e",
|
||||
"sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.1.1"
|
||||
"version": "6.0.0"
|
||||
},
|
||||
"dart_mappable": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "dart_mappable",
|
||||
"sha256": "7b6d38ae95f1ae8ffa65df9a5464f14b56c2de94699a035202ca4cd3a0ba249e",
|
||||
"sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.2.0"
|
||||
"version": "4.2.2"
|
||||
},
|
||||
"dart_mappable_builder": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "dart_mappable_builder",
|
||||
"sha256": "98c058f7e80a98ea42d357d888ed1648d96bedac8b16872b58fc7024faefcdfe",
|
||||
"sha256": "ab5cf9086862d3fceb9773e945b5f95cc5471a28c782a4fc451bd400a4e0c64e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.2.0"
|
||||
"version": "4.2.3"
|
||||
},
|
||||
"dart_style": {
|
||||
"dependency": "transitive",
|
||||
@@ -433,21 +403,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "dio",
|
||||
"sha256": "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8",
|
||||
"sha256": "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.4.1"
|
||||
"version": "5.4.3+1"
|
||||
},
|
||||
"dynamic_color": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "dynamic_color",
|
||||
"sha256": "a866f1f8947bfdaf674d7928e769eac7230388a2e7a2542824fad4bb5b87be3b",
|
||||
"sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.6.9"
|
||||
"version": "1.7.0"
|
||||
},
|
||||
"extended_image": {
|
||||
"dependency": "transitive",
|
||||
@@ -503,11 +473,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "file_picker",
|
||||
"sha256": "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6",
|
||||
"sha256": "d1d0ac3966b36dc3e66eeefb40280c17feb87fa2099c6e22e6a1fc959327bd03",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.1.1"
|
||||
"version": "8.0.0+1"
|
||||
},
|
||||
"file_selector": {
|
||||
"dependency": "direct main",
|
||||
@@ -523,11 +493,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "file_selector_android",
|
||||
"sha256": "1cd66575f063b689e041aec836905ba7be18d76c9f0634d0d75daec825f67095",
|
||||
"sha256": "57265ec9591e8fd8508f613544cde6f7d045731f6b09644057e49a4c9c672b7c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.0+7"
|
||||
"version": "0.5.1+1"
|
||||
},
|
||||
"file_selector_ios": {
|
||||
"dependency": "transitive",
|
||||
@@ -553,11 +523,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "file_selector_macos",
|
||||
"sha256": "b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6",
|
||||
"sha256": "f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.9.3+3"
|
||||
"version": "0.9.4"
|
||||
},
|
||||
"file_selector_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -619,21 +589,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_gen_core",
|
||||
"sha256": "8b4ff1d45d125e576e26ea99d15e0419bb3c45b53696e022880866b78bb6b830",
|
||||
"sha256": "d8e828ad015a8511624491b78ad8e3f86edb7993528b1613aefbb4ad95947795",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.3.2"
|
||||
"version": "5.6.0"
|
||||
},
|
||||
"flutter_gen_runner": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "flutter_gen_runner",
|
||||
"sha256": "fd197f8c657e79313d53d3934de602ebe604ba722a84c88ae3a43cd90428c67a",
|
||||
"sha256": "931b03f77c164df0a4815aac0efc619a6ac8ec4cada55025119fca4894dada90",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.3.2"
|
||||
"version": "5.6.0"
|
||||
},
|
||||
"flutter_lints": {
|
||||
"dependency": "direct dev",
|
||||
@@ -665,11 +635,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_plugin_android_lifecycle",
|
||||
"sha256": "b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da",
|
||||
"sha256": "592dc01a18961a51c24ae5d963b724b2b7fa4a95c100fe8eb6ca8a5a4732cadf",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.17"
|
||||
"version": "2.0.18"
|
||||
},
|
||||
"flutter_test": {
|
||||
"dependency": "transitive",
|
||||
@@ -703,16 +673,6 @@
|
||||
"source": "hosted",
|
||||
"version": "2.3.0"
|
||||
},
|
||||
"get_it": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "get_it",
|
||||
"sha256": "e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.6.7"
|
||||
},
|
||||
"glob": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -743,6 +703,16 @@
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"hashcodes": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "hashcodes",
|
||||
"sha256": "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"html": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -803,35 +773,25 @@
|
||||
"source": "hosted",
|
||||
"version": "4.0.2"
|
||||
},
|
||||
"image": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "image",
|
||||
"sha256": "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.1.7"
|
||||
},
|
||||
"image_picker": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "image_picker",
|
||||
"sha256": "26222b01a0c9a2c8fe02fc90b8208bd3325da5ed1f4a2acabf75939031ac0bdd",
|
||||
"sha256": "1f498d086203360cca099d20ffea2963f48c39ce91bdd8a3b6d4a045786b02c8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.8"
|
||||
},
|
||||
"image_picker_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "image_picker_android",
|
||||
"sha256": "39f2bfe497e495450c81abcd44b62f56c2a36a37a175da7d137b4454977b51b1",
|
||||
"sha256": "42c098e7fb6334746be37cdc30369ade356ed4f14d48b7a0313f95a9159f4321",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.8.9+3"
|
||||
"version": "0.8.9+5"
|
||||
},
|
||||
"image_picker_for_web": {
|
||||
"dependency": "transitive",
|
||||
@@ -893,6 +853,16 @@
|
||||
"source": "hosted",
|
||||
"version": "0.2.1+1"
|
||||
},
|
||||
"image_size_getter": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "image_size_getter",
|
||||
"sha256": "f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.3"
|
||||
},
|
||||
"in_app_purchase": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -907,21 +877,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "in_app_purchase_android",
|
||||
"sha256": "c94aebe986723b6f4e4d8551d160c6602e73d0b38bf86a59fb054dfeb44bc1e5",
|
||||
"sha256": "bc4e58e8bd9f1027ca869f419737773bdf80ad36074037fa8ed81e5ca15dc655",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.3.1"
|
||||
"version": "0.3.5+1"
|
||||
},
|
||||
"in_app_purchase_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "in_app_purchase_platform_interface",
|
||||
"sha256": "412efce2b9238c5ace4f057acad43f793ed06880e366d26ae322e796cadb051a",
|
||||
"sha256": "1d353d38251da5b9fea6635c0ebfc6bb17a2d28d0e86ea5e083bf64244f1fb4c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.7"
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"in_app_purchase_storekit": {
|
||||
"dependency": "transitive",
|
||||
@@ -977,21 +947,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "json_annotation",
|
||||
"sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467",
|
||||
"sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.8.1"
|
||||
"version": "4.9.0"
|
||||
},
|
||||
"launch_at_startup": {
|
||||
"legalize": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "launch_at_startup",
|
||||
"sha256": "93fc5638e088290004fae358bae691486673d469957d461d9dae5b12248593eb",
|
||||
"name": "legalize",
|
||||
"sha256": "bc3068aa4f14588575c8b5ba2a9e608c242dad325e7f7c56fedd68adba33526a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.2"
|
||||
"version": "1.2.2"
|
||||
},
|
||||
"lints": {
|
||||
"dependency": "transitive",
|
||||
@@ -1083,15 +1053,15 @@
|
||||
"source": "hosted",
|
||||
"version": "5.4.4"
|
||||
},
|
||||
"msix": {
|
||||
"dependency": "direct dev",
|
||||
"nanoid2": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "msix",
|
||||
"sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047",
|
||||
"name": "nanoid2",
|
||||
"sha256": "35b5048f836652a1d711db0d716bdee59fcaaa4c37792db8b3568da4f7feb2f9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.16.7"
|
||||
"version": "2.0.1"
|
||||
},
|
||||
"nested": {
|
||||
"dependency": "transitive",
|
||||
@@ -1107,21 +1077,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "network_info_plus",
|
||||
"sha256": "4601b815b1c6a46d84839f65cd774a7d999738471d910fae00d813e9e98b04e1",
|
||||
"sha256": "5bd4b86e28fed5ed4e6ac7764133c031dfb7d3f46aa2a81b46f55038aa78ecc0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.1.0+1"
|
||||
"version": "5.0.3"
|
||||
},
|
||||
"network_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "network_info_plus_platform_interface",
|
||||
"sha256": "881f5029c5edaf19c616c201d3d8b366c5b1384afd5c1da5a49e4345de82fb8b",
|
||||
"sha256": "2e193d61d3072ac17824638793d3b89c6d581ce90c11604f4ca87311b42f2706",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.3"
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"nm": {
|
||||
"dependency": "transitive",
|
||||
@@ -1203,6 +1173,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.8.3"
|
||||
},
|
||||
"path_parsing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "path_parsing",
|
||||
"sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"path_provider": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1217,11 +1197,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "path_provider_android",
|
||||
"sha256": "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668",
|
||||
"sha256": "51f0d2c554cfbc9d6a312ab35152fc77e2f0b758ce9f1a444a3a1e5b8f3c6b7f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.2"
|
||||
"version": "2.2.3"
|
||||
},
|
||||
"path_provider_foundation": {
|
||||
"dependency": "transitive",
|
||||
@@ -1328,11 +1308,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "photo_manager",
|
||||
"sha256": "2d698826421ebd045ecc0df60422e9dd24bd22b178310b68444385f783735b55",
|
||||
"sha256": "74e5cb8a9e359e7fd461f684564c5a3e82b2d360f0e46d64264b4b381628c86d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.8.1"
|
||||
"version": "2.8.2"
|
||||
},
|
||||
"platform": {
|
||||
"dependency": "transitive",
|
||||
@@ -1358,11 +1338,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "pointycastle",
|
||||
"sha256": "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29",
|
||||
"sha256": "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.7.4"
|
||||
"version": "3.8.0"
|
||||
},
|
||||
"pool": {
|
||||
"dependency": "transitive",
|
||||
@@ -1378,21 +1358,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "pretty_qr_code",
|
||||
"sha256": "47a0fde3967e01ea31985d1a11a998fab1ab900becdba592e9abb0a4034b807e",
|
||||
"sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.2.1"
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"provider": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "provider",
|
||||
"sha256": "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096",
|
||||
"sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.1.1"
|
||||
"version": "6.1.2"
|
||||
},
|
||||
"pub_semver": {
|
||||
"dependency": "transitive",
|
||||
@@ -1408,11 +1388,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "pubspec_parse",
|
||||
"sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367",
|
||||
"sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.3"
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"qr": {
|
||||
"dependency": "transitive",
|
||||
@@ -1428,41 +1408,41 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "refena",
|
||||
"sha256": "a29603854d785e5259c6fb99268847e918f54463a861accc36cc913daea95cb8",
|
||||
"sha256": "1446e9622451e0cffef2af5b3fd57a52f0688d7c9eb848e969c16ccc2d14e833",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.6.1"
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"refena_flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "refena_flutter",
|
||||
"sha256": "2bee85271c8d8ced0238d98c1c056dbabfd4af207f9cc248d10af5a37820ae3e",
|
||||
"sha256": "2e57bab72667f37b55f26675d46c0a362e6eb115a70605c90163736b85e97a42",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.6.0"
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"refena_inspector": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "refena_inspector",
|
||||
"sha256": "495822cc8142b3a5826b5f17061b8ea60aa4b0fd7758fdec9746b85cbd61895d",
|
||||
"sha256": "c682581e2c2e8f641f5366cd079c0db1cab33a58ec160464d03d02019e92acd2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"refena_inspector_client": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "refena_inspector_client",
|
||||
"sha256": "f01636eb2c9609e9a5df5591132df5d3008a4a397b70166bc18c464af09880a6",
|
||||
"sha256": "f211414cd0c45a18fa482b8fbc0d8ee3b0383cda2979f127320134c4ffa8cafb",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"routerino": {
|
||||
"dependency": "direct main",
|
||||
@@ -1508,11 +1488,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "share_handler_android",
|
||||
"sha256": "6e752f2c4f67a9f7bef5503f6e1b0dd6075e127cafe7763d92649559c3692bc6",
|
||||
"sha256": "124dcc914fb7ecd89076d3dc28435b98fe2129a988bf7742f7a01dcb66a95667",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.0.7"
|
||||
"version": "0.0.9"
|
||||
},
|
||||
"share_handler_ios": {
|
||||
"dependency": "direct main",
|
||||
@@ -1538,11 +1518,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "shared_preferences",
|
||||
"sha256": "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02",
|
||||
"sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.2"
|
||||
"version": "2.2.3"
|
||||
},
|
||||
"shared_preferences_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -1684,41 +1664,41 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "slang",
|
||||
"sha256": "95dee03eb3fd1b36c99f365d4eace270a0d83c6148f8e7d1057806ef60cfaf12",
|
||||
"sha256": "f68f6d6709890f85efabfb0318e9d694be2ebdd333e57fe5cb50eee449e4e3ab",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.29.0"
|
||||
"version": "3.31.1"
|
||||
},
|
||||
"slang_build_runner": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "slang_build_runner",
|
||||
"sha256": "929ea4bf24f11e09afd2b01abd658f550da7eb4039ae83d91bc220f942e18cb3",
|
||||
"sha256": "6e60160e8000b91824c47221b20d9642e7408287a5a21837ecefc75270197586",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.29.0"
|
||||
"version": "3.31.0"
|
||||
},
|
||||
"slang_flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "slang_flutter",
|
||||
"sha256": "34c7cf297c608e24d3957a29e75c6790f4dbbfb1a4783d261a6c1e33ede7ad0f",
|
||||
"sha256": "f8400292be49c11697d94af58d7f7d054c91af759f41ffe71e4e5413871ffc62",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.29.0"
|
||||
"version": "3.31.0"
|
||||
},
|
||||
"slang_gpt": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "slang_gpt",
|
||||
"sha256": "1adfe55319721c2c18395acbb9bb96adcd4b9c954882af96e9b8487dd12a1cd8",
|
||||
"sha256": "a633f3c32e5e2f06e8763fb825ecee1ef8dea663fc700ab1c4c2943d8a90ef26",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.10.0"
|
||||
"version": "0.10.2"
|
||||
},
|
||||
"source_gen": {
|
||||
"dependency": "transitive",
|
||||
@@ -1810,16 +1790,6 @@
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"system_tray": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "system_tray",
|
||||
"sha256": "40444e5de8ed907822a98694fd031b8accc3cb3c0baa547634ce76189cf3d9cf",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.3"
|
||||
},
|
||||
"term_glyph": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1883,23 +1853,22 @@
|
||||
"tray_manager": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "b37f5e088e0f02c45a684ae41e9d2da2d5c596db",
|
||||
"resolved-ref": "b37f5e088e0f02c45a684ae41e9d2da2d5c596db",
|
||||
"url": "https://github.com/Tienisto/tray_manager.git"
|
||||
"name": "tray_manager",
|
||||
"sha256": "c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "0.2.0"
|
||||
"source": "hosted",
|
||||
"version": "0.2.3"
|
||||
},
|
||||
"type_plus": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "type_plus",
|
||||
"sha256": "2e33cfac2e129297d5874567bdf7587502ec359881e9318551e014d91b02f84a",
|
||||
"sha256": "d5d1019471f0d38b91603adb9b5fd4ce7ab903c879d2fbf1a3f80a630a03fcc9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"typed_data": {
|
||||
"dependency": "transitive",
|
||||
@@ -1911,6 +1880,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.3.2"
|
||||
},
|
||||
"uri_content": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "uri_content",
|
||||
"sha256": "ad08e63cd995e2daeace00359399f368e3d5dfe381c1a37daa3f9901108b518e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"url_launcher": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1955,11 +1934,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_macos",
|
||||
"sha256": "b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234",
|
||||
"sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.0"
|
||||
"version": "3.2.0"
|
||||
},
|
||||
"url_launcher_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -2001,6 +1980,26 @@
|
||||
"source": "hosted",
|
||||
"version": "3.0.7"
|
||||
},
|
||||
"vector_graphics_codec": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_graphics_codec",
|
||||
"sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.11+1"
|
||||
},
|
||||
"vector_graphics_compiler": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_graphics_compiler",
|
||||
"sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.11+1"
|
||||
},
|
||||
"vector_math": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -2015,11 +2014,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "video_player",
|
||||
"sha256": "fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2",
|
||||
"sha256": "efa2e24042166906ddf836dd131258d0371d0009cdf0476f6a83fd992a17f5d0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.8.2"
|
||||
"version": "2.8.5"
|
||||
},
|
||||
"video_player_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -2152,7 +2151,7 @@
|
||||
"version": "5.1.1"
|
||||
},
|
||||
"win32_registry": {
|
||||
"dependency": "transitive",
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "win32_registry",
|
||||
"sha256": "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a",
|
||||
@@ -2165,11 +2164,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "window_manager",
|
||||
"sha256": "b3c895bdf936c77b83c5254bec2e6b3f066710c1f89c38b20b8acc382b525494",
|
||||
"sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.3.8"
|
||||
"version": "0.3.9"
|
||||
},
|
||||
"windows_taskbar": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "windows_taskbar",
|
||||
"sha256": "204edfdb280a7053febdf50fc9b49b3c007255bd8a83c082d10c174ec6548f33",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.2"
|
||||
},
|
||||
"xdg_directories": {
|
||||
"dependency": "transitive",
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "20.3";
|
||||
version = "20.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Zj995KsgLN6XYHRKx8eyDTrt5zpMqqUmzQgpoAofkeY=";
|
||||
hash = "sha256-6siv6fve0i/6DrNKuwNEc7nWlD4GbMaH7y4Mgliq8iI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-meta";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -16,12 +16,12 @@ buildGoModule rec {
|
||||
owner = "mautrix";
|
||||
repo = "meta";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zU8c/ZAKTKd4dbG056gOCiPzvPNS5/KEkJ2fw48oV00=";
|
||||
hash = "sha256-whBqhdB2FSFfrbtGtq8v3pjXW7QMt+I0baHTXVGPWVg=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorHash = "sha256-uwprj4G7HI87ZGr+6Bqkp77nzW6kgV3S5j4NGjbtOwQ=";
|
||||
vendorHash = "sha256-rP9wvF6yYW0TdQ+vQV6ZcVMxnCtqz8xRcd9v+4pYYio=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@@ -1,17 +1,28 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nix, rustPlatform, CoreServices, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix,
|
||||
rustPlatform,
|
||||
darwin,
|
||||
CoreServices ? darwin.apple_sdk.frameworks.CoreServices,
|
||||
installShellFiles,
|
||||
}:
|
||||
let
|
||||
version = "0.4.40";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
pname = "mdbook";
|
||||
version = "0.4.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "mdBook";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-A8ZSqIG+rGKwggs9ogvbMIi9gClFKe8gS6D5W426ebc=";
|
||||
sha256 = "sha256-GGQK2Mf3EK1rwBMzQkAzWAaK6Fh0Qqqf8dtDjZPxOMA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8GQM4pHiFbyoRkOx3SXuIV118ndzL+O+eA+Gd2jbsdI=";
|
||||
cargoHash = "sha256-jriSQHn+Y+EWtwDJeMTAuCCHR7fEtWsErAxbG9a4pts=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -30,12 +41,16 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Create books from MarkDown";
|
||||
mainProgram = "mdbook";
|
||||
homepage = "https://github.com/rust-lang/mdBook";
|
||||
changelog = "https://github.com/rust-lang/mdBook/blob/v${version}/CHANGELOG.md";
|
||||
license = [ licenses.mpl20 ];
|
||||
maintainers = with maintainers; [ havvy Frostman matthiasbeyer ];
|
||||
license = [ lib.licenses.mpl20 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
havvy
|
||||
Frostman
|
||||
matthiasbeyer
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
cmake,
|
||||
curl,
|
||||
fetchFromGitHub,
|
||||
ffmpeg_7-headless,
|
||||
ffmpeg-headless,
|
||||
gnutls,
|
||||
lame,
|
||||
lib,
|
||||
@@ -32,17 +32,17 @@
|
||||
}:
|
||||
|
||||
let
|
||||
ffmpeg = ffmpeg_7-headless;
|
||||
ffmpeg = ffmpeg-headless;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "musikcube";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clangen";
|
||||
repo = "musikcube";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha512-Yqh35hyGzGZlh4UoHK0MGYBa+zugYJg3F+8F223saTdDChiX4cSncroSTexRyJVGm7EE8INNJoXg3HU6bZ08lA==";
|
||||
hash = "sha512-ibpSrzbn2yGNgWnjAh4sG9ZRFImxjE2sq6tu9k0w1QAAr/OWSTwtaIuK71ClT6yt4HKyRk1KSaXa+/IzOHI6Kg==";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "myks";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mykso";
|
||||
repo = "myks";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IkcMn6g9d8C42W1WdgYBSJn603La1eORB58YSY0+HFA=";
|
||||
hash = "sha256-jI5u/xaAt7BOug/okrrRoZXZVJOr+ahGtFJE3PbPQ7k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5pDe/3BDDdB+rd5UnGSmgY+FIu8mxVkP9ppVXFe5SxE=";
|
||||
vendorHash = "sha256-Ka+zVKQBAd6ChOYOw4FYzqJCfdzpN2OppDJsoT/5I0c=";
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nicstat";
|
||||
version = "0-unstable-2018-05-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scotte";
|
||||
repo = "nicstat";
|
||||
rev = "1fbe28198b49a2062b0c928554f93db33cb288c3";
|
||||
hash = "sha256-7+11K9636dGeW0HaaH6OJF5Wy4CXYXfoaZOVfhHK6kg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
$CC -O2 nicstat.c -o nicstat
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -d "$out/bin"
|
||||
install -m 755 nicstat "$out/bin"
|
||||
|
||||
installManPage nicstat.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Network traffic statistics utility for Solaris and Linux";
|
||||
homepage = "https://github.com/scotte/nicstat";
|
||||
changelog = "https://github.com/scotte/nicstat/blob/${finalAttrs.src.rev}/ChangeLog.txt";
|
||||
license = lib.licenses.artistic2;
|
||||
maintainers = with lib.maintainers; [ juliusrickert ];
|
||||
mainProgram = "nicstat";
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
})
|
||||
@@ -32,17 +32,17 @@
|
||||
let
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.2.1";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hzB/sS+6vsMuJfCPZucTQerytnq+TBzTtiWwwd+H+bE=";
|
||||
hash = "sha256-IuSWybyHjewxpLKZxDROqtdyIAWB61+mn4nfvRAyyw0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LNH3mpxIrPMe5emfum1W10jvXIjKC6GkGcjq1HhpJQo=";
|
||||
vendorHash = "sha256-hSxcREAujhvzHVNwnRTfhi0MKI3s8HNavER2VLz6SYk=";
|
||||
|
||||
# ollama's patches of llama.cpp's example server
|
||||
# `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream"
|
||||
@@ -214,6 +214,8 @@ goBuild ((lib.optionalAttrs enableRocm {
|
||||
};
|
||||
} // lib.optionalAttrs stdenv.isLinux {
|
||||
inherit ollama-rocm ollama-cuda;
|
||||
service-cuda = nixosTests.ollama-cuda;
|
||||
service-rocm = nixosTests.ollama-rocm;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "saunafs";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leil-io";
|
||||
repo = "saunafs";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rEiiBHB1wRqpnSgFgqVGwA3kOwiDx6MgyTmWyIQHATU=";
|
||||
hash = "sha256-T/K13JygU7Q/ylPk5ZAby3Kepi8I4z3vBBaigboJhus=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromSourcehut,
|
||||
fetchpatch,
|
||||
hareHook,
|
||||
haredo,
|
||||
lib,
|
||||
scdoc,
|
||||
stdenv,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "treecat";
|
||||
@@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-4A01MAGkBSSzkyRw4omNbLoX8z+pHfoUO7/6QvEUu70=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Update for Hare 0.24.2.
|
||||
(fetchpatch {
|
||||
url = "https://git.sr.ht/~autumnull/treecat/commit/53ad8126261051dd3b3493c34ae49f23db2c2d16.patch";
|
||||
hash = "sha256-cF/lMZjg1hB93rBXcjecT5Rrzb2Y73u6DSW1WcP5Vek=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
hareHook
|
||||
haredo
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "worker";
|
||||
version = "5.0.2";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.boomerangsworld.de/cms/worker/downloads/worker-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-k4HgIXuy0q72pHhGU+AuIwCUNMH/icasEXWIFc/w5Mo=";
|
||||
hash = "sha256-Tff/1I9RZYo2oXGsnrGeSs69W9nPu7OFDwF1Bg6R01s=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
@@ -27,14 +27,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xemu";
|
||||
version = "0.7.127";
|
||||
version = "0.7.128";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xemu-project";
|
||||
repo = "xemu";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-qf4zc+qZSLZLjqpKUVgSEhb5VGAzkiRlJSsSCCbNImU=";
|
||||
hash = "sha256-gJ5Da7bn4I7EOK12zqjekOJn+299v8WqH8e68GYUKpQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
libcap,
|
||||
zlib,
|
||||
libnetfilter_queue,
|
||||
libnfnetlink,
|
||||
|
||||
iptables,
|
||||
nftables,
|
||||
gawk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "zapret";
|
||||
version = "0-unstable-2024-07-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bol-van";
|
||||
repo = "zapret";
|
||||
rev = "9fcd8f830ebde2491719a5c698e22d1d5210e0fb";
|
||||
sha256 = "sha256-8cqKCNYLLkZXlwrybKUPG6fLd7gmf8zV9tjWoTxAwIY=";
|
||||
};
|
||||
|
||||
buildInputs = [ libcap zlib libnetfilter_queue libnfnetlink ];
|
||||
nativeBuildInputs = [ iptables nftables gawk ];
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
make TGT=$out/bin
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/usr/share/zapret/init.d/sysv
|
||||
mkdir -p $out/usr/share/docs
|
||||
|
||||
cp $src/blockcheck.sh $out/bin/blockcheck
|
||||
|
||||
substituteInPlace $out/bin/blockcheck \
|
||||
--replace "ZAPRET_BASE=\"\$EXEDIR\"" "ZAPRET_BASE=$out/usr/share/zapret"
|
||||
|
||||
cp $src/init.d/sysv/functions $out/usr/share/zapret/init.d/sysv/functions
|
||||
cp $src/init.d/sysv/zapret $out/usr/share/zapret/init.d/sysv/init.d
|
||||
|
||||
substituteInPlace $out/usr/share/zapret/init.d/sysv/functions \
|
||||
--replace "ZAPRET_BASE=\$(readlink -f \"\$EXEDIR/../..\")" "ZAPRET_BASE=$out/usr/share/zapret" \
|
||||
--replace ". \"\$ZAPRET_BASE/config\"" ""
|
||||
|
||||
cp -r $src/docs/* $out/usr/share/docs
|
||||
|
||||
mkdir -p $out/usr/share/zapret/{common,ipset}
|
||||
|
||||
cp $src/common/* $out/usr/share/zapret/common
|
||||
cp $src/ipset/* $out/usr/share/zapret/ipset
|
||||
|
||||
mkdir -p $out/usr/share/zapret/nfq
|
||||
ln -s ../../../../bin/nfqws $out/usr/share/zapret/nfq/nfqws
|
||||
|
||||
for i in ip2net mdig tpws
|
||||
do
|
||||
mkdir -p $out/usr/share/zapret/$i
|
||||
ln -s ../../../../bin/$i $out/usr/share/zapret/$i/$i
|
||||
done
|
||||
|
||||
ln -s ../usr/share/zapret/init.d/sysv/init.d $out/bin/zapret
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "DPI bypass multi platform";
|
||||
homepage = "https://github.com/bol-van/zapret";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nishimara ];
|
||||
mainProgram = "zapret";
|
||||
|
||||
# probably gonna work on darwin, but untested
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "30.3.1";
|
||||
version = "30.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
|
||||
|
||||
@@ -1,93 +1,93 @@
|
||||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
Iosevka = "0fi5x3nj6zxgac7l1smdxjwlphc7f3py83zxn5b93mizn3ypj4f0";
|
||||
IosevkaAile = "180armmv9a4jxb7jnirmi1r7wj6hlf3gsv56w7yzcg6m1x17hrb8";
|
||||
IosevkaCurly = "1z9nqbd2sbyr005g9v5zk4y06d4mbvc8k6w95rzy9ls92xnrpqch";
|
||||
IosevkaCurlySlab = "1k2zygx7q3cxvnj7spz736d6xxi3x2wxsk8wz652xmcwi8nawh1i";
|
||||
IosevkaEtoile = "1z6aj3m8m3hi4fw4lalgjfdc7lnmif418xqwlydzqc9klrkjw9q7";
|
||||
IosevkaSlab = "0yazmxc012zjlwdp06rgakjra0ylsjpn157yws3q3nn2552vi1qk";
|
||||
IosevkaSS01 = "1bp89wyxy55yll567q7ri48zll9n920waynhvsdalfqvl21x3baw";
|
||||
IosevkaSS02 = "154i35m6i41rimdyp2nwfmamkwqn4y4aj0m365jw152ybdmd01x2";
|
||||
IosevkaSS03 = "16ifwa93cpcjgkpvw6w3nar4x8dmfqi8gimhhh06hhdda1r9rhdh";
|
||||
IosevkaSS04 = "0xb7slc91991r7p23xl6kxdf0a244lcjhdpzd9cp765f18fxxf64";
|
||||
IosevkaSS05 = "0cl24iy7ghh7glp5xkjar2g9d0rh2kyjdsck3x9bk15lx0r2vkdf";
|
||||
IosevkaSS06 = "1gcdkw8d67i2vq6p40s8y23c4k1vyxph5ywkm21i2p0sa73z5j8q";
|
||||
IosevkaSS07 = "1y9v5j74y3cpzn19ixzwxvsz0d2f8dp9l9mfk02ijrbvncmjb3ql";
|
||||
IosevkaSS08 = "194la3gxb64ifqhzy74dvdz2ajw6qxhzf88g7bfmyxmhkqgwpyzs";
|
||||
IosevkaSS09 = "14lyqkk2xsgq114rxh2vb3alp8j835zl48dia8zi5kd896vbmf6j";
|
||||
IosevkaSS10 = "1jqh8zfcv96l1ldrl5lqigjcl31b7yqaix873842mrimqyyjgxvc";
|
||||
IosevkaSS11 = "1id5chzwpwzapfpavl3mjjysm2q7k1y94nbh8xzprg2gyzg0d1ic";
|
||||
IosevkaSS12 = "0hkcmjk6yhbxcl65yc91amz69bj9ybjpp598hnqpv8qi8c65ip17";
|
||||
IosevkaSS13 = "08gvncs6i4giyj773r1rq2hfxs6y0lba5j644w6r73q3vyw0ym95";
|
||||
IosevkaSS14 = "1w3haxahhcd7sybbsr1r5qcfsdyaijyymwqr591cg1ldxvk5nm0a";
|
||||
IosevkaSS15 = "0p2q794l5p14g0fmykxmzyvwvn34lx35x48fd7ikpvwggx8wn9v1";
|
||||
IosevkaSS16 = "13203i7hfl1d5mwnpdl8arggyaibqxrm1y34b725hs90wvpz5qar";
|
||||
IosevkaSS17 = "1m36dk42wjphxj8qj3yg7slrp4v959kswmcx3iywcb0pzhbiwv45";
|
||||
IosevkaSS18 = "1l80766wqrc94pd0v2xlhjl80dlb4al0jlnmxscf4lzlqfyw86rz";
|
||||
SGr-Iosevka = "0j8frx4vl8vfid79hy0rw71gzcbmlmnj08r399ivcl1dx5cqj6yw";
|
||||
SGr-IosevkaCurly = "0g2kcgy51hydv982888yswhrymslhs1ba55qj94iw5h29rwlhifc";
|
||||
SGr-IosevkaCurlySlab = "0jkzxg6j60i51nb9fr34yb3ld8wywxvmxivppz03w8savrfi19hb";
|
||||
SGr-IosevkaFixed = "1ix78dcb0423slqf7zhhns57my4q6b6196b3khyhsnj2rs8q5c4s";
|
||||
SGr-IosevkaFixedCurly = "1dlzdgm916z6zqvnmvh28mh8p8al773hq8rd9kh1i78bph3pj83f";
|
||||
SGr-IosevkaFixedCurlySlab = "15xhhxpb3w2ra04iq6lllhiwap5wmshlgh1qq6qb73mhmp7b3gq2";
|
||||
SGr-IosevkaFixedSlab = "0i5760gnjd9sf57wvsxlwszwxx29xf250kmlqkc70cqq3c1hx37r";
|
||||
SGr-IosevkaFixedSS01 = "00rn66jfkp4k0g064vg1wqk3lwfyn1k8xcw69kz45cyl26rb0bnv";
|
||||
SGr-IosevkaFixedSS02 = "19cnypv4wwxbkhcxx9k4jc8m88wn281albn1xlsr5qq4cq9girfc";
|
||||
SGr-IosevkaFixedSS03 = "0z4rl8xm9zgz14zkw3d39mc5hcgyjrmxhsndwdi1nf9xqzi9labl";
|
||||
SGr-IosevkaFixedSS04 = "0m8jx2g3q2lmh9yh7dc42c63mmvvw4g41s2n8zmbqmlp5z2wvhk5";
|
||||
SGr-IosevkaFixedSS05 = "1mb5i0nkbni1sf8hkd7dqpmkric0mpw962cxxa8n5nbh9ysplsk3";
|
||||
SGr-IosevkaFixedSS06 = "187yjb4flnylskxhfnns81mcqfnzn2q1r4mjj5hzmj5xx8np1kv5";
|
||||
SGr-IosevkaFixedSS07 = "01j4s3y8prcz12mj72lqsbs2w4wp0s2d20j9mhr22ng80ihg79y8";
|
||||
SGr-IosevkaFixedSS08 = "1by49m5gixqxwkhp6lfgn45sg9qql086k5f57x6cjn5g0jaagl5k";
|
||||
SGr-IosevkaFixedSS09 = "0d9v0jhjqg07xv0nr112lyvpp19w10al6wxvs8y8xvgc7wbaf10g";
|
||||
SGr-IosevkaFixedSS10 = "069qvzq87spmy2b99fbim2ag2ab13b94r1xbq688lbww7n8777zq";
|
||||
SGr-IosevkaFixedSS11 = "0rlscwcvgjlm07ccyhcxnspnh3xbyqbw5i9kwvi278ndmrmj98gd";
|
||||
SGr-IosevkaFixedSS12 = "1j7v0wz8qcmmcwpzlbk3ag254ddb2vvbvz9y8mwwgmmimiyd9x02";
|
||||
SGr-IosevkaFixedSS13 = "1izxz1v8r0b87d7243y8znjg74ajbbdlpy946xxp0295fjrkwn48";
|
||||
SGr-IosevkaFixedSS14 = "0gla42979n5p0lssyvcvq8xig9gj7wsd24dapkg6nw2qn7xh5nf6";
|
||||
SGr-IosevkaFixedSS15 = "181x7wygz3h6224am48jxhh17s377xij3a61n74rkpqdfvqgknyd";
|
||||
SGr-IosevkaFixedSS16 = "070a7gnykajr0sy4x9z9qd98z0lfh7nvg9lm1jja5mwq408s3sfi";
|
||||
SGr-IosevkaFixedSS17 = "1s1xck9cw33f2hkpn5qjfh0shpszis957k521hq3f4nqac3jmjw1";
|
||||
SGr-IosevkaFixedSS18 = "0v2p0c5nibb5xs2h9fdg6a2ns0kc02wk4lx65a9dsmsdxfgmz0j2";
|
||||
SGr-IosevkaSlab = "1iai9svsfa8l9gwr6hczz8lx0zxbzd7l711l3c1kwz6gd7ssavs9";
|
||||
SGr-IosevkaSS01 = "035pca36gbh860ggvjw4zvl0infaa8knq0r7cx8aqp5f0rprg72y";
|
||||
SGr-IosevkaSS02 = "1npk7w828s48gfnn27vh1pjsgb9kwnvyjdznciym989bxn9knhf8";
|
||||
SGr-IosevkaSS03 = "0mdkxlvmr5zwczz3w4xq9s9nnryx634q9jc6166p3b7861hkln1b";
|
||||
SGr-IosevkaSS04 = "1jifclcjvl0c3iqf98mf83jbg964vfh5dlrbxyzg787s3j1bbl81";
|
||||
SGr-IosevkaSS05 = "1xfdl5s7ivx10nppwcialmqn87gd6wgfs1in6pxx0675nmkl1vq9";
|
||||
SGr-IosevkaSS06 = "01yabw97bciqwg5pmrdr9qzl7kz1k3yxrza3rlfcmymbjyz2p3jm";
|
||||
SGr-IosevkaSS07 = "1p1sipaw95n6f7bazsxphc8y295zn861yd1122sc71f3jb5jamga";
|
||||
SGr-IosevkaSS08 = "1y17vimbpwabdzw3kg8nmw2jfaaam4g9wb2bwm612y8xmb421skx";
|
||||
SGr-IosevkaSS09 = "0vpl45zx28mirpj4xwzpn06ivdkmdnrfvgfkr9ai7il6rvqjvbqd";
|
||||
SGr-IosevkaSS10 = "1kna602l4vh40zcxa8ibdhhzkpf9mprhbycyrgjbq30jw8klgfll";
|
||||
SGr-IosevkaSS11 = "16qlnmgvnjg5fvqh7mwpqv0qrwskcp67lxk8qm67dkkaa26b5cms";
|
||||
SGr-IosevkaSS12 = "1zzf5rw1ffpg6ig2nngdfqpn7d9mmm60m2mmdnmh56vfhva8pgqf";
|
||||
SGr-IosevkaSS13 = "1jwrvi059bdba56lc5hfwc1j2m9wimdax8k5myzc682bj5lj19dy";
|
||||
SGr-IosevkaSS14 = "1bhxjp0b2yf3lxrxv8hyawkq789rcia1wh5dmxq0pn6smc5r43xc";
|
||||
SGr-IosevkaSS15 = "10cdmndq7nxvsmgipcfd1zz9cxzrs13fym204ylxzh1yhycl52w0";
|
||||
SGr-IosevkaSS16 = "1jpzybq0hzz00b30ynpl1lxjdr7j0kq708mb2sv11db9b5w2wcqd";
|
||||
SGr-IosevkaSS17 = "00jcagyjfdqvmszra4p32w1mk1md35fgfh53498cv6i8jq3ycz09";
|
||||
SGr-IosevkaSS18 = "001sgb1x18k00r989kwsgrn1fsiq0hngfnmd7qxa3lbhh4clwmlc";
|
||||
SGr-IosevkaTerm = "1kvgd8n0f8ik4v1wwb4skc6ixys2h4g88vshjv4y6lwsgmz9lbg0";
|
||||
SGr-IosevkaTermCurly = "1v461nxq05lxh4k0l19clql2bl15grn1kavbgpf9mcjbnaxv4h4i";
|
||||
SGr-IosevkaTermCurlySlab = "07gd8zhvwzjicz4fzxwmhjnganpxzac296nml6p00dav8r0dv093";
|
||||
SGr-IosevkaTermSlab = "09dj10xhnfa86pg4dfm2398afjy46z4kcpyjx0gcflkl73k1ka32";
|
||||
SGr-IosevkaTermSS01 = "19cca99xsfrw31c04zaym2w6l3krzyc6y8syq3hp03frq4w2w68n";
|
||||
SGr-IosevkaTermSS02 = "1zxz3cckxh2wdpzvbx1d87753z49ydfcs8l969qgmqxlqfrd3lwi";
|
||||
SGr-IosevkaTermSS03 = "1084sms84r2iacw6r003mdggb3xfv227nwdqc32n93r3bs8babj7";
|
||||
SGr-IosevkaTermSS04 = "0jl6w43hqrpn15sb4pf2057dxj572l9p1q00fy1db4y0sc668p8k";
|
||||
SGr-IosevkaTermSS05 = "0c41ivq4g8kiiywq8qr8qn6iglnx1csnq8f0kz3574zfnfyg7vis";
|
||||
SGr-IosevkaTermSS06 = "17hak7601k6l5acygxkhqk4ig3xm6v1g53kx3dz6v85s0hjmm2xa";
|
||||
SGr-IosevkaTermSS07 = "0ymxhdkclsc6fbswgrmwg0z2r9nddpwa12v5z7v9qbgpvwfpbngl";
|
||||
SGr-IosevkaTermSS08 = "136vb2ilmll5qrwlrqwaa21f8p4m25vzhdqi8hlfnf09l759sn4d";
|
||||
SGr-IosevkaTermSS09 = "0z2lbq8gv99vzwg5536lw17j2ivdzv8p0a5rgqdysnbm0q57w9rx";
|
||||
SGr-IosevkaTermSS10 = "040g7yjyb1n2yqjramrcglpb65zaq0hjfj8iy283chyf78h8zw7z";
|
||||
SGr-IosevkaTermSS11 = "0fik7zhznizpf2ppc35p2sa0fa49a8acd6ppcy5fmmipffgb0kx6";
|
||||
SGr-IosevkaTermSS12 = "0ffmf2wlgy6h642arq06bvy4j2wa88a2xk42w303gg49wccqq2zr";
|
||||
SGr-IosevkaTermSS13 = "0vanc6h0dvd829933alkih8pqszhb6lj8c9zhk4r8m22hn81z6ym";
|
||||
SGr-IosevkaTermSS14 = "1nacl68g4ikff01wrklckygvanidnzl7svh5dhrg295scv9anmvn";
|
||||
SGr-IosevkaTermSS15 = "0kxn01nvpbv0csqy1rm0s9dqn8mnfl3x1yy2c8svgxq8snvk0xm9";
|
||||
SGr-IosevkaTermSS16 = "0kq65gpza1jy18z1639wl383ck3zc9fpfprr68aqkywrzcky6rzb";
|
||||
SGr-IosevkaTermSS17 = "1q1k6vqibqzzww3fhl70inhgjwwczpl20h0qfwvnvpzz9x5hzh26";
|
||||
SGr-IosevkaTermSS18 = "1zbfy657x2vk6f9fbxxcja31i0pyg1afzzx794wa9w2pyd2hcpi7";
|
||||
Iosevka = "1d8ial7bmqwg7msmz5gqfddfp0dnqck9v02h8ghjnkf3gwc1myn1";
|
||||
IosevkaAile = "1wl05qa21rzbir80ig4li7mym9w8gbx7fnxi3mm4g6r32a397p4v";
|
||||
IosevkaCurly = "1anyvcixknxf9vld83yv7w2mn63rvmanq1a1hy3kgjyk9d67gxfi";
|
||||
IosevkaCurlySlab = "01byfnvyypacwk5mmlhzz769d6l81z4px5ywn2m9zrphcfvvy42k";
|
||||
IosevkaEtoile = "1k6s4x7j9yiv62lc4bxp122x13b126xgy0d8jz4fyawnzzcqwadq";
|
||||
IosevkaSlab = "0rq1gdrz89vlvk41wmlghfnlkmfrwl18lh1glki87wkpyc303wnz";
|
||||
IosevkaSS01 = "1yfbangcfqmf8k5iw7if9zgb4f4rxr60wyi2gah79bab4aamqifd";
|
||||
IosevkaSS02 = "1qpdkr9qw0n04j80gi8x6w0qn7z3s71lg1asxpg11jpba6hqb57y";
|
||||
IosevkaSS03 = "12jwd3falkl58dhn2bdr01s08s9cxff20apfz2p29245arb7gppz";
|
||||
IosevkaSS04 = "1k4kq83cnxm3sprzrx8gbqf7vhlrs8hcaby7iw5llzrf3nyh7ipq";
|
||||
IosevkaSS05 = "0bfr9ngicz01jlmcrcsw173h33bp2xc9c7p6bcb86gf6fgqq38rw";
|
||||
IosevkaSS06 = "13whqch4mf5zznq30xya240qsi8zsd2s56zl4df86vfzv4l5yr4v";
|
||||
IosevkaSS07 = "19q0pi54ch3bsw3h5bngk57rj8p6pm4h6zzq08avcwzid3cz4rik";
|
||||
IosevkaSS08 = "0j7lrj3hzcc7j3hz6p2pnh5fjf5ajgmsmbzac7fa23j5mhg71vi6";
|
||||
IosevkaSS09 = "143gj6mzwn7267h8dp8p8cm0yqq2kjm8gdyf6v9pdr3yq3g0dmwy";
|
||||
IosevkaSS10 = "1v94gf7rbapf7rp2r9yb11k2qqxn4p5cdb0fbws0wshhjd2akb09";
|
||||
IosevkaSS11 = "049z96078fl98kidp6mm3535d9fq53jmipz51hsz64ba91azj82l";
|
||||
IosevkaSS12 = "0f827rvzndzkb5w69piydd6vygmzj7gkaffk0wnh1ksz561x4nmc";
|
||||
IosevkaSS13 = "1mrrl8szsmnxyys9r5y6a6ziagrcrvgikw845whs25p6v2vrz7ag";
|
||||
IosevkaSS14 = "088sga3clabsffwd2asdxcn0nzn2jm4njp3sf7rfi9xrcy4nvwrr";
|
||||
IosevkaSS15 = "08p7zaj977yssn2x7rd00ij9j53jg1322ni36a4narhsbikms32j";
|
||||
IosevkaSS16 = "12zbdlpnvp9cx2x0x7xr929z0qxk3w4waam5m54ycrkjkx5qbjzb";
|
||||
IosevkaSS17 = "1b57w2zqplrfjhxd4ylwl6gbzza3msyccm843v90yhzyazdhbl30";
|
||||
IosevkaSS18 = "1wi65nlw0ag2haqcjikvw2vzgpy7n60cqnh0c06dfvvv8b499k3i";
|
||||
SGr-Iosevka = "01hisr1h4ipxhcaqbvyq1cbwmwi5l74q8k0k3smc0b66icar3yqx";
|
||||
SGr-IosevkaCurly = "166mhny2kl4cfpaiid1dqmjr6pm9di1cf7n1v998ddzdz8i4jnyi";
|
||||
SGr-IosevkaCurlySlab = "0c3argr2dsg9z9xjpl6rhnvarz6mbhi8ar1d0w937l1sj4rnqs7w";
|
||||
SGr-IosevkaFixed = "0wrw3swn07w907x7hwq0mciki07dhqzr0zdkirq2f61a87hdfkl8";
|
||||
SGr-IosevkaFixedCurly = "12nycck76j9aj6n052f2s2ygfhvn3r2xscnpl757klhfvzfcdvjy";
|
||||
SGr-IosevkaFixedCurlySlab = "032jax5aj0k0qdqa3184xqnczsvsqkw15z5dpygxbnrz6s0s7999";
|
||||
SGr-IosevkaFixedSlab = "1lv6ys56m5fry5ngzn1gjipi75a1ivcszlx4dywriasmqg84b16x";
|
||||
SGr-IosevkaFixedSS01 = "1cbjx7a721a7vinrrz7wcq2hzkqjhwwvipny061p6m6fsci5pnzz";
|
||||
SGr-IosevkaFixedSS02 = "02rqfz0b8pfny2np4cv9ba4f1bv1ciplxhpjf67c3q80vlgljmcr";
|
||||
SGr-IosevkaFixedSS03 = "089w4r5xv4xvcr4id2nl78syak83zx7qzbg7kl4bm50n7xfm794w";
|
||||
SGr-IosevkaFixedSS04 = "0cgadjx4gxlhqd93lnq87y201qpcf1v6v8sqnkwv0az5biil7pbc";
|
||||
SGr-IosevkaFixedSS05 = "146v7y49gg0jb5x6isqsmjandq5ya4nil0zcmiadqxrmyhx40lvh";
|
||||
SGr-IosevkaFixedSS06 = "1x9lykvkhjzz084i7ndq5gpd2hy2s19vqyvrgja79qddifir3k3k";
|
||||
SGr-IosevkaFixedSS07 = "1b0m46c4kq639y0csckd5f6hcl9d9i6b0745i8aynfhla2wva3j9";
|
||||
SGr-IosevkaFixedSS08 = "0ysy7xiismi3pr7sk3b9nn4nh1dw6jr5l0wllvj30f8rh8z05a0s";
|
||||
SGr-IosevkaFixedSS09 = "1b36n1lv6c5k2asv4xrcmgyc09n704slfbzsi4g2q20c032nax1l";
|
||||
SGr-IosevkaFixedSS10 = "1f1gscpfzqghmmdygvy5v39vj38rsi4k1hx3dp4zl08nbvfic0rb";
|
||||
SGr-IosevkaFixedSS11 = "1vxy002j4vqi8xqpm551kw804j8vllsw1hs3p4xfqn8qfkqklb3v";
|
||||
SGr-IosevkaFixedSS12 = "1w4r2w60d962f48xlyg3yfl6q4fn90cwmfjpgf1nlhnpalcpqq99";
|
||||
SGr-IosevkaFixedSS13 = "16bh6wa06nybqg017hp2k35dphxh1sqzzqnspqkkkssp0pqrljl3";
|
||||
SGr-IosevkaFixedSS14 = "15jwzgjcsy6agvacn4xz46ijkkwxsgsr5nbvsbhxa3al0yhbkl89";
|
||||
SGr-IosevkaFixedSS15 = "036aph9qixsrb657n6qzckcbcpf6rswyc945j8m94rx4lar6k10r";
|
||||
SGr-IosevkaFixedSS16 = "0hx2vz7lpfbxhvs3g8psmlfywzmjksxr5s0d36m4mnga90scwjiw";
|
||||
SGr-IosevkaFixedSS17 = "1s5hl874bskix5vdxz0w37wmqf5yj633k779gccyq5mlwy9yjmrl";
|
||||
SGr-IosevkaFixedSS18 = "1zbmpkm17vcrg53qv8sqcpasc97hlz4lh2i0pjz58qsidfsqhcgr";
|
||||
SGr-IosevkaSlab = "1lhfhag73bhpfzr5fapgcn68awjzk960dc08481p3qb4aphqczlw";
|
||||
SGr-IosevkaSS01 = "15j23226497zvsk8s9dkgh1dbxjxcc1mdqpc9p7868vl4qjgcyg6";
|
||||
SGr-IosevkaSS02 = "0cr4h84w9429ypwf1i8h289gfv3k2ls9lfyxgqhdy99ckqgmy8gz";
|
||||
SGr-IosevkaSS03 = "0am1lck3l2m7pw7nwv62xjcvi5yz94hpx3rmzj4ji22qn6l633zq";
|
||||
SGr-IosevkaSS04 = "1ggjsdczpjqnhikbp88kch7sai29r4m557y4f9xr7njfzwqkssdy";
|
||||
SGr-IosevkaSS05 = "0s3iwasn8p72snyp9r4c7bwzxwg5lh6sj2vvwv48clp0aynqj9nm";
|
||||
SGr-IosevkaSS06 = "1yh2qh718w94dsvm4bf6j4lqbamc0p8054f71kmk4d8zj9iijjy5";
|
||||
SGr-IosevkaSS07 = "0njr2mgr5gpa5yiymzg3n52xw6zi5zpswmsfhlq3gxw5xgjfv4q9";
|
||||
SGr-IosevkaSS08 = "0kf3p5yf202s45vkxn6zjk5im2rlmqpqcwn2p6vwanj2r4c0mq6j";
|
||||
SGr-IosevkaSS09 = "15zvggmz43fq9p9jqp40f7s7sa63sk8ss6qk5hpj7661lmw95cli";
|
||||
SGr-IosevkaSS10 = "1fnkrklrk6rz6nl0l9xwbz5rpjsizfan0rw3b1ylzbv7s6hjm3z6";
|
||||
SGr-IosevkaSS11 = "06j98fzfi3wqsm1vsc6b3prascfh9ycrfgg240471qx7fyynsnzs";
|
||||
SGr-IosevkaSS12 = "1a689igs4ygqq87g1yx2v0h29hvv69n78a3dlnyab2p9likidzhi";
|
||||
SGr-IosevkaSS13 = "124v6asig6in0vwh513yk9a93sl3j3vbnbgx85zk24601r6j4sgd";
|
||||
SGr-IosevkaSS14 = "017pjpj9m9l8hgpy5d801kdy1xvsyddyb0lzizqj0wlwgwafgayh";
|
||||
SGr-IosevkaSS15 = "1wf7wvcxfjcywaxjjwa97iy103vfihgmap585kkmjsign72gvhnd";
|
||||
SGr-IosevkaSS16 = "0069a898ba44460j94jbyiah5i0k8frr84njp75dhm3rbx9xrqh3";
|
||||
SGr-IosevkaSS17 = "0yqb51y1zfxbzvpmvy08r9q1al4gvmwsnbsj5b5ixspmvda475rn";
|
||||
SGr-IosevkaSS18 = "1ss8b6dn08a8ch3qcjqrnmh3v205nrr3q7727zvl0xcv47l54kr0";
|
||||
SGr-IosevkaTerm = "1hygc8cq3qlw5yc2399g6h95bgkwniy3wmcmppr5dd72mhr5ghvn";
|
||||
SGr-IosevkaTermCurly = "0cyfbmp7ns2jjzcgi1xw92cip3gk7j5imzx1846xdjdb2xima806";
|
||||
SGr-IosevkaTermCurlySlab = "1vqlqphj860bzs90jci8kmd8dvpd9ggl97r5dwfb3jh8nshyi56c";
|
||||
SGr-IosevkaTermSlab = "1n61lybs2v9n61mrdg1s7a9yy0ai5p1qqsgj16rh05k72zan66mn";
|
||||
SGr-IosevkaTermSS01 = "1cgqcz318dl85y8mmqrlr946c7w686bfgbankyqbkda7503xl18c";
|
||||
SGr-IosevkaTermSS02 = "0yb5c0iphlcwv8k4bh3p6vk2yk8gpyy213vsvb95sxa6838x27pp";
|
||||
SGr-IosevkaTermSS03 = "0b00s45xfg25ffnfylkiz4ba6acn8b4p64c5q4pans8gfjfnb275";
|
||||
SGr-IosevkaTermSS04 = "0icmi402xwrd1qn35qpacqzvcxgj42imm1kgixjgmnvbzs508h6a";
|
||||
SGr-IosevkaTermSS05 = "0qd7jrfgj5niaw8a8l3qf3z4m87hvb3wwcy3fndg1zlmwlbg2cfd";
|
||||
SGr-IosevkaTermSS06 = "0pg13v5q22k5hfy8vwk1hwh28v52wnfc28amgbkjxgcjyvd5m2xl";
|
||||
SGr-IosevkaTermSS07 = "0vww5dwpakmwhq5l0g371ha3hy1p0arnfp0f47lw9qsahyl0hhw2";
|
||||
SGr-IosevkaTermSS08 = "0y3gvmh4fyx2xxyn008i873m3fjwssalg8ib10zjj6mbz767az3l";
|
||||
SGr-IosevkaTermSS09 = "10jkdw8i4jz16x2kfsh7cmg1s6si3n3d5n65yr9n9ipmgdk2qj2r";
|
||||
SGr-IosevkaTermSS10 = "0wp9f6982dqha5dwyb4r09bm4fg690pqmb337i9237vzp6q6w0lq";
|
||||
SGr-IosevkaTermSS11 = "00qqyi4xxgfhcyr2qf5jn42rmnhdn0fpn66qh99v15fa7b8r7iz7";
|
||||
SGr-IosevkaTermSS12 = "0pz3c13zzvpxd2v2vlvgwk0j4fki1yfd95kycgafrijk2s2g9684";
|
||||
SGr-IosevkaTermSS13 = "1l5d59vh9ji0rmdixinix10nxcglbll55ad2syra5hvb9rfb6q2q";
|
||||
SGr-IosevkaTermSS14 = "0nqp05vhjjjg4aci5gaf6zf4w1z973y3wzxv3ndwkagn4gzq7y15";
|
||||
SGr-IosevkaTermSS15 = "019nzx7azrkgxvlrj2f3gfxjhjdf4ywy2gwan7fwj3kv983s4s6f";
|
||||
SGr-IosevkaTermSS16 = "16j3v6sbvav27p3i8q2qz76sw5i8bqr6i08khjc5cfx9pf9kfh2f";
|
||||
SGr-IosevkaTermSS17 = "0gd32ddi0q60scvv10qx5fwmgwwdjrx6j0ymsimmnd4gi3n3ylbr";
|
||||
SGr-IosevkaTermSS18 = "04j17062cs4h7dcrqb2qzx94wkq8n633j63vdqk72las513535xa";
|
||||
}
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20240707162925";
|
||||
version = "20240713050854";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-Cpd66RSbKcEcLeL/ibS6cWnZABJuYCthaaMTkCsbij0=";
|
||||
hash = "sha256-+VDC6VkxJGVwRkAupIjtbP5lWZDgq8KXT813Zm83Ap0=";
|
||||
};
|
||||
vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
|
||||
meta = with lib; {
|
||||
|
||||
+3
-3
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hare-ev";
|
||||
version = "0-unstable-2024-01-04";
|
||||
version = "0-unstable-2024-07-07";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "hare-ev";
|
||||
rev = "736ab9bb17257ee5eba3bc96f6650fc4a14608ea";
|
||||
hash = "sha256-SXExwDZKlW/2XYzmJUhkLWj6NF/znrv3vY9V0mD5iFQ=";
|
||||
rev = "aa01cdd0ba226ed9a4c5e6031e6aa7158aa05c9a";
|
||||
hash = "sha256-xq6d2+BbHk2iLg50mtqXqhkky/P9GeRAulSD7ouMnrA=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ hareHook ];
|
||||
|
||||
+3
-3
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hare-json";
|
||||
version = "0-unstable-2023-03-13";
|
||||
version = "0-unstable-2024-04-19";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "hare-json";
|
||||
rev = "88256102a9fec62d494628e32cb406574e49e5e1";
|
||||
hash = "sha256-Sx+RBiLhR3ftP89AwinVlBg0u0HX4GVP7TLmuofgC9s=";
|
||||
rev = "b6aeae96199607a1f3b4d437d5c99f821bd6a6b6";
|
||||
hash = "sha256-mgUzHGXbaJdWm7qUn7mWdDUQBgbEjh42O+Lo0ok80Wo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hareHook ];
|
||||
|
||||
+11
-2
@@ -1,5 +1,6 @@
|
||||
{
|
||||
fetchFromGitea,
|
||||
fetchpatch,
|
||||
hareHook,
|
||||
lib,
|
||||
nix-update-script,
|
||||
@@ -8,16 +9,24 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hare-toml";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "lunacb";
|
||||
repo = "hare-toml";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-r8T7Gy9c5polP+R12q0QRy4075nfGssDnNPQ8ARx/0M=";
|
||||
hash = "sha256-MfflJElDMu15UBuewssqhCEsNtzmN/H421H4HV+JCWc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Update strconv module functions for 0.24.2
|
||||
(fetchpatch {
|
||||
url = "https://codeberg.org/lunacb/hare-toml/commit/9849908ba1fd3457abd6c708272ecb896954d2bc.patch";
|
||||
hash = "sha256-herJZXJ8uusTO2b7Ddby2chIvDRuAPDFOPEt+wotTA0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
scdoc
|
||||
hareHook
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "27.0.1";
|
||||
sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ=";
|
||||
version = "27.0";
|
||||
sha256 = "sha256-YZWBLcpkm8B4sjoQO7I9ywXcmxXL+Dvq/JYsLsr7TO0=";
|
||||
}
|
||||
|
||||
@@ -122,10 +122,20 @@ stdenv.mkDerivation ({
|
||||
'';
|
||||
|
||||
# For OTP 27+ we need ex_doc to build the documentation
|
||||
# When exdocSupport is enabled, grab the raw ex_doc executable from the exdoc
|
||||
# derivation. Next, patch the first line to use the escript that will be
|
||||
# built during the build phase of this derivation. Finally, building the
|
||||
# documentation requires the erlang-logo.png asset.
|
||||
preConfigure = ''
|
||||
./otp_build autoconf
|
||||
'' + optionalString exdocSupport ''
|
||||
export EX_DOC=${exdoc}/bin/.ex_doc-wrapped
|
||||
mkdir -p $out/bin
|
||||
cp ${exdoc}/bin/.ex_doc-wrapped $out/bin/ex_doc
|
||||
sed -i "1 s:^.*$:#!$out/bin/escript:" $out/bin/ex_doc
|
||||
export EX_DOC=$out/bin/ex_doc
|
||||
|
||||
mkdir -p $out/lib/erlang/system/doc/assets
|
||||
cp $src/system/doc/assets/erlang-logo.png $out/lib/erlang/system/doc/assets
|
||||
'';
|
||||
|
||||
configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ]
|
||||
|
||||
@@ -47,11 +47,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gvfs";
|
||||
version = "1.54.1";
|
||||
version = "1.54.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-rEo7zLf+FQIVjvD95cl5q0RxJVfQKKjk8wop8PvZ0Z8=";
|
||||
hash = "sha256-VJCPThC18cIx6QMwyMFbfyHyu2EPGUwDSzOON5xQjjw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lcrq";
|
||||
version = "0.1.2";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "librecast";
|
||||
repo = "lcrq";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-r4UiZ9oNDxF3rHMqg+1NLLjm6LPZtzgtZOs7pRe5SdQ=";
|
||||
hash = "sha256-xhv1rU0CImd5vs0bMdF1eJZt2AToU/JhBsoCsCLdyyg=";
|
||||
};
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, config
|
||||
, fetchFromGitHub
|
||||
, symlinkJoin
|
||||
, fetchpatch2
|
||||
, stdenv
|
||||
, cmake
|
||||
, cudaPackages ? { }
|
||||
@@ -9,7 +9,6 @@
|
||||
, pythonSupport ? true
|
||||
, pythonPackages
|
||||
, llvmPackages
|
||||
, boost
|
||||
, blas
|
||||
, swig
|
||||
, addDriverRunpath
|
||||
@@ -55,6 +54,15 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
# Replace distutils with packaging for version checks
|
||||
url = "https://github.com/facebookresearch/faiss/commit/c540e762ca0ecf8f43da0bfc215da148c5cf420e.patch";
|
||||
includes = [ "faiss/python/loader.py" ];
|
||||
hash = "sha256-yMHAXo0+oDXknSpv1fxUgil3R/WG1+vTLyxvwVR3VtE=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
blas
|
||||
swig
|
||||
@@ -68,6 +76,7 @@ stdenv.mkDerivation {
|
||||
|
||||
propagatedBuildInputs = lib.optionals pythonSupport [
|
||||
pythonPackages.numpy
|
||||
pythonPackages.packaging
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dep-logic";
|
||||
version = "0.3.4";
|
||||
version = "0.4.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "pdm-project";
|
||||
repo = "dep-logic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1pGAY4d4dD85aqxBL/i/JHPyr7dOoZVpniDS5xSjnHU=";
|
||||
hash = "sha256-ZRf/3DA2qsHNIuOLHIJdNYQLMlzJjFmw9KoI9dxHevY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pdm-backend ];
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nebula3-python";
|
||||
version = "3.8.0";
|
||||
version = "3.8.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "vesoft-inc";
|
||||
repo = "nebula-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tpMm13iixtg3ZF4g7YgRLyd/VqJba51QPGPmFRpy0wA=";
|
||||
hash = "sha256-AcfKcrfDBY5K5xDDA7rLzKnsnhwhtpLXHkPLd0SfC4M=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
{
|
||||
blessed,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
pandas,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
rich,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "objexplore";
|
||||
version = "1.5.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kylepollina";
|
||||
repo = "objexplore";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FFQIiip7pk9fQhjGLxMSMakwoXbzaUjXcbQgDX52dnI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail '==' '>='
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
blessed
|
||||
rich
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pandas
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"objexplore"
|
||||
"objexplore.cached_object"
|
||||
"objexplore.explorer"
|
||||
"objexplore.filter"
|
||||
"objexplore.help_layout"
|
||||
"objexplore.objexplore"
|
||||
"objexplore.overview"
|
||||
"objexplore.stack"
|
||||
"objexplore.utils"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal UI to interactively inspect and explore Python objects";
|
||||
homepage = "https://github.com/kylepollina/objexplore";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pbsds ];
|
||||
};
|
||||
}
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "1.35.9";
|
||||
version = "1.35.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7.1";
|
||||
@@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-THsA284Z/LRQ3GJLnAR5GtFJUYw6EJJZzcFTsiCKxaY=";
|
||||
hash = "sha256-oEXulUsppaSOUwonY61tYPm7f3homNrb+rOpm+c/M84=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rawpython";
|
||||
repo = pname;
|
||||
repo = "remi";
|
||||
rev = version;
|
||||
hash = "sha256-VQn+Uzp6oGSit8ot0e8B0C2N41Q8+J+o91skyVN1gDA=";
|
||||
};
|
||||
@@ -41,7 +41,11 @@ buildPythonPackage rec {
|
||||
"self.assertEqual("
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
setuptools # pkg_resources is referenced at runtime
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
@@ -56,10 +60,10 @@ buildPythonPackage rec {
|
||||
"editor.widgets"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Pythonic, lightweight and websocket-based webui library";
|
||||
homepage = "https://github.com/rawpython/remi";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ pbsds ];
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
maintainers = with lib.maintainers; [ pbsds ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,12 +19,13 @@
|
||||
pydantic,
|
||||
safety-schemas,
|
||||
typing-extensions,
|
||||
filelock,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safety";
|
||||
version = "3.2.3";
|
||||
version = "3.2.4";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -32,7 +33,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QUFUk08XJ9r4pkc0k5RP7LOAVAw/AIddwa43c4L32D8=";
|
||||
hash = "sha256-usAgIBbXNqIRgFeWSg45g/og/yVj/RA8rD86we0/6hE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -47,18 +48,14 @@ buildPythonPackage rec {
|
||||
--replace-fail "telemetry=True" "telemetry=False"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"packaging"
|
||||
"dparse"
|
||||
"authlib"
|
||||
"pydantic"
|
||||
"filelock"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
setuptools
|
||||
click
|
||||
urllib3
|
||||
@@ -75,6 +72,7 @@ buildPythonPackage rec {
|
||||
pydantic
|
||||
safety-schemas
|
||||
typing-extensions
|
||||
filelock
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "soundcloud-v2";
|
||||
version = "1.3.8";
|
||||
version = "1.5.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wcRjzLnPvpz4zWhV7LxAJ6+BDvkI1MexdgL4nBjJwbg=";
|
||||
hash = "sha256-Cvi8VwUq87ZAH3NtzBNrA2mvOA3Av48QmecDrlNncVU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "srp";
|
||||
version = "1.0.20";
|
||||
version = "1.0.21";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LbRTvc4mue6tNnp7V4MHTvgOhIK/MMAUCnuJg2oFRwc=";
|
||||
hash = "sha256-hmgTvPUhGJoVY+bKMRK29U/fclpBCi2+u28NhLgqHx0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1188";
|
||||
version = "3.0.1190";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-crpn9OLOqS1EAFaz1ZUNpc7CYyxDG3aA6/tubHHZm9g=";
|
||||
hash = "sha256-bf9WZauTily9V4fKNxQifxUzdbj51rH7LvAogiZmX6U=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.17.6";
|
||||
version = "2.18.0";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
hash = "sha256-Xw/lyA4J0FkU0MTXbOanDJ+rLCEGCOP7BX9sApu+K6s=";
|
||||
hash = "sha256-wmBsPSwuFUnipLodxtr9xGhWKjBrn3NQ/X1QpxvlRf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlite-web";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cDSlSh0vnwvbJZFDPqvJ5oXz68gN9yzodcQYkXUAytE=";
|
||||
hash = "sha256-5Bdd1C9M3HjvfDKdVvGSQ+/I0Iimvf1MZwPonRiqwqU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ flask peewee pygments ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metals";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps-${version}";
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-hRESY7TFxUjEkNf0vhCG30mIHZHXoAyZl3nTQ3OvQ0E=";
|
||||
outputHash = "sha256-OFpnfAR1BuY0QFCR8Zf210IEMgVDVLQnHNSCM2FbBxk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper setJavaClassPath ];
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
let
|
||||
common = rec {
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nixd";
|
||||
rev = version;
|
||||
hash = "sha256-Yr/+03ealYQHjxtCLNCz/EYypwMPgiaTvCE55BEUk2c=";
|
||||
hash = "sha256-1i4U012vqw84NuD5cjgfVX/he4vW9MyEeIetJ55g280=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
-1995
File diff suppressed because it is too large
Load Diff
@@ -1,49 +1,49 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, darwin
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
stdenv,
|
||||
darwin,
|
||||
testers,
|
||||
hydra-cli,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hydra-cli";
|
||||
version = "0.3.0";
|
||||
version = "0.3.0-unstable-2023-12-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlewo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1fd3swdjx249971ak1bgndm5kh6rlzbfywmydn122lhfi6ry6a03";
|
||||
repo = "hydra-cli";
|
||||
rev = "dbb6eaa45c362969382bae7142085be769fa14e6";
|
||||
hash = "sha256-6L+5rkXzjXH9JtLsrJkuV8ZMsm64Q+kcb+2pr1coBK4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
sourceRoot = "${src.name}/hydra-cli";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
cargoHash = "sha256-WokdTMNA7MrbFcKNeFIRU2Tw6LyM80plDoZPX1v/hrc=";
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
# build fails due to outdated socket2 dependency
|
||||
postPatch = ''
|
||||
ln -sf ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = hydra-cli;
|
||||
version = "0.3.0";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Client for the Hydra CI";
|
||||
mainProgram = "hydra-cli";
|
||||
homepage = "https://github.com/nlewo/hydra-cli";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ lewo ];
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [
|
||||
lewo
|
||||
aleksana
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pyenv";
|
||||
version = "2.4.5";
|
||||
version = "2.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyenv";
|
||||
repo = "pyenv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0MMPbn6BaIn623nHYuNYsiMIFF0y2fAYmjxZ/XESyTg=";
|
||||
hash = "sha256-DrLma9gR9wy0IULtCoD/gTHMFPVyxijGACqcoQnYUHY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,16 +18,16 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
aarch64-darwin = "sha256-ubXwWgg4QAwM27meaIjT/HjgoVs9cVUiGNWoGRLktBI=";
|
||||
aarch64-linux = "sha256-vd1hRTAGLI3Kv/FmYICKTSajyneh+F9vM1+gnqGthGs=";
|
||||
armv7l-linux = "sha256-Jl5H+MZUMBZOBmHgzpM/S7lAY4F1KtRS0G7Vu7ORKgg=";
|
||||
x86_64-darwin = "sha256-SL0DjE1ssPlypsWbhxq/YgSUYtdqOXkb6EktfmAAXkQ=";
|
||||
x86_64-linux = "sha256-18MbsqzYcr9hsON5hZujEBzvi7vyQzpYZOCitYYq5HY=";
|
||||
aarch64-darwin = "sha256-9vRoGoYCJ1CGDOZtv6D3ZmH0HA3RTPIsB5SeGzCb+Dc=";
|
||||
aarch64-linux = "sha256-Z6NZ2izOWVxuiwqvoGitOHhQe8Y9lk7q73Tv4iYh6Ds=";
|
||||
armv7l-linux = "sha256-xuPWvQ2isSG4CQVzzQM0CGxW+KHKYj31hIEHZI2rB/g=";
|
||||
x86_64-darwin = "sha256-omsqaCM+1sPu4AG59oOgYwQBpEJ7irjvTHIo62GVCoE=";
|
||||
x86_64-linux = "sha256-fPbI6np3wDqS/OGi2GikgsyMtIVHhxcl+D9lnLd0vos=";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tailwindcss";
|
||||
version = "3.4.4";
|
||||
version = "3.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yaml2json";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bronze1man";
|
||||
repo = "yaml2json";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yVA5eV+/TxWN3wzsHy5++IGMAopkCz+PBfjSD+TNKc8=";
|
||||
hash = "sha256-SDKsmK2YVX+LiF0WQyZOQBpcHFVrBurzqf4xItIfmrE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g+yaVIx4jxpAQ/+WrGKxhVeliYx7nLQe/zsGpxV4Fn4=";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ytt";
|
||||
version = "0.49.1";
|
||||
version = "0.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-ytt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1W7pnljAzeIjXdjCj8nauvca4IGpsn0TmrKUNJtMg+E=";
|
||||
sha256 = "sha256-57SCBlA2IoBy0iygqunFPBS/nyLtl7e7GlA3vB+ED/4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.44.4";
|
||||
version = "1.45.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DQrN5x+UiY6lLY1h96sTWBhD0jrvNyCdTwHsyFo95VE=";
|
||||
hash = "sha256-9VEKv6GHcvrSjmJKE6tLY8/Lu9bWWw+vI57OwkQzuHs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QGBFDFZpOqPj/U1PhMaTZ3mI+d2jG6vYAkW6aNG4wyQ=";
|
||||
cargoHash = "sha256-XdT12nH0mYHbGqt613N+/r1nkTLLddFIEiXimoIixi4=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
||||
@@ -13,11 +13,11 @@ let
|
||||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.93.1";
|
||||
version = "0.97.0";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-ttbwIxzMgihfwwjh3usu7FxVTwLt7ceXU+MyaxXfkxk=";
|
||||
aarch64-linux = "sha256-rlyY4C4FMHTyPUzqHKYzToIs9tJunTXEor9wc/7zH/0=";
|
||||
x86_64-darwin = "sha256-IUDe0ogBSCaz1q+uXepOi883hamtJYqBPtNfrm/y6Qo=";
|
||||
aarch64-darwin = "sha256-53PuHq7AUi21cjopoFakzLuJyqSJ9VeF7g53IWxFXAI=";
|
||||
x86_64-linux = "sha256-6dWSE9EsihouhRTEnly5UJFcKXwR7GhoYJtOvgVHhXk=";
|
||||
aarch64-linux = "sha256-8IkFEnzpGuDHfHkRuybZ7rLhxOcI2y1p+3jlV45eqho=";
|
||||
x86_64-darwin = "sha256-UmmgJH//lbqgQuhcL3NSaJnyaACZmLf8I5Gg/dubdh8=";
|
||||
aarch64-darwin = "sha256-L8CR4oSTnxP5wo3aIoVXmgXDp/FHAs45ErLtEcno9AU=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "function-runner";
|
||||
version = "5.1.3";
|
||||
version = "5.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shopify";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U47kA2D2dvJu8ym1OT/ThSsNC22b5hJ0Kqxerg8RPSI=";
|
||||
sha256 = "sha256-nKOgXUwhOHaOnxycTsEReS/4y9DNpyqDKz7ohfAaJ3U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pznA7aTLrc4I5uElh+4Oxp3lXHRfV5YMn9abcaJSHIc=";
|
||||
cargoHash = "sha256-UDeHNIw7e+3zXO9Hggq3pVSDDp6iSoO8ikOl6RxZyb0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";
|
||||
|
||||
@@ -1,23 +1,26 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, openssl
|
||||
, keyutils
|
||||
, asciidoc
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
openssl,
|
||||
tpm2-tss,
|
||||
keyutils,
|
||||
asciidoc,
|
||||
libxslt,
|
||||
docbook_xsl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ima-evm-utils";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.code.sf.net/p/linux-ima/ima-evm-utils";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WPBG7v29JHZ+ZGeLgA2gtLzZmaG0Xdvpq+BZ6NriY+A=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-integrity";
|
||||
repo = "ima-evm-utils";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rS2KChYKHnaR17VKYXyb28AsWnLZ8CRoHhLOUejO8Z8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -30,8 +33,9 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
keyutils
|
||||
openssl
|
||||
tpm2-tss
|
||||
];
|
||||
|
||||
env.MANPAGE_DOCBOOK_XSL = "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl";
|
||||
@@ -39,8 +43,11 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)";
|
||||
mainProgram = "evmctl";
|
||||
homepage = "https://sourceforge.net/projects/linux-ima/";
|
||||
license = lib.licenses.gpl2Only;
|
||||
homepage = "https://github.com/linux-integrity/ima-evm-utils";
|
||||
license = with lib.licenses; [
|
||||
lgpl2Plus # libimaevm
|
||||
gpl2Plus # evmctl
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ nickcao ];
|
||||
};
|
||||
|
||||
@@ -196,7 +196,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "systemd";
|
||||
repo = "systemd-stable";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ah0678iNfy0c5NhHhjn0roY6RoM8OE0hWyEt+qEGKRQ=";
|
||||
};
|
||||
|
||||
@@ -492,7 +492,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266
|
||||
(lib.mesonOption "time-epoch" releaseTimestamp)
|
||||
|
||||
(lib.mesonOption "version-tag" version)
|
||||
(lib.mesonOption "version-tag" finalAttrs.version)
|
||||
(lib.mesonOption "mode" "release")
|
||||
(lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
|
||||
(lib.mesonOption "debug-shell" "${bashInteractive}/bin/bash")
|
||||
@@ -524,8 +524,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.mesonOption "sbat-distro" "nixos")
|
||||
(lib.mesonOption "sbat-distro-summary" "NixOS")
|
||||
(lib.mesonOption "sbat-distro-url" "https://nixos.org/")
|
||||
(lib.mesonOption "sbat-distro-pkgname" pname)
|
||||
(lib.mesonOption "sbat-distro-version" version)
|
||||
(lib.mesonOption "sbat-distro-pkgname" finalAttrs.pname)
|
||||
(lib.mesonOption "sbat-distro-version" finalAttrs.version)
|
||||
|
||||
# Users
|
||||
(lib.mesonOption "system-uid-max" "999")
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zed";
|
||||
version = "0.18.2";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "zed";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TavFN9gWetK1qIP2sBE1zT/dFW3q2j8jTR1vDWiJBHM=";
|
||||
hash = "sha256-vRU2svDkx6jQ0ZnyHKp4cwV4SS9a5WdrqP+pkSlZHb8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ko0SbpFHpy9a2GhQUeCwZyWxD7yHBnlQLDxk5hM6aG8=";
|
||||
vendorHash = "sha256-l3wu3IimmPQL4z7WOx+u9dO/AUKPV+lQkWMzphj2bbA=";
|
||||
|
||||
ldflags = [
|
||||
"-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'"
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tar2ext4";
|
||||
version = "0.12.4";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "hcsshim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aK1XZPHZSgTf6MTrJv+5SBr7FCT53VNXSTZQVnHM2GA=";
|
||||
sha256 = "sha256-BK70SPZdNptJ3MXMgkMkf6oLZEKeLCMKqOZrK1KP2YE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cmd/tar2ext4";
|
||||
|
||||
@@ -5,8 +5,9 @@
|
||||
, zlib
|
||||
, openssl
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, gcc-unwrapped
|
||||
, libjpeg8
|
||||
, libjpeg
|
||||
, libpng
|
||||
, fontconfig
|
||||
, stdenv
|
||||
@@ -39,13 +40,13 @@ let
|
||||
};
|
||||
|
||||
linuxAttrs = rec {
|
||||
version = "0.12.6-3";
|
||||
version = "0.12.6.1-3";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.archlinux-x86_64.pkg.tar.xz";
|
||||
sha256 = "sha256-6Ewu8sPRbqvYWj27mBlQYpEN+mb+vKT46ljrdEUxckI=";
|
||||
url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox_${version}.bookworm_amd64.deb";
|
||||
hash = "sha256-mLoNFXtQ028jvQ3t9MCqKMewxQ/NzcVKpba7uoGjlB0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
xorg.libXext
|
||||
@@ -57,16 +58,24 @@ let
|
||||
|
||||
(lib.getLib fontconfig)
|
||||
(lib.getLib gcc-unwrapped)
|
||||
(lib.getLib libjpeg8)
|
||||
(lib.getLib libjpeg)
|
||||
(lib.getLib libpng)
|
||||
];
|
||||
|
||||
unpackPhase = "tar -xf $src";
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
mkdir pkg
|
||||
dpkg-deb -x $src pkg
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r usr/bin usr/include usr/lib usr/share $out/
|
||||
|
||||
cp -r pkg/usr/local $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
{ stdenv, lib, fetchFromGitHub, qtwebkit, qtsvg, qtxmlpatterns
|
||||
, fontconfig, freetype, libpng, zlib, libjpeg, wrapQtAppsHook
|
||||
, openssl, libX11, libXext, libXrender }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.12.6";
|
||||
pname = "wkhtmltopdf";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wkhtmltopdf";
|
||||
repo = "wkhtmltopdf";
|
||||
rev = version;
|
||||
sha256 = "0m2zy986kzcpg0g3bvvm815ap9n5ann5f6bdy7pfj6jv482bm5mg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig freetype libpng zlib libjpeg openssl
|
||||
libX11 libXext libXrender
|
||||
qtwebkit qtsvg qtxmlpatterns
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
for f in src/image/image.pro src/pdf/pdf.pro ; do
|
||||
substituteInPlace $f --replace '$(INSTALL_ROOT)' ""
|
||||
done
|
||||
'';
|
||||
|
||||
# rewrite library path
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -change libwkhtmltox.0.dylib $out/lib/libwkhtmltox.0.dylib $out/bin/wkhtmltopdf
|
||||
install_name_tool -change libwkhtmltox.0.dylib $out/lib/libwkhtmltox.0.dylib $out/bin/wkhtmltoimage
|
||||
'';
|
||||
|
||||
configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wkhtmltopdf.org/";
|
||||
description = "Tools for rendering web pages to PDF or images";
|
||||
longDescription = ''
|
||||
wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools
|
||||
to render HTML into PDF and various image formats using the QT Webkit
|
||||
rendering engine. These run entirely "headless" and do not require a
|
||||
display or display service.
|
||||
|
||||
There is also a C library, if you're into that kind of thing.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jb55 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keymapper";
|
||||
version = "4.4.2";
|
||||
version = "4.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "houmain";
|
||||
repo = "keymapper";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-JMDUsWjzqe7JaOqowMmgG3sVJt54YSM75uS9TeF7bsc=";
|
||||
hash = "sha256-TNUln6K8iECtucCLZ7NIFqVsHX/FS32otabxmuRANq8=";
|
||||
};
|
||||
|
||||
# all the following must be in nativeBuildInputs
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cfspeedtest";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "code-inflation";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-55g3dskYlAJNnoLwjTL0XvpDIk2l53EQ+CZ1MzhuxNI=";
|
||||
hash = "sha256-rJTECX6JgIoOFpUWK4jYF6duGfhFn6SCNsHzotq5Fhg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lTYiL5kCm9NClN4YjIlHz6aQlEwrESE25lOdJGkLMDA=";
|
||||
cargoHash = "sha256-XVXHVkwkVYaETN4NAcZkoSQJJK3FxuD4uk7hll47pLM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial CLI for speed.cloudflare.com";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "auth";
|
||||
version = "2.155.1";
|
||||
version = "2.155.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "auth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W2hJw/cn6Ss5LBBIJ7q0t5wbEHJ7WaGGvxrfRQ84Y8A=";
|
||||
hash = "sha256-nqPLXBoEQ9rtxA0hxz5PmWWX4xWal5iBzoV1Vl3Sns8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qL1uHUNw0QqAswnP2E2UrdJKao9ow8HHVWPK010LVgI=";
|
||||
vendorHash = "sha256-ttdrHBA6Dybv+oNljIJpOlA2CZPwTIi9fI32w5Khp9Y=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "himitsu";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "himitsu";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-jDxQajc8Kyfihm8q3wCpA+WsbAkQEZerLckLQXNhTa8=";
|
||||
hash = "sha256-+GQgRPJut+3zvzSyTGujTbbwJNNgHtFxAoEEwU0lbfU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oauth2c";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudentity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sxaInCsW3MKOYV3TscJYGwzSncg5TUW9YVheuxoO1h4=";
|
||||
hash = "sha256-zesN3MDBxeMGX7sbIKHTkvEWJZ9mbUtthL5veEeKAfo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PdLh/J0HUvr1JjW/ew5PQe9TJNykI4tJhlRoVjRT/hg=";
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.21";
|
||||
version = "2.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Rk1Et/wPREF4IMbLQhqCmWDDiMjVpiJ6xEOj6YBYbwY=";
|
||||
sha256 = "sha256-W1VfJiQHgYp3KzLaXYIJfvNRHKNZ7NxFr4WbBUtwh8k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-l/DJvm8r1xr4W/PNQcORfVV8LZEF+o/XEpU5FrboQM8=";
|
||||
cargoHash = "sha256-N9xQqMFd14tkRGYrRUvqg9Y6rqnWwukutD3nv61gKuc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supercronic";
|
||||
version = "0.2.29";
|
||||
version = "0.2.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aptible";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cYKVeWZEjWV5j68aTpBOE/z+5QcMBh5ovyXoV/u80o4=";
|
||||
hash = "sha256-gey5d+Dxmk7TS0miWRjeWMxW+qYrAPVYGHcHNYrYwK4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uQFceysbRdcSaFvdfdFcJX6yzPWE26YYiVzAEISQeCc=";
|
||||
vendorHash = "sha256-ebUsnPpvQ/AK3C7MbGnXWSiuoXrjhQ2uZhj1OtRGeWU=";
|
||||
|
||||
excludedPackages = [ "cronexpr/cronexpr" ];
|
||||
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scraper";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-HfZ8zyjghTXIyIYS+MaGF5OdMLJv6NIjQswdn/tvQbU=";
|
||||
hash = "sha256-RxNnKejGd5Jr7ZOXnYGHbV/0mS2e4zKzSpTbsyOPXqw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-py8VVciNJ36/aSTlTH+Bx36yrh/8AuzB9XNNv/PrFak=";
|
||||
cargoHash = "sha256-ld+1O+oYGm/R+bCK/pEc/pDl/ev1zEp8HgSOkilgWgk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3, libreoffice-unwrapped, asciidoc, makeWrapper
|
||||
{ lib, stdenv, fetchFromGitHub, libreoffice-unwrapped, asciidoc, makeWrapper
|
||||
# whether to install odt2pdf/odt2doc/... symlinks to unoconv
|
||||
, installSymlinks ? true
|
||||
}:
|
||||
|
||||
# IMPORTANT: unoconv must use the same python version as libreoffice (unless it
|
||||
# will not be able to load the pyuno module from libreoffice).
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unoconv";
|
||||
version = "0.9.0";
|
||||
@@ -24,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
sed -i "s|/usr/bin/env python.*|${python3}/bin/${python3.executable}|" "$out/bin/unoconv"
|
||||
sed -i "s|/usr/bin/env python.*|${libreoffice-unwrapped.python.interpreter}|" "$out/bin/unoconv"
|
||||
wrapProgram "$out/bin/unoconv" \
|
||||
--set-default UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/"
|
||||
'' + lib.optionalString installSymlinks ''
|
||||
|
||||
@@ -9706,10 +9706,6 @@ with pkgs;
|
||||
|
||||
md2gemini = with python3.pkgs; toPythonApplication md2gemini;
|
||||
|
||||
mdbook = callPackage ../tools/text/mdbook {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
mdbook-emojicodes = callPackage ../tools/text/mdbook-emojicodes { };
|
||||
|
||||
mdbook-epub = callPackage ../tools/text/mdbook-epub {
|
||||
@@ -14439,11 +14435,8 @@ with pkgs;
|
||||
|
||||
wireguard-go = callPackage ../tools/networking/wireguard-go { };
|
||||
|
||||
wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { };
|
||||
|
||||
wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { };
|
||||
wkhtmltopdf = wkhtmltopdf-bin;
|
||||
|
||||
wml = callPackage ../development/web/wml { };
|
||||
|
||||
@@ -32094,8 +32087,6 @@ with pkgs;
|
||||
|
||||
lls = callPackage ../applications/networking/lls { };
|
||||
|
||||
localsend = callPackage ../applications/networking/localsend { };
|
||||
|
||||
lmms = libsForQt5.callPackage ../applications/audio/lmms {
|
||||
lame = null;
|
||||
libsoundio = null;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user