diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/1password/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/dasel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/golden-cheetah-bin/default.nix | 35 | ||||
-rw-r--r-- | pkgs/applications/misc/golden-cheetah/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/libosmocore/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/p2pool/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/snapmaker-luban/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/tilemaker/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/tiv/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/misc/wmenu/default.nix | 48 |
10 files changed, 121 insertions, 18 deletions
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index c42ab4a25483f..f7a7281496bbb 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.16.0"; + version = "2.16.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-G0kn3BsgC8En4wNNr0aUSa52is+xmx3Ho+l3aMxKcKs=" "zip"; - i686-linux = fetch "linux_386" "sha256-b5v8BGf7QkEU61TrLhCWprxcpUJp5BmUwrB9Oi+qyDI=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-ctHNRESQp+l7s1uXCv6AgNBARFQJydA/rLfdYDNyDXU=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-j+BiFJawqAhZHJhYDQx51G/aEgwAqq7mXedP65HyaGo=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-8zKxd2yY8syGhgyPv06b+ag2bEfFfG19ZmQPrfi+Qh4=" "zip"; + i686-linux = fetch "linux_386" "sha256-3OO0JMJMRqbmq/rD/VRKIMBdjYu66ebEFGNLKX9K6A8=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-ZCXfreBiFDc5YFd9YsMddEvzl22KwnnfSQsV6BmHqeA=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-vlsqvz+AgEhL7M8cJhxmjjZ6ocIVUdq7MC1EVZOExU8=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 3f613041ff933..48852268549a0 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-27tQEWnirDhqYt5smRFwADa9wKXSk6yXR8+mXvJVtYI="; + sha256 = "sha256-3zYBgDtptEmuAhLFnPt0eDvgTYltHDdQGX1JCem/UxE="; }; vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE="; diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/applications/misc/golden-cheetah-bin/default.nix new file mode 100644 index 0000000000000..bfd5d5b86e94c --- /dev/null +++ b/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -0,0 +1,35 @@ +{ appimageTools, lib, fetchurl, stdenv }: +let + + pname = "golden-cheetah"; + version = "3.6-RC3"; + + src = fetchurl { + url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage"; + hash = "sha256-Bp1IFql96tHc5ssg9nhTrFQqNtaM+5iYJguPGkguvns="; + }; + + appimageContents = appimageTools.extract { inherit pname src version; }; +in +appimageTools.wrapType2 { + inherit pname src version; + + extraPkgs = pkgs: with pkgs; [ R zlib libusb-compat-0_1 ]; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/GoldenCheetah + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + cp ${appimageContents}/GoldenCheetah.desktop $out/share/applications/ + cp ${appimageContents}/gc.png $out/share/pixmaps/ + ''; + + meta = with lib; { + description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; + platforms = platforms.linux; + broken = !stdenv.isx86_64; + maintainers = with maintainers; [ gador ]; + license = licenses.gpl2Plus; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 368d6eddfe78b..f13cf8a21d42c 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -73,7 +73,7 @@ in mkDerivation rec { ''; meta = with lib; { - description = "Performance software for cyclists, runners and triathletes"; + description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens"; platforms = platforms.linux; maintainers = with maintainers; [ adamcstephens ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index a3de388a52abb..5f9ce0a9a6478 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-Dkud3ZA9m/UVbPugbQztUJXFpkQYTWjK2mamxfto9JA="; + hash = "sha256-xs8XI6xIUIZ7e0b+z4+FB6jNGY08t1wI4Ud8EHdi93I="; }; postPatch = '' @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ talloc + libmnl ]; nativeBuildInputs = [ @@ -38,7 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls - libmnl libusb1 lksctp-tools pcsclite diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index bce7760759df1..5636fa2cfb55a 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.7"; + version = "3.1"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-j3SVwat/LGw/iGcyNn8acR29Ob/WXDKyeCfDTsH+gxA="; + sha256 = "sha256-yHxg/9QhaDNlUFzylftsJEk+pJoSoTfA0rJfcolBdTs="; fetchSubmodules = true; }; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; + cmakeFlags = ["-DWITH_LTO=OFF"]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index 9b8ea390af79d..266eb511938ea 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.4.0"; + version = "4.7.0"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "sha256-cXFnFWa6IDGuC6M46Ybnr9/LM8hG0KTUlkzcyuje5SI="; + sha256 = "sha256-iIAK4XqxtdV+3FZHhzerMLcpfniKhNMGnfGA+W2inZc="; }; nativeBuildInputs = [ @@ -47,7 +47,13 @@ stdenv.mkDerivation rec { libXtst nspr nss libxcb pango libXScrnSaver udev ]; + autoPatchelfIgnoreMissingDeps = [ + "libc.musl-x86_64.so.1" + ]; + dontWrapGApps = true; + dontConfigure = true; + dontBuild = true; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/tilemaker/default.nix b/pkgs/applications/misc/tilemaker/default.nix index de5a7490f5c0d..39700097e79be 100644 --- a/pkgs/applications/misc/tilemaker/default.nix +++ b/pkgs/applications/misc/tilemaker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tilemaker"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "systemed"; repo = "tilemaker"; rev = "v${finalAttrs.version}"; - hash = "sha256-O1zoRYNUeReIH2ZpL05SiwCZrZrM2IAkwhsP30k/hHc="; + hash = "sha256-xpOF/0qFuvTUWQ1I8x/gy5qSLKzSgcQahS47PG+bTRA="; }; postPatch = '' diff --git a/pkgs/applications/misc/tiv/default.nix b/pkgs/applications/misc/tiv/default.nix index 3a46d2db9be8e..30117180b74cb 100644 --- a/pkgs/applications/misc/tiv/default.nix +++ b/pkgs/applications/misc/tiv/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, imagemagick }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, imagemagick +}: stdenv.mkDerivation rec { pname = "tiv"; @@ -11,12 +16,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-mCgybL4af19zqECN1pBV+WnxMq2ZtlK5GDTQO3u9CK0="; }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ imagemagick ]; makeFlags = [ "prefix=$(out)" ]; preConfigure = "cd src/main/cpp"; + postFixup = '' + wrapProgram $out/bin/tiv \ + --prefix PATH : ${lib.makeBinPath [ imagemagick ]} + ''; + meta = with lib; { homepage = "https://github.com/stefanhaustein/TerminalImageViewer"; description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters"; diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix new file mode 100644 index 0000000000000..2e045eb2bf4b0 --- /dev/null +++ b/pkgs/applications/misc/wmenu/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromSourcehut +, fetchpatch +, pkg-config +, meson +, ninja +, cairo +, pango +, wayland +, wayland-protocols +, libxkbcommon +, scdoc +}: + +stdenv.mkDerivation rec { + pname = "wmenu"; + version = "0.1.2"; + + strictDeps = true; + + src = fetchFromSourcehut { + owner = "~adnano"; + repo = "wmenu"; + rev = version; + hash = "sha256-mS4qgf2sjgswasZXsmnbIWlqVv+Murvx1/ob0G3xsws="; + }; + + # Patch needed to remove build warning, gets merged in next release + patches = [ + (fetchpatch { + url = "https://git.sr.ht/~adnano/wmenu/commit/ba10072cdec9b0d4b51bcf305ff27dcf3003ae42.patch"; + hash = "sha256-XF7xmEnsKlExMJQ5iS7wQG9Ja6ocrR0YvQuWFfByKVA="; + }) + ]; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ]; + + meta = with lib; { + description = "An efficient dynamic menu for Sway and wlroots based Wayland compositors"; + homepage = "https://git.sr.ht/~adnano/wmenu"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ eken ]; + }; +} + |