diff options
Diffstat (limited to 'pkgs/applications')
9 files changed, 155 insertions, 16 deletions
diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix new file mode 100644 index 0000000000000..1f09d99c88893 --- /dev/null +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, glib +, gtk3 +, libsoup +, keybinder3 +, gst_all_1 +, wrapGAppsHook +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "goodvibes"; + version = "0.7.5"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-CE9f0GnXr7wSpp8jyW0ZxGKx16r6tOaObzQXKcy5nPY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk3 + libsoup + keybinder3 + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + postPatch = '' + patchShebangs scripts + ''; + + meta = with lib; { + description = "A lightweight internet radio player"; + homepage = "https://gitlab.com/goodvibes/goodvibes"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 3fa08757f7de7..35470a7b8542c 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-jU0qN+T5bHn9l/SXDR/Wa8uCGyJhIDUCHzEQe39L2MQ="; + hash = "sha256-GqFtCK5hxnEfIfw3ITufeu26yueknuFZhLtGSXmJ8fE="; }; - cargoHash = "sha256-hdScQd0Fd6gE9/f4kk0zjZLK42oK1aaDzIOcAIsJqbU="; + cargoHash = "sha256-p4t+G13XaCl7+IbX5YyBFF0PmARbw4XlRvnA0PRcjvQ="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; @@ -33,6 +33,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; homepage = "https://github.com/romanz/electrs"; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 35b4fa3aef43a..3d12b11b51410 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ... }: +{ lib, stdenv, fetchurl, libxcrypt, ... }: stdenv.mkDerivation rec { pname = "resilio-sync"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -D rslsync "$out/bin/rslsync" patchelf \ --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc ]} "$out/bin/rslsync" + --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc libxcrypt ]} "$out/bin/rslsync" ''; meta = with lib; { diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/applications/radio/guglielmo/default.nix index 1702f5902021f..404ec7aa96a19 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/applications/radio/guglielmo/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "guglielmo"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "marcogrecopriolo"; repo = pname; rev = "v${version}"; - sha256 = "0s1iz9s0k897jayiwl3yr9ylpclw6bzcpmzhxqn0mkd7jhgfl4vx"; + sha256 = "sha256-djBQTYbpgPFBtQZ9fZBpECP20RxB49AdxLbq8mUU6rg="; }; postInstall = '' diff --git a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix new file mode 100644 index 0000000000000..7c0dbefc50696 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, jre +}: + +stdenv.mkDerivation rec { + pname = "gitnuro"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar"; + hash = "sha256-tAFFl14mmXhLr6V/vTDe9lwX7trsaTWgIqkwxD3mBUw="; + }; + + icon = fetchurl { + url = "https://raw.githubusercontent.com/JetpackDuba/Gitnuro/4cfc45069c176f807d9bfb1a7cba410257078d3c/icons/logo.svg"; + hash = "sha256-QGJcWTSJesIpDArOWiS3Kn1iznzeMFzvqS+CuNXh3as="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + makeWrapper ${jre}/bin/java $out/bin/gitnuro --add-flags "-jar $src" + install -Dm444 $icon $out/share/icons/hicolor/scalable/apps/com.jetpackduba.Gitnuro.svg + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Gitnuro"; + exec = "gitnuro"; + icon = "com.jetpackduba.Gitnuro"; + desktopName = "Gitnuro"; + categories = [ "Development" ]; + comment = meta.description; + }) + ]; + + meta = with lib; { + description = "A FOSS Git multiplatform client based on Compose and JGit"; + homepage = "https://gitnuro.jetpackduba.com"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/applications/virtualization/libgovirt/default.nix index 9c9da54c3632d..0815781c21f7d 100644 --- a/pkgs/applications/virtualization/libgovirt/default.nix +++ b/pkgs/applications/virtualization/libgovirt/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; }; + patches = lib.optionals stdenv.isDarwin [ + # The flag breaks the build on darwin and doesn't seem necessary + ./no-version-script-ld-flag.patch + ]; + nativeBuildInputs = [ pkg-config gobject-introspection @@ -46,8 +51,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/libgovirt"; description = "GObject wrapper for the oVirt REST API"; - maintainers = [ maintainers.amarshall ]; - platforms = platforms.linux; + maintainers = with maintainers; [ amarshall atemu ]; + platforms = with platforms; linux ++ darwin; license = licenses.lgpl21Plus; }; } diff --git a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch new file mode 100644 index 0000000000000..a837c3bf06421 --- /dev/null +++ b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch @@ -0,0 +1,14 @@ +--- a/govirt/Makefile.in ++++ b/govirt/Makefile.in +@@ -511,8 +511,7 @@ + libgovirt_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-dynamic \ +- -no-undefined \ +- -Wl,--version-script=$(srcdir)/govirt.sym ++ -no-undefined + + libgovirt_la_CFLAGS = \ + $(WARNINGFLAGS_C) + +Diff finished. Fri Oct 28 10:36:38 2022 diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 42a556a451fb4..46bbc3b914b93 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -14,7 +14,7 @@ , gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook , vncSupport ? !nixosTestRunner, libjpeg, libpng , smartcardSupport ? !nixosTestRunner, libcacard -, spiceSupport ? !stdenv.isDarwin && !nixosTestRunner, spice, spice-protocol +, spiceSupport ? true && !nixosTestRunner, spice, spice-protocol , ncursesSupport ? !nixosTestRunner, ncurses , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index ed882709aa143..2e8aa34286a6f 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -29,7 +29,7 @@ assert spiceSupport -> ( gdbm != null - && libcap != null + && (stdenv.isLinux -> libcap != null) && spice-gtk_libsoup2 != null && spice-protocol != null ); @@ -76,12 +76,13 @@ stdenv.mkDerivation rec { libvirt-glib libxml2 vte - ] ++ optionals spiceSupport [ + ] ++ optionals spiceSupport ([ gdbm - libcap spice-gtk_libsoup2 spice-protocol - ]; + ] ++ optionals stdenv.isLinux [ + libcap + ]); # Required for USB redirection PolicyKit rules file propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; @@ -94,8 +95,8 @@ stdenv.mkDerivation rec { meta = { description = "A viewer for remote virtual machines"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + maintainers = with maintainers; [ raskin atemu ]; + platforms = with platforms; linux ++ darwin; license = licenses.gpl2; }; passthru = { |