diff options
Diffstat (limited to 'pkgs/applications')
203 files changed, 3245 insertions, 2042 deletions
diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/applications/audio/ChowKick/default.nix new file mode 100644 index 000000000000..135ed3a11a1c --- /dev/null +++ b/pkgs/applications/audio/ChowKick/default.nix @@ -0,0 +1,106 @@ +{ alsa-lib +, at-spi2-core +, brotli +, cmake +, curl +, dbus +, epoxy +, fetchFromGitHub +, freeglut +, freetype +, gtk2-x11 +, lib +, libGL +, libXcursor +, libXdmcp +, libXext +, libXinerama +, libXrandr +, libXtst +, libdatrie +, libjack2 +, libpsl +, libselinux +, libsepol +, libsysprof-capture +, libthai +, libxkbcommon +, lv2 +, pcre +, pkg-config +, python3 +, sqlite +, stdenv +, util-linuxMinimal +, webkitgtk +}: + +stdenv.mkDerivation rec { + pname = "ChowKick"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "Chowdhury-DSP"; + repo = pname; + rev = "v${version}"; + sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + buildInputs = [ + alsa-lib + at-spi2-core + brotli + curl + dbus + epoxy + freeglut + freetype + gtk2-x11 + libGL + libXcursor + libXdmcp + libXext + libXinerama + libXrandr + libXtst + libdatrie + libjack2 + libpsl + libselinux + libsepol + libsysprof-capture + libthai + libxkbcommon + lv2 + pcre + python3 + sqlite + util-linuxMinimal + webkitgtk + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" + "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin + cp -r ChowKick_artefacts/Release/LV2//${pname}.lv2 $out/lib/lv2 + cp -r ChowKick_artefacts/Release/VST3/${pname}.vst3 $out/lib/vst3 + cp ChowKick_artefacts/Release/Standalone/${pname} $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/Chowdhury-DSP/ChowKick"; + description = "Kick synthesizer based on old-school drum machine circuits"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index b1808ed90f11..51dda20cc3a1 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,30 +1,34 @@ -{lib, stdenv, fetchurl, gettext, ncurses +{ lib +, stdenv +, fetchurl +, gettext +, ncurses , gtkGUI ? false -, pkg-config ? null -, gtk2 ? null}: - -assert gtkGUI -> pkg-config != null && gtk2 != null; +, pkg-config +, gtk2 +}: stdenv.mkDerivation rec { - name = "aumix-2.9.1"; + pname = "aumix"; + version = "2.9.1"; + src = fetchurl { - url = "http://www.jpj.net/~trevor/aumix/releases/${name}.tar.bz2"; + url = "http://www.jpj.net/~trevor/aumix/releases/aumix-${version}.tar.bz2"; sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj"; }; buildInputs = [ gettext ncurses ] - ++ (if gtkGUI then [pkg-config gtk2] else []); + ++ lib.optionals gtkGUI [ pkg-config gtk2 ]; - meta = { + meta = with lib; { description = "Audio mixer for X and the console"; longDescription = '' Aumix adjusts an audio mixer from X, the console, a terminal, the command line or a script. ''; homepage = "http://www.jpj.net/~trevor/aumix.html"; - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index ebcd09ca6adf..ff9dca961aea 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -1,8 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl, -util-linux, python3Packages, libnotify }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, rofi +, mpc_cli +, perl +, util-linux +, python3Packages +, libnotify +}: stdenv.mkDerivation { - name = "clerk-2016-10-14"; + pname = "clerk"; + version = "unstable-2016-10-14"; src = fetchFromGitHub { owner = "carnager"; @@ -26,8 +36,8 @@ stdenv.mkDerivation { meta = with lib; { description = "An MPD client built on top of rofi"; - homepage = "https://github.com/carnager/clerk"; - license = licenses.mit; + homepage = "https://github.com/carnager/clerk"; + license = licenses.mit; maintainers = with maintainers; [ anderspapitto ]; }; } diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index 675f31b478ce..e5579175bbb7 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, unzip, portaudio }: stdenv.mkDerivation rec { - name = "espeak-1.48.04"; + pname = "espeak"; + version = "1.48.04"; src = fetchurl { - url = "mirror://sourceforge/espeak/${name}-source.zip"; + url = "mirror://sourceforge/espeak/espeak-${version}-source.zip"; sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz"; }; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 0b9fa3dfbe54..2240a8561164 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }: stdenv.mkDerivation rec { - name = "espeakedit-1.48.03"; + pname = "espeakedit"; + version = "1.48.03"; src = fetchurl { - url = "mirror://sourceforge/espeak/${name}.zip"; + url = "mirror://sourceforge/espeak/espeakedit-${version}.zip"; sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index fc5a2e9b0350..578cecf09b09 100644 --- a/pkgs/applications/audio/mmtc/default.nix +++ b/pkgs/applications/audio/mmtc/default.nix @@ -1,27 +1,26 @@ -{ fetchFromGitHub, installShellFiles, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "mmtc"; - version = "0.2.13"; + version = "0.2.14"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "0ag87hgdg6fvk80fgznba0xjlcajks5w5s6y8lvwhz9irn2kq2rz"; + sha256 = "sha256-g2JHY95vkG/Ep2eqz8guteF8fHUso/JuuVijNGkgykA="; }; - cargoSha256 = "0lkx0zj9xc0rlrq91l4wydzp430hxlrqyq7ii8wq2fcan8ln22lv"; + cargoSha256 = "sha256-tVjy/O5hfnQFC6to8VMGc39mEXhA5lwUIne6pVvDec0="; nativeBuildInputs = [ installShellFiles ]; preFixup = '' completions=($releaseDir/build/mmtc-*/out/completions) - installShellCompletion ''${completions[0]}/mmtc.{bash,fish} - installShellCompletion --zsh ''${completions[0]}/_mmtc + installShellCompletion $completions/mmtc.{bash,fish} --zsh $completions/_mmtc ''; - GEN_COMPLETIONS = "1"; + GEN_COMPLETIONS = 1; meta = with lib; { description = "Minimal mpd terminal client that aims to be simple yet highly configurable"; diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix index edfb19483646..b5e820e83459 100644 --- a/pkgs/applications/audio/nootka/unstable.nix +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -1,20 +1,38 @@ -{ lib, stdenv, fetchurl, cmake -, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch -, qtbase, qtdeclarative, qtquickcontrols2 +{ lib +, stdenv +, fetchurl +, cmake +, alsa-lib +, fftwSinglePrec +, libjack2 +, libpulseaudio +, libvorbis +, soundtouch +, qtbase +, qtdeclarative +, qtquickcontrols2 }: stdenv.mkDerivation rec { - name = "nootka-1.7.0-beta1"; + pname = "nootka"; + version = "1.7.0-beta1"; src = fetchurl { - url = "mirror://sourceforge/nootka/${name}-source.tar.bz2"; + url = "mirror://sourceforge/nootka/nootka-${version}-source.tar.bz2"; sha256 = "13b50vnpr1zx2mrgkc8fmhsyfa19rqq1rksvn31145dy6fk1f3gc"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch - qtbase qtdeclarative qtquickcontrols2 + alsa-lib + fftwSinglePrec + libjack2 + libpulseaudio + libvorbis + soundtouch + qtbase + qtdeclarative + qtquickcontrols2 ]; dontWrapQtApps = true; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 64e403001a3d..31ccb212cd51 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,5 +1,6 @@ { fetchurl -, lib, stdenv +, lib +, stdenv , meson , ninja , gettext @@ -11,10 +12,11 @@ }: stdenv.mkDerivation rec { - name = "paprefs-1.1"; + pname = "paprefs"; + version = "1.1"; src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/paprefs/paprefs-${version}.tar.xz"; sha256 = "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf"; }; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 9cce4af92984..b5cf068d5691 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.8.0"; + version = "3.8.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "wdOJYmUHPSuijQjmkwq1jLX3qgLzmFxDihlETELlzk13RcpCcczL++V5dqdiQY6UmZVP3KL4VPjXubSq4CmXlQ=="; + sha512 = "JVzfWlrX21KHw4tSrGpCYqqoWFudnyFG4YnHKsnIUtxLDkjyQA8N2/OrDIR+SlK/b0RRs9KZ4lbqQMX8PXUHsg=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/33"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/35"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 5c9250b45e03..655290020156 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.13"; + version = "0.11.14"; format = "pyproject"; src = fetchFromGitLab { @@ -57,19 +57,26 @@ python3Packages.buildPythonApplication rec { ++ lib.optional serverSupport bottle ; + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov-on-fail/d" setup.cfg + ''; + # hook for gobject-introspection doesn't like strictDeps # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - # Use the test suite provided by the upstream project. checkInputs = with python3Packages; [ pytest - pytest-cov ]; - checkPhase = "${xvfb-run}/bin/xvfb-run pytest"; - # Also run the python import check for sanity - pythonImportsCheck = [ "sublime_music" ]; + checkPhase = '' + ${xvfb-run}/bin/xvfb-run pytest -k "not test_json_load_unload" + ''; + + pythonImportsCheck = [ + "sublime_music" + ]; postInstall = '' install -Dm444 sublime-music.desktop -t $out/share/applications diff --git a/pkgs/applications/audio/tagutil/default.nix b/pkgs/applications/audio/tagutil/default.nix index 903537333fff..e5076188301a 100644 --- a/pkgs/applications/audio/tagutil/default.nix +++ b/pkgs/applications/audio/tagutil/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { zlib ]; - prePatch = '' + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "-o aslr" "" ''; diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index f4ef7f6d8a57..1820ed2def1c 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "wavegain-1.3.1"; + pname = "wavegain"; + version = "1.3.1"; + src = fetchFromGitHub { owner = "MestreLion"; repo = "wavegain"; diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix new file mode 100644 index 000000000000..ee6eef5527f9 --- /dev/null +++ b/pkgs/applications/audio/zrythm/default.nix @@ -0,0 +1,169 @@ +{ stdenv +, lib +, fetchFromGitHub +, SDL2 +, alsa-lib +, libaudec +, bash +, bash-completion +, breeze-icons +, carla +, chromaprint +, cmake +, curl +, dconf +, epoxy +, ffmpeg +, fftw +, fftwFloat +, flex +, glib +, gtk3 +, gtksourceview3 +, guile +, graphviz +, help2man +, json-glib +, jq +, libbacktrace +, libcyaml +, libgtop +, libjack2 +, libpulseaudio +, libsamplerate +, libsndfile +, libsoundio +, libxml2 +, libyaml +, lilv +, lv2 +, meson +, ninja +, pandoc +, pcre +, pcre2 +, pkg-config +, python3 +, reproc +, rtaudio +, rtmidi +, rubberband +, serd +, sord +, sratom +, texi2html +, wrapGAppsHook +, xdg-utils +, xxHash +, vamp-plugin-sdk +, zstd +}: + +stdenv.mkDerivation rec { + pname = "zrythm"; + version = "1.0.0-alpha.26.0.13"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dkXlkJ+qlfxV9Bv2UvZZa2iRVm8tgpK4JxkWL2Jeq48="; + }; + + nativeBuildInputs = [ + help2man + jq + libaudec + libxml2 + meson + ninja + pandoc + pkg-config + python3 + python3.pkgs.sphinx + texi2html + wrapGAppsHook + cmake + ]; + + buildInputs = [ + SDL2 + alsa-lib + bash-completion + carla + chromaprint + curl + dconf + epoxy + ffmpeg + fftw + fftwFloat + flex + breeze-icons + glib + gtk3 + gtksourceview3 + graphviz + guile + json-glib + libbacktrace + libcyaml + libgtop + libjack2 + libpulseaudio + libsamplerate + libsndfile + libsoundio + libyaml + lilv + lv2 + pcre + pcre2 + reproc + rtaudio + rtmidi + rubberband + serd + sord + sratom + vamp-plugin-sdk + xdg-utils + xxHash + zstd + ]; + + mesonFlags = [ + "-Denable_ffmpeg=true" + "-Denable_rtmidi=true" + "-Denable_rtaudio=true" + "-Denable_sdl=true" + "-Dmanpage=true" + # "-Duser_manual=true" # needs sphinx-intl + "-Dlsp_dsp=disabled" + "-Db_lto=false" + ]; + + NIX_LDFLAGS = '' + -lfftw3_threads -lfftw3f_threads + ''; + + postPatch = '' + chmod +x scripts/meson-post-install.sh + patchShebangs ext/sh-manpage-completions/run.sh scripts/generic_guile_wrap.sh \ + scripts/meson-post-install.sh tools/check_have_unlimited_memlock.sh + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/" + ) + ''; + + meta = with lib; { + homepage = "https://www.zrythm.org"; + description = "Highly automated and intuitive digital audio workstation"; + maintainers = with maintainers; [ tshaynik magnetophon ]; + platforms = platforms.linux; + license = licenses.agpl3Plus; + }; +} diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index d16fc0f85c55..816646ab6f12 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: -stdenv.mkDerivation { - name = "areca-7.5"; +stdenv.mkDerivation rec { + pname = "areca"; + version = "7.5"; src = fetchurl { - url = "mirror://sourceforge/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz"; + url = "mirror://sourceforge/project/areca/areca-stable/areca-${version}/areca-${version}-src.tar.gz"; sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb"; }; diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix index 39f2e3cb0edc..b576cd2373ce 100644 --- a/pkgs/applications/blockchains/chia-plotter/default.nix +++ b/pkgs/applications/blockchains/chia-plotter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "chia-plotter"; - version = "unstable-2021-07-12"; + version = "1.1.7"; src = fetchFromGitHub { owner = "madMAx43v3r"; repo = "chia-plotter"; - rev = "974d6e5f1440f68c48492122ca33828a98864dfc"; - sha256 = "0dliswvqmi3wq9w8jp0sb0z74n5k37608sig6r60z206g2bwhjja"; + rev = "18cad340858f0dbcc8dafd0bda1ce1af0fe58c65"; + sha256 = "sha256-lXjeqcjn3+LtnVYngdM1T3on7V7wez4oOAZ0RpKJXMM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 3a5436d4f32d..1919e6b6947d 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,24 +1,41 @@ -{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 -, enchant, gucharmap, python3, gnome +{ lib +, stdenv +, fetchurl +, intltool +, wrapGAppsHook +, pkg-config +, gtk +, libxml2 +, enchant +, gucharmap +, python3 +, gnome }: stdenv.mkDerivation rec { - name = "bluefish-2.2.12"; + pname = "bluefish"; + version = "2.2.12"; src = fetchurl { - url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; + url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2"; sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; }; nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; - buildInputs = [ gnome.adwaita-icon-theme gtk libxml2 - enchant gucharmap python3 ]; + buildInputs = [ + gnome.adwaita-icon-theme + gtk + libxml2 + enchant + gucharmap + python3 + ]; meta = with lib; { description = "A powerful editor targeted towards programmers and webdevelopers"; homepage = "http://bluefish.openoffice.nl/"; license = licenses.gpl3Plus; - maintainers = [maintainers.vbgl]; + maintainers = with maintainers; [ vbgl ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index f63598a7c5e2..eb288ff8b2a8 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -1,19 +1,22 @@ { fetchurl, fetchpatch, lib, stdenv, ncurses }: -stdenv.mkDerivation { - name = "elvis-2.2_0"; +stdenv.mkDerivation rec { + pname = "elvis"; + version = "2.2_0"; src = fetchurl { - url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-2.2_0.tar.gz"; + url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${version}.tar.gz"; sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s"; }; buildInputs = [ ncurses ]; - patches = [ (fetchpatch { - url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; - sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; - }) ]; + patches = [ + (fetchpatch { + url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; + sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; + }) + ]; postPatch = '' substituteInPlace configure \ diff --git a/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix b/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix index 18dcef129cc2..31106654ae6c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix @@ -1,10 +1,11 @@ { lib, fetchurl, stdenv, emacs, python }: stdenv.mkDerivation rec { - name = "cedet-1.1"; + pname = "cedet"; + version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/cedet/${name}.tar.gz"; + url = "mirror://sourceforge/cedet/cedet-${version}.tar.gz"; sha256 = "0p2bwlpwwa019axvgj09xkxbr53j0pq23d46s4la9jfhl47nbh22"; }; 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 61749a89fde4..64a8402650b2 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 @@ -1,27 +1,29 @@ -{stdenv, fetchurl, emacs}: +{ stdenv, fetchurl, emacs }: -stdenv.mkDerivation { - name = "session-management-for-emacs-2.2a"; +stdenv.mkDerivation rec { + pname = "session-management-for-emacs"; + version = "2.2a"; src = fetchurl { - url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz"; + url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz"; sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; }; - buildInputs = [emacs]; + buildInputs = [ emacs ]; installPhase = '' mkdir -p "$out/share/emacs/site-lisp" cp lisp/*.el "$out/share/emacs/site-lisp/" ''; - meta = { + meta = with lib; { /* installation: add to your ~/.emacs - (require 'session) - (add-hook 'after-init-hook 'session-initialize) + (require 'session) + (add-hook 'after-init-hook 'session-initialize) */ description = "Small session management for emacs"; homepage = "http://emacs-session.sourceforge.net/"; - license = "GPL"; + license = license.gpl; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index 4f78267dbe5d..05841bb1bac2 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }: stdenv.mkDerivation rec { - name = "fte-0.50.02"; + pname = "fte"; + version = "0.50.02"; nativeBuildInputs = [ unzip ]; buildInputs = [ perl libX11 libXpm gpm ncurses slang ]; diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index a1b90b83d589..9adce387f407 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -23,6 +23,22 @@ stdenv.mkDerivation rec { url = "https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch"; sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix"; }) + + # Fix pending upstream inclusion for gcc10 -fno-common compatibility: + # https://github.com/LonnyGomes/hexcurse/pull/28 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/LonnyGomes/hexcurse/commit/9cf7c9dcd012656df949d06f2986b57db3a72bdc.patch"; + sha256 = "1awsyxys4pd3gkkgyckgjg3njgqy07223kcmnpfdkidh2xb0s360"; + }) + + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/LonnyGomes/hexcurse/pull/40 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/LonnyGomes/hexcurse/commit/cb70d4a93a46102f488f471fad31a7cfc9fec025.patch"; + sha256 = "19674zhhp7gc097kl4bxvi0gblq6jzjy8cw8961svbq5y3hv1v5y"; + }) ]; meta = with lib; { diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 1e7d38086b79..e8c2760973a6 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; - version = "2021.10.28"; + version = "2021.11.08"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "sha256-ph0063EHyFa7arXvCVD+tGhs8ShyCDYkFVd1w6MZ5Z8="; + sha256 = "sha256-lMGMt0H1G8EN/7zSVSvU1yU4BYPnSF1vWmozLdrRTQk="; }; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 6819c4337f4c..686113452eb8 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -22,10 +22,11 @@ }: mkDerivation rec { - name = "kile-2.9.93"; + pname = "kile"; + version = "2.9.93"; src = fetchurl { - url = "mirror://sourceforge/kile/${name}.tar.bz2"; + url = "mirror://sourceforge/kile/kile-${version}.tar.bz2"; sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; }; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 8655235f2927..6a55e7c8e396 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv , libuv, lua, ncurses, pkg-config -, unibilium, xsel, gperf +, unibilium, gperf , libvterm-neovim , tree-sitter , glibcLocales ? null, procps ? null @@ -113,10 +113,6 @@ in substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; - postInstall = lib.optionalString stdenv.isLinux '' - sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim - ''; - # export PATH=$PWD/build/bin:${PATH} shellHook='' export VIMRUNTIME=$PWD/runtime diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 7102d6951390..7f14bf8ae14b 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -1,26 +1,28 @@ { fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: let - libPath = lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; + libPath = lib.makeLibraryPath [ glib xorg.libX11 gtk2 cairo ]; in stdenv.mkDerivation rec { - name = "sublimetext-2.0.2"; + pname = "sublimetext"; + version = "2.0.2"; + src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - name = "sublimetext-2.0.2.tar.bz2"; + name = "sublimetext-${version}.tar.bz2"; urls = [ - "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" - "https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2" + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%20${version}.tar.bz2" ]; sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7"; } else fetchurl { - name = "sublimetext-2.0.2.tar.bz2"; + name = "sublimetext-${version}.tar.bz2"; urls = [ - "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" - "https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2" + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%20${version}%20x64.tar.bz2" ]; sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1"; }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index d08f80fda6f5..fff0f07477f1 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1yfaf9qdaf6njvj8kilmivyl0nnhdvd9hbzpf8hv3kw5rfpdvy89"; - x86_64-darwin = "10rx5aif61xipf5lcjzkidz9dhbm5gc2wf87c2j456nixaxbx0b4"; - aarch64-linux = "13h4ffdm9y9p3jnqcjvapykbm73bkjy5jaqwhsi293f9r7jfp9rf"; - aarch64-darwin = "07nmrxc25rfp5ibarhg3c14ksk2ymqmsnc55hicvvhw93g2qczby"; - armv7l-linux = "1gz1mmw2vp986l9sm7rd6hypxs70sz63sbmzyxwfqpvj973dl23q"; + x86_64-linux = "18sa2avr7xl8d0yaxs0df1pkwx7bbg21s8qf3mijdndsnhri0j1c"; + x86_64-darwin = "0vx0jiw341gsf00xw92fwwylnsi5c0ybrbj5syag4vkqddvp410k"; + aarch64-linux = "0jswwz1rxddaxz6v7hzpvddhx9dia5nk5rdsaj93q4gs3nda90hk"; + aarch64-darwin = "11lxg543kl85vbndqcq5zccycxfk63ijmka0jb973jfp0nm4iq60"; + armv7l-linux = "1ryr6k93z24yk0qqv3yasbp4achwpn0mpi6f28d2pvnsr9v9bh3y"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.61.2"; + version = "1.62.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f014bf1fda39..8f383563bfc2 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1q260kjhyx8djl82275ii63z1mzypsz7rkz3pj1n2wjkwsnw276x"; - x86_64-darwin = "1scx155rm8j6dwn0i31b6ajsdxcn1n24p3k6dx248w0zyiwd5wm1"; - aarch64-linux = "1j788a0p767i65ying9pfg6rss8l7g76n2323dnmj12bhxs6cqd1"; - armv7l-linux = "1yfwmfxpilfv2h3pp698pg4wr6dnyzwg0r266xiwsw7z38jh54fk"; + x86_64-linux = "17vrz16q4fhc6b2rlddhz3m6y780gi9vzk28l0fcj12l9z5iprn9"; + x86_64-darwin = "1hn8sjmndmicl3gjrsb163wn5j36ij5b68mw7n6v6lqaf0a75xah"; + aarch64-linux = "0ikdy9c2ldrxyh8ij2qskv4m7j5azr1hbi53ddzgj1j6nms68lkh"; + armv7l-linux = "07a3kz4c8wzid0rd1rdzndy8c1cdg4hba7p1jmdf7zclr702i2j7"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.61.2"; + version = "1.62.0"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 129e3e547691..20874dd55e76 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: +{ lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: -stdenv.mkDerivation { - name = "autopano-sift-C-2.5.1"; +stdenv.mkDerivation rec { + pname = "autopano-sift-C"; + version = "2.5.1"; src = fetchurl { - url = "mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz"; + url = "mirror://sourceforge/hugin/autopano-sift-C-${version}.tar.gz"; sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s"; }; diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/applications/graphics/autotrace/autofig.nix index 0f53965786b9..9555dd4c02ed 100644 --- a/pkgs/applications/graphics/autotrace/autofig.nix +++ b/pkgs/applications/graphics/autotrace/autofig.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "autofig-0.1"; + pname = "autofig"; + version = "0.1"; src = fetchurl { url = "http://autotrace.sourceforge.net/tools/autofig.tar.gz"; diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 5c6ec804e62c..36da9d26410e 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -1,13 +1,16 @@ -{lib, stdenv, fetchurl, wxGTK, util-linux, zlib }: +{ lib, stdenv, fetchurl, wxGTK, util-linux, zlib }: stdenv.mkDerivation rec { - name = "comical-0.8"; + pname = "comical"; + version = "0.8"; + src = fetchurl { - url = "mirror://sourceforge/comical/${name}.tar.gz"; + url = "mirror://sourceforge/comical/comical-${version}.tar.gz"; sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e"; }; + buildInputs = [ wxGTK util-linux zlib ]; - preBuild="makeFlags=\"prefix=$out\""; + makeFlags = [ "prefix=${placeholder "out"}" ]; patches = [ ./wxgtk-2.8.patch ]; @@ -17,7 +20,7 @@ stdenv.mkDerivation rec { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = "http://comical.sourceforge.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index c31c1407da7e..2bb480a54f4d 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }: -stdenv.mkDerivation { - name ="openexr_viewers-2.2.1"; +stdenv.mkDerivation rec { + pname = "openexr_viewers"; + version = "2.2.1"; src = fetchurl { - url = "mirror://savannah/openexr/openexr_viewers-2.2.1.tar.gz"; + url = "mirror://savannah/openexr/openexr_viewers-${version}.tar.gz"; sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8"; }; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 279f49e6a495..5f13136d0c8c 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,12 +1,33 @@ -{ lib, stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng, libwebp, libdrm -, pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler, mesa, lirc }: +{ lib +, stdenv +, fetchurl +, libjpeg +, libexif +, giflib +, libtiff +, libpng +, libwebp +, libdrm +, pkg-config +, freetype +, fontconfig +, which +, imagemagick +, curl +, sane-backends +, libXpm +, epoxy +, poppler +, mesa +, lirc +}: stdenv.mkDerivation rec { - name = "fbida-2.14"; + pname = "fbida"; + version = "2.14"; src = fetchurl { - url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; + url = "http://dl.bytesex.org/releases/fbida/fbida-${version}.tar.gz"; sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; @@ -21,8 +42,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which ]; buildInputs = [ - libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp - imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc + libexif + libjpeg + libpng + giflib + freetype + fontconfig + libtiff + libwebp + imagemagick + curl + sane-backends + libdrm + libXpm + epoxy + poppler + lirc mesa ]; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index bf990c4d0ef8..d11798a9b290 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,11 +1,24 @@ -{ lib, stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng, - libXxf86vm }: +{ lib +, stdenv +, fetchurl +, libjpeg +, libGLU +, libGL +, freeglut +, zlib +, cmake +, libX11 +, libxml2 +, libpng +, libXxf86vm +}: -stdenv.mkDerivation { - name = "freepv-0.3.0"; +stdenv.mkDerivation rec { + pname = "freepv"; + version = "0.3.0"; src = fetchurl { - url = "mirror://sourceforge/freepv/freepv-0.3.0.tar.gz"; + url = "mirror://sourceforge/freepv/freepv-${version}.tar.gz"; sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 3c87e62e3d66..21ba4c662c22 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, tk }: stdenv.mkDerivation rec { - name = "gocr-0.52"; + pname = "gocr"; + version = "0.52"; src = fetchurl { - url = "https://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; + url = "https://www-e.uni-magdeburg.de/jschulen/ocr/gocr-${version}.tar.gz"; sha256 = "11l6gds1lrm8lwrrsxnm5fjlwz8q1xbh896cprrl4psz21in946z"; }; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index b661ba562f9d..edafa5612a2d 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }: -stdenv.mkDerivation { - name = "gpicview-0.2.4"; +stdenv.mkDerivation rec { + pname = "gpicview"; + version = "0.2.4"; src = fetchurl { - url = "mirror://sourceforge/lxde/gpicview-0.2.4.tar.gz"; + url = "mirror://sourceforge/lxde/gpicview-${version}.tar.gz"; sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr"; }; @@ -15,15 +16,16 @@ stdenv.mkDerivation { }) ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ intltool gtk2 ]; + meta = with lib; { description = "A simple and fast image viewer for X"; - homepage = "http://lxde.sourceforge.net/gpicview/"; + homepage = "http://lxde.sourceforge.net/gpicview/"; repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.unix; }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk2 ]; } diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 39f7a42b3b3b..427429404a09 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -1,20 +1,17 @@ -{lib, stdenv, fetchurl, pkg-config, gtk2, libpng}: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libpng }: -assert pkg-config != null && gtk2 != null && libpng != null; -# Note that we cannot just copy gtk's png attribute, since gtk might -# not be linked against png. -# !!! assert libpng == gtk2.libpng; - -stdenv.mkDerivation { - name = "gqview-2.1.5"; +stdenv.mkDerivation rec { + pname = "gqview"; + version = "2.1.5"; src = fetchurl { - url = "mirror://sourceforge/gqview/gqview-2.1.5.tar.gz"; + url = "mirror://sourceforge/gqview/gqview-${version}.tar.gz"; sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libpng]; + + buildInputs = [ gtk2 libpng ]; hardeningDisable = [ "format" ]; @@ -25,5 +22,6 @@ stdenv.mkDerivation { homepage = "http://gqview.sourceforge.net"; license = licenses.gpl2; platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index a83070e5e6b6..ec2ac709f868 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,14 +1,46 @@ -{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkg-config, fetchpatch -, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext -, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi -, libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib +{ lib +, stdenv +, cmake +, fetchurl +, gnumake +, makeWrapper +, pkg-config +, fetchpatch +, autopanosiftc +, boost +, cairo +, enblend-enfuse +, exiv2 +, fftw +, flann +, gettext +, glew +, ilmbase +, lcms2 +, lensfun +, libjpeg +, libpng +, libtiff +, libX11 +, libXi +, libXmu +, libGLU +, libGL +, openexr +, panotools +, perlPackages +, sqlite +, vigra +, wxGTK +, zlib }: stdenv.mkDerivation rec { - name = "hugin-2019.0.0"; + pname = "hugin"; + version = "2019.0.0"; src = fetchurl { - url = "mirror://sourceforge/hugin/${name}.tar.bz2"; + url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr"; }; @@ -21,9 +53,30 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg - libpng libtiff libX11 libXi libXmu libGLU libGL openexr panotools sqlite vigra - wxGTK zlib + boost + cairo + exiv2 + fftw + flann + gettext + glew + ilmbase + lcms2 + lensfun + libjpeg + libpng + libtiff + libX11 + libXi + libXmu + libGLU + libGL + openexr + panotools + sqlite + vigra + wxGTK + zlib ]; nativeBuildInputs = [ cmake makeWrapper pkg-config ]; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index 40b28dd8566a..f0693cc6121f 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, libtiff, gettext }: +{ lib, stdenv, fetchurl, libtiff, gettext }: + +stdenv.mkDerivation rec { + pname = "minidjvu"; + version = "0.8"; -stdenv.mkDerivation { - name = "minidjvu-0.8"; src = fetchurl { - url = "mirror://sourceforge/minidjvu/minidjvu-0.8.tar.gz"; + url = "mirror://sourceforge/minidjvu/minidjvu-${version}.tar.gz"; sha256 = "0jmpvy4g68k6xgplj9zsl6brg6vi81mx3nx2x9hfbr1f4zh95j79"; }; @@ -11,7 +13,7 @@ stdenv.mkDerivation { sed -i s,/usr/bin/gzip,gzip, Makefile.in ''; - buildInputs = [ libtiff gettext]; + buildInputs = [ libtiff gettext ]; preInstall = '' mkdir -p $out/lib diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 4acb50e200fd..338f716e9bbd 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -1,8 +1,22 @@ -{ lib, stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, - lcms2, lensfun, pkg-config, libjpeg, exiv2, liblqr1 }: +{ lib +, stdenv +, fetchhg +, fetchpatch +, cmake +, qt4 +, fftw +, graphicsmagick_q16 +, lcms2 +, lensfun +, pkg-config +, libjpeg +, exiv2 +, liblqr1 +}: stdenv.mkDerivation { - name = "photivo-2014-01-25"; + pname = "photivo"; + version = "2014-01-25"; src = fetchhg { url = "http://code.google.com/p/photivo/"; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 2635b2d3d886..66804fc3110b 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -1,14 +1,18 @@ -{ lib, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, - gettext }: +{ lib +, fetchFromGitHub +, buildDotnetPackage +, dotnetPackages +, gtksharp +, gettext +}: let mono-addins = dotnetPackages.MonoAddins; in buildDotnetPackage rec { - name = "pinta-1.6"; - baseName = "Pinta"; version = "1.6"; + outputFiles = [ "bin/*" ]; buildInputs = [ gtksharp mono-addins gettext ]; xBuildFiles = [ "Pinta.sln" ]; @@ -37,23 +41,25 @@ buildDotnetPackage rec { "Mono\\.Addins\\.Setup" ]; - stripVersion = name: file: let + stripVersion = name: file: + let match = ''<Reference Include="${name}([ ,][^"]*)?"''; replace = ''<Reference Include="${name}"''; - in "sed -i -re 's/${match}/${replace}/g' ${file}\n"; + in + "sed -i -re 's/${match}/${replace}/g' ${file}\n"; # Map all possible pairs of two lists map2 = f: listA: listB: concatMap (a: map (f a) listB) listA; concatMap2Strings = f: listA: listB: concatStrings (map2 f listA listB); in - concatMap2Strings stripVersion versionedNames csprojFiles - + '' - # For some reason there is no Microsoft.Common.tasks file - # in ''${mono}/lib/mono/3.5 . - substituteInPlace Pinta.Install.proj \ - --replace 'ToolsVersion="3.5"' 'ToolsVersion="4.0"' \ - --replace "/usr/local" "$out" - ''; + concatMap2Strings stripVersion versionedNames csprojFiles + + '' + # For some reason there is no Microsoft.Common.tasks file + # in ''${mono}/lib/mono/3.5 . + substituteInPlace Pinta.Install.proj \ + --replace 'ToolsVersion="3.5"' 'ToolsVersion="4.0"' \ + --replace "/usr/local" "$out" + ''; makeWrapperArgs = [ "--prefix MONO_GAC_PREFIX : ${gtksharp}" diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index b3e555358bed..6a47760082e0 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }: stdenv.mkDerivation rec { - name = "qscreenshot-1.0"; + pname = "qscreenshot"; + version = "1.0"; src = fetchurl { - url = "mirror://sourceforge/qscreenshot/${name}-src.tar.gz"; + url = "mirror://sourceforge/qscreenshot/qscreenshot-${version}-src.tar.gz"; sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx"; }; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix index 9ca0a7020609..05b018215bb1 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: +{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49" }: stdenv.mkDerivation rec { - name = "brother-udev-rule-type1-1.0.0-1"; + pname = "brother-udev-rule-type1"; + version = "1.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006654/${name}.all.deb"; + url = "http://download.brother.com/welcome/dlf006654/brother-udev-rule-type1-${version}.all.deb"; sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi"; }; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index e394acf2b061..007483fb5e26 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkg-config, libpng -, libusb-compat-0_1 ? null -, gimpSupport ? false, gimp ? null +{ lib +, stdenv +, fetchurl +, sane-backends +, sane-frontends +, libX11 +, gtk2 +, pkg-config +, libpng +, libusb-compat-0_1 +, gimpSupport ? false +, gimp }: -assert gimpSupport -> gimp != null; - stdenv.mkDerivation rec { - name = "xsane-0.999"; + pname = "xsane"; + version = "0.999"; src = fetchurl { - url = "http://www.xsane.org/download/${name}.tar.gz"; + url = "http://www.xsane.org/download/xsane-${version}.tar.gz"; sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp"; }; @@ -19,14 +27,15 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] - ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) + + buildInputs = [ libpng libusb-compat-0_1 sane-backends sane-frontends libX11 gtk2 ] ++ lib.optional gimpSupport gimp; - meta = { + meta = with lib; { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; - license = lib.licenses.gpl2Plus; - platforms = with lib.platforms; linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 898cc3336a55..a0e52ab5d303 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: +{ lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: -stdenv.mkDerivation { - name = "scantailor-0.9.12.1"; +stdenv.mkDerivation rec { + pname = "scantailor"; + version = "0.9.12.1"; src = fetchurl { - url = "https://github.com/scantailor/scantailor/archive/RELEASE_0_9_12_1.tar.gz"; + url = "https://github.com/scantailor/scantailor/archive/RELEASE_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg"; }; diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index ef8d4b5096e6..53f658590739 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,9 +1,11 @@ { fetchurl, lib, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { - name = "wings-2.2.4"; + pname = "wings"; + version = "2.2.4"; + src = fetchurl { - url = "mirror://sourceforge/wings/${name}.tar.bz2"; + url = "mirror://sourceforge/wings/wings-${version}.tar.bz2"; sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3"; }; @@ -24,13 +26,13 @@ stdenv.mkDerivation rec { # I did not test the *cl* part. I added the -pa just by imitation. installPhase = '' - mkdir -p $out/bin $out/lib/${name}/ebin - cp ebin/* $out/lib/${name}/ebin - cp -R textures shaders plugins $out/lib/$name + mkdir -p $out/bin $out/lib/wings-${version}/ebin + cp ebin/* $out/lib/wings-${version}/ebin + cp -R textures shaders plugins $out/lib/wings-${version} cat << EOF > $out/bin/wings #!${runtimeShell} ${erlang}/bin/erl \ - -pa $out/lib/${name}/ebin -run wings_start start_halt "$@" + -pa $out/lib/wings-${version}/ebin -run wings_start start_halt "$@" EOF chmod +x $out/bin/wings ''; @@ -39,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "http://www.wings3d.com/"; description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; license = lib.licenses.tcltk; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 5742a9b85c4c..f4eb1b85965d 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.2/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 43fc81b3c247..73032655fc43 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1811 +4,1811 @@ { akonadi = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akonadi-21.08.2.tar.xz"; - sha256 = "0jwhjdqha82hbyg2wmzjl5qi2rgmyd2sghdw85s77y63bxm9f0s2"; - name = "akonadi-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-21.08.3.tar.xz"; + sha256 = "1yqlgzni7kj0n7k2wvi65wfz4il75j7qvmrdjw3a0ld6115j2vqs"; + name = "akonadi-21.08.3.tar.xz"; }; }; akonadi-calendar = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akonadi-calendar-21.08.2.tar.xz"; - sha256 = "0k4cbcr6cw9rcrzidlbjbpshmsfh0p2m8bd9inkgzxi08drwizsa"; - name = "akonadi-calendar-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-calendar-21.08.3.tar.xz"; + sha256 = "17pl7viz89zn43iyp6hk9q2dix1mzfxmxf08jk5wcciphabyj2sc"; + name = "akonadi-calendar-21.08.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akonadi-calendar-tools-21.08.2.tar.xz"; - sha256 = "1hxah75grydlaz6hzd3ng91dsap860111alph7vnrqcakhcfm0yc"; - name = "akonadi-calendar-tools-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-calendar-tools-21.08.3.tar.xz"; + sha256 = "0wc3yfb8riijmmwqbny7vpfav24w8id4s2ysbcljrvypv420ii2g"; + name = "akonadi-calendar-tools-21.08.3.tar.xz"; }; }; akonadi-contacts = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akonadi-contacts-21.08.2.tar.xz"; - sha256 = "1ap2c16c0z4m7f3zsp5w5wqwcdr3fn1n2kvb6d647c3knszgibvg"; - name = "akonadi-contacts-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-contacts-21.08.3.tar.xz"; + sha256 = "1i5mwjf8vp40mmdfkafhhbcmvdd2sihd6aa4z1wnhnbg59cjvp8i"; + name = "akonadi-contacts-21.08.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akonadi-import-wizard-21.08.2.tar.xz"; - sha256 = "0hgbjdkl4nva9dy9ljn8f5g4v9bw1rl84x2m0x94msf6bih20nr3"; - name = "akonadi-import-wizard-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-import-wizard-21.08.3.tar.xz"; + sha256 = "1splq2fgifk4mh00j4dd1lmgyc4bvz8sbsw0fznmafg76k1fvama"; + name = "akonadi-import-wizard-21.08.3.tar.xz"; }; }; akonadi-mime = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akonadi-mime-21.08.2.tar.xz"; - sha256 = "0fkv26zl92xijkibpxvbqcmip24qrq58lan3w9s642gqh972a6x3"; - name = "akonadi-mime-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-mime-21.08.3.tar.xz"; + sha256 = "19dbgl9940wwsiyhysh1lm5ks9xb6a5m53p9qmdr5siid9karq64"; + name = "akonadi-mime-21.08.3.tar.xz"; }; }; akonadi-notes = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akonadi-notes-21.08.2.tar.xz"; - sha256 = "0r19g9a0asqlw1qsh9vidbwpgbslfwqc8g577hdkhahfvg7hplmq"; - name = "akonadi-notes-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-notes-21.08.3.tar.xz"; + sha256 = "0g1kdhj4qjl29x70dl4fl30f4r67s6ldpmqrf0xnj7zwz008r0fn"; + name = "akonadi-notes-21.08.3.tar.xz"; }; }; akonadi-search = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akonadi-search-21.08.2.tar.xz"; - sha256 = "1a1pf9q93z0cv7v2fxksiw3vn5dylg0lgniv98z9p6zv0wijxhn5"; - name = "akonadi-search-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadi-search-21.08.3.tar.xz"; + sha256 = "1fvfd1410zy9dbcjl21463wj91s5vly00l53ixaizylnjbj67lm0"; + name = "akonadi-search-21.08.3.tar.xz"; }; }; akonadiconsole = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akonadiconsole-21.08.2.tar.xz"; - sha256 = "07vr4nwjzz6y1babwnhhidpv8pldx7vk2mq98midqji87xxh7r10"; - name = "akonadiconsole-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akonadiconsole-21.08.3.tar.xz"; + sha256 = "1id1l6ifc1b8qsx16badhww33idk7c8qnn4lh3bg6mg1whmvy4k2"; + name = "akonadiconsole-21.08.3.tar.xz"; }; }; akregator = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/akregator-21.08.2.tar.xz"; - sha256 = "15qkkfrxiwcd1gz5skqj8sb8fkr1mkc51wc2chqr4jv6aa0lbf5r"; - name = "akregator-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/akregator-21.08.3.tar.xz"; + sha256 = "1jb2vd43pn7i1b7ylhm74q0jkk3hwbjxh6nc2hqpl9c0ic20arf2"; + name = "akregator-21.08.3.tar.xz"; }; }; analitza = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/analitza-21.08.2.tar.xz"; - sha256 = "1y4amcl3sjpxhlqzyjmnpycgv3jfdn4458zch9qzakvjxamq6m9c"; - name = "analitza-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/analitza-21.08.3.tar.xz"; + sha256 = "04g1l9q80j5rigz0667js35zjm3as0dpfkjhcm997bna1yb0d92z"; + name = "analitza-21.08.3.tar.xz"; }; }; ark = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ark-21.08.2.tar.xz"; - sha256 = "0hxzd0qr07wyz5v76nj4qj4db4lav53xapknmakif1fkghj1r51g"; - name = "ark-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ark-21.08.3.tar.xz"; + sha256 = "1wrxv8csj1irrwcddkjgbcivpxi2v3nj06lvayzr32b29i85h637"; + name = "ark-21.08.3.tar.xz"; }; }; artikulate = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/artikulate-21.08.2.tar.xz"; - sha256 = "0b4fvxwrynnwr8mm87h60mhk293invaq8vw4y9dk6hv36l1z5fbf"; - name = "artikulate-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/artikulate-21.08.3.tar.xz"; + sha256 = "14g5wcw1bxxmbc9vvy07zbk2ma2cj1zbb5fdcwdf4ybaal9r43jq"; + name = "artikulate-21.08.3.tar.xz"; }; }; audiocd-kio = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/audiocd-kio-21.08.2.tar.xz"; - sha256 = "1l0wym8gisgwv2mg2jsvpj8hb2yvmzd7dcximg540ljphv3hp1p2"; - name = "audiocd-kio-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/audiocd-kio-21.08.3.tar.xz"; + sha256 = "0fp29igj87pff8jya230j67vcz9pv7g27g4dv2pl3r6gm2kv8c9i"; + name = "audiocd-kio-21.08.3.tar.xz"; }; }; baloo-widgets = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/baloo-widgets-21.08.2.tar.xz"; - sha256 = "1fk8qvqh1xx6139wvyfk607vkb7w3d79gc3v3c8s96pkp5b228ax"; - name = "baloo-widgets-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/baloo-widgets-21.08.3.tar.xz"; + sha256 = "1pjlw22ivqhpd6bf50d8s9jaq6h2k0l2szwnh841qq7bwwkp9kcb"; + name = "baloo-widgets-21.08.3.tar.xz"; }; }; blinken = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/blinken-21.08.2.tar.xz"; - sha256 = "1ciq6fk9430p8sihc1q40djjw4994w1lghps9kr3415ryv08bfci"; - name = "blinken-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/blinken-21.08.3.tar.xz"; + sha256 = "03s3pv61jhkx3lm5rik25fglhda9l4w43blpwh78rbdk3c3s3ijg"; + name = "blinken-21.08.3.tar.xz"; }; }; bomber = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/bomber-21.08.2.tar.xz"; - sha256 = "0wk6j89m8lbp83yfz2xwy78x99cvph9p36jzscpp4i894j6fad61"; - name = "bomber-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/bomber-21.08.3.tar.xz"; + sha256 = "0h5iwpmpw8xnqh6xcm4zqqcp1ia5wir0ghwsbcgrz9ka59dfdh4z"; + name = "bomber-21.08.3.tar.xz"; }; }; bovo = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/bovo-21.08.2.tar.xz"; - sha256 = "1k5ncxxx64yj2b71jlpz7ll935mrilhrhphwz1h8n8pdr6dn91mf"; - name = "bovo-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/bovo-21.08.3.tar.xz"; + sha256 = "0p5pi6rnnmikhg72gagld67r022bq3nsrhls0gglx14zfj6pgln3"; + name = "bovo-21.08.3.tar.xz"; }; }; calendarsupport = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/calendarsupport-21.08.2.tar.xz"; - sha256 = "01plq4qzp94lxcc2gp04afnlvmni8993c8mf6kl256158z0y24ik"; - name = "calendarsupport-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/calendarsupport-21.08.3.tar.xz"; + sha256 = "1kial8x8sw0039n2s3nl9i0wadf8xda1bv2g9kws0kp29k58lyfy"; + name = "calendarsupport-21.08.3.tar.xz"; }; }; cantor = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/cantor-21.08.2.tar.xz"; - sha256 = "07xxwm3aa00v6cax7nyv326glapll01qh4libszhhn8pwpiyl00w"; - name = "cantor-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/cantor-21.08.3.tar.xz"; + sha256 = "1l3z0aikrfjdpcfq6apmwla9k7dqymvysi275kpx0dqi5sfgi9lb"; + name = "cantor-21.08.3.tar.xz"; }; }; cervisia = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/cervisia-21.08.2.tar.xz"; - sha256 = "0x4hisqfkizjxzl34s0yc6dn5r5fyh7f5yaadq5g47fdcah5cmmf"; - name = "cervisia-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/cervisia-21.08.3.tar.xz"; + sha256 = "0a7g3g849vf0c0222944iwqhymnxcn9qj0v85m2b0bfxgdf0fgk7"; + name = "cervisia-21.08.3.tar.xz"; }; }; dolphin = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/dolphin-21.08.2.tar.xz"; - sha256 = "18aiqpf8qsig64gpcn6b1f0fs5mvzbdg8ncbhcjq0gy8gh3xamj2"; - name = "dolphin-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/dolphin-21.08.3.tar.xz"; + sha256 = "19yrgfliqabmymrh3sx2i5129rcc14nxb86f21wd616b3pcby5rv"; + name = "dolphin-21.08.3.tar.xz"; }; }; dolphin-plugins = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/dolphin-plugins-21.08.2.tar.xz"; - sha256 = "0278pmakd4xqc8ckyxkzvf1xj1jp7jdq3a86i0n0k691zfljnan7"; - name = "dolphin-plugins-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/dolphin-plugins-21.08.3.tar.xz"; + sha256 = "098i2zydzi95i860pk6p0g0wx1bryyxanawhcis5d5h3xra66s0p"; + name = "dolphin-plugins-21.08.3.tar.xz"; }; }; dragon = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/dragon-21.08.2.tar.xz"; - sha256 = "0ddijz96z58582w298jp11vns9fx3rmzqd3x1qplxvp4sl0hp9l7"; - name = "dragon-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/dragon-21.08.3.tar.xz"; + sha256 = "0zfh5kmw2mvnwpcbh9i6xzzdigkglr6y0y7acw2dw6bi2cqx5cc7"; + name = "dragon-21.08.3.tar.xz"; }; }; elisa = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/elisa-21.08.2.tar.xz"; - sha256 = "14wi7dva0bfagxw49bs80qszqcv6k16s0569mh1c4m97gzlzgv35"; - name = "elisa-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/elisa-21.08.3.tar.xz"; + sha256 = "0w3sk52ghkka305hagld5ia6z6czavbqgc0abqdz442bgnk1f1vb"; + name = "elisa-21.08.3.tar.xz"; }; }; eventviews = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/eventviews-21.08.2.tar.xz"; - sha256 = "0d1ahknazkjav9641i1wggj9f67cr3s3y176v1j6ljhr4dl3m3xj"; - name = "eventviews-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/eventviews-21.08.3.tar.xz"; + sha256 = "08bcw79iag71yiaf7ck27b2ja4pg18ah04rxa1c6g5fr9x6kkk46"; + name = "eventviews-21.08.3.tar.xz"; }; }; ffmpegthumbs = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ffmpegthumbs-21.08.2.tar.xz"; - sha256 = "1gsxcm86aq3r485ivk532a949z5l4129kildbd752c2qy0hdy5z1"; - name = "ffmpegthumbs-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ffmpegthumbs-21.08.3.tar.xz"; + sha256 = "10l9592f2l63rfak3f0knvzapsaa8nyx3dl82n724359qj43m530"; + name = "ffmpegthumbs-21.08.3.tar.xz"; }; }; filelight = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/filelight-21.08.2.tar.xz"; - sha256 = "0phisyrnxc6i19253fdayx8cn51y6vxd66gfdy08hi4r31ih57jd"; - name = "filelight-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/filelight-21.08.3.tar.xz"; + sha256 = "0j5106x93ljkcxk90cs1yvd9dw3pnr007cd4plsw5z7kgmch3zww"; + name = "filelight-21.08.3.tar.xz"; }; }; granatier = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/granatier-21.08.2.tar.xz"; - sha256 = "1bly3jlmn9d2im05srr3v28mw8wmr3hnw180wi8lpfzianh589v7"; - name = "granatier-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/granatier-21.08.3.tar.xz"; + sha256 = "1igia7fxll361np76763nw915d90f5hklgqii9iyld8si99amy4y"; + name = "granatier-21.08.3.tar.xz"; }; }; grantlee-editor = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/grantlee-editor-21.08.2.tar.xz"; - sha256 = "1sm35c4r5sawcrclv1sc6ij4gsll87zwmissahgf30km32vz0rbv"; - name = "grantlee-editor-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/grantlee-editor-21.08.3.tar.xz"; + sha256 = "04yry04cdysh4a1y6nznxmfw2pww956xan0dnf77yjzssri9p2fq"; + name = "grantlee-editor-21.08.3.tar.xz"; }; }; grantleetheme = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/grantleetheme-21.08.2.tar.xz"; - sha256 = "0xm19a21y8b4cqiqg6mhxip1xxk7hrz88z1sijhhgc8d14i7mkdk"; - name = "grantleetheme-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/grantleetheme-21.08.3.tar.xz"; + sha256 = "11c72jp9ywpmsc3d92cj2c9xvwmqbilsfddmlxlwnpnp2rf8q933"; + name = "grantleetheme-21.08.3.tar.xz"; }; }; gwenview = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/gwenview-21.08.2.tar.xz"; - sha256 = "0yignay0g4vz3zj9xpziinsqd8pwywd1cq43f0n5hmzxrrv0abcf"; - name = "gwenview-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/gwenview-21.08.3.tar.xz"; + sha256 = "06hg20sygi6xfbifgi1d6s5zba5qqpm949xa7gyxi1vsq0kbvrq4"; + name = "gwenview-21.08.3.tar.xz"; }; }; incidenceeditor = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/incidenceeditor-21.08.2.tar.xz"; - sha256 = "0xrz3kzf4mc37zgfbjgc23l7wxry9m6d5igvyf1qm33yxwr4w78q"; - name = "incidenceeditor-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/incidenceeditor-21.08.3.tar.xz"; + sha256 = "0p45x5qkzbfklxk22kzp9zlvl8ggdjgniq889q8hzb1s89ia1cck"; + name = "incidenceeditor-21.08.3.tar.xz"; }; }; itinerary = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/itinerary-21.08.2.tar.xz"; - sha256 = "059n7xy3gjbqxl9cn7nxng9y4662ggi2lh2zj3yv0knwy78ccwjk"; - name = "itinerary-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/itinerary-21.08.3.tar.xz"; + sha256 = "0w7kb4wvy1sfhlkikvq1ajckizf7k2bzy2wcjdz5is69rrd5cab5"; + name = "itinerary-21.08.3.tar.xz"; }; }; juk = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/juk-21.08.2.tar.xz"; - sha256 = "0c74s9ylx1xh1y581ygm6zyafwv3l5d7297wfg50f64nyr5npxm2"; - name = "juk-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/juk-21.08.3.tar.xz"; + sha256 = "19g1dpvrssip8vysds3j4wa599ivapznz10p0p1254gkjyxdxdm3"; + name = "juk-21.08.3.tar.xz"; }; }; k3b = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/k3b-21.08.2.tar.xz"; - sha256 = "1g9xgzklsyard3ghcmr9irixcilga6kcj46jav884y8w7zxb4mrd"; - name = "k3b-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/k3b-21.08.3.tar.xz"; + sha256 = "1k5xn33sggx3a7lns8y64sa3schqvg476q81rig9mylh68x8rr5y"; + name = "k3b-21.08.3.tar.xz"; }; }; kaccounts-integration = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kaccounts-integration-21.08.2.tar.xz"; - sha256 = "1ckwm2kwb83kl89491wrmpd748zhkwd1vyaffwiyaqkp4rkrjph0"; - name = "kaccounts-integration-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kaccounts-integration-21.08.3.tar.xz"; + sha256 = "0hyaygrsdp6s96s4wa9z5l1w5w5hxwbw432zs6a2fkgq5dpa3wn4"; + name = "kaccounts-integration-21.08.3.tar.xz"; }; }; kaccounts-providers = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kaccounts-providers-21.08.2.tar.xz"; - sha256 = "15q1ibhxwxcvsjn6b2whyynhipq5b571d98bz20dn25fff88xllg"; - name = "kaccounts-providers-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kaccounts-providers-21.08.3.tar.xz"; + sha256 = "0chajl87w3gp1a8l7h6bxf93js6jxdkx90ir82glgh45p5qhdhcr"; + name = "kaccounts-providers-21.08.3.tar.xz"; }; }; kaddressbook = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kaddressbook-21.08.2.tar.xz"; - sha256 = "1pvd31zpam13jv0mhxzaagdlvnav60znd68l24y1dw5i98wk7n72"; - name = "kaddressbook-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kaddressbook-21.08.3.tar.xz"; + sha256 = "1c16pcbjd5w04xbkjalvf697nqi751f4g8ldaing3k2rmdvhsqwg"; + name = "kaddressbook-21.08.3.tar.xz"; }; }; kajongg = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kajongg-21.08.2.tar.xz"; - sha256 = "0c8kxh6kbk7ml16df4gmr142rjllc7v0v7m3kw4ksngk93f7vz2s"; - name = "kajongg-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kajongg-21.08.3.tar.xz"; + sha256 = "15i5vdcwm7a5amrxxbi0f4c3ls7ly1ccg88hff2wc960wwc6nvqb"; + name = "kajongg-21.08.3.tar.xz"; }; }; kalarm = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kalarm-21.08.2.tar.xz"; - sha256 = "06cww023m4ng4g3v344lci0rvapk4zyzf1vi5jlajfs5d8bfkgf5"; - name = "kalarm-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kalarm-21.08.3.tar.xz"; + sha256 = "0zcmaf4x9jvpyri1kirnm2rij3886z9k1vx6wxxxmx6sbllpb669"; + name = "kalarm-21.08.3.tar.xz"; }; }; kalarmcal = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kalarmcal-21.08.2.tar.xz"; - sha256 = "0xdcazbbkm2z0r2g1avwh9bvdkvv0fy6qhhddlmfzj4cwh4c9vih"; - name = "kalarmcal-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kalarmcal-21.08.3.tar.xz"; + sha256 = "03zmw8pxhfmrm7xl5h2k42xyqwn4cllhrp43sv7pjbym9ya41wyk"; + name = "kalarmcal-21.08.3.tar.xz"; }; }; kalgebra = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kalgebra-21.08.2.tar.xz"; - sha256 = "07fw8ab8gy9mam5dij6i9nl1zv4fp13vari6nzdk337klhsdbsjr"; - name = "kalgebra-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kalgebra-21.08.3.tar.xz"; + sha256 = "0w2n3nyds9069c4cj1ap2b14w8nw5dc3yb62j5y6yj9qz9ip7cdk"; + name = "kalgebra-21.08.3.tar.xz"; }; }; kalzium = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kalzium-21.08.2.tar.xz"; - sha256 = "0hjkpgclm67nyninywdmcpi7vn3jmf7ikbd4afg4bhj5mcz2a4vg"; - name = "kalzium-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kalzium-21.08.3.tar.xz"; + sha256 = "0x7dn0f2bwzplzxal2wvnc3qh2qs522626ksp6ajgf16jwf7d4kl"; + name = "kalzium-21.08.3.tar.xz"; }; }; kamera = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kamera-21.08.2.tar.xz"; - sha256 = "1arb93sa730ha8bgbcvp6bng8s4fp9yvcv0qvkhk2nl4db4m5rng"; - name = "kamera-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kamera-21.08.3.tar.xz"; + sha256 = "1yv87rmb8k6yh5150915fsnh8rdj1d4k8zpc8k54hxa9gjw5wqm7"; + name = "kamera-21.08.3.tar.xz"; }; }; kamoso = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kamoso-21.08.2.tar.xz"; - sha256 = "0rkd9mk7rgha40j19rwpyqmn8lchqahakn4p3sbab7h3p3cq2b7p"; - name = "kamoso-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kamoso-21.08.3.tar.xz"; + sha256 = "1k2kis36a6dlsnh85qc01yd6qnz8kwrv4hvzpkpqvvp3m4ik17wx"; + name = "kamoso-21.08.3.tar.xz"; }; }; kanagram = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kanagram-21.08.2.tar.xz"; - sha256 = "12iq58jc36rp664c92s7442gnxq6k1fi4017a4hwqq67b9ismgzl"; - name = "kanagram-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kanagram-21.08.3.tar.xz"; + sha256 = "1rxirjrw6dj23awv6gbypv0jlwfdh4baz86l32rx8pnmd9icg7s3"; + name = "kanagram-21.08.3.tar.xz"; }; }; kapman = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kapman-21.08.2.tar.xz"; - sha256 = "04yv6j2bjlgclp916k2gibhhv5d64sxk181cqw7sh5j4aq555a3r"; - name = "kapman-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kapman-21.08.3.tar.xz"; + sha256 = "0v8ay2s868l7dxasq0rhy065rp9sfb4fzldcqs46lxy7jmk3ws93"; + name = "kapman-21.08.3.tar.xz"; }; }; kapptemplate = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kapptemplate-21.08.2.tar.xz"; - sha256 = "0vgfz4pz9yjns4dpks8mrp8zzipka4chw257l1db25khibksgh48"; - name = "kapptemplate-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kapptemplate-21.08.3.tar.xz"; + sha256 = "02dp4qwrv3gylri936c82imh4lv1a3vfzlphmwadyhiy7j9ic5fa"; + name = "kapptemplate-21.08.3.tar.xz"; }; }; kate = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kate-21.08.2.tar.xz"; - sha256 = "1cm6iq3cqmp0kvsxhv0vlqy1dyzmis9fb0a6298q0lyjkmsri26n"; - name = "kate-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kate-21.08.3.tar.xz"; + sha256 = "1gdz0wxkh34a2zi9vks9qw70g7dvkbvrbp6y68rjg7720sdb0gp2"; + name = "kate-21.08.3.tar.xz"; }; }; katomic = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/katomic-21.08.2.tar.xz"; - sha256 = "0lng3fpc1b255n8hayla3lpb77rmgvx8bkzi1s152kq7bf2mnxj7"; - name = "katomic-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/katomic-21.08.3.tar.xz"; + sha256 = "1sgrpqbv4zz22qijm00lzv1cv4rwjh7bbf4gz9xmnfmhyw0n88i1"; + name = "katomic-21.08.3.tar.xz"; }; }; kbackup = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kbackup-21.08.2.tar.xz"; - sha256 = "06xvw94m6zr7zj0i54if9vanbflnj88b0c16751br6ibp2m9zvlp"; - name = "kbackup-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kbackup-21.08.3.tar.xz"; + sha256 = "1cjb2invbc60i2lahn01kd28q3wb6s35grwglgmx2cgqqkmgl42s"; + name = "kbackup-21.08.3.tar.xz"; }; }; kblackbox = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kblackbox-21.08.2.tar.xz"; - sha256 = "093k42259lwbhmq6pm5hv1iqm4maqd63qic80p748wmh88bsh8yg"; - name = "kblackbox-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kblackbox-21.08.3.tar.xz"; + sha256 = "1i4c5v5w42akf4b44sqrl9x4rhqgyjljr7k5i440ahch9qkf93pj"; + name = "kblackbox-21.08.3.tar.xz"; }; }; kblocks = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kblocks-21.08.2.tar.xz"; - sha256 = "0p4k3wr8756qfxr09daqp7z3461ljnd3yv34h893j5dini1lfy3d"; - name = "kblocks-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kblocks-21.08.3.tar.xz"; + sha256 = "0326fxv1nvh37h8xhvv5x4fy3l4gbrzmwsgcwslma1hakys9dhrs"; + name = "kblocks-21.08.3.tar.xz"; }; }; kbounce = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kbounce-21.08.2.tar.xz"; - sha256 = "06zd4p8glpzp7q4a8qcmnj1lszgfdircfkgc8ay5abmfx2rr9hcw"; - name = "kbounce-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kbounce-21.08.3.tar.xz"; + sha256 = "00d9m7c564qrifpaldvjk6ahclrjk1aawhypjj9sls2sisx2mip4"; + name = "kbounce-21.08.3.tar.xz"; }; }; kbreakout = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kbreakout-21.08.2.tar.xz"; - sha256 = "1gj37ryhak1czv95ksigssmbmicdpirzi1l5zsv1w7jdh4nqcz54"; - name = "kbreakout-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kbreakout-21.08.3.tar.xz"; + sha256 = "1h3s4cr4bxi24j55anks946h7iba2wda5kbglsyfqw1ifrsq13vz"; + name = "kbreakout-21.08.3.tar.xz"; }; }; kbruch = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kbruch-21.08.2.tar.xz"; - sha256 = "1syy188f3sg3r22f7dklzman0h8fz6r1n4r5z986240q0r316rbn"; - name = "kbruch-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kbruch-21.08.3.tar.xz"; + sha256 = "15bfqxz4j5f5ix55fsk780p7ddrzqzmk55gmbjy796sgh8b71wcr"; + name = "kbruch-21.08.3.tar.xz"; }; }; kcachegrind = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kcachegrind-21.08.2.tar.xz"; - sha256 = "126qa061bwz2d4s721vbv2099mz07vw3i1yw7vm0b3ih43h95149"; - name = "kcachegrind-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcachegrind-21.08.3.tar.xz"; + sha256 = "188m15y7sj17jyr9963gblgkknhgf32331kvzz4cwqzk14b9krr2"; + name = "kcachegrind-21.08.3.tar.xz"; }; }; kcalc = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kcalc-21.08.2.tar.xz"; - sha256 = "01923w7zav2iia5pffs33vhblzh26lr1zpf2274cgplsbb5lcc9p"; - name = "kcalc-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcalc-21.08.3.tar.xz"; + sha256 = "1d7716law49cwmis4w9ij1xmi4g2wrv4mnc78xcms8kmgba5gs7v"; + name = "kcalc-21.08.3.tar.xz"; }; }; kcalutils = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kcalutils-21.08.2.tar.xz"; - sha256 = "0kvfpsz6zxdbgl4qvk3q55fjgjql1chx844cys26anhza0ld9afz"; - name = "kcalutils-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcalutils-21.08.3.tar.xz"; + sha256 = "0l209pyi866mf1pr4rkq7g3pgjvyss5sqhpy9vb2b2w66w3f66ri"; + name = "kcalutils-21.08.3.tar.xz"; }; }; kcharselect = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kcharselect-21.08.2.tar.xz"; - sha256 = "08x060xmnyzqyadimwdqz767q29rmd48m8aqr3dsrzvb969ijnha"; - name = "kcharselect-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcharselect-21.08.3.tar.xz"; + sha256 = "0fk06whwi4h43sw3adcs4b2s9ycwjamzrwr23m33c31mlpcb3i8z"; + name = "kcharselect-21.08.3.tar.xz"; }; }; kcolorchooser = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kcolorchooser-21.08.2.tar.xz"; - sha256 = "00vn2001crd0in3zd016xkhm38qgl7m03k1n90fiashjlnfd0928"; - name = "kcolorchooser-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcolorchooser-21.08.3.tar.xz"; + sha256 = "07fvl4rfzhgz4kh9dhqkq6kf4913jv9cw9abfdb7k3pbr0r26qgz"; + name = "kcolorchooser-21.08.3.tar.xz"; }; }; kcron = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kcron-21.08.2.tar.xz"; - sha256 = "1ryfa084cfp7v11lbr58j4rx3n4m70ynpzbyavin31x1zzbw7bh8"; - name = "kcron-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kcron-21.08.3.tar.xz"; + sha256 = "1374agj9qc5ifm0yckq8m94gq7sjd42n4wwb59p756736asan8k5"; + name = "kcron-21.08.3.tar.xz"; }; }; kde-dev-scripts = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kde-dev-scripts-21.08.2.tar.xz"; - sha256 = "093i4k4qqmjlffjyz7wqfv4lpsq6x9rc4svldbq5iszk8a7ldal5"; - name = "kde-dev-scripts-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kde-dev-scripts-21.08.3.tar.xz"; + sha256 = "152n6iir4xzx1a5d5bi4lb42rgl222pi6jz0hfkchk7swfgpvdfs"; + name = "kde-dev-scripts-21.08.3.tar.xz"; }; }; kde-dev-utils = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kde-dev-utils-21.08.2.tar.xz"; - sha256 = "1gidcxnixymzvdqjyzwdc9bfphvrbq7xx1miabn221gjc42bkggs"; - name = "kde-dev-utils-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kde-dev-utils-21.08.3.tar.xz"; + sha256 = "1xs4fybbqlxji2py06hxabsisfb3bkvbfb3vy9lyj2k5vnnmpkf8"; + name = "kde-dev-utils-21.08.3.tar.xz"; }; }; kdebugsettings = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdebugsettings-21.08.2.tar.xz"; - sha256 = "1wpj1hldrpbi538fd69i36zr3q3dg04i5bcmy41i1brzbddxl6sv"; - name = "kdebugsettings-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdebugsettings-21.08.3.tar.xz"; + sha256 = "1d47igv0xg1hlxzyfg10h5g7s79yq44d3ixpr82risyrslbwvll4"; + name = "kdebugsettings-21.08.3.tar.xz"; }; }; kdeconnect-kde = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdeconnect-kde-21.08.2.tar.xz"; - sha256 = "09dv3l5g0wjilpga11mkxbyy3d8xk46pb2i35yvjbgi9yzp0xzfv"; - name = "kdeconnect-kde-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdeconnect-kde-21.08.3.tar.xz"; + sha256 = "1gfsbg6rwqv3cpfxcayn3q9i99mnhjz666p9x9ih205idlrn6iij"; + name = "kdeconnect-kde-21.08.3.tar.xz"; }; }; kdeedu-data = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdeedu-data-21.08.2.tar.xz"; - sha256 = "0zm7gl4nz1b6m9m8hw5zklf5nbfh6qms7qbrrdxzcn6kj50zx6m2"; - name = "kdeedu-data-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdeedu-data-21.08.3.tar.xz"; + sha256 = "15qqcl6gws6ddyv373dfql3wj2fryvr5b6d66q4l1xwc1mg6wnqs"; + name = "kdeedu-data-21.08.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdegraphics-mobipocket-21.08.2.tar.xz"; - sha256 = "15wd7sfwfz3n1a0m0l2ymyhsdxjajw3kkl4piv9956amcg1bxlcp"; - name = "kdegraphics-mobipocket-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdegraphics-mobipocket-21.08.3.tar.xz"; + sha256 = "1bli0ld2mymgppjsjjvkyk7ldpz787p30d7lf6lpafrf64di2bhm"; + name = "kdegraphics-mobipocket-21.08.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdegraphics-thumbnailers-21.08.2.tar.xz"; - sha256 = "1261kn4fa2lrissqc9cb5s7rd94pzfzq79kjw3gagbhrjfs91872"; - name = "kdegraphics-thumbnailers-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdegraphics-thumbnailers-21.08.3.tar.xz"; + sha256 = "1hbjmkjymb3pi1lz43bl5clgdyy6kr928q7fniwiwmak3k1xrng5"; + name = "kdegraphics-thumbnailers-21.08.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdenetwork-filesharing-21.08.2.tar.xz"; - sha256 = "0xyph51w7ba0jrp9dds0v97k7av2h5a3098h7wpwd0sclj2hbnwc"; - name = "kdenetwork-filesharing-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdenetwork-filesharing-21.08.3.tar.xz"; + sha256 = "19c3my0i9xb3salf7sk870nhv797wkk83dyrczw672skwl8xcnd9"; + name = "kdenetwork-filesharing-21.08.3.tar.xz"; }; }; kdenlive = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdenlive-21.08.2.tar.xz"; - sha256 = "10x160sdj7dk27aa7iyvfmpgfidc8pisfmx6a50z0b23y54kg77m"; - name = "kdenlive-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdenlive-21.08.3.tar.xz"; + sha256 = "00ss9i9gw112vc3bjayp193qnfd3dq47bij9mv429azl20ff0y0c"; + name = "kdenlive-21.08.3.tar.xz"; }; }; kdepim-addons = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdepim-addons-21.08.2.tar.xz"; - sha256 = "050kbxh89drd0yd9gzjjipmz1cvxkk5riivr5fcccqayyvskvyh2"; - name = "kdepim-addons-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdepim-addons-21.08.3.tar.xz"; + sha256 = "1ham9yzmj89lp3zwxwpyh0qy7fxrlhgmhphn9crrkx9gsy77ddsf"; + name = "kdepim-addons-21.08.3.tar.xz"; }; }; kdepim-runtime = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdepim-runtime-21.08.2.tar.xz"; - sha256 = "0vzly768f2g0zhprl1970k16kza128izhrby2mm1wdskrmdrvflq"; - name = "kdepim-runtime-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdepim-runtime-21.08.3.tar.xz"; + sha256 = "1d2208pwalc6mjfnn4gfq2f2fqgxp9w3g8igx6r6l9qsgybh1msx"; + name = "kdepim-runtime-21.08.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdesdk-kioslaves-21.08.2.tar.xz"; - sha256 = "1g4i7sc30m7sjmmgjf12b83yhcwpdnvb7gzdjs1da5np5nq96j4y"; - name = "kdesdk-kioslaves-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdesdk-kioslaves-21.08.3.tar.xz"; + sha256 = "0frw2zxwckmqmffxn5gszdxz61zc0k8xpbhbiyfxsqprh3ck4a2y"; + name = "kdesdk-kioslaves-21.08.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdesdk-thumbnailers-21.08.2.tar.xz"; - sha256 = "1bdwdpvdqx19j714fnxfhi3b647ynm1cgrkny7i27pkqlyw72hjg"; - name = "kdesdk-thumbnailers-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdesdk-thumbnailers-21.08.3.tar.xz"; + sha256 = "06s7i85g5gpknxlrq59i5w8czpaz5wl1b8kfx9flzx0x6ibm5s9q"; + name = "kdesdk-thumbnailers-21.08.3.tar.xz"; }; }; kdf = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdf-21.08.2.tar.xz"; - sha256 = "1z2m9a4rzjsjxv9pkassn3j7pxkqrpq04hw0j6q913q69a999rwg"; - name = "kdf-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdf-21.08.3.tar.xz"; + sha256 = "061xclwkhmc9m8f113hlb46dwk5zvqlmgahz13yfbvyrpj810a7k"; + name = "kdf-21.08.3.tar.xz"; }; }; kdialog = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdialog-21.08.2.tar.xz"; - sha256 = "08klapfcxwp3mf7jv7swsia4719fq6aqdv7lnxr16j8sd6h3z0yx"; - name = "kdialog-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdialog-21.08.3.tar.xz"; + sha256 = "1ibqz8s8p90rxy843f1wn3jnyzrm54srhfpr4ix48amf86afj2gp"; + name = "kdialog-21.08.3.tar.xz"; }; }; kdiamond = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kdiamond-21.08.2.tar.xz"; - sha256 = "1k458rs0x82jf4sjzcry4xzazwfn9drg41736749nc5d26k6csz1"; - name = "kdiamond-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kdiamond-21.08.3.tar.xz"; + sha256 = "1vkflwvi1wa2kd6hq647g9skxg6c7jdk9hakzfphlq2jw6daml94"; + name = "kdiamond-21.08.3.tar.xz"; }; }; keditbookmarks = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/keditbookmarks-21.08.2.tar.xz"; - sha256 = "07yscqr3zzjvb1snl1k0ilmpgv8wrxvjrjdcr1410llfwd80fpvi"; - name = "keditbookmarks-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/keditbookmarks-21.08.3.tar.xz"; + sha256 = "0v9grm385zyxpsqjp287cz8lvrvfzkk7b4blvdr1hi66sng7nr2n"; + name = "keditbookmarks-21.08.3.tar.xz"; }; }; kfind = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kfind-21.08.2.tar.xz"; - sha256 = "1rqn77m8i3fvknkq4gdl4fyihxkc34537010d6i992pxcx9yxv4d"; - name = "kfind-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kfind-21.08.3.tar.xz"; + sha256 = "04qdxqa8gfipjm5akplxrjbnlaky2djkx8nkvcqzqfhvw5i9rxqp"; + name = "kfind-21.08.3.tar.xz"; }; }; kfloppy = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kfloppy-21.08.2.tar.xz"; - sha256 = "0g54qwrmqkd3jxi6nwprzd0jckzdq3iawibfsfblkchnd8hnlxiw"; - name = "kfloppy-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kfloppy-21.08.3.tar.xz"; + sha256 = "14l53a0mrzhnfrhalr71fv0j0ksz6c1zqj8j33nayhqz386yrccx"; + name = "kfloppy-21.08.3.tar.xz"; }; }; kfourinline = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kfourinline-21.08.2.tar.xz"; - sha256 = "0z28lzx9jqp2krgwf6cpwv4hhyl8q8azgw3ni24c8hjl81sxidvb"; - name = "kfourinline-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kfourinline-21.08.3.tar.xz"; + sha256 = "0w2zdl0yfhwdwbnlqd4l9pdx7q9mr0xq7kw49h9wiajy1zmh8vls"; + name = "kfourinline-21.08.3.tar.xz"; }; }; kgeography = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kgeography-21.08.2.tar.xz"; - sha256 = "16rqlh2n4xz5rcs0p9ppzsk7wh060zf1i5yfx4cjrswfn2wk5brv"; - name = "kgeography-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kgeography-21.08.3.tar.xz"; + sha256 = "03wchz3bd4vlijywp9r2xilmhw4gc3ka54ilf2w60baazslhlnr3"; + name = "kgeography-21.08.3.tar.xz"; }; }; kget = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kget-21.08.2.tar.xz"; - sha256 = "11h073nkk5axr263wz5wjq8pdad2wk3nmhixx12ilkqqinb0pi6h"; - name = "kget-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kget-21.08.3.tar.xz"; + sha256 = "0zpzh7bf65kz469viff794zdwc54aq84ndafx6g07nhqs3jhnmjp"; + name = "kget-21.08.3.tar.xz"; }; }; kgoldrunner = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kgoldrunner-21.08.2.tar.xz"; - sha256 = "13y8a1zxfy16sbdf2c94wdx15ghmb436pzx7kvvsfv8d5yizlzdz"; - name = "kgoldrunner-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kgoldrunner-21.08.3.tar.xz"; + sha256 = "0c566c83a7kdc4kvzn37q4kdmr373hfrjgmq7mvn9bji5gcaqzch"; + name = "kgoldrunner-21.08.3.tar.xz"; }; }; kgpg = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kgpg-21.08.2.tar.xz"; - sha256 = "051z9h12zqmhgvr8pk17vsfzld25mpklk1z6nknlf3hydjnq6ns1"; - name = "kgpg-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kgpg-21.08.3.tar.xz"; + sha256 = "0q8da9mzqxg0xmclcpgjh8c744l1sm180ga6hxbasan47wwq67as"; + name = "kgpg-21.08.3.tar.xz"; }; }; khangman = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/khangman-21.08.2.tar.xz"; - sha256 = "0xrwsg5pv1y5lh6d2na1gx8aiimpbl8y2i9a4qj3qg5l4nf0inal"; - name = "khangman-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/khangman-21.08.3.tar.xz"; + sha256 = "1iq4njq0fa7all8zm2q585i1grmv2nfb5qnpr8xpyn13np39q8sr"; + name = "khangman-21.08.3.tar.xz"; }; }; khelpcenter = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/khelpcenter-21.08.2.tar.xz"; - sha256 = "0ivm1z7c6yy6dm9sb88ggiww9c2k526lhpipkgiwm6kslzallxsn"; - name = "khelpcenter-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/khelpcenter-21.08.3.tar.xz"; + sha256 = "1pn5822yxqw62hynkf05a33gzs9xvrwwrxam024g6gs0y0v5nsfp"; + name = "khelpcenter-21.08.3.tar.xz"; }; }; kidentitymanagement = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kidentitymanagement-21.08.2.tar.xz"; - sha256 = "0kaws0w21sm0mb0fd5av7gid8gvyz0zxxjrbx0kf3c52dwkrmw5c"; - name = "kidentitymanagement-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kidentitymanagement-21.08.3.tar.xz"; + sha256 = "00fhw2c7jmv0xqyd1jlrlkahszw163a7cbljn83msws8m5mrnlcb"; + name = "kidentitymanagement-21.08.3.tar.xz"; }; }; kig = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kig-21.08.2.tar.xz"; - sha256 = "1i5lszzj200mda7vbc8c6bzdlx8ycf2d8kk28pl2n17ajra33iim"; - name = "kig-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kig-21.08.3.tar.xz"; + sha256 = "1l4zap7lm1pigyldbqy20jaqysid0r4a6y71qalxk3f565jsqfx5"; + name = "kig-21.08.3.tar.xz"; }; }; kigo = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kigo-21.08.2.tar.xz"; - sha256 = "0ss15k2qpmrf4xvsjpqpvf9pvw8wijmk4zqqhvsjrbd5xrk53bkf"; - name = "kigo-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kigo-21.08.3.tar.xz"; + sha256 = "1cdrmlwpzbkz1mi2f72z9dh1pvkdkjn885zqqybhqbqicn3w3qch"; + name = "kigo-21.08.3.tar.xz"; }; }; killbots = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/killbots-21.08.2.tar.xz"; - sha256 = "11cgkx5wpzgzx62frn90h35ga2scrvyxv7sasfsxldf3yiv15m30"; - name = "killbots-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/killbots-21.08.3.tar.xz"; + sha256 = "1mwa46r7yvxhavprc6yjh773gjhz5ks0znsvpzambn6hk23r11p8"; + name = "killbots-21.08.3.tar.xz"; }; }; kimagemapeditor = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kimagemapeditor-21.08.2.tar.xz"; - sha256 = "0k1jl5d9qxdg9lrz19vzjbsnpnf236hmckvwy9c620sik0rzpj12"; - name = "kimagemapeditor-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kimagemapeditor-21.08.3.tar.xz"; + sha256 = "0vzy028cgq0ai4f9rgkc32w09yz5836y280nck2wxk2dajjc5k6x"; + name = "kimagemapeditor-21.08.3.tar.xz"; }; }; kimap = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kimap-21.08.2.tar.xz"; - sha256 = "0qdl94zqk0qvy5mcnbhskh7dskcx8g1bkv4qv8zjjj9rz1r2rm2x"; - name = "kimap-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kimap-21.08.3.tar.xz"; + sha256 = "11xwkgxm0ghbpcy6bmvkw1hlsfkdrlyyfbblv5m4s881ky7h4aim"; + name = "kimap-21.08.3.tar.xz"; }; }; kio-extras = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kio-extras-21.08.2.tar.xz"; - sha256 = "0735c9n50qflkcl8j032m84wvb6alv8rr9yfhyzflzv56k8r4034"; - name = "kio-extras-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kio-extras-21.08.3.tar.xz"; + sha256 = "0lx0b9q68mfb96jfwsf0awcx9wn47nmnqqnk57wrbx8zx880q0j2"; + name = "kio-extras-21.08.3.tar.xz"; }; }; kio-gdrive = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kio-gdrive-21.08.2.tar.xz"; - sha256 = "0mbh5ccw3iyfnhqkidds9kq8bm7dwpx5zrnbqi93fach7zmpidk2"; - name = "kio-gdrive-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kio-gdrive-21.08.3.tar.xz"; + sha256 = "1h781cksqq5qana80rlc0x3cfz5prl1g3il4282vf2yqihl3zgrd"; + name = "kio-gdrive-21.08.3.tar.xz"; }; }; kipi-plugins = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kipi-plugins-21.08.2.tar.xz"; - sha256 = "0ygji1dm6bzyn6f455l1avbw12kl5vdhx1g8lwvgfc51vflv3vxp"; - name = "kipi-plugins-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kipi-plugins-21.08.3.tar.xz"; + sha256 = "1vscmljcadz11m4jsbkkx5f8ywbyvmfxnw1g7x5ks8d8hqsrcgd0"; + name = "kipi-plugins-21.08.3.tar.xz"; }; }; kirigami-gallery = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kirigami-gallery-21.08.2.tar.xz"; - sha256 = "1i5aly7pwc39avarqmi8wwzv6bbza5pxaz5v8jm6b57d5mampkn8"; - name = "kirigami-gallery-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kirigami-gallery-21.08.3.tar.xz"; + sha256 = "0d2psfq5q7zjmd4k1jz0fgwi3gnhi78jn10hrwvc7f8fb6pw4rzc"; + name = "kirigami-gallery-21.08.3.tar.xz"; }; }; kiriki = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kiriki-21.08.2.tar.xz"; - sha256 = "1l3sc3fi4b8hc9dyrsi66src52wygckngiwqq8hf4mj2h0hf9s55"; - name = "kiriki-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kiriki-21.08.3.tar.xz"; + sha256 = "19qvbxc0dpjq0vb5kh3qsrkv1793bz5ii958a4yqfmmc8xb26v2x"; + name = "kiriki-21.08.3.tar.xz"; }; }; kiten = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kiten-21.08.2.tar.xz"; - sha256 = "12jmsg26y4ldkh5qyz2bzyd14wk401p7kl48m5ngxv95qxw2ix9s"; - name = "kiten-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kiten-21.08.3.tar.xz"; + sha256 = "0ly44w9y4ha5nw6lqpm5gavxc3ywqc4wh04nl7wpg0m2rm624mci"; + name = "kiten-21.08.3.tar.xz"; }; }; kitinerary = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kitinerary-21.08.2.tar.xz"; - sha256 = "1l21q95rszdm1gp1msr9mzlj8ay115dl4cxchhm1mz7w7h53scg3"; - name = "kitinerary-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kitinerary-21.08.3.tar.xz"; + sha256 = "066rq42g5l1rmzf5c7xg21p35ln60ir92d0sp2wg9s5li0l0azbf"; + name = "kitinerary-21.08.3.tar.xz"; }; }; kjumpingcube = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kjumpingcube-21.08.2.tar.xz"; - sha256 = "1akg30mz8j6w6dzc43z56siiljblqpah80ghbashq3h2wq3q1lxz"; - name = "kjumpingcube-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kjumpingcube-21.08.3.tar.xz"; + sha256 = "0iya370m6n9g6m6rzfkdsb9ypwdd0ksfddiy2g0yvjf1xdxr7im9"; + name = "kjumpingcube-21.08.3.tar.xz"; }; }; kldap = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kldap-21.08.2.tar.xz"; - sha256 = "1vc94n9wq1422bp9ky2sapy8wra0gi5gfl6dz0h8wxnxflb28zvw"; - name = "kldap-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kldap-21.08.3.tar.xz"; + sha256 = "1jb1k5xpicsmazc6c57z203w75h8klja7jp7p8934nvj9dgqqcd1"; + name = "kldap-21.08.3.tar.xz"; }; }; kleopatra = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kleopatra-21.08.2.tar.xz"; - sha256 = "1ym40xxwl9qqz8sbsck606vzxys5qhkca8g23gqn3sxx3kk8zpn9"; - name = "kleopatra-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kleopatra-21.08.3.tar.xz"; + sha256 = "1gpn0kpxrw4jn214k5swg2frkfgp9clr99n45z3mzjdccl8zfsbi"; + name = "kleopatra-21.08.3.tar.xz"; }; }; klettres = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/klettres-21.08.2.tar.xz"; - sha256 = "1n3qw190nznz0h4l68iy9azky57f8pflx10dihhl541jspgga5lg"; - name = "klettres-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/klettres-21.08.3.tar.xz"; + sha256 = "0w4fynbvnvlizz0qjkn2qcnn3xs1b0jjfmy9a01wff93a4nw2cj8"; + name = "klettres-21.08.3.tar.xz"; }; }; klickety = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/klickety-21.08.2.tar.xz"; - sha256 = "1vi4xx4y7s225b3vgi2z8l1d5z4fgz3v5jfg4zq6v1pis46zpmwz"; - name = "klickety-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/klickety-21.08.3.tar.xz"; + sha256 = "00dl0c6si302mprdwdngxa4361qmr27ii5kvk38vrdlq0cynzgzv"; + name = "klickety-21.08.3.tar.xz"; }; }; klines = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/klines-21.08.2.tar.xz"; - sha256 = "1gxaadl8gnbaliwbnr6ychp1da5dgppk58jgv5z0zngacwy80d97"; - name = "klines-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/klines-21.08.3.tar.xz"; + sha256 = "0n3mdnwlyl0q09bz7dkb3796ki3l181085rb2r1k2mjnjwmn8zya"; + name = "klines-21.08.3.tar.xz"; }; }; kmag = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmag-21.08.2.tar.xz"; - sha256 = "0y68vg95fjhfsjvvn2i214jrv06f6811j1asjxrgvwcmwdf0fnc0"; - name = "kmag-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmag-21.08.3.tar.xz"; + sha256 = "09jvp1hhdam31qwljzpflcnm1mczsai6xlxlks6q0qi2n52cxkhb"; + name = "kmag-21.08.3.tar.xz"; }; }; kmahjongg = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmahjongg-21.08.2.tar.xz"; - sha256 = "1fx4almqcz8x3pzbrjv9yd9kfb7akrfy45z7idhyb31dkdaxi40w"; - name = "kmahjongg-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmahjongg-21.08.3.tar.xz"; + sha256 = "0afjg3svj1sg47xrz3fgvgkd74lvl71sy26br7jjyxjbq1ag9sin"; + name = "kmahjongg-21.08.3.tar.xz"; }; }; kmail = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmail-21.08.2.tar.xz"; - sha256 = "0way147xqjhapswdfqnnvav8dk41lf2050jzmd6jz7qj0dina977"; - name = "kmail-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmail-21.08.3.tar.xz"; + sha256 = "02kina7xn10f963xb7jgzrf15z6akzgl8ba4c9a7yb46ra4w2707"; + name = "kmail-21.08.3.tar.xz"; }; }; kmail-account-wizard = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmail-account-wizard-21.08.2.tar.xz"; - sha256 = "0ac4p9jy3n45i0aj0fn2151pdbjmvkzyr3qlzdidzf386y7m7y9b"; - name = "kmail-account-wizard-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmail-account-wizard-21.08.3.tar.xz"; + sha256 = "1wfzbkipdhmbsj1q5c79ssij1sz57mapg1kkypw10p0nlriklz89"; + name = "kmail-account-wizard-21.08.3.tar.xz"; }; }; kmailtransport = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmailtransport-21.08.2.tar.xz"; - sha256 = "0q76wanhby9gb9c07z8gpkmdqn6rv82bh6fz182m7bdzkqh4rbxx"; - name = "kmailtransport-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmailtransport-21.08.3.tar.xz"; + sha256 = "0xn4imfb4085wx5czxb3yiigslwfxwdi2dmgv7ng01wbphpg0chw"; + name = "kmailtransport-21.08.3.tar.xz"; }; }; kmbox = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmbox-21.08.2.tar.xz"; - sha256 = "055vx2cr9zqab887grjans5cassh2g86r1lcn64jb61sh1cvzj7y"; - name = "kmbox-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmbox-21.08.3.tar.xz"; + sha256 = "19dkc5l5h5x4h5nq924clc06vz5abll2ki70pc6r9py33rfjs11j"; + name = "kmbox-21.08.3.tar.xz"; }; }; kmime = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmime-21.08.2.tar.xz"; - sha256 = "1dg0vm576gqvj7ia80zcdyf9cyg3fzvj7j3fkxx79mw17binlzg4"; - name = "kmime-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmime-21.08.3.tar.xz"; + sha256 = "1bmgnsslhfzyix85c5p3mym6r9f2sjw5ajd5kzw9yxzyvzyc7kv6"; + name = "kmime-21.08.3.tar.xz"; }; }; kmines = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmines-21.08.2.tar.xz"; - sha256 = "0vzspy446pwbd04zyq7x0s7q6nrhmdnzq3jfvv6nnazhjmxpfafv"; - name = "kmines-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmines-21.08.3.tar.xz"; + sha256 = "0x2ligjxam6aaxpzl1zj5circ0ssn9ycafl3ydvhk9pz9j3c9cx1"; + name = "kmines-21.08.3.tar.xz"; }; }; kmix = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmix-21.08.2.tar.xz"; - sha256 = "1srv1alrq2w87rmv9jriz1y37rb0fp7w14291ky64gf23phwmfdq"; - name = "kmix-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmix-21.08.3.tar.xz"; + sha256 = "0smfvkw8svg4fd3sf3f3l5my516jjh2n203kffkg6nr2pgscfw58"; + name = "kmix-21.08.3.tar.xz"; }; }; kmousetool = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmousetool-21.08.2.tar.xz"; - sha256 = "1b09z6793zjjspcrhz4f1vxk3zbs4qdrkdp59q61i7ganm49znma"; - name = "kmousetool-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmousetool-21.08.3.tar.xz"; + sha256 = "0fyhni1m96xh7ir7zhggszfvn7rsf5dp8l065pzvla73w7l6iqwy"; + name = "kmousetool-21.08.3.tar.xz"; }; }; kmouth = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmouth-21.08.2.tar.xz"; - sha256 = "1b9bc0vnqihaqa4wfa9sqcrq92q1kyw0w1ikkx3pb8rzdzkk4cv2"; - name = "kmouth-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmouth-21.08.3.tar.xz"; + sha256 = "0d30r0kyq260pmbk4n9ild0zibwf1sdqwpszvi2j8y5v3gn2bg69"; + name = "kmouth-21.08.3.tar.xz"; }; }; kmplot = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kmplot-21.08.2.tar.xz"; - sha256 = "0p81x7qlpj1b84wzqqb7sxmbmnxfys0clg1k07d2hw4rb8gisgic"; - name = "kmplot-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kmplot-21.08.3.tar.xz"; + sha256 = "0az7krs0m7xly9v2aclfh4schw9hj99qmv6qmqwa1qvdhhhxd52p"; + name = "kmplot-21.08.3.tar.xz"; }; }; knavalbattle = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/knavalbattle-21.08.2.tar.xz"; - sha256 = "0zhp8zmnsjv1ainlc98waixv2p05w8jh91clb8747rc8x4k3phxk"; - name = "knavalbattle-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/knavalbattle-21.08.3.tar.xz"; + sha256 = "0ydbkfi1n1j9fv0rjxpvh6nsjp20zwmb5ii47pv77z6a3rk5sqf4"; + name = "knavalbattle-21.08.3.tar.xz"; }; }; knetwalk = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/knetwalk-21.08.2.tar.xz"; - sha256 = "1jb6w790jfngifhgp4clgakiacw0lbn40jnj00zlzcg751vl6ajl"; - name = "knetwalk-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/knetwalk-21.08.3.tar.xz"; + sha256 = "0nplhxvqiw9ap12hxyk1z247f31jqwg59d5q75jiqi1xr1gf27n2"; + name = "knetwalk-21.08.3.tar.xz"; }; }; knights = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/knights-21.08.2.tar.xz"; - sha256 = "0v72niszn93671c4313f3cz2y8wq5nsww0c4irsbz9jpivcq080z"; - name = "knights-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/knights-21.08.3.tar.xz"; + sha256 = "0ajnn8jaa1h97k89qj5c7i51c2wr3zgbsiiz9bxhhmb6gwrwjqpi"; + name = "knights-21.08.3.tar.xz"; }; }; knotes = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/knotes-21.08.2.tar.xz"; - sha256 = "1g3rmkpwbicga09qwhxn47rhiv9rfaacpzapsrhddh63831bl999"; - name = "knotes-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/knotes-21.08.3.tar.xz"; + sha256 = "0v5kg8gi2wmz4dhwg6pmq5pd6kh91ha9hg64z21p38b3nc4z07l4"; + name = "knotes-21.08.3.tar.xz"; }; }; kolf = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kolf-21.08.2.tar.xz"; - sha256 = "1dziji28syv7rirm959ahcch6696sc4y6pnfp40v11j1pw58jm8p"; - name = "kolf-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kolf-21.08.3.tar.xz"; + sha256 = "1mz30vzdcsa9nhwqmcr6kxwvi9843b876kzpmqrlrxc19ixqbyq4"; + name = "kolf-21.08.3.tar.xz"; }; }; kollision = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kollision-21.08.2.tar.xz"; - sha256 = "04hb91gqy58lvhwy0hx27xcd1pvqm378lcavswh7b142f63mhmjf"; - name = "kollision-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kollision-21.08.3.tar.xz"; + sha256 = "1m46xrik0ppp6nhrsx264zzy0fdvryamcj0w5m6bm0hnyj75c4rk"; + name = "kollision-21.08.3.tar.xz"; }; }; kolourpaint = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kolourpaint-21.08.2.tar.xz"; - sha256 = "0p64dp63m8ycy5qrgd6fdgf670y5iqdyw4gjbkwphg01qp8kpj6d"; - name = "kolourpaint-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kolourpaint-21.08.3.tar.xz"; + sha256 = "11ciijpr8aa8nd3zgxrikdnx1gk1w78h1v1nhgqn399lxn3vkchi"; + name = "kolourpaint-21.08.3.tar.xz"; }; }; kompare = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kompare-21.08.2.tar.xz"; - sha256 = "14bbqxdzj67g2m6zmz28ax6v4bzz9nmyy45flqzm8jqvq9afqb1d"; - name = "kompare-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kompare-21.08.3.tar.xz"; + sha256 = "1988y00mb5wz9c6h4kchkyda4vas44bhiqd1zc4i0fkyl5wi5vp0"; + name = "kompare-21.08.3.tar.xz"; }; }; konqueror = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/konqueror-21.08.2.tar.xz"; - sha256 = "0v5l1nqa0fm4q17l0rncriwyvkgq0pdg2q4kjc92kvvdvrpm3jjp"; - name = "konqueror-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/konqueror-21.08.3.tar.xz"; + sha256 = "1ls9avkwcf7c9qnmxasbi933sjw9q3hnjyys5zf69v7p5hqvg0dz"; + name = "konqueror-21.08.3.tar.xz"; }; }; konquest = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/konquest-21.08.2.tar.xz"; - sha256 = "0shky9cys79prdgr6bcmi50gvfmqr0famdq6gqacv9krbja4pl20"; - name = "konquest-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/konquest-21.08.3.tar.xz"; + sha256 = "0vsvzz47yn5wyl8zjnbfs1g97466l5ldxcc7mpg1q4y28fxb4jiv"; + name = "konquest-21.08.3.tar.xz"; }; }; konsole = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/konsole-21.08.2.tar.xz"; - sha256 = "1lhpgags85y0s5p44dpa2k0b9vq46m7h19pha59w1wy72an884ig"; - name = "konsole-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/konsole-21.08.3.tar.xz"; + sha256 = "1w802g95s8hrlpkilxs2mh7fsg7xq3x9vzw48766kpl9ri3ppx91"; + name = "konsole-21.08.3.tar.xz"; }; }; kontact = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kontact-21.08.2.tar.xz"; - sha256 = "1a7d7xfby796kk9hbqqnnhjnn5yvk99hglm4270azlcgbjxf4s2j"; - name = "kontact-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kontact-21.08.3.tar.xz"; + sha256 = "0rwi34avk98m0jjbaij895ganfcz5c8l926nr399j5qnv9r6j82l"; + name = "kontact-21.08.3.tar.xz"; }; }; kontactinterface = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kontactinterface-21.08.2.tar.xz"; - sha256 = "0wavclk0z55z8xmqiq6wjhlf2byiggmj9fr5kwdk8wsjfj30npwg"; - name = "kontactinterface-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kontactinterface-21.08.3.tar.xz"; + sha256 = "1284f6cndf3l4il4mw1qrqvf9jmww6nmhh6fx7asw7mfc32r5zaj"; + name = "kontactinterface-21.08.3.tar.xz"; }; }; kontrast = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kontrast-21.08.2.tar.xz"; - sha256 = "12pmkkgrj848whwfz523ciix2a4dm3wgw1vva30svyvlv6qyrgwa"; - name = "kontrast-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kontrast-21.08.3.tar.xz"; + sha256 = "1yy4gfckabb175apvm7fcj77nxdc2fdszz1f1zrikrss20r7dc79"; + name = "kontrast-21.08.3.tar.xz"; }; }; konversation = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/konversation-21.08.2.tar.xz"; - sha256 = "1blaxxpp0831frw2v4ylvq23ffyqabbq1zcqj0v4kq736acdl8pa"; - name = "konversation-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/konversation-21.08.3.tar.xz"; + sha256 = "0wfjhp6scrq9a5llr5f9fcz2k7b5jnid8m8hrp520ai4wg4ll7zv"; + name = "konversation-21.08.3.tar.xz"; }; }; kopeninghours = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kopeninghours-21.08.2.tar.xz"; - sha256 = "1g4g3hc0zpklnw8an49dk25zfw740w4slkm52191q2ajymp589l0"; - name = "kopeninghours-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kopeninghours-21.08.3.tar.xz"; + sha256 = "090rp2qpsbsyqm4nipq398c3pkr0rx46rwmr4393wffzmnbiwcb9"; + name = "kopeninghours-21.08.3.tar.xz"; }; }; kopete = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kopete-21.08.2.tar.xz"; - sha256 = "015pjfc5kxhm5nmjv8fx4jlczp0l3vhqrkxgfvq83a200nlvg2pm"; - name = "kopete-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kopete-21.08.3.tar.xz"; + sha256 = "105zwy4k7idkdmjjx754x7acszd4yw3y3r7lrf61f44wsm9dv2wr"; + name = "kopete-21.08.3.tar.xz"; }; }; korganizer = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/korganizer-21.08.2.tar.xz"; - sha256 = "0izrzg5xxqgz0wq0vkv1i1xcf0xnzgfwixy8f4gcvihpqxyvixb7"; - name = "korganizer-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/korganizer-21.08.3.tar.xz"; + sha256 = "00r7abidj71yqgx4g0kd09dfnq0ilqh3kyzq47ms912gp1dkr5b9"; + name = "korganizer-21.08.3.tar.xz"; }; }; kosmindoormap = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kosmindoormap-21.08.2.tar.xz"; - sha256 = "0yf4n48x041wl07f575hzqdkn1qmx3idpxswinsk9r8zdr2dwch7"; - name = "kosmindoormap-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kosmindoormap-21.08.3.tar.xz"; + sha256 = "15qq6w14yxfprzzj3267z15zkalsb8y0igq772hwyz4v7f6xhydp"; + name = "kosmindoormap-21.08.3.tar.xz"; }; }; kpat = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kpat-21.08.2.tar.xz"; - sha256 = "16cj3w4cibar1q12wam3i623kzddhl39ychvi3nphlni5cmr4x42"; - name = "kpat-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpat-21.08.3.tar.xz"; + sha256 = "0s8k8q12hvciz2c38gn5w7miz0i97pqn4jrs69sm294nw7wh1xi4"; + name = "kpat-21.08.3.tar.xz"; }; }; kpimtextedit = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kpimtextedit-21.08.2.tar.xz"; - sha256 = "0v479g998amh822lxr0l2d9xhlrwbij9prlrn1z9y9al056cic7h"; - name = "kpimtextedit-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpimtextedit-21.08.3.tar.xz"; + sha256 = "18bjvhlvjn5a1gnzw478l15mgda4c7qba0qqk9rrbh2ryr1ksf7h"; + name = "kpimtextedit-21.08.3.tar.xz"; }; }; kpkpass = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kpkpass-21.08.2.tar.xz"; - sha256 = "003rmp8svnz74qfd3727l7p5wj56j9x8w3dwk19ysyklh2rbaj2p"; - name = "kpkpass-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpkpass-21.08.3.tar.xz"; + sha256 = "0l6n358gng24fqhwjmfpxfmmcw8x80di120k72zahiqplk2arcf5"; + name = "kpkpass-21.08.3.tar.xz"; }; }; kpmcore = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kpmcore-21.08.2.tar.xz"; - sha256 = "0rn8x0add1qflsbgppmhz1zbnjvy39d5wckxga0vmhdix2m3d60g"; - name = "kpmcore-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpmcore-21.08.3.tar.xz"; + sha256 = "0y9bpw71dn9c39rjsl44az3y2bdczrj833dvwmrwaz6jbnhxl1kj"; + name = "kpmcore-21.08.3.tar.xz"; }; }; kpublictransport = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kpublictransport-21.08.2.tar.xz"; - sha256 = "1g4k1wxhvjya0k79ysr92kq37fbdfly5qdrmp11apvar4la4xmr8"; - name = "kpublictransport-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kpublictransport-21.08.3.tar.xz"; + sha256 = "06jbc0qgi5dgx9jwhdnimw1k480whbqw5x75jrx9bspv5y5br16j"; + name = "kpublictransport-21.08.3.tar.xz"; }; }; kqtquickcharts = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kqtquickcharts-21.08.2.tar.xz"; - sha256 = "04cxw88lv7mj74znzfl3m9jzks11z837y3bch40qdn8ysk9wqjhn"; - name = "kqtquickcharts-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kqtquickcharts-21.08.3.tar.xz"; + sha256 = "0kyznsq7bjzj5c091kpgn443zvkn3qbmn2b0sppj78a7b8ica5ca"; + name = "kqtquickcharts-21.08.3.tar.xz"; }; }; krdc = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/krdc-21.08.2.tar.xz"; - sha256 = "0zrpfbs4r0d4wnficmhn0av7877hbrl4jvxpi0qiy2gdc7zksnbd"; - name = "krdc-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/krdc-21.08.3.tar.xz"; + sha256 = "0jcbbq9vd4f1kp76fanwnp6q4hq10w3z7ygrb8makpa0daa96vx4"; + name = "krdc-21.08.3.tar.xz"; }; }; kreversi = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kreversi-21.08.2.tar.xz"; - sha256 = "18z2aclpd0xln1n442jg13n5j2yip6dldfvd5z56g7n23l9paywq"; - name = "kreversi-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kreversi-21.08.3.tar.xz"; + sha256 = "1ifcckbf9lr4pr9n2ggqjvv6xz747k9hk7m43y5ij0bixi6cq474"; + name = "kreversi-21.08.3.tar.xz"; }; }; krfb = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/krfb-21.08.2.tar.xz"; - sha256 = "1hn21d0cp2k6zair2wwf492y0ip69f1b5axaaz9fqgmgqn0l47qb"; - name = "krfb-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/krfb-21.08.3.tar.xz"; + sha256 = "17q0hpwqbwqg4xbq5lmk5g1fl5jplzpx1acyhcbx7il0j06cfcn4"; + name = "krfb-21.08.3.tar.xz"; }; }; kross-interpreters = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kross-interpreters-21.08.2.tar.xz"; - sha256 = "07f153ib1gmbfnkchzymvwlng3sgn28zspxkrx75g8xa5jszwwym"; - name = "kross-interpreters-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kross-interpreters-21.08.3.tar.xz"; + sha256 = "0z9lmazpw5389sgvhsjsm1219ys3fybr7hg95nrz8a334vw39nqv"; + name = "kross-interpreters-21.08.3.tar.xz"; }; }; kruler = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kruler-21.08.2.tar.xz"; - sha256 = "082z14vcp1ww42jrlxl128gp6y5iqrz360cipvj4xph4q7lpgb0r"; - name = "kruler-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kruler-21.08.3.tar.xz"; + sha256 = "0rjxy4ipxxk91wlzhrw9mg5avz18l4p01in29l1ccfz278b97lqm"; + name = "kruler-21.08.3.tar.xz"; }; }; kshisen = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kshisen-21.08.2.tar.xz"; - sha256 = "12mi59n8sm7wqf53wbi2nlh4d2i673x93rlqz6qxkaqznlpf7lrr"; - name = "kshisen-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kshisen-21.08.3.tar.xz"; + sha256 = "1fnd2qck51gxnw6ncq52rd1q08abh70azs0apjnh9qk0dyjk91wh"; + name = "kshisen-21.08.3.tar.xz"; }; }; ksirk = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ksirk-21.08.2.tar.xz"; - sha256 = "1j6nzyl3ppi68d1y84yals0y90km5mxzz4x44frn3k3bb1n1imzc"; - name = "ksirk-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksirk-21.08.3.tar.xz"; + sha256 = "03v8sghnipkpca3c71s3008m3psawinj90a7637r19h7gyvlyws7"; + name = "ksirk-21.08.3.tar.xz"; }; }; ksmtp = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ksmtp-21.08.2.tar.xz"; - sha256 = "08bdi23qwvayl9w1nsfgpxpxmxrw820qcmvw03ivdk1h7m6sl3yh"; - name = "ksmtp-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksmtp-21.08.3.tar.xz"; + sha256 = "0diz01z8gczkwy8c8gvjd583w02vma7kpngzg1ax0wx640vbjq50"; + name = "ksmtp-21.08.3.tar.xz"; }; }; ksnakeduel = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ksnakeduel-21.08.2.tar.xz"; - sha256 = "0n7digcymwrcg24y2libp0x67s1rj2qmps4yzp2bxpgasx9pf6ik"; - name = "ksnakeduel-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksnakeduel-21.08.3.tar.xz"; + sha256 = "0gmcn31dg3isv5dxv01rg8w6cbfdhwsz5rpp98lrr0qx4abphva7"; + name = "ksnakeduel-21.08.3.tar.xz"; }; }; kspaceduel = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kspaceduel-21.08.2.tar.xz"; - sha256 = "1gjb23dw8fh61b7s23b2bfkgcfxqvndrv1x7lkk2bpi4i4g6sqz3"; - name = "kspaceduel-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kspaceduel-21.08.3.tar.xz"; + sha256 = "0099rc25zvbl2zg1gpmxdhnphl32bd0cxlgikyfvanigq3mx8zkd"; + name = "kspaceduel-21.08.3.tar.xz"; }; }; ksquares = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ksquares-21.08.2.tar.xz"; - sha256 = "10sl49mjjlpqyh6f930iz1nncy2dqzm1b8hksn8zxz5kwi2gvfrc"; - name = "ksquares-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksquares-21.08.3.tar.xz"; + sha256 = "1mgs9yapz8fm2nmv0zg2x9qfd0ijj518s43dqmss41zrjr0g3mv2"; + name = "ksquares-21.08.3.tar.xz"; }; }; ksudoku = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ksudoku-21.08.2.tar.xz"; - sha256 = "15svd1paf1hx5aqmdrh6bcdag7k8iq18fpjflk3vkkip6s76lrv6"; - name = "ksudoku-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksudoku-21.08.3.tar.xz"; + sha256 = "09s91xvkbybhwdkf80d7kvjj2jvii938vf650fqicypki2vf0zyx"; + name = "ksudoku-21.08.3.tar.xz"; }; }; ksystemlog = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ksystemlog-21.08.2.tar.xz"; - sha256 = "1qnnhbi75glgvcvpmpy5zrq6x6hygl7r7v4h99lfm48jdfpyxilj"; - name = "ksystemlog-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ksystemlog-21.08.3.tar.xz"; + sha256 = "1m20nvvvfbgzd3aay7hsb5pm1bgjngc36ixqs0hrklhrcmwjq9g6"; + name = "ksystemlog-21.08.3.tar.xz"; }; }; kteatime = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kteatime-21.08.2.tar.xz"; - sha256 = "02vkh3dyacba9x0zl8j8g8isj50h8wz7mjnfqgxc67azcwwx41sp"; - name = "kteatime-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kteatime-21.08.3.tar.xz"; + sha256 = "175vmcbhhlan6smhagli0jpa3ik0y0wwiijigfk2srm8cyk29ymn"; + name = "kteatime-21.08.3.tar.xz"; }; }; ktimer = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktimer-21.08.2.tar.xz"; - sha256 = "0rfmrh7i8c23r6wdyh4w55980vlj2p127mbpiw5brj4dazdjll5x"; - name = "ktimer-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktimer-21.08.3.tar.xz"; + sha256 = "1nr116cxw81c2bh32l2xrzmrglk36qkzycbfcffxnm7ka4flwzbm"; + name = "ktimer-21.08.3.tar.xz"; }; }; ktnef = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktnef-21.08.2.tar.xz"; - sha256 = "05l4g38f2m3qjl6q45j12zarpazsizjl2pyqh87vhaxgnf4fbqqp"; - name = "ktnef-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktnef-21.08.3.tar.xz"; + sha256 = "0vfsy894hs3538ssbqky6nfnjzhyn8yjlmvh0mb6gg69952gcvqa"; + name = "ktnef-21.08.3.tar.xz"; }; }; ktorrent = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktorrent-21.08.2.tar.xz"; - sha256 = "1nd72jcvsc0kabd23ddy93dxp59ihg5npa8r3vbzvic89xlpkivi"; - name = "ktorrent-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktorrent-21.08.3.tar.xz"; + sha256 = "0y1vpfc8xsm98lrf119r5clmb6xwq2a8adb347ksyvvr4l7rdkwm"; + name = "ktorrent-21.08.3.tar.xz"; }; }; ktouch = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktouch-21.08.2.tar.xz"; - sha256 = "16r3hj160y1517dk1nzvikwkjlfbzmjpx54k9jc98csaplbv683l"; - name = "ktouch-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktouch-21.08.3.tar.xz"; + sha256 = "0i0ph52k2zw6q37qam2s09msxsdxr5v8qiqwxirjab8ad7g9z0gf"; + name = "ktouch-21.08.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-accounts-kcm-21.08.2.tar.xz"; - sha256 = "0fxlkbx8kzlbfyfj7ac6m0y6vc80n3nlm5skrq106vbm1nnh565p"; - name = "ktp-accounts-kcm-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-accounts-kcm-21.08.3.tar.xz"; + sha256 = "1ymq8cnvvw62xd4va969imm2g62fw7fhbs8rw3wqrc2lal9d5l1g"; + name = "ktp-accounts-kcm-21.08.3.tar.xz"; }; }; ktp-approver = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-approver-21.08.2.tar.xz"; - sha256 = "1pbc2f477xysv707j1xbcw799pxas31j5cmf26wrkbjmzxh5nhnd"; - name = "ktp-approver-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-approver-21.08.3.tar.xz"; + sha256 = "0z9kw2gamgdz425aw6li6nvv1g0b1ffil0rmjh0b0z89bbpbc6jx"; + name = "ktp-approver-21.08.3.tar.xz"; }; }; ktp-auth-handler = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-auth-handler-21.08.2.tar.xz"; - sha256 = "1fwzm15s8q8h47kfqw4jz2vfv81fc4azxg7c9r4vvlh23grlzbx8"; - name = "ktp-auth-handler-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-auth-handler-21.08.3.tar.xz"; + sha256 = "1z89ycwpq46w82hylwq1sizd7a563g5a22jdc1chhhlwp9dqmdc2"; + name = "ktp-auth-handler-21.08.3.tar.xz"; }; }; ktp-call-ui = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-call-ui-21.08.2.tar.xz"; - sha256 = "0d4iaqpl67w3q7rrk2h9glq91ha03hvnrywi6271nc4892r4b2ys"; - name = "ktp-call-ui-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-call-ui-21.08.3.tar.xz"; + sha256 = "1nr064h0f4rqjka030xflhrmq0l8g87fwyi853plk7y0473fy6h2"; + name = "ktp-call-ui-21.08.3.tar.xz"; }; }; ktp-common-internals = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-common-internals-21.08.2.tar.xz"; - sha256 = "1jc8dv4563y4xlx13sz07lmkfnxraidqpxq08plapkliq56hv2xd"; - name = "ktp-common-internals-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-common-internals-21.08.3.tar.xz"; + sha256 = "0ndfdggs4j2jc93pf998r0fyj7fjnc2pz98acc1l6laq8d8aawd2"; + name = "ktp-common-internals-21.08.3.tar.xz"; }; }; ktp-contact-list = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-contact-list-21.08.2.tar.xz"; - sha256 = "1glh9np0q82x9z7pb3xzvq1mwmfggzq8lc5in1lhhjzhpnla2n21"; - name = "ktp-contact-list-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-contact-list-21.08.3.tar.xz"; + sha256 = "0pdl3w1vj6f4nms4cs91yagfyf5ssqms0bzmcnjf53pcpyf8rhjs"; + name = "ktp-contact-list-21.08.3.tar.xz"; }; }; ktp-contact-runner = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-contact-runner-21.08.2.tar.xz"; - sha256 = "15xvw84c4ygz1zz3qkjmxfjrkczwrdwdmls5a4bc4d4i78df8v4m"; - name = "ktp-contact-runner-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-contact-runner-21.08.3.tar.xz"; + sha256 = "0zjw9f66rn5nc37q3q54qy8m09qlama949ksfrvyyh3qhsxp17pm"; + name = "ktp-contact-runner-21.08.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-desktop-applets-21.08.2.tar.xz"; - sha256 = "09bli0hhibwhia5zsprf1mv2li344lcqjq6pkirzz8h2dr1nr2s5"; - name = "ktp-desktop-applets-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-desktop-applets-21.08.3.tar.xz"; + sha256 = "1wlls0rhynfq9cfn48g31avviy067r409c5pcvasfwgzcv5hjan5"; + name = "ktp-desktop-applets-21.08.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-filetransfer-handler-21.08.2.tar.xz"; - sha256 = "0g0w1ayj3m6lkmy71xqvfg829rk9y5z98h6rnim3ag9yx44namzw"; - name = "ktp-filetransfer-handler-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-filetransfer-handler-21.08.3.tar.xz"; + sha256 = "1vnwgcmn3j18spcn2dl468n2y073mk9nsc3557hid5mmg7byp8ng"; + name = "ktp-filetransfer-handler-21.08.3.tar.xz"; }; }; ktp-kded-module = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-kded-module-21.08.2.tar.xz"; - sha256 = "1rx79zqqk2gl2qi28q429ss63kyndfzs24mdrn4491hsbln0sv1x"; - name = "ktp-kded-module-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-kded-module-21.08.3.tar.xz"; + sha256 = "0mgw2w812306w04w1xgv9ngd31zj0m4v9hv3cyyk2dz1hi97g9hz"; + name = "ktp-kded-module-21.08.3.tar.xz"; }; }; ktp-send-file = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-send-file-21.08.2.tar.xz"; - sha256 = "1791zhp5rpwizx3y48hgamk7pgbx2yk650nczxbnza828m1lxzab"; - name = "ktp-send-file-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-send-file-21.08.3.tar.xz"; + sha256 = "1c0yrir3z6p6ravizaqhdgjiwcj2cyzd61n4zcx2mrr4mfq7wr4l"; + name = "ktp-send-file-21.08.3.tar.xz"; }; }; ktp-text-ui = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktp-text-ui-21.08.2.tar.xz"; - sha256 = "1pinn61dkb2jcyzms3kf70sxjbkd3pkn6cxvxs8zsj1m1bdkydym"; - name = "ktp-text-ui-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktp-text-ui-21.08.3.tar.xz"; + sha256 = "0xk9lcdp99rd1n6gg9a4ix5bdfk229y1ddf115ldjsk30ksfv0r0"; + name = "ktp-text-ui-21.08.3.tar.xz"; }; }; ktuberling = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/ktuberling-21.08.2.tar.xz"; - sha256 = "0h7vhvh03w11dr17zxdmb5j2vz8flwahvz70h9kw8a63sxpw0x6f"; - name = "ktuberling-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/ktuberling-21.08.3.tar.xz"; + sha256 = "1i0ykflfr2q3043z5j5h1m093n103la8zbax7cacid109d0kca5g"; + name = "ktuberling-21.08.3.tar.xz"; }; }; kturtle = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kturtle-21.08.2.tar.xz"; - sha256 = "1f3iw3fk4l8q2jnnadaqjbj6jzmw86ibf0p515x4rrqz4l8m6plg"; - name = "kturtle-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kturtle-21.08.3.tar.xz"; + sha256 = "1fw7hgx0zxsl1l9ymjhf3k3w5999ijj8vdagnyiz01y2i2hlnvhc"; + name = "kturtle-21.08.3.tar.xz"; }; }; kubrick = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kubrick-21.08.2.tar.xz"; - sha256 = "0kvd8dsg9hdgid70jd5b1vngqpmi9rigkvxl2v4h2ps1ziqqxa78"; - name = "kubrick-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kubrick-21.08.3.tar.xz"; + sha256 = "1fq2icsfbd6k4gm9w25aml2rigzami934vvkvb30222vbhs86qr4"; + name = "kubrick-21.08.3.tar.xz"; }; }; kwalletmanager = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kwalletmanager-21.08.2.tar.xz"; - sha256 = "134690b4bhkjczwxg8776163aggwrqmb84xkvb7612wgs5jygyib"; - name = "kwalletmanager-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kwalletmanager-21.08.3.tar.xz"; + sha256 = "0cbq0md317fipd4lfqvcgan1jm5n0zyilzbrkjymbnl7cy276ajq"; + name = "kwalletmanager-21.08.3.tar.xz"; }; }; kwave = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kwave-21.08.2.tar.xz"; - sha256 = "0sivhgcypwpdi6g0mkdzf1k2hqkj1vj4b5cdcvn8chs2gk9pisgh"; - name = "kwave-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kwave-21.08.3.tar.xz"; + sha256 = "08qs33mi047jcqaavglgxk3i6gq4h73aygn6gj8xpcpqhq82kjl5"; + name = "kwave-21.08.3.tar.xz"; }; }; kwordquiz = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/kwordquiz-21.08.2.tar.xz"; - sha256 = "1prj7iz71z8zy2ynjad7yqkgswg96q4hmc76kg1lvahn2waikr0y"; - name = "kwordquiz-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/kwordquiz-21.08.3.tar.xz"; + sha256 = "066v2w8i2fvrrqb1aakscwcd6rchlm4m5pwsql0s6k59mn7wab6b"; + name = "kwordquiz-21.08.3.tar.xz"; }; }; libgravatar = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libgravatar-21.08.2.tar.xz"; - sha256 = "047fbdj02rnb7bn2vn9lava2mh4ypzlyd8iiri4mbpd686lmi0s1"; - name = "libgravatar-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libgravatar-21.08.3.tar.xz"; + sha256 = "0ni2lgrfpx8vx9mmm43gsn1kw4jj8j52yq4ylfam89q6mhpxcnix"; + name = "libgravatar-21.08.3.tar.xz"; }; }; libkcddb = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkcddb-21.08.2.tar.xz"; - sha256 = "03az77p3p0c0shzi2y2n5721gppzgrq469afvpjppria1n3ks5d2"; - name = "libkcddb-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkcddb-21.08.3.tar.xz"; + sha256 = "00wivb6viw5w1ylcsx3m9ps7j00z7fzjh2s7nap95xnprraihcmv"; + name = "libkcddb-21.08.3.tar.xz"; }; }; libkcompactdisc = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkcompactdisc-21.08.2.tar.xz"; - sha256 = "0sjr8gdbqsjlggxax0l2bxn42l9znplrjiln15izj2zwfkah7d69"; - name = "libkcompactdisc-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkcompactdisc-21.08.3.tar.xz"; + sha256 = "1rsmibz9mamqvhppnxwn2db6jmsipvjx2kj8ikpsp9bx8h421n2g"; + name = "libkcompactdisc-21.08.3.tar.xz"; }; }; libkdcraw = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkdcraw-21.08.2.tar.xz"; - sha256 = "0yhcrzl7piginz19vmyg63154j9rrqxfvfchn9k8g9jiddwnjfd8"; - name = "libkdcraw-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkdcraw-21.08.3.tar.xz"; + sha256 = "0gm8nfc6ayg1ipba4yvhy5nzfrpdwx6l434bg9y7yqvbm3lm1g86"; + name = "libkdcraw-21.08.3.tar.xz"; }; }; libkdegames = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkdegames-21.08.2.tar.xz"; - sha256 = "0jbb4h515c9h08r7dqaslqgrpmb6f08ai46phwgipd67jzgh6wh7"; - name = "libkdegames-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkdegames-21.08.3.tar.xz"; + sha256 = "0ysc5g6ap207c5yq3ryiaxmvkrh6wzqzdgccdffs0lncd24g641a"; + name = "libkdegames-21.08.3.tar.xz"; }; }; libkdepim = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkdepim-21.08.2.tar.xz"; - sha256 = "1j8nkfgzixpchz34p338mcm87f112ddy1linhaczg5fal1brangh"; - name = "libkdepim-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkdepim-21.08.3.tar.xz"; + sha256 = "1776fjzd88kj2crr8lcrwxmkvjsxxyll2gy21wlbmqy4h04bi130"; + name = "libkdepim-21.08.3.tar.xz"; }; }; libkeduvocdocument = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkeduvocdocument-21.08.2.tar.xz"; - sha256 = "051mzwbrlpvjnqphf01nzzc76zbz9hasd57sn6y6x8cviflf7kmy"; - name = "libkeduvocdocument-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkeduvocdocument-21.08.3.tar.xz"; + sha256 = "1qyi5y5v1zp3qid58sdfpcp83rkmz2s1hsvir4f9j5ngir0czcq1"; + name = "libkeduvocdocument-21.08.3.tar.xz"; }; }; libkexiv2 = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkexiv2-21.08.2.tar.xz"; - sha256 = "0spa6pbr6rpnznvm2z0c410k5wssw4rw15rdc3f5ds9mbzbyxpva"; - name = "libkexiv2-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkexiv2-21.08.3.tar.xz"; + sha256 = "15d8d3mzp0yhj6lm5799mfncqkxnw0cvfxcgpkz0lf9askv2cq8n"; + name = "libkexiv2-21.08.3.tar.xz"; }; }; libkgapi = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkgapi-21.08.2.tar.xz"; - sha256 = "13dna8iv3qzkc1jagjgji928g88wrgds47lcfj3dqkn8swamisa0"; - name = "libkgapi-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkgapi-21.08.3.tar.xz"; + sha256 = "101yb495k5bxq402qdvyqd0sdhzc5z3r8szymfmrlilgk35wy9rs"; + name = "libkgapi-21.08.3.tar.xz"; }; }; libkipi = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkipi-21.08.2.tar.xz"; - sha256 = "134iaagdn49y79aihi6k5pgx0cyk52wq38cdiinpcsxqc4xmzswh"; - name = "libkipi-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkipi-21.08.3.tar.xz"; + sha256 = "12qjvd7ynab33qid2d4j06z8fbfziaxdlrpq0h3ywd2drks0ykvf"; + name = "libkipi-21.08.3.tar.xz"; }; }; libkleo = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkleo-21.08.2.tar.xz"; - sha256 = "14p3x2jq9sa5gkhcd7q3g5ras2sl62shrjm9kx4426mbnj10n0q2"; - name = "libkleo-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkleo-21.08.3.tar.xz"; + sha256 = "0ivyqmc1hv1cljbpxr5xrzyf9z96dbaa48ak54cxxpanphpialrl"; + name = "libkleo-21.08.3.tar.xz"; }; }; libkmahjongg = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkmahjongg-21.08.2.tar.xz"; - sha256 = "195c7bgn4jp2whqrg7l8g147kj92bvdcvcrh7n186kac9q0jqr3b"; - name = "libkmahjongg-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkmahjongg-21.08.3.tar.xz"; + sha256 = "0rh61491dl90rrlmqmqjdj7vlrjhayhkk5i50zb6jfvrysq9axkc"; + name = "libkmahjongg-21.08.3.tar.xz"; }; }; libkomparediff2 = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libkomparediff2-21.08.2.tar.xz"; - sha256 = "08y9p3il0i5sayq42v9p1v9f6yynp7ljb5d4ls1hf5ww4xxvx10x"; - name = "libkomparediff2-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libkomparediff2-21.08.3.tar.xz"; + sha256 = "0a3980kiigc5kqkyxf4glcxvgr3f4rnc43gcx9vj9mk2qhfcsiqy"; + name = "libkomparediff2-21.08.3.tar.xz"; }; }; libksane = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libksane-21.08.2.tar.xz"; - sha256 = "094k5f0qwcm74jn5jlzs0mr74myp4s217ah2pl1kny1fm5hv5pyj"; - name = "libksane-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libksane-21.08.3.tar.xz"; + sha256 = "086zrddpammihia888nrx2p18if1fyzvhs3igkxq9q2p551vk9fy"; + name = "libksane-21.08.3.tar.xz"; }; }; libksieve = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libksieve-21.08.2.tar.xz"; - sha256 = "1jxb0a18mf8yqxbi90jbgjh90x17qr6z7ga6zxdb8gk1hjsyb10y"; - name = "libksieve-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libksieve-21.08.3.tar.xz"; + sha256 = "1snli2yvq2n567vgi1xs6iiqgn4zp31cid17aqpxllyw8a3xa0l7"; + name = "libksieve-21.08.3.tar.xz"; }; }; libktorrent = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/libktorrent-21.08.2.tar.xz"; - sha256 = "16rx0na7gy03c0qbwy07q7si35z62p0pq7fcvf3ggr594akwz4kl"; - name = "libktorrent-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/libktorrent-21.08.3.tar.xz"; + sha256 = "1zjnnxhd0mv9if61rr28h35wban7sif61dmgc3wsixp4dz1xfrm6"; + name = "libktorrent-21.08.3.tar.xz"; }; }; lokalize = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/lokalize-21.08.2.tar.xz"; - sha256 = "01f48fsrv095vlgxfjfdlm70xwsw73x5zhqbm38szn6r404jcmjm"; - name = "lokalize-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/lokalize-21.08.3.tar.xz"; + sha256 = "0m084mayd9b0iwm4j5cckw22ix1mc4zcwxjfk0cdapm3g2ls1rzd"; + name = "lokalize-21.08.3.tar.xz"; }; }; lskat = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/lskat-21.08.2.tar.xz"; - sha256 = "03www1ix31ifmn6hvzymvhg157rdhahjfwvc9arns23zxpn1sq9p"; - name = "lskat-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/lskat-21.08.3.tar.xz"; + sha256 = "09l209fz82ibsxzg2f53lhbcsaq6zpwllpyklj2988xzn7h49cqg"; + name = "lskat-21.08.3.tar.xz"; }; }; mailcommon = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/mailcommon-21.08.2.tar.xz"; - sha256 = "0d0czxrf3i796pyrlifv4psq3hl4z2abhsqj1ns30xng45pzyrvz"; - name = "mailcommon-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/mailcommon-21.08.3.tar.xz"; + sha256 = "0vpbp88pl462d1j9f3ww22zybrmz92zx3b5cj4gsl7gmb7ijwb19"; + name = "mailcommon-21.08.3.tar.xz"; }; }; mailimporter = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/mailimporter-21.08.2.tar.xz"; - sha256 = "0vd0bghszwr1wh4x2ygd7flg0kypb8m92gvh0q800gdgnqj87lw7"; - name = "mailimporter-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/mailimporter-21.08.3.tar.xz"; + sha256 = "00vm445i5c7vjfmbfgzdj3xildqbnlzpi5i16w4c47wyg5kvpj2c"; + name = "mailimporter-21.08.3.tar.xz"; }; }; marble = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/marble-21.08.2.tar.xz"; - sha256 = "1l8dwj0kyq8r3cap2sjsr4blbz591l6cxhglkhxwds901igacmxa"; - name = "marble-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/marble-21.08.3.tar.xz"; + sha256 = "0bapnmm2x0ihms5gd12brqb2yx7g5h4c8ky70l1czd4a8d95ha0a"; + name = "marble-21.08.3.tar.xz"; }; }; markdownpart = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/markdownpart-21.08.2.tar.xz"; - sha256 = "0vx2d31d9c9ipwkbnlrjhzkaj97a7vz6vigbbkvw4cyaqhq6zkqp"; - name = "markdownpart-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/markdownpart-21.08.3.tar.xz"; + sha256 = "1cqkwvs1ssg203fkaiibcmqjm2viaq3iq880cjlkx9irh0bv9q9h"; + name = "markdownpart-21.08.3.tar.xz"; }; }; mbox-importer = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/mbox-importer-21.08.2.tar.xz"; - sha256 = "1bf4awkrivx209rnwflxrqdxzvj8mzlgzis79hn9n654qy6ar2d5"; - name = "mbox-importer-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/mbox-importer-21.08.3.tar.xz"; + sha256 = "19i5a1rax3xfkcz0hv0vqq9iavggqrliwpqsqnx6zvwjzgjrvsif"; + name = "mbox-importer-21.08.3.tar.xz"; }; }; messagelib = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/messagelib-21.08.2.tar.xz"; - sha256 = "0gsxik4ib72xhw948h257m17w4k49sa3ymbg87n0q8nd6gykxyhr"; - name = "messagelib-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/messagelib-21.08.3.tar.xz"; + sha256 = "0q9mligkkvbwb92ghv5g66rkn0vpbw2xfbgsdnn4jajjxsixipg7"; + name = "messagelib-21.08.3.tar.xz"; }; }; minuet = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/minuet-21.08.2.tar.xz"; - sha256 = "13i37xw2aarmqi25m1r68z9zjwqf9nx8bxlflb0wxghzf3pgrp4v"; - name = "minuet-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/minuet-21.08.3.tar.xz"; + sha256 = "1g2chj23dw9p2lgf094mn9cd26wnhwgslwdwzwax2a23p42j7kb8"; + name = "minuet-21.08.3.tar.xz"; }; }; okular = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/okular-21.08.2.tar.xz"; - sha256 = "0y3n340fbhsgmmrq4vz2p9682xzs7hsvvna8ffh4r15wgl1qdb9q"; - name = "okular-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/okular-21.08.3.tar.xz"; + sha256 = "00ghh7z39904d5x5sa39adkavkhl09hzib6fpwjn14f6sz925f9r"; + name = "okular-21.08.3.tar.xz"; }; }; palapeli = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/palapeli-21.08.2.tar.xz"; - sha256 = "0pl6hi0c5fa6zs3gdicm1s7rmzzdjjvrm8s8ds6f4ghq6dmlknqj"; - name = "palapeli-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/palapeli-21.08.3.tar.xz"; + sha256 = "084nvavgzkmrv77rsg2zf2vykfjwwsvn2i2y24jsh63hs7i5xqhb"; + name = "palapeli-21.08.3.tar.xz"; }; }; parley = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/parley-21.08.2.tar.xz"; - sha256 = "0lykvjaxfj6blgjkmipvlw9531npz46d6jwq6w5wxvk6f1b2cgbh"; - name = "parley-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/parley-21.08.3.tar.xz"; + sha256 = "0wyv5qx4g0941kg870qb9rc9npdw39ggvndjk7ywaad9nkvdj73g"; + name = "parley-21.08.3.tar.xz"; }; }; partitionmanager = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/partitionmanager-21.08.2.tar.xz"; - sha256 = "1fa90mnby2kf5a85wjz7xvb999gh5c2yn0j3g562zndqznqhcpvx"; - name = "partitionmanager-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/partitionmanager-21.08.3.tar.xz"; + sha256 = "0im782ggbnkyzcczxx3mv5qi4nlqmcyhwkbf0mzh8cz56qkfvzhr"; + name = "partitionmanager-21.08.3.tar.xz"; }; }; picmi = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/picmi-21.08.2.tar.xz"; - sha256 = "0qvz4fl4jb256rwmaw0bszr3x2b5jd8priilc3jr33v393f3pd6q"; - name = "picmi-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/picmi-21.08.3.tar.xz"; + sha256 = "0h208sy2r2jzy7a6rmla349d8lydvfvdb2vahdfxrqql0m15s07s"; + name = "picmi-21.08.3.tar.xz"; }; }; pim-data-exporter = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/pim-data-exporter-21.08.2.tar.xz"; - sha256 = "0li96fkwkdg4ziyv4n56vn49wav4kilf7lqb4s9xwj8h44kjpa5f"; - name = "pim-data-exporter-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/pim-data-exporter-21.08.3.tar.xz"; + sha256 = "0l6gkwh6pxp6px50n8i0374by3n7nv0gjkb2qy0s4hsvfz8nwlwk"; + name = "pim-data-exporter-21.08.3.tar.xz"; }; }; pim-sieve-editor = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/pim-sieve-editor-21.08.2.tar.xz"; - sha256 = "173c595djmz3wyzl9dl3br8m3k0940ncdyjf8rjfgrh79y86bh7m"; - name = "pim-sieve-editor-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/pim-sieve-editor-21.08.3.tar.xz"; + sha256 = "1z01c0wsxzl69kr0cxfq23l56dgi0xfjak5qbpfd9p4b2kr095s7"; + name = "pim-sieve-editor-21.08.3.tar.xz"; }; }; pimcommon = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/pimcommon-21.08.2.tar.xz"; - sha256 = "074pbxprzx8hd6fikjvx8hn9g9135swzhj1f5zvfvhyvlpyj90wg"; - name = "pimcommon-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/pimcommon-21.08.3.tar.xz"; + sha256 = "1hj49spfjwqrwh7h86kw7ydcx13rknagj54mhcn60kawz639533l"; + name = "pimcommon-21.08.3.tar.xz"; }; }; poxml = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/poxml-21.08.2.tar.xz"; - sha256 = "1h7y4y1n3xcpgrkabik21ilck5dmq6p3qxs3xm9vzq1jxpb9izyf"; - name = "poxml-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/poxml-21.08.3.tar.xz"; + sha256 = "0yrn2dbdhm3ap55w401ma8z64b7pgs57lzgakzkdpcf69bww9xkw"; + name = "poxml-21.08.3.tar.xz"; }; }; print-manager = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/print-manager-21.08.2.tar.xz"; - sha256 = "0g2y2i7iysi6i397gd9fpqpk9cha7z4b2wz6shcqp0jyvvwl1pd3"; - name = "print-manager-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/print-manager-21.08.3.tar.xz"; + sha256 = "0dmd1wp6c5f58fssnyc977d29gqcr6pmzplvq5pj97xq0i8fq15z"; + name = "print-manager-21.08.3.tar.xz"; }; }; rocs = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/rocs-21.08.2.tar.xz"; - sha256 = "0cvgi42w1a7zd6bzazly9w2azbyp9gzvkyx5wlff5z99nk6v3mp0"; - name = "rocs-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/rocs-21.08.3.tar.xz"; + sha256 = "0mdn58wbv5rhljp7ai0282h5z5j7m9yly6q9s6c8vm5kaxhbwg58"; + name = "rocs-21.08.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/signon-kwallet-extension-21.08.2.tar.xz"; - sha256 = "19jp6h9xqhlyvddgyg9jz74by0pcxqm920c5h8vln5vkkcgsdwws"; - name = "signon-kwallet-extension-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/signon-kwallet-extension-21.08.3.tar.xz"; + sha256 = "1m3wyyndlwk4snjzz45j377hz5plx01bl69y39aw1y53rsx0baln"; + name = "signon-kwallet-extension-21.08.3.tar.xz"; }; }; skanlite = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/skanlite-21.08.2.tar.xz"; - sha256 = "1zwrb7j7x234vbb57p8gzbqz2mfr1n2i84yjf16jrsv1fm53z9md"; - name = "skanlite-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/skanlite-21.08.3.tar.xz"; + sha256 = "1llvq89vdsypbak8lmhnyfr61s72c4lra1yypxmgw0hwqvwqzyjk"; + name = "skanlite-21.08.3.tar.xz"; }; }; spectacle = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/spectacle-21.08.2.tar.xz"; - sha256 = "0m59cnfqkm379i6ayj1g5flszqs26dmnwl79324d1j6bxk24mjrh"; - name = "spectacle-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/spectacle-21.08.3.tar.xz"; + sha256 = "0l1p565y2d04fw9mz1ns11bwc9z5apkjd4llgdihz4qwq5j0ri5y"; + name = "spectacle-21.08.3.tar.xz"; }; }; step = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/step-21.08.2.tar.xz"; - sha256 = "15l11s39hw847kd37fhq6kp3ajbsxidkfpp2ryb9dfh595lncg2r"; - name = "step-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/step-21.08.3.tar.xz"; + sha256 = "1pznz6hxj1h0vcsidsyjm9zgzx4pla47yckykc3mxb9biraalhi5"; + name = "step-21.08.3.tar.xz"; }; }; svgpart = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/svgpart-21.08.2.tar.xz"; - sha256 = "14xgwdvpcvgw0jj4gy3175ah38x9f8lhknqbw5bczvm9cy8j7qfw"; - name = "svgpart-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/svgpart-21.08.3.tar.xz"; + sha256 = "1zpzmhgvxlyalq4nn446k7plz5fw2pl4r7zv7q3hjrzla1wgcqx8"; + name = "svgpart-21.08.3.tar.xz"; }; }; sweeper = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/sweeper-21.08.2.tar.xz"; - sha256 = "1yvcfdhapml1vzqns67v6j2c39g752f8czxs7bnczi69fq1ksh0b"; - name = "sweeper-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/sweeper-21.08.3.tar.xz"; + sha256 = "0sa8dfx26m9ry3pvqryx41w51l76r8l2xh16b783ixqln7x08z5j"; + name = "sweeper-21.08.3.tar.xz"; }; }; umbrello = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/umbrello-21.08.2.tar.xz"; - sha256 = "1xiz006ppgss6rxg7lndgnrbcdbm0iq1hjly3rjn943ff11wq5yr"; - name = "umbrello-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/umbrello-21.08.3.tar.xz"; + sha256 = "025qds7nahm6kpi94j4blk8xpv6vh2alrbgwby20vvn3h678z26x"; + name = "umbrello-21.08.3.tar.xz"; }; }; yakuake = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/yakuake-21.08.2.tar.xz"; - sha256 = "1d8dh10jkpm4pm8fh1bmkdwvv59gk0fg6dr3gahlspnh4hhzy4hg"; - name = "yakuake-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/yakuake-21.08.3.tar.xz"; + sha256 = "1za4vhnr495dadrarqqanavmyn1mmzm3y8jx05cpbjyqmlm353dk"; + name = "yakuake-21.08.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.08.2"; + version = "21.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.2/src/zeroconf-ioslave-21.08.2.tar.xz"; - sha256 = "0xgm4y29iklal5kd5z76jdw6wgw0mg9xn0f0d07zyshv5hjgllv6"; - name = "zeroconf-ioslave-21.08.2.tar.xz"; + url = "${mirror}/stable/release-service/21.08.3/src/zeroconf-ioslave-21.08.3.tar.xz"; + sha256 = "1dkig267znwyw03fq6mpdb5g1xnkhr0brnvxskjm44a4d5ipbv2g"; + name = "zeroconf-ioslave-21.08.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 62cba4a5b736..de463cfd6665 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - name = "abook-0.6.1"; + pname = "abook"; + version = "0.6.1"; src = fetchurl { - url = "http://abook.sourceforge.net/devel/${name}.tar.gz"; + url = "http://abook.sourceforge.net/devel/abook-${version}.tar.gz"; sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh"; }; patches = [ (fetchpatch { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc5.patch?h=packages/abook"; - name = "gcc5.patch"; - sha256 = "13n3qd6yy45i5n8ppjn9hj6y63ymjrq96280683xk7f7rjavw5nn"; - }) + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc5.patch?h=packages/abook"; + name = "gcc5.patch"; + sha256 = "13n3qd6yy45i5n8ppjn9hj6y63ymjrq96280683xk7f7rjavw5nn"; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 8f1b3f5ca88f..2bce30365f08 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,13 +1,23 @@ -{ lib, stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib -, gdk-pixbuf, gdk-pixbuf-xlib }: - -assert stdenv.hostPlatform.system == "i686-linux"; - -let version = "9.5.5"; in - -stdenv.mkDerivation { - name = "adobe-reader-${version}-1"; - +{ lib +, stdenv +, fetchurl +, libX11 +, cups +, zlib +, libxml2 +, pango +, atk +, gtk2 +, glib +, gdk-pixbuf +, gdk-pixbuf-xlib +}: + +stdenv.mkDerivation rec { + pname = "adobe-reader"; + version = "9.5.5"; + + # TODO: convert to phases builder = ./builder.sh; src = fetchurl { @@ -16,11 +26,8 @@ stdenv.mkDerivation { }; # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. - # We should probably remove those and use the regular Nixpkgs - # versions. - - libPath = lib.makeLibraryPath - [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; + # We should probably remove those and use the regular Nixpkgs versions. + libPath = lib.makeLibraryPath [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; @@ -32,5 +39,6 @@ stdenv.mkDerivation { "Numerous unresolved vulnerabilities" "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" ]; + platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 9baf2d4d2f24..29a932f40d58 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,54 +1,72 @@ -{ config, lib, stdenv, fetchurl, pkg-config, CoreAudio -, enableAlsa ? true, alsa-lib ? null -, enableLibao ? true, libao ? null -, enableLame ? config.sox.enableLame or false, lame ? null -, enableLibmad ? true, libmad ? null -, enableLibogg ? true, libogg ? null, libvorbis ? null -, enableOpusfile ? true, opusfile ? null -, enableFLAC ? true, flac ? null -, enablePNG ? true, libpng ? null -, enableLibsndfile ? true, libsndfile ? null -, enableWavpack ? true, wavpack ? null -# amrnb and amrwb are unfree, disabled by default -, enableAMR ? false, amrnb ? null, amrwb ? null -, enableLibpulseaudio ? true, libpulseaudio ? null +{ config +, lib +, stdenv +, fetchurl +, pkg-config +, CoreAudio +, enableAlsa ? true +, alsa-lib +, enableLibao ? true +, libao +, enableLame ? config.sox.enableLame or false +, lame +, enableLibmad ? true +, libmad +, enableLibogg ? true +, libogg +, libvorbis +, enableOpusfile ? true +, opusfile +, enableFLAC ? true +, flac +, enablePNG ? true +, libpng +, enableLibsndfile ? true +, libsndfile +, enableWavpack ? true +, wavpack + # amrnb and amrwb are unfree, disabled by default +, enableAMR ? false +, amrnb +, amrwb +, enableLibpulseaudio ? stdenv.isLinux +, libpulseaudio }: -with lib; - stdenv.mkDerivation rec { - name = "sox-14.4.2"; + pname = "sox"; + version = "14.4.2"; src = fetchurl { - url = "mirror://sourceforge/sox/${name}.tar.gz"; + url = "mirror://sourceforge/sox/sox-${version}.tar.gz"; sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; }; # configure.ac uses pkg-config only to locate libopusfile - nativeBuildInputs = optional enableOpusfile pkg-config; + nativeBuildInputs = lib.optional enableOpusfile pkg-config; patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; buildInputs = - optional (enableAlsa && stdenv.isLinux) alsa-lib ++ - optional enableLibao libao ++ - optional enableLame lame ++ - optional enableLibmad libmad ++ - optionals enableLibogg [ libogg libvorbis ] ++ - optional enableOpusfile opusfile ++ - optional enableFLAC flac ++ - optional enablePNG libpng ++ - optional enableLibsndfile libsndfile ++ - optional enableWavpack wavpack ++ - optionals enableAMR [ amrnb amrwb ] ++ - optional enableLibpulseaudio libpulseaudio ++ - optional (stdenv.isDarwin) CoreAudio; + lib.optional (enableAlsa && stdenv.isLinux) alsa-lib + ++ lib.optional enableLibao libao + ++ lib.optional enableLame lame + ++ lib.optional enableLibmad libmad + ++ lib.optionals enableLibogg [ libogg libvorbis ] + ++ lib.optional enableOpusfile opusfile + ++ lib.optional enableFLAC flac + ++ lib.optional enablePNG libpng + ++ lib.optional enableLibsndfile libsndfile + ++ lib.optional enableWavpack wavpack + ++ lib.optionals enableAMR [ amrnb amrwb ] + ++ lib.optional enableLibpulseaudio libpulseaudio + ++ lib.optional stdenv.isDarwin CoreAudio; - meta = { + meta = with lib; { description = "Sample Rate Converter for audio"; homepage = "http://sox.sourceforge.net/"; - maintainers = [ lib.maintainers.marcweber ]; - license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with maintainers; [ marcweber ]; + license = if enableAMR then licenses.unfree else licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 9c8a99a59347..99cdc9ade21b 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }: -stdenv.mkDerivation { - name = "wavesurfer-1.8.5"; +stdenv.mkDerivation rec { + pname = "wavesurfer"; + version = "1.8.5"; src = fetchurl { - url = "https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz"; + url = "https://www.speech.kth.se/wavesurfer/wavesurfer-${version}.tar.gz"; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index 6b09a2e38d8c..10aac715b48a 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "wavrsocvt-1.0.2.0"; + pname = "wavrsocvt"; + version = "1.0.2.0"; src = fetchurl { url = "http://bricxcc.sourceforge.net/wavrsocvt.tgz"; @@ -10,23 +11,23 @@ stdenv.mkDerivation { unpackPhase = '' tar -zxf $src - ''; + ''; installPhase = '' mkdir -p $out/bin cp wavrsocvt $out/bin - ''; + ''; meta = with lib; { description = "Convert .wav files into sound files for Lego NXT brick"; longDescription = '' - wavrsocvt is a command-line utility which can be used from a - terminal window or script to convert .wav files into sound - files for the NXT brick (.rso files). It can also convert the - other direction (i.e., .rso -> .wav). It can produce RSO files - with a sample rate between 2000 and 16000 (the min/max range of - supported sample rates in the standard NXT firmware). - You can then upload these with e.g. nxt-python. + wavrsocvt is a command-line utility which can be used from a + terminal window or script to convert .wav files into sound + files for the NXT brick (.rso files). It can also convert the + other direction (i.e., .rso -> .wav). It can produce RSO files + with a sample rate between 2000 and 16000 (the min/max range of + supported sample rates in the standard NXT firmware). + You can then upload these with e.g. nxt-python. ''; homepage = "http://bricxcc.sourceforge.net/"; license = licenses.mpl11; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 61cab2b6a2a4..0a42e6f5e2cd 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg-utils }: stdenv.mkDerivation { - name = "avrdudess-2.2.20140102"; + pname = "avrdudess"; + version = "2.2.20140102"; src = fetchurl { url = "http://blog.zakkemble.co.uk/download/avrdudess_20140102.zip"; diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 9c6b1812683a..768eb7b308e4 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }: stdenv.mkDerivation { - name = "catclock-2015-10-04"; + pname = "catclock"; + version = "unstable-2015-10-04"; src = fetchFromGitHub { owner = "BarkyTheDog"; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 61150d56fbbd..5802f21a8749 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -13,7 +13,6 @@ , sqlite , curl , libuchardet -, fmt , spdlog }: @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { sqlite curl libuchardet - fmt spdlog ]; diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix index a4283e5ebb93..7a1ae7a9e2f4 100644 --- a/pkgs/applications/misc/colort/default.nix +++ b/pkgs/applications/misc/colort/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "colort-unstable-2017-03-12"; + pname = "colort"; + version = "unstable-2017-03-12"; src = fetchFromGitHub { owner = "neeasade"; @@ -10,7 +11,7 @@ stdenv.mkDerivation { sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw"; }; - makeFlags = ["PREFIX=$(out)"]; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "A program for 'tinting' color values"; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index 148553da1621..3c74aaaded4a 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Makefile --replace "--static" "" - '' + lib.optionalString stdenv.isi686 '' - substituteInPlace Makefile --replace "-flto" "" ''; installPhase = '' diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 649fbe55fae2..3c193d3f569a 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -10,10 +10,11 @@ let }; in stdenv.mkDerivation rec { - name = "ding-1.9"; + pname = "ding"; + version = "1.9"; src = fetchurl { - url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz"; + url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${version}.tar.gz"; sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; }; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 62f02ce67142..42bc05998667 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: stdenv.mkDerivation rec { - name = "dmenu-5.0"; + pname = "dmenu"; + version = "5.0"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz"; sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y"; }; @@ -24,10 +25,10 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" ]; meta = with lib; { - description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = "https://tools.suckless.org/dmenu"; - license = licenses.mit; - maintainers = with maintainers; [ pSub globin ]; - platforms = platforms.all; + description = "A generic, highly customizable, and efficient menu for the X Window System"; + homepage = "https://tools.suckless.org/dmenu"; + license = licenses.mit; + maintainers = with maintainers; [ pSub globin ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 67753b6e3710..698a9b7c3b5f 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,29 +1,22 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, fetchpatch +{ stdenv, lib, fetchFromGitHub, makeWrapper , pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , wayland, wayland-protocols , libXinerama, libnotify, pango, xorgproto, librsvg +, testVersion, dunst }: stdenv.mkDerivation rec { pname = "dunst"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-BWbvGetXXCXbfPRY+u6gEfzBmX8PLSnI6a5vfCByiC0="; + sha256 = "0v15fhwzcg7zfn092sry0f4qb6dccz9bb312y9dadg745wf3n9qw"; }; - patches = [ - (fetchpatch { - # fixes double free (https://github.com/dunst-project/dunst/issues/957) - url = "https://github.com/dunst-project/dunst/commit/dc8efbbaff0e9ba881fa187a01bfe5c033fbdcf9.patch"; - sha256 = "sha256-xuODOFDP9Eqr3g8OtNnaMmTihhurfj2NLeZPr0TF4vY="; - }) - ]; - nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; buildInputs = [ @@ -47,6 +40,8 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; + passthru.tests.version = testVersion { package = dunst; }; + meta = with lib; { description = "Lightweight and customizable notification daemon"; homepage = "https://dunst-project.org/"; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 87eaed975352..3e74d04c5128 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick -, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: +, libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }: stdenv.mkDerivation rec { pname = "far2l"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; - buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build + buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index c2347d5fbb8b..c684d273bc75 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -1,9 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config -, bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, bzip2 +, curl +, expat +, fribidi +, libunibreak +, sqlite +, zlib , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" -, qt4, gtk2 -, AppKit, Cocoa +, qt4 +, gtk2 +, AppKit +, Cocoa }: with lib; @@ -16,7 +28,8 @@ assert uiTarget == "macosx" -> uiType == "cocoa"; # which is way to old and no longer in nixpkgs. stdenv.mkDerivation { - name = "fbreader-${uiType}-0.99.6"; + pname = "fbreader-${uiType}"; + version = "0.99.6"; src = fetchFromGitHub { owner = "geometer"; @@ -53,7 +66,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - bzip2 curl expat fribidi libunibreak sqlite zlib + bzip2 + curl + expat + fribidi + libunibreak + sqlite + zlib ] ++ optional (uiType == "qt4") qt4 ++ optional (uiType == "gtk") gtk2 @@ -68,7 +87,7 @@ stdenv.mkDerivation { homepage = "http://www.fbreader.org/"; license = licenses.gpl3; broken = stdenv.isDarwin # untested, might work - || uiType == "gtk"; # builds, but the result is unusable, hangs a lot + || uiType == "gtk"; # builds, but the result is unusable, hangs a lot platforms = platforms.unix; maintainers = [ maintainers.coroa ]; }; diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index 992b62780828..69050ca661f9 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, pkg-config, gtk2, keybinder, fetchFromGitLab }: stdenv.mkDerivation { - name = "fehlstart-9f4342d7"; + pname = "fehlstart"; + version = "unstable-2016-05-23"; src = fetchFromGitLab { owner = "fehlstart"; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 656a5f3bea48..20590552fc99 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -1,15 +1,15 @@ -{ lib, buildPythonApplication, fetchPypi, requests, pytestCheckHook }: +{ lib, buildPythonApplication, fetchPypi, requests, youtube-dl, pytestCheckHook }: buildPythonApplication rec { pname = "gallery_dl"; - version = "1.19.1"; + version = "1.19.2"; src = fetchPypi { inherit pname version; - sha256 = "ea1a7bf908507a87edffde6d6be93b8859ab0832ca788b61690a13aa5dd52216"; + sha256 = "7fec9ac69582dbd9922666e6ece3142ae52dc9679a2c4a613f6ee94ad09e5f68"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests youtube-dl ]; checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index c2c3a69140b9..c401b2722565 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,26 +1,39 @@ -{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }: -stdenv.mkDerivation { - name = "garmin-plugin-0.3.26"; - src = fetchurl { - url = "https://github.com/adiesner/GarminPlugin/archive/V0.3.26.tar.gz"; - sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; +{ lib, stdenv, fetchFromGitHub, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }: + +stdenv.mkDerivation rec { + pname = "garmin-plugin"; + version = "0.3.26"; + + src = fetchFromGitHub { + owner = "adiesner"; + repo = "GarminPlugin"; + rev = "V${version}"; + sha256 = "sha256-l0WAbEsQl1dCADf5gTepYjsA1rQCJMLcrTxRR4PfUus="; }; - sourceRoot = "GarminPlugin-0.3.26/src"; + + preConfigure = '' + cd src + ''; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; + configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" "--with-garmintools-libdir=${garmintools}/lib" ]; + installPhase = '' mkdir -p $out/lib/mozilla/plugins cp npGarminPlugin.so $out/lib/mozilla/plugins ''; - meta = { - homepage = "http://www.andreas-diesner.de/garminplugin"; - license = lib.licenses.gpl3; - maintainers = [ ]; - platforms = lib.platforms.linux; + + meta = with lib; { + homepage = "https://adiesner.github.io/GarminPlugin/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index aaaab255c763..0a62ce4ea518 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,20 +1,32 @@ -{ lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which -, IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook +{ lib +, fetchurl +, stdenv +, gettext +, pkg-config +, glib +, gtk2 +, libX11 +, libSM +, libICE +, which +, IOKit +, copyDesktopItems +, makeDesktopItem +, wrapGAppsHook }: -with lib; - stdenv.mkDerivation rec { - name = "gkrellm-2.3.11"; + pname = "gkrellm"; + version = "2.3.11"; src = fetchurl { - url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2"; + url = "http://gkrellm.srcbox.net/releases/gkrellm-${version}.tar.bz2"; sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ]; - buildInputs = [gettext glib gtk2 libX11 libSM libICE] - ++ optionals stdenv.isDarwin [ IOKit ]; + buildInputs = [ gettext glib gtk2 libX11 libSM libICE ] + ++ lib.optionals stdenv.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; @@ -48,7 +60,7 @@ stdenv.mkDerivation rec { }) ]; - meta = { + meta = with lib; { description = "Themeable process stack of system monitors"; longDescription = '' GKrellM is a single process stack of system monitors which diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index af204b235062..0d567dd79a10 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpg-error, libassuan }: stdenv.mkDerivation rec { - name = "gpa-0.10.0"; + pname = "gpa"; + version = "0.10.0"; src = fetchurl { - url = "mirror://gnupg/gpa/${name}.tar.bz2"; + url = "mirror://gnupg/gpa/gpa-${version}.tar.bz2"; sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm"; }; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index bbe77c182205..85fef2cbb00d 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "9.6"; + version = "9.11"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-Yj8lR8zgIV+gshea7rzLbMF84n1nyN3DytiIkr3B274="; + sha256 = "sha256-5FGdcmkVOxjDngVQIlXnH3OPRMjaixqJ2Xb239usUuo="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 557cd45c42c9..6a6666763c18 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -15,10 +15,11 @@ }: stdenv.mkDerivation rec { - name = "grip-4.2.2"; + pname = "grip"; + version = "4.2.2"; src = fetchurl { - url = "mirror://sourceforge/grip/${name}.tar.gz"; + url = "mirror://sourceforge/grip/grip-${version}.tar.gz"; sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE="; }; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index aa07058dc808..851f2d80c976 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }: -let - name = "gv-3.7.4"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "gv"; + version = "3.7.4"; src = fetchurl { - url = "mirror://gnu/gv/${name}.tar.gz"; + url = "mirror://gnu/gv/gv-${version}.tar.gz"; sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 9e8c5ddaef4a..7c32cec72192 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: -stdenv.mkDerivation { - name = "gxneur-0.20.0"; +stdenv.mkDerivation rec { + pname = "gxneur"; + version = "0.20.0"; src = fetchurl { - url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz"; + url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/${version}/gxneur_${version}.orig.tar.gz"; sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; }; @@ -13,8 +14,17 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ - xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur - libglade GConf pcre libappindicator-gtk2 + xorg.libX11 + glib + gtk2 + xorg.libXpm + xorg.libXt + xorg.libXext + xneur + libglade + GConf + pcre + libappindicator-gtk2 ]; meta = with lib; { diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index b4573a816359..9e07193cdb7f 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, db, gtk2, bzip2 }: -stdenv.mkDerivation { - name = "jigdo-0.7.3"; +stdenv.mkDerivation rec { + pname = "jigdo"; + version = "0.7.3"; - # Debian sources src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz"; + url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_${version}.orig.tar.gz"; sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; }; @@ -21,10 +21,11 @@ stdenv.mkDerivation { configureFlags = [ "--without-libdb" ]; - meta = { + meta = with lib; { description = "Download utility that can fetch files from several sources simultaneously"; - homepage = "http://atterer.net/jigdo/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; + homepage = "http://atterer.org/jigdo/"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 65f9a9f0f17e..2e7a1365f4d2 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -1,18 +1,17 @@ -{ lib, python27Packages, fetchgit }: -let - py = python27Packages; - python = py.python; -in -py.buildPythonApplication { - name = "loxodo-0.20150124"; +{ lib, python2, fetchFromGitHub }: - src = fetchgit { - url = "https://github.com/sommer/loxodo.git"; +python2.pkgs.buildPythonApplication { + pname = "loxodo"; + version = "unstable-2015-01-24"; + + src = fetchFromGitHub { + owner = "sommer"; + repo = "loxodo"; rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795"; sha256 = "1cg0dfcv57ps54f1a0ksib7hgkrbdi9q699w302xyyfyvjcb5dd2"; }; - propagatedBuildInputs = with py; [ wxPython ]; + propagatedBuildInputs = with python2.pkgs; [ wxPython ]; postInstall = '' mv $out/bin/loxodo.py $out/bin/loxodo @@ -21,7 +20,7 @@ py.buildPythonApplication { [Desktop Entry] Type=Application Exec=$out/bin/loxodo - Icon=$out/lib/${python.libPrefix}/site-packages/resources/loxodo-icon.png + Icon=$out/lib/${python2.libPrefix}/site-packages/resources/loxodo-icon.png Name=Loxodo GenericName=Password Vault Categories=Application;Other; @@ -33,5 +32,6 @@ py.buildPythonApplication { homepage = "https://www.christoph-sommer.de/loxodo/"; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/applications/misc/mencal/default.nix index 806d6a53cfaa..c4973b275534 100644 --- a/pkgs/applications/misc/mencal/default.nix +++ b/pkgs/applications/misc/mencal/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mencal-3.0"; + pname = "mencal"; + version = "3.0"; src = fetchurl { - url = "http://kyberdigi.cz/projects/mencal/files/${name}.tar.gz"; + url = "http://kyberdigi.cz/projects/mencal/files/mencal-${version}.tar.gz"; sha256 = "9328d0b2f3f57847e8753c5184531f4832be7123d1b6623afdff892074c03080"; }; installPhase = '' - mkdir -p $out/bin - cp mencal $out/bin/ - ''; + mkdir -p $out/bin + cp mencal $out/bin/ + ''; buildInputs = [ perl ]; diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/applications/misc/metar/default.nix index d9e1922f1c48..07ac41f7281e 100644 --- a/pkgs/applications/misc/metar/default.nix +++ b/pkgs/applications/misc/metar/default.nix @@ -1,10 +1,12 @@ -{ lib, stdenv, fetchgit, curl }: +{ lib, stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation { - name = "metar-20161013.1"; + pname = "metar"; + version = "unstable-2017-02-17"; - src = fetchgit { - url = "https://github.com/keesL/metar.git"; + src = fetchFromGitHub { + owner = "keesL"; + repo = "metar"; rev = "20e9ca69faea330f6c2493b6829131c24cb55147"; sha256 = "1fgrlnpasqf1ihh9y6zy6mzzybqx0lxvh7gmv03rjdb55dr42dxj"; }; @@ -13,8 +15,6 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/keesL/metar"; - license = licenses.gpl2; - maintainers = [ maintainers.zalakain ]; description = "Downloads weather reports and optionally decodes them"; longDescription = '' METAR reports are meteorogical weather reports for aviation. Metar is a small @@ -26,5 +26,7 @@ stdenv.mkDerivation { more work in the area of clouds need to be done, as support for Cumulus or Cumulunimbus is not yet decoded. ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ zalakain ]; }; } diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index 69aca239d311..bfdfeebae271 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, socat, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation { - name = "mpvc-unstable-2017-03-18"; + pname = "mpvc"; + version = "unstable-2017-03-18"; src = fetchFromGitHub { owner = "wildefyr"; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 0727f8672910..6527a4f57411 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { - name = "navipowm-0.2.4"; + pname = "navipowm"; + version = "0.2.4"; src = fetchurl { - url = "mirror://sourceforge/navipowm/NaviPOWM-0.2.4.tar.gz"; + url = "mirror://sourceforge/navipowm/NaviPOWM-${version}.tar.gz"; sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b"; }; @@ -12,10 +13,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/share/${name}/Icons + mkdir -p $out/bin $out/share/navipowm-${version}/Icons cp bin/NaviPOWM $out/bin - cp ../../common/Config/navipowm.ini $out/share/${name} - cp ../../common/Images/* $out/share/${name} + cp ../../common/Config/navipowm.ini $out/share/navipowm-${version} + cp ../../common/Images/* $out/share/navipowm-${version} ''; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 9809a2a62058..76a583fc8fdf 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "0.5.0"; + version = "1.0.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - sha256 = "1hh66i0rfm85a97iajxlh965wk68hn0kkfgi9cljjkqf98xiy0bb"; + sha256 = "1mr0rmm7hcyn8qr485h1ihbb5f581sab4fgvs7lhwy9lxsqk0r0l"; }; postPatch = '' diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 663a7bf43eae..c0fb436b7f8a 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -2,7 +2,8 @@ mkDerivation { - name = "openbrf-unstable-2016-01-09"; + pname = "openbrf"; + version = "unstable-2016-01-09"; src = fetchFromGitHub { owner = "cfcohen"; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index a8b407dd7b5d..deb9a98a517c 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config -, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }: +{ lib +, stdenv +, fetchurl +, glib +, intltool +, libfm +, libX11 +, pango +, pkg-config +, wrapGAppsHook +, gnome +, withGtk3 ? true +, gtk2 +, gtk3 +}: let libfm' = libfm.override { inherit withGtk3; }; @@ -7,9 +20,11 @@ let inherit (lib) optional; in stdenv.mkDerivation rec { - name = "pcmanfm-1.3.2"; + pname = "pcmanfm"; + version = "1.3.2"; + src = fetchurl { - url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; + url = "mirror://sourceforge/pcmanfm/pcmanfm-${version}.tar.xz"; sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 602ac3e5e3b4..77e5e34899ea 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }: -stdenv.mkDerivation { - name = "posterazor-1.5.1"; +stdenv.mkDerivation rec { + pname = "posterazor"; + version = "1.5.1"; src = fetchurl { - url = "mirror://sourceforge/posterazor/1.5.1/PosteRazor-1.5.1-Source.zip"; + url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip"; sha256 = "1dqpdk8zl0smdg4fganp3hxb943q40619qmxjlga9jhjc01s7fq5"; }; diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 1244347cc53c..dafc73925b54 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -1,7 +1,13 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "procmail-3.22"; +stdenv.mkDerivation rec { + pname = "procmail"; + version = "3.22"; + + src = fetchurl { + url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz"; + sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; + }; patches = [ ./CVE-2014-3618.patch @@ -15,20 +21,16 @@ stdenv.mkDerivation { # getline is defined differently in glibc now. So rename it. # Without the .PHONY target "make install" won't install anything on Darwin. postPatch = '' - sed -e "s%^RM.*$%#%" -i Makefile - sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile - sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile + sed -i Makefile \ + -e "s%^RM.*$%#%" \ + -e "s%^BASENAME.*%\BASENAME=$out%" \ + -e "s%^LIBS=.*%LIBS=-lm%" sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h sed -e "3i\ -.PHONY: install -" -i Makefile + .PHONY: install + " -i Makefile ''; - src = fetchurl { - url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz"; - sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; - }; - meta = with lib; { description = "Mail processing and filtering utility"; homepage = "http://www.procmail.org/"; diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index b243f1941817..739003720447 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }: stdenv.mkDerivation rec { - name = "ptask-1.0.0"; + pname = "ptask"; + version = "1.0.0"; src = fetchurl { - url = "https://wpitchoune.net/ptask/files/${name}.tar.gz"; + url = "https://wpitchoune.net/ptask/files/ptask-${version}.tar.gz"; sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq"; }; diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix index 6c9e5f6feff8..569ae6ef4cd8 100644 --- a/pkgs/applications/misc/rofi-menugen/default.nix +++ b/pkgs/applications/misc/rofi-menugen/default.nix @@ -1,24 +1,28 @@ { lib, stdenv, fetchFromGitHub, rofi, gnused }: stdenv.mkDerivation rec { - rev = "168efd2608fdb88b1aff3e0244bda8402169f207"; - name = "rofi-menugen-2015-12-28-${builtins.substring 0 7 rev}"; + pname = "rofi-menugen"; + version = "unstable-2015-12-28"; + src = fetchFromGitHub { owner = "octotep"; repo = "menugen"; - inherit rev; + rev = "168efd2608fdb88b1aff3e0244bda8402169f207"; sha256 = "09fk9i6crw772qlc5zld35pcff1jq4jcag0syial2q000fbpjx5m"; }; - patchPhase = '' + + postPatch = '' sed -i -e "s|menugenbase|$out/bin/rofi-menugenbase|" menugen sed -i -e "s|rofi |${rofi}/bin/rofi |" menugen sed -i -e "s|sed |${gnused}/bin/sed |" menugenbase ''; + installPhase = '' mkdir -p $out/bin cp menugen $out/bin/rofi-menugen cp menugenbase $out/bin/rofi-menugenbase ''; + meta = with lib; { description = "Generates menu based applications using rofi"; homepage = "https://github.com/octotep/menugen"; diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 215447ed4e9f..4ddfa6f9cf28 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sbagen-1.4.4"; + pname = "sbagen"; + version = "1.4.4"; src = fetchurl { - url = "https://uazu.net/sbagen/${name}.tgz"; + url = "https://uazu.net/sbagen/sbagen-${version}.tgz"; sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2"; }; diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/misc/sfm/default.nix index 355c5915db27..808e64cdcce5 100644 --- a/pkgs/applications/misc/sfm/default.nix +++ b/pkgs/applications/misc/sfm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sfm"; - version = "0.3.1"; + version = "0.4"; src = fetchFromGitHub { owner = "afify"; repo = pname; rev = "v${version}"; - hash = "sha256-NmafUezwKK9bYPAWDNhegyjqkb4GY/i1WEtQ9puIaig="; + hash = "sha256-VwPux6n+azpR4qDkzZJia95pJJOaFDBBoz6/VwlC0zw="; }; configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index f263c4ee74dd..124ae206c8ce 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , cmake , pkg-config , wxGTK @@ -15,7 +17,8 @@ }: stdenv.mkDerivation { - name = "slade-git-3.2.0.2021.05.13"; + pname = "slade"; + version = "unstable-2021-05-13"; src = fetchFromGitHub { owner = "sirjuddington"; diff --git a/pkgs/applications/misc/smpq/default.nix b/pkgs/applications/misc/smpq/default.nix new file mode 100644 index 000000000000..fd6b5937b8e5 --- /dev/null +++ b/pkgs/applications/misc/smpq/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, cmake, StormLib }: + +stdenv.mkDerivation rec { + pname = "smpq"; + version = "1.6"; + + src = fetchurl { + url = "https://launchpad.net/smpq/trunk/${version}/+download/${pname}_${version}.orig.tar.gz"; + sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm"; + }; + + cmakeFlags = [ + "-DWITH_KDE=OFF" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ StormLib ]; + + meta = with lib; { + description = "StormLib MPQ archiving utility"; + homepage = "https://launchpad.net/smpq"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ aanderse karolchmist ]; + }; +} diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/applications/misc/speedread/default.nix index a7b9cb591a5e..451382cda373 100644 --- a/pkgs/applications/misc/speedread/default.nix +++ b/pkgs/applications/misc/speedread/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "speedread-unstable-2016-09-21"; + pname = "speedread"; + version = "unstable-2016-09-21"; src = fetchFromGitHub { - owner = "pasky"; - repo = "speedread"; - rev = "93acfd61a1bf4482537ce5d71b9164b8446cb6bd"; + owner = "pasky"; + repo = "speedread"; + rev = "93acfd61a1bf4482537ce5d71b9164b8446cb6bd"; sha256 = "1h94jx3v18fdlc64lfmj2g5x63fjyqb8c56k5lihl7bva0xgdkxd"; }; diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 03c90af23689..f9c91d28f14a 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -1,10 +1,12 @@ -{ lib, stdenv, fetchgit, curses }: +{ lib, stdenv, fetchFromGitHub, curses }: stdenv.mkDerivation { - name = "stag-1.0"; + pname = "stag"; + version = "1.0"; - src = fetchgit { - url = "https://github.com/seenaburns/stag.git"; + src = fetchFromGitHub { + owner = "seenaburns"; + repo = "stag"; rev = "90e2964959ea8242349250640d24cee3d1966ad6"; sha256 = "1yrzjhcwrxrxq5jj695wvpgb0pz047m88yq5n5ymkcw5qr78fy1v"; }; @@ -15,11 +17,11 @@ stdenv.mkDerivation { make install PREFIX=$out ''; - meta = { + meta = with lib; { homepage = "https://github.com/seenaburns/stag"; description = "Terminal streaming bar graph passed through stdin"; - license = lib.licenses.bsdOriginal; - maintainers = [ lib.maintainers.matthiasbeyer ]; - platforms = lib.platforms.unix; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ matthiasbeyer ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/synergy/build-tests.patch b/pkgs/applications/misc/synergy/build-tests.patch deleted file mode 100644 index ab08195e794d..000000000000 --- a/pkgs/applications/misc/synergy/build-tests.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 9c2278dad498b8e4040f30c80cf65b3a089ba218 Mon Sep 17 00:00:00 2001 -From: talyz <kim.lindberger@gmail.com> -Date: Fri, 14 Feb 2020 16:26:36 +0100 -Subject: [PATCH] Build tests again - -The tests were accidentally disabled in -688095d0a7d22704b5c3282bc68b41ceca42ab7e. Since then, the code has -drifted slightly: the synergy lib has been renamed from synergy to -synlib in 4263fd17177d7717b04ac6d6ec62efa2f657ed74 and the curl -dependency was dropped in 491bb2de000245a943b8298462c4a9d8f34c9a44. - -This reenables the tests, targets the right lib and removes the -obsolete test. ---- - src/CMakeLists.txt | 2 + - src/test/integtests/CMakeLists.txt | 2 +- - .../integtests/arch/ArchInternetTests.cpp | 37 ------------------- - src/test/unittests/CMakeLists.txt | 2 +- - 4 files changed, 4 insertions(+), 39 deletions(-) - delete mode 100644 src/test/integtests/arch/ArchInternetTests.cpp - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ab63a066..fee080ab 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -22,3 +22,5 @@ add_subdirectory(cmd) - if (SYNERGY_BUILD_LEGACY_GUI) - add_subdirectory(gui) - endif (SYNERGY_BUILD_LEGACY_GUI) -+ -+add_subdirectory(test) -diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt -index f39968a3..096ba3d5 100644 ---- a/src/test/integtests/CMakeLists.txt -+++ b/src/test/integtests/CMakeLists.txt -@@ -68,4 +68,4 @@ endif() - - add_executable(integtests ${sources}) - target_link_libraries(integtests -- arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS}) -+ arch base client common io ipc mt net platform server synlib gtest gmock ${libs} ${OPENSSL_LIBS}) -diff --git a/src/test/integtests/arch/ArchInternetTests.cpp b/src/test/integtests/arch/ArchInternetTests.cpp -deleted file mode 100644 -index 95823e9f..00000000 ---- a/src/test/integtests/arch/ArchInternetTests.cpp -+++ /dev/null -@@ -1,37 +0,0 @@ --/* -- * synergy -- mouse and keyboard sharing utility -- * Copyright (C) 2014-2016 Symless Ltd. -- * -- * This package is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License -- * found in the file LICENSE that should have accompanied this file. -- * -- * This package is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program. If not, see <http://www.gnu.org/licenses/>. -- */ -- --#include "arch/Arch.h" -- --#include "test/global/gtest.h" -- --#define TEST_URL "https://symless.com/tests/?testString" --//#define TEST_URL "http://localhost/synergy/tests/?testString" -- --TEST(ArchInternetTests, get) --{ -- ARCH_INTERNET internet; -- String result = internet.get(TEST_URL); -- ASSERT_EQ("Hello world!", result); --} -- --TEST(ArchInternetTests, urlEncode) --{ -- ARCH_INTERNET internet; -- String result = internet.urlEncode("hello=+&world"); -- ASSERT_EQ("hello%3D%2B%26world", result); --} -diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt -index 54131eb2..46307e90 100644 ---- a/src/test/unittests/CMakeLists.txt -+++ b/src/test/unittests/CMakeLists.txt -@@ -68,4 +68,4 @@ endif() - - add_executable(unittests ${sources}) - target_link_libraries(unittests -- arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) -+ arch base client server common io net platform server synlib mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) --- -2.25.0 - diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 8d3cc8c30966..803456dc85f0 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,41 +1,90 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, openssl, qttools -, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver -, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat -, withGUI ? true, wrapQtAppsHook }: +{ withGUI ? true +, stdenv +, lib +, fetchpatch +, fetchFromGitHub +, wrapQtAppsHook + +, cmake +, openssl +, pcre +, util-linux +, libselinux +, libsepol +, pkg-config +, gdk-pixbuf +, libnotify +, qttools +, xlibsWrapper +, libX11 +, libXi +, libXtst +, libXrandr +, xinput +, avahi-compat + +# macOS / darwin +, ApplicationServices +, Carbon +, Cocoa +, CoreServices +, ScreenSaver +}: stdenv.mkDerivation rec { pname = "synergy"; - version = "1.13.1.41"; + version = "1.14.1.32"; src = fetchFromGitHub { owner = "symless"; repo = "synergy-core"; rev = "${version}-stable"; fetchSubmodules = true; - sha256 = "1phg0szc9g018zxs5wbys4drzq1cdhyzajfg45l6a3fmi6qdi1kw"; + sha256 = "123p75rm22vb3prw1igh0yii2y4bvv7r18iykfvmnr41hh4w7z2p"; }; - patches = lib.optional stdenv.isDarwin ./macos_build_fix.patch; + patches = [ ./macos_build_fix.patch ]; postPatch = '' substituteInPlace src/gui/src/SslCertificate.cpp \ --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";' ''; - cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"; + cmakeFlags = lib.optionals (!withGUI) [ + "-DSYNERGY_BUILD_LEGACY_GUI=OFF" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.09" + ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; - nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; dontWrapQtApps = true; buildInputs = [ openssl + pcre ] ++ lib.optionals withGUI [ qttools ] ++ lib.optionals stdenv.isDarwin [ - ApplicationServices Carbon Cocoa CoreServices ScreenSaver + ApplicationServices + Carbon + Cocoa + CoreServices + ScreenSaver ] ++ lib.optionals stdenv.isLinux [ - xlibsWrapper libX11 libXi libXtst libXrandr xinput avahi-compat + util-linux + libselinux + libsepol + xlibsWrapper + libX11 + libXi + libXtst + libXrandr + xinput + avahi-compat + gdk-pixbuf + libnotify ]; installPhase = '' @@ -60,7 +109,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Share one mouse and keyboard between multiple computers"; - homepage = "https://synergy-project.org/"; + homepage = "https://symless.com/synergy"; license = licenses.gpl2; maintainers = with maintainers; [ talyz ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/synergy/macos_build_fix.patch b/pkgs/applications/misc/synergy/macos_build_fix.patch index 50087a2c4b4b..c304f3bfdd44 100644 --- a/pkgs/applications/misc/synergy/macos_build_fix.patch +++ b/pkgs/applications/misc/synergy/macos_build_fix.patch @@ -1,20 +1,29 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1e78d1d..13639ba1 100644 +index 50e712fa..d39c2ce4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -328,14 +328,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - ${OPENSSL_ROOT}/lib/libssl.lib - ${OPENSSL_ROOT}/lib/libcrypto.lib - ) --elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -- set (OPENSSL_ROOT /usr/local/opt/openssl) -- include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include) -- set (OPENSSL_LIBS -- ${OPENSSL_ROOT}/lib/libssl.a -- ${OPENSSL_ROOT}/lib/libcrypto.a -- ) --elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly") -+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin|.*BSD|DragonFly") - set (OPENSSL_LIBS ssl crypto) - else() - message (FATAL_ERROR "Couldn't find OpenSSL") +@@ -326,9 +326,6 @@ endif() + # Apple has to use static libraries because + # "Use of the Apple-provided OpenSSL libraries by apps is strongly discouraged." + # https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html +-if(APPLE) +- set(OPENSSL_USE_STATIC_LIBS TRUE) +-endif() + find_package(OpenSSL REQUIRED) + + # +diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm +index 0c98afc1..38c190a6 100644 +--- a/src/gui/src/OSXHelpers.mm ++++ b/src/gui/src/OSXHelpers.mm +@@ -20,10 +20,6 @@ + #import <Foundation/Foundation.h> + #import <CoreData/CoreData.h> + #import <Cocoa/Cocoa.h> +-#import <UserNotifications/UNNotification.h> +-#import <UserNotifications/UNUserNotificationCenter.h> +-#import <UserNotifications/UNNotificationContent.h> +-#import <UserNotifications/UNNotificationTrigger.h> + + #import <QtGlobal> + diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index b7974966be45..d4b4d1d9d803 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,7 +1,8 @@ { lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkg-config, boost }: mkDerivation { - name = "twmn-git-2018-10-01"; + pname = "twmn"; + version = "unstable-2018-10-01"; src = fetchFromGitHub { owner = "sboli"; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index a38c1002a01f..38ea7c909c05 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -10,7 +10,6 @@ , gtkmm3 , libsigcxx , jsoncpp -, fmt , scdoc , spdlog , gtk-layer-shell @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { strictDeps = false; buildInputs = with lib; - [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] + [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional sndioSupport sndio diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index cb4f5ec34425..438bd5c5d56a 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { - name = "wmname-0.1"; + pname = "wmname"; + version = "0.1"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/wmname-${version}.tar.gz"; sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; }; diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index db7fe260b924..d57eb4878173 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }: -stdenv.mkDerivation { - name = "xcruiser-0.30"; +stdenv.mkDerivation rec { + pname = "xcruiser"; + version = "0.30"; src = fetchurl { - url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz"; - sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; - }; + url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-${version}/xcruiser-${version}.tar.gz"; + sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; + }; nativeBuildInputs = [ gccmakedep imake ]; buildInputs = [ libXt libXaw libXpm libXext ]; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 17e58cb54d71..d59b936608c8 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { - name = "xfe-1.42"; + pname = "xfe"; + version = "1.42"; src = fetchurl { - url = "mirror://sourceforge/xfe/${name}.tar.gz"; + url = "mirror://sourceforge/xfe/xfe-${version}.tar.gz"; sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; }; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "MS-Explorer like file manager for X"; longDescription = '' X File Explorer (Xfe) is an MS-Explorer like file manager for X. @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { Xfe aims to be the filemanager of choice for all the Unix addicts! ''; homepage = "https://sourceforge.net/projects/xfe/"; - license = lib.licenses.gpl2; - maintainers = []; - platforms = lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 365f6217861b..d056dd66e8da 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,17 +2,20 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw}: +{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }: + stdenv.mkDerivation rec { - name = "xfontsel-1.0.6"; + pname = "xfontsel"; + version = "1.0.6"; src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.bz2"; + url = "mirror://xorg/individual/app/xfontsel-${version}.tar.bz2"; sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [libX11 libXaw]; + + buildInputs = [ libX11 libXaw ]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; @@ -26,11 +29,11 @@ stdenv.mkDerivation rec { --set XAPPLRESDIR $out/share/X11/app-defaults ''; - meta = { + meta = with lib; { homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; - license = lib.licenses.free; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux ++ darwin; + license = licenses.free; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index 065ca813155d..61c696f1309e 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -1,8 +1,11 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl }: stdenv.mkDerivation { - name = "libxpdf-3.02pl5"; + pname = "libxpdf"; + version = "3.02pl5"; src = fetchurl { url = "https://dl.xpdfreader.com/old/xpdf-3.02.tar.gz"; diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix index e8e6490cbd64..22ad3d789ac9 100644 --- a/pkgs/applications/misc/xrq/default.nix +++ b/pkgs/applications/misc/xrq/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, libX11}: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation { - name = "xrq-unstable-2016-01-15"; + pname = "xrq"; + version = "unstable-2016-01-15"; src = fetchFromGitHub { owner = "arianon"; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index b579579195f6..d6514e58517e 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -1,21 +1,35 @@ -{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep -, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkg-config +{ lib +, stdenv +, fetchurl +, libX11 +, libXt +, libXext +, libXpm +, imake +, gccmakedep +, svgSupport ? false +, librsvg +, glib +, gdk-pixbuf +, pkg-config }: -assert svgSupport -> - librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null; - stdenv.mkDerivation rec { - name = "xxkb-1.11.1"; + pname = "xxkb"; + version = "1.11.1"; src = fetchurl { - url = "mirror://sourceforge/xxkb/${name}-src.tar.gz"; + url = "mirror://sourceforge/xxkb/xxkb-${version}-src.tar.gz"; sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; }; nativeBuildInputs = [ imake gccmakedep ]; + buildInputs = [ - libX11 libXt libXext libXpm + libX11 + libXt + libXext + libXpm ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; outputs = [ "out" "man" ]; @@ -33,11 +47,11 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; - meta = { + meta = with lib; { description = "A keyboard layout indicator and switcher"; homepage = "http://xxkb.sourceforge.net/"; - license = lib.licenses.artistic2; - maintainers = with lib.maintainers; [ rasendubi ]; - platforms = lib.platforms.linux; + license = licenses.artistic2; + maintainers = with maintainers; [ rasendubi ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 26b925d51a83..65aca548e4c3 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.0.1"; + version = "2.0.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-vnkZGxuLvj8Pjmey6NO3mcHuWbtO0bYEfgKwvgumbPA="; + sha256 = "sha256-AUGfD7FFB5+pfKyIqvychD4mvFU+GTRneQTRI+8bwBM="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d1cbe5d44732..689ef8c59154 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "94.0"; + version = "94.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5eb65450a0f1842d28d73235f3ef95fa1dbf8cf1467c354f13df51313bd227aaf5a48b741ee49b13378aaaf054bff52004c1dd5a274eddef4a3cf1b913ef7071"; + sha512 = "634665ed64f2ef205fad03ba023bc915df110c0d4b0a5e36aa470627808fbb3bce5418ea607f909d4e1eaf7d90c5dcacf398b8a434e26906dcfa366292a18b66"; }; meta = { diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c679b568736b..0e1f67800a20 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.5.10"; + version = "11.0"; lang = "en-US"; @@ -97,7 +97,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0mvclh2f2lqj5kf98p0xdbaa6wxshwb8dkcna5sl561cw8nnayc2"; + sha256 = "0938a9yjfg9qa9rv5acrmbgqq11mc8j0pvl1n64jrdz29crk6sj2"; }; i686-linux = fetchurl { @@ -105,7 +105,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1g714abhh3ynmparb516z5syl7i64n7s5mga0zxb4598bhzi5zkg"; + sha256 = "07v1ca66a69jl238qdq81mw654yffrcyq685y4rvv8xvx11fnzzp"; }; }; in diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index a802ce67941b..d24dff6fb8a9 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "helmfile"; @@ -15,17 +15,10 @@ buildGoModule rec { doCheck = false; - nativeBuildInputs = [ makeWrapper ]; - subPackages = [ "." ]; ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; - postInstall = '' - wrapProgram $out/bin/helmfile \ - --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} - ''; - meta = { description = "Deploy Kubernetes Helm charts"; homepage = "https://github.com/roboll/helmfile"; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index eb29cba7de88..02c1c834781a 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -4,19 +4,20 @@ , makeWrapper , git , go +, gnumake }: buildGoModule rec { pname = "kubebuilder"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "0bl5ff2cplal6hg75800crhyviamk1ws85sq60h4zg21hzf21y68"; + sha256 = "sha256-V/g2RHnZPa/9hkVG5WVXmbx6hnJAwUEyyUX/Q3OR2DM="; }; - vendorSha256 = "0zxyd950ksjswja64rfri5v2yaalfg6qmq8215ildgrcavl9974n"; + vendorSha256 = "sha256-bTCLuAo5xXNoafjGpjKLKlKVKB29PEFwdPu9+qjvufs="; subPackages = ["cmd"]; @@ -33,7 +34,7 @@ buildGoModule rec { postInstall = '' mv $out/bin/cmd $out/bin/kubebuilder wrapProgram $out/bin/kubebuilder \ - --prefix PATH : ${lib.makeBinPath [ go ]} + --prefix PATH : ${lib.makeBinPath [ go gnumake ]} ''; allowGoReference = true; diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/applications/networking/cluster/terranix/default.nix index d06393718a4b..4338dddb49f9 100644 --- a/pkgs/applications/networking/cluster/terranix/default.nix +++ b/pkgs/applications/networking/cluster/terranix/default.nix @@ -1,26 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, ... }: +{ stdenv, lib, fetchFromGitHub, jq, nix, ... }: stdenv.mkDerivation rec { pname = "terranix"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-3N4a5VhZqIgJW11w8oJKJ9T8mhfwEM33kEwV/zZkCs8="; + sha256 = "sha256-HDiyJGgyDUoLnpL8N+wDm3cM/vEfYYc/p4N1kKH/kLk="; }; installPhase = '' - mkdir -p $out + mkdir -p $out/{bin,core,modules,lib} mv bin core modules lib $out/ + + mv $out/bin/terranix-doc-json $out/bin/.wrapper_terranix-doc-json + + # manual wrapper because makeWrapper expectes executables + wrapper=$out/bin/terranix-doc-json + cat <<EOF>$wrapper + #!/usr/bin/env bash + export PATH=$PATH:${jq}/bin:${nix}/bin + $out/bin/.wrapper_terranix-doc-json "\$@" + EOF + chmod +x $wrapper ''; meta = with lib; { description = "A NixOS like terraform-json generator"; homepage = "https://terranix.org"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mrVanDalo ]; }; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 845d0f2779c2..9c4340fffedb 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -26,6 +26,7 @@ let genericName = "File Synchronizer"; categories = "Network;FileTransfer;"; startupNotify = "false"; + icon = "dropbox"; }; in diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index b097864af431..ffd04fd829ed 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -18,7 +18,6 @@ , mtxclient , boost17x , spdlog -, fmt , olm , pkg-config , nlohmann_json @@ -52,7 +51,6 @@ mkDerivation rec { libsecret lmdb spdlog - fmt cmark qtbase qtmultimedia diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix new file mode 100644 index 000000000000..282506c5e0af --- /dev/null +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gtk3 +, libconfig +, libsoup +, libsecret +, openssl +, gettext +, glib +, glib-networking +, appstream-glib +, dbus-glib +, python3Packages +, meson +, ninja +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "srain"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "SrainApp"; + repo = "srain"; + rev = version; + sha256 = "14s0h5wgvlkdylnjis2fa7m835142jzw0d0yqjnir1wqnwmq1rld"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + appstream-glib + wrapGAppsHook + python3Packages.sphinx + ]; + + buildInputs = [ + gtk3 + glib + glib-networking + dbus-glib + libconfig + libsoup + libsecret + openssl + ]; + + meta = with lib; { + description = "Modern IRC client written in GTK"; + homepage = "https://srain.im"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 253143d00047..fde521c53d58 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -10,21 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; - sha256 = "gKyHR3FZHDybaP38rqB8/gvr8T+mDO4QQxoTtWS+TlE="; + sha256 = "177d1x4z0mh0p7c5ldq70cn1j3pac50d8cil2ni50hl49c3x6yy1"; }; - cargoSha256 = "0ChfW8vaqC2kCp4lpS0HOvhuihPw9G5TOmgwKzVDfws="; - - # Fix Cargo.lock version. Remove with the next release. - cargoPatches = [ - ./fix-Cargo.lock.patch - ]; + cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1"; cargoBuildFlags = lib.optionals stdenv.isLinux [ "--features=desktop-notifications" ]; @@ -34,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A console IRC client"; homepage = "https://github.com/osa1/tiny"; - changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/osa1/tiny/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne vyp ]; }; diff --git a/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch b/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch deleted file mode 100644 index 71bc4709bece..000000000000 --- a/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3a184dc..0e58cb1 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1023,7 +1023,7 @@ dependencies = [ - - [[package]] - name = "tiny" --version = "0.8.0" -+version = "0.9.0" - dependencies = [ - "clap", - "dirs 3.0.1", diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index a618a696d0fe..df5c9de29d17 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.34"; + version = "0.34.1"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "1dk16xa9q7adp1jaswxvw4p92f4h5mg0zkrh3zv8gqxn88amisc3"; + sha256 = "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index b0e87a314943..3bcbdf0cf02b 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.18"; + version = "1.8.19"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-FPxirzfr3MXtGaJFoF64N27+cBYRjwDJxZS8mZ1VYKU="; + sha256 = "sha256-NKHhmBF2h02+TuZu4NkQPJCYmqTc3Ehh5N4Fzn5EUms="; }; patches = [ diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch new file mode 100644 index 000000000000..73325791fc2b --- /dev/null +++ b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch @@ -0,0 +1,26 @@ +From bade623bb98c957d9a274df75b58296beb8ae6a7 Mon Sep 17 00:00:00 2001 +From: Marvin Dostal <maffinmaffinmaffinmaffin@gmail.com> +Date: Sun, 17 Oct 2021 21:26:51 +0200 +Subject: [PATCH] When creating the autostart entry, do not use an absolute + path + +--- + src/common/utility_unix.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/utility_unix.cpp b/src/common/utility_unix.cpp +index 010408395..16964c64f 100644 +--- a/src/common/utility_unix.cpp ++++ b/src/common/utility_unix.cpp +@@ -83,7 +83,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName, + ts << QLatin1String("[Desktop Entry]") << endl + << QLatin1String("Name=") << guiName << endl + << QLatin1String("GenericName=") << QLatin1String("File Synchronizer") << endl +- << QLatin1String("Exec=\"") << executablePath << "\" --background" << endl ++ << QLatin1String("Exec=") << "nextcloud --background" << endl + << QLatin1String("Terminal=") << "false" << endl + << QLatin1String("Icon=") << APPLICATION_ICON_NAME << endl + << QLatin1String("Categories=") << QLatin1String("Network") << endl +-- +2.31.1 + diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d3612321c352..b7ff968f79bd 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,18 +21,19 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-kqNN9P0G/Obi/8PStmLxImQdqkhLnJoFZ7dLpqe11TI="; + sha256 = "sha256-HhFm8rIsDaV4QmvHplbj49gf1vYCZyBl8WH5bvRHT7I="; }; patches = [ # Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`. ./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch + ./0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch ]; nativeBuildInputs = [ @@ -59,6 +60,8 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" + # See also: https://bugreports.qt.io/browse/QTBUG-85967 + "--set QML_DISABLE_DISK_CACHE 1" ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 38e1b7cfceb2..f5f5b3bde762 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.3.8"; + version = "4.3.9"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-on5folzKuRoVlvDOpme+aWxUKUC5PnO+N3L51qwG2gY="; + sha256 = "sha256-pFHeozx72qVjA3cmW6GK058IIAOWmyNm1UQVCQ1v5EU="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index f0aa32355450..5da7d84905bb 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -1,13 +1,11 @@ { lib, fetchurl, stdenv }: -let - name = "antiword-0.37"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec{ + pname = "antiword"; + version = "0.37"; src = fetchurl { - url = "http://www.winfield.demon.nl/linux/${name}.tar.gz"; + url = "http://www.winfield.demon.nl/linux/antiword-${version}.tar.gz"; sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; }; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index ba3afbff9467..1d5bafbdb406 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation { - name = "bean-add-2018-01-08"; + pname = "bean-add"; + version = "unstable-2018-01-08"; src = fetchFromGitHub { owner = "simon-v"; diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 14f48da22309..1ff88d49d2b7 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,11 +1,12 @@ { lib, fetchurl, python2Packages }: -python2Packages.buildPythonApplication { - name = "keepnote-0.7.8"; +python2Packages.buildPythonApplication rec { + pname = "keepnote"; + version = "0.7.8"; namePrefix = ""; src = fetchurl { - url = "http://keepnote.org/download/keepnote-0.7.8.tar.gz"; + url = "http://keepnote.org/download/keepnote-${version}.tar.gz"; sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 18126b5e2b76..7869b54a5f04 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, qt4, cmake, sqlite }: -stdenv.mkDerivation { - name = "tagainijisho-1.0.3"; +stdenv.mkDerivation rec { + pname = "tagainijisho"; + version = "1.0.3"; + src = fetchurl { - url = "https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz"; + url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; @@ -14,8 +16,10 @@ stdenv.mkDerivation { description = "A free, open-source Japanese dictionary and kanji lookup tool"; homepage = "https://www.tagaini.net/"; license = with licenses; [ - /* program */ gpl3Plus - /* data */ cc-by-sa-30 + /* program */ + gpl3Plus + /* data */ + cc-by-sa-30 ]; platforms = platforms.linux; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index 5792031c802d..f10840e1bea9 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }: stdenv.mkDerivation { - name = "kalibrate-hackrf-unstable-20160827"; + pname = "kalibrate-hackrf"; + version = "unstable-2016-08-27"; # There are no tags/releases, so use the latest commit from git master. # Currently, the latest commit is from 2016-07-03. diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 255938b11d52..4fe9ad086781 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: stdenv.mkDerivation { - name = "kalibrate-rtl-20131214"; + pname = "kalibrate-rtl"; + version = "unstable-2013-12-14"; - # There are no tags/releases, so use the latest commit from git master. - # Currently, the latest commit is from 2013-12-14. - src = fetchgit { - url = "https://github.com/steve-m/kalibrate-rtl.git"; + src = fetchFromGitHub { + owner = "steve-m"; + repo = "kalibrate-rtl"; rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38"; sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ fftw rtl-sdr libusb1 ]; meta = with lib; { @@ -26,6 +27,6 @@ stdenv.mkDerivation { homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index baf9ed7fc184..d557f32bb6da 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { - name = "gravit-0.5.1"; + pname = "gravit"; + version = "0.5.1"; src = fetchurl { - url = "https://gravit.slowchop.com/media/downloads/${name}.tgz"; + url = "https://gravit.slowchop.com/media/downloads/gravit-${version}.tgz"; sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index f147c0422e45..b6286d11c8cb 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -1,11 +1,12 @@ -{lib, stdenv, fetchurl, cmake}: +{ lib, stdenv, fetchurl, cmake }: -stdenv.mkDerivation { - name = "cmtk-3.3.1"; +stdenv.mkDerivation rec { + pname = "cmtk"; + version = "3.3.1"; src = fetchurl { name = "cmtk-source.tar.gz"; - url = "https://www.nitrc.org/frs/download.php/8198/CMTK-3.3.1-Source.tar.gz//?i_agree=1&download_now=1"; + url = "https://www.nitrc.org/frs/download.php/8198/CMTK-${version}-Source.tar.gz//?i_agree=1&download_now=1"; sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; }; @@ -14,13 +15,13 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { - description = "Computational Morphometry Toolkit "; + description = "Computational Morphometry Toolkit "; longDescription = ''A software toolkit for computational morphometry of biomedical images, CMTK comprises a set of command line tools and a back-end general-purpose library for processing and I/O''; maintainers = with maintainers; [ tbenst ]; platforms = platforms.all; - license = licenses.gpl3; - homepage = "https://www.nitrc.org/projects/cmtk/"; + license = licenses.gpl3; + homepage = "https://www.nitrc.org/projects/cmtk/"; }; } diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 2e11c1d8c58c..4f23f3f9a82c 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, zlib }: -stdenv.mkDerivation { - name = "diamond-0.8.36"; +stdenv.mkDerivation rec { + pname = "diamond"; + version = "0.8.36"; src = fetchurl { - url = "https://github.com/bbuchfink/diamond/archive/v0.8.36.tar.gz"; + url = "https://github.com/bbuchfink/diamond/archive/v${version}.tar.gz"; sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh"; }; @@ -30,7 +31,7 @@ stdenv.mkDerivation { B. Buchfink, Xie C., D. Huson, "Fast and sensitive protein alignment using DIAMOND", Nature Methods 12, 59-60 (2015). - ''; + ''; homepage = "https://github.com/bbuchfink/diamond"; license = { fullName = "University of Tuebingen, Benjamin Buchfink"; diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 019370378605..4ed11857a30e 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gcc, zlib, python27 }: stdenv.mkDerivation rec { - name = "ecopcr-0.8.0"; + pname = "ecopcr"; + version = "0.8.0"; src = fetchurl { - url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/${name}.tar.gz"; + url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/ecopcr-${version}.tar.gz"; sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6"; }; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 5cbcd46ee07c..29669d027303 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: +{ lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib }: + +stdenv.mkDerivation rec { + pname = "emboss"; + version = "6.6.0"; -stdenv.mkDerivation { - name = "emboss-6.6.0"; src = fetchurl { - url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz"; + url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${version}.tar.gz"; sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; }; @@ -16,13 +18,13 @@ stdenv.mkDerivation { ''; meta = { - description = "The European Molecular Biology Open Software Suite"; + description = "The European Molecular Biology Open Software Suite"; longDescription = ''EMBOSS is a free Open Source software analysis package specially developed for the needs of the molecular biology (e.g. EMBnet) user community, including libraries. The software automatically copes with data in a variety of formats and even allows transparent retrieval of sequence data from the web.''; - license = lib.licenses.gpl2; - homepage = "http://emboss.sourceforge.net/"; + license = lib.licenses.gpl2; + homepage = "http://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index 72cf9c86e65b..ba1b91298bb3 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -1,32 +1,43 @@ -{ lib, stdenv, fetchurl, neuron-version -, libX11, libXext, patchelf +{ lib +, stdenv +, fetchurl +, neuron-version +, libX11 +, libXext +, patchelf }: -stdenv.mkDerivation rec - { name = "iv-19"; - src = fetchurl - { url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz"; - sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; - }; - nativeBuildInputs = [ patchelf ]; - buildInputs = [ libXext ]; - propagatedBuildInputs = [ libX11 ]; - hardeningDisable = [ "format" ]; - postInstall = '' - for dir in $out/*; do # */ - if [ -d $dir/lib ]; then - mv $dir/* $out # */ - rmdir $dir - break - fi - done - '' + lib.optionalString stdenv.isLinux '' - patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so - ''; - meta = with lib; - { description = "InterViews graphical library for Neuron"; - license = licenses.bsd3; - homepage = "http://www.neuron.yale.edu/neuron"; - platforms = platforms.all; - }; - } +stdenv.mkDerivation rec { + pname = "iv"; + version = "19"; + + src = fetchurl { + url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/iv-${version}.tar.gz"; + sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; + }; + + nativeBuildInputs = [ patchelf ]; + buildInputs = [ libXext ]; + propagatedBuildInputs = [ libX11 ]; + + hardeningDisable = [ "format" ]; + + postInstall = '' + for dir in $out/*; do # */ + if [ -d $dir/lib ]; then + mv $dir/* $out # */ + rmdir $dir + break + fi + done + '' + lib.optionalString stdenv.isLinux '' + patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so + ''; + + meta = with lib; { + description = "InterViews graphical library for Neuron"; + license = licenses.bsd3; + homepage = "http://www.neuron.yale.edu/neuron"; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index a7de2b4f76fe..b38af2f64b54 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -9,8 +9,6 @@ python3Packages.buildPythonApplication rec { sha256 = "1x7a0nrr9agg1pfgq8i1j8r1p6c0jpyxsv196ylix1dd2iivmas1"; }; - disabled = python3Packages.pythonOlder "3.5"; - nativeBuildInputs = [ python3Packages.cython cmake ]; postPatch = lib.optionalString stdenv.isAarch64 '' diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index f5c6d79e28aa..c6339bab1228 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: stdenv.mkDerivation rec { - name = "avogadro-1.1.1"; + pname = "avogadro"; + version = "1.1.1"; src = fetchurl { - url = "mirror://sourceforge/avogadro/${name}.tar.bz2"; + url = "mirror://sourceforge/avogadro/avogadro-${version}.tar.bz2"; sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 731f2db56af5..8bceed08e1db 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "archimedes-2.0.1"; + pname = "archimedes"; + version = "2.0.1"; src = fetchurl { - url = "mirror://gnu/archimedes/${name}.tar.gz"; + url = "mirror://gnu/archimedes/archimedes-${version}.tar.gz"; sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; }; diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index b30a18931213..f1d34062d2aa 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook -, fmt, graphviz, llvmPackages, z3 +, graphviz, llvmPackages, z3 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook z3 ] + buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ] ++ (with python3Packages; [ python pybind11 ]) ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index de79abc3e511..b2e3704cba70 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: stdenv.mkDerivation rec { - name = "qfsm-0.54.0"; + pname = "qfsm"; + version = "0.54.0"; src = fetchurl { - url = "mirror://sourceforge/qfsm/${name}-Source.tar.bz2"; + url = "mirror://sourceforge/qfsm/qfsm-${version}-Source.tar.bz2"; sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 6a3999585534..f8741cd8d180 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -5,10 +5,11 @@ let libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { - name = "tkgate-1.8.7"; + pname = "tkgate"; + version = "1.8.7"; src = fetchurl { - url = "http://www.tkgate.org/downloads/${name}.tgz"; + url = "http://www.tkgate.org/downloads/tkgate-${version}.tgz"; sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; }; diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix index 245d4c12bfe0..684f5913f79f 100644 --- a/pkgs/applications/science/geometry/tetgen/1.4.nix +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tetgen-1.4.3"; + pname = "tetgen"; + version = "1.4.3"; src = fetchurl { - url = "${meta.homepage}/files/tetgen1.4.3.tar.gz"; + url = "${meta.homepage}/files/tetgen${version}.tar.gz"; sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm"; }; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index f9cc97893da8..fc16423b671e 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "aspino-unstable-2017-03-09"; + pname = "aspino"; + version = "unstable-2017-03-09"; src = fetchFromGitHub { owner = "alviano"; diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index be1d6f253bc5..af6673caa54f 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gmp, mpfr, boost }: -stdenv.mkDerivation { - name = "gappa-1.4.0"; +stdenv.mkDerivation rec { + pname = "gappa"; + version = "1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-1.4.0.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-${version}.tar.gz"; sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb"; }; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 24faa98f777b..e66fe992e189 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -3,11 +3,11 @@ let load_num = if num == null then "" else - '' - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \ - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \ - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ - ''; + '' + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \ + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \ + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ + ''; start_script = '' @@ -21,19 +21,22 @@ let in stdenv.mkDerivation { - name = "hol_light-2019-10-06"; + pname = "hol_light"; + version = "unstable-2019-10-06"; src = fetchFromGitHub { - owner = "jrh13"; - repo = "hol-light"; - rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; + owner = "jrh13"; + repo = "hol-light"; + rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; }; - patches = [(fetchpatch { - url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; - sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; - })]; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; + sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; + }) + ]; buildInputs = [ ocaml camlp5 ]; propagatedBuildInputs = [ num ]; @@ -47,9 +50,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Interactive theorem prover based on Higher-Order Logic"; - homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; - license = licenses.bsd2; - platforms = platforms.unix; + homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; + license = licenses.bsd2; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice maggesi vbgl ]; }; } diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index 77db8ae3384d..193f603656dc 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, zlib, gmp }: stdenv.mkDerivation { - name = "open-wbo-2.0"; + pname = "open-wbo"; + version = "2.0"; src = fetchFromGitHub { owner = "sat-group"; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 7fedca72b698..aa01469bfbb8 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -1,7 +1,8 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "prover9-2009-11a"; + pname = "prover9"; + version = "2009-11a"; src = fetchurl { url = "https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz"; @@ -10,7 +11,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - patchPhase = '' + postPatch = '' RM=$(type -tp rm) MV=$(type -tp mv) CP=$(type -tp cp) @@ -30,16 +31,16 @@ stdenv.mkDerivation { cp bin/* $out/bin ''; - meta = { + meta = with lib; { homepage = "https://www.cs.unm.edu/~mccune/mace4/"; - license = "GPL"; + license = licenses.gpl1; description = "Automated theorem prover for first-order and equational logic"; longDescription = '' Prover9 is a resolution/paramodulation automated theorem prover for first-order and equational logic. Prover9 is a successor of the Otter Prover. This is the LADR command-line version. ''; - platforms = lib.platforms.linux; - maintainers = []; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index ba46d87581e0..fbc9eb2d8a15 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -2,28 +2,28 @@ stdenv.mkDerivation rec { pname = "proverif"; - version = "2.02pl1"; + version = "2.03"; src = fetchurl { - url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz"; - sha256 = "1jmzfpx0hdgfmkq0jp6i3k5av9xxgndjaj743wfy37svn0ga4jjx"; + url = "https://bblanche.gitlabpages.inria.fr/proverif/proverif${version}.tar.gz"; + sha256 = "sha256:1q5mp9il09jylimcaqczb3kh34gb5px88js127gxv0jj5b4bqfc7"; }; - buildInputs = with ocamlPackages; [ ocaml findlib lablgtk ]; + buildInputs = with ocamlPackages; [ ocaml findlib ]; - buildPhase = "./build"; + buildPhase = "./build -nointeract"; installPhase = '' - mkdir -p $out/bin - cp ./proverif $out/bin - cp ./proveriftotex $out/bin + runHook preInstall + install -D -t $out/bin proverif proveriftotex install -D -t $out/share/emacs/site-lisp/ emacs/proverif.el + runHook postInstall ''; meta = { - description = "Cryptographic protocol verifier in the Dolev-Yao model"; - homepage = "https://prosecco.gforge.inria.fr/personal/bblanche/proverif/"; + description = "Cryptographic protocol verifier in the formal model"; + homepage = "https://bblanche.gitlabpages.inria.fr/proverif/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 43a2ec7e97e2..eece691bfd78 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -1,28 +1,37 @@ -{ lib, stdenv, fetchgit, mlton }: +{ lib, stdenv, fetchFromGitHub, mlton }: + stdenv.mkDerivation { - name = "redprl-2017-03-28"; - src = fetchgit { - url = "https://github.com/RedPRL/sml-redprl.git"; + pname = "redprl"; + version = "unstable-2017-03-28"; + + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "sml-redprl"; rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b"; - sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c"; fetchSubmodules = true; + sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c"; }; + buildInputs = [ mlton ]; - patchPhase = '' + + postPatch = '' patchShebangs ./script/ ''; + buildPhase = '' ./script/mlton.sh ''; + installPhase = '' mkdir -p $out/bin mv ./bin/redprl $out/bin ''; - meta = { + + meta = with lib; { description = "A proof assistant for Nominal Computational Type Theory"; homepage = "http://www.redprl.org/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.acowley ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ acowley ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index fe0ca1b3017b..a509d70ed462 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, haskell, spass }: -stdenv.mkDerivation { - name = "system-for-automated-deduction-2.3.25"; +stdenv.mkDerivation rec { + pname = "system-for-automated-deduction"; + version = "2.3.25"; src = fetchurl { - url = "http://nevidal.org/download/sad-2.3-25.tar.gz"; + url = "http://nevidal.org/download/sad-${version}.tar.gz"; sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; }; buildInputs = [ haskell.compiler.ghc844 spass ]; @@ -15,7 +16,7 @@ stdenv.mkDerivation { ]; postPatch = '' substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt - ''; + ''; installPhase = '' mkdir -p $out/{bin,provers} install alice $out/bin @@ -23,18 +24,18 @@ stdenv.mkDerivation { substituteAll provers/provers.dat $out/provers/provers.dat substituteAll init.opt $out/init.opt cp -r examples $out - ''; + ''; inherit spass; meta = { description = "A program for automated proving of mathematical texts"; longDescription = '' The system for automated deduction is intended for automated processing of formal mathematical texts written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language - ''; + ''; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.schmitthenner ]; homepage = "http://nevidal.org/sad.en.html"; platforms = lib.platforms.linux; - broken = true; # ghc-8.4.4 is gone from Nixpkgs + broken = true; # ghc-8.4.4 is gone from Nixpkgs }; } diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index a7010966c26d..911d0043ed26 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,13 +1,38 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig -# data, compression -, bzip2, curl, hdf5, json_c, xz, lzo, protobuf, snappy -# maths -, blas, lapack, eigen, nlopt, lp_solve, colpack, glpk -# libraries -, libarchive, libxml2 -# extra support -, pythonSupport ? true, pythonPackages ? null -, opencvSupport ? false, opencv ? null +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, fetchurl + # build +, cmake +, ctags +, pythonPackages +, swig + # math +, eigen +, blas +, lapack +, glpk + # data +, protobuf +, json_c +, libxml2 +, hdf5 +, curl + # compression +, libarchive +, bzip2 +, xz +, snappy +, lzo + # more math +, nlopt +, lp_solve +, colpack + # extra support +, pythonSupport ? true +, opencvSupport ? false +, opencv ? null , withSvmLight ? false }: @@ -19,8 +44,10 @@ assert (!blas.isILP64) && (!lapack.isILP64); let pname = "shogun"; version = "6.1.4"; + rxcppVersion = "4.0.0"; gtestVersion = "1.8.0"; + srcs = { toolbox = fetchFromGitHub { owner = pname + "-toolbox"; @@ -29,7 +56,8 @@ let sha256 = "05s9dclmk7x5d7wnnj4qr6r6c827m72a44gizcv09lxr28pr9inz"; fetchSubmodules = true; }; - # we need the packed archive + + # The CMake external projects expect the packed archives rxcpp = fetchurl { url = "https://github.com/Reactive-Extensions/RxCpp/archive/v${rxcppVersion}.tar.gz"; sha256 = "0y2isr8dy2n1yjr9c5570kpc9lvdlch6jv0jvw000amwn5d3krsh"; @@ -42,54 +70,90 @@ let in stdenv.mkDerivation rec { - inherit pname version; - src = srcs.toolbox; - - postUnpack = '' - mkdir -p $sourceRoot/third_party/{rxcpp,gtest} - ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz - ln -s ${srcs.gtest} $sourceRoot/third_party/gtest/release-${gtestVersion}.tar.gz - ''; + outputs = [ "out" "dev" "doc" ]; - # broken - doCheck = false; + src = srcs.toolbox; patches = [ + # Fix compile errors with json-c + # https://github.com/shogun-toolbox/shogun/pull/4104 (fetchpatch { - url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; + url = "https://github.com/shogun-toolbox/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s"; }) + + # Fix compile errors with GCC 9+ + # https://github.com/shogun-toolbox/shogun/pull/4811 + (fetchpatch { + url = "https://github.com/shogun-toolbox/shogun/commit/c8b670be4790e0f06804b048a6f3d77c17c3ee95.patch"; + sha256 = "sha256-MxsR3Y2noFQevfqWK3nmX5iK4OVWeKBl5tfeDNgjcXk="; + }) + (fetchpatch { + url = "https://github.com/shogun-toolbox/shogun/commit/5aceefd9fb0e2132c354b9a0c0ceb9160cc9b2f7.patch"; + sha256 = "sha256-AgJJKQA8vc5oKaTQDqMdwBR4hT4sn9+uW0jLe7GteJw="; + }) + + # Fix compile errors with Eigen 3.4 + ./eigen-3.4.patch + ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch; - CCACHE_DISABLE="1"; - CCACHE_DIR=".ccache"; - - nativeBuildInputs = [ cmake ]; - buildInputs = with lib; [ - blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve xz lzo - protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk - ] - ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) - ++ optional (opencvSupport) opencv; - - NIX_CFLAGS_COMPILE="-faligned-new"; - - cmakeFlags = - let - onOff = b: if b then "ON" else "OFF"; - flag = n: b: "-D"+n+"="+onOff b; - in - with lib; [ - (flag "ENABLE_TESTING" doCheck) - (flag "BUILD_META_EXAMPLES" doCheck) - (flag "CMAKE_VERBOSE_MAKEFILE:BOOL" doCheck) - (flag "PythonModular" pythonSupport) - (flag "OpenCV" opencvSupport) - (flag "USE_SVMLIGHT" withSvmLight) + nativeBuildInputs = [ cmake swig ctags ] + ++ (with pythonPackages; [ python jinja2 ply ]); + + buildInputs = [ + eigen + blas + lapack + glpk + protobuf + json_c + libxml2 + hdf5 + curl + libarchive + bzip2 + xz + snappy + lzo + nlopt + lp_solve + colpack + ] ++ lib.optionals pythonSupport (with pythonPackages; [ python numpy ]) + ++ lib.optional opencvSupport opencv; + + cmakeFlags = let + enableIf = cond: if cond then "ON" else "OFF"; + in [ + "-DBUILD_META_EXAMPLES=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_CPLEX=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;TrainedModelSerialization'" # Sporadic segfault + "-DENABLE_TESTING=${enableIf doCheck}" + "-DDISABLE_META_INTEGRATION_TESTS=ON" + "-DTRAVIS_DISABLE_META_CPP=ON" + "-DPythonModular=${enableIf pythonSupport}" + "-DOpenCV=${enableIf opencvSupport}" + "-DUSE_SVMLIGHT=${enableIf withSvmLight}" ]; + CXXFLAGS = "-faligned-new"; + + doCheck = true; + + postUnpack = '' + mkdir -p $sourceRoot/third_party/{rxcpp,GoogleMock} + ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz + ln -s ${srcs.gtest} $sourceRoot/third_party/GoogleMock/release-${gtestVersion}.tar.gz + ''; + postPatch = '' # Fix preprocessing SVMlight code sed -i \ @@ -106,10 +170,17 @@ stdenv.mkDerivation rec { ./scripts/light-scrubber.sh ''; + postInstall = '' + mkdir -p $doc/share/doc/shogun/examples + mv $out/share/shogun/examples/cpp $doc/share/doc/shogun/examples + cp ../examples/undocumented/libshogun/*.cpp $doc/share/doc/shogun/examples/cpp + rm -r $out/share + ''; + meta = with lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; license = if withSvmLight then licenses.unfree else licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo smancill ]; }; } diff --git a/pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch b/pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch new file mode 100644 index 000000000000..863bd75918b0 --- /dev/null +++ b/pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch @@ -0,0 +1,74 @@ +From: Sebastián Mancilla <smancill@smancill.dev> +Subject: [PATCH] Fix compile errors when using Eigen 3.4 + +--- + .../machine/gp/MultiLaplaceInferenceMethod.cpp | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp b/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp +index 2e27678d2..60050afea 100644 +--- a/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp ++++ b/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp +@@ -84,9 +84,9 @@ class CMultiPsiLine : public func_base + float64_t result=0; + for(index_t bl=0; bl<C; bl++) + { +- eigen_f.block(bl*n,0,n,1)=K*alpha->block(bl*n,0,n,1)*CMath::exp(log_scale*2.0); +- result+=alpha->block(bl*n,0,n,1).dot(eigen_f.block(bl*n,0,n,1))/2.0; +- eigen_f.block(bl*n,0,n,1)+=eigen_m; ++ eigen_f.segment(bl*n,n)=K*alpha->segment(bl*n,n)*CMath::exp(log_scale*2.0); ++ result+=alpha->segment(bl*n,n).dot(eigen_f.segment(bl*n,n))/2.0; ++ eigen_f.segment(bl*n,n)+=eigen_m; + } + + // get first and second derivatives of log likelihood +@@ -272,7 +272,7 @@ void CMultiLaplaceInferenceMethod::update_alpha() + { + Map<VectorXd> alpha(m_alpha.vector, m_alpha.vlen); + for(index_t bl=0; bl<C; bl++) +- eigen_mu.block(bl*n,0,n,1)=eigen_ktrtr*CMath::exp(m_log_scale*2.0)*alpha.block(bl*n,0,n,1); ++ eigen_mu.segment(bl*n,n)=eigen_ktrtr*CMath::exp(m_log_scale*2.0)*alpha.segment(bl*n,n); + + //alpha'*(f-m)/2.0 + Psi_New=alpha.dot(eigen_mu)/2.0; +@@ -316,7 +316,7 @@ void CMultiLaplaceInferenceMethod::update_alpha() + + for(index_t bl=0; bl<C; bl++) + { +- VectorXd eigen_sD=eigen_dpi.block(bl*n,0,n,1).cwiseSqrt(); ++ VectorXd eigen_sD=eigen_dpi.segment(bl*n,n).cwiseSqrt(); + LLT<MatrixXd> chol_tmp((eigen_sD*eigen_sD.transpose()).cwiseProduct(eigen_ktrtr*CMath::exp(m_log_scale*2.0))+ + MatrixXd::Identity(m_ktrtr.num_rows, m_ktrtr.num_cols)); + MatrixXd eigen_L_tmp=chol_tmp.matrixU(); +@@ -341,11 +341,11 @@ void CMultiLaplaceInferenceMethod::update_alpha() + VectorXd tmp2=m_tmp.array().rowwise().sum(); + + for(index_t bl=0; bl<C; bl++) +- eigen_b.block(bl*n,0,n,1)+=eigen_dpi.block(bl*n,0,n,1).cwiseProduct(eigen_mu.block(bl*n,0,n,1)-eigen_mean_bl-tmp2); ++ eigen_b.segment(bl*n,n)+=eigen_dpi.segment(bl*n,n).cwiseProduct(eigen_mu.segment(bl*n,n)-eigen_mean_bl-tmp2); + + Map<VectorXd> &eigen_c=eigen_W; + for(index_t bl=0; bl<C; bl++) +- eigen_c.block(bl*n,0,n,1)=eigen_E.block(0,bl*n,n,n)*(eigen_ktrtr*CMath::exp(m_log_scale*2.0)*eigen_b.block(bl*n,0,n,1)); ++ eigen_c.segment(bl*n,n)=eigen_E.block(0,bl*n,n,n)*(eigen_ktrtr*CMath::exp(m_log_scale*2.0)*eigen_b.segment(bl*n,n)); + + Map<MatrixXd> c_tmp(eigen_c.data(),n,C); + +@@ -409,7 +409,7 @@ float64_t CMultiLaplaceInferenceMethod::get_derivative_helper(SGMatrix<float64_t + { + result+=((eigen_E.block(0,bl*n,n,n)-eigen_U.block(0,bl*n,n,n).transpose()*eigen_U.block(0,bl*n,n,n)).array() + *eigen_dK.array()).sum(); +- result-=(eigen_dK*eigen_alpha.block(bl*n,0,n,1)).dot(eigen_alpha.block(bl*n,0,n,1)); ++ result-=(eigen_dK*eigen_alpha.segment(bl*n,n)).dot(eigen_alpha.segment(bl*n,n)); + } + + return result/2.0; +@@ -489,7 +489,7 @@ SGVector<float64_t> CMultiLaplaceInferenceMethod::get_derivative_wrt_mean( + result[i]=0; + //currently only compute the explicit term + for(index_t bl=0; bl<C; bl++) +- result[i]-=eigen_alpha.block(bl*n,0,n,1).dot(eigen_dmu); ++ result[i]-=eigen_alpha.segment(bl*n,n).dot(eigen_dmu); + } + + return result; diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index 7ecbe09f5e18..7e9b322b4157 100644 --- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }: stdenv.mkDerivation rec { pname = "vowpal-wabbit"; @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost flatbuffers - fmt rapidjson spdlog zlib diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 02c4c134f92e..6ce03008d3a9 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, blas, gfortran, lapack }: -stdenv.mkDerivation { - name = "csdp-6.1.1"; +stdenv.mkDerivation rec { + pname = "csdp"; + version = "6.1.1"; src = fetchurl { - url = "https://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz"; + url = "https://www.coin-or.org/download/source/Csdp/Csdp-${version}.tgz"; sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 58b2a617bd63..808d89ef9636 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchurl, ocamlPackages, makeWrapper -, libGLU, libGL, freeglut, mpfr, gmp +{ lib +, stdenv +, fetchurl +, ocamlPackages +, makeWrapper +, libGLU +, libGL +, freeglut +, mpfr +, gmp , pkgsHostTarget }: @@ -7,24 +15,32 @@ let inherit (pkgsHostTarget.targetPackages.stdenv) cc; in -stdenv.mkDerivation { - name = "glsurf-3.3.1"; +stdenv.mkDerivation rec { + pname = "glsurf"; + version = "3.3.1"; src = fetchurl { - url = "https://raffalli.eu/~christophe/glsurf/glsurf-3.3.1.tar.gz"; + url = "https://raffalli.eu/~christophe/glsurf/glsurf-${version}.tar.gz"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; nativeBuildInputs = [ makeWrapper ] ++ (with ocamlPackages; [ - ocaml findlib + ocaml + findlib ]); buildInputs = [ - freeglut libGL libGLU mpfr gmp + freeglut + libGL + libGLU + mpfr + gmp ] ++ (with ocamlPackages; [ - camlp4 lablgl camlimages_4_2_4 + camlp4 + lablgl + camlimages_4_2_4 ]); postPatch = '' diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 5c0de33a71ae..3ddcd6206d68 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, gfortran, blas, lapack}: +{ lib, stdenv, fetchurl, gfortran, blas, lapack }: stdenv.mkDerivation rec { - name = "JAGS-4.3.0"; + pname = "JAGS"; + version = "4.3.0"; + src = fetchurl { - url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; + url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz"; sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; }; @@ -15,8 +17,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Just Another Gibbs Sampler"; - license = licenses.gpl2; - homepage = "http://mcmc-jags.sourceforge.net"; + license = licenses.gpl2; + homepage = "http://mcmc-jags.sourceforge.net"; maintainers = [ maintainers.andres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 88db3c4b2e92..90a7ada99504 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , coreutils , patchelf , requireFile @@ -22,11 +23,11 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { - - name = "mathematica-9.0.0"; + pname = "mathematica"; + version = "9.0.0"; src = requireFile { - name = "Mathematica_9.0.0_LINUX.sh"; + name = "Mathematica_${version}_LINUX.sh"; message = '' This nix expression requires that Mathematica_9.0.0_LINUX.sh is already part of the store. Find the file on your Mathematica CD @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ldpath = lib.makeLibraryPath buildInputs + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 588df51554ab..6456608e7dbc 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl, zlib, gmp, ecm }: +{ lib, stdenv, fetchurl, zlib, gmp, ecm }: -stdenv.mkDerivation { - name = "msieve-1.53"; +stdenv.mkDerivation rec { + pname = "msieve"; + version = "1.53"; src = fetchurl { - url = "mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz"; + url = "mirror://sourceforge/msieve/msieve/Msieve%20v${version}/msieve${lib.replaceStrings ["."] [""] version}_src.tar.gz"; sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65"; }; diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index d53236d8070c..4545203dacca 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "perseus-4-beta"; + pname = "perseus"; version = "4-beta"; nativeBuildInputs = [ unzip ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [erikryb]; + maintainers = with lib.maintainers; [ erikryb ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix index e46553d7b09e..eb759723256d 100644 --- a/pkgs/applications/science/math/ries/default.nix +++ b/pkgs/applications/science/math/ries/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchzip }: -stdenv.mkDerivation { - name = "ries-2018-04-11"; +stdenv.mkDerivation rec { + pname = "ries"; + version = "2018.04.11-1"; # upstream does not provide a stable link src = fetchzip { - url = "https://salsa.debian.org/debian/ries/-/archive/debian/2018.04.11-1/ries-debian-2018.04.11-1.zip"; + url = "https://salsa.debian.org/debian/ries/-/archive/debian/${version}/ries-debian-${version}.zip"; sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842"; }; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 731230130caf..a92920c5e795 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,9 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake -, eigen, opencv, ceres-solver, cgal, boost, vcg -, gmp, mpfr, glog, gflags, libjpeg_turbo }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, eigen +, opencv +, ceres-solver +, cgal +, boost +, vcg +, gmp +, mpfr +, glog +, gflags +, libjpeg_turbo +}: stdenv.mkDerivation { - name = "openmvs-unstable-2018-05-26"; + pname = "openmvs"; + version = "unstable-2018-05-26"; src = fetchFromGitHub { owner = "cdcseacave"; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index ed9d18528756..7d284d5eebb7 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "vite-1.2pre${rev}"; + pname = "vite"; + version = "1.2pre${rev}"; src = fetchsvn { url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index f7756f33499e..bbe8f6f9f536 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2021.3"; + version = "2021.4"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "4QmFbsREdo373kHzBZ4xI6vbj+Vsozsag/Me1FdaHMY="; + sha256 = "07ds8abxq0k7vfpjvxb8in3fhb6lz0pbdzbmlidyzaw37qz8lw6b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index c4f6362465ff..2016d6afff74 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, libextractor, gettext }: stdenv.mkDerivation rec { - name = "doodle-0.7.2"; + pname = "doodle"; + version = "0.7.2"; buildInputs = [ libextractor gettext ]; src = fetchurl { - url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz"; + url = "https://grothoff.org/christian/doodle/download/doodle-${version}.tar.gz"; sha256 = "sha256-dtRPfUjhBNgN+5zHMYmszISmBv1+K6yjKsbQBiAXWRA="; }; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "https://grothoff.org/christian/doodle/"; description = "Tool to quickly index and search documents on a computer"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index bd01b0843fb1..ba6c6ab87c15 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -1,11 +1,27 @@ -{ lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE -, freetype, pkg-config, which }: +{ lib +, stdenv +, fetchurl +, libX11 +, libXft +, libXi +, xorgproto +, libSM +, libICE +, freetype +, pkg-config +, which +}: -stdenv.mkDerivation { - name = "mrxvt-0.5.4"; +stdenv.mkDerivation rec { + pname = "mrxvt"; + version = "0.5.4"; - buildInputs = - [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; + src = fetchurl { + url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz"; + sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; + }; + + buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; configureFlags = [ "--with-x" @@ -22,11 +38,6 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"; ''; - src = fetchurl { - url = "mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz"; - sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; - }; - meta = with lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " @@ -36,6 +47,7 @@ stdenv.mkDerivation { homepage = "https://sourceforge.net/projects/materm"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = with maintainers; [ ]; knownVulnerabilities = [ "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" ]; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix index b9c72c97d6de..9ecaffb185cc 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, wmctrl }: stdenv.mkDerivation { - name = "urxvt-perl-2015-01-16"; + pname = "urxvt-perl"; + version = "unstable-2015-01-16"; src = fetchFromGitHub { owner = "effigies"; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index 303555db7224..c7510568e264 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; - name = "urxvt-theme-switch-2014-12-21_rev${builtins.substring 0 1 rev}"; + pname = "urxvt-theme-switch"; + version = "unstable-2014-12-21"; + dontPatchShebangs = true; src = fetchFromGitHub { owner = "felixr"; repo = "urxvt-theme-switch"; - inherit rev; + rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; sha256 = "0x27m1vdqprn3lqpwgxvffill7prmaj6j9rhgvkvi13mzl5wmlli"; }; @@ -23,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/felixr/urxvt-theme-switch"; license = "CCBYNC"; maintainers = with maintainers; [ ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix index 446126aad748..7d3d69122f62 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchgit, perl }: stdenv.mkDerivation { - - name = "rxvt-unicode-vtwheel-0.3.2"; + pname = "rxvt-unicode-vtwheel"; + version = "0.3.2"; src = fetchgit { - url = "https://aur.archlinux.org/urxvt-vtwheel.git"; - rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; - sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; + url = "https://aur.archlinux.org/urxvt-vtwheel.git"; + rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; + sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; }; installPhase = '' diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 2879b688c6a5..9f039c4ab004 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, nano }: -stdenv.mkDerivation { - name = "cvs-1.12.13"; +stdenv.mkDerivation rec { + pname = "cvs"; + version = "1.12.13"; src = fetchurl { - url = "mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2"; + url = "mirror://savannah/cvs/source/feature/${version}/cvs-${version}.tar.bz2"; sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq"; }; diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index a1c63538220b..b68179b182bc 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -1,7 +1,8 @@ { fetchgit, lib, stdenv, perl }: -stdenv.mkDerivation { - name = "git2cl-20080827"; +stdenv.mkDerivation rec { + pname = "git2cl"; + version = "unstable-2008-08-27"; src = fetchgit { url = "git://repo.or.cz/git2cl.git"; diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 8f06050d0902..6d6a3a4f9882 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "subgit-3.3.11"; + pname = "subgit"; + version = "3.3.11"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "https://subgit.com/download/${name}.zip"; + url = "https://subgit.com/download/subgit-${version}.zip"; sha256 = "sha256-ltTpmXPCIGTmVDxKc6oelMEzQWXRbIf0NESzRugaXo0="; }; } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c6f4df537748..2993d1a013fc 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -20,6 +20,7 @@ let }; }; }; + version = "14.4.1"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 541a2262f999..e3c48c5724f7 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,25 +1,49 @@ -{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw -, bison, libtool, fontconfig, pango, gd, libwebp +{ lib +, stdenv +, fetchurl +, pkg-config +, xlibsWrapper +, libpng +, libjpeg +, expat +, libXaw +, bison +, libtool +, fontconfig +, pango +, gd +, libwebp }: stdenv.mkDerivation rec { - name = "graphviz-2.0"; + pname = "graphviz"; + version = "2.0"; src = fetchurl { - url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; + url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-${version}.tar.gz"; sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xlibsWrapper libpng libjpeg expat libXaw bison - libtool fontconfig pango gd libwebp + xlibsWrapper + libpng + libjpeg + expat + libXaw + bison + libtool + fontconfig + pango + gd + libwebp ]; hardeningDisable = [ "format" "fortify" ]; configureFlags = - [ "--with-pngincludedir=${libpng.dev}/include" + [ + "--with-pngincludedir=${libpng.dev}/include" "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index 6a9e910f8012..36e9154571be 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -1,11 +1,11 @@ -{lib, stdenv, fetchurl, tcl, tk}: +{ lib, stdenv, fetchurl, tcl, tk }: -stdenv.mkDerivation -{ - name = "tkcvs-8.2.1"; +stdenv.mkDerivation rec { + pname = "tkcvs"; + version = "8.2.1"; src = fetchurl { - url = "mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz"; + url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; }; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 75d3cdbcc667..0ce0623ec9d9 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,13 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkg-config, faad2, faac, a52dec, alsa-lib, fftw, lame, libavc1394 -, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg -, libtiff, freetype, mjpegtools, x264, gettext, openexr -, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng -, libdv, libuuid, file, nasm, perl -, fontconfig, intltool }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, faad2 +, faac +, a52dec +, alsa-lib +, fftw +, lame +, libavc1394 +, libiec61883 +, libraw1394 +, libsndfile +, libvorbis +, libogg +, libjpeg +, libtiff +, freetype +, mjpegtools +, x264 +, gettext +, openexr +, libXext +, libXxf86vm +, libXv +, libXi +, libX11 +, libXft +, xorgproto +, libtheora +, libpng +, libdv +, libuuid +, file +, nasm +, perl +, fontconfig +, intltool +}: stdenv.mkDerivation { - name = "cinelerra-cv-2021-02-14"; + pname = "cinelerra-cv"; + version = "unstable-2021-02-14"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; @@ -26,20 +63,46 @@ stdenv.mkDerivation { preBuild = '' make -C cinelerra versioninfo.h ''; + enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ]; - buildInputs = - [ faad2 faac - a52dec alsa-lib fftw lame libavc1394 libiec61883 - libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype - mjpegtools x264 gettext openexr - libXext libXxf86vm libXv libXi libX11 libXft xorgproto - libtheora libpng libdv libuuid - nasm - perl - fontconfig - ]; + + buildInputs = [ + faad2 + faac + a52dec + alsa-lib + fftw + lame + libavc1394 + libiec61883 + libraw1394 + libsndfile + libvorbis + libogg + libjpeg + libtiff + freetype + mjpegtools + x264 + gettext + openexr + libXext + libXxf86vm + libXv + libXi + libX11 + libXft + xorgproto + libtheora + libpng + libdv + libuuid + nasm + perl + fontconfig + ]; meta = with lib; { description = "Professional video editing and compositing environment (community version)"; diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 09289840030e..7f57c79c5fe5 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,11 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 -, SDL, automake, GConf }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gtk2 +, libgnomeui +, libXv +, libraw1394 +, libdc1394 +, SDL +, automake +, GConf +}: -stdenv.mkDerivation { - name = "coriander-2.0.1"; +stdenv.mkDerivation rec { + pname = "coriander"; + version = "2.0.1"; src = fetchurl { - url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-2.0.1.tar.gz"; + url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-${version}.tar.gz"; sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5"; }; @@ -20,7 +33,7 @@ stdenv.mkDerivation { homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 502c4c69c3f8..941b0808886e 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,15 +1,28 @@ -{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkg-config -, flex, bison }: +{ lib +, stdenv +, fetchurl +, imagemagick +, libdvdread +, libxml2 +, freetype +, fribidi +, libpng +, zlib +, pkg-config +, flex +, bison +}: stdenv.mkDerivation rec { - name = "dvdauthor-0.7.1"; + pname = "dvdauthor"; + version = "0.7.1"; src = fetchurl { - url = "mirror://sourceforge/dvdauthor/${name}.tar.gz"; + url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz"; sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; }; - buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; + buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ]; nativeBuildInputs = [ pkg-config ]; patches = [ diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 38f85625bd05..ce64a702379c 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -228,5 +228,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ Anton-Latukha wmertens ]; platforms = with platforms; unix; + broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; }; } diff --git a/pkgs/applications/video/kodi-packages/archive_tool/default.nix b/pkgs/applications/video/kodi-packages/archive_tool/default.nix new file mode 100644 index 000000000000..4788556a8793 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/archive_tool/default.nix @@ -0,0 +1,28 @@ +{ lib, buildKodiAddon, fetchFromGitHub, vfs-libarchive }: +buildKodiAddon rec { + pname = "archive_tool"; + namespace = "script.module.archive_tool"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "zach-morris"; + repo = "script.module.archive_tool"; + rev = version; + sha256 = "0hbkyk59xxfjv6vzfjplahmqxi5564qjlwyq6k8ijy6jjcwnd3p7"; + }; + + propagatedBuildInputs = [ + vfs-libarchive + ]; + + passthru = { + pythonPath = "lib"; + }; + + meta = with lib; { + homepage = "https://github.com/zach-morris/script.module.archive_tool"; + description = "A set of common python functions to work with the Kodi archive virtual file system (vfs) binary addons"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/iagl/default.nix b/pkgs/applications/video/kodi-packages/iagl/default.nix new file mode 100644 index 000000000000..8ca0abdf960b --- /dev/null +++ b/pkgs/applications/video/kodi-packages/iagl/default.nix @@ -0,0 +1,30 @@ +{ lib, buildKodiAddon, fetchFromGitHub, fetchzip, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }: + +buildKodiAddon rec { + pname = "iagl"; + namespace = "plugin.program.iagl"; + version = "1101521-2"; + + src = fetchFromGitHub { + owner = "zach-morris"; + repo = "plugin.program.iagl"; + rev = "30e82eec1a909b31767f0e298cf77fc970b256d3"; + sha256 = "11y05i5f7lzik23w2kr52jdgr8db3gin8i683sy1hzxlmplk4699"; + }; + + propagatedBuildInputs = [ + dateutil + requests + routing + vfs-libarchive + archive_tool + youtube + ]; + + meta = with lib; { + homepage = "https://github.com/zach-morris/plugin.program.iagl"; + description = "Launch Games from the Internet using Kodi"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 7221e668f4e1..5fa652de0c7e 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -16,7 +16,7 @@ , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1 -, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson +, libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson , lirc , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp , dbusSupport ? true, dbus @@ -125,7 +125,7 @@ in stdenv.mkDerivation { libgcrypt libgpg-error libunistring libcrossguid libplist bluez giflib glib harfbuzz lcms2 libpthreadstubs - ffmpeg flatbuffers fmt fstrcmp rapidjson + ffmpeg flatbuffers fstrcmp rapidjson lirc mesa # for libEGL ] diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 6a10aca398cb..60604a4b8abf 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libdvdread }: stdenv.mkDerivation rec { - name = "lxdvdrip-1.76"; + pname = "lxdvdrip"; + version = "1.76"; src = fetchurl { - url = "mirror://sourceforge/lxdvdrip/${name}.tgz"; + url = "mirror://sourceforge/lxdvdrip/lxdvdrip-${version}.tgz"; sha256 = "0vgslc7dapfrbgslnaicc8bggdccyrvcgjv1dwi19qswhh7jkzj6"; }; diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index aa0f2404ab80..9f7e08a9ddf4 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, libogg, libvorbis, libdvdread }: stdenv.mkDerivation rec { - name = "ogmtools-1.5"; + pname = "ogmtools"; + version = "1.5"; src = fetchurl { - url = "https://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2"; + url = "https://www.bunkus.org/videotools/ogmtools/ogmtools-${version}.tar.bz2"; sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8"; }; - buildInputs = [libogg libvorbis libdvdread]; + buildInputs = [ libogg libvorbis libdvdread ]; meta = { description = "Tools for modifying and inspecting OGG media streams"; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 3fe3dcf454a1..e01d0a2f49c7 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, fetchurl -, raspberrypifw, pcre, boost, freetype, zlib +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, raspberrypifw +, pcre +, boost +, freetype +, zlib }: let ffmpeg = stdenv.mkDerivation rec { - name = "ffmpeg-1.1.3"; + pname = "ffmpeg"; + version = "1.1.3"; src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; + url = "http://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; }; - configurePlatforms = []; + configurePlatforms = [ ]; configureFlags = [ "--arch=${stdenv.hostPlatform.parsed.cpu.name}" ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ @@ -61,26 +69,32 @@ let }; in stdenv.mkDerivation rec { - name = "omxplayer-20130328-fbee325dc2"; - src = fetchurl { - url = "https://github.com/huceke/omxplayer/tarball/fbee325dc2"; - name = "${name}.tar.gz"; + pname = "omxplayer"; + version = "unstable-2013-03-28"; + + src = fetchFromGitHub { + owner = "huceke"; + repo = "omxplayer"; + rev = "fbee325dc20441138d04d8d2022ad85956302e97"; sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg"; }; - patchPhase = '' + + postPatch = '' sed -i 1d Makefile export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/" ''; + installPhase = '' mkdir -p $out/bin cp omxplayer.bin $out/bin ''; + buildInputs = [ raspberrypifw ffmpeg pcre boost freetype zlib ]; - meta = { + meta = with lib; { homepage = "https://github.com/huceke/omxplayer"; description = "Commandline OMX player for the Raspberry Pi"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.arm; + license = licenses.gpl2Plus; + platforms = platforms.arm; }; } diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix index e115fbcdd04d..95f7be2cbcaf 100644 --- a/pkgs/applications/video/subdl/default.nix +++ b/pkgs/applications/video/subdl/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation { - name = "subdl-0.0pre.2017.11.06"; + pname = "subdl"; + version = "unstable-2017-11.06"; src = fetchFromGitHub { owner = "alexanderwink"; @@ -10,6 +11,12 @@ stdenv.mkDerivation { sha256 = "0kmk5ck1j49q4ww0lvas2767kwnzhkq0vdwkmjypdx5zkxz73fn8"; }; + buildInputs = [ python3 ]; + + installPhase = '' + install -vD subdl $out/bin/subdl + ''; + meta = { homepage = "https://github.com/alexanderwink/subdl"; description = "A command-line tool to download subtitles from opensubtitles.org"; @@ -17,10 +24,4 @@ stdenv.mkDerivation { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.exfalso ]; }; - - buildInputs = [ python3 ]; - - installPhase = '' - install -vD subdl $out/bin/subdl - ''; } diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix index 70c3baa0b811..be0a7fcd2416 100644 --- a/pkgs/applications/video/uvccapture/default.nix +++ b/pkgs/applications/video/uvccapture/default.nix @@ -8,11 +8,12 @@ let in -stdenv.mkDerivation { - name = "uvccapture-0.5"; +stdenv.mkDerivation rec { + pname = "uvccapture"; + version = "0.5"; src = fetchurl { - url = "mirror://debian/pool/main/u/uvccapture/uvccapture_0.5.orig.tar.gz"; + url = "mirror://debian/pool/main/u/uvccapture/uvccapture_${version}.orig.tar.gz"; sha256 = "1b3akkcmr3brbf93akr8xi20w8zqf2g0qfq928500wy04qi6jqpi"; }; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index b046fbebaa26..d52feb8a66b0 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , ncurses , libjpeg @@ -19,10 +20,11 @@ }: stdenv.mkDerivation rec { - name = "xawtv-3.107"; + pname = "xawtv"; + version = "3.107"; src = fetchurl { - url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/xawtv/xawtv-${version}.tar.bz2"; sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5"; }; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index e0cca0409878..06dc6bb465cc 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,12 +1,26 @@ -{ lib, stdenv, fetchurl, perlPackages, pkg-config, gtk2 -, scrollkeeper, libglade, libXmu, libX11, libXext, gettext -, lame, libXfixes, libXdamage }: +{ lib +, stdenv +, fetchurl +, perlPackages +, pkg-config +, gtk2 +, scrollkeeper +, libglade +, libXmu +, libX11 +, libXext +, gettext +, lame +, libXfixes +, libXdamage +}: -stdenv.mkDerivation { - name = "xvidcap-1.1.7"; +stdenv.mkDerivation rec { + pname = "xvidcap"; + version = "1.1.7"; src = fetchurl { - url = "mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz"; + url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz"; sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm"; }; @@ -14,8 +28,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - gtk2 scrollkeeper - libglade libXmu gettext lame libXdamage libXfixes libXext libX11 + gtk2 + scrollkeeper + libglade + libXmu + gettext + lame + libXdamage + libXfixes + libXext + libX11 ] ++ (with perlPackages; [ perl XMLParser ]); # !!! don't know why this is necessary @@ -24,7 +46,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Screencast video catpuring tool"; homepage = "http://xvidcap.sourceforge.net/"; - license = lib.licenses.gpl2; + license = licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 1d1788ba0d80..7adcd328add7 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -30,10 +30,6 @@ edk2.mkDerivation projectDscPath { hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; - # Fails on i686 with: - # 'cc1: error: LTO support has not been enabled in this configuration' - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-fno-lto" ]; - buildFlags = lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 277c06438f53..ebfaac0bde1f 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.37.0"; + version = "1.37.2"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "1gxbgn61qv4zhzxwdd917hywwicr3jand34ghjzha35r44lmyzgz"; + sha256 = "1svhi9xf71zrk843bnwkpmq4iaaln07dpfrdvq0vdqhj5xvbx47g"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index cf6395c8a53b..75cf99caf861 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -1,29 +1,30 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "win-pvdrivers-git-20150701"; - version = "20150701"; +stdenv.mkDerivation { + pname = "win-pvdrivers"; + version = "unstable-2015-07-01"; - src = fetchgit { - url = "https://github.com/ts468/win-pvdrivers"; + src = fetchFromGitHub { + owner = "ts468"; + repo = "win-pvdrivers"; rev = "3054d645fc3ee182bea3e97ff01869f01cc3637a"; sha256 = "6232ca2b7c9af874abbcb9262faf2c74c819727ed2eb64599c790879df535106"; }; buildPhase = let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/."; - in lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]); + in lib.concatStringsSep "\n" (map unpack [ "xenbus" "xeniface" "xenvif" "xennet" "xenvbd" ]); installPhase = '' mkdir -p $out cp -r x86 $out/. cp -r amd64 $out/. - ''; + ''; meta = with lib; { description = "Xen Subproject: Windows PV Driver"; homepage = "http://xenproject.org/downloads/windows-pv-drivers.html"; - maintainers = [ maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; license = licenses.bsd3; }; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index 7c1eb0055a30..a4cd8dacc449 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, p7zip }: -stdenv.mkDerivation { - name = "win-qemu-0.1.105-1"; +stdenv.mkDerivation rec { + pname = "win-qemu"; version = "0.1.105-1"; dontUnpack = true; src = fetchurl { - url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso"; + url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc"; }; buildPhase = '' ${p7zip}/bin/7z x $src - ''; + ''; installPhase = let @@ -23,10 +23,10 @@ stdenv.mkDerivation { mkdir -p $out/${arch}/qemuagent cp guest-agent/${if arch=="x86" then "qemu-ga-x86.msi" else "qemu-ga-x64.msi"} $out/${arch}/qemuagent/qemu-guest-agent.msi (cd $out/${arch}/qemuagent; ${p7zip}/bin/7z x qemu-guest-agent.msi; rm qemu-guest-agent.msi) - ''; + ''; copy = arch: version: (copy_pvpanic arch version) + (copy_pciserial arch) + (copy_agent arch); in - (copy "amd64" "w8.1") + (copy "x86" "w8.1"); + (copy "amd64" "w8.1") + (copy "x86" "w8.1"); meta = with lib; { description = "Windows QEMU Drivers"; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index e9ad3b863386..ef8ec062e4d8 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -12,8 +12,8 @@ let }; in -stdenv.mkDerivation { - name = "gplpv-0.11.0.373"; +stdenv.mkDerivation { + pname = "gplpv"; version = "0.11.0.373"; dontUnpack = true; @@ -23,13 +23,13 @@ stdenv.mkDerivation { (cd x86; ${p7zip}/bin/7z e ${src_x86}) mkdir -p amd64 (cd amd64; ${p7zip}/bin/7z e ${src_amd64}) - ''; + ''; installPhase = '' mkdir -p $out/x86 $out/amd64 cp x86/* $out/x86/. cp amd64/* $out/amd64/. - ''; + ''; meta = with lib; { description = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation { Windows to be para-virtualized. The drivers are signed by Univention with a Software Publishers Certificate obtained from the VeriSign CA. - ''; + ''; homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 9b6c412fa211..cb45f5b7a827 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XJZg3uX++gU65bO1uqJblXXcVPzFXROCWFTn/gfkea0="; + sha256 = "sha256-HVWZ0XF1oBUHhkOQHELlZ/pxXUsUo2cVo6EhZl6S0W4="; }; - vendorSha256 = "sha256-+fx/Iy78gmhxRjXPkHYdixpaMkOwEANUsZA+KSdQkWU="; + vendorSha256 = "sha256-LhmZRa7vDylA4DRTfKFRs3lQMnwNfzF1H6ki1/zdpUg="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 8ac00d1f8e15..c7a3620d644e 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }: stdenv.mkDerivation { - name = "qboot-20200423"; + pname = "qboot"; + version = "unstable-2020-04-23"; src = fetchFromGitHub { owner = "bonzini"; @@ -26,6 +27,6 @@ stdenv.mkDerivation { homepage = "https://github.com/bonzini/qboot"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ tstrobel ]; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 98c7f80df8ad..0dcebb71cc5f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -2,7 +2,7 @@ , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsa-lib, curl, libvpx, nettools, dbus, substituteAll +, 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 @@ -14,6 +14,7 @@ , enableHardening ? false , headless ? false , enable32bitGuests ? true +, enableWebService ? false }: with lib; @@ -49,7 +50,8 @@ in stdenv.mkDerivation { ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals (headless) [ libXrandr libGL ] - ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ]; + ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ] + ++ optionals (enableWebService) [ gsoap zlib ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; @@ -133,6 +135,10 @@ in stdenv.mkDerivation { PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease ''} + ${optionalString (enableWebService) '' + # fix gsoap missing zlib include and produce errors with --as-needed + VBOX_GSOAP_CXX_LIBS := gsoapssl++ z + ''} LOCAL_CONFIG ./configure \ @@ -142,6 +148,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ + ${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@' \ @@ -168,7 +175,7 @@ in stdenv.mkDerivation { -name src -o -exec cp -avt "$libexec" {} + mkdir -p $out/bin - for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} 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 diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 84380bfc9d86..df7521cd2c41 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXinerama, libXpm }: -stdenv.mkDerivation { - name = "dzen2-0.9.5"; +stdenv.mkDerivation rec { + pname = "dzen2"; + version = "0.9.5"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXft libXinerama libXpm ]; src = fetchurl { - url = "https://github.com/robm/dzen/tarball/master/dzen2-0.9.5git.tar.gz"; + url = "https://github.com/robm/dzen/tarball/master/dzen2-${version}git.tar.gz"; sha256 = "d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556"; }; diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 94562cd0d224..0855e512fd8e 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -1,19 +1,36 @@ -{ lib, stdenv, fetchurl, libX11, libXext, libXrandr, libXrender, - xorgproto, patches ? [] }: +{ lib +, stdenv +, fetchurl +, libX11 +, libXext +, libXrandr +, libXrender +, xorgproto +, patches ? [ ] +}: stdenv.mkDerivation rec { - name = "evilwm-1.1.1"; + pname = "evilwm"; + version = "1.1.1"; src = fetchurl { - url = "http://www.6809.org.uk/evilwm/${name}.tar.gz"; + url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz"; sha256 = "79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a"; }; - buildInputs = [ libX11 libXext libXrandr libXrender - xorgproto ]; + buildInputs = [ + libX11 + libXext + libXrandr + libXrender + xorgproto + ]; - prePatch = ''substituteInPlace ./Makefile --replace /usr $out \ - --replace "CC = gcc" "#CC = gcc"''; + postPatch = '' + substituteInPlace ./Makefile \ + --replace /usr $out \ + --replace "CC = gcc" "#CC = gcc" + ''; # Allow users set their own list of patches inherit patches; @@ -21,14 +38,12 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.6809.org.uk/evilwm/"; description = "Minimalist window manager for the X Window System"; - license = { shortName = "evilwm"; fullName = "Custom, inherited from aewm and 9wm"; url = "http://www.6809.org.uk/evilwm/"; free = true; - }; # like BSD/MIT, but Share-Alike'y; See README. - + }; # like BSD/MIT, but Share-Alike'y; See README. maintainers = with maintainers; [ amiloradovsky ]; platforms = platforms.all; }; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 7e42a8efd7e9..9a1b959690a2 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -1,36 +1,49 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk -, i3lock-color, getopt, fontconfig +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, scrot +, imagemagick +, gawk +, i3lock-color +, getopt +, fontconfig }: stdenv.mkDerivation rec { - rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; - name = "i3lock-fancy-unstable-2018-11-25_rev${builtins.substring 0 7 rev}"; + pname = "i3lock-fancy"; + version = "unstable-2018-11-25"; + src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; - inherit rev; + rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1"; }; - patchPhase = '' - sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" i3lock-fancy - sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy - sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy - sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy - sed -i -e "s|awk -F|${gawk}/bin/awk -F|" i3lock-fancy - sed -i -e "s| awk | ${gawk}/bin/awk |" i3lock-fancy - sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" i3lock-fancy - sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' i3lock-fancy - sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy - sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy - sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy - sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" i3lock-fancy + + postPatch = '' + sed -i i3lock-fancy \ + -e "s|mktemp|${coreutils}/bin/mktemp|" \ + -e "s|'rm -f |'${coreutils}/bin/rm -f |" \ + -e "s|scrot -z |${scrot}/bin/scrot -z |" \ + -e "s|convert |${imagemagick.out}/bin/convert |" \ + -e "s|awk -F|${gawk}/bin/awk -F|" \ + -e "s| awk | ${gawk}/bin/awk |" \ + -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" \ + -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' \ + -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' \ + -e "s|getopt |${getopt}/bin/getopt |" \ + -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" \ + -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" rm Makefile ''; + installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons cp i3lock-fancy $out/bin/i3lock-fancy cp icons/lock*.png $out/share/i3lock-fancy/icons ''; + meta = with lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; homepage = "https://github.com/meskarune/i3lock-fancy"; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 8e9cb2d2b76f..bbbad532d096 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { - name = "i3status-2.13"; + pname = "i3status"; + version = "2.13"; src = fetchurl { - url = "https://i3wm.org/i3status/${name}.tar.bz2"; + url = "https://i3wm.org/i3status/i3status-${version}.tar.bz2"; sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; }; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 8f172ac87003..4794de1d5f84 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,18 +1,25 @@ { lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: -stdenv.mkDerivation { - name = "ion-3-20090110"; - meta = { - description = "Tiling tabbed window manager designed with keyboard users in mind"; - homepage = "http://modeemi.fi/~tuomov/ion"; - platforms = with lib.platforms; linux; - license = lib.licenses.lgpl21; - }; +stdenv.mkDerivation rec { + pname = "ion"; + version = "3-20090110"; + src = fetchurl { - url = "http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz"; + url = "http://tuomov.iki.fi/software/dl/ion-${version}.tar.gz"; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; + buildInputs = [ xlibsWrapper lua gettext groff ]; + buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; + installFlags = [ "PREFIX=\${out}" ]; + + meta = with lib; { + description = "Tiling tabbed window manager designed with keyboard users in mind"; + homepage = "http://modeemi.fi/~tuomov/ion"; + platforms = with platforms; linux; + license = licenses.lgpl21; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch b/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch deleted file mode 100644 index f7b6a4cb9f16..000000000000 --- a/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 347d325..dce95a0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -489,7 +489,8 @@ fi - ############################################################################ - AM_ICONV - AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION([0.19]) -+AM_GNU_GETTEXT_VERSION([0.19.6]) -+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) - LDFLAGS="$LDFLAGS $LIBINTL $LIBICONV" - - ############################################################################ diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 3c97c5630b08..2c9461d6388b 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,21 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, libtool, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: stdenv.mkDerivation rec { pname = "jwm"; - version = "1685"; + version = "2.4.0"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; - rev = "s${version}"; - sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg"; + rev = "v${version}"; + sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj"; }; - patches = [ ./0001-Fix-Gettext-Requirement.patch ]; - - nativeBuildInputs = [ pkg-config automake autoconf libtool gettext which ]; + nativeBuildInputs = [ pkg-config gettext which autoreconfHook ]; buildInputs = [ libX11 @@ -38,12 +36,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = "./autogen.sh"; - meta = { homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; - license = lib.licenses.gpl2; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index e9d400378e62..ce212b1c682b 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }: -stdenv.mkDerivation { - name = "larswm-7.5.3"; +stdenv.mkDerivation rec { + pname = "larswm"; + version = "7.5.3"; src = fetchurl { - url = "mirror://sourceforge/larswm/larswm-7.5.3.tar.gz"; + url = "mirror://sourceforge/larswm/larswm-${version}.tar.gz"; sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v"; }; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 786a47d49c34..e17cbce7e2bb 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -47,6 +47,9 @@ let psutil pyxdg pygobject3 + pywayland + pywlroots + xkbcommon ]; doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 2eeae7f4da5e..7366ff196954 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -1,9 +1,8 @@ -{lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }: - -with lib; +{ lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [ ] }: stdenv.mkDerivation { - name = "tabbed-20180310"; + pname = "tabbed"; + version = "unstable-2018-03-10"; src = fetchgit { url = "https://git.suckless.org/tabbed"; @@ -23,7 +22,7 @@ stdenv.mkDerivation { "PREFIX=$(out)" ]; - meta = { + meta = with lib; { homepage = "https://tools.suckless.org/tabbed"; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index c210b39fe181..57cf0fc93fac 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, gtk2 }: stdenv.mkDerivation rec { - name = "trayer-1.1.8"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gdk-pixbuf gtk2 ]; + pname = "trayer"; + version = "1.1.8"; src = fetchFromGitHub { owner = "sargon"; repo = "trayer-srg"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg"; }; - preConfigure = '' + postPatch = '' patchShebangs configure ''; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gdk-pixbuf gtk2 ]; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 9eea18f79d60..7c47eb9c4d99 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -1,11 +1,21 @@ -{lib, stdenv, fetchurl, ncurses, pkg-config, glib, libviper, libpseudo, gpm, -libvterm}: +{ lib +, stdenv +, fetchurl +, ncurses +, pkg-config +, glib +, libviper +, libpseudo +, gpm +, libvterm +}: stdenv.mkDerivation rec { - name = "vwm-2.1.3"; + pname = "vwm"; + version = "2.1.3"; src = fetchurl { - url = "mirror://sourceforge/vwm/${name}.tar.gz"; + url = "mirror://sourceforge/vwm/vwm-${version}.tar.gz"; sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf"; }; |