Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
@@ -26313,6 +26313,13 @@
|
||||
githubId = 3742502;
|
||||
name = "Oscar Molnar";
|
||||
};
|
||||
typedrat = {
|
||||
name = "Alexis Williams";
|
||||
email = "alexis@typedr.at";
|
||||
github = "typedrat";
|
||||
githubId = 1057789;
|
||||
matrix = "@typedrat:thisratis.gay";
|
||||
};
|
||||
typetetris = {
|
||||
email = "ericwolf42@mail.com";
|
||||
github = "typetetris";
|
||||
|
||||
+2
-2
@@ -219,14 +219,14 @@ let
|
||||
let
|
||||
escapedName = ''"${replaceStrings [ ''"'' "\\" ] [ ''\"'' "\\\\" ] name}"'';
|
||||
in
|
||||
recurse (prefix + "." + escapedName) item.${name}
|
||||
recurse (prefix + (if prefix == "." then "" else ".") + escapedName) item.${name}
|
||||
) (attrNames item)
|
||||
else if isList item then
|
||||
imap0 (index: item: recurse (prefix + "[${toString index}]") item) item
|
||||
else
|
||||
[ ];
|
||||
in
|
||||
listToAttrs (flatten (recurse "" item));
|
||||
listToAttrs (flatten (recurse "." item));
|
||||
|
||||
/*
|
||||
Takes an attrset and a file path and generates a bash snippet that
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
}:
|
||||
let
|
||||
cfg = config.services.sssd;
|
||||
nscd = config.services.nscd;
|
||||
|
||||
dataDir = "/var/lib/sssd";
|
||||
settingsFile = "${dataDir}/sssd.conf";
|
||||
@@ -106,18 +105,36 @@ in
|
||||
config.environment.etc."nscd.conf".source
|
||||
settingsFileUnsubstituted
|
||||
];
|
||||
script = ''
|
||||
export LDB_MODULES_PATH+="''${LDB_MODULES_PATH+:}${pkgs.ldb}/modules/ldb:${pkgs.sssd}/modules/ldb"
|
||||
mkdir -p /var/lib/sss/{pubconf,db,mc,pipes,gpo_cache,secrets} /var/lib/sss/pipes/private /var/lib/sss/pubconf/krb5.include.d
|
||||
${pkgs.sssd}/bin/sssd -D -c ${settingsFile}
|
||||
'';
|
||||
environment.LDB_MODULES_PATH = "${pkgs.ldb}/modules/ldb:${pkgs.sssd}/modules/ldb";
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
# systemd needs to start sssd directly for "NotifyAccess=main" to work
|
||||
ExecStart = "${pkgs.sssd}/bin/sssd -i -c ${settingsFile}";
|
||||
Type = "notify";
|
||||
NotifyAccess = "main";
|
||||
PIDFile = "/run/sssd.pid";
|
||||
CapabilityBoundingSet = [
|
||||
"CAP_IPC_LOCK"
|
||||
"CAP_CHOWN"
|
||||
"CAP_DAC_READ_SEARCH"
|
||||
"CAP_KILL"
|
||||
"CAP_NET_ADMIN"
|
||||
"CAP_SYS_NICE"
|
||||
"CAP_FOWNER"
|
||||
"CAP_SETGID"
|
||||
"CAP_SETUID"
|
||||
"CAP_SYS_ADMIN"
|
||||
"CAP_SYS_RESOURCE"
|
||||
"CAP_BLOCK_SUSPEND"
|
||||
];
|
||||
Restart = "on-abnormal";
|
||||
StateDirectory = baseNameOf dataDir;
|
||||
# We cannot use LoadCredential here because it's not available in ExecStartPre
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
|
||||
};
|
||||
unitConfig = {
|
||||
StartLimitIntervalSec = "50s";
|
||||
StartLimitBurst = 5;
|
||||
};
|
||||
preStart = ''
|
||||
mkdir -p "${dataDir}/conf.d"
|
||||
[ -f ${settingsFile} ] && rm -f ${settingsFile}
|
||||
@@ -127,6 +144,7 @@ in
|
||||
-o ${settingsFile} \
|
||||
-i ${settingsFileUnsubstituted}
|
||||
umask $old_umask
|
||||
mkdir -p /var/lib/sss/{pubconf,db,mc,pipes,gpo_cache,secrets} /var/lib/sss/pipes/private /var/lib/sss/pubconf/krb5.include.d
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -147,6 +165,14 @@ in
|
||||
serviceConfig = {
|
||||
ExecStartPre = "-${pkgs.sssd}/bin/sssd --genconf-section=kcm";
|
||||
ExecStart = "${pkgs.sssd}/libexec/sssd/sssd_kcm --uid 0 --gid 0";
|
||||
CapabilityBoundingSet = [
|
||||
"CAP_IPC_LOCK"
|
||||
"CAP_CHOWN"
|
||||
"CAP_DAC_READ_SEARCH"
|
||||
"CAP_FOWNER"
|
||||
"CAP_SETGID"
|
||||
"CAP_SETUID"
|
||||
];
|
||||
};
|
||||
restartTriggers = [
|
||||
settingsFileUnsubstituted
|
||||
|
||||
@@ -49,13 +49,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clementine";
|
||||
version = "1.4.1-48-g12e851937";
|
||||
version = "1.4.1-49-g263b4f7b4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clementine-player";
|
||||
repo = "Clementine";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-L8ANz4lGXO7q9MyFJjhZr4cQpOkAl7NHbrzOm7lPVBs=";
|
||||
hash = "sha256-ESmo/USm+mML6Go5QWDoGaHS6uLHIKlVS+3CNFhRtVQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,6 +19,10 @@ lib.packagesFromDirectoryRecursive {
|
||||
inherit (pkgs) aria2;
|
||||
};
|
||||
|
||||
eaf-git = callPackage ./manual-packages/eaf-git {
|
||||
inherit (pkgs) ripgrep;
|
||||
};
|
||||
|
||||
elpaca = callPackage ./manual-packages/elpaca { inherit (pkgs) git; };
|
||||
|
||||
emacs-application-framework = callPackage ./manual-packages/emacs-application-framework {
|
||||
|
||||
@@ -45,6 +45,7 @@ melpaBuild (finalAttrs: {
|
||||
|
||||
postInstall = ''
|
||||
LISPDIR=$out/share/emacs/site-lisp/elpa/${finalAttrs.ename}-${finalAttrs.melpaVersion}
|
||||
touch node_modules/.nosearch
|
||||
cp -r node_modules $LISPDIR/
|
||||
'';
|
||||
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
{
|
||||
# Basic
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
# Dependencies
|
||||
delta,
|
||||
ripgrep,
|
||||
# Java Script dependency
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
# Updater
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
melpaBuild (finalAttrs: {
|
||||
|
||||
pname = "eaf-git";
|
||||
version = "0-unstable-2025-07-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eaf";
|
||||
repo = "eaf-git";
|
||||
rev = "24c3887075630a21d0a53ddb95b01ef70694f03a";
|
||||
hash = "sha256-ggxgwMTk46WDLKxrNkzX3pSO/yLoLTJVH08T4o70fEM=";
|
||||
};
|
||||
|
||||
env.npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-kbFnPZlFqoE1Q/KKVW5ZI4HPPWsIjXA/jne2jw7BeEc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
npm run build
|
||||
'';
|
||||
|
||||
files = ''
|
||||
("*.el"
|
||||
"*.py"
|
||||
"*.js"
|
||||
"src")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
LISPDIR=$out/share/emacs/site-lisp/elpa/${finalAttrs.ename}-${finalAttrs.melpaVersion}
|
||||
touch node_modules/.nosearch
|
||||
cp -r node_modules $LISPDIR/
|
||||
cp -r dist $LISPDIR/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
eafPythonDeps =
|
||||
ps: with ps; [
|
||||
charset-normalizer
|
||||
giturlparse
|
||||
pygit2
|
||||
pygments
|
||||
unidiff
|
||||
];
|
||||
eafOtherDeps = [
|
||||
delta
|
||||
ripgrep
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Git client for the EAF";
|
||||
homepage = "https://github.com/emacs-eaf/eaf-git";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
thattemperature
|
||||
];
|
||||
};
|
||||
|
||||
})
|
||||
+1
@@ -42,6 +42,7 @@ melpaBuild (finalAttrs: {
|
||||
|
||||
postInstall = ''
|
||||
LISPDIR=$out/share/emacs/site-lisp/elpa/${finalAttrs.ename}-${finalAttrs.melpaVersion}
|
||||
touch node_modules/.nosearch
|
||||
cp -r node_modules $LISPDIR/
|
||||
'';
|
||||
|
||||
|
||||
@@ -1570,6 +1570,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
blink-cmp-latex = buildVimPlugin {
|
||||
pname = "blink-cmp-latex";
|
||||
version = "2025-05-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "erooke";
|
||||
repo = "blink-cmp-latex";
|
||||
rev = "3a958361e275bb5996e8393e7b2595b2f40c15ca";
|
||||
sha256 = "1f761ljnlngql4vj5hdjbdrdrshl1xg2lj46a485in84f8lg5gdq";
|
||||
};
|
||||
meta.homepage = "https://github.com/erooke/blink-cmp-latex/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
blink-cmp-npm-nvim = buildVimPlugin {
|
||||
pname = "blink-cmp-npm.nvim";
|
||||
version = "2025-05-18";
|
||||
@@ -2625,14 +2638,14 @@ final: prev: {
|
||||
|
||||
cmp-pandoc-references = buildVimPlugin {
|
||||
pname = "cmp-pandoc-references";
|
||||
version = "2022-04-20";
|
||||
version = "2025-04-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jc-doyle";
|
||||
owner = "jmbuhr";
|
||||
repo = "cmp-pandoc-references";
|
||||
rev = "2c808dff631a783ddd2c554c4c6033907589baf6";
|
||||
sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw";
|
||||
rev = "130eae4f75029d6495808e0ea4b769fa1ce4c9ac";
|
||||
sha256 = "1mvgqmy2s6ba2w0gaq8vpj9ihd1l94zrfg09h90n9kj9cdw6gisy";
|
||||
};
|
||||
meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/";
|
||||
meta.homepage = "https://github.com/jmbuhr/cmp-pandoc-references/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
|
||||
@@ -119,6 +119,7 @@ https://github.com/disrupted/blink-cmp-conventional-commits/,HEAD,
|
||||
https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD,
|
||||
https://github.com/Kaiser-Yang/blink-cmp-dictionary/,HEAD,
|
||||
https://github.com/Kaiser-Yang/blink-cmp-git/,HEAD,
|
||||
https://github.com/erooke/blink-cmp-latex/,HEAD,
|
||||
https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/,HEAD,
|
||||
https://github.com/ribru17/blink-cmp-spell/,HEAD,
|
||||
https://github.com/archie-judd/blink-cmp-words/,HEAD,
|
||||
@@ -199,7 +200,7 @@ https://github.com/hrsh7th/cmp-nvim-lua/,,
|
||||
https://github.com/quangnguyen30192/cmp-nvim-tags/,HEAD,
|
||||
https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,,
|
||||
https://github.com/hrsh7th/cmp-omni/,,
|
||||
https://github.com/jc-doyle/cmp-pandoc-references/,,
|
||||
https://github.com/jmbuhr/cmp-pandoc-references/,,
|
||||
https://github.com/aspeddro/cmp-pandoc.nvim/,HEAD,
|
||||
https://github.com/hrsh7th/cmp-path/,,
|
||||
https://github.com/lukas-reineke/cmp-rg/,HEAD,
|
||||
|
||||
@@ -26,11 +26,11 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-8gOAcyG1gPLK7YLBMgdKJbyF32gbm7mFa4oXJPQIWUI=";
|
||||
x86_64-darwin = "sha256-r9+PYN/1QFviNobsN/cmU7icXqoYYUXx7tVqqfsJgEw=";
|
||||
aarch64-linux = "sha256-3O3tNOiF77W1uNX6XxiCMy8CCowCPyimPLaQ0m73Ej4=";
|
||||
aarch64-darwin = "sha256-NpIC4KM+BUyzsjvgLjIMXkfgEvKqz67P0tNoMd0vsMA=";
|
||||
armv7l-linux = "sha256-GIRyfhGMBALf/bvKAKIm6DgyL9o50CEgXhKFNegLfd4=";
|
||||
x86_64-linux = "sha256-8gX4dyNL9meXZfYCDvnnurD51A35c/6WY2nlRVb6AyY=";
|
||||
x86_64-darwin = "sha256-bbu/X4M2Yxm8HsdeJzgU77L87XbUQW+Laq1tYPqMw+M=";
|
||||
aarch64-linux = "sha256-fKNIk6W5w9WAb4IoB03Pzz7pHwN+12YNUnRuI3ErJJw=";
|
||||
aarch64-darwin = "sha256-+DtwJSlVxDrza5K55ZOd18isaoDVUu8j0pMBr/Us6FI=";
|
||||
armv7l-linux = "sha256-QmAsja9eU9VEi38vtsCS0uXf5xHKjyI5IIEIi3qyDmE=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.103.05312";
|
||||
version = "1.103.15418";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@@ -1,158 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
dpkg,
|
||||
autoPatchelfHook,
|
||||
alsa-lib,
|
||||
at-spi2-core,
|
||||
libtool,
|
||||
libxkbcommon,
|
||||
nspr,
|
||||
libgbm,
|
||||
libtiff,
|
||||
udev,
|
||||
gtk3,
|
||||
qtbase,
|
||||
xorg,
|
||||
cups,
|
||||
pango,
|
||||
runCommandLocal,
|
||||
curl,
|
||||
coreutils,
|
||||
cacert,
|
||||
libjpeg,
|
||||
useChineseVersion ? false,
|
||||
}:
|
||||
let
|
||||
pkgVersion = "11.1.0.11723";
|
||||
url =
|
||||
if useChineseVersion then
|
||||
"https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}_amd64.deb"
|
||||
else
|
||||
"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-vpXK8YyjqhFdmtajO6ZotYACpe5thMct9hwUT3advUM="
|
||||
else
|
||||
"sha256-o8njvwE/UsQpPuLyChxGAZ4euvwfuaHxs5pfUvcM7kI=";
|
||||
uri = builtins.replaceStrings [ "https://wps-linux-personal.wpscdn.cn" ] [ "" ] url;
|
||||
securityKey = "7f8faaaa468174dc1c9cd62e5f218a5b";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wpsoffice";
|
||||
version = pkgVersion;
|
||||
|
||||
src =
|
||||
runCommandLocal
|
||||
(
|
||||
if useChineseVersion then
|
||||
"wps-office_${version}_amd64.deb"
|
||||
else
|
||||
"wps-office_${version}.XA_amd64.deb"
|
||||
)
|
||||
{
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = hash;
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
coreutils
|
||||
];
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
}
|
||||
''
|
||||
timestamp10=$(date '+%s')
|
||||
md5hash=($(echo -n "${securityKey}${uri}$timestamp10" | md5sum))
|
||||
|
||||
curl \
|
||||
--retry 3 --retry-delay 3 \
|
||||
"${url}?t=$timestamp10&k=$md5hash" \
|
||||
> $out
|
||||
'';
|
||||
|
||||
unpackCmd = "dpkg -x $src .";
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
at-spi2-core
|
||||
libtool
|
||||
libjpeg
|
||||
libxkbcommon
|
||||
nspr
|
||||
libgbm
|
||||
libtiff
|
||||
udev
|
||||
gtk3
|
||||
qtbase
|
||||
xorg.libXdamage
|
||||
xorg.libXtst
|
||||
xorg.libXv
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
runtimeDependencies = map lib.getLib [
|
||||
cups
|
||||
pango
|
||||
];
|
||||
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
# distribution is missing libkappessframework.so
|
||||
"libkappessframework.so"
|
||||
# qt4 support is deprecated
|
||||
"libQtCore.so.4"
|
||||
"libQtNetwork.so.4"
|
||||
"libQtXml.so.4"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
prefix=$out/opt/kingsoft/wps-office
|
||||
mkdir -p $out
|
||||
cp -r opt $out
|
||||
cp -r usr/* $out
|
||||
for i in wps wpp et wpspdf; do
|
||||
substituteInPlace $out/bin/$i \
|
||||
--replace /opt/kingsoft/wps-office $prefix
|
||||
done
|
||||
for i in $out/share/applications/*;do
|
||||
substituteInPlace $i \
|
||||
--replace /usr/bin $out/bin
|
||||
done
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# The following libraries need libtiff.so.5, but nixpkgs provides libtiff.so.6
|
||||
patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so,addons/pdfbatchcompression/libpdfbatchcompressionapp.so}
|
||||
patchelf --add-needed libtiff.so $out/opt/kingsoft/wps-office/office6/libwpsmain.so
|
||||
# Fix: Wrong JPEG library version: library is 62, caller expects 80
|
||||
patchelf --add-needed libjpeg.so $out/opt/kingsoft/wps-office/office6/libwpsmain.so
|
||||
# dlopen dependency
|
||||
patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Office suite, formerly Kingsoft Office";
|
||||
homepage = "https://www.wps.com";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
hydraPlatforms = [ ];
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [
|
||||
mlatus
|
||||
th0rgal
|
||||
rewine
|
||||
pokon548
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -10,6 +10,7 @@ const path = require('path')
|
||||
const lockfile = require('./yarnpkg-lockfile.js')
|
||||
const { promisify } = require('util')
|
||||
const url = require('url')
|
||||
const { URL } = url;
|
||||
const { urlToName } = require('./common.js')
|
||||
|
||||
const execFile = promisify(child_process.execFile)
|
||||
@@ -20,7 +21,7 @@ const exec = async (...args) => {
|
||||
return res
|
||||
}
|
||||
|
||||
const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => {
|
||||
const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha1') => {
|
||||
return new Promise((resolve, reject) => {
|
||||
const get = (url, redirects = 0) => https.get(url, (res) => {
|
||||
if(redirects > 10) {
|
||||
@@ -28,7 +29,9 @@ const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => {
|
||||
return;
|
||||
}
|
||||
if(res.statusCode === 301 || res.statusCode === 302) {
|
||||
return get(res.headers.location, redirects + 1)
|
||||
const location = new URL(res.headers.location, url);
|
||||
if (verbose) console.log('following redirect to ' + location);
|
||||
return get(location, redirects + 1);
|
||||
}
|
||||
const file = fs.createWriteStream(fileName)
|
||||
const hash = crypto.createHash(hashType)
|
||||
@@ -119,9 +122,9 @@ const downloadPkg = (pkg, verbose) => {
|
||||
} else if (url.startsWith('https://')) {
|
||||
if (typeof pkg.integrity === 'string' || pkg.integrity instanceof String) {
|
||||
const [ type, checksum ] = pkg.integrity.split('-')
|
||||
return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), type)
|
||||
return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), verbose, type)
|
||||
}
|
||||
return downloadFileHttps(fileName, url, hash)
|
||||
return downloadFileHttps(fileName, url, hash, verbose)
|
||||
} else if (url.startsWith('file:')) {
|
||||
console.warn(`ignoring unsupported file:path url "${url}"`)
|
||||
} else {
|
||||
|
||||
@@ -9,15 +9,15 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.63";
|
||||
version = "0.107.64";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = "AdGuardHome";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yu+rw1is5Egs1O2mww8MGe48Cl74j7RULm4FB2JhQN4=";
|
||||
hash = "sha256-UmgWRei3qVkPLtusnXDGeaobxMy1a3Nlb1kBqkcmpxA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9w2P3kNSf8I6tGq3K0ULoV+qeq3rUzrevDC+mktfsis=";
|
||||
vendorHash = "sha256-EKQGbDLaEZGthdBr+Fj5pZ2TBCQ1Df+L9uuI0y/k7XU=";
|
||||
|
||||
dashboard = buildNpmPackage {
|
||||
inherit (finalAttrs) src;
|
||||
|
||||
@@ -19,4 +19,4 @@ echo "got schema_version $schema_version"
|
||||
|
||||
nix-update --subpackage dashboard adguardhome --version $version
|
||||
|
||||
sed -i -r -e "s/schema_version\s*?=\s*?.*?;/schema_version = ${schema_version};/" "$dirname/default.nix"
|
||||
sed -i -r -e "s/schema_version\s*?=\s*?.*?;/schema_version = ${schema_version};/" "$dirname/package.nix"
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "basedpyright";
|
||||
version = "1.31.1";
|
||||
version = "1.31.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "detachhead";
|
||||
repo = "basedpyright";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-chwIsjMg91fLZ0VRSUo3ydtHXVNKtjqX539b0IlOPI4=";
|
||||
hash = "sha256-esP/N+nKcRTW5WdlNzQDOlFZ1VLJUtqxYjDGngzxlSk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-aJte4ApeXJQ9EYn87Uo+Xx7s+wi80I1JsZHeqklHGs4=";
|
||||
npmDepsHash = "sha256-ZVni3s5LwnpFnPshKT7DMms2UE3Pu6Oz03eOnMFHvyk=";
|
||||
npmWorkspace = "packages/pyright";
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -1,58 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromSavannah,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
texinfo,
|
||||
texliveBasic,
|
||||
ghostscript,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "c-intro-and-ref";
|
||||
version = "0-unstable-2025-03-09";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromSavannah {
|
||||
repo = "c-intro-and-ref";
|
||||
rev = "11723f5d07331708985dfd3eb9b05163dde990e5";
|
||||
hash = "sha256-quTeOQKTX/Aq78vMJPsjVQyisADzWm9mtLE1HoJByl4=";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-45mtnlyz2RuYUk4Jza+lZGGBxezpiRS/v70xx1iKxEQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
texinfo
|
||||
ghostscript
|
||||
texliveBasic
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
"c.info"
|
||||
"c.dvi"
|
||||
"c.pdf"
|
||||
# FIXME: Not a HASH reference at (texinfo)/share/texinfo/Texinfo/Convert/DocBook.pm
|
||||
# "c.doc"
|
||||
"c.html"
|
||||
"c.html.d"
|
||||
"c.txt"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
dst_info=$out/share/info
|
||||
dst_doc=$out/share/doc/c-intro-and-ref
|
||||
mkdir -p $dst_info
|
||||
mkdir -p $dst_doc
|
||||
|
||||
cp -prv -t $dst_info \
|
||||
c.info c.info-*
|
||||
cp -prv -t $dst_doc \
|
||||
c.dvi \
|
||||
c.pdf \
|
||||
c.html \
|
||||
c.html.d \
|
||||
c.txt
|
||||
runHook postInstall
|
||||
# Remove pre-built documentaton artifacts
|
||||
postConfigure = ''
|
||||
make clean
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
buildFlags = [
|
||||
"c.dvi"
|
||||
"c.html"
|
||||
];
|
||||
|
||||
# Build missing targets
|
||||
postBuild = ''
|
||||
makeinfo --html --no-split c.texi -o c.htm
|
||||
makeinfo --plaintext c.texi -o c.txt
|
||||
'';
|
||||
|
||||
# FIXME: Not a HASH reference at (texinfo)/share/texinfo/Texinfo/Convert/DocBook.pm
|
||||
# Occurs when building "c.doc"
|
||||
# makeinfo --docbook c.texi -o c.doc
|
||||
|
||||
# Install missing targets
|
||||
postInstall = ''
|
||||
install -Dm644 c.htm $out/share/doc/c-intro-and-ref/c.html
|
||||
install -Dm644 c.txt -t $out/share/doc/c-intro-and-ref/
|
||||
install -Dm644 c.html/* -t $out/share/doc/c-intro-and-ref/c.html.d/
|
||||
install -Dm644 c.dvi -t $out/share/doc/c-intro-and-ref/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GNU C Language Intro and Reference Manual";
|
||||
@@ -63,9 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
a reference manual.
|
||||
'';
|
||||
homepage = "https://www.gnu.org/software/c-intro-and-ref/";
|
||||
changelog = "https://git.savannah.nongnu.org/cgit/c-intro-and-ref.git/plain/ChangeLog?id=${finalAttrs.src.rev}";
|
||||
license = lib.licenses.fdl13Plus;
|
||||
maintainers = with lib.maintainers; [ rc-zb ];
|
||||
maintainers = with lib.maintainers; [
|
||||
normalcea
|
||||
rc-zb
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-supply-chain";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-secure-code";
|
||||
repo = "cargo-supply-chain";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KjeYB9TFbuJ2KPaObeM0ADs5F8uJJ6/czMPQjBUgIk8=";
|
||||
hash = "sha256-LTr7Y1SHk56ltYAA6AESAiWD0Rr15cY1BtOyhM4Q5iE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fsW3qTyFMcj/OTouOah1ZFskw075V8jBwhs02AxY7kU=";
|
||||
cargoHash = "sha256-Lk08Avmx563A2Ka5J/TqxY3FRNgbKRSsIpJWYlcLt0E=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gather author, contributor and publisher data on crates in your dependency graph";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "certigo";
|
||||
version = "1.16.0";
|
||||
version = "1.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "square";
|
||||
repo = "certigo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+j1NeQJPDwQxXVYnHNmL49Li2IMH+9ehS0HSM3kqyxU=";
|
||||
sha256 = "sha256-dn2GqEiSzlcqNPoAZhPESRsl3LOUBlaPs59rUjf2c5k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G9YpMF4qyL8eJPnai81ihVTDK9E4meKxdpk+rjISnIM=";
|
||||
vendorHash = "sha256-hBuR6a0gBhuYICbuiHxJdbDr4hLF4mQvIcMr5FHfOu8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utility to examine and validate certificates in a variety of formats";
|
||||
|
||||
@@ -16,20 +16,20 @@ let
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/d01860bc5f5a36b62f8a77cd42578126270db343/linux/x64/Cursor-1.4.2-x86_64.AppImage";
|
||||
hash = "sha256-WMZA0CjApcSTup4FLIxxaO7hMMZrJPawYsfCXnFK4EE=";
|
||||
url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/linux/x64/Cursor-1.4.5-x86_64.AppImage";
|
||||
hash = "sha256-2Hz1tXC+YkIIHWG1nO3/84oygH+wvaUtTXqvv19ZAz4=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/d01860bc5f5a36b62f8a77cd42578126270db343/linux/arm64/Cursor-1.4.2-aarch64.AppImage";
|
||||
hash = "sha256-JuEu+QVz6b0iEz711mQSZ1UyVqFeFk6knQEjZxGr3+g=";
|
||||
url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/linux/arm64/Cursor-1.4.5-aarch64.AppImage";
|
||||
hash = "sha256-kKoOSxLsgeM2FJRW2HlCinhz6Ij6lpVsbWxQmTiMBSs=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/d01860bc5f5a36b62f8a77cd42578126270db343/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-TvPNU9GSNBvksEvwLcpirUu/rSc67bf00Usp+2T71lk=";
|
||||
url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-fX8ukEWKS2prNz+UopZ9a4uhDLoGYuXa6P8cSJqBang=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/d01860bc5f5a36b62f8a77cd42578126270db343/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-AmNTIXQXdhnu31L5gtYGNFmICvGJkPRiz3yJJ0yw4kM=";
|
||||
url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-J/by3BOoIV2HUtcCqaCEJoPzqcFFooc/zShSmEBSw/Q=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ in
|
||||
inherit useVSCodeRipgrep;
|
||||
commandLineArgs = finalCommandLineArgs;
|
||||
|
||||
version = "1.4.2";
|
||||
version = "1.4.5";
|
||||
pname = "cursor";
|
||||
|
||||
# You can find the current VSCode version in the About dialog:
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "databricks-cli";
|
||||
version = "0.263.0";
|
||||
version = "0.264.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-bRHZGoO7+k7HoXcyJMusqDnn3XoAesgZ280j8jNgQYY=";
|
||||
hash = "sha256-tPX0QOtNsRf8W0jP8BLL3QE3FDFq12WpObwra+FjH9I=";
|
||||
};
|
||||
|
||||
# Otherwise these tests fail asserting that the version is 0.0.0-dev
|
||||
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
|
||||
--replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-sJyinqKX4irO4rquJ1hxDU/GH4XcyxPGw7qH0ZLgdxU=";
|
||||
vendorHash = "sha256-Uv2B9Z2qfuGEjTo4Jcwf0ygB+keWQixeymZrT+KdHlg=";
|
||||
|
||||
excludedPackages = [
|
||||
"bundle/internal"
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libsodium,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "equihash";
|
||||
version = "1.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stef";
|
||||
repo = "equihash";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s16MwWH/xYLl7MSayXLoQUtuTv4GsQgq+qbI14igcv8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ libsodium ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Memory-hard PoW with fast verification";
|
||||
homepage = "https://github.com/stef/equihash/";
|
||||
license = lib.licenses.cc0;
|
||||
teams = [ lib.teams.ngi ];
|
||||
# ld -z not available on darwin
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -1,31 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitLab,
|
||||
fetchpatch2,
|
||||
lv2,
|
||||
lv2lint,
|
||||
pkg-config,
|
||||
python3,
|
||||
wafHook,
|
||||
meson,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fomp";
|
||||
version = "1.2.2";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-xnGijydiO3B7BjSlryFuH1j/OPio9hCYbniq2IXp2W8=";
|
||||
src = fetchFromGitLab {
|
||||
owner = "drobilla";
|
||||
repo = "fomp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8rkAV+RJS9vQV+9+swclAP0QBjBDT2tKeLWHxwpUrlk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.com/drobilla/fomp/-/commit/f8e4e1e0b1abe3afd2ea17b13795bbe871fccece.patch";
|
||||
hash = "sha256-uJpUwTEBOp0Zo7zKT9jekhtkg9okUvGTavLIQmNKutU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wafHook
|
||||
meson
|
||||
ninja
|
||||
lv2lint
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
lv2
|
||||
python3
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://drobilla.net/software/fomp.html";
|
||||
description = "LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gcsfuse";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlecloudplatform";
|
||||
repo = "gcsfuse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xTICtyx6YPBe3hfme29M9pX/fX/w+/0pZWUMCbA6ajs=";
|
||||
hash = "sha256-O+wkNb48+8kI8PBhDCkQvhVmApXFrVgNd31B6IMe8JA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eTtKjGDJwRJzIb0qLp/HHLc8cYdd3HdWuivVUZOYEBU=";
|
||||
vendorHash = "sha256-NUT1VGQ17cBDjdZVxBEqh7UJUGw5G5EtqpF7LXkXAH8=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
python3Packages,
|
||||
sops,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "github-to-sops";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarasglek";
|
||||
repo = "github-to-sops";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HwJay5GaEWhXBsRijSgxX+FMKX7wIwssDVoekPKJ67M=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
sops
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "use-compliant-license-schema.patch";
|
||||
url = "https://github.com/tarasglek/github-to-sops/commit/798c864f1537f668fbaf7802651ec8beb998a7af.patch?full_index=1";
|
||||
hash = "sha256-udBO5dN8RCclXpkTj/gU6zcUcaoM+G9jPEw4dCZ+oT4=";
|
||||
})
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Tool for managing infrastructure secrets in git repositories using SOPS and GitHub SSH keys";
|
||||
homepage = "https://github.com/tarasglek/github-to-sops";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "github-to-sops";
|
||||
maintainers = with lib.maintainers; [ typedrat ];
|
||||
};
|
||||
}
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goctl";
|
||||
version = "1.8.5";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeromicro";
|
||||
repo = "go-zero";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-12nlrwzzM5wPyiC3vJfs7sJ7kPiRy1H0gTeWB+9bqKI=";
|
||||
hash = "sha256-1V/LH38H0alylKLid/nQxNF8fA02G++m6Nq2/JIen2w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ReLXN4SUNQ7X0yHy8FFwD8lRRm05q2FdEdohXpfuZIY=";
|
||||
vendorHash = "sha256-clbTaXZck16guROF6bHeDt95CtwtgkvIAEM8JBS5u7Y=";
|
||||
|
||||
modRoot = "tools/goctl";
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -12,39 +12,44 @@
|
||||
sdcv,
|
||||
SDL2,
|
||||
openssl,
|
||||
nix-update-script,
|
||||
writeScript,
|
||||
}:
|
||||
let
|
||||
luajit_lua52 = luajit.override { enable52Compat = true; };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "koreader";
|
||||
version = "2025.04";
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb";
|
||||
hash = "sha256-bpKNP+1C0oHZEv6HGL4dBziv3RfCow882yV8JFLtDJ4=";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb";
|
||||
hash = "sha256-q3M33f0b5FAU/nmPfzsXu93mVZOhXMVgBbfwnieqkeM=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
|
||||
hash = "sha256-ZZujk98YVvNJmffW2fDg+n+z1xgtkha7y1LasYEhCR4=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
version = "2025.08";
|
||||
|
||||
src_repo = fetchFromGitHub {
|
||||
repo = "koreader";
|
||||
owner = "koreader";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Kt00AZARfQjGY8FzDcQB8UaowWW2+KWyXJzexFNmZmM=";
|
||||
hash = "sha256-lkXpmvde1PPJRocnRpmuu4AeCv/0Mql40Aw5WIZfj5s=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "koreader";
|
||||
inherit version;
|
||||
|
||||
src =
|
||||
let
|
||||
selectSystem =
|
||||
attrs:
|
||||
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
arch = selectSystem {
|
||||
aarch64-linux = "arm64";
|
||||
armv7l-linux = "armhf";
|
||||
x86_64-linux = "amd64";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-${arch}.deb";
|
||||
hash = selectSystem {
|
||||
aarch64-linux = "sha256-OWhTlVEw1Sj7ZBE6/vTMwt67nP/qzBi47ZOtUZ2aBeo=";
|
||||
armv7l-linux = "sha256-NOlyh+q0WAsSD8r4MH0jVfRvxBmqkxmMzUp9Jwn5u+s=";
|
||||
x86_64-linux = "sha256-nzQdfc9bo0RCpa9sGH0rc7RBnR6Z0z6NIyJcYogNhCw=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -60,29 +65,31 @@ stdenv.mkDerivation rec {
|
||||
openssl
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
dpkg-deb -x $src .
|
||||
cp -R usr/* $out/
|
||||
runHook preInstall
|
||||
|
||||
# Link required binaries
|
||||
cp --recursive usr $out
|
||||
''
|
||||
# Link required binaries
|
||||
+ ''
|
||||
ln -sf ${luajit_lua52}/bin/luajit $out/lib/koreader/luajit
|
||||
ln -sf ${sdcv}/bin/sdcv $out/lib/koreader/sdcv
|
||||
ln -sf ${gnutar}/bin/tar $out/lib/koreader/tar
|
||||
|
||||
# Link SSL/network libraries
|
||||
''
|
||||
# Link SSL/network libraries
|
||||
+ ''
|
||||
ln -sf ${openssl.out}/lib/libcrypto.so.3 $out/lib/koreader/libs/libcrypto.so.1.1
|
||||
ln -sf ${openssl.out}/lib/libssl.so.3 $out/lib/koreader/libs/libssl.so.1.1
|
||||
|
||||
# Copy fonts
|
||||
''
|
||||
# Copy fonts
|
||||
+ ''
|
||||
find ${src_repo}/resources/fonts -type d -execdir cp -r '{}' $out/lib/koreader/fonts \;
|
||||
|
||||
# Remove broken symlinks
|
||||
''
|
||||
# Remove broken symlinks
|
||||
+ ''
|
||||
find $out -xtype l -print -delete
|
||||
|
||||
''
|
||||
+ ''
|
||||
wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : $out/lib/koreader/libs:${
|
||||
lib.makeLibraryPath [
|
||||
gtk3-x11
|
||||
@@ -92,10 +99,29 @@ stdenv.mkDerivation rec {
|
||||
openssl.out
|
||||
]
|
||||
}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
inherit src_repo;
|
||||
updateScript = writeScript "update-koreader" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix curl jq nix-update common-updater-scripts
|
||||
set -eou pipefail
|
||||
version=$(nix eval --raw --file . koreader.version)
|
||||
nix-update koreader
|
||||
latestVersion=$(nix eval --raw --file . koreader.version)
|
||||
if [[ "$latestVersion" == "$version" ]]; then
|
||||
exit 0
|
||||
fi
|
||||
update-source-version koreader $latestVersion --source-key=src_repo --ignore-same-version
|
||||
systems=$(nix eval --json -f . koreader.meta.platforms | jq --raw-output '.[]')
|
||||
for system in $systems; do
|
||||
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw -f . koreader.src.url --system "$system")))
|
||||
update-source-version koreader $latestVersion $hash --system=$system --ignore-same-version --ignore-same-hash
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
Generated
+695
-485
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,14 @@
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 681e634..48cbc8e 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -19,7 +19,8 @@ path = "src/main.rs"
|
||||
[dependencies]
|
||||
anyhow = "1.0.43"
|
||||
base64 = "0.13.0"
|
||||
-clap = { git = "https://github.com/clap-rs/clap", features = ["wrap_help"] }
|
||||
+clap = { version = "= 3.0.0-beta.2", features = ["wrap_help"] }
|
||||
+clap_derive = "= 3.0.0-beta.2"
|
||||
console = "0.14.1"
|
||||
crossbeam-channel = "0.5.1"
|
||||
getset = "0.1.1"
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/crio.rs b/src/crio.rs
|
||||
index 36bf40b..97d5e57 100644
|
||||
--- a/src/crio.rs
|
||||
+++ b/src/crio.rs
|
||||
@@ -34,7 +34,7 @@ impl Display for CriSocket {
|
||||
impl CriSocket {
|
||||
pub fn new(path: PathBuf) -> Result<CriSocket> {
|
||||
if path.display().to_string().len() > 100 {
|
||||
- bail!("Socket path '{}' is too long")
|
||||
+ bail!("Socket path '{}' is too long", path.display().to_string())
|
||||
}
|
||||
Ok(CriSocket(path))
|
||||
}
|
||||
@@ -6,22 +6,28 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kubernix";
|
||||
version = "0.2.0";
|
||||
version = "0.2.0-unstable-2021-11-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saschagrunert";
|
||||
repo = "kubernix";
|
||||
rev = "v${version}";
|
||||
sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp";
|
||||
rev = "630087e023e403d461c4bb8b1c9368b26a2c0744";
|
||||
sha256 = "sha256-IkfVpNxWOqQt/aXsN4iD9dkKKyOui3maKowVibuKbvM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"clap-3.0.0-beta.1" = "sha256-tErZmEiAF1v39AtgRUHoEmoYqXPWRDXBEkWUbH+fPyY=";
|
||||
"clap_derive-0.3.0" = "sha256-VijH+XB4WeKYUsJH9h/ID8EGZ89R3oauYO8Yg331dPU=";
|
||||
};
|
||||
};
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
patches = [
|
||||
# Need a specific version of clap and clap_derive: fails with anything greater.
|
||||
./Cargo.toml.patch
|
||||
# error: 1 positional argument in format string, but no arguments were given
|
||||
./fix-compile-error.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazyhetzner";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grammeaway";
|
||||
repo = "lazyhetzner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MPPe4Epr77aqAFOeDGj4lTAauR489hVqGz8uiIqdyW8=";
|
||||
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
git rev-parse HEAD > $out/COMMIT
|
||||
date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g+HWDhMNrPUsszmosClthEHS60Cp7zjt+50Jt9zqfTE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/grammeaway/lazyhetzner/cmd.version=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
ldflags+=" -X github.com/grammeaway/lazyhetzner/cmd.commit=$(cat COMMIT)"
|
||||
ldflags+=" -X github.com/grammeaway/lazyhetzner/cmd.date=$(cat SOURCE_DATE_EPOCH)"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "TUI for managing Hetzner Cloud resources";
|
||||
homepage = "https://github.com/grammeaway/lazyhetzner";
|
||||
changelog = "https://github.com/grammeaway/lazyhetzner/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ ryand56 ];
|
||||
mainProgram = "lazyhetzner";
|
||||
};
|
||||
})
|
||||
@@ -27,16 +27,16 @@ let
|
||||
in
|
||||
phpPackage.buildComposerProject2 rec {
|
||||
pname = "librenms";
|
||||
version = "25.6.0";
|
||||
version = "25.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librenms";
|
||||
repo = "librenms";
|
||||
tag = version;
|
||||
sha256 = "sha256-8LL0D1vIThjZ5RBIQ6INAuXz0bbhOBEZMFYhv3OX1c8=";
|
||||
sha256 = "sha256-YXSzHqMJwqEYP1c6hLT7t9CyOJ2GZMELoqGQf2GSjdA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9ndmr1cs6+p2EThs8UQkNsSFHd/1wxbPOgw2rX5ZivU=";
|
||||
vendorHash = "sha256-YlGT326Yp8A6rR4LHaczrNu5SOgQBUA11WBpJhHNhvg=";
|
||||
|
||||
php = phpPackage;
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
withGoolm ? false,
|
||||
}:
|
||||
let
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "mautrix-slack";
|
||||
@@ -23,10 +23,10 @@ buildGoModule {
|
||||
owner = "mautrix";
|
||||
repo = "slack";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ha3Rwd9+2RFxOF+H5jG6wRlgqLfUbCcoZcaXehyr1m0=";
|
||||
hash = "sha256-gR5D2uCNS+LiP0KXup/iIiOThWohzeBe4CD/oWak1BM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BjKEf4cG9kPcwuUefosBFzyCUpYhK7fm+w/GtG+oicg=";
|
||||
vendorHash = "sha256-aukL6RThtWcznz/x25btTTvloYkRZ/vhAQj1hOdI1U4=";
|
||||
|
||||
buildInputs = lib.optional (!withGoolm) olm;
|
||||
tags = lib.optional withGoolm "goolm";
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mold";
|
||||
version = "2.40.3";
|
||||
version = "2.40.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rui314";
|
||||
repo = "mold";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zE+qve1ooCN1UY0h9tI2jo7Sw+fVdhh4DPFIU7yYKSg=";
|
||||
hash = "sha256-BiPeZJvMlLIC0TbsqBD1JSt/RE4xZ5wSRYujPXKb+RY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "osv-scanner";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "osv-scanner";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Xr+16wG/iC4SxytfpjFDd3eKvINtCTMTECh3//wFHtY=";
|
||||
hash = "sha256-ePhwY1F1MfjFnWuIZwDBBo4rmngcW9BJfPijBs0HmQQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+Ad4XiD4npaATUybVym1Pr+NwgjYDGNTGWdQEcgjWsI=";
|
||||
vendorHash = "sha256-Ph7ukPx2BD2GKnxooWqH2jYoHoeTow+ta9ZaY+3dIX4=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/osv-scanner"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "pfetch";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Un1q32";
|
||||
repo = "pfetch";
|
||||
tag = version;
|
||||
hash = "sha256-a2ay+Ag9vYwGGENRPCcFLCmtyOCyHhF6/P7NAn/CzSI=";
|
||||
hash = "sha256-q1UMkeg9E02NPWku85xrn2msWesjD2NtZbbjppOla7o=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -73,13 +73,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "5.5.2";
|
||||
version = "5.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iLpJQC1v+jPeQNCjgtx3pPKsa6wLcrqtQkeG7qF3rWo=";
|
||||
hash = "sha256-0w22mEbp1RRQlVqAKx0oHG0dVoC6m6Oo2l5RaL05t/A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quarkus-cli";
|
||||
version = "3.24.5";
|
||||
version = "3.25.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-yO7sq4WZ39TtpZ6MD8rWZgJXl2P6IOLbnzxCN8caEN0=";
|
||||
hash = "sha256-4tOduWY1PaW6FMnwL1jPARxpm4lKg7MJP36bpZavtxY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchgit,
|
||||
stdenv,
|
||||
libiconv,
|
||||
zlib,
|
||||
radicle-node,
|
||||
makeBinaryWrapper,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "radicle-tui";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://seed.radicle.xyz/z39mP9rQAaGmERfUMPULfPUi473tY.git";
|
||||
rev = "refs/namespaces/z6MkswQE8gwZw924amKatxnNCXA55BMupMmRg7LvJuim2C1V/refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-rz9l9GtycqZoROUI6Hn0Fv5Br0YCIrcHlEWLMP4hasQ=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse HEAD > $out/.git_head
|
||||
git -C $out log -1 --pretty=%ct HEAD > $out/.git_time
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-f9D4RKWw7y6z9rERuF7F6soyNITvKa6QVt34biZZ5JY=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build.rs \
|
||||
--replace-fail "GIT_HEAD={hash}" "GIT_HEAD=$(<.git_head)" \
|
||||
--replace-fail "GIT_COMMIT_TIME={commit_time}" "GIT_COMMIT_TIME=$(<.git_time)"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ radicle-node ];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=cli::can_be_executed"
|
||||
"--skip=cli::empty_command_is_forwarded"
|
||||
"--skip=cli::help_command_is_forwarded"
|
||||
"--skip=cli::version_command_is_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::empty_operation"
|
||||
"--skip=commands::tui_inbox::cli::empty_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::empty_operation_is_not_forwarded_explicitly"
|
||||
"--skip=commands::tui_inbox::cli::empty_operation_with_help_is_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::list_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::list_operation_is_not_forwarded_explicitly"
|
||||
"--skip=commands::tui_inbox::cli::list_operation_with_help_is_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::unknown_operation_show_is_forwarded"
|
||||
"--skip=commands::tui_patch::cli::empty_operation"
|
||||
"--skip=commands::tui_patch::cli::empty_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_patch::cli::empty_operation_is_not_forwarded_explicitly"
|
||||
"--skip=commands::tui_patch::cli::empty_operation_with_help_is_forwarded"
|
||||
"--skip=commands::tui_patch::cli::list_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_patch::cli::list_operation_is_not_forwarded_explicitly"
|
||||
"--skip=commands::tui_patch::cli::list_operation_with_help_is_forwarded"
|
||||
"--skip=commands::tui_patch::cli::unknown_operation_edit_is_forwarded"
|
||||
"--skip=commands::tui_patch::cli::unknown_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_patch::cli::unknown_operation_show_is_forwarded"
|
||||
"--skip=commands::tui_patch::review::test::app_with_single_file_multiple_hunks_can_be_constructed"
|
||||
"--skip=commands::tui_patch::review::test::app_with_single_hunk_can_be_constructed"
|
||||
"--skip=commands::tui_patch::review::test::first_hunk_is_selected_by_default"
|
||||
"--skip=commands::tui_patch::review::test::hunk_can_be_selected"
|
||||
"--skip=commands::tui_patch::review::test::hunks_are_rejected_by_default"
|
||||
"--skip=commands::tui_patch::review::test::multiple_files_single_hunk_can_be_accepted"
|
||||
"--skip=commands::tui_patch::review::test::single_file_multiple_hunks_only_last_can_be_accepted"
|
||||
"--skip=commands::tui_patch::review::test::single_file_single_hunk_can_be_accepted"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
zlib
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ radicle-node ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/rad-tui \
|
||||
--suffix PATH : ${lib.makeBinPath finalAttrs.propagatedUserEnvPkgs}
|
||||
'';
|
||||
|
||||
# versionCheckHook doesn't support multiple arguments yet
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheckPhase
|
||||
$out/bin/rad-tui --version --no-forward | grep -F 'rad-tui ${finalAttrs.version}'
|
||||
runHook postInstallCheckPhase
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Radicle terminal user interface";
|
||||
homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY";
|
||||
changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY/tree/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
matthiasbeyer
|
||||
defelo
|
||||
];
|
||||
mainProgram = "rad-tui";
|
||||
};
|
||||
})
|
||||
Executable
+20
@@ -0,0 +1,20 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p coreutils gnused gitMinimal nix-update
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
dirname="$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
url=$(nix-instantiate --eval --raw -A radicle-tui.src.url)
|
||||
old_ref=$(nix-instantiate --eval --raw -A radicle-tui.src.rev)
|
||||
new_ref=$(git ls-remote "$url" 'refs/namespaces/*/refs/tags/*' | cut -f2 | tail -1)
|
||||
|
||||
[[ "$old_ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]]
|
||||
old_node="${BASH_REMATCH[1]}"
|
||||
|
||||
[[ "$new_ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]]
|
||||
new_node="${BASH_REMATCH[1]}"
|
||||
version="${BASH_REMATCH[2]}"
|
||||
|
||||
sed -i "s/${old_node}/${new_node}/g" "${dirname}/package.nix"
|
||||
nix-update --version="$version" radicle-tui
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "retool";
|
||||
version = "2.3.9";
|
||||
version = "2.4.1";
|
||||
|
||||
pyproject = true;
|
||||
disabled = python3.pkgs.pythonOlder "3.10";
|
||||
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "unexpectedpanda";
|
||||
repo = "retool";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pWH6R5RjYQv03LdoG3RUy/7mw93it1D3yNIyiV9ELQI=";
|
||||
hash = "sha256-u2MKyNT9L/rq4rvX6an2tS8xFFZhjDuU+py9rJL57xY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -9,19 +9,20 @@
|
||||
libapparmor,
|
||||
libseccomp,
|
||||
libselinux,
|
||||
runtimeShell,
|
||||
makeWrapper,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.1.15";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y8TcMyNRkVfmNkumhohBoyiU6GM8/yLXT/CTFPmXlU4=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oXoDio3l23Z6UyAhb9oDMo1O4TLBbFyLh9sRWXnfLVY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -44,7 +45,10 @@ buildGoModule rec {
|
||||
libapparmor
|
||||
];
|
||||
|
||||
makeFlags = [ "BUILDTAGS+=seccomp" ];
|
||||
makeFlags = [
|
||||
"BUILDTAGS+=seccomp"
|
||||
"SHELL=${runtimeShell}"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "s7";
|
||||
version = "11.5-unstable-2025-08-09";
|
||||
version = "11.5-unstable-2025-08-17";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "cm-gitlab.stanford.edu";
|
||||
owner = "bil";
|
||||
repo = "s7";
|
||||
rev = "76c6f2b28cdada1e71dfbc0932df595f763e375a";
|
||||
hash = "sha256-QB6aUF8538vd5IF8eQhYAbzU7jAxqw70RrUB1ewzY6s=";
|
||||
rev = "4f06eecf958c59561d624503af5b7524647d953f";
|
||||
hash = "sha256-02N7wmPbukVFD4gssNu+WuLp0B7NmYXeMLQdWXeNivo=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "seabird";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getseabird";
|
||||
repo = "seabird";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y+QIBqU3kAxedhWLnu07m9HQOCgHfOvVscIxxWtUcZo=";
|
||||
hash = "sha256-z+XEOqr7JX376AyGr0zx3AV3P+YqFbyspXMoxidCWY0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4o9z4XjtW7kNHAb8L0kuq9rgQzTwvAAXcl6+RIGjmqI=";
|
||||
vendorHash = "sha256-hPvMSAHWtcJULE9t8TKx8r0OpI9V287UPVACeORqOHA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
Generated
+2
-2
@@ -781,8 +781,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Soulseek",
|
||||
"version": "7.1.0",
|
||||
"hash": "sha256-n6LUNuPmmy9QYNNALR0ObYyR9LJalf0H8P+SKnoqfFc="
|
||||
"version": "7.1.2",
|
||||
"hash": "sha256-yel9mxRf1idEQssM7n4SIVQPMQDMDmyvfL5owllqgf0="
|
||||
},
|
||||
{
|
||||
"pname": "SQLitePCLRaw.bundle_e_sqlite3",
|
||||
|
||||
@@ -19,13 +19,13 @@ let
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
pname = "slskd";
|
||||
version = "0.23.1";
|
||||
version = "0.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slskd";
|
||||
repo = "slskd";
|
||||
tag = version;
|
||||
hash = "sha256-vUqDWzWJIZbb6WvANsLhUBzyQFi59/+jizarI8Ob3uQ=";
|
||||
hash = "sha256-y/qgx4tC7QGQTbBqhvp/TUalW1MfKYzvvSVgyNvKMME=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,7 +40,7 @@ buildDotnetModule rec {
|
||||
name = "${pname}-${version}-npm-deps";
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/${npmRoot}";
|
||||
hash = "sha256-AbIlpu0KNuzwSQVIsSRhLQZqE3yA68DlIL4WbZ34Hi8=";
|
||||
hash = "sha256-xFRuyCMPR+NT3ogmqKK0cmjdv6v/90deP50Y5vIL20w=";
|
||||
};
|
||||
|
||||
projectFile = "slskd.sln";
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
{
|
||||
lib,
|
||||
buildGo125Module,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
go_1_25,
|
||||
}:
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "sshwifty";
|
||||
version = "0.4.0-beta-release";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nirui";
|
||||
repo = "sshwifty";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7ZfS46+aflKIQ8S9T18JjCb7bY8mB6cJl/lgJi5Hukg=";
|
||||
};
|
||||
|
||||
sshwifty-ui = buildNpmPackage {
|
||||
pname = "sshwifty-ui";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
npmDepsHash = "sha256-I96VixL21cF2kp9AK6q0ipjphjdWuSETKakbsprGek0=";
|
||||
|
||||
npmBuildScript = "generate";
|
||||
|
||||
postInstall = ''
|
||||
cp -r application/controller/{static_pages,static_pages.go} \
|
||||
$out/lib/node_modules/sshwifty-ui/application/controller
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ go_1_25 ];
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp -r ${finalAttrs.sshwifty-ui}/lib/node_modules/sshwifty-ui/* .
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-kLKydjvZtFEY7vjqxK1cCwZSTbdqYWPRmxYSN0LYqsg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X github.com/nirui/sshwifty/application.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
find $out/bin ! -name sshwifty -type f -exec rm -rf {} \;
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "WebSSH & WebTelnet client";
|
||||
homepage = "https://github.com/nirui/sshwifty";
|
||||
changelog = "https://github.com/nirui/sshwifty/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ungeskriptet ];
|
||||
mainProgram = "sshwifty";
|
||||
};
|
||||
})
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "2.33.9";
|
||||
version = "2.36.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bH/ifvyeZ57GRBzqa9efMKBs5/6U5O10gwpOsDt1Mdc=";
|
||||
hash = "sha256-8e6Fc0khFq2K/ZDLpNMMEi8127Ke5Fmc+PJ8Vgp0euE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8gqUlnfyQ41IRa65jBs8SO9bLIE+Rh0iypZt5Ll3wtg=";
|
||||
vendorHash = "sha256-NnGtUK+iMj7KUCTAmNtHxB8OssdvsPJK896b+aFaSl4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swappy";
|
||||
version = "1.5.1";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtheoof";
|
||||
repo = "swappy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo=";
|
||||
hash = "sha256-2BNnXtvliebTJAvoicsIEcGxJYnVp1wA8cv+dXr2vJY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wastebin";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matze";
|
||||
repo = "wastebin";
|
||||
rev = version;
|
||||
hash = "sha256-emhPa4VuXOjTZ6AU/4S8acjjz68byBg4x4MW0M5hvD4=";
|
||||
hash = "sha256-L19Yz+vGNTdwJ3cYoGnx4m8/J6SMSg1Gbaqph8tQtfE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Ub6BQhrLkIoOM9XFVIfm6mI4pP1Rloo3DnZXB8C4CjE=";
|
||||
cargoHash = "sha256-BZlYb7ZRfCKUgO3R+l/ZpLctXHA2N6L3nYTVov2GolI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "wgo";
|
||||
version = "0.5.13";
|
||||
version = "0.5.14";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -15,7 +15,7 @@ buildGoModule {
|
||||
owner = "bokwoon95";
|
||||
repo = "wgo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CAHaIq4gxl5o3PMdnyQXKKCJGuHpoBuXv2/bETm1LZs=";
|
||||
hash = "sha256-zqRcGUfqvn0NX1rL/+jMVE/LCIT2IrqUUPDGThSueAY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU=";
|
||||
|
||||
@@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
hydraPlatforms = [ ];
|
||||
license = licenses.unfreeRedistributable;
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [
|
||||
mlatus
|
||||
th0rgal
|
||||
|
||||
@@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
hydraPlatforms = [ ];
|
||||
license = licenses.unfreeRedistributable;
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [
|
||||
mlatus
|
||||
th0rgal
|
||||
|
||||
@@ -99,7 +99,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.199.8";
|
||||
version = "0.199.9";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ys82+R9ZKsxexVkZjPUMUI1VTimvBcmYt8uKpiLSMKQ=";
|
||||
hash = "sha256-k4Fh+/Q9MawEZfH6KZ0/wZ9SpQZiTEF0sjECpSCisVE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-kPmbLQrx/+SzWFDeYgL7gko8PBi0k8a4kAWh7h7FbwM=";
|
||||
cargoHash = "sha256-dgAKyLAaWr1kfyCsM0g/ULe/wF4UpK/lZgwrByAYItc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -33,9 +33,9 @@ let
|
||||
"20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
|
||||
"21.1.0-rc3".officialRelease.sha256 = "sha256-quZuqDIm8OrkDJqu7vJKUP8MF1xCuQNFwW9SnKMFoS8=";
|
||||
"22.0.0-git".gitRelease = {
|
||||
rev = "144cd87088dc82263b25e816c77fc03f29fd1288";
|
||||
rev-version = "22.0.0-unstable-2025-08-03";
|
||||
sha256 = "sha256-DtY1OcpquPQ+dXTyuVggrK5gO7H5xgoZajf/ZONCQ7o=";
|
||||
rev = "97d5d483ecc67d0b786a53d065b7202908cb4047";
|
||||
rev-version = "22.0.0-unstable-2025-08-17";
|
||||
sha256 = "sha256-rz+Ybn9bslZA57AV1gHyePrxvBi7bRnt3Tii6Go/NWA=";
|
||||
};
|
||||
}
|
||||
// llvmVersions;
|
||||
|
||||
@@ -814,15 +814,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "fzf-lua";
|
||||
version = "0.0.2063-1";
|
||||
version = "0.0.2086-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/fzf-lua-0.0.2063-1.rockspec";
|
||||
sha256 = "0lgiygz0l05wy7f3fpc0cbfpz56v77n065pynsdpfaq09f1cal5d";
|
||||
url = "mirror://luarocks/fzf-lua-0.0.2086-1.rockspec";
|
||||
sha256 = "10wnp4xj33xi861fiv7p9rl8r6czwm2d8w2r2a4iqrf9plrm4k7m";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/5be1c24918761c6d3229a4024aa323ae95d933e0.zip";
|
||||
sha256 = "06zrpcja0mqp3y1w2w79d4sf8dbcia6m2gaac2hqig60rh9za0gr";
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/de1ddf70922ef26825ae5460a154a22278954cae.zip";
|
||||
sha256 = "1rm4msncfylgg3yn42x8w9s586glnssqlqd13cdlj1ph92a0c103";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -903,15 +903,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "grug-far.nvim";
|
||||
version = "1.6.44-1";
|
||||
version = "1.6.45-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/grug-far.nvim-1.6.44-1.rockspec";
|
||||
sha256 = "0dzw1plzj2p1fr41zmbmvvbiswkk0w38whpmlasam4qcrx2hlbcn";
|
||||
url = "mirror://luarocks/grug-far.nvim-1.6.45-1.rockspec";
|
||||
sha256 = "05hwis664cvchk8g8bgqf4va32i58fihad8dgr7qca4m6f38a7qv";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/MagicDuck/grug-far.nvim/archive/482517700eef8579b289a20995f017a0775a6ec4.zip";
|
||||
sha256 = "03y7sa60n5nqdm4ygnh817k5gzqpalz07nq1p3qdjcpf539d8b1l";
|
||||
url = "https://github.com/MagicDuck/grug-far.nvim/archive/385d1949dc21d0c39e7a74b4f4a25da18817bc86.zip";
|
||||
sha256 = "1dx3xzbkrnyd0wnh136j74i9bl194yxg33sf4ddrgs0i7ylxxk6p";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -2044,17 +2044,17 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-resty-session";
|
||||
version = "4.1.3-1";
|
||||
version = "4.1.4-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lua-resty-session-4.1.3-1.rockspec";
|
||||
sha256 = "11qiw5yg56n41jp8bipi6fd6gilfmb8rwjhrdkcg19i7xrk94x8g";
|
||||
url = "mirror://luarocks/lua-resty-session-4.1.4-1.rockspec";
|
||||
sha256 = "0ny09yvdvbm1lkhsn7c5c9klmsjdp62qy01a77bzvq49s8ma6mik";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "bungle";
|
||||
repo = "lua-resty-session";
|
||||
rev = "v4.1.3";
|
||||
hash = "sha256-mnc+AOszKRQCwMETPhSrniyZX5Wb2NQq/EHDNoQiFxE=";
|
||||
rev = "v4.1.4";
|
||||
hash = "sha256-S9dMlbCQjLzAdvlNE1bBAtB02vZhF+Tx08zlU0WZYsM=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -2763,13 +2763,13 @@ final: prev: {
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lualine.nvim-scm-1.rockspec";
|
||||
sha256 = "0cmss7ks8d1yxw43m9zc8glbqgxylpnh25xw7c0ym5l04p61ary0";
|
||||
sha256 = "1mixb73qp35wv4bjkkakxjzvczc2gk5m4ywylj5xx41r074hpp1f";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lualine";
|
||||
repo = "lualine.nvim";
|
||||
rev = "a94fc68960665e54408fe37dcf573193c4ce82c9";
|
||||
hash = "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=";
|
||||
rev = "b8c23159c0161f4b89196f74ee3a6d02cdc3a955";
|
||||
hash = "sha256-lWt2kpW+hsTMWt8tar/+AISTDrIt4Jn27NmI9j+Xt4s=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -4651,15 +4651,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "rustaceanvim";
|
||||
version = "6.6.0-1";
|
||||
version = "6.7.0-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/rustaceanvim-6.6.0-1.rockspec";
|
||||
sha256 = "02nm7wddffhg53w4cpsf19a5gvgrhm617k3md406q0wyja7hqysn";
|
||||
url = "mirror://luarocks/rustaceanvim-6.7.0-1.rockspec";
|
||||
sha256 = "0f6rwnf7n7gq9kbpgn0g221fif910wcfsl4bx4qabj9wcyjdvss4";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.6.0.zip";
|
||||
sha256 = "005xvdl21yya7v4cr0svnyq9mlf3p7v0lzidgggwhlslc7yw3bg1";
|
||||
url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.7.0.zip";
|
||||
sha256 = "00hni3yyj7xvcx0swkv7dqgrpsihiwiivvgd6ir7f3kh01za6m02";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
@@ -189,7 +189,7 @@ let
|
||||
archive:
|
||||
(fetchurl {
|
||||
inherit (archive) url sha1;
|
||||
preferLocalBuild = true;
|
||||
inherit meta;
|
||||
passthru = {
|
||||
info = packageInfo;
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -18,7 +18,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "androidenv-test-suite";
|
||||
version = "1";
|
||||
version = lib.substring 0 8 (builtins.hashFile "sha256" ./repo.json);
|
||||
buildInputs = lib.mapAttrsToList (name: value: value) all-tests;
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrop";
|
||||
version = "9.2.11";
|
||||
version = "9.2.12.post3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "angrop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wL6H4UqBqOHMQU91q0uJrgeS/wVvIbinpF9IBtli3Ig=";
|
||||
hash = "sha256-t4JjI6mWX/Us4dHcVXPAUGms8SEE6MVhteQMPi8p5Zo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "genie-partner-sdk";
|
||||
version = "1.0.6";
|
||||
version = "1.0.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "genie_partner_sdk";
|
||||
hash = "sha256-4RYNBRB1T60qoZV0+gnxepotPiRJGPS0ZJC28VaVrHg=";
|
||||
hash = "sha256-9fnKbC/Kiu5DYF3Sz4EksOJbJzRG7C+H3Ku2uE3eTTY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mlx-lm";
|
||||
version = "0.26.2";
|
||||
version = "0.26.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ml-explore";
|
||||
repo = "mlx-lm";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-D5csHfkmIM01PkCMT+DDJ2+6as6eVdKNvvHzXcVqdEY=";
|
||||
hash = "sha256-O4wW7wvIqSeBv01LoUCHm0/CgcRc5RfFHjvwyccp6UM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -68,6 +68,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Run LLMs with MLX";
|
||||
homepage = "https://github.com/ml-explore/mlx-lm";
|
||||
changelog = "https://github.com/ml-explore/mlx-lm/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = [
|
||||
"aarch64-darwin"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
replaceVars,
|
||||
stdenv,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
# buildInputs
|
||||
apple-sdk_14,
|
||||
fmt_10,
|
||||
fmt_11,
|
||||
nanobind,
|
||||
nlohmann_json,
|
||||
pybind11,
|
||||
@@ -36,14 +36,14 @@ let
|
||||
|
||||
mlx = buildPythonPackage rec {
|
||||
pname = "mlx";
|
||||
version = "0.26.3";
|
||||
version = "0.28.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ml-explore";
|
||||
repo = "mlx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hbqV/2KYGJ1gyExZd5bgaxTdhl5+Gext+U/+1KAztMU=";
|
||||
hash = "sha256-+2dVZ89a09q8mWIbv6fBsySp7clzRV1tOyqr5hjFrNU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -80,9 +80,9 @@ let
|
||||
# hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper`
|
||||
# or by changing the upstream (e.g., https://github.com/zed-industries/zed/discussions/7016).
|
||||
(lib.cmakeBool "MLX_BUILD_METAL" false)
|
||||
(lib.cmakeBool "USE_SYSTEM_FMT" true)
|
||||
(lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}")
|
||||
(lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json.src}")
|
||||
(lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_FMT" "${fmt_10.src}")
|
||||
];
|
||||
};
|
||||
|
||||
@@ -96,7 +96,7 @@ let
|
||||
|
||||
buildInputs = [
|
||||
apple-sdk_14
|
||||
fmt_10
|
||||
fmt_11
|
||||
gguf-tools
|
||||
nanobind
|
||||
nlohmann_json
|
||||
@@ -115,6 +115,17 @@ let
|
||||
"python/tests/"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError
|
||||
"test_numpy_conv"
|
||||
"test_tensordot"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# AssertionError
|
||||
"python/tests/test_blas.py"
|
||||
];
|
||||
|
||||
# Additional testing by executing the example Python scripts supplied with mlx
|
||||
# using the version of the library we've built.
|
||||
passthru.tests = {
|
||||
|
||||
+25
-25
@@ -10,9 +10,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
|
||||
|
||||
[[package]]
|
||||
name = "async-lock"
|
||||
version = "3.4.0"
|
||||
version = "3.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
|
||||
checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
|
||||
dependencies = [
|
||||
"event-listener",
|
||||
"event-listener-strategy",
|
||||
@@ -21,9 +21,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.88"
|
||||
version = "0.1.89"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
|
||||
checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -38,9 +38,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.9.1"
|
||||
version = "2.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
|
||||
checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29"
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
@@ -85,9 +85,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "event-listener"
|
||||
version = "5.4.0"
|
||||
version = "5.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
|
||||
checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
|
||||
dependencies = [
|
||||
"concurrent-queue",
|
||||
"parking",
|
||||
@@ -162,9 +162,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.174"
|
||||
version = "0.2.175"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
|
||||
checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
@@ -236,16 +236,16 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.95"
|
||||
version = "1.0.101"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
|
||||
checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pycrdt"
|
||||
version = "0.12.26"
|
||||
version = "0.12.27"
|
||||
dependencies = [
|
||||
"pyo3",
|
||||
"serde_json",
|
||||
@@ -325,9 +325,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.5.13"
|
||||
version = "0.5.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
|
||||
checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
@@ -366,9 +366,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.140"
|
||||
version = "1.0.142"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
|
||||
checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
@@ -378,9 +378,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "smallstr"
|
||||
version = "0.3.0"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "63b1aefdf380735ff8ded0b15f31aab05daf1f70216c01c02a12926badd1df9d"
|
||||
checksum = "862077b1e764f04c251fe82a2ef562fd78d7cadaeb072ca7c2bcaf7217b1ff3b"
|
||||
dependencies = [
|
||||
"smallvec",
|
||||
]
|
||||
@@ -393,9 +393,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.104"
|
||||
version = "2.0.106"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
|
||||
checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -410,18 +410,18 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "2.0.12"
|
||||
version = "2.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
|
||||
checksum = "80d76d3f064b981389ecb4b6b7f45a0bf9fdac1d5b9204c7bd6714fecc302850"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "2.0.12"
|
||||
version = "2.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
|
||||
checksum = "44d29feb33e986b6ea906bd9c3559a856983f92371b3eaa5e83782a351623de0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycrdt";
|
||||
version = "0.12.26";
|
||||
version = "0.12.27";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "y-crdt";
|
||||
repo = "pycrdt";
|
||||
tag = version;
|
||||
hash = "sha256-dhIMh8sRFS9LSX17vnGn/eqQF/WpGDJkzjwHYCuzbkM=";
|
||||
hash = "sha256-HGNSgdWdYSVc1EcLNDneXqswUWGEgW685HtWYoSo65Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
equihash,
|
||||
setuptools,
|
||||
python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyequihash";
|
||||
pyproject = true;
|
||||
|
||||
inherit (equihash)
|
||||
version
|
||||
src
|
||||
;
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
postPatch =
|
||||
let
|
||||
soext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
''
|
||||
substituteInPlace ./equihash/__init__.py --replace-fail \
|
||||
"ctypes.util.find_library('equihash') or ctypes.util.find_library('libequihash')" "'${lib.getLib equihash}/lib/libequihash${soext}'"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "equihash" ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
${python.interpreter} test.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (equihash.meta)
|
||||
description
|
||||
homepage
|
||||
license
|
||||
teams
|
||||
;
|
||||
};
|
||||
}
|
||||
@@ -21,16 +21,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-can";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hardbyte";
|
||||
repo = "python-can";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oKa/LT7tTBLp47t6CQFCEmzBu8b6NQzFCSfi6Ii3NTI=";
|
||||
hash = "sha256-yF/Ir9FUf9Q8GINeT0H4SixzZGetqumU5N6O3GT3M6A=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "2.35.0";
|
||||
version = "2.36.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4coslBoLZydw8g1fokYH2oGHJn+UFQ/Kzc3T/6bHuiY=";
|
||||
hash = "sha256-bcrzpMF8ftEAAdJQoARJsQeX7pc4PNx1/gvESXGCpZY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
qrcodegen,
|
||||
setuptools,
|
||||
python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qrcodegen";
|
||||
pyproject = true;
|
||||
|
||||
inherit (qrcodegen)
|
||||
version
|
||||
src
|
||||
;
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "qrcodegen" ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
${python.interpreter} qrcodegen-demo.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (qrcodegen.meta)
|
||||
description
|
||||
homepage
|
||||
license
|
||||
maintainers
|
||||
platforms
|
||||
;
|
||||
};
|
||||
}
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.41.1";
|
||||
version = "1.41.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HBt/TpgrApdsiBACALBeMelA23LLQVbGg2jWRhAQsYo=";
|
||||
hash = "sha256-mpCskwwxYbjAuLDZLB53sOKOPV35FBEORdEXF+CXGG8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "outline";
|
||||
version = "0.85.1";
|
||||
version = "0.86.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "outline";
|
||||
repo = "outline";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lErNsYzxqZYVl1MAQdMk062nBORjQGd3C+UbGbZMzvA=";
|
||||
hash = "sha256-lsiwTpmb9E6C5FuYFfko4PqulDcqWU9sQnzSEJ3Y4NE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-/CXIZKI8eeK21PRIVZnRMOkwNNbj0vC0PZuT6rZBwG4=";
|
||||
hash = "sha256-9xJ+N+UaHTlBzXvFPyYgB4jNwdiWCkvCSN22kEGuIxI=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -10233,7 +10233,7 @@ with pkgs;
|
||||
outline = callPackage ../servers/web-apps/outline (
|
||||
lib.fix (super: {
|
||||
yarn = yarn.override { inherit (super) nodejs; };
|
||||
nodejs = nodejs_20;
|
||||
nodejs = nodejs_22;
|
||||
})
|
||||
);
|
||||
|
||||
|
||||
@@ -12811,6 +12811,8 @@ self: super: with self; {
|
||||
|
||||
pyepsg = callPackage ../development/python-modules/pyepsg { };
|
||||
|
||||
pyequihash = callPackage ../development/python-modules/pyequihash { };
|
||||
|
||||
pyerfa = callPackage ../development/python-modules/pyerfa { };
|
||||
|
||||
pyeverlights = callPackage ../development/python-modules/pyeverlights { };
|
||||
@@ -15353,6 +15355,8 @@ self: super: with self; {
|
||||
|
||||
qrcode-terminal = callPackage ../development/python-modules/qrcode-terminal { };
|
||||
|
||||
qrcodegen = callPackage ../development/python-modules/qrcodegen { qrcodegen = pkgs.qrcodegen; };
|
||||
|
||||
qreactor = callPackage ../development/python-modules/qreactor { };
|
||||
|
||||
qscintilla = self.qscintilla-qt5;
|
||||
|
||||
Reference in New Issue
Block a user