diff options
Diffstat (limited to 'pkgs/by-name/ch')
-rw-r--r-- | pkgs/by-name/ch/ch341eeprom/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/ch/challenger/package.nix | 81 | ||||
-rw-r--r-- | pkgs/by-name/ch/changelog-d/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/ch/changelog-d/updateScript.nix | 12 | ||||
-rw-r--r-- | pkgs/by-name/ch/charm-freeze/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/ch/charmcraft/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/ch/chatgpt-shell-cli/package.nix | 48 | ||||
-rw-r--r-- | pkgs/by-name/ch/chess-tui/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/ch/chezmoi/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/ch/chow-centaur/package.nix | 53 | ||||
-rw-r--r-- | pkgs/by-name/ch/chow-kick/package.nix | 107 | ||||
-rw-r--r-- | pkgs/by-name/ch/chow-phaser/package.nix | 77 | ||||
-rw-r--r-- | pkgs/by-name/ch/chow-tape-model/package.nix | 132 | ||||
-rw-r--r-- | pkgs/by-name/ch/chrysalis/package.nix | 36 | ||||
-rwxr-xr-x[-rw-r--r--] | pkgs/by-name/ch/chrysalis/update.sh | 0 |
15 files changed, 528 insertions, 40 deletions
diff --git a/pkgs/by-name/ch/ch341eeprom/package.nix b/pkgs/by-name/ch/ch341eeprom/package.nix index b5e8c6f5e2ca6..de29004aeaf06 100644 --- a/pkgs/by-name/ch/ch341eeprom/package.nix +++ b/pkgs/by-name/ch/ch341eeprom/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { }; meta = { - description = "A libusb based programming tool for 24Cxx serial EEPROMs using the WinChipHead CH341A IC"; + description = "Libusb based programming tool for 24Cxx serial EEPROMs using the WinChipHead CH341A IC"; homepage = "https://github.com/command-tab/ch341eeprom"; license = lib.licenses.gpl3Plus; mainProgram = "ch341eeprom"; diff --git a/pkgs/by-name/ch/challenger/package.nix b/pkgs/by-name/ch/challenger/package.nix new file mode 100644 index 0000000000000..108c7a77eaea4 --- /dev/null +++ b/pkgs/by-name/ch/challenger/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + libgcrypt, + pkg-config, + texinfo, + curl, + gnunet, + jansson, + libgnurl, + libmicrohttpd, + libsodium, + libtool, + postgresql, + taler-exchange, + taler-merchant, + runtimeShell, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "challenger"; + version = "0.11.0"; + + src = fetchgit { + url = "https://git.taler.net/challenger.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-utME8ywCf4hjgOZWp4j2+dNPPLbAqHd80A62waVvONE="; + }; + + # https://git.taler.net/challenger.git/tree/bootstrap + preAutoreconf = '' + # Generate Makefile.am in contrib/ + pushd contrib + rm -f Makefile.am + find wallet-core/challenger/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext + # Remove extra '\' at the end of the file + truncate -s -2 Makefile.am.ext + cat Makefile.am.in Makefile.am.ext >> Makefile.am + # Prevent accidental editing of the generated Makefile.am + chmod -w Makefile.am + popd + ''; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + libgcrypt + pkg-config + texinfo + ]; + + buildInputs = [ + curl + gnunet + jansson + libgcrypt + libgnurl + libmicrohttpd + libsodium + libtool + postgresql + taler-exchange + taler-merchant + ]; + + preFixup = '' + substituteInPlace $out/bin/challenger-{dbconfig,send-post.sh} \ + --replace-fail "/bin/bash" "${runtimeShell}" + ''; + + meta = { + description = "OAuth 2.0-based authentication service that validates user can receive messages at a certain address"; + homepage = "https://git.taler.net/challenger.git"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ch/changelog-d/package.nix b/pkgs/by-name/ch/changelog-d/package.nix index 380f4a801afae..a5bff1bfe1dee 100644 --- a/pkgs/by-name/ch/changelog-d/package.nix +++ b/pkgs/by-name/ch/changelog-d/package.nix @@ -13,17 +13,11 @@ let haskellModifications = lib.flip lib.pipe [ addCompletions - haskell.lib.doJailbreak haskell.lib.justStaticExecutables ]; mkDerivationOverrides = finalAttrs: oldAttrs: { - version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}"; - - # nix-shell ./maintainers/scripts/update.nix --argstr package changelog-d - passthru.updateScript = lib.getExe (callPackage ./updateScript.nix { }); - # nix-build -A changelog-d.tests passthru.tests = { basic = callPackage ./tests/basic.nix { changelog-d = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/ch/changelog-d/updateScript.nix b/pkgs/by-name/ch/changelog-d/updateScript.nix deleted file mode 100644 index fae22a161b6df..0000000000000 --- a/pkgs/by-name/ch/changelog-d/updateScript.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ writeShellApplication, cabal2nix }: - -writeShellApplication { - name = "update-changelog-d"; - runtimeInputs = [ - cabal2nix - ]; - text = '' - cd pkgs/development/misc/haskell/changelog-d - cabal2nix https://codeberg.org/fgaz/changelog-d >default.nix - ''; -} diff --git a/pkgs/by-name/ch/charm-freeze/package.nix b/pkgs/by-name/ch/charm-freeze/package.nix index f3efac03eb98b..c9002e244e53d 100644 --- a/pkgs/by-name/ch/charm-freeze/package.nix +++ b/pkgs/by-name/ch/charm-freeze/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { - description = "A tool to generate images of code and terminal output"; + description = "Tool to generate images of code and terminal output"; mainProgram = "freeze"; homepage = "https://github.com/charmbracelet/freeze"; changelog = "https://github.com/charmbracelet/freeze/releases/tag/v${version}"; diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index c837563a61c8b..a78fb1c3557fd 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "charmcraft"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; rev = "refs/tags/${version}"; - hash = "sha256-B0ZcOORW6yaSIpisPLnq5/S/CcqqvHNTXcfP1sKW2KQ="; + hash = "sha256-yMcGXi7OxEtfOv3zLEUlnZrR90TkFc0y9RB9jS34ZWs="; }; postPatch = '' diff --git a/pkgs/by-name/ch/chatgpt-shell-cli/package.nix b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix new file mode 100644 index 0000000000000..25ab95c94127d --- /dev/null +++ b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, jq +, curl +, glow +, makeWrapper +}: + +let + pname = "chatgpt-shell-cli"; + + # no tags + version = "master"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "0xacx"; + repo = "chatgpt-shell-cli"; + rev = version; + hash = "sha256-hYLrUya4UCsIB1J/n+jp1jFRCEqnGFJOr3ATxm0zwdY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 chatgpt.sh -t $out/bin + + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/chatgpt.sh \ + --prefix PATH : ${lib.makeBinPath [ jq curl glow ]} + ''; + + meta = with lib; { + homepage = "https://github.com/0xacx/chatGPT-shell-cli"; + description = "Simple shell script to use OpenAI's ChatGPT and DALL-E from the terminal. No Python or JS required."; + license = licenses.mit; + maintainers = with maintainers; [ jfvillablanca ]; + }; + } diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix index 63ff6b8fc3e78..e2c4f5fe1edbe 100644 --- a/pkgs/by-name/ch/chess-tui/package.nix +++ b/pkgs/by-name/ch/chess-tui/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-RUnT5b9pBcopTPT/1J48xZ4pfn3C0mIuYTDvgf3zvn0="; meta = with lib;{ - description = "A chess TUI implementation in rust"; + description = "Chess TUI implementation in rust"; homepage = "https://github.com/thomas-mauran/chess-tui"; maintainers = with maintainers; [ ByteSudoer ]; license = licenses.mit; diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index afb575230e4c0..46035e0f5b403 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.48.1"; + version = "2.49.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-v24gS80s7dTDlOO9ouf+Am7KyZPTBWzjG+HyBfFZynw="; + hash = "sha256-DrilLcV6wyUVPPiDs5KiC8kztNCH4Fug5h35+xerLZU="; }; - vendorHash = "sha256-8KcseMkYww+Ccaw+ovwXhakO9ira2TRI4uQ5TbCZcSE="; + vendorHash = "sha256-3nufF280WuDNvhKn9xP9dnxNX2VC59nifuJp+ebUSvk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix new file mode 100644 index 0000000000000..87c8bc35b1b9b --- /dev/null +++ b/pkgs/by-name/ch/chow-centaur/package.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon +, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor +, alsa-lib, libjack2, lv2, gcc-unwrapped }: + +stdenv.mkDerivation (finalAttrs: { + pname = "chow-centaur"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "jatinchowdhury18"; + repo = "KlonCentaur"; + rev = "v${finalAttrs.version}"; + sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + cairo + libxkbcommon + xcbutilcursor + xcbutilkeysyms + xcbutil + libXrandr + libXinerama + libXcursor + alsa-lib + libjack2 + lv2 + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 + cd ChowCentaur/ChowCentaur_artefacts/Release + cp -r LV2/ChowCentaur.lv2 $out/lib/lv2 + cp -r VST3/ChowCentaur.vst3 $out/lib/vst3 + ''; + + meta = with lib; { + description = + "Digital emulation of the Klon Centaur guitar pedal using RNNs, Wave Digital Filters, and more"; + homepage = "https://github.com/jatinchowdhury18/KlonCentaur"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon ]; + }; +}) diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix new file mode 100644 index 0000000000000..b9dec059d1f18 --- /dev/null +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -0,0 +1,107 @@ +{ alsa-lib +, at-spi2-core +, brotli +, cmake +, curl +, dbus +, libepoxy +, fetchFromGitHub +, freeglut +, freetype +, gtk2-x11 +, lib +, libGL +, libXcursor +, libXdmcp +, libXext +, libXinerama +, libXrandr +, libXtst +, libdatrie +, libjack2 +, libpsl +, libselinux +, libsepol +, libsysprof-capture +, libthai +, libxkbcommon +, lv2 +, pcre +, pkg-config +, python3 +, sqlite +, stdenv +, util-linuxMinimal +, webkitgtk +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "chow-kick"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "Chowdhury-DSP"; + repo = "ChowKick"; + rev = "v${finalAttrs.version}"; + sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + buildInputs = [ + alsa-lib + at-spi2-core + brotli + curl + dbus + libepoxy + freeglut + freetype + gtk2-x11 + libGL + libXcursor + libXdmcp + libXext + libXinerama + libXrandr + libXtst + libdatrie + libjack2 + libpsl + libselinux + libsepol + libsysprof-capture + libthai + libxkbcommon + lv2 + pcre + python3 + sqlite + util-linuxMinimal + webkitgtk + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" + "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin + cp -r ChowKick_artefacts/Release/LV2/ChowKick.lv2 $out/lib/lv2 + cp -r ChowKick_artefacts/Release/VST3/ChowKick.vst3 $out/lib/vst3 + cp ChowKick_artefacts/Release/Standalone/ChowKick $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/Chowdhury-DSP/ChowKick"; + description = "Kick synthesizer based on old-school drum machine circuits"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + mainProgram = "ChowKick"; + }; +}) diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix new file mode 100644 index 0000000000000..23cfe684d81f5 --- /dev/null +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -0,0 +1,77 @@ +{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut +, freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext +, libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux +, libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config +, python3, sqlite, stdenv }: + +stdenv.mkDerivation (finalAttrs: { + pname = "chow-phaser"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jatinchowdhury18"; + repo = "ChowPhaser"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + sha256 = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ="; + }; + + nativeBuildInputs = [ pkg-config cmake ]; + + buildInputs = [ + alsa-lib + at-spi2-core + curl + dbus + libepoxy + freeglut + freetype + gtk3 + libGL + libXcursor + libXdmcp + libXext + libXinerama + libXrandr + libXtst + libdatrie + libjack2 + libpsl + libselinux + libsepol + libsysprof-capture + libthai + libxkbcommon + pcre + python3 + sqlite + gcc-unwrapped + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/ChowPhaser/ + cd ChowPhaserMono_artefacts/Release + cp libChowPhaserMono_SharedCode.a $out/lib + cp -r VST3/ChowPhaserMono.vst3 $out/lib/vst3 + cp Standalone/ChowPhaserMono $out/bin + cd ../../ChowPhaserStereo_artefacts/Release + cp libChowPhaserStereo_SharedCode.a $out/lib + cp -r VST3/ChowPhaserStereo.vst3 $out/lib/vst3 + cp Standalone/ChowPhaserStereo $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/jatinchowdhury18/ChowPhaser"; + description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'"; + license = with licenses; [ bsd3 ]; + mainProgram = "ChowPhaserStereo"; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix new file mode 100644 index 0000000000000..44fc35073d364 --- /dev/null +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -0,0 +1,132 @@ +{ alsa-lib +, at-spi2-core +, cmake +, curl +, dbus +, libepoxy +, fetchFromGitHub +, freeglut +, freetype +, gtk3 +, lib +, libGL +, libXcursor +, libXdmcp +, libXext +, libXinerama +, libXrandr +, libXtst +, libdatrie +, libjack2 +, libpsl +, libselinux +, libsepol +, libsysprof-capture +, libthai +, libuuid +, libxkbcommon +, lv2 +, pcre +, pcre2 +, pkg-config +, python3 +, sqlite +, gcc11Stdenv +, webkitgtk +}: +let + # JUCE version in submodules is incompatible with GCC12 + # See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2 + stdenv = gcc11Stdenv; +in +stdenv.mkDerivation (finalAttrs: { + pname = "chow-tape-model"; + version = "2.11.4"; + + src = fetchFromGitHub { + owner = "jatinchowdhury18"; + repo = "AnalogTapeModel"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkg-config cmake ]; + + buildInputs = [ + alsa-lib + at-spi2-core + curl + dbus + libepoxy + freeglut + freetype + gtk3 + libGL + libXcursor + libXdmcp + libXext + libXinerama + libXrandr + libXtst + libdatrie + libjack2 + libpsl + libselinux + libsepol + libsysprof-capture + libthai + libuuid + libxkbcommon + lv2 + pcre + pcre2 + python3 + sqlite + webkitgtk + ]; + + # Link-time-optimization fails without these + cmakeFlags = [ + "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" + "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" + "-DCMAKE_NM=${stdenv.cc.cc}/bin/gcc-nm" + ]; + + cmakeBuildType = "Release"; + + postPatch = "cd Plugin"; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/lib/clap $out/bin $out/share/doc/CHOWTapeModel/ + cd CHOWTapeModel_artefacts/${finalAttrs.cmakeBuildType} + cp -r LV2/CHOWTapeModel.lv2 $out/lib/lv2 + cp -r VST3/CHOWTapeModel.vst3 $out/lib/vst3 + cp -r CLAP/CHOWTapeModel.clap $out/lib/clap + cp Standalone/CHOWTapeModel $out/bin + cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/ + ''; + + # JUCE dlopens these, make sure they are in rpath + # Otherwise, segfault will happen + NIX_LDFLAGS = (toString [ + "-lX11" + "-lXext" + "-lXcursor" + "-lXinerama" + "-lXrandr" + ]); + + meta = with lib; { + homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel"; + description = + "Physical modelling signal processing for analog tape recording. LV2, VST3, CLAP, and standalone"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'? + # error: no matching function for call to 'juce::dsp::SIMDRegister<double>::SIMDRegister(xsimd::simd_batch_traits<xsimd::batch<double, 2> >::batch_bool_type)' + broken = stdenv.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 + mainProgram = "CHOWTapeModel"; + }; +}) diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix index e0b7a9da78ea4..96383fdd66672 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -1,18 +1,20 @@ -{ lib, appimageTools, fetchurl }: +{ + lib, + appimageTools, + fetchurl, +}: let pname = "chrysalis"; version = "0.13.3"; - name = "${pname}-${version}-binary"; src = fetchurl { - url = - "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage"; - hash = - "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw=="; + url = "https://github.com/keyboardio/chrysalis/releases/download/v${version}/chrysalis-${version}-x64.AppImage"; + hash = "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw=="; }; - appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 rec { - inherit name pname src; + appimageContents = appimageTools.extract { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; extraPkgs = pkgs: [ pkgs.glib ]; @@ -30,7 +32,7 @@ in appimageTools.wrapType2 rec { -t $out/share/applications substituteInPlace \ $out/share/applications/Chrysalis.desktop \ - --replace 'Exec=Chrysalis' 'Exec=${pname}' + --replace-fail 'Exec=Chrysalis' 'Exec=${pname}' install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps ''; @@ -38,11 +40,17 @@ in appimageTools.wrapType2 rec { passthru.updateScript = ./update.sh; meta = with lib; { - description = "A graphical configurator for Kaleidoscope-powered keyboards"; + description = "Graphical configurator for Kaleidoscope-powered keyboards"; homepage = "https://github.com/keyboardio/Chrysalis"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ aw eclairevoyant nshalman ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + aw + eclairevoyant + nshalman + ]; platforms = [ "x86_64-linux" ]; - mainProgram = "chrysalis"; + # buildFHSEnv will create a symlink in $out/bin/${pname} + mainProgram = pname; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/by-name/ch/chrysalis/update.sh b/pkgs/by-name/ch/chrysalis/update.sh index 182d47a9285a5..182d47a9285a5 100644..100755 --- a/pkgs/by-name/ch/chrysalis/update.sh +++ b/pkgs/by-name/ch/chrysalis/update.sh |