movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

infnoise: 0.3.2 -> 0.3.3

Browse source
This commit is contained in:
Caleb Norton 2025-03-10 00:58:11 -05:00
parent d3ea0717ca
commit bc4de002cf
2 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkgs/by-name/in/infnoise/makefile.patch
View file

@ -1,14 +0,0 @@
diff --git a/software/Makefile.linux b/software/Makefile.linux
index db48aa5..df8b3d2 100644
--- a/software/Makefile.linux
+++ b/software/Makefile.linux
@@ -1,6 +1,6 @@
-GIT_VERSION := $(shell git --no-pager describe --tags --always)
-GIT_COMMIT := $(shell git rev-parse --verify HEAD)
-GIT_DATE := $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only))
+GIT_VERSION ?= $(shell git --no-pager describe --tags --always)
+GIT_COMMIT ?= $(shell git rev-parse --verify HEAD)
+GIT_DATE ?= $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only))
PREFIX = $(DESTDIR)/usr/local

19
pkgs/by-name/in/infnoise/package.nix
View file

@ -9,29 +9,26 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "infnoise"; pname = "infnoise";
version = "0.3.2"; version = "0.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "leetronics"; owner = "leetronics";
repo = "infnoise"; repo = "infnoise";
rev = "e80ddd78085abf3d06df2e0d8c08fd33dade78eb"; rev = "19bb69894724d87b32b7b9b86022bb4b26c919f8";
sha256 = "sha256-9MKG1InkV+yrQPBTgi2gZJ3y9Fokb6WbxuAnM7n7FyA="; sha256 = "sha256-O2P4uOwO7wKLYLufdW3KQeyuFBoQPdSepnTUeq0CSJY=";
}; };
patches = [ patches = [
# Patch makefile so we can set defines from the command line instead of it depending on .git # Patch providing version info at compile time
./makefile.patch
# Fix getc return type
(fetchpatch { (fetchpatch {
url = "https://github.com/leetronics/infnoise/commit/7ed7014e14253311c07e530c8f89f1c8f4705c2b.patch"; url = "https://github.com/leetronics/infnoise/commit/04d52a975bf78d2aff2bb4c176c286715e1948ba.patch";
sha256 = "sha256-seB/fJaxQ/rXJp5iPtnobXXOccQ2KUAk6HFx31dhOhs="; sha256 = "sha256-vtPAR6gCyny9UP+U6/7X8CPEUuMDl7RIyICIwiaWyfc=";
}) })
]; ];
GIT_COMMIT = finalAttrs.src.rev; GIT_COMMIT = finalAttrs.src.rev;
GIT_VERSION = finalAttrs.version; GIT_VERSION = finalAttrs.version;
GIT_DATE = "2019-08-12"; GIT_DATE = "2023-02-14";
buildInputs = [ libftdi ]; buildInputs = [ libftdi ];
@ -44,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = '' postInstall = ''
make -C tools make -C tools
# 2e6cfbe made findlongest executable, but it's a C file
chmod -x tools/*.c
find ./tools/ -executable -type f -exec \ find ./tools/ -executable -type f -exec \
sh -c "install -Dm755 {} $out/bin/infnoise-\$(basename {})" \; sh -c "install -Dm755 {} $out/bin/infnoise-\$(basename {})" \;
''; '';