Merge branch 'master' into pr/perses-update
This commit is contained in:
@@ -3350,8 +3350,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-kubernetes-tools";
|
||||
publisher = "ms-kubernetes-tools";
|
||||
version = "1.3.23";
|
||||
hash = "sha256-8s1fuuTwUPd1Z32EqZNloD50KaFlPOxlvMmo5D6NaE4=";
|
||||
version = "1.3.24";
|
||||
hash = "sha256-LO8WWLxvLZKSpQx+iLR8RpRxnck0oZU/A0WzEeDPgyQ=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "MeerK40t";
|
||||
version = "0.9.7030";
|
||||
version = "0.9.7051";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meerk40t";
|
||||
repo = pname;
|
||||
tag = version;
|
||||
hash = "sha256-3UO2M4mDzRdzhS+H2gyzJo5W4JWGK+qt1Gg9LHGmdOY=";
|
||||
hash = "sha256-v3lwFl4Qls+NzR2rYwNF8PyFTH0nNcLlF/uwc0h3Pc0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -4,16 +4,28 @@
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
qt6,
|
||||
writeShellScriptBin,
|
||||
}:
|
||||
let
|
||||
# Matches the pyside6-uic and pyside6-rcc implementations
|
||||
# https://code.qt.io/cgit/pyside/pyside-setup.git/tree/sources/pyside-tools/pyside_tool.py?id=9b310d4c0654a244147766e382834b5e8bdeb762#n90
|
||||
pyside-tools-uic = writeShellScriptBin "pyside6-uic" ''
|
||||
exec ${qt6.qtbase}/libexec/uic -g python "$@"
|
||||
'';
|
||||
pyside-tools-rcc = writeShellScriptBin "pyside6-rcc" ''
|
||||
exec ${qt6.qtbase}/libexec/rcc -g python "$@"
|
||||
'';
|
||||
in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nanovna-saver";
|
||||
version = "0.6.8";
|
||||
version = "0.7.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NanoVNA-Saver";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-XGm3y0C0bFqKbh2ImbYTKOKSYFJ728mE/1N78/WPJqo=";
|
||||
sha256 = "sha256-Asx4drb9W2NobdgOlbgdm1aAzB69hnIWvOM915F7sgA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,6 +40,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
scipy
|
||||
pyqt6
|
||||
pyserial
|
||||
pyside6
|
||||
numpy
|
||||
setuptools
|
||||
setuptools-scm
|
||||
@@ -38,6 +51,12 @@ python3.pkgs.buildPythonApplication rec {
|
||||
dontWrapGApps = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tools/ui_compile.py \
|
||||
--replace-fail "pyside6-uic" "${pyside-tools-uic}/bin/pyside6-uic" \
|
||||
--replace-fail "pyside6-rcc" "${pyside-tools-rcc}/bin/pyside6-rcc"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "beekeeper-studio";
|
||||
version = "5.2.9";
|
||||
version = "5.2.12";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -44,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchurl {
|
||||
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/beekeeper-studio_${finalAttrs.version}_${arch}.deb";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-iooZSiIkHfd3jSk+Pk0E7s/g51UzbyqyP8qnfes3mts=";
|
||||
aarch64-linux = "sha256-zLkEMOJhckIM0qPCKBNUgFwYiF1YjJU4wKmiLJ1pzNg=";
|
||||
x86_64-linux = "sha256-hpzvu4SyVLXhQ5wbh5hyx+8tM19SxkKZvlMVhzhDCW4=";
|
||||
aarch64-linux = "sha256-s567NOTzTItfOdsABIzYoF8iYSpwDsDzbnLZhUSfT8o=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c92df71..724911a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -10,11 +10,12 @@ DATE ?= $(shell date -u -d @${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:%M:%SZ")
|
||||
VERSION ?= 0.10.0
|
||||
|
||||
test: ## Run all tests
|
||||
- @go clean --testcache && go test -v ./...
|
||||
+ @go clean --testcache && go test -ldflags -extldflags=-Wl,-z,lazy -v ./...
|
||||
|
||||
build: ## Builds the CLI
|
||||
@go build ${GO_FLAGS} \
|
||||
-ldflags "-w -s \
|
||||
+ -extldflags=-Wl,-z,lazy \
|
||||
-X ${NAME}/cmd/global.Version=${VERSION} \
|
||||
-X ${PACKAGE}/cmd/global.Version=${VERSION} \
|
||||
-X ${NAME}/cmd/global.Commit=${GIT_REV} \
|
||||
@@ -1,25 +1,33 @@
|
||||
{
|
||||
buildGo123Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
lm_sensors,
|
||||
}:
|
||||
|
||||
buildGo123Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "fan2go";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markusressel";
|
||||
repo = "fan2go";
|
||||
rev = version;
|
||||
hash = "sha256-eSHeHBzDvzsDAck0zexwR8drasisvlQNTeowv92E2uc=";
|
||||
tag = version;
|
||||
hash = "sha256-mLypuOGjYrXFf3BGCDggEDk1+PVx2CgsxAjZQ7uiSW0=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd $out
|
||||
git rev-parse --short HEAD > $out/GIT_REV
|
||||
find $out -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ad0e/cxbcU/KfPDOdD46KdCcvns83dgGDAyLLQiGyiA=";
|
||||
vendorHash = "sha256-IJJTolpOtstVov8MNel6EOJqv1oCkTOTiPyW42ElQjc=";
|
||||
|
||||
buildInputs = [ lm_sensors ];
|
||||
|
||||
patches = [ ./lazy-binding.patch ];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \
|
||||
--replace-fail '"/etc/sensors3.conf"' '"${lib.getLib lm_sensors}/etc/sensors3.conf"'
|
||||
@@ -30,6 +38,24 @@ buildGo123Module rec {
|
||||
rm internal/fans/cmd_test.go
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
make build GIT_REV="$(cat GIT_REV)"
|
||||
|
||||
dir="$GOPATH/bin"
|
||||
mkdir -p "$dir"
|
||||
cp bin/fan2go "$dir"
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple daemon providing dynamic fan speed control based on temperature sensors";
|
||||
mainProgram = "fan2go";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "firefly-iii-data-importer";
|
||||
version = "1.6.1";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-iii";
|
||||
repo = "data-importer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/mQnv/81XpdiXayC4+kw0QihZSPBkz59eJCdEBodudQ=";
|
||||
hash = "sha256-+e5UtnK/eiFnmvtKjVp3EZ8JLi+dWnJ+vgjDJKRLqH8=";
|
||||
};
|
||||
|
||||
buildInputs = [ php84 ];
|
||||
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
composerStrictValidation = true;
|
||||
strictDeps = true;
|
||||
|
||||
vendorHash = "sha256-9WSq8kUoXyClAHvuMtqzlfcITgCgXdulslDAzlaJ9LU=";
|
||||
vendorHash = "sha256-ExHT4kRyyp4c7vGqUN7hbP8pScvto/qp81oDjZGBJis=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
hash = "sha256-6yfXh9KX0ucAB+wo/xG4gRGmDL+CPtLkcq390iVz2qU=";
|
||||
hash = "sha256-i+Ytv8uLSrdLPC04BfZbRXRA7jmy1IX4nYW5WRZubCY=";
|
||||
};
|
||||
|
||||
composerRepository = php84.mkComposerRepository {
|
||||
@@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
passthru = {
|
||||
phpPackage = php84;
|
||||
tests = nixosTests.firefly-iii-data-importer;
|
||||
updateScript = nix-update-script { };
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex='v([0-9]+\.[0-9]+\.[0-9]+)'" ]; };
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.34.1";
|
||||
version = "3.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CllaviW7pqLD9XD4oSHyW2nG4lObkPWFseXZbtkNUQI=";
|
||||
hash = "sha256-iSuOiQC+dKqcDCS4nTPMrNFpo3ipPUQhfoofM11UInI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hoppscotch.version or (lib.getVersion hoppscotch)" | tr -d '"')
|
||||
BASEDIR="$(dirname "$0")/../../../.."
|
||||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import $BASEDIR {}; hoppscotch.version or (lib.getVersion hoppscotch)" | tr -d '"')
|
||||
latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/hoppscotch/releases/releases/latest | jq --raw-output .tag_name | sed 's/^v//')
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
@@ -17,6 +19,6 @@ for system in \
|
||||
x86_64-linux \
|
||||
x86_64-darwin \
|
||||
aarch64-darwin; do
|
||||
hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hoppscotch.src.url" --system "$system" | tr -d '"')))
|
||||
update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version
|
||||
hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import $BASEDIR {}; hoppscotch.src.url" --system "$system" | tr -d '"')))
|
||||
(cd $BASEDIR && update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version)
|
||||
done
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "megasync";
|
||||
version = "5.9.0.3";
|
||||
version = "5.12.0.1";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "meganz";
|
||||
repo = "MEGAsync";
|
||||
tag = "v${finalAttrs.version}_Linux";
|
||||
hash = "sha256-anX/zVCKG3azROamIIqG9hrj+2Tcw+sFIE60RDCJjaY=";
|
||||
hash = "sha256-dIva/Xmk7enmRbczfuy1VLAcAMPQ27HUaHEQSTsldaY=";
|
||||
fetchSubmodules = false; # DesignTokensImporter cannot be fetched, see #1010 in github:meganz/megasync
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
@@ -122,6 +122,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "USE_PDFIUM" false) # PDFIUM is not in nixpkgs
|
||||
(lib.cmakeBool "USE_FREEIMAGE" false) # freeimage is insecure
|
||||
(lib.cmakeBool "ENABLE_DESIGN_TOKENS_IMPORTER" false) # cannot be fetched
|
||||
(lib.cmakeBool "USE_BREAKPAD" false)
|
||||
(lib.cmakeBool "ENABLE_DESKTOP_APP_TESTS" false)
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -41,7 +41,6 @@ SWITCH_TO_CONFIGURATION_CMD_PREFIX: Final = [
|
||||
"--no-ask-password",
|
||||
"--pipe",
|
||||
"--quiet",
|
||||
"--same-dir",
|
||||
"--service-type=exec",
|
||||
"--unit=nixos-rebuild-switch-to-configuration",
|
||||
]
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
electron,
|
||||
}:
|
||||
let
|
||||
version = "1.3.4220.57";
|
||||
version = "1.3.4275.94";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pritunl";
|
||||
repo = "pritunl-client-electron";
|
||||
rev = version;
|
||||
sha256 = "sha256-AqolwsGHDxVQMjgQdWz24BmM+uMT/XII1vtDjA3fFcQ=";
|
||||
sha256 = "sha256-a1arRI4qQy5niKV8JAyusAjheMa/LtEXPZGhngsH+TU=";
|
||||
};
|
||||
|
||||
cli = buildGoModule {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
inherit version src;
|
||||
|
||||
modRoot = "cli";
|
||||
vendorHash = "sha256-wwPgyIo14zpA+oCJH0CQ4+7zyP+Itxbd6S0P7t01wBw=";
|
||||
vendorHash = "sha256-xozdrNKBgrrCZ5WYHGWKOuuGrEhx/VzOKLZTGq3scoo=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/pritunl-client
|
||||
@@ -45,7 +45,7 @@ let
|
||||
inherit version src;
|
||||
|
||||
modRoot = "service";
|
||||
vendorHash = "sha256-WWvROYvw8JuidZHKOO0xiNcxlyRCZkw9j/eI6C5HJhU=";
|
||||
vendorHash = "sha256-3dgBiCqWj+nwWn9mFARBKIpgjn2aJYvVUrqMIzhToQs=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchDebianPatch,
|
||||
glib,
|
||||
pkg-config,
|
||||
libogg,
|
||||
@@ -18,6 +19,23 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with gcc 14
|
||||
(fetchDebianPatch {
|
||||
inherit pname version;
|
||||
debianRevision = "2";
|
||||
patch = "1075541-gcc14";
|
||||
hash = "sha256-30bz7CDmbq+Bd+jTKSq7aJsXUJQAQp3nnJZvt3Qbp8Q=";
|
||||
})
|
||||
# fix parse of URIs containing colons (https://bugs.debian.org/873964)
|
||||
(fetchDebianPatch {
|
||||
inherit pname version;
|
||||
debianRevision = "2";
|
||||
patch = "873964-http";
|
||||
hash = "sha256-D6koUCbnJHtRuq2zZy9VrxymuGXN1COacbQhphgB8qo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
glib
|
||||
@@ -26,10 +44,6 @@ stdenv.mkDerivation rec {
|
||||
libmad
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"AR:=$(AR)"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://streamripper.sourceforge.net/";
|
||||
description = "Application that lets you record streaming mp3 to your hard drive";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sums";
|
||||
version = "0.13";
|
||||
version = "0.15";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "leesonwai";
|
||||
repo = "sums";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-DztSQcaH/k5EOvsrVA/DdgNSEHtz4Nr938tIhC94Gu8=";
|
||||
hash = "sha256-L+ND18cqXAi0qqt1lECQlx2cBX9HrhAXNFxHFl9wjU8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
libX11,
|
||||
libXaw,
|
||||
}:
|
||||
|
||||
let
|
||||
getPatch =
|
||||
{ name, sha256 }:
|
||||
fetchpatch {
|
||||
inherit name sha256;
|
||||
url =
|
||||
"https://projects.archlinux.org/svntogit/packages.git/plain/trunk/${name}"
|
||||
+ "?h=packages/t1lib&id=643a4c2c58e70072b5bc1e9e4624162517b58357";
|
||||
};
|
||||
|
||||
patches = map getPatch [
|
||||
{
|
||||
name = "lib-cleanup.diff";
|
||||
sha256 = "1w3q1y4zk0y4mf2s2x9z4cd8d4af8i868c8837p40mz3dqrai4zp";
|
||||
}
|
||||
{
|
||||
name = "format-security.diff";
|
||||
sha256 = "0cca94bif9dsc6iwpcnk1504gb3sl3nsqhni85c21q9aywyz26l3";
|
||||
}
|
||||
{
|
||||
name = "CVE-2011-0764.diff";
|
||||
sha256 = "1j0y3f38im7srpqjg9jvx8as6sxkz8gw7hglcxnxl9qylx8mr2jh";
|
||||
}
|
||||
{
|
||||
name = "CVE-2011-1552_1553_1554.patch";
|
||||
sha256 = "16cyq6jhyhh8912j8hapx9pq4rzxk36ljlkxlnyi7i3wr8iz1dir";
|
||||
}
|
||||
{
|
||||
name = "CVE-2010-2642.patch";
|
||||
sha256 = "175zvyr9v1xs22k2svgxqjcpz5nihfa7j46hn9nzvkqcrhm5m9y8";
|
||||
}
|
||||
# this ^ also fixes CVE-2011-5244
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "t1lib";
|
||||
version = "5.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://ibiblioPubLinux/libs/graphics/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-ghMotQVPeJCg0M0vUoJScHBd82QdvUdtWNF+Vu2Ve1k=";
|
||||
};
|
||||
inherit patches;
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXaw
|
||||
];
|
||||
buildFlags = [ "without_doc" ];
|
||||
|
||||
postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
# ??
|
||||
chmod +x $out/lib/*.so.*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.t1lib.org/";
|
||||
description = "Type 1 font rasterizer library for UNIX/X11";
|
||||
license = with licenses; [
|
||||
gpl2
|
||||
lgpl2
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -2,10 +2,13 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
buildPackages,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.11.2";
|
||||
version = "0.12.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "vault-tasks";
|
||||
@@ -14,12 +17,37 @@ rustPlatform.buildRustPackage {
|
||||
owner = "louis-thevenet";
|
||||
repo = "vault-tasks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DcnOuQ37fzLVJOteP7ZiA9IxNAd6lH6zelaO5GCvakk=";
|
||||
hash = "sha256-PMqGqvyxgkGRVahQ+ruDA0vFT0162DrZU92nT4SMTGw=";
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-/5CpIPdqIvxwiplMqXZ1J04oQoK9rnzDP1N7ffrbJDk=";
|
||||
cargoHash = "sha256-34c5i2kIoQuTkm1SF7bYX109noVGaGJ47b2FCxQUyB8=";
|
||||
|
||||
postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications";
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications
|
||||
''
|
||||
+ (
|
||||
let
|
||||
vault-tasks =
|
||||
if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
|
||||
placeholder "out"
|
||||
else
|
||||
buildPackages.vault-tasks;
|
||||
in
|
||||
''
|
||||
# vault-tasks tries to load a config file from ~/.config/ before generating completions
|
||||
export HOME="$(mktemp -d)"
|
||||
|
||||
installShellCompletion --cmd vault-tasks \
|
||||
--bash <(${vault-tasks}/bin/vault-tasks generate-completions bash) \
|
||||
--fish <(${vault-tasks}/bin/vault-tasks generate-completions fish) \
|
||||
--zsh <(${vault-tasks}/bin/vault-tasks generate-completions zsh)
|
||||
''
|
||||
);
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -12,16 +12,19 @@ let
|
||||
in
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "yafc-ce";
|
||||
version = "2.11.1";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shpaass";
|
||||
repo = "yafc-ce";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-n6twiCIQ1nMSidfmdl2py5wHvx4kk6skK0f8chXTCjQ=";
|
||||
hash = "sha256-FWGH/CDjfeewms0lKMMK3hGPCw6Xs40MdsbS/Cgif8s=";
|
||||
};
|
||||
|
||||
projectFile = [ "Yafc/Yafc.csproj" ];
|
||||
projectFile = [
|
||||
"Yafc.I18n.Generator/Yafc.I18n.Generator.csproj"
|
||||
"Yafc/Yafc.csproj"
|
||||
];
|
||||
testProjectFile = [ "Yafc.Model.Tests/Yafc.Model.Tests.csproj" ];
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
@@ -36,6 +39,13 @@ buildDotnetModule (finalAttrs: {
|
||||
SDL2_image
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Yafc finds the root by looking for a `.git` directory, but `.git` is
|
||||
# removed by Nix to ensure reproducibility. `.github` is not.
|
||||
substituteInPlace Yafc.I18n.Generator/SourceGenerator.cs \
|
||||
--replace-fail 'rootDirectory, ".git"' 'rootDirectory, ".github"'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Powerful Factorio calculator/analyser that works with mods, Community Edition";
|
||||
longDescription = ''
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-maps-routing";
|
||||
version = "0.6.15";
|
||||
version = "0.6.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "google-cloud-python";
|
||||
tag = "google-maps-routing-v${version}";
|
||||
hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw=";
|
||||
hash = "sha256-VYkgkVrUgBiUEFF2J8ZFrh2Sw7h653stYxNcpYfRAj4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/google-maps-routing";
|
||||
|
||||
@@ -18,18 +18,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "panphon";
|
||||
version = "0.21.2";
|
||||
version = "0.22.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FpYHbkEeQzyPfbpigZ1EMNlzLLFWB/wNcGHYFYiEE2k=";
|
||||
hash = "sha256-iSdCZjzeZhxsrkaRYHpg60evmo9g09a9Fwr0I5WWd1A=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
setuptools # need for pkg_resources
|
||||
unicodecsv
|
||||
pyyaml
|
||||
regex
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "11.2.0";
|
||||
version = "11.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2bZEPwAj9K3ubKoM0P1xRS/NmJp+CMRYo7tXk6miRRs=";
|
||||
hash = "sha256-SFBKu30C92BbbwSlmlRU/66mBywROktWUiw8fltFXoA=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@@ -34,7 +34,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-dmUqlkBwnz4/u3vOxNfk/rMFuPwB5OoHz5/xjYnffRk=";
|
||||
vendorHash = "sha256-ypimv9xi3mKL6xmmkAYdUO+lspafXpJsP8StaniboE0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -59,14 +59,14 @@ let
|
||||
in
|
||||
{
|
||||
nextcloud30 = generic {
|
||||
version = "30.0.11";
|
||||
hash = "sha256-WEJ3LV1xLxBdyPFdZ4hFnmFEuDbMiKBiyQU3CiZUN3o=";
|
||||
version = "30.0.12";
|
||||
hash = "sha256-nhmyX0InPUNhIYQmtHYqdmvuQIz6aqghn4wn9yCVp6g=";
|
||||
packages = nextcloud30Packages;
|
||||
};
|
||||
|
||||
nextcloud31 = generic {
|
||||
version = "31.0.5";
|
||||
hash = "sha256-Iii49STc2H8IoqkoHUGwT1y1ALdiS8jI4HuOMDkGFQM=";
|
||||
version = "31.0.6";
|
||||
hash = "sha256-pqvOG+hK5lCQYliV7leWxuYx/RDLF2RexNc/fZs3Jig=";
|
||||
packages = nextcloud31Packages;
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -26,13 +26,13 @@ let
|
||||
|
||||
self = buildGhidraExtension rec {
|
||||
pname = "kaiju";
|
||||
version = "250417";
|
||||
version = "250610";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CERTCC";
|
||||
repo = "kaiju";
|
||||
rev = version;
|
||||
hash = "sha256-SSvCb3xnOh0mb3H24RJTi11UmN2ARgFgsiiKlZXyufM=";
|
||||
hash = "sha256-qqUnWakQDOBw3sI/6iWD9140iRAsM5PUEQJSV/3/8FQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.89.0";
|
||||
version = "3.89.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-utcTfoRBYvTHlbTdUXUTPUHHvVkHe7HqE84qR7dl46Y=";
|
||||
hash = "sha256-mzApiAWPLq2Q69NNLj1/FNuktYjIGHt9iWO9OlercjM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Zum9Clc7yL81QT6dA6sjLV2HmB5Why76fmooSSAo63Y=";
|
||||
|
||||
@@ -1868,6 +1868,7 @@ mapAliases {
|
||||
|
||||
### T ###
|
||||
|
||||
t1lib = throw "'t1lib' has been removed as it was broken and unmaintained upstream."; # Added 2025-06-11
|
||||
tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
|
||||
tailor = throw "'tailor' has been removed from nixpkgs, as it was unmaintained upstream."; # Added 2024-11-02
|
||||
tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17
|
||||
|
||||
Reference in New Issue
Block a user