diff options
Diffstat (limited to 'pkgs/applications')
4 files changed, 93 insertions, 33 deletions
diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix new file mode 100644 index 00000000000..8bc0963338f --- /dev/null +++ b/pkgs/applications/networking/blocky/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "blocky"; + version = "0.17"; + + src = fetchFromGitHub { + owner = "0xERR0R"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vG6QAI8gBI2nLRQ0nOFWQHihyzgmJu69rgkWlg3iW3E="; + }; + + # needs network connection and fails at + # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go + doCheck = false; + + vendorSha256 = "sha256-+mpNPDejK9Trhw41SUXJPL/OX5wQR0QfA2+BXSlE0Jk="; + + meta = with lib; { + description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; + homepage = "https://0xerr0r.github.io/blocky"; + changelog = "https://github.com/0xERR0R/blocky/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ ratsclub ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index 6de601348c3..3d09711fb3c 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -1,16 +1,29 @@ -{ lib, python3, fetchFromGitHub, file, gnupg, gawk, notmuch, procps, withManpage ? false +{ lib +, python3 +, fetchFromGitHub +, file +, gnupg +, gawk +, notmuch +, procps +, withManpage ? false }: with python3.pkgs; - let notmuch2 = callPackage ./notmuch.nix { inherit notmuch; }; -in buildPythonApplication rec { +in +buildPythonApplication rec { pname = "alot"; version = "0.10"; - outputs = [ "out" ] ++ lib.optional withManpage "man"; + + outputs = [ + "out" + ] ++ lib.optional withManpage [ + "man" + ]; disabled = !isPy3k; @@ -22,48 +35,63 @@ in buildPythonApplication rec { }; postPatch = '' - substituteInPlace alot/settings/manager.py --replace /usr/share "$out/share" + substituteInPlace alot/settings/manager.py \ + --replace /usr/share "$out/share" ''; nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ - notmuch2 - urwid - urwidtrees - twisted - python_magic configobj - service-identity file gpgme + notmuch2 + python_magic + service-identity + twisted + urwid + urwidtrees ]; - postBuild = lib.optionalString withManpage "make -C docs man"; + checkInputs = [ + future + gawk + gnupg + mock + procps + pytestCheckHook + ]; + + postBuild = lib.optionalString withManpage [ + "make -C docs man" + ]; - checkInputs = [ gawk future mock gnupg procps pytestCheckHook ]; - # some twisted tests need internet access disabledTests = [ + # Some twisted tests need internet access "test_env_set" "test_no_spawn_no_stdin_attached" + # DatabaseLockedError + "test_save_named_query" ]; - postInstall = let - completionPython = python.withPackages (ps: [ ps.configobj ]); - in lib.optionalString withManpage '' - mkdir -p $out/man - cp -r docs/build/man $out/man - '' - + '' - mkdir -p $out/share/{applications,alot} - cp -r extra/themes $out/share/alot + postInstall = + let + completionPython = python.withPackages (ps: [ ps.configobj ]); + in + lib.optionalString withManpage '' + mkdir -p $out/man + cp -r docs/build/man $out/man + '' + + '' + mkdir -p $out/share/{applications,alot} + cp -r extra/themes $out/share/alot - substituteInPlace extra/completion/alot-completion.zsh \ - --replace "python3" "${completionPython.interpreter}" - install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot + substituteInPlace extra/completion/alot-completion.zsh \ + --replace "python3" "${completionPython.interpreter}" + install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot - sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop - ''; + sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop + ''; meta = with lib; { homepage = "https://github.com/pazz/alot"; diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 76dc559cb7a..08b8a681b2d 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -79,6 +79,8 @@ mkDerivation (common "tamarin-prover" src // { # so that the package can be used as a vim plugin to install syntax coloration install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/syntax/spthy.vim install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim + # Emacs SPTHY major mode + install -Dt $out/share/emacs/site-lisp etc/spthy-mode.el ''; checkPhase = "./dist/build/tamarin-prover/tamarin-prover test"; diff --git a/pkgs/applications/video/srtrelay/default.nix b/pkgs/applications/video/srtrelay/default.nix index 5fffdca9e38..898f728d3ee 100644 --- a/pkgs/applications/video/srtrelay/default.nix +++ b/pkgs/applications/video/srtrelay/default.nix @@ -1,17 +1,17 @@ { lib, buildGoModule, fetchFromGitHub, srt, ffmpeg }: buildGoModule rec { - pname = "srtrelay-unstable"; - version = "2021-07-28"; + pname = "srtrelay"; + version = "1.1.0"; src = fetchFromGitHub { owner = "voc"; repo = "srtrelay"; - rev = "c4f02ff2e9637b01a0679b29e5a76f4521eeeef3"; - sha256 = "06zbl97bjjyv51zp27qk37ffpbh1ylm9bsr0s5qlyd73pyavcj1g"; + rev = "v${version}"; + sha256 = "sha256-CA+UuFOWjZjSBDWM62rda3IKO1fwC3X52mP4tg1uoO4="; }; - vendorSha256 = "1pdpb0my7gdvjjkka6jhj19b9nx575k6117hg536b106ij2n4zd2"; + vendorSha256 = "sha256-xTYlfdijSo99ei+ZMX6N9gl+yw0DrPQ2wOhn6SS9S/E="; buildInputs = [ srt ]; checkInputs = [ ffmpeg ]; |