diff options
Diffstat (limited to 'pkgs/applications')
15 files changed, 144 insertions, 90 deletions
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index f7abeb2a91e83..abb13b021c047 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }: stdenv.mkDerivation { - version = "git-2015-05-21"; + version = "unstable-2015-05-21"; pname = "foo-yc20"; src = fetchFromGitHub { owner = "sampov2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = "https://github.com/sampov2/foo-yc20"; - license = with licenses; [ bsd3 lgpl21 mpl11 ] ; + license = with licenses; [ bsd3 lgpl21 mpl11 ]; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index 7c9f2acfd8445..7e2b2bf6cfbda 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation { - pname = "mod-distortion-git"; - version = "2016-08-19"; + pname = "mod-distortion"; + version = "unstable-2016-08-19"; src = fetchFromGitHub { owner = "portalmod"; diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix index 4bad496033735..420055884b453 100644 --- a/pkgs/applications/audio/orca-c/default.nix +++ b/pkgs/applications/audio/orca-c/default.nix @@ -1,8 +1,7 @@ { lib, stdenv, fetchgit, ncurses, portmidi }: stdenv.mkDerivation { pname = "orca-c"; - - version = "git-2021-02-13"; + version = "unstable-2021-02-13"; src = fetchgit { url = "https://git.sr.ht/~rabbits/orca"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix index afc51e8fcc2a8..71f9981f461a9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { */ description = "Small session management for emacs"; homepage = "http://emacs-session.sourceforge.net/"; - license = license.gpl; + license = licenses.gpl2; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index ec713d99371b7..6888cebec2d0b 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation { - version = "git-2014-08-20"; + version = "unstable-2014-08-20"; pname = "supertux-editor"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; + buildInputs = [ mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 6a835fb3c71a4..ccde0c0d9ecb1 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,14 +1,12 @@ { fetchurl, lib, stdenv, cmake, qt4, fftw }: -let - rev = "9895036d26"; -in stdenv.mkDerivation rec { - name = "smartdeblur-git-${rev}"; + pname = "smartdeblur"; + version = "unstable-2013-01-09"; src = fetchurl { - url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/${rev}"; - name = "${name}.tar.gz"; + url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/9895036d26"; + name = "smartdeblur-${version}.tar.gz"; sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4"; }; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 19cfa95a88e40..6a9453eb583a3 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -2,7 +2,7 @@ mkDerivation { pname = "dfilemanager"; - version = "git-2020-09-04"; + version = "unstable-2020-09-04"; src = fetchFromGitHub { owner = "probonopd"; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 4701fe0b54f30..9d3b751fcd6ac 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.4.6"; + version = "2.5.12"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-BMpRWtfx5fXEJy3hp/+q86sd+Yd/QPJbSqi2nWE2dcQ="; - x86_64-darwin = "sha256-4UNKdoGtQSN5/m+xQZrY77ZE5A7jvpDOUCRvwrS5e6g="; + x86_64-linux = "sha256-/S/paqMKVerSQFjA4wQ9fLV0WaqKm4CzQfy+0OdH7c8="; + x86_64-darwin = "sha256-5eKTfZRpW7IYwFt8TeJiytrwEpiHBgN4k9kth+Lh0Bo="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index 93e8f1fc9d75c..d031f63a097a1 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -2,16 +2,33 @@ let perlDeps = with perlPackages; [ - Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon - XMLLibXML XMLSAXBase XMLParser XMLRSS + Glib + Gtk2 + Gnome2 + Pango + Cairo + Gnome2Canvas + Gnome2VFS + Gtk2GladeXML + Gtk2TrayIcon + XMLLibXML + XMLSAXBase + XMLParser + XMLRSS HTMLParser - DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone + DateTime + DateTimeFormatMail + DateTimeFormatW3CDTF + DateTimeLocale + DateTimeTimeZone ParamsValidate - ModuleImplementation ModuleRuntime + ModuleImplementation + ModuleRuntime TryTiny ClassSingleton URI - AnyEvent AnyEventHTTP + AnyEvent + AnyEventHTTP commonsense FileSlurp JSON @@ -24,7 +41,7 @@ let ]; in stdenv.mkDerivation { - version = "git-2017-12-01"; + version = "unstable-2017-12-01"; pname = "yarssr"; src = fetchFromGitHub { @@ -35,7 +52,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ perlPackages.perl gettext makeWrapper ]; - buildInputs = perlDeps ++ [gnome2.libglade]; + buildInputs = perlDeps ++ [ gnome2.libglade ]; propagatedBuildInputs = libs ++ perlDeps; installPhase = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d10615fdec277..a36b160c5f94d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "97.0.4688.2", - "sha256": "0a5i64gxb24z5mfvmf50g4fafvqqbj7k5077arnhwzp3xiznld88", - "sha256bin64": "0l70qlna8x05rrlcfgv2xyl8g5nlmd42i8n0yc9dw3mwq8m4c4db", + "version": "97.0.4692.8", + "sha256": "0n47jfxs05g55p69f5939jf5pgyw88n4cpg78k019n3zr2vlv1qf", + "sha256bin64": "1gisqc6dz7yfigj0dji7cnx5jdcjz0gmn248cp2a6zs9mfvwwbqv", "deps": { "gn": { - "version": "2021-10-30", + "version": "2021-11-03", "url": "https://gn.googlesource.com/gn", - "rev": "8926696a4186279489cc2b8d768533e61bba73d7", - "sha256": "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk" + "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", + "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" } } }, diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix new file mode 100644 index 0000000000000..346284d3eab08 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "helm-docs"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "norwoodj"; + repo = "helm-docs"; + rev = "v${version}"; + sha256 = "sha256-eyFuF03rqwfXyjEkqNRkjrJlHBazGYij1EtN0LAKdFk="; + }; + + vendorSha256 = "sha256-aAn969C4UhFGu5/qXIG/rc1cErQIDtPwEA+f0d43y0w="; + + subPackages = [ "cmd/helm-docs" ]; + ldflags = [ + "-w" + "-s" + "-X main.version=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/norwoodj/helm-docs"; + description = "A tool for automatically generating markdown documentation for Helm charts"; + platforms = platforms.unix; + license = licenses.gpl3Only; + maintainers = with maintainers; [ sagikazarmark ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 70ada1d08d14a..c8797423bedbb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -58,7 +58,7 @@ let }); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.23.0"; # Please backport all updates to the stable channel. + version = "5.23.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0jan203zbrkb9scfdldwnvyvk4657a3pn0ws51xf53jhvvywhpg0"; + sha256 = "0scbnkkbaqyqiz6bfvhdrc0yqnccjsf66iggjpa7kjyk3cy61s6c"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 477e5442b8290..943ec299cdbd7 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,17 +1,24 @@ -{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake -, makeDesktopItem }: +{ mkDerivation +, lib +, stdenv +, fetchgit +, qtbase +, qtquickcontrols +, qmake +, makeDesktopItem +}: # we now have libqmatrixclient so a future version of tensor that supports it # should use that mkDerivation rec { - pname = "tensor-git"; - version = "2017-02-21"; + pname = "tensor"; + version = "unstable-2017-02-21"; src = fetchgit { - url = "https://github.com/davidar/tensor.git"; - rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; - sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; + url = "https://github.com/davidar/tensor.git"; + rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; + sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; fetchSubmodules = true; }; @@ -19,14 +26,14 @@ mkDerivation rec { nativeBuildInputs = [ qmake ]; desktopItem = makeDesktopItem { - name = "tensor"; - exec = "@bin@"; - icon = "tensor.png"; - comment = meta.description; + name = "tensor"; + exec = "@bin@"; + icon = "tensor.png"; + comment = meta.description; desktopName = "Tensor Matrix Client"; genericName = meta.description; - categories = "Chat;Utility"; - mimeType = "application/x-chat"; + categories = "Chat;Utility"; + mimeType = "application/x-chat"; }; installPhase = if stdenv.isDarwin then '' diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 562372b1bb70c..ddd94bff522aa 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -1,25 +1,29 @@ { lib, stdenv, fetchFromGitHub, znc }: let - zncDerivation = a@{ - pname, src, module_name, - buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp", - installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ... - } : stdenv.mkDerivation (a // { - inherit buildPhase; - inherit installPhase; - - buildInputs = znc.buildInputs; - - meta = a.meta // { platforms = lib.platforms.unix; }; - passthru.module_name = module_name; - }); - -in { + zncDerivation = + a@{ pname + , src + , module_name + , buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp" + , installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so" + , ... + }: stdenv.mkDerivation (a // { + inherit buildPhase; + inherit installPhase; + + buildInputs = znc.buildInputs; + + meta = a.meta // { platforms = lib.platforms.unix; }; + passthru.module_name = module_name; + }); + +in +{ backlog = zncDerivation rec { pname = "znc-backlog"; - version = "git-2017-06-13"; + version = "unstable-2017-06-13"; module_name = "backlog"; src = fetchFromGitHub { @@ -39,7 +43,7 @@ in { clientbuffer = zncDerivation rec { pname = "znc-clientbuffer"; - version = "git-2020-04-24"; + version = "unstable-2020-04-24"; module_name = "clientbuffer"; src = fetchFromGitHub { @@ -59,7 +63,7 @@ in { clientaway = zncDerivation rec { pname = "znc-clientaway"; - version = "git-2017-04-28"; + version = "unstable-2017-04-28"; module_name = "clientaway"; src = fetchFromGitHub { @@ -79,7 +83,7 @@ in { fish = zncDerivation rec { pname = "znc-fish"; - version = "git-2017-06-26"; + version = "unstable-2017-06-26"; module_name = "fish"; src = fetchFromGitHub { @@ -99,7 +103,7 @@ in { ignore = zncDerivation rec { pname = "znc-ignore"; - version = "git-2017-04-28"; + version = "unstable-2017-04-28"; module_name = "ignore"; src = fetchFromGitHub { @@ -139,7 +143,7 @@ in { playback = zncDerivation rec { pname = "znc-playback"; - version = "git-2015-08-04"; + version = "unstable-2015-08-04"; module_name = "playback"; src = fetchFromGitHub { @@ -159,7 +163,7 @@ in { privmsg = zncDerivation rec { pname = "znc-privmsg"; - version = "git-2015-02-22"; + version = "unstable-2015-02-22"; module_name = "privmsg"; src = fetchFromGitHub { @@ -177,7 +181,7 @@ in { push = zncDerivation rec { pname = "znc-push"; - version = "git-2016-10-12"; + version = "unstable-2016-10-12"; module_name = "push"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 0dcebb71cc5f2..128753f26433f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -5,12 +5,12 @@ , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). -, open-watcom-bin ? null +, open-watcom-bin , makeself, perl -, javaBindings ? true, jdk ? null # Almost doesn't affect closure size -, pythonBindings ? false, python3 ? null -, extensionPack ? null, fakeroot ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null +, javaBindings ? true, jdk # Almost doesn't affect closure size +, pythonBindings ? false, python3 +, extensionPack ? null, fakeroot +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio , enableHardening ? false , headless ? false , enable32bitGuests ? true @@ -20,7 +20,6 @@ with lib; let - python = python3; buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. @@ -42,23 +41,23 @@ in stdenv.mkDerivation { # Wrap manually because we wrap just a small number of executables. dontWrapQtApps = true; - buildInputs = - [ acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL - libcap glib lvm2 alsa-lib curl libvpx pam makeself perl - libXmu libpng libopus python ] + buildInputs = [ + acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL + libcap glib lvm2 alsa-lib curl libvpx pam makeself perl + libXmu libpng libopus python3 ] ++ optional javaBindings jdk - ++ optional pythonBindings python # Python is needed even when not building bindings + ++ optional pythonBindings python3 # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio - ++ optionals (headless) [ libXrandr libGL ] + ++ optionals headless [ libXrandr libGL ] ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ] - ++ optionals (enableWebService) [ gsoap zlib ]; + ++ optionals enableWebService [ gsoap zlib ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; prePatch = '' set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ - -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ + -e 's@PYTHONDIR=.*@PYTHONDIR=${lib.optionalString pythonBindings python3}@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ ${optionalString (!headless) '' -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ @@ -135,7 +134,7 @@ in stdenv.mkDerivation { PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease ''} - ${optionalString (enableWebService) '' + ${optionalString enableWebService '' # fix gsoap missing zlib include and produce errors with --as-needed VBOX_GSOAP_CXX_LIBS := gsoapssl++ z ''} @@ -148,7 +147,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ - ${optionalString (enableWebService) "--enable-webservice"} \ + ${optionalString enableWebService "--enable-webservice"} \ ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ --disable-kmods sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ @@ -175,7 +174,7 @@ in stdenv.mkDerivation { -name src -o -exec cp -avt "$libexec" {} + mkdir -p $out/bin - for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString (enableWebService) "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do echo "Linking $file to /bin" test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file @@ -183,14 +182,14 @@ in stdenv.mkDerivation { ${optionalString (extensionPack != null) '' mkdir -p "$share" - "${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EXTHELPER + "${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EOF "$libexec/VBoxExtPackHelperApp" install \ --base-dir "$share/ExtensionPacks" \ --cert-dir "$share/ExtPackCertificates" \ --name "Oracle VM VirtualBox Extension Pack" \ --tarball "${extensionPack}" \ --sha-256 "${extensionPack.outputHash}" - EXTHELPER + EOF ''} ${optionalString (!headless) '' |