diff options
Diffstat (limited to 'pkgs/applications')
9 files changed, 70 insertions, 89 deletions
diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 8933faf5fb01..88050d2f449d 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -1,20 +1,27 @@ -{ fetchurl, lib, stdenv, makeWrapper, which, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, which, perl, perlPackages }: -stdenv.mkDerivation { - name = "taskopen-1.1.4"; - src = fetchurl { - url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz"; - sha256 = "774dd89f5c92462098dd6227e181268e5ec9930bbc569f25784000df185c71ba"; - }; +stdenv.mkDerivation rec { + pname = "taskopen"; + version = "1.1.5"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ which perl ] ++ (with perlPackages; [ JSON ]); + src = fetchFromGitHub { + owner = "ValiValpas"; + repo = "taskopen"; + rev = "v${version}"; + sha256 = "sha256-/xf7Ph2KKiZ5lgLKk95nCgw/z9wIBmuWf3QGaNebgHg="; + }; - installPhase = '' + postPatch = '' # We don't need a DESTDIR and an empty string results in an absolute path # (due to the trailing slash) which breaks the build. sed 's|$(DESTDIR)/||' -i Makefile + ''; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which ] + ++ (with perlPackages; [ JSON perl ]); + installPhase = '' make PREFIX=$out make PREFIX=$out install ''; @@ -28,7 +35,7 @@ stdenv.mkDerivation { description = "Script for taking notes and open urls with taskwarrior"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; - license = lib.licenses.free ; + license = licenses.free; maintainers = [ maintainers.winpat ]; }; } diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix new file mode 100644 index 000000000000..ebb0abfcbd28 --- /dev/null +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "hubble"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "cilium"; + repo = pname; + rev = "v${version}"; + sha256 = "1n1930hlaflx7kzqbz7vvnxw9hrps84kqibaf2ixnjp998kqkl6d"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "Network, Service & Security Observability for Kubernetes using eBPF"; + license = licenses.asl20; + homepage = "https://github.com/cilium/hubble/"; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index a2be79f5589f..6d9f62e75ab3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,3 +1,8 @@ +# Update instructions: +# +# To update `thunderbird-bin`'s `release_sources.nix`, run from the nixpkgs root: +# +# nix-shell maintainers/scripts/update.nix --argstr package pkgs.firefox-bin-unwrapped { stdenv, lib, fetchurl, config, makeWrapper , alsa-lib , at-spi2-atk diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 314d2141de7e..0be69104a5fe 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,12 +44,12 @@ rec { thunderbird-78 = common rec { pname = "thunderbird"; - version = "78.13.0"; + version = "78.14.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "daee9ea9e57bdfce231a35029807f279a06f8790d71efc8998c78eb42d99a93cf98623170947df99202da038f949ba9111a7ff7adbd43c161794deb6791370a0"; + sha512 = "0zan30jvv45pd6i59l2kfyfjwivqk5qq6vyf77xhss2dk8qhk3mfrfxpfbkrab676l14b9hs09nr6ni1h1iwn82zx5k7fx5x8sh5dx6"; }; patches = [ ./no-buildconfig-78.patch diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index 64afe3222c2d..e7b947450acc 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -15,13 +15,10 @@ , withQcsxcad ? true , withMPI ? false , withHyp2mat ? true -, qcsxcad ? null -, hyp2mat ? null +, qcsxcad +, hyp2mat }: -assert withQcsxcad -> qcsxcad != null; -assert withHyp2mat -> hyp2mat != null; - stdenv.mkDerivation { pname = "openems"; version = "unstable-2020-02-15"; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 5052a3715ef4..7a9f58a0c6e3 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,18 +1,26 @@ -{lib, stdenv, fetchurl, gtk2, pkg-config}: +{ lib +, stdenv +, fetchurl +, gtk3 +, gtkdatabox +, fftw +, gnum4 +, comedilib +, alsa-lib +, pkg-config +}: stdenv.mkDerivation rec { - name = "xoscope-2.0"; + pname = "xoscope"; + version = "2.3"; src = fetchurl { - url = "mirror://sourceforge/xoscope/${name}.tgz"; - sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; + url = "mirror://sourceforge/xoscope/${pname}-${version}.tar.gz"; + sha256 = "0a5ycfc1qdmibvagc82r2mhv2i99m6pndy5i6ixas3j2297g6pgq"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - - # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 - patches = [ ./gtkdepre.diff ]; + nativeBuildInputs = [ pkg-config gnum4 ]; + buildInputs = [ gtk3 gtkdatabox fftw comedilib alsa-lib ]; meta = { description = "Oscilloscope through the sound card"; diff --git a/pkgs/applications/science/electronics/xoscope/gtkdepre.diff b/pkgs/applications/science/electronics/xoscope/gtkdepre.diff deleted file mode 100644 index 993df9cb5503..000000000000 --- a/pkgs/applications/science/electronics/xoscope/gtkdepre.diff +++ /dev/null @@ -1,58 +0,0 @@ -diff -ru xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c ---- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:42:24.000000000 +0200 -+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:45:40.000000000 +0200 -@@ -661,7 +661,7 @@ - static void - gtk_databox_calculate_hcanvas (GtkDatabox *box) - { -- if (!GTK_WIDGET_VISIBLE (box)) -+ if (!gtk_widget_get_visible (box)) - return; - - if (box->priv->adjX->page_size == 1.0) -@@ -698,7 +698,7 @@ - static void - gtk_databox_calculate_vcanvas (GtkDatabox *box) - { -- if (!GTK_WIDGET_VISIBLE (box)) -+ if (!gtk_widget_get_visible (box)) - return; - - if (box->priv->adjY->page_size == 1.0) -@@ -780,7 +780,7 @@ - gtk_databox_draw (box, event); - - gdk_draw_drawable (widget->window, -- widget->style->fg_gc[GTK_WIDGET_STATE (widget)], -+ widget->style->fg_gc[gtk_widget_get_state (widget)], - box->priv->canvas.pixmap, event->area.x, event->area.y, - event->area.x, event->area.y, event->area.width, - event->area.height); -@@ -940,7 +940,7 @@ - GtkWidget *widget = GTK_WIDGET (box); - - g_return_if_fail (GTK_IS_DATABOX (box)); -- g_return_if_fail (GTK_WIDGET_VISIBLE (widget)); -+ g_return_if_fail (gtk_widget_get_visible (widget)); - - gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0], - TRUE, 0, 0, -@@ -1150,7 +1150,7 @@ - /* Copy a part of the pixmap to the screen */ - if (pixmapCopyRect) - gdk_draw_drawable (widget->window, -- widget->style->fg_gc[GTK_WIDGET_STATE (box)], -+ widget->style->fg_gc[gtk_widget_get_state (box)], - box->priv->canvas.pixmap, - pixmapCopyRect->x, - pixmapCopyRect->y, ---- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:43.000000000 +0200 -+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:57.000000000 +0200 -@@ -196,7 +196,6 @@ - -DG_DISABLE_DEPRECATED\ - -DGDK_DISABLE_DEPRECATED\ - -DGDK_PIXBUF_DISABLE_DEPRECATED\ -- -DGTK_DISABLE_DEPRECATED\ - `pkg-config gtk+-2.0 --cflags` - - all: all-am diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix index fcf53e7a1694..7698e6619d91 100644 --- a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; - version = "0.5.5+matrix.1"; + version = "0.5.8+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0y4xn3ygwv1kb7gya7iwdga0g9sa89snpnram0wwqzqn8wn2lyb4"; + sha256 = "xdsUzmz8ji9JcYLEUFWwvXq0Oig5i08VPQD93K8R9hk="; }; passthru = { diff --git a/pkgs/applications/video/kodi-packages/youtube/default.nix b/pkgs/applications/video/kodi-packages/youtube/default.nix index 8e57adbfb1af..7c16aa606f24 100644 --- a/pkgs/applications/video/kodi-packages/youtube/default.nix +++ b/pkgs/applications/video/kodi-packages/youtube/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "6.8.14+matrix.1"; + version = "6.8.17+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1a18whh3fisprwipwhxf26kc958sxhwpvs8pxwq2sq96vr7b4xq7"; + sha256 = "AuYoUyv0DDtHnxFiNl3AF5jrMjuNRXdlJvw7d7b+yh8="; }; propagatedBuildInputs = [ |