Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -27,9 +27,57 @@ import ../make-test-python.nix (
|
||||
pkgs.runCommand "k3s-test-chart.tgz"
|
||||
{
|
||||
nativeBuildInputs = [ pkgs.kubernetes-helm ];
|
||||
chart = builtins.toJSON {
|
||||
name = "k3s-test-chart";
|
||||
version = "0.1.0";
|
||||
};
|
||||
values = builtins.toJSON {
|
||||
restartPolicy = "Never";
|
||||
runCommand = "";
|
||||
image = {
|
||||
repository = "foo";
|
||||
tag = "1.0.0";
|
||||
};
|
||||
};
|
||||
job = builtins.toJSON {
|
||||
apiVersion = "batch/v1";
|
||||
kind = "Job";
|
||||
metadata = {
|
||||
name = "{{ .Release.Name }}";
|
||||
namespace = "{{ .Release.Namespace }}";
|
||||
};
|
||||
spec = {
|
||||
template = {
|
||||
spec = {
|
||||
containers = [
|
||||
{
|
||||
name = "test";
|
||||
image = "{{ .Values.image.repository }}:{{ .Values.image.tag }}";
|
||||
command = [ "sh" ];
|
||||
args = [
|
||||
"-c"
|
||||
"{{ .Values.runCommand }}"
|
||||
];
|
||||
}
|
||||
];
|
||||
restartPolicy = "{{ .Values.restartPolicy }}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
passAsFile = [
|
||||
"values"
|
||||
"chart"
|
||||
"job"
|
||||
];
|
||||
}
|
||||
''
|
||||
helm package ${./k3s-test-chart}
|
||||
mkdir -p chart/templates
|
||||
cp "$chartPath" chart/Chart.yaml
|
||||
cp "$valuesPath" chart/values.yaml
|
||||
cp "$jobPath" chart/templates/job.json
|
||||
|
||||
helm package chart
|
||||
mv ./*.tgz $out
|
||||
'';
|
||||
# The common Helm chart that is used in this test
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
apiVersion: v2
|
||||
name: k3s-test-chart
|
||||
description: A Helm chart that is used in k3s NixOS tests.
|
||||
|
||||
# A chart can be either an 'application' or a 'library' chart.
|
||||
#
|
||||
# Application charts are a collection of templates that can be packaged into versioned archives
|
||||
# to be deployed.
|
||||
#
|
||||
# Library charts provide useful utilities or functions for the chart developer. They're included as
|
||||
# a dependency of application charts to inject those utilities and functions into the rendering
|
||||
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
|
||||
type: application
|
||||
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||
version: 0.1.0
|
||||
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application. Versions are not expected to
|
||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||
# It is recommended to use it with quotes.
|
||||
appVersion: "1.16.0"
|
||||
@@ -1,14 +0,0 @@
|
||||
apiVersion: batch/v1
|
||||
kind: Job
|
||||
metadata:
|
||||
name: {{ .Release.Name | quote }}
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
containers:
|
||||
- name: test
|
||||
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||
command: ["sh"]
|
||||
args: ["-c", "{{ .Values.runCommand }}"]
|
||||
restartPolicy: {{ .Values.restartPolicy | quote }}
|
||||
@@ -1,5 +0,0 @@
|
||||
restartPolicy: "Never"
|
||||
runCommand: ""
|
||||
image:
|
||||
repository: foo
|
||||
tag: 1.0.0
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.0.61";
|
||||
hash = "sha256-dZu2CIjRyvAhTRwOuQV2s0SoEUQko+dQfnQg6ECwLv4=";
|
||||
version = "2.0.62";
|
||||
hash = "sha256-2w4ZMOM7EI0rEKoUocwnHVlNVk6smCiX0nTgTpdZo2s=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -38,14 +38,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.0.3";
|
||||
version = "2.0.5";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-vvbzXwujOIk3g/SvNM3JGkt956RN9VR0Pcx5nzg1IU0=";
|
||||
hash = "sha256-a2pYQCpcF4nIr2HaU+29umiTdXN2P//+a9SZ7pG55lo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "algia";
|
||||
version = "0.0.91";
|
||||
version = "0.0.93";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "algia";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VsQBiD8OE2NHwMlYrCG43ukuBHE0bkKFt4BxsNUvLAo=";
|
||||
hash = "sha256-B1win7mTU1vrdhhm8jtbemVYwUWYlEpoLN4d4FI65Is=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kp52vbvE6QY0SEY/2D1f1EbDzqweQkNOepN0We4I9ko=";
|
||||
vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU=";
|
||||
|
||||
meta = {
|
||||
description = "CLI application for nostr";
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
bison,
|
||||
glm,
|
||||
flex,
|
||||
wrapQtAppsHook,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libglut,
|
||||
@@ -14,6 +13,7 @@
|
||||
imagemagick,
|
||||
fftw,
|
||||
eigen,
|
||||
libsForQt5,
|
||||
libtirpc,
|
||||
boehmgc,
|
||||
libGLU,
|
||||
@@ -24,8 +24,6 @@
|
||||
gsl,
|
||||
libsigsegv,
|
||||
python3,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
boost186,
|
||||
zlib,
|
||||
perl,
|
||||
@@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
flex
|
||||
bison
|
||||
texinfo
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
cmake
|
||||
ghostscriptX
|
||||
perl
|
||||
@@ -101,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zlib
|
||||
perl
|
||||
curl
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
# relies on removed asio::io_service
|
||||
# https://github.com/kuafuwang/LspCpp/issues/52
|
||||
boost186
|
||||
@@ -199,11 +197,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# make: *** [Makefile:272: install-asy] Error 1
|
||||
enableParallelInstalling = false;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Tool for programming graphics intended to replace Metapost";
|
||||
homepage = "https://asymptote.sourceforge.io/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.raskin ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@@ -21,16 +21,16 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "23.2.2";
|
||||
version = "23.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HAcsFGLUUaeNxEBAFgYjDipu8QTsd+8yptC6kAX0C4g=";
|
||||
hash = "sha256-qczkG1+6sn/n+Ew/HD5Ki8epZW3UEpREc3fjS2VS1go=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-dT5WrrzrO5tcP4/NFe5WTG7boYTOlFRNut52X2AWaao=";
|
||||
npmDepsHash = "sha256-b5LNCOai6DyJx5VDaNHWFq9rvj5g9kwXqnUoS7fb8z4=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-about";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-about";
|
||||
tag = version;
|
||||
sha256 = "sha256-MRrcSVWcvp0E135ViKbPo7a60TcYjWZNj8ZL/lJ/XDM=";
|
||||
sha256 = "sha256-QbmZIbn/xPZUTXNpUjGuWTjoh8RpsMRuVIfJRO9M3xM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KIc3LPkFGMvNusyRAhaejv6wZjQnDmrGn4cOTYb70KM=";
|
||||
cargoHash = "sha256-oO5Kp5A2v1w6EUwgcHhyagZDIK7a/2d9uTiCoXHuHhY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.61",
|
||||
"version": "2.0.62",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.61",
|
||||
"version": "2.0.62",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.61";
|
||||
version = "2.0.62";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-701TwdPtqudwKuphVngMiI6TbM9y1S/HFVTREhkHgdY=";
|
||||
hash = "sha256-fsYTcbn1wvysECAZfiBCAM9tnNx5bIC7QTKaGw5rfjQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lPWrFSintH3/4T5IKSH9tBX3q3Ow/L0ptk+NsVGR+uQ=";
|
||||
npmDepsHash = "sha256-q1jBjwVxc0mP+rbW3VHYp85Q14cjilzIWq3kNpjsxLY=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "clive";
|
||||
version = "0.12.15";
|
||||
version = "0.12.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koki-develop";
|
||||
repo = "clive";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WOcqcyhyv72tNmm7mETjboStesfFfVVAmN2ZdLFd1Uc=";
|
||||
hash = "sha256-bZzK7RLAStRb9R3V/TK6tZV6yv1C7MGslAhhpWDzdWk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QfHCrou7Lr1CrRQqvLEnWTtQk8aDigkm4SBArLjMkyo=";
|
||||
vendorHash = "sha256-BDspmaATLIfwyqxwJNJ24vpEETUWGVbobHWD2NRaOi4=";
|
||||
subPackages = [ "." ];
|
||||
buildInputs = [ ttyd ];
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,30 +1,29 @@
|
||||
{
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cmst";
|
||||
version = "2023.03.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "cmst";
|
||||
owner = "andrew-bibb";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-yTqPxywPbtxTy1PPG+Mq64u8MrB27fEdmt1B0pn0BVk=";
|
||||
tag = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
hash = "sha256-yTqPxywPbtxTy1PPG+Mq64u8MrB27fEdmt1B0pn0BVk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
libsForQt5.qmake
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
|
||||
postPatch = ''
|
||||
for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do
|
||||
@@ -33,18 +32,18 @@ mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "${pname}-";
|
||||
rev-prefix = "${finalAttrs.pname}-";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "QT GUI for Connman with system tray icon";
|
||||
mainProgram = "cmst";
|
||||
homepage = "https://github.com/andrew-bibb/cmst";
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
matejc
|
||||
romildo
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -14,18 +14,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.65.0";
|
||||
version = "0.66.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-1zh6ifwavP3RFqQbHIClEQ4cKRQ5LdU61LReA6+HSW8=";
|
||||
hash = "sha256-IO5bZOkMcpIB0751d9PV32C21CIFuZPa/p8tVmoNwuA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-XzqEI8wpI5g1+u+AOWiZYOzCVhwysMtHKPDpcfu2HAU=";
|
||||
cargoHash = "sha256-ilzYG2W7xdpdCnrKN1LIrMvAjCAVJx6106sbApkH/60=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
+10
-12
@@ -2,16 +2,11 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
mkDerivation,
|
||||
qtbase,
|
||||
qmltermwidget,
|
||||
qtquickcontrols2,
|
||||
qtgraphicaleffects,
|
||||
qmake,
|
||||
libsForQt5,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.0";
|
||||
pname = "cool-retro-term";
|
||||
|
||||
@@ -27,13 +22,16 @@ mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qmltermwidget
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qmltermwidget
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtgraphicaleffects
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.20.1";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SfuMX6ZiOFwi9dx1ZAM3uIKCjl52X93JzQa71q6uXAY=";
|
||||
hash = "sha256-WwakKR+JdlidfxXnKmAPVMxRs/TfNPOg43vQ9HrEqFY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mlX961xljS+KcP+ReQsP6N1VK6blG0yLpRVIvXJAQBw=";
|
||||
vendorHash = "sha256-9WROtIp4Tt+9w+L+frLawwoyMCjuk41VIGYEi5oSHDk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
+20
-23
@@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
lib,
|
||||
autoreconfHook,
|
||||
curl,
|
||||
@@ -7,15 +7,12 @@
|
||||
git,
|
||||
libevent,
|
||||
libtool,
|
||||
libsForQt5,
|
||||
qrencode,
|
||||
udev,
|
||||
libusb1,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtwebsockets,
|
||||
qtmultimedia,
|
||||
udevRule51 ? ''
|
||||
SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402"
|
||||
'',
|
||||
@@ -49,15 +46,15 @@
|
||||
let
|
||||
copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
|
||||
in
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "digitalbitbox";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digitalbitbox";
|
||||
repo = "dbb-app";
|
||||
rev = "v${version}";
|
||||
sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
|
||||
};
|
||||
|
||||
# configure.ac:23: error: AC_CONFIG_MACRO_DIR can only be used once
|
||||
@@ -71,8 +68,9 @@ mkDerivation rec {
|
||||
git
|
||||
makeWrapper
|
||||
pkg-config
|
||||
qttools
|
||||
libsForQt5.qttools
|
||||
udevCheckHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -81,18 +79,17 @@ mkDerivation rec {
|
||||
udev
|
||||
libusb1
|
||||
qrencode
|
||||
|
||||
qtbase
|
||||
qtwebsockets
|
||||
qtmultimedia
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtwebsockets
|
||||
libsForQt5.qtmultimedia
|
||||
];
|
||||
|
||||
LUPDATE = "${qttools.dev}/bin/lupdate";
|
||||
LRELEASE = "${qttools.dev}/bin/lrelease";
|
||||
MOC = "${qtbase.dev}/bin/moc";
|
||||
QTDIR = qtbase.dev;
|
||||
RCC = "${qtbase.dev}/bin/rcc";
|
||||
UIC = "${qtbase.dev}/bin/uic";
|
||||
LUPDATE = "${libsForQt5.qttools.dev}/bin/lupdate";
|
||||
LRELEASE = "${libsForQt5.qttools.dev}/bin/lrelease";
|
||||
MOC = "${libsForQt5.qtbase.dev}/bin/moc";
|
||||
QTDIR = libsForQt5.qtbase.dev;
|
||||
RCC = "${libsForQt5.qtbase.dev}/bin/rcc";
|
||||
UIC = "${libsForQt5.qtbase.dev}/bin/uic";
|
||||
|
||||
configureFlags = [
|
||||
"--enable-libusb"
|
||||
@@ -130,7 +127,7 @@ mkDerivation rec {
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "QT based application for the Digital Bitbox hardware wallet";
|
||||
longDescription = ''
|
||||
Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices.
|
||||
@@ -149,7 +146,7 @@ mkDerivation rec {
|
||||
to the configuration which installs the package and enables the hardware module.
|
||||
'';
|
||||
homepage = "https://digitalbitbox.com/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ente-web-${enteApp}";
|
||||
version = "1.2.20";
|
||||
version = "1.2.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gauge";
|
||||
version = "1.6.21";
|
||||
version = "1.6.22";
|
||||
|
||||
patches = [
|
||||
# adds a check which adds an error message when trying to
|
||||
@@ -18,10 +18,10 @@ buildGoModule rec {
|
||||
owner = "getgauge";
|
||||
repo = "gauge";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mUuoGLAVUShhNsSjURCL6yWcIW+K7P8KEBwBoBelgyw=";
|
||||
hash = "sha256-6RJj+sDffqzdMlMkE/rJ7AEKYcxDQBR86fjlaNDb6M0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WyQbvZNd61L4Bz5btZ2hkrCTb5iuJJU5yNDzuYR5Sdc=";
|
||||
vendorHash = "sha256-nxd+3hKHLUiHpSGTJpD5QRFJ4e0Boq5MTijmND56Uug=";
|
||||
|
||||
excludedPackages = [
|
||||
"build"
|
||||
|
||||
@@ -1,28 +1,22 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchCrate,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "genemichaels";
|
||||
version = "0.5.13";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andrewbaxter";
|
||||
repo = "genemichaels";
|
||||
rev = "genemichaels-v${version}";
|
||||
hash = "sha256-pzGTKswETm7RR0up1eSWC+X633rsVmEAJ3DYM8z6paQ=";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-5cM5VyS5w92CjP3nVumuUNkCFlhipukRhM8ERhE36n4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-J7uibeoIKLC3jo5TstzC8udK+miAA52321eapOHVzbM=";
|
||||
cargoHash = "sha256-aJDtXsGVUxUrh3yLWEcobvFUqy/7PGFQHWIWU54zYdE=";
|
||||
|
||||
cargoBuildFlags = [ "--package ${pname}" ];
|
||||
# cargoTestFlags is not used because genemichaels is tightly coupled to the
|
||||
# other crates in the workspace and by not setting it, we run all the tests.
|
||||
# If a dependency crate is failing its tests, we want to know about it. For
|
||||
# example, between versions 0.5.8 and 0.5.12, there was a failing test in one
|
||||
# of the other workspace members that genemichaels depends on.
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Even formats macros";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gotlsaflare";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stenstromen";
|
||||
repo = "gotlsaflare";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1CvPQdaJJbh+Dsibgwan9T7yLiH+fTfAYtv1Rkuo8E4=";
|
||||
hash = "sha256-oGuK6jyThBG/Kvsa/g+Z27HuU8n+EX7FDsQVuJPsjS0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-d+79m6K1+fy3vyXLKvwNx6mFiO3UO9lHJ07364jVJYM=";
|
||||
vendorHash = "sha256-NNmNX4ZZsL2m9RfVwy5uJ1uj+YG2jV1hgrrPyZ4dkb8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
+13
-13
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -9,22 +9,21 @@
|
||||
fdk_aac,
|
||||
faad2,
|
||||
fftwFloat,
|
||||
libsForQt5,
|
||||
libsndfile,
|
||||
libsamplerate,
|
||||
portaudio,
|
||||
qtmultimedia,
|
||||
qwt,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "guglielmo";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marcogrecopriolo";
|
||||
repo = "guglielmo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
@@ -34,6 +33,7 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
airspy
|
||||
@@ -44,8 +44,8 @@ mkDerivation rec {
|
||||
libsndfile
|
||||
libsamplerate
|
||||
portaudio
|
||||
qtmultimedia
|
||||
qwt
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qwt
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
@@ -53,12 +53,12 @@ mkDerivation rec {
|
||||
patchelf --add-rpath "${airspy}/lib:${rtl-sdr}/lib" $out/bin/.guglielmo-wrapped
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Qt based FM / Dab tuner";
|
||||
mainProgram = "guglielmo";
|
||||
homepage = "https://github.com/marcogrecopriolo/guglielmo";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.markuskowa ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.markuskowa ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "infrastructure-agent";
|
||||
version = "1.71.1";
|
||||
version = "1.71.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newrelic";
|
||||
repo = "infrastructure-agent";
|
||||
rev = version;
|
||||
hash = "sha256-HS6OgPi6gF1LB7BgFeLL3Wpvwu7sv9YoR3VBytLrd0Y=";
|
||||
hash = "sha256-DnS6C2Fiah1jaInX2xS3R0UKrHa0IAagKOPB0QBCR5Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o=";
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keymapper";
|
||||
version = "5.1.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "houmain";
|
||||
repo = "keymapper";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-y1EVF3IwGzDy32ywo9LSzkQNki/HuKC40DySIme8nTc=";
|
||||
hash = "sha256-YKfKgsrjDrskLEoYCSRMYco7+7E/sgXFAMEwwm7rs7w=";
|
||||
};
|
||||
|
||||
# all the following must be in nativeBuildInputs
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lms";
|
||||
version = "3.72.1";
|
||||
version = "3.73.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epoupon";
|
||||
repo = "lms";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c6eCfQz/Tc8pg1vVjgidkPj7I85sJ5AcyX7Gf/MTXZI=";
|
||||
hash = "sha256-9m1YvuYuiiEXAX8HFt61VGZN/ThYXdBcwOSeL05mwOU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "LycheeSlicer";
|
||||
version = "7.5.1";
|
||||
version = "7.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
|
||||
hash = "sha256-mjpBE896mKQbJZysGW6skzisrUhcanU0tMB8bk4YauM=";
|
||||
hash = "sha256-f6Ug0m1BKvSFGIG3lC/YBcR1JXQGEJ/rAimdq36iTco=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
# https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996
|
||||
buildGoModule rec {
|
||||
pname = "mark";
|
||||
version = "15.1.0";
|
||||
version = "15.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovetskiy";
|
||||
repo = "mark";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7aOzl1+Nihj2UiAAaoQAtTlxr1FSOS/0fYmeg/dYukc=";
|
||||
sha256 = "sha256-ZvFaSoD9nQtxc5ONWneVgpAfX3f7sS0lBSMXqhABn8o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jbaDk28NIPqjf5fLOJZnsShVw5Ni14JS4J+T0GKNTbQ=";
|
||||
vendorHash = "sha256-3hfeh7PRzsPfQ+aLPV44ExXum6lG6Huvc7itRIn8mNo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -57,6 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
NotAShelf
|
||||
viperML
|
||||
midischwarz12
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
in
|
||||
symlinkJoin {
|
||||
pname = "nh";
|
||||
inherit (unwrapped) version meta;
|
||||
inherit (unwrapped) version;
|
||||
|
||||
paths = [
|
||||
unwrapped
|
||||
@@ -27,4 +27,20 @@ symlinkJoin {
|
||||
wrapProgram $out/bin/nh \
|
||||
--prefix PATH : ${lib.makeBinPath runtimeDeps}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (unwrapped.meta)
|
||||
changelog
|
||||
description
|
||||
homepage
|
||||
license
|
||||
mainProgram
|
||||
maintainers
|
||||
;
|
||||
|
||||
# To prevent builds on hydra
|
||||
hydraPlatforms = [ ];
|
||||
# prefer wrapper over the package
|
||||
priority = (unwrapped.meta.priority or lib.meta.defaultPriority) - 1;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,48 +3,47 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pe-bear";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hasherezade";
|
||||
repo = "pe-bear";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jWRO0vO601IijFo7nu0SMF8inEXWLzv+Ni1nlJfGqhQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Portable Executable reversing tool with a friendly GUI";
|
||||
mainProgram = "PE-bear";
|
||||
homepage = "https://hshrzd.wordpress.com/pe-bear/";
|
||||
|
||||
license = [
|
||||
license = with lib.licenses; [
|
||||
# PE-Bear
|
||||
licenses.gpl2Only
|
||||
gpl2Only
|
||||
|
||||
# Vendored capstone
|
||||
licenses.bsd3
|
||||
bsd3
|
||||
|
||||
# Vendored bearparser
|
||||
licenses.bsd2
|
||||
bsd2
|
||||
];
|
||||
|
||||
maintainers = with maintainers; [ blitz ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ lib.maintainers.blitz ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "proton-ge-bin";
|
||||
version = "GE-Proton10-25";
|
||||
version = "GE-Proton10-26";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-RKko4QMxtnuC1SAHTSEQGBzVyl3ywnirFSYJ1WKSY0k=";
|
||||
hash = "sha256-Q5bKTDn3sTgp4mbsevOdN3kcdRsyKylghXqM2I2cYq8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -10,11 +10,11 @@ index 4e899af..0000000
|
||||
-
|
||||
-fn main() {
|
||||
- let outdir = env::var("OUT_DIR").unwrap();
|
||||
- let outfile = format!("{}/build-time.txt", outdir);
|
||||
- let outfile = format!("{outdir}/build-time.txt");
|
||||
-
|
||||
- let mut fh = fs::File::create(outfile).unwrap();
|
||||
- let now = OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc());
|
||||
- write!(fh, r#""{}""#, now).ok();
|
||||
- write!(fh, r#""{now}""#).ok();
|
||||
-
|
||||
- let git_config = File::from_git_dir("../.git/".into()).expect("Git Config not found!");
|
||||
- // Get Git's 'Origin' URL
|
||||
@@ -43,9 +43,9 @@ index 4e899af..0000000
|
||||
- let trimmed_url = remote_url.trim_end_matches(".git");
|
||||
- remote_url.clone_from(&String::from(trimmed_url));
|
||||
-
|
||||
- let outfile = format!("{}/remote-url.txt", outdir);
|
||||
- let outfile = format!("{outdir}/remote-url.txt");
|
||||
- let mut file = fs::File::create(outfile).unwrap();
|
||||
- write!(file, r#""{}""#, remote_url).ok();
|
||||
- write!(file, r#""{remote_url}""#).ok();
|
||||
-}
|
||||
diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs
|
||||
index 2faa317..b890a2d 100644
|
||||
|
||||
@@ -33,16 +33,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "psst";
|
||||
version = "0-unstable-2025-04-20";
|
||||
version = "0-unstable-2025-11-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpochyla";
|
||||
repo = "psst";
|
||||
rev = "86169f8b05c1b3502261cfe1fae9af2487b8f1bb";
|
||||
hash = "sha256-BkGoaYflCTiElTj47r2j/ngUrZ9wIe0q4pl+zhoattA=";
|
||||
rev = "cae05c43f4aee2c5936375225c4586ea35594835";
|
||||
hash = "sha256-iCm5lvZq64Dmbe/stkZO0XvX0mWfmzFgl3MeCTI6/hM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gt2EDrZ+XXig5JUsmQksSLaFd7UArnttOT4UiTVASXw=";
|
||||
cargoHash = "sha256-Q4xMsX6lJK3Or+oKuPOTCec2pe+oBWC33peCE1x7QRg=";
|
||||
|
||||
# specify the subdirectory of the binary crate to build from the workspace
|
||||
buildAndTestSubdir = "psst-gui";
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
withUi ? true,
|
||||
buildFeatures ?
|
||||
# enable all features except self_update by default
|
||||
# https://github.com/dathere/qsv/blob/10.0.0/Cargo.toml#L370
|
||||
# https://github.com/dathere/qsv/blob/11.0.2/Cargo.toml#L370
|
||||
[
|
||||
"apply"
|
||||
"feature_capable"
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
let
|
||||
pname = "qsv";
|
||||
version = "10.0.0";
|
||||
version = "11.0.2";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version buildFeatures;
|
||||
@@ -42,10 +42,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "dathere";
|
||||
repo = "qsv";
|
||||
rev = version;
|
||||
hash = "sha256-Jo2pC+zs3wQAaeQzg6MLySVtI0bB7hLczT62Xpb4L14=";
|
||||
hash = "sha256-EuNDwzO4tVjJUz8mXI0fDczoPLD89zmbSyfFI8ZrgwU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-05jJslguUFLZtugozv/jn7CDie47WnvrFnjC3SUYxxo=";
|
||||
cargoHash = "sha256-l8hkDr3CtpyXWDTS8oje6W0iu5O28j4rLIXprxTEwHc=";
|
||||
|
||||
buildInputs = [
|
||||
file
|
||||
|
||||
@@ -1,29 +1,25 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
libsForQt5,
|
||||
git,
|
||||
gnupg,
|
||||
pass,
|
||||
pwgen,
|
||||
qrencode,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qttools,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtpass";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IJHack";
|
||||
repo = "QtPass";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -35,20 +31,20 @@ stdenv.mkDerivation rec {
|
||||
git
|
||||
gnupg
|
||||
pass
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
# setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too:
|
||||
"QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
|
||||
"QMAKE_LUPDATE=${libsForQt5.qttools.dev}/bin/lupdate"
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
@@ -76,12 +72,12 @@ stdenv.mkDerivation rec {
|
||||
install -D qtpass.1 -t $out/share/man/man1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Multi-platform GUI for pass, the standard unix password manager";
|
||||
mainProgram = "qtpass";
|
||||
homepage = "https://qtpass.org";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.hrdinka ];
|
||||
platforms = platforms.all;
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.hrdinka ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "2.62.10";
|
||||
version = "2.65.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rHu74DHbmy+/1mdsEvvND4bzVzVXfQoSXfJIzPYSq2s=";
|
||||
hash = "sha256-uxRC5T9i4JbMqRT8pCnbqhuNl1GxrhgqsDLrMNy8fgM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-neUCgxE7NH6rRKrmjpkzwcCFxYxiqgu5/0b0e/833Ng=";
|
||||
vendorHash = "sha256-rBlLfKcaWAYaC+3M9YgjHcne70ohNeOZ6JGt3Uwra4k=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tremotesf";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "equeim";
|
||||
repo = "tremotesf2";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0nqdCf0rRPEf8O5ZuC2uYLSJavXIDhhiB3sNMryP3Jg=";
|
||||
hash = "sha256-bDeyVmcKw6pMrsN123OnZio7YHs1Y/bfg+EnFTHY8gE=";
|
||||
# We need this for src/libtremotesf
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
+15
-12
@@ -1,22 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "veikk-linux-driver-gui";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jlam55555";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j";
|
||||
repo = "veikk-linux-driver-gui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ssQ54d+4H0a0FF3BrVlHPrPd7WlBocFLep9KPtPB4Qk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
make all clean
|
||||
@@ -27,12 +30,12 @@ mkDerivation rec {
|
||||
cp veikk-linux-driver-gui $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Configuration tool for the VEIKK Linux driver";
|
||||
homepage = "https://github.com/jlam55555/veikk-linux-driver-gui/";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ nicbk ];
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.nicbk ];
|
||||
mainProgram = "veikk-linux-driver-gui";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "watcher";
|
||||
version = "0.13.8";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "e-dant";
|
||||
repo = "watcher";
|
||||
tag = version;
|
||||
hash = "sha256-sQel+W9J8ExWkSEYd6Wjw2M9VgTIax+8zadI982fH4U=";
|
||||
hash = "sha256-Rqsm6DBS8SHxibQvrwO30RZ5ZPLWQvdTOM7i2zzCPXc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "werf";
|
||||
version = "2.55.0";
|
||||
version = "2.55.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mzZmLdzMlAArn8qr2fZH+U4Buewr+eBwyLCmqXKzlAM=";
|
||||
hash = "sha256-bfz9mjvvqT6jA9CGLNGox8IaE0QzVGWRc5I/vaB6e5M=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -8,16 +8,18 @@
|
||||
libiconv,
|
||||
}:
|
||||
|
||||
# r-ryantm wants to downgrade
|
||||
# nixpkgs-update: no auto update
|
||||
buildPythonPackage rec {
|
||||
pname = "biliass";
|
||||
version = "2.1.1";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yutto-dev";
|
||||
repo = "yutto";
|
||||
tag = "biliass@${version}";
|
||||
hash = "sha256-Pn6z4iDxNcLVoY4xk7v0zc8hmajWEaOYFDEw5HEYxl4=";
|
||||
hash = "sha256-ZB18BQJRSwA/ERHjqmp+D39UqTvdYpbhwLjaizM5R2I=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/biliass";
|
||||
@@ -31,7 +33,7 @@ buildPythonPackage rec {
|
||||
sourceRoot
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-0/3r4P6SJq4zbZpKW9bn+ljRbYkxWFP8nYxjlMLXioI=";
|
||||
hash = "sha256-gOYgYi8RlWBe0astv6D6/J7Ge20TM/19zJHwoCevpIo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
general-sam,
|
||||
setuptools,
|
||||
kbnf,
|
||||
frozendict,
|
||||
jsonschema,
|
||||
pydantic,
|
||||
transformers,
|
||||
vllm,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "formatron";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dan-wanna-M";
|
||||
repo = "formatron";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LQJza8F5wPcQO1y7Ino4slv7zoJMsZBn4LKLWYO9818=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
frozendict
|
||||
general-sam
|
||||
jsonschema
|
||||
kbnf
|
||||
pydantic
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
transformers = [
|
||||
transformers
|
||||
];
|
||||
vllm = [
|
||||
vllm
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"formatron"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Control the output format of language models";
|
||||
homepage = "https://github.com/Dan-wanna-M/formatron";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ BatteredBunny ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pytest,
|
||||
cargo,
|
||||
rustc,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "general-sam";
|
||||
version = "1.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ModelTC";
|
||||
repo = "general-sam-py";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-++6Z9Ocee4QFN1u0nK/g9uGdmB1UYnfHhhJj74zboCE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-8HHIM1Abz5KxnVphFFNJp6L3D6iPeoB7qVmxy11CUZs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
cargo
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.maturinBuildHook
|
||||
rustc
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
test = [
|
||||
pytest
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"general_sam"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "General suffix automaton implementation";
|
||||
homepage = "https://github.com/ModelTC/general-sam-py";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ BatteredBunny ];
|
||||
};
|
||||
}
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202512071";
|
||||
version = "0.1.202512091";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gP8Dar9tFolccIsC5xs0wI8T3licZzikdqvhtw/eQ+U=";
|
||||
hash = "sha256-y6DlcmPRC/yG++ejpbzVCOgPmj53pKwEWilxdep6x7Q=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
+1254
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
numpy,
|
||||
triton,
|
||||
torch,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kbnf";
|
||||
version = "0.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dan-wanna-M";
|
||||
repo = "kbnf";
|
||||
rev = "v${version}-python";
|
||||
hash = "sha256-reefuqS0eExky9qtxBTqwxnZgK8AWFfkrN+VL/lFLyg=";
|
||||
};
|
||||
|
||||
# Manually unarchived from tarball from pypi
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
build-system = [
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.maturinBuildHook
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
efficient_logits_mask = [
|
||||
triton
|
||||
];
|
||||
torch = [
|
||||
torch
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kbnf"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Fast constrained decoding engine based on context free grammar";
|
||||
homepage = "https://pypi.org/project/kbnf/";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ BatteredBunny ];
|
||||
};
|
||||
}
|
||||
@@ -34,14 +34,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libretranslate";
|
||||
version = "1.8.1";
|
||||
version = "1.8.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreTranslate";
|
||||
repo = "LibreTranslate";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LzXAGiZQU6wV063bqLTr8S1IDX/j4xHjqmhuFyosCSw=";
|
||||
hash = "sha256-nWm0h/ceGDtoUVqYPkIC+anXrneJsxlZ4DN3Wge0NCk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "timetagger";
|
||||
version = "25.06.1";
|
||||
version = "25.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "almarklein";
|
||||
repo = "timetagger";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fuZj4DoqtgIcRd/u7l0GsWqmuLEgF3BW5gN5wY8FdK0=";
|
||||
hash = "sha256-XuYxle5U5Ui8ITsCgiJjwaRdfHwEa9cF0lAMoXwJamw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weaviate-client";
|
||||
version = "4.18.2";
|
||||
version = "4.18.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate-python-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WaNTYV8HmfyC+OuDZOMmb5uKaACxmdk5qXZ9AxsMQaw=";
|
||||
hash = "sha256-2cgj7Ry6lcmrvjhXkAmUO1vjsjF2dZxb1MsbQH3uElM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.12.60";
|
||||
hash = "sha256-nS9vsdH76q+uUaWXEp3duikX7osVqv7hjBMFNzdtA7o=";
|
||||
version = "6.12.61";
|
||||
hash = "sha256-7m4Ehmy463rQK265fEvTMjndqZXs+PJ35HE+tZVKgGQ=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "6.17.10";
|
||||
hash = "sha256-Y6WsimtxzT6SutR040tUK+fVNnxnACtiyA3DF+iiPVM=";
|
||||
version = "6.17.11";
|
||||
hash = "sha256-NJQ67MOjFMScwECxQd00F3SZ+kITbuBp/3imNXdUqlQ=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -403,8 +403,6 @@ with pkgs;
|
||||
name = "die-hook";
|
||||
} ../build-support/setup-hooks/die.sh;
|
||||
|
||||
digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };
|
||||
|
||||
devShellTools = callPackage ../build-support/dev-shell-tools { };
|
||||
|
||||
dockerTools = callPackage ../build-support/docker {
|
||||
@@ -506,8 +504,6 @@ with pkgs;
|
||||
|
||||
prefer-remote-fetch = import ../build-support/prefer-remote-fetch;
|
||||
|
||||
pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { };
|
||||
|
||||
magika = with python3Packages; toPythonApplication magika;
|
||||
|
||||
mysql-shell = mysql-shell_8;
|
||||
@@ -1078,8 +1074,6 @@ with pkgs;
|
||||
|
||||
mkosi-full = mkosi.override { withQemu = true; };
|
||||
|
||||
ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };
|
||||
|
||||
openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { };
|
||||
|
||||
openusd = python3Packages.openusd.override {
|
||||
@@ -1103,8 +1097,6 @@ with pkgs;
|
||||
|
||||
ufolint = with python3Packages; toPythonApplication ufolint;
|
||||
|
||||
veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
|
||||
|
||||
ventoy-full = ventoy.override {
|
||||
withCryptsetup = true;
|
||||
withXfs = true;
|
||||
@@ -1422,8 +1414,6 @@ with pkgs;
|
||||
|
||||
### APPLICATIONS/TERMINAL-EMULATORS
|
||||
|
||||
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
|
||||
|
||||
kitty = callPackage ../by-name/ki/kitty/package.nix {
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
@@ -1500,8 +1490,6 @@ with pkgs;
|
||||
|
||||
arpack-mpi = arpack.override { useMpi = true; };
|
||||
|
||||
asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };
|
||||
|
||||
authelia = callPackage ../servers/authelia {
|
||||
buildGoModule = buildGo124Module;
|
||||
pnpm = pnpm_10;
|
||||
@@ -1634,8 +1622,6 @@ with pkgs;
|
||||
|
||||
go2tv-lite = go2tv.override { withGui = false; };
|
||||
|
||||
guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { };
|
||||
|
||||
hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit;
|
||||
|
||||
hwi = with python3Packages; toPythonApplication hwi;
|
||||
@@ -2316,8 +2302,6 @@ with pkgs;
|
||||
;
|
||||
citrix_workspace = citrix_workspace_25_05_0;
|
||||
|
||||
cmst = libsForQt5.callPackage ../tools/networking/cmst { };
|
||||
|
||||
colord-gtk4 = colord-gtk.override { withGtk4 = true; };
|
||||
|
||||
connmanFull = connman.override {
|
||||
@@ -11866,8 +11850,6 @@ with pkgs;
|
||||
|
||||
qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };
|
||||
|
||||
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
|
||||
|
||||
quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };
|
||||
|
||||
quasselClient = quassel.override {
|
||||
|
||||
@@ -5687,6 +5687,8 @@ self: super: with self; {
|
||||
|
||||
forecast-solar = callPackage ../development/python-modules/forecast-solar { };
|
||||
|
||||
formatron = callPackage ../development/python-modules/formatron { };
|
||||
|
||||
formbox = callPackage ../development/python-modules/formbox { };
|
||||
|
||||
formencode = callPackage ../development/python-modules/formencode { };
|
||||
@@ -5915,6 +5917,8 @@ self: super: with self; {
|
||||
|
||||
genanki = callPackage ../development/python-modules/genanki { };
|
||||
|
||||
general-sam = callPackage ../development/python-modules/general-sam { };
|
||||
|
||||
generic = callPackage ../development/python-modules/generic { };
|
||||
|
||||
genie-partner-sdk = callPackage ../development/python-modules/genie-partner-sdk { };
|
||||
@@ -7958,6 +7962,8 @@ self: super: with self; {
|
||||
|
||||
kbcstorage = callPackage ../development/python-modules/kbcstorage { };
|
||||
|
||||
kbnf = callPackage ../development/python-modules/kbnf { };
|
||||
|
||||
kconfiglib = callPackage ../development/python-modules/kconfiglib { };
|
||||
|
||||
kde-material-you-colors = callPackage ../development/python-modules/kde-material-you-colors { };
|
||||
|
||||
@@ -221,7 +221,7 @@ let
|
||||
jobs.metrics
|
||||
jobs.manual
|
||||
jobs.lib-tests
|
||||
jobs.pkgs-lib-tests
|
||||
jobs.tests.pkgs-lib.formats-tests.x86_64-linux
|
||||
jobs.stdenv.x86_64-linux
|
||||
jobs.cargo.x86_64-linux
|
||||
jobs.go.x86_64-linux
|
||||
|
||||
Reference in New Issue
Block a user