diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/dart-sass-embedded/default.nix | 74 | ||||
-rw-r--r-- | pkgs/misc/drivers/epkowa/default.nix | 32 | ||||
-rw-r--r-- | pkgs/misc/i3a/default.nix | 12 | ||||
-rw-r--r-- | pkgs/misc/lilypond/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/logging/pacemaker/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/tpm2-pkcs11/default.nix | 2 |
6 files changed, 41 insertions, 87 deletions
diff --git a/pkgs/misc/dart-sass-embedded/default.nix b/pkgs/misc/dart-sass-embedded/default.nix deleted file mode 100644 index 30ea1395dad3c..0000000000000 --- a/pkgs/misc/dart-sass-embedded/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, dart -, buf -, callPackage -, runtimeShell -}: - -let - embedded-protocol = fetchFromGitHub { - owner = "sass"; - repo = "embedded-protocol"; - rev = "refs/tags/1.2.0"; - hash = "sha256-OHOWotI+cXjDhEYUNXa36FpMEW7hSIu8gVX3gVRvw2Y="; - }; - - libExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; -in -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "dart-sass-embedded"; - version = "1.62.1"; - - src = fetchFromGitHub { - owner = "sass"; - repo = "dart-sass-embedded"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-GpSus5/QItbzCrOImMvrO6DTAQeODABRNiSYHJlLlIA="; - }; - - nativeBuildInputs = [ - buf - dart - (callPackage ../../build-support/dart/fetch-dart-deps { } { - buildDrvArgs = finalAttrs; - vendorHash = "sha256-aEBE+z8M5ivMR9zL7kleBJ8c9T+4PGXoec56iwHVT+c="; - }) - ]; - - strictDeps = true; - - configurePhase = '' - runHook preConfigure - doPubGet dart pub get --offline - mkdir build - ln -s ${embedded-protocol} build/embedded-protocol - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - UPDATE_SASS_PROTOCOL=false HOME="$TMPDIR" dart run grinder protobuf - dart run grinder pkg-compile-native - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p "$out/lib" "$out/bin" - cp build/dart-sass-embedded.native "$out/lib/dart-sass-embedded${libExt}" - echo '#!${runtimeShell}' > "$out/bin/dart-sass-embedded" - echo "exec ${dart}/bin/dartaotruntime $out/lib/dart-sass-embedded${libExt} \"\$@\"" >> "$out/bin/dart-sass-embedded" - chmod +x "$out/bin/dart-sass-embedded" - runHook postInstall - ''; - - meta = with lib; { - description = "A wrapper for Dart Sass that implements the compiler side of the Embedded Sass protocol"; - homepage = "https://github.com/sass/dart-sass-embedded"; - changelog = "https://github.com/sass/dart-sass-embedded/blob/${finalAttrs.version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ shyim ]; - }; -}) diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index cf54b048f5914..460ebb8a3af0d 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -287,6 +287,38 @@ let plugins = { }; meta = common_meta // { description = "iscan GT-X750 for " + passthru.hw; }; }; + gt1500 = stdenv.mkDerivation rec { + name = "iscan-gt-1500-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "sha256-1rVsbBsb+QtCOT1FsyhgvCbZIN6IeQH7rZXNmsD7cl8="; + }; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-1500-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0133 "$plugin/lib/esci/libesint86 $plugin/share/esci/esfw86.bin" + ''; + hw = "GT-1500"; + }; + meta = common_meta // { description = "iscan GT-1500 for " + passthru.hw; }; + }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; # for the version, look for the driver of XP-750 in the search page diff --git a/pkgs/misc/i3a/default.nix b/pkgs/misc/i3a/default.nix index 42d8c11915c8a..5c549bc7f16ae 100644 --- a/pkgs/misc/i3a/default.nix +++ b/pkgs/misc/i3a/default.nix @@ -2,18 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "i3a"; - version = "2.0.1"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - hash = "sha256-2k1HYtgJ76qXLvX6RmOSKtMMg+K722n8U9YmBANvQvE="; + hash = "sha256-b1bB7Gto4aL1rbQXIelBVhutjIvZY+K+Y66BGN7OcCs="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "python_requires='>=3.7,<3.10'," "python_requires='>=3.7'," - ''; - nativeBuildInputs = [ python3Packages.setuptools-scm ]; propagatedBuildInputs = [ python3Packages.i3ipc ]; @@ -21,8 +16,9 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = "https://git.goral.net.pl/mgoral/i3a"; + changelog = "https://git.goral.net.pl/i3a.git/log/"; description = "A set of scripts used for automation of i3 and sway window manager layouts"; + homepage = "https://git.goral.net.pl/i3a.git/about"; license = licenses.gpl3Plus; maintainers = with maintainers; [ moni ]; }; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index c85f956e1a8ba..5fa5e75a637dd 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2 +{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , freefont_ttf, makeFontsConf @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm + [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm python3 gettext perl fontconfig freetype pango fontforge help2man groff t1utils boehmgc rsync ]; diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix index 3ce74457acd28..a3d365cd41709 100644 --- a/pkgs/misc/logging/pacemaker/default.nix +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pacemaker"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "Pacemaker-${version}"; - sha256 = "sha256-3+eRQ3NqPusdFhKc0wE7UMMNKsDLRVvh+EhD6zYGoP0="; + sha256 = "sha256-cvCMIzeyP9oEzHpafOvCORYwWg6cH5qj3qXOUMW4nHA="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index 3898c9880c539..48ec7839d3e1a 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tpm2-software/tpm2-pkcs11"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; mainProgram = "tpm2_ptool"; }; } |