diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2021-01-10 15:50:49 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-01-10 15:50:49 +0100 |
commit | 0c42bb50279fdafcdaeb8dfc1fcb7fd1b3d51fc5 (patch) | |
tree | 35134d9e1f6ef713650cec6b9f7b6a0407b524fd /pkgs/tools | |
parent | add2d890824281417852b38cf2804fc01b3bd81e (diff) | |
parent | 9f8b7cb4a8948afe0701e5d717a4ee9cbf38163c (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/backup/bupstash/default.nix | 33 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/evscript/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/default.nix | 100 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 76 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 60 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 71 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 40 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 46 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 47 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix | 38 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix | 38 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/with-addons.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/security/deepsea/default.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/security/pcsc-cyberjack/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/sn0int/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/typesetting/sile/default.nix | 5 |
16 files changed, 630 insertions, 6 deletions
diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix new file mode 100644 index 000000000000..9801d8ded9c4 --- /dev/null +++ b/pkgs/tools/backup/bupstash/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: +rustPlatform.buildRustPackage rec { + pname = "bupstash"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "andrewchambers"; + repo = pname; + rev = "v${version}"; + sha256 = "013k8pr4865f5rp66fjf3a8069kmd29brxv0l20z571gy2kxs5p9"; + }; + + cargoSha256 = "17cdi93q71wsqqfkpz6mxcaqqhqclsbns0g1r9mni39nikw7amv1"; + + nativeBuildInputs = [ ronn pkg-config installShellFiles ]; + buildInputs = [ libsodium ]; + + postBuild = '' + RUBYOPT="-KU -E utf-8:utf-8" ronn doc/man/*.md + ''; + + postInstall = '' + installManPage doc/man/*.[1-9] + ''; + + meta = with stdenv.lib; { + description = "Easy and efficient encrypted backups"; + homepage = "https://bupstash.io"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ andrewchambers ]; + }; +} diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix new file mode 100644 index 000000000000..95f322ed8c68 --- /dev/null +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "evscript"; + version = "git-${builtins.substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "myfreeweb"; + repo = pname; + rev = "47f86f0d15add2af785ea1ff47f24d130026d1b4"; + sha256 = "1xm8297k0d8d0aq7fxgmibr4qva4d02cb6gnnlzq77jcmnknxv14"; + }; + + cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp"; + verifyCargoDeps = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/myfreeweb/${pname}"; + description = "A tiny sandboxed Dyon scripting environment for evdev input devices"; + license = licenses.unlicense; + maintainers = with maintainers; [ milesbreslin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix new file mode 100644 index 000000000000..5fa85064fa3f --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -0,0 +1,100 @@ +{ stdenv +, fetchurl +, fetchFromGitHub +, pkg-config +, cmake +, extra-cmake-modules +, cairo +, cldr-emoji-annotation +, pango +, fribidi +, fmt +, wayland +, systemd +, wayland-protocols +, json_c +, isocodes +, xkeyboard_config +, enchant +, gdk-pixbuf +, libGL +, libevent +, libuuid +, libselinux +, libXdmcp +, libsepol +, libxkbcommon +, libthai +, libdatrie +, xcbutilkeysyms +, pcre +, xcbutilwm +, xcb-imdkit +, libxkbfile +}: +let + enDictVer = "20121020"; + enDict = fetchurl { + url = "https://download.fcitx-im.org/data/en_dict-${enDictVer}.tar.gz"; + sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4"; + }; +in +stdenv.mkDerivation rec { + pname = "fcitx5"; + version = "5.0.3"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5"; + rev = version; + sha256 = "QYMH0WbhHqDKUvpj1VOB8U5sbBD89H6moLFkQBJijZA="; + }; + + prePatch = '' + ln -s ${enDict} src/modules/spell/dict/$(stripHash ${enDict}) + ''; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + fmt + isocodes + cairo + enchant + pango + libthai + libdatrie + fribidi + systemd + gdk-pixbuf + wayland + wayland-protocols + cldr-emoji-annotation + json_c + libGL + libevent + libuuid + libselinux + libsepol + libXdmcp + libxkbcommon + pcre + xcbutilwm + xcbutilkeysyms + xcb-imdkit + xkeyboard_config + libxkbfile + ]; + + meta = with stdenv.lib; { + description = "Next generation of fcitx"; + homepage = "https://github.com/fcitx/fcitx5"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix new file mode 100644 index 000000000000..2b8a07537b0b --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -0,0 +1,76 @@ +{ stdenv +, mkDerivation +, fetchurl +, fetchFromGitHub +, cmake +, extra-cmake-modules +, boost +, libime +, fcitx5 +, fcitx5-qt +, fcitx5-lua +, qtwebengine +, opencc +, curl +, fmt +, luaSupport ? true +}: + +let + pyStrokeVer = "20121124"; + pyStroke = fetchurl { + url = "http://download.fcitx-im.org/data/py_stroke-${pyStrokeVer}.tar.gz"; + sha256 = "0j72ckmza5d671n2zg0psg7z9iils4gyxz7jgkk54fd4pyljiccf"; + }; + pyTableVer = "20121124"; + pyTable = fetchurl { + url = "http://download.fcitx-im.org/data/py_table-${pyTableVer}.tar.gz"; + sha256 = "011cg7wssssm6hm564cwkrrnck2zj5rxi7p9z5akvhg6gp4nl522"; + }; +in + +mkDerivation rec { + pname = "fcitx5-chinese-addons"; + version = "5.0.2"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-chinese-addons"; + rev = version; + sha256 = "11UIMrwzZqO8nrQx5oubeoQN8hspL1mvHw5Dc9sVOqQ="; + }; + + cmakeFlags = [ + "-DUSE_WEBKIT=off" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + boost + fcitx5-lua + ]; + + prePatch = '' + ln -s ${pyStroke} modules/pinyinhelper/$(stripHash ${pyStroke}) + ln -s ${pyTable} modules/pinyinhelper/$(stripHash ${pyTable}) + ''; + + buildInputs = [ + fcitx5 + fcitx5-qt + libime + curl + opencc + qtwebengine + fmt + ] ++ stdenv.lib.optional luaSupport fcitx5-lua; + + meta = with stdenv.lib; { + description = "Addons related to Chinese, including IME previous bundled inside fcitx4"; + homepage = "https://github.com/fcitx/fcitx5-chinese-addons"; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix new file mode 100644 index 000000000000..e5b55c26cd4b --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -0,0 +1,60 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, fcitx5-qt +, qtx11extras +, kwidgetsaddons +, kdeclarative +, kirigami2 +, isocodes +, xkeyboardconfig +, libxkbfile +, libXdmcp +, kcmSupport ? true +}: + +mkDerivation rec { + pname = "fcitx5-configtool"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-configtool"; + rev = version; + sha256 = "npSqd0R6bqKc+JxYCGcfVzgNLpuLtnHq6zM58smZ8/I="; + }; + + cmakeFlags = [ + "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + fcitx5 + fcitx5-qt + qtx11extras + kirigami2 + isocodes + xkeyboardconfig + libxkbfile + libXdmcp + ] ++ stdenv.lib.optionals kcmSupport [ + kdeclarative + kwidgetsaddons + ]; + + meta = with stdenv.lib; { + description = "Configuration Tool for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-configtool"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix new file mode 100644 index 000000000000..ce157f792535 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -0,0 +1,71 @@ +{ stdenv +, fetchurl +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, gobject-introspection +, gtk2 +, gtk3 +, pcre +, libuuid +, libselinux +, libsepol +, libthai +, libdatrie +, libXdmcp +, libxkbcommon +, epoxy +, dbus +, at-spi2-core +, libXtst +, withGTK2 ? false +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-gtk"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-gtk"; + rev = version; + sha256 = "rkusIqMRQMTjcpJR335as1xUQrzD9dLVB/wrLstPXPY="; + }; + + cmakeFlags = [ + "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" + "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" + ] ++ stdenv.lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; + + buildInputs = [ + gtk3 + gobject-introspection + fcitx5 + pcre + libuuid + libselinux + libsepol + libthai + libdatrie + libXdmcp + libxkbcommon + epoxy + dbus + at-spi2-core + libXtst + ] ++ stdenv.lib.optional withGTK2 gtk2; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with stdenv.lib; { + description = "Fcitx5 gtk im module and glib based dbus client library"; + homepage = "https://github.com/fcitx/fcitx5-gtk"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix new file mode 100644 index 000000000000..310cae035ba7 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, lua5_3 +, luaPackage ? lua5_3 +, gettext +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-lua"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-lua"; + rev = "${version}"; + sha256 = "OiTk9ldqBqF7WT1KY71hacLD6OQQNO05F7+cSXlli40="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + fcitx5 + luaPackage + gettext + ]; + + meta = with stdenv.lib; { + description = "Lua support for Fcitx 5"; + homepage = "https://github.com/fcitx/fcitx5-lua"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix new file mode 100644 index 000000000000..580082096ece --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -0,0 +1,46 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, qtx11extras +, libxcb +, libXdmcp +}: + +mkDerivation rec { + pname = "fcitx5-qt"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-qt"; + rev = version; + sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM="; + }; + + cmakeFlags = [ + "-DENABLE_QT4=0" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + fcitx5 + qtx11extras + libxcb + libXdmcp + ]; + + meta = with stdenv.lib; { + description = "Fcitx5 Qt Library"; + homepage = "https://github.com/fcitx/fcitx5-qt"; + license = with licenses; [ lgpl21Plus bsd3 ]; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix new file mode 100644 index 000000000000..9992e1987589 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchurl +, fetchFromGitHub +, pkgconfig +, cmake +, extra-cmake-modules +, gettext +, fcitx5 +, librime +, brise +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-rime"; + version = "5.0.2"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-rime"; + rev = version; + sha256 = "cVCTsD1Iw6OtyYFpxff3ix2CubRTnDaBevAYA4I9Ai8="; + }; + + cmakeFlags = [ + "-DRIME_DATA_DIR=${brise}/share/rime-data" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkgconfig + gettext + ]; + + buildInputs = [ + fcitx5 + librime + ]; + + meta = with stdenv.lib; { + description = "RIME support for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-rime"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix new file mode 100644 index 000000000000..7dcca7e130d0 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, gettext +, libime +, boost +, fcitx5 +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-table-extra"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-table-extra"; + rev = version; + sha256 = "UHhiWm2Khh6JBB9jz0ZKFofkAJPlqn6SqHeK9etoaxs="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + gettext + libime + boost + fcitx5 + ]; + + meta = with stdenv.lib; { + description = "Extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick"; + homepage = "https://github.com/fcitx/fcitx5-table-extra"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix new file mode 100644 index 000000000000..eb9d93d6e7ce --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, gettext +, libime +, boost +, fcitx5 +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-table-other"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-table-other"; + rev = version; + sha256 = "hQlrjDPImDof2+3/uOtTdJ27cInevbxH9B+lNwquKbs="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + gettext + libime + boost + fcitx5 + ]; + + meta = with stdenv.lib; { + description = "Some other tables for Fcitx"; + homepage = "https://github.com/fcitx/fcitx5-table-other"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix new file mode 100644 index 000000000000..854020effeaa --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -0,0 +1,18 @@ +{ symlinkJoin, makeWrapper, fcitx5, fcitx5-lua, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [] }: + +symlinkJoin { + name = "fcitx5-with-addons-${fcitx5.version}"; + + paths = [ fcitx5 fcitx5-configtool fcitx5-lua fcitx5-qt fcitx5-gtk ] ++ addons; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/fcitx5 \ + --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \ + --suffix XDG_DATA_DIRS : "$out/share" \ + --suffix PATH : "$out/bin" + ''; + + meta = fcitx5.meta; +} diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix new file mode 100644 index 000000000000..5cd7ed48aa34 --- /dev/null +++ b/pkgs/tools/security/deepsea/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "deepsea"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "dsnezhkov"; + repo = pname; + rev = "v${version}"; + sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig"; + }; + + vendorSha256 = "0vpkzykfg1rq4qi1v5lsa0drpil9i6ccfw96k48ppi9hiwzpq94w"; + + meta = with stdenv.lib; { + description = "Phishing tool for red teams and pentesters"; + longDescription = '' + DeepSea phishing gear aims to help RTOs and pentesters with the + delivery of opsec-tight, flexible email phishing campaigns carried + out on the outside as well as on the inside of a perimeter. + ''; + homepage = "https://github.com/dsnezhkov/deepsea"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 7ae062547aa2..015e3938c3ef 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -23,6 +23,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; + configureFlags = [ "--with-usbdropdir=${placeholder "out"}/pcsc/drivers" "--bindir=${placeholder "tools"}/bin" diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 8b99649e0c9f..ef2f97cfa111 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "10f1wblczxlww09f4dl8i9zzgpr14jj7s329wkvm7lafmwx3qrn5"; + sha256 = "1zjrbrkk7phv8s5qr0gj6fnssa31j3k3m8c55pdfmajh7ry7wwd1"; }; - cargoSha256 = "1v0q751ylsfpdjwsbl20pvn7g75w503jwjl5kn5kc8xq3g0lnp65"; + cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3"; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Semi-automatic OSINT framework and package manager"; homepage = "https://github.com/kpcyrd/sn0int"; - license = licenses.gpl3; + license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ xrelkd ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 239bafa05c97..9ed6c1de0e91 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -38,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.12"; + version = "0.10.13"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0bxm3vhba289vcgpzbs1hz5fjamf0zgxkr7h8vcsiijjjavmv64a"; + sha256 = "19k4r7wfszml4dac8cm1hx9rb1im3psigcidz8bdm9j9jzpd01yj"; }; configureFlags = [ @@ -109,6 +109,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://sile-typesetter.org/"; platforms = platforms.unix; + broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018 maintainers = with maintainers; [ doronbehar alerque ]; license = licenses.mit; }; |