diff options
Diffstat (limited to 'pkgs/applications')
243 files changed, 3460 insertions, 2491 deletions
diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 591c14c1adf..b2cce97bbc4 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -30,13 +30,9 @@ mkDerivation rec { postConfigure = "make qmake_all"; - # 1. installs app bundle on darwin, move to app bundle dir & link binary to bin - # 2. wrapQtAppsHook fails to wrap mach-o binaries automatically, manually call wrapper - # (see https://github.com/NixOS/nixpkgs/issues/102044) postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/{bin,Applications}/BambooTracker.app - wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker ''; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 1a6471397de..fa53bee5dc8 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -11,8 +11,8 @@ let sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; }; "2" = { - fluidsynthVersion = "2.0.6"; - sha256 = "0nas9pp9r8rnziznxm65x2yzf1ryg98zr3946g0br3s38sjf8l3a"; + fluidsynthVersion = "2.2.3"; + sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3"; }; }; in diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index 0213dc4af6d..a50e5dcd669 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "6.4"; + version = "6.5"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XR5xmQYVbBR6QWt/+PLeGqg0t4xl35MPrQNaPsmgAYA="; + sha256 = "sha256-thRcRJ88bz3jwu6rKaQxt2MkBSf5Ri1jygkKDguP2eE="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index b55cf9be351..e355cfb86de 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "mpdevil"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "SoongNoonien"; repo = pname; rev = "v${version}"; - sha256 = "1wa5wkkv8kvzlxrhqmmhjmrzcm5v2dij516dk4vlpv9sazc6gzkm"; + sha256 = "1zx129zl6bjb0j3f81yx2641nsj6ck04q5f0v0g8f08xgdwsyv3b"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 191612700f4..93a9ce25854 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -36,7 +36,6 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/${mainProgram}.app $out/Applications/ - wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} ''; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index c542517797e..33df06e77e4 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -3,7 +3,6 @@ let pname = "plexamp"; version = "3.7.1"; - name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; @@ -12,16 +11,16 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; multiPkgs = null; # no 32bit needed extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' - ln -s $out/bin/${name} $out/bin/${pname} + ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop install -m 444 -D ${appimageContents}/plexamp.png \ $out/share/icons/hicolor/512x512/apps/plexamp.png diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index ab55287f29f..46625253d0f 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -1,11 +1,7 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12, -alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: -let - # Using Electron 12 to solve errors regarding threading - electron = electron_12; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "pocket-casts"; version = "0.5.0"; @@ -41,8 +37,9 @@ in stdenv.mkDerivation rec { ''; postFixup = '' - substituteInPlace $out/share/applications/pocket-casts.desktop --replace '"/opt/Pocket Casts/pocket-casts"' $out/bin/pocket-casts - substituteInPlace $out/share/applications/pocket-casts.desktop --replace '/usr/share/icons/hicolor/0x0/apps/pocket-casts.png' "pocket-casts" + substituteInPlace $out/share/applications/pocket-casts.desktop \ + --replace '"/opt/Pocket Casts/pocket-casts"' $out/bin/pocket-casts \ + --replace '/usr/share/icons/hicolor/0x0/apps/pocket-casts.png' "pocket-casts" makeWrapper ${electron}/bin/electron \ $out/bin/pocket-casts \ --add-flags $out/opt/pocket-casts/resources/app.asar diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 7d1ec9f9978..1d5edf892cb 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.4"; + version = "0.9.5"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceChars ["."] ["_"] version}"; - sha256 = "sha256-eZKrPQ07Z3pF5dArZ4QSclrRCaPHpPb8S5HANLUS9MM="; + sha256 = "sha256-20oy3R0gbVXO3Da80cTYXu+BG8OfVNRLtAwHk8nRFJk="; }; buildInputs = [ diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 56d1dacaf9a..9561dc00d74 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -1,19 +1,22 @@ { lib, stdenv, fetchurl, pkg-config , alsa-lib, fftw, gsl, motif, xorg +, CoreServices, CoreMIDI }: stdenv.mkDerivation rec { pname = "snd"; - version = "21.7"; + version = "21.8"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-GjaPZmJfodvYvhObGcBDRN0mIyc6Vxycd0BZGHdvoJA="; + sha256 = "sha256-sI2xa37eSBDr/ucQ7RF3YfsszKfWcmOCoAJENALSlTo="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib fftw gsl motif ] + buildInputs = [ fftw gsl motif ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.isDarwin [ CoreServices CoreMIDI ] ++ (with xorg; [ libXext libXft libXpm libXt ]); configureFlags = [ "--with-motif" ]; diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 166784a164d..60fbd3a2888 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "songrec"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "marin-m"; repo = pname; rev = version; - sha256 = "sha256-9fq2P+F7Olm9bUQ1HbH/Lzb5J2mJCma+x/vuH3wf+zY="; + sha256 = "sha256-pKHKM4XOuuZCr4neMe1AVqWMuZghwYNe+ifJCQhXG/c="; }; - cargoSha256 = "sha256-ATlwBMuT8AufkrZNe1+U74hYRN4V88ZDKYvCWV52iyI="; + cargoSha256 = "sha256-J3ezXBOGJwzIPTHXujHpswsgh9PFy110AOQ2pPJNm10="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 7a5a5c7280f..54ed7a977f3 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -1,60 +1,56 @@ -{ stdenv -, dpkg -, lib -, autoPatchelfHook +{ lib +, stdenv , fetchurl -, gtk3 -, glib -, desktop-file-utils +, autoPatchelfHook +, dpkg , alsa-lib -, libjack2 -, harfbuzz -, fribidi -, pango , freetype +, libglvnd , curl +, libXcursor +, libXinerama +, libXrandr +, libXrender +, libjack2 }: stdenv.mkDerivation rec { pname = "tonelib-jam"; - version = "4.6.6"; + version = "4.7.0"; src = fetchurl { - url = "https://www.tonelib.net/download/0509/ToneLib-Jam-amd64.deb"; - sha256 = "sha256-cizIQgO35CQSLme/LKQqP+WzB/jCTk+fS5Z+EtF7wnQ="; + url = "https://www.tonelib.net/download/0930/ToneLib-Jam-amd64.deb"; + sha256 = "sha256-xyBDp3DQVC+nK2WGnvrfUfD+9GvwtbldXgExTMmCGw0="; }; - buildInputs = [ + nativeBuildInputs = [ + autoPatchelfHook dpkg - gtk3 - glib - desktop-file-utils - alsa-lib - libjack2 - harfbuzz - fribidi - pango - freetype ]; - nativeBuildInputs = [ - autoPatchelfHook + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + freetype + libglvnd + ] ++ runtimeDependencies; + + runtimeDependencies = map lib.getLib [ + curl + libXcursor + libXinerama + libXrandr + libXrender + libjack2 ]; - unpackPhase = '' - mkdir -p $TMP/ $out/ - dpkg -x $src $TMP - ''; + unpackCmd = "dpkg -x $curSrc source"; installPhase = '' - cp -R $TMP/usr/* $out/ - mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam + mv usr $out + substituteInPlace $out/share/applications/ToneLib-Jam.desktop --replace /usr/ $out/ ''; - runtimeDependencies = [ - (lib.getLib curl) - ]; - meta = with lib; { description = "ToneLib Jam – the learning and practice software for guitar players"; homepage = "https://tonelib.net/"; diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index b50ebdd4a87..d16fc0f85c5 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://www.areca-backup.org/"; description = "An Open Source personal backup solution"; + # Builds fine but fails to launch. + broken = true; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 4077442b341..2781e69c56a 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.7.4"; + version = "1.7.5"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "1yhxq6pv8hc0pz8g993a9nng2srnmmajkqxf0lfvkypy13k9zdg4"; + sha256 = "0mwlmya53xaps8x8c5cvk9zxy0ddijkrba8x3jp2glql34wac3ri"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 5a4c7f4e33d..23a0e479160 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.2.4"; + version = "1.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-vjNJ08twsJ036TTFF6srOGshDpP7ZwWCGN0XjrtFT/g="; + sha256 = "sha256-gJvUW/U+O83Q0VDo6a5VkWx2RuofMNs/mPn/hnM2XiE="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index f92b2f7a856..2cb07e9954f 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,18 +31,18 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.12"; - sha256 = "0sciwh9m7h6ns59bsrzpd6zyxxdkiy33bdsq0phd3r2yxakvw68n"; + version = "1.2.13"; + sha256 = "16nhahb6bnjwhw3wh044zfkqpb5k40kyhdazs2h6y4phjhm5hq2r"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; - version = "1.2.7"; - sha256 = "02x3p0am5zqp8f4fycdlrp26alicxc5vrlvgxg6d8wsa35q473xc"; + version = "1.2.8"; + sha256 = "0ldk7kyipgmg0mj1444ins5n014z149j1qa40h12pncr6q1fb0xf"; }) (fetchNuGet { name = "BTCPayServer.Lightning.CLightning"; - version = "1.2.8"; - sha256 = "06c6dnp72iwvnjm3pil24fnk4vp2v1f9gg84a381yn1xah9jghky"; + version = "1.2.9"; + sha256 = "0r855lnh6cyj6hpwhdpdhpp39332v7lmk93ri2q8gs9lsnwdyjr8"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; @@ -50,19 +50,24 @@ sha256 = "09p2ks1qgy6jnpcfwgdnxvldyyadwnh3mwmq9z89vvzmmgs19xkk"; }) (fetchNuGet { + name = "BTCPayServer.Lightning.Common"; + version = "1.2.7"; + sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6"; + }) + (fetchNuGet { name = "BTCPayServer.Lightning.Eclair"; - version = "1.2.6"; - sha256 = "0lf55w8v997kqh808545ry5mlwxpzxzlkbz38fl4nfm85yydw0fc"; + version = "1.2.7"; + sha256 = "1h15gic45wps4nvmxyfmfils9nicbz3xkli705hq69g0mafy0f23"; }) (fetchNuGet { name = "BTCPayServer.Lightning.LND"; - version = "1.2.8"; - sha256 = "1g1siy3xwf3rmyl4qrcg42wpww4b2qmfs88x0rxccwxjy5inzkz6"; + version = "1.2.9"; + sha256 = "1zyr58kwdyb02dfgxza73fqvzcjlf59msllmf06anl9im4pqcjx6"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Ptarmigan"; - version = "1.2.6"; - sha256 = "10g785jh92z5x7aqh41ma3d1nw0718bk7ibb58ychhdk1v2wwmh4"; + version = "1.2.7"; + sha256 = "1mmj8bi32kzgda8v7qdfpm2qlpffv5223c2xnq7351h8ih4bbcvb"; }) (fetchNuGet { name = "BuildBundlerMinifier"; @@ -170,14 +175,19 @@ sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) (fetchNuGet { + name = "LNURL"; + version = "0.0.14"; + sha256 = "0b2v87k3yi2lyka5zy3sbvxsa7yp04nn72l7dk27cm9i1d9914sq"; + }) + (fetchNuGet { name = "McMaster.NETCore.Plugins.Mvc"; - version = "1.3.1"; - sha256 = "1dh58ijwn6q6id0jpzr4hpfl0y4ak43zq4m8rsi5j2qv8vasq1mi"; + version = "1.4.0"; + sha256 = "07i0p6236hyh1c3cb5v6zkayq5807rd6msc341v2jh6yd5radasy"; }) (fetchNuGet { name = "McMaster.NETCore.Plugins"; - version = "1.3.1"; - sha256 = "0jrp7sshnvg7jcb52gfhwmg1jy31k9dxdf4061yggwcgpfskyg7n"; + version = "1.4.0"; + sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; }) (fetchNuGet { name = "Microsoft.AspNet.SignalR.Client"; @@ -191,13 +201,13 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.Cryptography.Internal"; - version = "3.1.4"; - sha256 = "0d4djj073bl9kps5jkcpydh92lcp6kpa7njhypjw3myaa987dcsh"; + version = "3.1.19"; + sha256 = "1b20hksk2qk2jnkwin4g0n9ap3ma7724pd518fh9qcakf7vfpkl1"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; - version = "3.1.4"; - sha256 = "1rya2775prm8ss0rz6izsqqcz96gcf1rh0bpcvnfy1mwi04rx8bl"; + version = "3.1.19"; + sha256 = "1ksi2h3904932igh1g27l91fqdsfxg8zr6y82ym8pqb62m0906a4"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Abstractions"; @@ -221,33 +231,33 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; - version = "3.1.4"; - sha256 = "0smcpaqm7d95flr0k7i2psrsfvs48lv28kzqgnllv5229hhb670d"; + version = "3.1.19"; + sha256 = "0sm7cpccpygwgplbkp0j1q5ilkkiw0dx76qwy3xharv4himakrfm"; }) (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; - version = "3.1.1"; - sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; + version = "3.1.19"; + sha256 = "1fh3k85k988jw35sf5hvm6jwmvzmslzpfvf3jk3sn3f3s6gyk0an"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "3.1.1"; - sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; + version = "3.1.19"; + sha256 = "1nh08kjdc152m85ycwxn1q8r69f0l02p6cac6q57nzlyy5gyj2rs"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; - version = "3.1.1"; - sha256 = "1iydcr7rfzg3kqky0x70853g6lbzsl9ja9cv8ph6iwpqxnswgdkh"; + version = "3.1.19"; + sha256 = "1n22q10n9xlhcjxsm1apd0b7j3j97dd5jmpw6nvymwbv2bw88af4"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; - version = "3.1.1"; - sha256 = "1q1bblcj9l2dnz46frygsfq7w4v08l96clgryh78wyws83xjm43y"; + version = "3.1.19"; + sha256 = "1glmlgrwksv0h8g41wy43wv94ndllq4ihxhdaagig9szvivdh8c1"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Language"; - version = "3.1.1"; - sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0"; + version = "3.1.19"; + sha256 = "059v85f2qbj403wcnp5mspzvhkbf6d8hsjl26xvfd5s8svnaz4ax"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; @@ -256,8 +266,8 @@ }) (fetchNuGet { name = "Microsoft.Bcl.HashCode"; - version = "1.1.0"; - sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; + version = "1.1.1"; + sha256 = "0xwfph92p92d8hgrdiaka4cazqsjpg4ywfxfx6qbk3939f29kzl0"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; @@ -266,38 +276,38 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; - version = "3.0.0"; - sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; + version = "3.3.2"; + sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; - version = "3.3.0"; - sha256 = "1vwhsp3pjgcfnpapkps9a3z9n2ryiv5bbhzycfljngj5grj63rg2"; + version = "3.11.0"; + sha256 = "0pwidgg4ifm7cirdy3hf61dyvg6lk4vgb6q7lyb4y0h0b6mvkrcl"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; - version = "3.6.0"; - sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7"; + version = "3.3.0"; + sha256 = "1vwhsp3pjgcfnpapkps9a3z9n2ryiv5bbhzycfljngj5grj63rg2"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; - version = "3.3.0"; - sha256 = "09nmd5h1r2q0dwp1dfpn4anvs8sfi3rwcgpcv28lrhky8vc51424"; + version = "3.11.0"; + sha256 = "1h16b7dsp1mq7d7picyfhkssqr6xiyywi5x1fd4jwclyrvanyl81"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; - version = "3.6.0"; - sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn"; + version = "3.3.0"; + sha256 = "09nmd5h1r2q0dwp1dfpn4anvs8sfi3rwcgpcv28lrhky8vc51424"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Razor"; - version = "3.1.1"; - sha256 = "03n5rli6v1kvghha82zar3dvvkbc2vb9g8zp5fjrzhvp4l74ingn"; + version = "3.1.19"; + sha256 = "18l0gcpl7i0bfnyzhpm7h72ng2h8bh46fr2azk7d3ns507gi3xmp"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.6.1"; - sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; + version = "16.11.0"; + sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -321,8 +331,8 @@ }) (fetchNuGet { name = "Microsoft.Data.Sqlite.Core"; - version = "3.1.4"; - sha256 = "1pahyqjs4l9g1wg9hvxf68kgzzf72ny2i7n7ai97a389p2c86xvh"; + version = "3.1.19"; + sha256 = "0ns3rrk011gjw4g1kwr625390yj0mcadb3py49750sji72my7l7s"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -331,53 +341,53 @@ }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; - version = "3.1.0"; - sha256 = "1fg1zggza45pa8zlcf8llqh6v47fqi44azsia68kmsg2q9r1r4mq"; + version = "3.1.6"; + sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { - name = "Microsoft.DotNet.PlatformAbstractions"; - version = "3.1.4"; - sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia"; + name = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "3.1.18"; + sha256 = "0d00d6wx2mm5bav39bjsikjq0sx6qmp183dbwimfda7wav2bwya8"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "3.1.4"; - sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7"; + version = "3.1.19"; + sha256 = "0na2jgxs5k2gxqh99ha4v0blya3pwh2qha49iz0qkw0r3kq0vdvv"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "3.1.4"; - sha256 = "1zaqn9z7ns6p6jgnffzkgpziqr2wqs68g2sa0c11kaclhlhgvvbv"; + version = "3.1.19"; + sha256 = "02xjz4c6f71mcmdwihi9klrqm28xk84x19vcqi8cgpw50q7d0rly"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Design"; - version = "3.1.4"; - sha256 = "10mxnbiw23ia4sln86sd3gn84yhmrb6r2kipzid4h1g15paal9gi"; + version = "3.1.19"; + sha256 = "128md0ijqa1wvpdicf09i7kcb2aq2b07skc6j0vddz2jhcbi0irr"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Relational"; - version = "3.1.0"; - sha256 = "0javqw6c27ppcysigjvcjcw3mk0gg1pv2pmwfpvvryr1pb4a9n55"; + version = "3.1.18"; + sha256 = "0mlq9gmxrmix68mdh0lv803cx15lzrhs5d9622vj8wwdlngg3xdx"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Relational"; - version = "3.1.4"; - sha256 = "1344rsavawwg69dx8xsl08hcs43lc6h7z4mn461dcx85rirlwd0v"; + version = "3.1.19"; + sha256 = "13rbnd441r4zb52y99zwida0n0phvvw7hmccjy2kpnk1jfrr8xi1"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "3.1.4"; - sha256 = "080qz0b52i7v5c1sgnqlh9px9881cfr1x06np66hdgmh0ni5c1lw"; + version = "3.1.19"; + sha256 = "1w8ja5daglnr3ycfwlyskrnacb66p8yz730k838v6bpmpsdybn71"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "3.1.4"; - sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx"; + version = "3.1.19"; + sha256 = "0iwwa44dr2lg9mh5hmnpnkzbhi5v3vi6xy3xlnqg4hja37ji0xyw"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; - version = "3.1.4"; - sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; + version = "3.1.19"; + sha256 = "0gl43zk7ashjx49h35w58cn7dfl1ap3nyq9ws8575jcjhcx3c94h"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; @@ -386,13 +396,13 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; - version = "3.1.4"; - sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk"; + version = "3.1.19"; + sha256 = "1y1is16yl69ja67i9n98r44cr0z8b8f8k31d5ighi9djj4yhz4k2"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; - version = "3.1.4"; - sha256 = "0b8ijxjd8lgq8mgnvh3wl4y4wbjj3v5b763y6gslm75fn43iyad8"; + version = "3.1.19"; + sha256 = "1iysxrmchw5ripyrcfi4nv5a00b9a7agsgvbb7y9fwbfq838v3mp"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; @@ -411,8 +421,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.4"; - sha256 = "0r33m68y1vgpmqams4sgciizl0w6y97qkp93m0hyn0nlkxqf72l6"; + version = "3.1.19"; + sha256 = "19s5dpswyad55p191280510sb8cr2b6zyx9zlx79p0lq4zaxwaq6"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; @@ -426,8 +436,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.4"; - sha256 = "1bnf213zlrh0m3sbhsv601yx21l5xp254jiy2g4hm7zpm8vsz1hz"; + version = "3.1.19"; + sha256 = "0dw1qiyc8j7rk13x6wfm1xnc7drnlvk8xv607hja0af2m0y7a3p2"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; @@ -461,8 +471,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Configuration"; - version = "3.1.4"; - sha256 = "0npc18pjl86d06czb0fy6ln3prfpwfb16p6709xx2jrsl96dp9bp"; + version = "3.1.19"; + sha256 = "04zadl7q5vcak9d77jm5ivfzhhp2zvz5apywvfzrca4h0q38fs45"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration"; @@ -481,8 +491,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.4"; - sha256 = "03ys96pqca93zwxvh0vprzms09i9y0lmq32w98m6klbizq01fc06"; + version = "3.1.19"; + sha256 = "0claq9nna6p30zbvd25bn1ild9f3x50d5fxfbq9fsp464rq70b2y"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; @@ -496,8 +506,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.4"; - sha256 = "0rhyjgdpjm56drvrvqd9v1xq1qhyrpwwn2pjsz17g2s462rwliqx"; + version = "3.1.19"; + sha256 = "0fsvv5jl95kmdxc4c7b15xanlq3fmfls556m8ghbqqikrgkqhz8m"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; @@ -506,18 +516,13 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; - version = "3.1.0"; - sha256 = "12nrdw3q9wl5zry8gb3sw003a0iyk2gvps2ij813l7lim38wy1mi"; + version = "3.1.6"; + sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; - version = "3.1.1"; - sha256 = "0qa04dspjl4qk7l8d66wqyrvhp5dxcfn2j4r8mmj362xyrp3r8sh"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyModel"; - version = "3.1.4"; - sha256 = "0r0wv4k0ig6mrl6fr184zqbf5f010d6i2an2ws23g2bjvk8jh1bk"; + version = "5.0.0"; + sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }) (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Abstractions"; @@ -551,13 +556,13 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Identity.Core"; - version = "3.1.4"; - sha256 = "0kyi03l9d7pnsvrcylc86fcxwnj59mhvmbz4c1d142f8djdrqfid"; + version = "3.1.19"; + sha256 = "14mywrm6mv7hzfappgdrmwwk97a4qpfkir5a55443awy8wl3bylr"; }) (fetchNuGet { name = "Microsoft.Extensions.Identity.Stores"; - version = "3.1.4"; - sha256 = "0jb3syy0glyn4nnd7lb7aj412xnqyrwhfavh98rbc5adq9v09nbw"; + version = "3.1.19"; + sha256 = "0pkrhf1vffll986hh49gyvfdqn1vnjd0qnpfkag2b76d681xlvgg"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; @@ -581,8 +586,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.4"; - sha256 = "1rkl0yqmi5vfivn641866v2mdsgdy8amym546y6lzbab39g24b5n"; + version = "3.1.19"; + sha256 = "07jnqb6518xrw086rqlc28ms80d57xg0pl5x72032rk2x5x8hhnn"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; @@ -601,8 +606,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; - version = "3.1.4"; - sha256 = "04asfrhfrcl3ijilry2pr28ql5m6pgrwapadikgcg66jjxbx75zq"; + version = "3.1.19"; + sha256 = "0j2874x847xa1nfbppjn10cnxd486f6lwy53mxmansvlmp96h2sn"; }) (fetchNuGet { name = "Microsoft.Extensions.Options.ConfigurationExtensions"; @@ -621,8 +626,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Options"; - version = "3.1.4"; - sha256 = "0jphncx82l7jm5xi49dfxhbh24wv86sy44022chd7bkizllsypp4"; + version = "3.1.19"; + sha256 = "1jm7rd2sbfscyfysvl8zcaypyzpd6d5w52ha2npa9c7q84cmn4r9"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -656,8 +661,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; - version = "3.1.4"; - sha256 = "12xvysk024aghrcwzv4525vznnk8lqmknl2vqqxhq4k5hjxpsysp"; + version = "3.1.19"; + sha256 = "0vcwwqqfwm5vj87psmic6mxix3prgkzw8sqbg5m1c2q662kby380"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; @@ -681,13 +686,13 @@ }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.6.1"; - sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; + version = "16.11.0"; + sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl"; }) (fetchNuGet { name = "Microsoft.NetCore.Analyzers"; - version = "2.9.8"; - sha256 = "1klybsdy9yw49zlpmix4vjdhmfaibg5h9yx03vszdnijzap7vpsx"; + version = "3.3.2"; + sha256 = "1h1bjiiw64qncs61p2idwxswv4kzq06bbl2rlghiagv6sbjk4pnq"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -726,13 +731,13 @@ }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.6.1"; - sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + version = "16.11.0"; + sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.6.1"; - sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix"; + version = "16.11.0"; + sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -751,18 +756,18 @@ }) (fetchNuGet { name = "MySqlConnector"; - version = "0.61.0"; - sha256 = "0b0mc41dsih4p1ky3kcmibsz4bw14w439nraq5732wjfkq2sqdxg"; + version = "0.69.10"; + sha256 = "159xir7czzz291cs0f2dsgmnhar41s4wglm5r5lw3kqpd50q3i9v"; }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "3.0.4"; - sha256 = "03aia31sznw81jjr9k6dkwgvm9dc38fgp1z8y5i45vlkf5fp89pb"; + version = "3.0.8"; + sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618"; }) (fetchNuGet { - name = "NBitcoin"; - version = "5.0.33"; - sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; + name = "NBitcoin.Secp256k1"; + version = "1.0.3"; + sha256 = "08d4db64j1qz8ax9fg8zi6n7g1n53clnkajbbvv2hgaqyfrsnqxj"; }) (fetchNuGet { name = "NBitcoin"; @@ -771,6 +776,16 @@ }) (fetchNuGet { name = "NBitcoin"; + version = "5.0.54"; + sha256 = "0mx2gr8j8bc4mf1vi1fvqj3672qalxvzvincc61if79p46cik24b"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "6.0.15"; + sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain"; + }) + (fetchNuGet { + name = "NBitcoin"; version = "6.0.3"; sha256 = "1kfq1q86844ssp8myy5vmvg33h3x0p9gqrlc99fl9gm1vzjc723f"; }) @@ -786,88 +801,88 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "4.1.0"; - sha256 = "1al9j14k51ql7m6yd2w89xlnklj64jqjikq8wpl2vwi1zy2gxqrl"; + version = "4.1.3"; + sha256 = "1nh4jj7yg81825hr7cc99qlnfmdm6jibap81qqi8a968b61z4251"; }) (fetchNuGet { name = "Nethereum.ABI"; - version = "3.8.0"; - sha256 = "10saq2qsqqgsf9d5cjji4lay74ydwkvkqgnns6gxikqicci8yx5c"; + version = "4.1.0"; + sha256 = "1mhg6mh7wkz93fq3pclkxjipcvzglnk70gr9s1cgr2ak84y3g5lr"; }) (fetchNuGet { name = "Nethereum.Accounts"; - version = "3.8.0"; - sha256 = "03dq4l1gsd6r2hah5flas8d8pfys7hh5srd279kiidaaxrp8fv2m"; + version = "4.1.0"; + sha256 = "0wd4wa2d1dm4ni5l208bn7wi63m1whmbh4x6sfk8m4qh4dlh1bq0"; }) (fetchNuGet { name = "Nethereum.BlockchainProcessing"; - version = "3.8.0"; - sha256 = "0sz6710a3rvzbj1ghx8dx9adfpsaydw8129c5nj2bqvvh6shi4ax"; + version = "4.1.0"; + sha256 = "1986y39mpd61s7kkkbcc9hcg7vwmp9mamhiiy9pzsnfgc2jna6c4"; }) (fetchNuGet { name = "Nethereum.Contracts"; - version = "3.8.0"; - sha256 = "0989as81dqz4j0h8b5a9f5hnd4lrjdj851cfc4j5h6hd633a13f8"; + version = "4.1.0"; + sha256 = "07yj2fqx0p22aayhn7zjczq5xj55b2w48qar8j5q2klzl9q64iwc"; }) (fetchNuGet { name = "Nethereum.HdWallet"; - version = "3.8.0"; - sha256 = "0dy1bcm0gsp137286q3bx5q9gyd8lymrdmnh1ip3sszs5j31l9k2"; + version = "4.1.0"; + sha256 = "052g15iqhkx94igvnv5qr8gxpvbi34c7avqn6j4i4p0yf6kwbwsi"; }) (fetchNuGet { name = "Nethereum.Hex"; - version = "3.8.0"; - sha256 = "0sbi982jnfs39sp7w85wf8lb51mijpwr9mpsmws08zrm90n93kb6"; + version = "4.1.0"; + sha256 = "1bkmbfclbkr3336za7ii5vac7c4h2l1vd4bl3a15s54piwfgx44w"; }) (fetchNuGet { name = "Nethereum.JsonRpc.Client"; - version = "3.8.0"; - sha256 = "0gmdvsxhs398cj14f16r3dl8yv52iaxr9c9214k2ra28r14gfd1l"; + version = "4.1.0"; + sha256 = "1260pr9y83nrfqpgq37s91dbsxdfkvdh55x48554c33ldrqsqk4p"; }) (fetchNuGet { name = "Nethereum.JsonRpc.RpcClient"; - version = "3.8.0"; - sha256 = "05k5f0dfcx4afbkc1w7cfnz514i7840j2haxyzsxkp8818yvfg0a"; + version = "4.1.0"; + sha256 = "0jybgfzy4cj9jx1djjc66vpk9sg88dymy5jrcrply3y6bq85arq3"; }) (fetchNuGet { name = "Nethereum.KeyStore"; - version = "3.8.0"; - sha256 = "05pj95vcfznlk4saq9dw19377gd1sqgmjcg5h92b5rzpgm9v811s"; + version = "4.1.0"; + sha256 = "16xffhfx7k9rfb5kr717cpbircj66gazbkbbwvf5hss3v9a6imzz"; }) (fetchNuGet { name = "Nethereum.Model"; - version = "3.8.0"; - sha256 = "1qfhzqirj9bi49zb6rdcy7w5bm9jyv3a79q7crmgpq3qx4lmz5yh"; + version = "4.1.0"; + sha256 = "03aaizfpjvbf367mprni2ixlyfvz7ic8cn1cfmjk1n3f3q63qbqh"; }) (fetchNuGet { name = "Nethereum.RLP"; - version = "3.8.0"; - sha256 = "16142ag09h95394ip0ffkci09hchxh2i5xaw2rq46qcr8xd3kiym"; + version = "4.1.0"; + sha256 = "19ixlvv91s0xhn3bvwn0yydd5932vcylin037dv4wzgbk2v0vdpm"; }) (fetchNuGet { name = "Nethereum.RPC"; - version = "3.8.0"; - sha256 = "1m2p10dds1k0r3gci25lh6cxl9z7ciw18g6wwa4yqi1hsw7n59vb"; + version = "4.1.0"; + sha256 = "0ivvic38wpay9ry1hp4n88bgglnxcd8id7p5h235ilviq2gxgmmb"; }) (fetchNuGet { name = "Nethereum.Signer"; - version = "3.8.0"; - sha256 = "175acfqjqacc5zwh2kmrfnwd15jm3fjpv0xlgpyqry52mqxd9khf"; + version = "4.1.0"; + sha256 = "1lgyb80l7xwhp4jbfbba0d47p7nxhx0lac08k23nzwnqmg95y4n6"; }) (fetchNuGet { name = "Nethereum.StandardTokenEIP20"; - version = "3.8.0"; - sha256 = "0xqb32x5b9y9r380frhj52i1lxsfs92nfgcpmys3shjxz6fnwf6g"; + version = "4.1.0"; + sha256 = "1i08kpa6knrm3jbhxgfaa2ing5w42j3jsdx72hl6a9xcjdkjr405"; }) (fetchNuGet { name = "Nethereum.Util"; - version = "3.8.0"; - sha256 = "1ig1zkzpglq2q465n4c0ckv8w9gca9cfxz1qnrdhap0f1z90jyg8"; + version = "4.1.0"; + sha256 = "1fp7ii6ic13d1s8n6l63f1kyb03s04fghhfm7sshvk6bhjlynfqw"; }) (fetchNuGet { name = "Nethereum.Web3"; - version = "3.8.0"; - sha256 = "0n18chc9h1cxqp01kncik9lqfgiqrzl2zr8jgzbb05drlf6k0f3i"; + version = "4.1.0"; + sha256 = "1b8myc9wr44vf7kcl9rmhc8zimpfda3mmizhiq1x287xs44nam0b"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -875,6 +890,11 @@ sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + (fetchNuGet { name = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; @@ -886,8 +906,8 @@ }) (fetchNuGet { name = "Newtonsoft.Json.Schema"; - version = "3.0.13"; - sha256 = "04vzjz5fb588rh6ji5a0svfzjsdcfpr1qrz9hxpc64z5zhnh6sf4"; + version = "3.0.14"; + sha256 = "1njk1arrf8pbx0i0p3yww459i70p0fcx02vs0jnbb6znvcy4mvh6"; }) (fetchNuGet { name = "Newtonsoft.Json"; @@ -901,13 +921,13 @@ }) (fetchNuGet { name = "Newtonsoft.Json"; - version = "12.0.2"; - sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) (fetchNuGet { name = "Newtonsoft.Json"; - version = "12.0.3"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + version = "13.0.1"; + sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { name = "Newtonsoft.Json"; @@ -941,13 +961,13 @@ }) (fetchNuGet { name = "Npgsql.EntityFrameworkCore.PostgreSQL"; - version = "3.1.4"; - sha256 = "1ng9pbamh93g0fbnjq8ygaf40d6rs0fy4s08bjmxpa69k3s8c7a4"; + version = "3.1.18"; + sha256 = "0yjrp87m0kj8bzybszxnj7n1h21zag3rqpva74xzvm78gz1asc04"; }) (fetchNuGet { name = "Npgsql"; - version = "4.1.3.1"; - sha256 = "0qk3hb8s521c2gy4k3m1i6fhpr133mnw9w85cwsy9j7ghxyca1nv"; + version = "4.1.9"; + sha256 = "1b9qp3cjwydd4g1yy8nxxr0b0nwdbijmcmzjpkb9r13ndgdrd8nq"; }) (fetchNuGet { name = "NSec.Cryptography"; @@ -981,8 +1001,8 @@ }) (fetchNuGet { name = "Pomelo.EntityFrameworkCore.MySql"; - version = "3.1.1"; - sha256 = "1jvv2q7pmh5wzsfjim7iby4r1scb30kgj9w6sbm2dp60i6vm32dx"; + version = "3.2.7"; + sha256 = "018za1ax17ibxld9rk2nc29716qpn2afh1prfrdjchf5cp56ba2p"; }) (fetchNuGet { name = "Pomelo.JsonObject"; @@ -1101,8 +1121,8 @@ }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "90.0.4430.2400"; - sha256 = "18gjm92nzzvxf0hk7c0nnabs0vmh6yyzq3m4si7p21m6xa3bqiga"; + version = "94.0.4606.6100"; + sha256 = "04kn91qcgsx92yhcqlhpm1yy3m34m371k70szf8h93gcwfs42b9c"; }) (fetchNuGet { name = "Selenium.WebDriver"; @@ -1220,6 +1240,11 @@ sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { + name = "System.Collections.Immutable"; + version = "5.0.0"; + sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; + }) + (fetchNuGet { name = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; @@ -1391,8 +1416,8 @@ }) (fetchNuGet { name = "System.IO.Pipelines"; - version = "4.7.2"; - sha256 = "16v4qaypm72cfsfqr8z3k6yrpzn0m3apgkh6aljfwpycdk150sf9"; + version = "4.7.4"; + sha256 = "09gv2nz35vmmcjrfj1ppxx32v772i0mb369v7lwqr8mz14zhh86r"; }) (fetchNuGet { name = "System.IO"; @@ -1555,6 +1580,11 @@ sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "5.0.0"; + sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; + }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; @@ -1630,6 +1660,11 @@ sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0"; + sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; + }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; @@ -1845,9 +1880,9 @@ sha256 = "05qp3yivh6gz0vva0v3wjlj3g1b45d5jmz362f2y8ah6yb3rx088"; }) (fetchNuGet { - name = "System.Text.Json"; - version = "4.7.0"; - sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; + name = "System.Text.Encodings.Web"; + version = "5.0.0"; + sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; }) (fetchNuGet { name = "System.Text.Json"; @@ -1855,6 +1890,11 @@ sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) (fetchNuGet { + name = "System.Text.Json"; + version = "5.0.0"; + sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; + }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; @@ -1885,6 +1925,11 @@ sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.4"; + sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; + }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; diff --git a/pkgs/applications/blockchains/eclair/default.nix b/pkgs/applications/blockchains/eclair/default.nix index 7b74512a388..dcddef61931 100644 --- a/pkgs/applications/blockchains/eclair/default.nix +++ b/pkgs/applications/blockchains/eclair/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "eclair"; - version = "0.6.1"; - revision = "d3ae323"; + version = "0.6.2"; + revision = "6817d6f"; src = fetchzip { url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip"; - sha256 = "0hmdssj6pxhvadrgr1svb2lh7hfbd2axr5wsl7glizv1a21g0l2c"; + sha256 = "038r9mblm2r8mkxnv65k29r7xj22dff5gmvzv9xiy5zf9i45mmk8"; }; propagatedBuildInputs = [ jq openjdk11 ]; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ACINQ/eclair"; license = licenses.asl20; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index d37ace71073..84b2a2f736a 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -9,24 +9,27 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-GDO8iGntQncvdJiDMBJk9GrGF9JToasbLRzju3S0TS0="; + hash = "sha256-dYKSc5fU66fu+GdTeWQBrIOJAiBGdYAOS7MCto98Xss="; }; - cargoHash = "sha256-Ms785+3Z4xEUW8FRRu1FIHk7HSWYLBThKlJDFjW6j0I="; + cargoHash = "sha256-M4H5tUbo1f18kk8S53saebSnZhZFr8udw41BUNJbQVI=="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3 + # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331 + # # link rocksdb dynamically - ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + # ROCKSDB_LIB_DIR = "${rocksdb}/lib"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/blockchains/electrs/update.sh b/pkgs/applications/blockchains/electrs/update.sh index 3e4d90db59d..14105d71a44 100755 --- a/pkgs/applications/blockchains/electrs/update.sh +++ b/pkgs/applications/blockchains/electrs/update.sh @@ -21,6 +21,7 @@ repo=$tmpdir/repo trap "rm -rf $tmpdir" EXIT git clone --depth 1 --branch v${version} -c advice.detachedHead=false https://github.com/romanz/electrs $repo +git -C $repo checkout tags/v${version} export GNUPGHOME=$tmpdir echo diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index a0e648218f5..422ad8210de 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.13"; + version = "4.0.15"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-HNpyUD2Tep2XnY3lr5a3ec+NmJtt0VvJx6ujVvSugXo="; + sha256 = "sha256-4omuu/9EeywWDkk//4TTal/1siCe/4YMmEsIefBxsuY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 149b20d0dd2..39d13189e8e 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "21.8.19"; + version = "21.10.25"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1ssacadx5hdxq0cljb869ds3d11i4fyy3qd5hzh8wk5mlpdnba6k"; + sha256 = "a85ddda4e73dfadddbb77cf9bc84c30fc6b893ead46367d702976bbf4da5afa4"; }; sourceRoot = "."; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 2a5f1aec2dc..01e1dfb8c42 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.2.11"; + version = "2.2.16"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-ZDqzkANGMdvv3e5gWCYcacUYKLJRquXRHLr8RAzT9hY="; + sha256 = "sha256-6nq5oCEVADZbzQJaEizzt6Lag11bZYLKGMTl2snZob8="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index d53e784ea11..c9cc80016b7 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -6,23 +6,23 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; - version = "3.1.5"; - sha256 = "0agcp9c8zf59bliybjfg5whby7k1i1xc4sccyyyj3qcx1snf6lfx"; + version = "3.1.19"; + sha256 = "1fh3k85k988jw35sf5hvm6jwmvzmslzpfvf3jk3sn3f3s6gyk0an"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "3.1.5"; - sha256 = "1n76xr3jn4bcxm9f3lk8k76zn39mhyqcj5b0dqhi2xykyvvrqjgc"; + version = "3.1.19"; + sha256 = "1nh08kjdc152m85ycwxn1q8r69f0l02p6cac6q57nzlyy5gyj2rs"; }) (fetchNuGet { name = "Microsoft.Azure.Amqp"; - version = "2.4.2"; - sha256 = "0pfgl6fnw3apwasfg1dp5pvi5h0z0vmznhn2bfsgwndn1xlfw1g9"; + version = "2.4.9"; + sha256 = "15kvklhfl17713kwin8p71lcxq2jx87bk1d8gsl597z3w6l4cqma"; }) (fetchNuGet { name = "Microsoft.Azure.ServiceBus"; - version = "4.1.3"; - sha256 = "1mj21nal3hv8b5678rah808521c5rkb0yh6hrlqirsdgxwnl6z6g"; + version = "4.2.1"; + sha256 = "0akxqds078p7djd5g95i9dh4wrlfarabkq2ybn614cqdgl4z0is5"; }) (fetchNuGet { name = "Microsoft.Azure.Services.AppAuthentication"; @@ -31,8 +31,8 @@ }) (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.7.1"; - sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4"; + version = "16.11.0"; + sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -126,8 +126,8 @@ }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.7.1"; - sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; + version = "16.11.0"; + sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -156,13 +156,13 @@ }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.7.1"; - sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0"; + version = "16.11.0"; + sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.7.1"; - sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs"; + version = "16.11.0"; + sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -181,18 +181,18 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "3.0.7"; - sha256 = "0nrkdbsc4k9fd4588axnkfa9gmif9b59wxw8fnmpg0nf4x8scm4n"; + version = "3.0.8"; + sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "3.0.5"; - sha256 = "09cgjzbkxvsi65qzns0ignp0x89z630vqacsgwj3b1h30dycwqdr"; + version = "3.0.6"; + sha256 = "0yw382238rjv0qmhz1xlb5v696s8sxbjf839c2ck6dqd947q403w"; }) (fetchNuGet { name = "NBitcoin"; - version = "6.0.10"; - sha256 = "00m0j74pqyjqal1wc28j6734rfd9zd7ajqb1p3fsdpqr16kfg56s"; + version = "6.0.15"; + sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -700,6 +700,11 @@ sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index af4fc5c997c..600902f75b1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,12 +13,12 @@ let sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg"; }; betaVersion = { - version = "2021.1.1.14"; # "Android Studio Bumblebee (2021.1.1) Beta 1" - sha256Hash = "1j1fxl4vzq3bln2z9ycxn9imjgy55yd1nbl7ycmsi90bdp96pzj0"; + version = "2021.1.1.15"; # "Android Studio Bumblebee (2021.1.1) Beta 2" + sha256Hash = "sha256-J+Jw9F8pEE0SMWka//jADOiQ+GSOeRf5GBfp0RDtwqA="; }; latestVersion = { # canary & dev - version = "2021.2.1.1"; # "Android Studio Chipmunk (2021.2.1) Canary 1" - sha256Hash = "1fn0jv6ybgdhgpwhamw16fjqbg2961ir9jhbjzanysi7y3935nbv"; + version = "2021.2.1.3"; # "Android Studio Chipmunk (2021.2.1) Canary 3" + sha256Hash = "sha256-xIVdM28NDadvJklDIw71iJ7Z5GPVJ1ZDJ+t1y+bt8cE="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 993c046d2c9..f3075d085c4 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.146.0"; + version = "1.148.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-YK4nLQvRdgS7hq5a9uVfVjUAgkM/sYXiKjbt0QNzcok="; + sha256 = "sha256-/wvtIPF/1HneW0zuT7+VCixemkw91MdU0S66bz2y48U="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 42b7af5abb4..aaa63595ab1 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.09.14", - "sha256": "sha256-j69UkRNdVdzMITBHMT1QwAsYX9S0fts5/0PCroCGtL8=" + "rev": "2021.10.19", + "sha256": "sha256-NO1q4qDXZ0x0G6AtcRP9xnFDWuBzOvxq8G7I76LgaBw=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.10.03", - "sha256": "sha256-JGw/GbQNLAgHhDm/EgCGvzPpd8rqQo2FhmAL51XIekw=" + "rev": "2021.10.27", + "sha256": "sha256-7DlnO7IeCFLU1A+HJt4CFXoHWfhAr52tBvfPNHieXMM=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,8 +26,8 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2021.10.03", - "sha256": "sha256-Kbjzn4Rp+/oTNgFMlzlkQEeob0Z4VidqJ/+wuNHS580=" + "rev": "2021.10.21", + "sha256": "sha256-RyRpHihmmr/EeVWk9CR0S3pvKy0FzqLZNGti33+4fkI=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", @@ -36,8 +36,8 @@ }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2021.07.27", - "sha256": "sha256-izCyBNRLRCizSjR7v9RhcLrQ6+aQA4eejCHFUzJ0IpE=" + "rev": "2021.10.27", + "sha256": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA=" }, "Emmet-Pascal": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix index 876392c0810..f74402f5e6e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix @@ -5,13 +5,13 @@ trivialBuild { pname = "bqn-mode"; - version = "0.pre+unstable=2021-09-27"; + version = "0.pre+unstable=2021-10-26"; src = fetchFromGitHub { owner = "AndersonTorres"; repo = "bqn-mode"; - rev = "5bdc713ade78f11d756231739429440552d7faf8"; - hash = "sha256-ztGHWKVgMP9N4hV9k0PY9LxqXgHxkycyF3N0eZ+jIZs="; + rev = "89d6928d0653518c97bcb06ae156f8b1de1b8768"; + sha256 = "0pnvfssglaqbjw6hw7vf7vffzjdbqscqhyl62vknml29yl7mjq05"; }; meta = with lib; { diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index 84dc16c76d1..8fbcfbb4c10 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "featherpad"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "sha256-GcOvof6bD7GNrABXIR8jOfzjDEN5Lvnj24M154iqQgU="; + sha256 = "sha256-FeqTPDix2tqTJ3UU6i2e6FkmCO0KMNt4tLtrPjX57fc="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 2562a821b82..1e7d38086b7 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.08.28"; + version = "2021.10.28"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "13kc68vkrzg89khir6ayyxgbnmz16dhippcnw09hhzxivf5ayzpy"; + sha256 = "sha256-ph0063EHyFa7arXvCVD+tGhs8ShyCDYkFVd1w6MZ5Z8="; }; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 6b93153ec04..2f75fb34cd1 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir "$out"/Applications mv app/mindforger.app "$out"/Applications/ - wrapQtApp "$out"/Applications/mindforger.app/Contents/MacOS/mindforger ''; meta = with lib; { diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index bbef0d8a405..3c098be5899 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -5,9 +5,9 @@ let in { sublime4 = common { - buildVersion = "4113"; - x64sha256 = "13679mnmigy1sgj355zs4si6gnx42rgjl4rn5d6gqgj5qq7zj3lh"; - aarch64sha256 = "0hg6g3cichma1x82963m7xwazmpdvv5zmz8rpwxs337zq7j3dmb3"; + buildVersion = "4121"; + x64sha256 = "CE/PeUV8Mg1Z2h8OWMhaemOVa95B1k2wHsht8lVPxeY="; + aarch64sha256 = "eveEW0Aq6pim0lnQ6BfISRaBgogeofgLmOVylSVojwg="; } {}; sublime4-dev = common { diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 21b4cfa94b1..d186d36efcf 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -76,9 +76,6 @@ mkDerivation rec { postInstall = with stdenv; lib.optionalString isDarwin '' mkdir -p $out/Applications mv $out/Mapper.app $out/Applications - # Fixes "This application failed to start because it could not find or load the Qt - # platform plugin "cocoa"." - wrapQtApp $out/Applications/Mapper.app/Contents/MacOS/Mapper mkdir -p $out/bin ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper ''; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 78c00b7984e..a07cf38c0eb 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-11"; + version = "7.1.0-13"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-z7ZpoB8NlcS5NVyoW0ngSlakCcb5qC3bh3xDVYuWS6w="; + sha256 = "sha256-W/XqgYOlSailHQdNBYsvf2P9go9sblWayDLrQQlekro="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index c120ece8cb4..cd3f026dfa0 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , dxflib , eigen @@ -20,9 +19,7 @@ mkDerivation rec { pname = "cloudcompare"; - # Released version doesn't work with packaged PCL - # because it's too new. Considering that a release - # is a year ago it's unreasonable to wait for it. + # Released version(v2.11.3) doesn't work with packaged PCL. version = "unstable-2021-10-14"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index f2d2e267595..279f49e6a49 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; + patches = [ + # Upstream patch to fix build on -fno-common toolchains. + (fetchurl { + name = "no-common.patch"; + url = "https://git.kraxel.org/cgit/fbida/patch/?id=1bb8a8aa29845378903f3c690e17c0867c820da2"; + sha256 = "0n5vqbp8wd87q60zfwdf22jirggzngypc02ha34gsj1rd6pvwahi"; + }) + ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp @@ -19,7 +28,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ]; - patchPhase = '' + postPatch = '' sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile ''; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index c65dfa1b6c0..33873166119 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , boehmgc , boost , cairo @@ -52,11 +53,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.1"; + version = "1.1.1"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "sha256-cebozj/fcC9Z28SidmZeuYLreCKwKbvb7O0t9DAXleY="; + sha256 = "sha256-rsoLnTO1sc+pqnBDO97mqMPQIP+vwubwyaYO7Xp5eK8="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index fe5f99de121..219613ad0ce 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , writeText , cmake , doxygen @@ -54,6 +55,15 @@ stdenv.mkDerivation rec { sha256 = "07zxs96i3prjqww1f68496cl2xxqaidx32lpfyy0pn5am4c297zc"; }; + patches = [ + # https://github.com/NixOS/nixpkgs/issues/137245 + # Fix warning after Vulkan 1.2.174 VK_NULL_HANDLE change + (fetchpatch { + url = "https://gitlab.freedesktop.org/monado/monado/-/commit/c47775a95d8e139a2f234063793eb6726f830510.patch"; + sha256 = "093ymvi9ifpk4vyjcwhhci9cnscxwbv5f80xdbppcqa0j92nmkmp"; + }) + ]; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index c7be99469b0..be079b6bdb2 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -65,8 +65,6 @@ mkDerivation rec { mv $out/bin/*.app $out/Applications rmdir $out/bin || true - wrapQtApp "$out"/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD - mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \ $out/share/openscad/{examples,color-schemes,locale,libraries,fonts,templates} diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index d3a46482be5..deed3d3b888 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "qimgv"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "1wybpmqvj7vj7cl6r4gif7mkrcdr6zpb939mmz46xsil5vb4pirh"; + sha256 = "sha256-YlV/ysm7bdPverpKpanrL+jPVvMtP1paoAm0PREMaww="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/applications/graphics/sane/backends/airscan/default.nix index 8d0e32e2b4e..d88c7352d57 100644 --- a/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -2,7 +2,7 @@ , libxml2, gnutls, sane-backends }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.26"; + version = "0.99.27"; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "08snfg5zx9924ryww0kxf1kgl085yw7fg6l4f1kzlhcmqf1958w5"; + sha256 = "sha256-29IPoLF4rmq8sGTi5RmpT1Fq8RJJlaepTt+2GWDU3es="; }; meta = with lib; { diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 54b86c09341..f2cdfa2990e 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "weylus"; - version = "0.11.2"; + version = "0.11.4"; src = fetchzip { url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip"; - sha256 = "sha256-coA8qUpUgRjVBF/0LZgimx61fTTpdck/AO6e+r2uNu0="; + sha256 = "sha256-EW3TdI4F4d4X/BeSqI05QtS77ym1U5jdswFfNtSFyFk="; stripRoot = false; }; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 1d10789bcca..5742a9b85c4 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.1/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.2/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 637ae3bc977..7fe3aa529fa 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -2,7 +2,7 @@ , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebengine , krunner, shared-mime-info, kparts, knewstuff -, gpsd, perl, fetchpatch +, gpsd, perl }: mkDerivation { @@ -18,15 +18,6 @@ mkDerivation { qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts knewstuff gpsd ]; - patches = [ - (fetchpatch { - # Backport fix to allow compilation with gpsd 3.23.1 - # Remove when marble compiles without the patch. - # See: https://invent.kde.org/education/marble/-/merge_requests/57 - url = "https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef.diff"; - sha256 = "sha256-ZkPXyunVItSRctv6SLGIonvyZwLDhCz+wfJrIXeHcDo="; - }) - ]; preConfigure = '' cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include" ''; diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 4f4ab4464a3..43fc81b3c24 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1811 +4,1811 @@ { akonadi = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-21.08.1.tar.xz"; - sha256 = "02abs3mxwna30rgidlndj4jq0swy3id236ckw726vp3r8m9qimd6"; - name = "akonadi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/akonadi-21.08.2.tar.xz"; + sha256 = "0jwhjdqha82hbyg2wmzjl5qi2rgmyd2sghdw85s77y63bxm9f0s2"; + name = "akonadi-21.08.2.tar.xz"; }; }; akonadi-calendar = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-21.08.1.tar.xz"; - sha256 = "1p8myayr6kfgp805wdpy39f9bjxw1fafv6kn35h1zsl1fgyc4812"; - name = "akonadi-calendar-21.08.1.tar.xz"; + 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"; }; }; akonadi-calendar-tools = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-tools-21.08.1.tar.xz"; - sha256 = "0j8cc0x2bx64crgvprksnmng4yi7fk71s5pfyjrnw8d9xnj7vvvg"; - name = "akonadi-calendar-tools-21.08.1.tar.xz"; + 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"; }; }; akonadi-contacts = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-contacts-21.08.1.tar.xz"; - sha256 = "13sjy2jg4bbg7dm182apppmcpkhmiwhkpnkjhh13dhz8v7488vnc"; - name = "akonadi-contacts-21.08.1.tar.xz"; + 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"; }; }; akonadi-import-wizard = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-import-wizard-21.08.1.tar.xz"; - sha256 = "1v0nzaijy6nahjx4j1wsvi8s6s3zk79b8h01n3r6gwilbxklqnqs"; - name = "akonadi-import-wizard-21.08.1.tar.xz"; + 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"; }; }; akonadi-mime = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-mime-21.08.1.tar.xz"; - sha256 = "15lm1248diqhnv1qldcyyfi1v7w8h13jvwhp80py93hijq07iwz5"; - name = "akonadi-mime-21.08.1.tar.xz"; + 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"; }; }; akonadi-notes = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-notes-21.08.1.tar.xz"; - sha256 = "1r43pvxpk3f183qaiydxg83xc1y5zss7xgxq5p1vnwgqyifibh3h"; - name = "akonadi-notes-21.08.1.tar.xz"; + 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"; }; }; akonadi-search = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadi-search-21.08.1.tar.xz"; - sha256 = "1w5vps398kadl6p2jhsj18jqfn4lyysx09jzj6q9cvkvzmq4im6i"; - name = "akonadi-search-21.08.1.tar.xz"; + 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"; }; }; akonadiconsole = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akonadiconsole-21.08.1.tar.xz"; - sha256 = "1dplpb6z3glps82bzlqhnx29k13m6b7q2wvdlcw9hfqrp2xgzyfk"; - name = "akonadiconsole-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/akonadiconsole-21.08.2.tar.xz"; + sha256 = "07vr4nwjzz6y1babwnhhidpv8pldx7vk2mq98midqji87xxh7r10"; + name = "akonadiconsole-21.08.2.tar.xz"; }; }; akregator = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/akregator-21.08.1.tar.xz"; - sha256 = "03rv9m3f7vrn80jfdmnbzxsl226s82liyfam1cysxl2skkmvpimm"; - name = "akregator-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/akregator-21.08.2.tar.xz"; + sha256 = "15qkkfrxiwcd1gz5skqj8sb8fkr1mkc51wc2chqr4jv6aa0lbf5r"; + name = "akregator-21.08.2.tar.xz"; }; }; analitza = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/analitza-21.08.1.tar.xz"; - sha256 = "0aagcj2dvm5aq24m6r5z79qsq2ra8xwzj7b1f64kcq8sabw7dbn4"; - name = "analitza-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/analitza-21.08.2.tar.xz"; + sha256 = "1y4amcl3sjpxhlqzyjmnpycgv3jfdn4458zch9qzakvjxamq6m9c"; + name = "analitza-21.08.2.tar.xz"; }; }; ark = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ark-21.08.1.tar.xz"; - sha256 = "1ss33qizhg325k4hhf8339xg52iv4s32qjm048zhi2jaz54pdnv0"; - name = "ark-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ark-21.08.2.tar.xz"; + sha256 = "0hxzd0qr07wyz5v76nj4qj4db4lav53xapknmakif1fkghj1r51g"; + name = "ark-21.08.2.tar.xz"; }; }; artikulate = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/artikulate-21.08.1.tar.xz"; - sha256 = "0x71m715iw1hv6xy36sd2gzd0cnsbn09wipp02nx2dc161lavnxk"; - name = "artikulate-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/artikulate-21.08.2.tar.xz"; + sha256 = "0b4fvxwrynnwr8mm87h60mhk293invaq8vw4y9dk6hv36l1z5fbf"; + name = "artikulate-21.08.2.tar.xz"; }; }; audiocd-kio = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/audiocd-kio-21.08.1.tar.xz"; - sha256 = "1aqzgmpypzska5lgjwjpnbl6q2cbyiirph6h8ph5wnnb992lx8li"; - name = "audiocd-kio-21.08.1.tar.xz"; + 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"; }; }; baloo-widgets = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/baloo-widgets-21.08.1.tar.xz"; - sha256 = "01f0hpgvlwxn3yms6yyi0ykryb78c9plp0q2z0ywk1p4lx4iywhd"; - name = "baloo-widgets-21.08.1.tar.xz"; + 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"; }; }; blinken = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/blinken-21.08.1.tar.xz"; - sha256 = "1bfkiwg2cwn4dizwcjb0ynzvvdxndf5172a8z0ch9b2wxlaljh87"; - name = "blinken-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/blinken-21.08.2.tar.xz"; + sha256 = "1ciq6fk9430p8sihc1q40djjw4994w1lghps9kr3415ryv08bfci"; + name = "blinken-21.08.2.tar.xz"; }; }; bomber = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/bomber-21.08.1.tar.xz"; - sha256 = "1ppsnnbwsf1y9pavnpxr64k845gx1yn5p1mqswpcqgp9zd58f338"; - name = "bomber-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/bomber-21.08.2.tar.xz"; + sha256 = "0wk6j89m8lbp83yfz2xwy78x99cvph9p36jzscpp4i894j6fad61"; + name = "bomber-21.08.2.tar.xz"; }; }; bovo = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/bovo-21.08.1.tar.xz"; - sha256 = "0qs96ds0clbvf7q487h9bq7l4haymdcyxzq8rlfd74qpki9cb9aa"; - name = "bovo-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/bovo-21.08.2.tar.xz"; + sha256 = "1k5ncxxx64yj2b71jlpz7ll935mrilhrhphwz1h8n8pdr6dn91mf"; + name = "bovo-21.08.2.tar.xz"; }; }; calendarsupport = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/calendarsupport-21.08.1.tar.xz"; - sha256 = "0n9mbwdgyc4530g1rn9b393qq8pgpcclcpip9p72q8qc630jsvbw"; - name = "calendarsupport-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/calendarsupport-21.08.2.tar.xz"; + sha256 = "01plq4qzp94lxcc2gp04afnlvmni8993c8mf6kl256158z0y24ik"; + name = "calendarsupport-21.08.2.tar.xz"; }; }; cantor = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/cantor-21.08.1.tar.xz"; - sha256 = "18gl6bw8mnn9sp4jws5b57k9w9scqg53ynw6yrabx2796k0hwfiw"; - name = "cantor-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/cantor-21.08.2.tar.xz"; + sha256 = "07xxwm3aa00v6cax7nyv326glapll01qh4libszhhn8pwpiyl00w"; + name = "cantor-21.08.2.tar.xz"; }; }; cervisia = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/cervisia-21.08.1.tar.xz"; - sha256 = "0dah0lgzpdzxyvccqk2k2qbl5x4dl53qp23d0rxb5cg1ba5h7n2l"; - name = "cervisia-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/cervisia-21.08.2.tar.xz"; + sha256 = "0x4hisqfkizjxzl34s0yc6dn5r5fyh7f5yaadq5g47fdcah5cmmf"; + name = "cervisia-21.08.2.tar.xz"; }; }; dolphin = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/dolphin-21.08.1.tar.xz"; - sha256 = "1vmk9iaylw427x203ccdjhlbah3dr5fz7l3lc113nczq54kcwpbf"; - name = "dolphin-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/dolphin-21.08.2.tar.xz"; + sha256 = "18aiqpf8qsig64gpcn6b1f0fs5mvzbdg8ncbhcjq0gy8gh3xamj2"; + name = "dolphin-21.08.2.tar.xz"; }; }; dolphin-plugins = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/dolphin-plugins-21.08.1.tar.xz"; - sha256 = "0gnmr73ly0djngp3imdi4zm72icj3gilqcshb4ks3rq3lwk408rr"; - name = "dolphin-plugins-21.08.1.tar.xz"; + 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"; }; }; dragon = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/dragon-21.08.1.tar.xz"; - sha256 = "050jrizyip362fanrbx3fwp4n69sr7d4y2w6n70aqv8hhi90xqjy"; - name = "dragon-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/dragon-21.08.2.tar.xz"; + sha256 = "0ddijz96z58582w298jp11vns9fx3rmzqd3x1qplxvp4sl0hp9l7"; + name = "dragon-21.08.2.tar.xz"; }; }; elisa = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/elisa-21.08.1.tar.xz"; - sha256 = "12kr5aixw5gdmy2vj6id0wmznkwg6p1ysxcqayk8bwvv2qz2pygr"; - name = "elisa-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/elisa-21.08.2.tar.xz"; + sha256 = "14wi7dva0bfagxw49bs80qszqcv6k16s0569mh1c4m97gzlzgv35"; + name = "elisa-21.08.2.tar.xz"; }; }; eventviews = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/eventviews-21.08.1.tar.xz"; - sha256 = "04z5cb4vhxcwxp8dwv7w4400zmj090gr7dm4d4h4x39312d25rhh"; - name = "eventviews-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/eventviews-21.08.2.tar.xz"; + sha256 = "0d1ahknazkjav9641i1wggj9f67cr3s3y176v1j6ljhr4dl3m3xj"; + name = "eventviews-21.08.2.tar.xz"; }; }; ffmpegthumbs = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ffmpegthumbs-21.08.1.tar.xz"; - sha256 = "13v5y99fvj0p9f9hqafw652qzb7z267fjfsqykv7wb3pv274f11w"; - name = "ffmpegthumbs-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ffmpegthumbs-21.08.2.tar.xz"; + sha256 = "1gsxcm86aq3r485ivk532a949z5l4129kildbd752c2qy0hdy5z1"; + name = "ffmpegthumbs-21.08.2.tar.xz"; }; }; filelight = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/filelight-21.08.1.tar.xz"; - sha256 = "0smvvh7g9p0vh4s3xd0pk6whszk8vmqv9ww1jp0y3dy6ai2cwixi"; - name = "filelight-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/filelight-21.08.2.tar.xz"; + sha256 = "0phisyrnxc6i19253fdayx8cn51y6vxd66gfdy08hi4r31ih57jd"; + name = "filelight-21.08.2.tar.xz"; }; }; granatier = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/granatier-21.08.1.tar.xz"; - sha256 = "1n7bvkh118530hi0aka9wwz7kycljwawb5d0wxzjb74kqp5rp0lv"; - name = "granatier-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/granatier-21.08.2.tar.xz"; + sha256 = "1bly3jlmn9d2im05srr3v28mw8wmr3hnw180wi8lpfzianh589v7"; + name = "granatier-21.08.2.tar.xz"; }; }; grantlee-editor = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/grantlee-editor-21.08.1.tar.xz"; - sha256 = "1nfqylrnkvhjiygah527i9q16987n99ry69nwd1000xvf7r1k2yd"; - name = "grantlee-editor-21.08.1.tar.xz"; + 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"; }; }; grantleetheme = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/grantleetheme-21.08.1.tar.xz"; - sha256 = "0zscb0wb85g1r0zcqb50ylg1r0640mjk985ifffnjzxlx4ayqglm"; - name = "grantleetheme-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/grantleetheme-21.08.2.tar.xz"; + sha256 = "0xm19a21y8b4cqiqg6mhxip1xxk7hrz88z1sijhhgc8d14i7mkdk"; + name = "grantleetheme-21.08.2.tar.xz"; }; }; gwenview = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/gwenview-21.08.1.tar.xz"; - sha256 = "187br8271z00v02vllpxqwk8x6y38gg43xixczd8x4j0p6rgv8a0"; - name = "gwenview-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/gwenview-21.08.2.tar.xz"; + sha256 = "0yignay0g4vz3zj9xpziinsqd8pwywd1cq43f0n5hmzxrrv0abcf"; + name = "gwenview-21.08.2.tar.xz"; }; }; incidenceeditor = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/incidenceeditor-21.08.1.tar.xz"; - sha256 = "1xyb106ck64qq4z083g0qx9n3rax5ma41jsfwl8am8w5q4szxw31"; - name = "incidenceeditor-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/incidenceeditor-21.08.2.tar.xz"; + sha256 = "0xrz3kzf4mc37zgfbjgc23l7wxry9m6d5igvyf1qm33yxwr4w78q"; + name = "incidenceeditor-21.08.2.tar.xz"; }; }; itinerary = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/itinerary-21.08.1.tar.xz"; - sha256 = "018871y48yd2z2qsrnjhymb72nn4by2l8lrz38gcd9fq2dwlh5fs"; - name = "itinerary-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/itinerary-21.08.2.tar.xz"; + sha256 = "059n7xy3gjbqxl9cn7nxng9y4662ggi2lh2zj3yv0knwy78ccwjk"; + name = "itinerary-21.08.2.tar.xz"; }; }; juk = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/juk-21.08.1.tar.xz"; - sha256 = "0q2q31r72d28hhabrnwglhcz6h3ay70i4fg7gyn658njvx8gl26b"; - name = "juk-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/juk-21.08.2.tar.xz"; + sha256 = "0c74s9ylx1xh1y581ygm6zyafwv3l5d7297wfg50f64nyr5npxm2"; + name = "juk-21.08.2.tar.xz"; }; }; k3b = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/k3b-21.08.1.tar.xz"; - sha256 = "1gs4api78ngyb03sgknhc1cil6rx7rd1y66674lmi3sssyhi6bkz"; - name = "k3b-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/k3b-21.08.2.tar.xz"; + sha256 = "1g9xgzklsyard3ghcmr9irixcilga6kcj46jav884y8w7zxb4mrd"; + name = "k3b-21.08.2.tar.xz"; }; }; kaccounts-integration = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-integration-21.08.1.tar.xz"; - sha256 = "1860njydckpdz34y7g94pa4xz0229j1szj8ihvql05kgysdm11qp"; - name = "kaccounts-integration-21.08.1.tar.xz"; + 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"; }; }; kaccounts-providers = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-providers-21.08.1.tar.xz"; - sha256 = "1w5k7y8xakp1lf4ca3wip7af3f9avd04i6zixv7kq9w3fh1mndp0"; - name = "kaccounts-providers-21.08.1.tar.xz"; + 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"; }; }; kaddressbook = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kaddressbook-21.08.1.tar.xz"; - sha256 = "05lrxban904szlqhri71qqfykyygsxwgsx9w406s213vwkakirxb"; - name = "kaddressbook-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kaddressbook-21.08.2.tar.xz"; + sha256 = "1pvd31zpam13jv0mhxzaagdlvnav60znd68l24y1dw5i98wk7n72"; + name = "kaddressbook-21.08.2.tar.xz"; }; }; kajongg = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kajongg-21.08.1.tar.xz"; - sha256 = "1izm0n2nsvxh9zvws53q4hkpzjihjwwccspas7k10ryasgp4nwsb"; - name = "kajongg-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kajongg-21.08.2.tar.xz"; + sha256 = "0c8kxh6kbk7ml16df4gmr142rjllc7v0v7m3kw4ksngk93f7vz2s"; + name = "kajongg-21.08.2.tar.xz"; }; }; kalarm = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kalarm-21.08.1.tar.xz"; - sha256 = "088461j6piwas0g4chpj579r3bhyncmyajsfh2hz4679ir5lf6yh"; - name = "kalarm-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kalarm-21.08.2.tar.xz"; + sha256 = "06cww023m4ng4g3v344lci0rvapk4zyzf1vi5jlajfs5d8bfkgf5"; + name = "kalarm-21.08.2.tar.xz"; }; }; kalarmcal = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kalarmcal-21.08.1.tar.xz"; - sha256 = "1s0yrh0y54rjp4d6y8vcixxrlsdra1xr8j3lxswl2h866p87v7fa"; - name = "kalarmcal-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kalarmcal-21.08.2.tar.xz"; + sha256 = "0xdcazbbkm2z0r2g1avwh9bvdkvv0fy6qhhddlmfzj4cwh4c9vih"; + name = "kalarmcal-21.08.2.tar.xz"; }; }; kalgebra = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kalgebra-21.08.1.tar.xz"; - sha256 = "0a8hmzdslr92v9a8pjf7rnmpf040l9cizzlx8xrxqk2bdb7qls5w"; - name = "kalgebra-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kalgebra-21.08.2.tar.xz"; + sha256 = "07fw8ab8gy9mam5dij6i9nl1zv4fp13vari6nzdk337klhsdbsjr"; + name = "kalgebra-21.08.2.tar.xz"; }; }; kalzium = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kalzium-21.08.1.tar.xz"; - sha256 = "0ijxyzryry1j9gfdmk56dlzyb4iz0v4vmjzjnqkv6sq2lm47lhyp"; - name = "kalzium-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kalzium-21.08.2.tar.xz"; + sha256 = "0hjkpgclm67nyninywdmcpi7vn3jmf7ikbd4afg4bhj5mcz2a4vg"; + name = "kalzium-21.08.2.tar.xz"; }; }; kamera = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kamera-21.08.1.tar.xz"; - sha256 = "0cmppa8bc9iqbdk0pbnzrj1qqryqmrdgs7hliay3hsl7gjlz9zgy"; - name = "kamera-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kamera-21.08.2.tar.xz"; + sha256 = "1arb93sa730ha8bgbcvp6bng8s4fp9yvcv0qvkhk2nl4db4m5rng"; + name = "kamera-21.08.2.tar.xz"; }; }; kamoso = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kamoso-21.08.1.tar.xz"; - sha256 = "15nqy97m913f0sdjs15bjivs7hvxghlhlw5579fsnfahg5iz5qp6"; - name = "kamoso-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kamoso-21.08.2.tar.xz"; + sha256 = "0rkd9mk7rgha40j19rwpyqmn8lchqahakn4p3sbab7h3p3cq2b7p"; + name = "kamoso-21.08.2.tar.xz"; }; }; kanagram = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kanagram-21.08.1.tar.xz"; - sha256 = "1jqrmgyd2ijqb1sq17r7mijvcix6syys02kyasyilwgibbnlzjz1"; - name = "kanagram-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kanagram-21.08.2.tar.xz"; + sha256 = "12iq58jc36rp664c92s7442gnxq6k1fi4017a4hwqq67b9ismgzl"; + name = "kanagram-21.08.2.tar.xz"; }; }; kapman = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kapman-21.08.1.tar.xz"; - sha256 = "072376xqm4a8fwvslf9grsklvzb50d9f098z4qba1lh3y3ivp7wm"; - name = "kapman-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kapman-21.08.2.tar.xz"; + sha256 = "04yv6j2bjlgclp916k2gibhhv5d64sxk181cqw7sh5j4aq555a3r"; + name = "kapman-21.08.2.tar.xz"; }; }; kapptemplate = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kapptemplate-21.08.1.tar.xz"; - sha256 = "1crll3dr299qpigh2w9psvpi0r4jmb8y0b0facfcfcs6j9ldfbw5"; - name = "kapptemplate-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kapptemplate-21.08.2.tar.xz"; + sha256 = "0vgfz4pz9yjns4dpks8mrp8zzipka4chw257l1db25khibksgh48"; + name = "kapptemplate-21.08.2.tar.xz"; }; }; kate = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kate-21.08.1.tar.xz"; - sha256 = "0k9kf8x5gbj5vbnr6lfhizi8122p76xixw480a3zsqi57i4bxk0z"; - name = "kate-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kate-21.08.2.tar.xz"; + sha256 = "1cm6iq3cqmp0kvsxhv0vlqy1dyzmis9fb0a6298q0lyjkmsri26n"; + name = "kate-21.08.2.tar.xz"; }; }; katomic = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/katomic-21.08.1.tar.xz"; - sha256 = "1595swszpw2ia9dh5c6wgrz04qlcvw84l474imkms4gv1cz583pb"; - name = "katomic-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/katomic-21.08.2.tar.xz"; + sha256 = "0lng3fpc1b255n8hayla3lpb77rmgvx8bkzi1s152kq7bf2mnxj7"; + name = "katomic-21.08.2.tar.xz"; }; }; kbackup = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kbackup-21.08.1.tar.xz"; - sha256 = "04795m0r4icfpv6166ingb82mfai0g6q48f9qvcqn029z0f347ya"; - name = "kbackup-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kbackup-21.08.2.tar.xz"; + sha256 = "06xvw94m6zr7zj0i54if9vanbflnj88b0c16751br6ibp2m9zvlp"; + name = "kbackup-21.08.2.tar.xz"; }; }; kblackbox = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kblackbox-21.08.1.tar.xz"; - sha256 = "019nd86wmm1m8yz0lsayx37mqyzhx1pa5kbddajf5032dscncymd"; - name = "kblackbox-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kblackbox-21.08.2.tar.xz"; + sha256 = "093k42259lwbhmq6pm5hv1iqm4maqd63qic80p748wmh88bsh8yg"; + name = "kblackbox-21.08.2.tar.xz"; }; }; kblocks = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kblocks-21.08.1.tar.xz"; - sha256 = "1grgkikl7zcs58y86kaw6slq7wvqa51g85kvwrysniv6l3yzhvxj"; - name = "kblocks-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kblocks-21.08.2.tar.xz"; + sha256 = "0p4k3wr8756qfxr09daqp7z3461ljnd3yv34h893j5dini1lfy3d"; + name = "kblocks-21.08.2.tar.xz"; }; }; kbounce = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kbounce-21.08.1.tar.xz"; - sha256 = "18sd3yzz0mj9j666pnkm49ngfzh7aw125a5zyf1k947z6ayv5zix"; - name = "kbounce-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kbounce-21.08.2.tar.xz"; + sha256 = "06zd4p8glpzp7q4a8qcmnj1lszgfdircfkgc8ay5abmfx2rr9hcw"; + name = "kbounce-21.08.2.tar.xz"; }; }; kbreakout = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kbreakout-21.08.1.tar.xz"; - sha256 = "0264w926ldfhdx22z1iqk41w5a9gnycff4vdjf0i6rzyws2qsb0g"; - name = "kbreakout-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kbreakout-21.08.2.tar.xz"; + sha256 = "1gj37ryhak1czv95ksigssmbmicdpirzi1l5zsv1w7jdh4nqcz54"; + name = "kbreakout-21.08.2.tar.xz"; }; }; kbruch = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kbruch-21.08.1.tar.xz"; - sha256 = "1rbkwzca3m93p3z294cwkiyycg0w87r6j37v0zyiq802pwkkpm34"; - name = "kbruch-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kbruch-21.08.2.tar.xz"; + sha256 = "1syy188f3sg3r22f7dklzman0h8fz6r1n4r5z986240q0r316rbn"; + name = "kbruch-21.08.2.tar.xz"; }; }; kcachegrind = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcachegrind-21.08.1.tar.xz"; - sha256 = "09zgilcya7asj2si747snli6h0s7wzgjzkns9f53rwvq06xbp2zv"; - name = "kcachegrind-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kcachegrind-21.08.2.tar.xz"; + sha256 = "126qa061bwz2d4s721vbv2099mz07vw3i1yw7vm0b3ih43h95149"; + name = "kcachegrind-21.08.2.tar.xz"; }; }; kcalc = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcalc-21.08.1.tar.xz"; - sha256 = "0si3mp1xbk6gps5fhc9fv1vskx37pgwx72i2x1kcm7azif26nzsk"; - name = "kcalc-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kcalc-21.08.2.tar.xz"; + sha256 = "01923w7zav2iia5pffs33vhblzh26lr1zpf2274cgplsbb5lcc9p"; + name = "kcalc-21.08.2.tar.xz"; }; }; kcalutils = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcalutils-21.08.1.tar.xz"; - sha256 = "1xrggb8vv8lrjyhdb9yf2fzs36q766if78hlymgfndj1z37s0m6m"; - name = "kcalutils-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kcalutils-21.08.2.tar.xz"; + sha256 = "0kvfpsz6zxdbgl4qvk3q55fjgjql1chx844cys26anhza0ld9afz"; + name = "kcalutils-21.08.2.tar.xz"; }; }; kcharselect = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcharselect-21.08.1.tar.xz"; - sha256 = "0qbhmyczc13kmbls06732i91s8n6w396dfj1z50z28wrkyqls8zr"; - name = "kcharselect-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kcharselect-21.08.2.tar.xz"; + sha256 = "08x060xmnyzqyadimwdqz767q29rmd48m8aqr3dsrzvb969ijnha"; + name = "kcharselect-21.08.2.tar.xz"; }; }; kcolorchooser = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcolorchooser-21.08.1.tar.xz"; - sha256 = "13zdyksijxflvjb3zaszl6q7wzwz0pxsq8hyi5pb2gb7gryz65h7"; - name = "kcolorchooser-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kcolorchooser-21.08.2.tar.xz"; + sha256 = "00vn2001crd0in3zd016xkhm38qgl7m03k1n90fiashjlnfd0928"; + name = "kcolorchooser-21.08.2.tar.xz"; }; }; kcron = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kcron-21.08.1.tar.xz"; - sha256 = "0c9d3rlml2adk11bp541l1zpbgp3q6mfhb7bpq4alrwlrbd4fxan"; - name = "kcron-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kcron-21.08.2.tar.xz"; + sha256 = "1ryfa084cfp7v11lbr58j4rx3n4m70ynpzbyavin31x1zzbw7bh8"; + name = "kcron-21.08.2.tar.xz"; }; }; kde-dev-scripts = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-scripts-21.08.1.tar.xz"; - sha256 = "1pv0qj7xpvxqgcrjbr9989cax0aan64cbipia4kmlg7kriz5wz6c"; - name = "kde-dev-scripts-21.08.1.tar.xz"; + 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"; }; }; kde-dev-utils = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-utils-21.08.1.tar.xz"; - sha256 = "02ksa35xh8vw08pqik7q8v3wax1fcvx2inicm1b2z2c4gq5k766l"; - name = "kde-dev-utils-21.08.1.tar.xz"; + 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"; }; }; kdebugsettings = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdebugsettings-21.08.1.tar.xz"; - sha256 = "1fmnmvyzlhczbsxdpnm3bi50pdh2659raizaqbal2yjxcp6rlb90"; - name = "kdebugsettings-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kdebugsettings-21.08.2.tar.xz"; + sha256 = "1wpj1hldrpbi538fd69i36zr3q3dg04i5bcmy41i1brzbddxl6sv"; + name = "kdebugsettings-21.08.2.tar.xz"; }; }; kdeconnect-kde = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdeconnect-kde-21.08.1.tar.xz"; - sha256 = "01nwzsryxg7kkxb6g4h0lwn6g5zx4k64vizqk4gsvkif8d5zfc33"; - name = "kdeconnect-kde-21.08.1.tar.xz"; + 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"; }; }; kdeedu-data = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdeedu-data-21.08.1.tar.xz"; - sha256 = "19hc9mykw8q0krcxmrjq4mhn5dljfrv9pzv38dm80w3yfflj8y65"; - name = "kdeedu-data-21.08.1.tar.xz"; + 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"; }; }; kdegraphics-mobipocket = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-mobipocket-21.08.1.tar.xz"; - sha256 = "06zpm5d58q10dalm2lm7v7lcjmainn3lmagra6a1f007yshm3i32"; - name = "kdegraphics-mobipocket-21.08.1.tar.xz"; + 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"; }; }; kdegraphics-thumbnailers = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-thumbnailers-21.08.1.tar.xz"; - sha256 = "0hqdxsnv6xgvy2knnhq733hbfgzhr6f4fi63l80saysqvpjyrxly"; - name = "kdegraphics-thumbnailers-21.08.1.tar.xz"; + 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"; }; }; kdenetwork-filesharing = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdenetwork-filesharing-21.08.1.tar.xz"; - sha256 = "1q5wisy6gz94lbf3dnmxp3rq0c5b1laajph8lnlm9dhfxxmrkacf"; - name = "kdenetwork-filesharing-21.08.1.tar.xz"; + 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"; }; }; kdenlive = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdenlive-21.08.1.tar.xz"; - sha256 = "0gjv1fm07f1qckpmlvia58myg9si9z46nwxiz1lcca5mx5k7rpcz"; - name = "kdenlive-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kdenlive-21.08.2.tar.xz"; + sha256 = "10x160sdj7dk27aa7iyvfmpgfidc8pisfmx6a50z0b23y54kg77m"; + name = "kdenlive-21.08.2.tar.xz"; }; }; kdepim-addons = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdepim-addons-21.08.1.tar.xz"; - sha256 = "08vpjcqnjh99bbmwp3h64anp53zafifblqy2f7bqkvwifmlrqvz8"; - name = "kdepim-addons-21.08.1.tar.xz"; + 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"; }; }; kdepim-runtime = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdepim-runtime-21.08.1.tar.xz"; - sha256 = "0ai6v5sysh5pzwpvbhjzi1fvfp608abpndh9nhnm7b87hca73vm9"; - name = "kdepim-runtime-21.08.1.tar.xz"; + 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"; }; }; kdesdk-kioslaves = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-kioslaves-21.08.1.tar.xz"; - sha256 = "0cz2cmcgksfkgl2nh0nnyz38q3rp1dfwhnajgcif5q0ka528v33w"; - name = "kdesdk-kioslaves-21.08.1.tar.xz"; + 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"; }; }; kdesdk-thumbnailers = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-thumbnailers-21.08.1.tar.xz"; - sha256 = "1cvh2p3vfzbqbr9cfa1bchgflmp9mi12qx1j6j1jdaqqwhz43kj6"; - name = "kdesdk-thumbnailers-21.08.1.tar.xz"; + 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"; }; }; kdf = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdf-21.08.1.tar.xz"; - sha256 = "1xmn7dhbnj9bhaw545ry0qwayxh3jhpgx9xa2fjcc0dhn8yx1spv"; - name = "kdf-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kdf-21.08.2.tar.xz"; + sha256 = "1z2m9a4rzjsjxv9pkassn3j7pxkqrpq04hw0j6q913q69a999rwg"; + name = "kdf-21.08.2.tar.xz"; }; }; kdialog = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdialog-21.08.1.tar.xz"; - sha256 = "1mxmj5cm5h1dhqkblcqdc7ba9x04sqj6gp0b12gii7jsz3g0pa94"; - name = "kdialog-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kdialog-21.08.2.tar.xz"; + sha256 = "08klapfcxwp3mf7jv7swsia4719fq6aqdv7lnxr16j8sd6h3z0yx"; + name = "kdialog-21.08.2.tar.xz"; }; }; kdiamond = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kdiamond-21.08.1.tar.xz"; - sha256 = "0l8z71k0a300yp03mkpabi3a9xydky6x19sk7xhq727canrb3nwz"; - name = "kdiamond-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kdiamond-21.08.2.tar.xz"; + sha256 = "1k458rs0x82jf4sjzcry4xzazwfn9drg41736749nc5d26k6csz1"; + name = "kdiamond-21.08.2.tar.xz"; }; }; keditbookmarks = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/keditbookmarks-21.08.1.tar.xz"; - sha256 = "0j9m5l3llb969ras4bvsswahqqpwrv1zscjpdscchk72vxi2ky4w"; - name = "keditbookmarks-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/keditbookmarks-21.08.2.tar.xz"; + sha256 = "07yscqr3zzjvb1snl1k0ilmpgv8wrxvjrjdcr1410llfwd80fpvi"; + name = "keditbookmarks-21.08.2.tar.xz"; }; }; kfind = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kfind-21.08.1.tar.xz"; - sha256 = "0d3milbrznwls197a5bjrdwarpdly4pyask7j97ia7nx0z91k35f"; - name = "kfind-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kfind-21.08.2.tar.xz"; + sha256 = "1rqn77m8i3fvknkq4gdl4fyihxkc34537010d6i992pxcx9yxv4d"; + name = "kfind-21.08.2.tar.xz"; }; }; kfloppy = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kfloppy-21.08.1.tar.xz"; - sha256 = "1nxkjaarvr7fq494hb4pk6nf9731f74zsxhfia3lzb2qf3rnxhvg"; - name = "kfloppy-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kfloppy-21.08.2.tar.xz"; + sha256 = "0g54qwrmqkd3jxi6nwprzd0jckzdq3iawibfsfblkchnd8hnlxiw"; + name = "kfloppy-21.08.2.tar.xz"; }; }; kfourinline = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kfourinline-21.08.1.tar.xz"; - sha256 = "0niwvc1fxvxk5xi90n753y7gjhljrnm3jjzxgjxs9ca5y1c7jcac"; - name = "kfourinline-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kfourinline-21.08.2.tar.xz"; + sha256 = "0z28lzx9jqp2krgwf6cpwv4hhyl8q8azgw3ni24c8hjl81sxidvb"; + name = "kfourinline-21.08.2.tar.xz"; }; }; kgeography = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kgeography-21.08.1.tar.xz"; - sha256 = "0wqblfs4h8pr0c3m9qv5xpz1sq1zxxbbgv42d0m12fhlbmhx0l64"; - name = "kgeography-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kgeography-21.08.2.tar.xz"; + sha256 = "16rqlh2n4xz5rcs0p9ppzsk7wh060zf1i5yfx4cjrswfn2wk5brv"; + name = "kgeography-21.08.2.tar.xz"; }; }; kget = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kget-21.08.1.tar.xz"; - sha256 = "06lng1sr1l5a7qcbld7xn97vlaxnq4f98sai2llmjkyna3awzi6r"; - name = "kget-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kget-21.08.2.tar.xz"; + sha256 = "11h073nkk5axr263wz5wjq8pdad2wk3nmhixx12ilkqqinb0pi6h"; + name = "kget-21.08.2.tar.xz"; }; }; kgoldrunner = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kgoldrunner-21.08.1.tar.xz"; - sha256 = "1dggs4fbfqc7q97j8fpi2v6q52165yikaps15mracn319c8mbx85"; - name = "kgoldrunner-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kgoldrunner-21.08.2.tar.xz"; + sha256 = "13y8a1zxfy16sbdf2c94wdx15ghmb436pzx7kvvsfv8d5yizlzdz"; + name = "kgoldrunner-21.08.2.tar.xz"; }; }; kgpg = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kgpg-21.08.1.tar.xz"; - sha256 = "0q4k7ahh1qr4fnkw4na5kyp4kq922a45hjgz9qzh7whn6zqrhsxs"; - name = "kgpg-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kgpg-21.08.2.tar.xz"; + sha256 = "051z9h12zqmhgvr8pk17vsfzld25mpklk1z6nknlf3hydjnq6ns1"; + name = "kgpg-21.08.2.tar.xz"; }; }; khangman = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/khangman-21.08.1.tar.xz"; - sha256 = "1jv7vbk4za17l73b10xx1ckv56qhsvlf2irlys917bk39jhxmwpp"; - name = "khangman-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/khangman-21.08.2.tar.xz"; + sha256 = "0xrwsg5pv1y5lh6d2na1gx8aiimpbl8y2i9a4qj3qg5l4nf0inal"; + name = "khangman-21.08.2.tar.xz"; }; }; khelpcenter = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/khelpcenter-21.08.1.tar.xz"; - sha256 = "09ayg8kb4b4v30xjm8ca5csw1axipn1336mq2sfqra5qwkj8d93y"; - name = "khelpcenter-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/khelpcenter-21.08.2.tar.xz"; + sha256 = "0ivm1z7c6yy6dm9sb88ggiww9c2k526lhpipkgiwm6kslzallxsn"; + name = "khelpcenter-21.08.2.tar.xz"; }; }; kidentitymanagement = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kidentitymanagement-21.08.1.tar.xz"; - sha256 = "0xhkz33w0z9jlxlqb06w5fiyj1qz2mjssrbba2kdm55q67lj1b76"; - name = "kidentitymanagement-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kidentitymanagement-21.08.2.tar.xz"; + sha256 = "0kaws0w21sm0mb0fd5av7gid8gvyz0zxxjrbx0kf3c52dwkrmw5c"; + name = "kidentitymanagement-21.08.2.tar.xz"; }; }; kig = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kig-21.08.1.tar.xz"; - sha256 = "0gvp07mnkpfamdq78bv2r1m84l4xp23qh2i6iscdhjdh05dzyl6s"; - name = "kig-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kig-21.08.2.tar.xz"; + sha256 = "1i5lszzj200mda7vbc8c6bzdlx8ycf2d8kk28pl2n17ajra33iim"; + name = "kig-21.08.2.tar.xz"; }; }; kigo = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kigo-21.08.1.tar.xz"; - sha256 = "1y7fh9acng4a135bz7skg7hgmyisaxgwli4ddv7y5h3r1rlhfd47"; - name = "kigo-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kigo-21.08.2.tar.xz"; + sha256 = "0ss15k2qpmrf4xvsjpqpvf9pvw8wijmk4zqqhvsjrbd5xrk53bkf"; + name = "kigo-21.08.2.tar.xz"; }; }; killbots = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/killbots-21.08.1.tar.xz"; - sha256 = "02rh60ww43r3zqv3v7zs42j7nl8b5373mykbql80amxnbj5965mn"; - name = "killbots-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/killbots-21.08.2.tar.xz"; + sha256 = "11cgkx5wpzgzx62frn90h35ga2scrvyxv7sasfsxldf3yiv15m30"; + name = "killbots-21.08.2.tar.xz"; }; }; kimagemapeditor = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kimagemapeditor-21.08.1.tar.xz"; - sha256 = "1mrf0k923gwy4cfh7g5yv0nnm4kx0j0yk9sz051sbvvbm4hbxqjg"; - name = "kimagemapeditor-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kimagemapeditor-21.08.2.tar.xz"; + sha256 = "0k1jl5d9qxdg9lrz19vzjbsnpnf236hmckvwy9c620sik0rzpj12"; + name = "kimagemapeditor-21.08.2.tar.xz"; }; }; kimap = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kimap-21.08.1.tar.xz"; - sha256 = "19b8awcbrn61dwqli10v883i8s18sjz8w335c2sxlhzqgdijgxhl"; - name = "kimap-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kimap-21.08.2.tar.xz"; + sha256 = "0qdl94zqk0qvy5mcnbhskh7dskcx8g1bkv4qv8zjjj9rz1r2rm2x"; + name = "kimap-21.08.2.tar.xz"; }; }; kio-extras = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kio-extras-21.08.1.tar.xz"; - sha256 = "0wlgd0cc56gzicgi16nx4592i6f6594d1mvz7d0266xrwmm8n688"; - name = "kio-extras-21.08.1.tar.xz"; + 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"; }; }; kio-gdrive = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kio-gdrive-21.08.1.tar.xz"; - sha256 = "1vqm8b819hg1yfjlz1x3yis9qkbclahp7l00cpqbxnra0ph9b1vw"; - name = "kio-gdrive-21.08.1.tar.xz"; + 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"; }; }; kipi-plugins = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kipi-plugins-21.08.1.tar.xz"; - sha256 = "1w6sw3wn0nj15jv6qp0yg7psg1m87b3izgn303z74vzkhqw04pid"; - name = "kipi-plugins-21.08.1.tar.xz"; + 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"; }; }; kirigami-gallery = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kirigami-gallery-21.08.1.tar.xz"; - sha256 = "0db1a5czq0xg0dhhmphds5vrz2lq771zwmps7gq6ahpfj01vyavd"; - name = "kirigami-gallery-21.08.1.tar.xz"; + 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"; }; }; kiriki = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kiriki-21.08.1.tar.xz"; - sha256 = "0x7iq3y2jc4wykgcyrgm8gmrkvlhs8gsxdl0495n1x1invsnmj00"; - name = "kiriki-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kiriki-21.08.2.tar.xz"; + sha256 = "1l3sc3fi4b8hc9dyrsi66src52wygckngiwqq8hf4mj2h0hf9s55"; + name = "kiriki-21.08.2.tar.xz"; }; }; kiten = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kiten-21.08.1.tar.xz"; - sha256 = "1skyfw5bshy6z8xvhs5q9f3c8nwqbm4mc74jcs6yhzc3i4mp82n3"; - name = "kiten-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kiten-21.08.2.tar.xz"; + sha256 = "12jmsg26y4ldkh5qyz2bzyd14wk401p7kl48m5ngxv95qxw2ix9s"; + name = "kiten-21.08.2.tar.xz"; }; }; kitinerary = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kitinerary-21.08.1.tar.xz"; - sha256 = "0r7mrcs7gh9ffscksvkh5v78dr2y1nh26p8r8ginafachg32p0mi"; - name = "kitinerary-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kitinerary-21.08.2.tar.xz"; + sha256 = "1l21q95rszdm1gp1msr9mzlj8ay115dl4cxchhm1mz7w7h53scg3"; + name = "kitinerary-21.08.2.tar.xz"; }; }; kjumpingcube = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kjumpingcube-21.08.1.tar.xz"; - sha256 = "1kh3jqp3m96lal6salcrqhgzg1pbacx20xn41c1jy272ch57r2jj"; - name = "kjumpingcube-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kjumpingcube-21.08.2.tar.xz"; + sha256 = "1akg30mz8j6w6dzc43z56siiljblqpah80ghbashq3h2wq3q1lxz"; + name = "kjumpingcube-21.08.2.tar.xz"; }; }; kldap = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kldap-21.08.1.tar.xz"; - sha256 = "1m92kd6mrz3dxap6rzw0r85wij030a60n10hkgkjkxb8npgvl14g"; - name = "kldap-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kldap-21.08.2.tar.xz"; + sha256 = "1vc94n9wq1422bp9ky2sapy8wra0gi5gfl6dz0h8wxnxflb28zvw"; + name = "kldap-21.08.2.tar.xz"; }; }; kleopatra = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kleopatra-21.08.1.tar.xz"; - sha256 = "1j1jd8ivcw2r2nlzzhr24kxcvfp5q1206gpkchd5mvsl6q34fmzx"; - name = "kleopatra-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kleopatra-21.08.2.tar.xz"; + sha256 = "1ym40xxwl9qqz8sbsck606vzxys5qhkca8g23gqn3sxx3kk8zpn9"; + name = "kleopatra-21.08.2.tar.xz"; }; }; klettres = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/klettres-21.08.1.tar.xz"; - sha256 = "0scgccwsma1hc1zp52h4rqddwizsqzwsh6gql5lf4qxhr8ihgj4m"; - name = "klettres-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/klettres-21.08.2.tar.xz"; + sha256 = "1n3qw190nznz0h4l68iy9azky57f8pflx10dihhl541jspgga5lg"; + name = "klettres-21.08.2.tar.xz"; }; }; klickety = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/klickety-21.08.1.tar.xz"; - sha256 = "0r8dr4blwv1l6b8585qw7q258qr9pgk97pmrfmpssb90yxni2c1c"; - name = "klickety-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/klickety-21.08.2.tar.xz"; + sha256 = "1vi4xx4y7s225b3vgi2z8l1d5z4fgz3v5jfg4zq6v1pis46zpmwz"; + name = "klickety-21.08.2.tar.xz"; }; }; klines = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/klines-21.08.1.tar.xz"; - sha256 = "1iyk91spsnfrkbjyf6jng6rgximcav2zf2xqkq1q2vvyhwwpchn6"; - name = "klines-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/klines-21.08.2.tar.xz"; + sha256 = "1gxaadl8gnbaliwbnr6ychp1da5dgppk58jgv5z0zngacwy80d97"; + name = "klines-21.08.2.tar.xz"; }; }; kmag = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmag-21.08.1.tar.xz"; - sha256 = "1hdjcya1jv6adz0d9hp1sq7y8f6fvzpw30fchmjkdm9y2kf8il6c"; - name = "kmag-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmag-21.08.2.tar.xz"; + sha256 = "0y68vg95fjhfsjvvn2i214jrv06f6811j1asjxrgvwcmwdf0fnc0"; + name = "kmag-21.08.2.tar.xz"; }; }; kmahjongg = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmahjongg-21.08.1.tar.xz"; - sha256 = "1wrzyiv07cffn5xiachqa8k9spcsi3iwvdj6prgbgdndbffw2gim"; - name = "kmahjongg-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmahjongg-21.08.2.tar.xz"; + sha256 = "1fx4almqcz8x3pzbrjv9yd9kfb7akrfy45z7idhyb31dkdaxi40w"; + name = "kmahjongg-21.08.2.tar.xz"; }; }; kmail = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmail-21.08.1.tar.xz"; - sha256 = "08q7c8l2nfrvw5xgc2dzcmidcpsjfya3jjnssziy3hpznmf8jpjr"; - name = "kmail-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmail-21.08.2.tar.xz"; + sha256 = "0way147xqjhapswdfqnnvav8dk41lf2050jzmd6jz7qj0dina977"; + name = "kmail-21.08.2.tar.xz"; }; }; kmail-account-wizard = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmail-account-wizard-21.08.1.tar.xz"; - sha256 = "1xqm4737p5l5cwqlnn7xladz4yna7aghl84hlbvzrfcc72v5xkal"; - name = "kmail-account-wizard-21.08.1.tar.xz"; + 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"; }; }; kmailtransport = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmailtransport-21.08.1.tar.xz"; - sha256 = "0zd03s4848n3g1w8fm0q3kq5sy91zhjw3hc2w6ncv6cgbb9s50dv"; - name = "kmailtransport-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmailtransport-21.08.2.tar.xz"; + sha256 = "0q76wanhby9gb9c07z8gpkmdqn6rv82bh6fz182m7bdzkqh4rbxx"; + name = "kmailtransport-21.08.2.tar.xz"; }; }; kmbox = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmbox-21.08.1.tar.xz"; - sha256 = "027x76lrjssrhqpr651fyqqkdv6jmiad901cssv7w54r2dpzs6w3"; - name = "kmbox-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmbox-21.08.2.tar.xz"; + sha256 = "055vx2cr9zqab887grjans5cassh2g86r1lcn64jb61sh1cvzj7y"; + name = "kmbox-21.08.2.tar.xz"; }; }; kmime = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmime-21.08.1.tar.xz"; - sha256 = "0prsmiv0g6icclhv7mkha66pddmdqz2mi69njz0xwz6m3ax068jw"; - name = "kmime-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmime-21.08.2.tar.xz"; + sha256 = "1dg0vm576gqvj7ia80zcdyf9cyg3fzvj7j3fkxx79mw17binlzg4"; + name = "kmime-21.08.2.tar.xz"; }; }; kmines = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmines-21.08.1.tar.xz"; - sha256 = "0nx07cghq20rja8rncrayx87v357s036whdfyzc6qkhdmlmkh6qj"; - name = "kmines-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmines-21.08.2.tar.xz"; + sha256 = "0vzspy446pwbd04zyq7x0s7q6nrhmdnzq3jfvv6nnazhjmxpfafv"; + name = "kmines-21.08.2.tar.xz"; }; }; kmix = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmix-21.08.1.tar.xz"; - sha256 = "0jc0b1j32gg7az0z7m1cvfdjrwss4q91hm1cfhrk5fq12620vivf"; - name = "kmix-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmix-21.08.2.tar.xz"; + sha256 = "1srv1alrq2w87rmv9jriz1y37rb0fp7w14291ky64gf23phwmfdq"; + name = "kmix-21.08.2.tar.xz"; }; }; kmousetool = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmousetool-21.08.1.tar.xz"; - sha256 = "04a5zrxg48svrvdf8gf3qc7cj7cayzhw0q4l1v8nzs2ykc330xq1"; - name = "kmousetool-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmousetool-21.08.2.tar.xz"; + sha256 = "1b09z6793zjjspcrhz4f1vxk3zbs4qdrkdp59q61i7ganm49znma"; + name = "kmousetool-21.08.2.tar.xz"; }; }; kmouth = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmouth-21.08.1.tar.xz"; - sha256 = "1rmqppmjjcrc7xp63csdgp440f003nia6hcnixxlya8pwn90bpwr"; - name = "kmouth-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmouth-21.08.2.tar.xz"; + sha256 = "1b9bc0vnqihaqa4wfa9sqcrq92q1kyw0w1ikkx3pb8rzdzkk4cv2"; + name = "kmouth-21.08.2.tar.xz"; }; }; kmplot = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kmplot-21.08.1.tar.xz"; - sha256 = "0mkcrdg0v98hdy5lgkyfv4x019w4sm7yiyfpryhx1wiqcpibxwl1"; - name = "kmplot-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kmplot-21.08.2.tar.xz"; + sha256 = "0p81x7qlpj1b84wzqqb7sxmbmnxfys0clg1k07d2hw4rb8gisgic"; + name = "kmplot-21.08.2.tar.xz"; }; }; knavalbattle = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/knavalbattle-21.08.1.tar.xz"; - sha256 = "1lvq223jspc5y0z6qaf648m85a58yp88b0jm8510p77ymxhyvgm7"; - name = "knavalbattle-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/knavalbattle-21.08.2.tar.xz"; + sha256 = "0zhp8zmnsjv1ainlc98waixv2p05w8jh91clb8747rc8x4k3phxk"; + name = "knavalbattle-21.08.2.tar.xz"; }; }; knetwalk = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/knetwalk-21.08.1.tar.xz"; - sha256 = "1akv78yaym474b57d9qxqp3vivs405m1zm6x0plf2g1adp93myz2"; - name = "knetwalk-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/knetwalk-21.08.2.tar.xz"; + sha256 = "1jb6w790jfngifhgp4clgakiacw0lbn40jnj00zlzcg751vl6ajl"; + name = "knetwalk-21.08.2.tar.xz"; }; }; knights = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/knights-21.08.1.tar.xz"; - sha256 = "1m00nryw69k4dyb0vvnjz3fwasf67ghkq78l7k8ck9vvzrihmwd1"; - name = "knights-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/knights-21.08.2.tar.xz"; + sha256 = "0v72niszn93671c4313f3cz2y8wq5nsww0c4irsbz9jpivcq080z"; + name = "knights-21.08.2.tar.xz"; }; }; knotes = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/knotes-21.08.1.tar.xz"; - sha256 = "1av537f02zsz72mqkzlcrv977kf96nrdwsj4fx7kmdbhf5x9rvgv"; - name = "knotes-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/knotes-21.08.2.tar.xz"; + sha256 = "1g3rmkpwbicga09qwhxn47rhiv9rfaacpzapsrhddh63831bl999"; + name = "knotes-21.08.2.tar.xz"; }; }; kolf = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kolf-21.08.1.tar.xz"; - sha256 = "15wk2c2pzpg39hv6s1b80mf5l7gkbxlprahjq6wh6f6a5hm3wkxb"; - name = "kolf-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kolf-21.08.2.tar.xz"; + sha256 = "1dziji28syv7rirm959ahcch6696sc4y6pnfp40v11j1pw58jm8p"; + name = "kolf-21.08.2.tar.xz"; }; }; kollision = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kollision-21.08.1.tar.xz"; - sha256 = "15ddxccj29094lxrihchc17x2a2xnjk790dqhfja9d235vkg3lpb"; - name = "kollision-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kollision-21.08.2.tar.xz"; + sha256 = "04hb91gqy58lvhwy0hx27xcd1pvqm378lcavswh7b142f63mhmjf"; + name = "kollision-21.08.2.tar.xz"; }; }; kolourpaint = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kolourpaint-21.08.1.tar.xz"; - sha256 = "0vjssni7c8dx1617gsnkp8dip92agys8n1ydzdly6jpwhvlr382a"; - name = "kolourpaint-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kolourpaint-21.08.2.tar.xz"; + sha256 = "0p64dp63m8ycy5qrgd6fdgf670y5iqdyw4gjbkwphg01qp8kpj6d"; + name = "kolourpaint-21.08.2.tar.xz"; }; }; kompare = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kompare-21.08.1.tar.xz"; - sha256 = "0sigh2c91ff7r6yclx18lcwqbwh4gbj55n5fjpd1fw9rb7xf9j3n"; - name = "kompare-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kompare-21.08.2.tar.xz"; + sha256 = "14bbqxdzj67g2m6zmz28ax6v4bzz9nmyy45flqzm8jqvq9afqb1d"; + name = "kompare-21.08.2.tar.xz"; }; }; konqueror = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/konqueror-21.08.1.tar.xz"; - sha256 = "155dc8nd3kgr25wpjisnp9z2jr1f31vcnm8ywa98p4i59kaaxh7h"; - name = "konqueror-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/konqueror-21.08.2.tar.xz"; + sha256 = "0v5l1nqa0fm4q17l0rncriwyvkgq0pdg2q4kjc92kvvdvrpm3jjp"; + name = "konqueror-21.08.2.tar.xz"; }; }; konquest = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/konquest-21.08.1.tar.xz"; - sha256 = "0i0pm5zq2ipm1ipsam19c771v16bxlhilidny336rzwfa1vik0zl"; - name = "konquest-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/konquest-21.08.2.tar.xz"; + sha256 = "0shky9cys79prdgr6bcmi50gvfmqr0famdq6gqacv9krbja4pl20"; + name = "konquest-21.08.2.tar.xz"; }; }; konsole = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/konsole-21.08.1.tar.xz"; - sha256 = "0v74yrblwakbmy0p4x5j9lhmqyavgsffahr51bh5r5qcgx0cafjv"; - name = "konsole-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/konsole-21.08.2.tar.xz"; + sha256 = "1lhpgags85y0s5p44dpa2k0b9vq46m7h19pha59w1wy72an884ig"; + name = "konsole-21.08.2.tar.xz"; }; }; kontact = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kontact-21.08.1.tar.xz"; - sha256 = "1aqyrkmc7hnzja1spm75ybrb9c3yg37rklcgdr7myyyhjxmvnrzg"; - name = "kontact-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kontact-21.08.2.tar.xz"; + sha256 = "1a7d7xfby796kk9hbqqnnhjnn5yvk99hglm4270azlcgbjxf4s2j"; + name = "kontact-21.08.2.tar.xz"; }; }; kontactinterface = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kontactinterface-21.08.1.tar.xz"; - sha256 = "1l251rw80c329sgrv25r8cn242v0kl7pvcfv9xkakql7dw707xs9"; - name = "kontactinterface-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kontactinterface-21.08.2.tar.xz"; + sha256 = "0wavclk0z55z8xmqiq6wjhlf2byiggmj9fr5kwdk8wsjfj30npwg"; + name = "kontactinterface-21.08.2.tar.xz"; }; }; kontrast = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kontrast-21.08.1.tar.xz"; - sha256 = "05nw7z05maxpcr37andv60fn9s8kprz474bkza980ah05xzvkkvb"; - name = "kontrast-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kontrast-21.08.2.tar.xz"; + sha256 = "12pmkkgrj848whwfz523ciix2a4dm3wgw1vva30svyvlv6qyrgwa"; + name = "kontrast-21.08.2.tar.xz"; }; }; konversation = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/konversation-21.08.1.tar.xz"; - sha256 = "0v3nvyjc13jav8x9krg9sd9p533j7ndan0fqb5p0virwk1dznvfy"; - name = "konversation-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/konversation-21.08.2.tar.xz"; + sha256 = "1blaxxpp0831frw2v4ylvq23ffyqabbq1zcqj0v4kq736acdl8pa"; + name = "konversation-21.08.2.tar.xz"; }; }; kopeninghours = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kopeninghours-21.08.1.tar.xz"; - sha256 = "09yskjfkr190vkp8xgj2hicfyg1mx9mqm7pgn4133qfn08xh52vd"; - name = "kopeninghours-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kopeninghours-21.08.2.tar.xz"; + sha256 = "1g4g3hc0zpklnw8an49dk25zfw740w4slkm52191q2ajymp589l0"; + name = "kopeninghours-21.08.2.tar.xz"; }; }; kopete = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kopete-21.08.1.tar.xz"; - sha256 = "131nic6w1bzc0l94b8jkzac2dckaz64y2fgplyiqjidicm0cyrd1"; - name = "kopete-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kopete-21.08.2.tar.xz"; + sha256 = "015pjfc5kxhm5nmjv8fx4jlczp0l3vhqrkxgfvq83a200nlvg2pm"; + name = "kopete-21.08.2.tar.xz"; }; }; korganizer = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/korganizer-21.08.1.tar.xz"; - sha256 = "0x05i3c0nj46bnnd7msz1rpghbr2p6sywfsa15d6l1j72i2ay0vr"; - name = "korganizer-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/korganizer-21.08.2.tar.xz"; + sha256 = "0izrzg5xxqgz0wq0vkv1i1xcf0xnzgfwixy8f4gcvihpqxyvixb7"; + name = "korganizer-21.08.2.tar.xz"; }; }; kosmindoormap = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kosmindoormap-21.08.1.tar.xz"; - sha256 = "1v31cik859b994xka37z0l86nd0crykbsnafyxpmqdzf942ixixb"; - name = "kosmindoormap-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kosmindoormap-21.08.2.tar.xz"; + sha256 = "0yf4n48x041wl07f575hzqdkn1qmx3idpxswinsk9r8zdr2dwch7"; + name = "kosmindoormap-21.08.2.tar.xz"; }; }; kpat = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpat-21.08.1.tar.xz"; - sha256 = "1dxihma5mad2kbg7wzfbnaq3gmgwav70rqrj5fpji42pvlqx4vyn"; - name = "kpat-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kpat-21.08.2.tar.xz"; + sha256 = "16cj3w4cibar1q12wam3i623kzddhl39ychvi3nphlni5cmr4x42"; + name = "kpat-21.08.2.tar.xz"; }; }; kpimtextedit = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpimtextedit-21.08.1.tar.xz"; - sha256 = "1zaavf0gpaibk22fz8ij0fqrlp18lj07hgdg6ynhdmhamw59sfr5"; - name = "kpimtextedit-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kpimtextedit-21.08.2.tar.xz"; + sha256 = "0v479g998amh822lxr0l2d9xhlrwbij9prlrn1z9y9al056cic7h"; + name = "kpimtextedit-21.08.2.tar.xz"; }; }; kpkpass = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpkpass-21.08.1.tar.xz"; - sha256 = "0z8dk548awy37iq8zz41x2wm2i9bhpfa2g0ghlwvhj7sy97ap1vk"; - name = "kpkpass-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kpkpass-21.08.2.tar.xz"; + sha256 = "003rmp8svnz74qfd3727l7p5wj56j9x8w3dwk19ysyklh2rbaj2p"; + name = "kpkpass-21.08.2.tar.xz"; }; }; kpmcore = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpmcore-21.08.1.tar.xz"; - sha256 = "1aw21x70kgm1dmhqr384k6rbsd1fx70zd94i0slq5zyf37zx6b9l"; - name = "kpmcore-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kpmcore-21.08.2.tar.xz"; + sha256 = "0rn8x0add1qflsbgppmhz1zbnjvy39d5wckxga0vmhdix2m3d60g"; + name = "kpmcore-21.08.2.tar.xz"; }; }; kpublictransport = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kpublictransport-21.08.1.tar.xz"; - sha256 = "1dbbsdrzhqaiz6d4hlyy1f50m6hi0arafxrxr65gh9h4zs2ym4qs"; - name = "kpublictransport-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kpublictransport-21.08.2.tar.xz"; + sha256 = "1g4k1wxhvjya0k79ysr92kq37fbdfly5qdrmp11apvar4la4xmr8"; + name = "kpublictransport-21.08.2.tar.xz"; }; }; kqtquickcharts = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kqtquickcharts-21.08.1.tar.xz"; - sha256 = "0ghmxzy3jqzy3zdpp5zhjv3mcq6micnnk1jhnlq03v4z981rrs6h"; - name = "kqtquickcharts-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kqtquickcharts-21.08.2.tar.xz"; + sha256 = "04cxw88lv7mj74znzfl3m9jzks11z837y3bch40qdn8ysk9wqjhn"; + name = "kqtquickcharts-21.08.2.tar.xz"; }; }; krdc = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/krdc-21.08.1.tar.xz"; - sha256 = "038m7wgpg33sqqqq7iy4rvficsi7x2012rimxb1gn2azg5kcwk6v"; - name = "krdc-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/krdc-21.08.2.tar.xz"; + sha256 = "0zrpfbs4r0d4wnficmhn0av7877hbrl4jvxpi0qiy2gdc7zksnbd"; + name = "krdc-21.08.2.tar.xz"; }; }; kreversi = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kreversi-21.08.1.tar.xz"; - sha256 = "1gh7zhqzyh2m34v3gyb902c6cvw33rbib5g8p3dwsmm5v2bfgggj"; - name = "kreversi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kreversi-21.08.2.tar.xz"; + sha256 = "18z2aclpd0xln1n442jg13n5j2yip6dldfvd5z56g7n23l9paywq"; + name = "kreversi-21.08.2.tar.xz"; }; }; krfb = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/krfb-21.08.1.tar.xz"; - sha256 = "0l28l9wmfxf6vihxr86pwxj027fkz0k0pwkif8had0s4swc9jfnx"; - name = "krfb-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/krfb-21.08.2.tar.xz"; + sha256 = "1hn21d0cp2k6zair2wwf492y0ip69f1b5axaaz9fqgmgqn0l47qb"; + name = "krfb-21.08.2.tar.xz"; }; }; kross-interpreters = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kross-interpreters-21.08.1.tar.xz"; - sha256 = "1fznrng6mz9s8ynzr48p05n6akkmzn3fifbgpxs98nhzlz2ay574"; - name = "kross-interpreters-21.08.1.tar.xz"; + 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"; }; }; kruler = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kruler-21.08.1.tar.xz"; - sha256 = "0l78hk7zjwjxba094gjvajh32v4avdc80h5r0rv94k2r3gckfjv4"; - name = "kruler-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kruler-21.08.2.tar.xz"; + sha256 = "082z14vcp1ww42jrlxl128gp6y5iqrz360cipvj4xph4q7lpgb0r"; + name = "kruler-21.08.2.tar.xz"; }; }; kshisen = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kshisen-21.08.1.tar.xz"; - sha256 = "107y828nkdzza5hi68pxxk5gp017dy2yxdmmhmg6ylppk5gfp6dp"; - name = "kshisen-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kshisen-21.08.2.tar.xz"; + sha256 = "12mi59n8sm7wqf53wbi2nlh4d2i673x93rlqz6qxkaqznlpf7lrr"; + name = "kshisen-21.08.2.tar.xz"; }; }; ksirk = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksirk-21.08.1.tar.xz"; - sha256 = "0l6bfpima9whgfdkbghhfh36p6kjs8j26gz5zc7r8fcswv66ya21"; - name = "ksirk-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ksirk-21.08.2.tar.xz"; + sha256 = "1j6nzyl3ppi68d1y84yals0y90km5mxzz4x44frn3k3bb1n1imzc"; + name = "ksirk-21.08.2.tar.xz"; }; }; ksmtp = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksmtp-21.08.1.tar.xz"; - sha256 = "0pl167gjhpmdvhsjm6hcygxwjs8v1z4xfc7x0c69bac8rdrzrlb6"; - name = "ksmtp-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ksmtp-21.08.2.tar.xz"; + sha256 = "08bdi23qwvayl9w1nsfgpxpxmxrw820qcmvw03ivdk1h7m6sl3yh"; + name = "ksmtp-21.08.2.tar.xz"; }; }; ksnakeduel = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksnakeduel-21.08.1.tar.xz"; - sha256 = "1jk4mdxg2b1aa1686rimhjqh91ijaf8n7fahvswwbl473zfjf748"; - name = "ksnakeduel-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ksnakeduel-21.08.2.tar.xz"; + sha256 = "0n7digcymwrcg24y2libp0x67s1rj2qmps4yzp2bxpgasx9pf6ik"; + name = "ksnakeduel-21.08.2.tar.xz"; }; }; kspaceduel = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kspaceduel-21.08.1.tar.xz"; - sha256 = "0q2mpidkhgjz3nm88j3m8wdb06y3m8ixr0540q0s9i9d997jdkch"; - name = "kspaceduel-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kspaceduel-21.08.2.tar.xz"; + sha256 = "1gjb23dw8fh61b7s23b2bfkgcfxqvndrv1x7lkk2bpi4i4g6sqz3"; + name = "kspaceduel-21.08.2.tar.xz"; }; }; ksquares = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksquares-21.08.1.tar.xz"; - sha256 = "0z7h5vig5zablvdlv7lanmsjjbqq931pqjyynm75mygrrbavgcfq"; - name = "ksquares-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ksquares-21.08.2.tar.xz"; + sha256 = "10sl49mjjlpqyh6f930iz1nncy2dqzm1b8hksn8zxz5kwi2gvfrc"; + name = "ksquares-21.08.2.tar.xz"; }; }; ksudoku = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksudoku-21.08.1.tar.xz"; - sha256 = "0aax14xwg42wr8g563nbpn7m55gs4k50kwk0zn79pf62i78g10lp"; - name = "ksudoku-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ksudoku-21.08.2.tar.xz"; + sha256 = "15svd1paf1hx5aqmdrh6bcdag7k8iq18fpjflk3vkkip6s76lrv6"; + name = "ksudoku-21.08.2.tar.xz"; }; }; ksystemlog = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ksystemlog-21.08.1.tar.xz"; - sha256 = "1vv0wbb3npbq8r0mq8y5lc36qx1hxdjxygfcnw2h9hm4dwl8mc5v"; - name = "ksystemlog-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ksystemlog-21.08.2.tar.xz"; + sha256 = "1qnnhbi75glgvcvpmpy5zrq6x6hygl7r7v4h99lfm48jdfpyxilj"; + name = "ksystemlog-21.08.2.tar.xz"; }; }; kteatime = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kteatime-21.08.1.tar.xz"; - sha256 = "0gjnvcvrnb3049ln64chnjgr7xm722ighjscxxhqz61i872dgb72"; - name = "kteatime-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kteatime-21.08.2.tar.xz"; + sha256 = "02vkh3dyacba9x0zl8j8g8isj50h8wz7mjnfqgxc67azcwwx41sp"; + name = "kteatime-21.08.2.tar.xz"; }; }; ktimer = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktimer-21.08.1.tar.xz"; - sha256 = "1l79yrg6g78gf8av1h6yr4mxyd1n63g4r38qp4csvpnjpx7y8ijd"; - name = "ktimer-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ktimer-21.08.2.tar.xz"; + sha256 = "0rfmrh7i8c23r6wdyh4w55980vlj2p127mbpiw5brj4dazdjll5x"; + name = "ktimer-21.08.2.tar.xz"; }; }; ktnef = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktnef-21.08.1.tar.xz"; - sha256 = "08wk4ssasqqixwnp59smv64c8m4jf89vpcwc3zvz4h92sfk0pk33"; - name = "ktnef-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ktnef-21.08.2.tar.xz"; + sha256 = "05l4g38f2m3qjl6q45j12zarpazsizjl2pyqh87vhaxgnf4fbqqp"; + name = "ktnef-21.08.2.tar.xz"; }; }; ktorrent = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktorrent-21.08.1.tar.xz"; - sha256 = "1r7w43ns4zy94y82dbghrjgqv1sbdj01rni0iijirzjjikr5av9m"; - name = "ktorrent-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ktorrent-21.08.2.tar.xz"; + sha256 = "1nd72jcvsc0kabd23ddy93dxp59ihg5npa8r3vbzvic89xlpkivi"; + name = "ktorrent-21.08.2.tar.xz"; }; }; ktouch = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktouch-21.08.1.tar.xz"; - sha256 = "00pyrp00dqbanb2w0cxmxh8aahih714q85prjij6iy5sv0917zr7"; - name = "ktouch-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ktouch-21.08.2.tar.xz"; + sha256 = "16r3hj160y1517dk1nzvikwkjlfbzmjpx54k9jc98csaplbv683l"; + name = "ktouch-21.08.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-accounts-kcm-21.08.1.tar.xz"; - sha256 = "0pn8g5w4p2synwfskw9m805nj2wk9g7yff423243qc3fxl572sv8"; - name = "ktp-accounts-kcm-21.08.1.tar.xz"; + 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"; }; }; ktp-approver = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-approver-21.08.1.tar.xz"; - sha256 = "1q2rsg9520ra7ap3ipvv0sdyc2mzbzap2ygzkwbm80fpspl6b973"; - name = "ktp-approver-21.08.1.tar.xz"; + 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"; }; }; ktp-auth-handler = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-auth-handler-21.08.1.tar.xz"; - sha256 = "0yzh2sqsyic3d979mj3m8d9m42y37w3h2s7gsyifw08gf5sna48p"; - name = "ktp-auth-handler-21.08.1.tar.xz"; + 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"; }; }; ktp-call-ui = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-call-ui-21.08.1.tar.xz"; - sha256 = "0m8x3mfhy5rnv9wp15zrl5fiwdkm66pc8szkncqnjxw2nv721s3m"; - name = "ktp-call-ui-21.08.1.tar.xz"; + 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"; }; }; ktp-common-internals = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-common-internals-21.08.1.tar.xz"; - sha256 = "12jcfr3cvyhzn62jnlnfmp39wyxa06bih4qz8gxzv56nl434qzv0"; - name = "ktp-common-internals-21.08.1.tar.xz"; + 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"; }; }; ktp-contact-list = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-list-21.08.1.tar.xz"; - sha256 = "1d4d0bvi9c813c3gyws3gc8zca1az2f3ych2r1cgpdhhbqjrf3wl"; - name = "ktp-contact-list-21.08.1.tar.xz"; + 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"; }; }; ktp-contact-runner = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-runner-21.08.1.tar.xz"; - sha256 = "0l2qimrpfnpmhvspgv62y8a7hsbw4abz92n1xry040qmkfqzv2l7"; - name = "ktp-contact-runner-21.08.1.tar.xz"; + 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"; }; }; ktp-desktop-applets = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-desktop-applets-21.08.1.tar.xz"; - sha256 = "03si91agdjascs6ri0g5zrhicjzx24p6kh2ni1d96k5sc7alwxnl"; - name = "ktp-desktop-applets-21.08.1.tar.xz"; + 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"; }; }; ktp-filetransfer-handler = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-filetransfer-handler-21.08.1.tar.xz"; - sha256 = "08dklgklc31fvcdi3917lh77gr58y75f1di0xhjf6jq8vxplqjd8"; - name = "ktp-filetransfer-handler-21.08.1.tar.xz"; + 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"; }; }; ktp-kded-module = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-kded-module-21.08.1.tar.xz"; - sha256 = "1135hh82ivvbpks9k39baisrq053570yq2x851j4vb2qrxg000yg"; - name = "ktp-kded-module-21.08.1.tar.xz"; + 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"; }; }; ktp-send-file = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-send-file-21.08.1.tar.xz"; - sha256 = "1fnn5m9spa0x8nw1rx94x85hy06qwkb1fl5l498rmhyzikhxmhqp"; - name = "ktp-send-file-21.08.1.tar.xz"; + 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"; }; }; ktp-text-ui = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktp-text-ui-21.08.1.tar.xz"; - sha256 = "0cfnf688jz5953x7jxjrdlfs96rxjcfzvasrc881y1aprav1dmjq"; - name = "ktp-text-ui-21.08.1.tar.xz"; + 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"; }; }; ktuberling = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/ktuberling-21.08.1.tar.xz"; - sha256 = "1f3a74nfh4fhxibcfxgjdj6phy185iz6y9nfg3pag3jvqsn8nx49"; - name = "ktuberling-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/ktuberling-21.08.2.tar.xz"; + sha256 = "0h7vhvh03w11dr17zxdmb5j2vz8flwahvz70h9kw8a63sxpw0x6f"; + name = "ktuberling-21.08.2.tar.xz"; }; }; kturtle = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kturtle-21.08.1.tar.xz"; - sha256 = "15ng6k6xfaj37dvycm29pj2pk73yfr66pp0wgj719c0kq7c9avdp"; - name = "kturtle-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kturtle-21.08.2.tar.xz"; + sha256 = "1f3iw3fk4l8q2jnnadaqjbj6jzmw86ibf0p515x4rrqz4l8m6plg"; + name = "kturtle-21.08.2.tar.xz"; }; }; kubrick = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kubrick-21.08.1.tar.xz"; - sha256 = "03i0b24mmq3jqf7812a9sjr8lr82mq9mrq75z2a9h62jinvxvigj"; - name = "kubrick-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kubrick-21.08.2.tar.xz"; + sha256 = "0kvd8dsg9hdgid70jd5b1vngqpmi9rigkvxl2v4h2ps1ziqqxa78"; + name = "kubrick-21.08.2.tar.xz"; }; }; kwalletmanager = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kwalletmanager-21.08.1.tar.xz"; - sha256 = "1a4aiajq04rlm566jwqwjq2b6sfamnabfrjfa80pld3qcmq0l1mz"; - name = "kwalletmanager-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kwalletmanager-21.08.2.tar.xz"; + sha256 = "134690b4bhkjczwxg8776163aggwrqmb84xkvb7612wgs5jygyib"; + name = "kwalletmanager-21.08.2.tar.xz"; }; }; kwave = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kwave-21.08.1.tar.xz"; - sha256 = "1dl7kn67hp9y39xlnq989kg743295a23kbpjpvbjashgdqy3hqwl"; - name = "kwave-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kwave-21.08.2.tar.xz"; + sha256 = "0sivhgcypwpdi6g0mkdzf1k2hqkj1vj4b5cdcvn8chs2gk9pisgh"; + name = "kwave-21.08.2.tar.xz"; }; }; kwordquiz = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/kwordquiz-21.08.1.tar.xz"; - sha256 = "1mzdmgls07bb6k2x6qb1xzp04jpfifdrka2k6kzwy9bq071gs7q5"; - name = "kwordquiz-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/kwordquiz-21.08.2.tar.xz"; + sha256 = "1prj7iz71z8zy2ynjad7yqkgswg96q4hmc76kg1lvahn2waikr0y"; + name = "kwordquiz-21.08.2.tar.xz"; }; }; libgravatar = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libgravatar-21.08.1.tar.xz"; - sha256 = "08xl8nb0bn6zf9sh7sn4v7aa86ffqb16hixci4ymixyxy5c4gwbv"; - name = "libgravatar-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libgravatar-21.08.2.tar.xz"; + sha256 = "047fbdj02rnb7bn2vn9lava2mh4ypzlyd8iiri4mbpd686lmi0s1"; + name = "libgravatar-21.08.2.tar.xz"; }; }; libkcddb = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkcddb-21.08.1.tar.xz"; - sha256 = "08841rssxcg9vi490qih8jxnalnbjd2wqsgcq22gkm1ahfj5dizq"; - name = "libkcddb-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkcddb-21.08.2.tar.xz"; + sha256 = "03az77p3p0c0shzi2y2n5721gppzgrq469afvpjppria1n3ks5d2"; + name = "libkcddb-21.08.2.tar.xz"; }; }; libkcompactdisc = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkcompactdisc-21.08.1.tar.xz"; - sha256 = "1q838md6kqvjmc61sy943lqgv5isll2px1s0izyvvxkf747hcpin"; - name = "libkcompactdisc-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkcompactdisc-21.08.2.tar.xz"; + sha256 = "0sjr8gdbqsjlggxax0l2bxn42l9znplrjiln15izj2zwfkah7d69"; + name = "libkcompactdisc-21.08.2.tar.xz"; }; }; libkdcraw = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkdcraw-21.08.1.tar.xz"; - sha256 = "17ijpgljhrm851mdnd1znjpa7hidmv1d5d05q68r6lp1aclcgmwm"; - name = "libkdcraw-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkdcraw-21.08.2.tar.xz"; + sha256 = "0yhcrzl7piginz19vmyg63154j9rrqxfvfchn9k8g9jiddwnjfd8"; + name = "libkdcraw-21.08.2.tar.xz"; }; }; libkdegames = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkdegames-21.08.1.tar.xz"; - sha256 = "0vfx3ksy6z5h4hjx0dl3fr3phfz3q590h86ksbp5q20lyylmdpji"; - name = "libkdegames-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkdegames-21.08.2.tar.xz"; + sha256 = "0jbb4h515c9h08r7dqaslqgrpmb6f08ai46phwgipd67jzgh6wh7"; + name = "libkdegames-21.08.2.tar.xz"; }; }; libkdepim = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkdepim-21.08.1.tar.xz"; - sha256 = "10zb97zf1jidh9q6dkn8cjs9f4gqz2xn6yqylsbq0bjlycv991fh"; - name = "libkdepim-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkdepim-21.08.2.tar.xz"; + sha256 = "1j8nkfgzixpchz34p338mcm87f112ddy1linhaczg5fal1brangh"; + name = "libkdepim-21.08.2.tar.xz"; }; }; libkeduvocdocument = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkeduvocdocument-21.08.1.tar.xz"; - sha256 = "0wnyx7h284g6wssnfdfz4m0hcb0rc6fnlryav8vnjcyzz7p5ni6l"; - name = "libkeduvocdocument-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkeduvocdocument-21.08.2.tar.xz"; + sha256 = "051mzwbrlpvjnqphf01nzzc76zbz9hasd57sn6y6x8cviflf7kmy"; + name = "libkeduvocdocument-21.08.2.tar.xz"; }; }; libkexiv2 = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkexiv2-21.08.1.tar.xz"; - sha256 = "0wnpkzivb5f5z3d1dn5952cx07q8nw421xrs21r57cmbsss344xa"; - name = "libkexiv2-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkexiv2-21.08.2.tar.xz"; + sha256 = "0spa6pbr6rpnznvm2z0c410k5wssw4rw15rdc3f5ds9mbzbyxpva"; + name = "libkexiv2-21.08.2.tar.xz"; }; }; libkgapi = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkgapi-21.08.1.tar.xz"; - sha256 = "14wzl40j5baw20628dqcpkg8vi6jsq5f9gw0sc1my8qhw91mj3vy"; - name = "libkgapi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkgapi-21.08.2.tar.xz"; + sha256 = "13dna8iv3qzkc1jagjgji928g88wrgds47lcfj3dqkn8swamisa0"; + name = "libkgapi-21.08.2.tar.xz"; }; }; libkipi = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkipi-21.08.1.tar.xz"; - sha256 = "13579gqxyj8dwmrmxylnw6mf56vr73vlbbv07rpi661kfrbjk2ms"; - name = "libkipi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkipi-21.08.2.tar.xz"; + sha256 = "134iaagdn49y79aihi6k5pgx0cyk52wq38cdiinpcsxqc4xmzswh"; + name = "libkipi-21.08.2.tar.xz"; }; }; libkleo = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkleo-21.08.1.tar.xz"; - sha256 = "1n1nacr1q0nw2jq8px6b3cmda6ff9mygggfrl3xh6qz042bg77xz"; - name = "libkleo-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkleo-21.08.2.tar.xz"; + sha256 = "14p3x2jq9sa5gkhcd7q3g5ras2sl62shrjm9kx4426mbnj10n0q2"; + name = "libkleo-21.08.2.tar.xz"; }; }; libkmahjongg = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkmahjongg-21.08.1.tar.xz"; - sha256 = "0ry6wz0i9dccjn5w2qy2nin0rhbg30vlbcr4zrlx8bxsw0la2k94"; - name = "libkmahjongg-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkmahjongg-21.08.2.tar.xz"; + sha256 = "195c7bgn4jp2whqrg7l8g147kj92bvdcvcrh7n186kac9q0jqr3b"; + name = "libkmahjongg-21.08.2.tar.xz"; }; }; libkomparediff2 = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libkomparediff2-21.08.1.tar.xz"; - sha256 = "0n6xxam33k8j6c9wqdf0lhfpk6nyf9brhvdkivdamp0idhi3rcpx"; - name = "libkomparediff2-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libkomparediff2-21.08.2.tar.xz"; + sha256 = "08y9p3il0i5sayq42v9p1v9f6yynp7ljb5d4ls1hf5ww4xxvx10x"; + name = "libkomparediff2-21.08.2.tar.xz"; }; }; libksane = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libksane-21.08.1.tar.xz"; - sha256 = "1x4wsdfczqnasr6ps8677m0ix1fqqd2316f6k2k3awn9qfgsqy3x"; - name = "libksane-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libksane-21.08.2.tar.xz"; + sha256 = "094k5f0qwcm74jn5jlzs0mr74myp4s217ah2pl1kny1fm5hv5pyj"; + name = "libksane-21.08.2.tar.xz"; }; }; libksieve = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libksieve-21.08.1.tar.xz"; - sha256 = "1569xcjz575f8007z91zs9xn5wjklzkiy6l0cl7yzpzn880wc03p"; - name = "libksieve-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libksieve-21.08.2.tar.xz"; + sha256 = "1jxb0a18mf8yqxbi90jbgjh90x17qr6z7ga6zxdb8gk1hjsyb10y"; + name = "libksieve-21.08.2.tar.xz"; }; }; libktorrent = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/libktorrent-21.08.1.tar.xz"; - sha256 = "0y5881v0g49rr8dspzaq4l1c62rchgfq4mjx64sn0ng2jjpnhv1x"; - name = "libktorrent-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/libktorrent-21.08.2.tar.xz"; + sha256 = "16rx0na7gy03c0qbwy07q7si35z62p0pq7fcvf3ggr594akwz4kl"; + name = "libktorrent-21.08.2.tar.xz"; }; }; lokalize = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/lokalize-21.08.1.tar.xz"; - sha256 = "0ih7a1rkwn9jpgk3qld8anavr0g4wlf8figwikhvbc2dw79lxs7k"; - name = "lokalize-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/lokalize-21.08.2.tar.xz"; + sha256 = "01f48fsrv095vlgxfjfdlm70xwsw73x5zhqbm38szn6r404jcmjm"; + name = "lokalize-21.08.2.tar.xz"; }; }; lskat = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/lskat-21.08.1.tar.xz"; - sha256 = "1d89yqfsc703pnvxljcsn33wpsv64s4nr2wlmlbl609m9x8b9g9b"; - name = "lskat-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/lskat-21.08.2.tar.xz"; + sha256 = "03www1ix31ifmn6hvzymvhg157rdhahjfwvc9arns23zxpn1sq9p"; + name = "lskat-21.08.2.tar.xz"; }; }; mailcommon = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/mailcommon-21.08.1.tar.xz"; - sha256 = "1r0qyqasah4z8vx836fhvv1f4zm20az9qrw8122l3a986lazh1zw"; - name = "mailcommon-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/mailcommon-21.08.2.tar.xz"; + sha256 = "0d0czxrf3i796pyrlifv4psq3hl4z2abhsqj1ns30xng45pzyrvz"; + name = "mailcommon-21.08.2.tar.xz"; }; }; mailimporter = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/mailimporter-21.08.1.tar.xz"; - sha256 = "05kiizbdnsl15ry2zb5sg94lcdwq9w4lnznd6zcq8n09s0zpz8nf"; - name = "mailimporter-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/mailimporter-21.08.2.tar.xz"; + sha256 = "0vd0bghszwr1wh4x2ygd7flg0kypb8m92gvh0q800gdgnqj87lw7"; + name = "mailimporter-21.08.2.tar.xz"; }; }; marble = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/marble-21.08.1.tar.xz"; - sha256 = "01hf3wwz9zflkpgx1pbkxbnl1vs2yyafrwmldnil66nkxsxx7izw"; - name = "marble-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/marble-21.08.2.tar.xz"; + sha256 = "1l8dwj0kyq8r3cap2sjsr4blbz591l6cxhglkhxwds901igacmxa"; + name = "marble-21.08.2.tar.xz"; }; }; markdownpart = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/markdownpart-21.08.1.tar.xz"; - sha256 = "0xgs2kxnbrn70mrzza2d4f7xpx9ks3dbl3yj1y1kds7bnidsf3f9"; - name = "markdownpart-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/markdownpart-21.08.2.tar.xz"; + sha256 = "0vx2d31d9c9ipwkbnlrjhzkaj97a7vz6vigbbkvw4cyaqhq6zkqp"; + name = "markdownpart-21.08.2.tar.xz"; }; }; mbox-importer = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/mbox-importer-21.08.1.tar.xz"; - sha256 = "06mgz10ma8r0vi7ln9zxz2kipdp9rd0zw0sgm69h43rq9zyjnjkk"; - name = "mbox-importer-21.08.1.tar.xz"; + 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"; }; }; messagelib = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/messagelib-21.08.1.tar.xz"; - sha256 = "1r3lqacixy5vy36jgy6glz08gp8k4559h1bdqyh7svmmflhs927i"; - name = "messagelib-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/messagelib-21.08.2.tar.xz"; + sha256 = "0gsxik4ib72xhw948h257m17w4k49sa3ymbg87n0q8nd6gykxyhr"; + name = "messagelib-21.08.2.tar.xz"; }; }; minuet = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/minuet-21.08.1.tar.xz"; - sha256 = "0law0ram3xdf5ayc7j8as1xwj83k37mf7w6qkkp3hy3kj2r2dahx"; - name = "minuet-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/minuet-21.08.2.tar.xz"; + sha256 = "13i37xw2aarmqi25m1r68z9zjwqf9nx8bxlflb0wxghzf3pgrp4v"; + name = "minuet-21.08.2.tar.xz"; }; }; okular = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/okular-21.08.1.tar.xz"; - sha256 = "1vk1mn40i80b5vkxq47i1qf2i734n5nfa1wgx3748jwc1fws631p"; - name = "okular-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/okular-21.08.2.tar.xz"; + sha256 = "0y3n340fbhsgmmrq4vz2p9682xzs7hsvvna8ffh4r15wgl1qdb9q"; + name = "okular-21.08.2.tar.xz"; }; }; palapeli = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/palapeli-21.08.1.tar.xz"; - sha256 = "09mswv446s6vqlllhz727qpd7mdszdkgivfn9sazgmydmmmzrw53"; - name = "palapeli-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/palapeli-21.08.2.tar.xz"; + sha256 = "0pl6hi0c5fa6zs3gdicm1s7rmzzdjjvrm8s8ds6f4ghq6dmlknqj"; + name = "palapeli-21.08.2.tar.xz"; }; }; parley = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/parley-21.08.1.tar.xz"; - sha256 = "02v9gfjdryf48m5iinsc9qg2qfmj1s96xga5b3ndd63g66b6gp9b"; - name = "parley-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/parley-21.08.2.tar.xz"; + sha256 = "0lykvjaxfj6blgjkmipvlw9531npz46d6jwq6w5wxvk6f1b2cgbh"; + name = "parley-21.08.2.tar.xz"; }; }; partitionmanager = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/partitionmanager-21.08.1.tar.xz"; - sha256 = "16vc0g08rs6dz87zv4b1ygs198c6mbjwcp2j4994z6cf16bxfgz8"; - name = "partitionmanager-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/partitionmanager-21.08.2.tar.xz"; + sha256 = "1fa90mnby2kf5a85wjz7xvb999gh5c2yn0j3g562zndqznqhcpvx"; + name = "partitionmanager-21.08.2.tar.xz"; }; }; picmi = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/picmi-21.08.1.tar.xz"; - sha256 = "1yshwfl8baw0cw8hnvzkb3y72r0bycyr19rwwns9sjc3fk9gnk6a"; - name = "picmi-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/picmi-21.08.2.tar.xz"; + sha256 = "0qvz4fl4jb256rwmaw0bszr3x2b5jd8priilc3jr33v393f3pd6q"; + name = "picmi-21.08.2.tar.xz"; }; }; pim-data-exporter = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/pim-data-exporter-21.08.1.tar.xz"; - sha256 = "1vx7h7900wq8icx7q4khkx9g5gm6j5c8dl38q08pwda4vl0pmxmd"; - name = "pim-data-exporter-21.08.1.tar.xz"; + 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"; }; }; pim-sieve-editor = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/pim-sieve-editor-21.08.1.tar.xz"; - sha256 = "0ph62khl2k2gpfjf05p9sklihib0hbxgl3n1bv59l58awj9brs0r"; - name = "pim-sieve-editor-21.08.1.tar.xz"; + 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"; }; }; pimcommon = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/pimcommon-21.08.1.tar.xz"; - sha256 = "1379lhvin2vkikd3fzanhwfjszb4cc9f3h9bxf3md3h4gx1i6hb6"; - name = "pimcommon-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/pimcommon-21.08.2.tar.xz"; + sha256 = "074pbxprzx8hd6fikjvx8hn9g9135swzhj1f5zvfvhyvlpyj90wg"; + name = "pimcommon-21.08.2.tar.xz"; }; }; poxml = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/poxml-21.08.1.tar.xz"; - sha256 = "10wwrbmhwbjk71m4ya1shb7mviil33fciykrzyqvvdnvx668aawm"; - name = "poxml-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/poxml-21.08.2.tar.xz"; + sha256 = "1h7y4y1n3xcpgrkabik21ilck5dmq6p3qxs3xm9vzq1jxpb9izyf"; + name = "poxml-21.08.2.tar.xz"; }; }; print-manager = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/print-manager-21.08.1.tar.xz"; - sha256 = "1hzykjnymr0knh67h6s5214bjp5lk1klm6znh8q2asf49c6x2zgw"; - name = "print-manager-21.08.1.tar.xz"; + 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"; }; }; rocs = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/rocs-21.08.1.tar.xz"; - sha256 = "1b527n0csk43sxafynqijiwf0bzj89viznpxnk2ayb9lik4q3djm"; - name = "rocs-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/rocs-21.08.2.tar.xz"; + sha256 = "0cvgi42w1a7zd6bzazly9w2azbyp9gzvkyx5wlff5z99nk6v3mp0"; + name = "rocs-21.08.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/signon-kwallet-extension-21.08.1.tar.xz"; - sha256 = "1x1q1vmqm9nq7sjhxc495x612jh39scxba0nbr8a4rval144268m"; - name = "signon-kwallet-extension-21.08.1.tar.xz"; + 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"; }; }; skanlite = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/skanlite-21.08.1.tar.xz"; - sha256 = "17lnazx1h4lk78037gvzscnm3p2yl6dhc4970bdq982ahwp63gg8"; - name = "skanlite-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/skanlite-21.08.2.tar.xz"; + sha256 = "1zwrb7j7x234vbb57p8gzbqz2mfr1n2i84yjf16jrsv1fm53z9md"; + name = "skanlite-21.08.2.tar.xz"; }; }; spectacle = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/spectacle-21.08.1.tar.xz"; - sha256 = "0bs93gylw90wj3b9kw71xhqy60smggh38s5g4jcras1n6iqmb06x"; - name = "spectacle-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/spectacle-21.08.2.tar.xz"; + sha256 = "0m59cnfqkm379i6ayj1g5flszqs26dmnwl79324d1j6bxk24mjrh"; + name = "spectacle-21.08.2.tar.xz"; }; }; step = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/step-21.08.1.tar.xz"; - sha256 = "0rg69j8r479vzyrajbdjgh5l2506w8f2dnlh1di545gzjk2ww448"; - name = "step-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/step-21.08.2.tar.xz"; + sha256 = "15l11s39hw847kd37fhq6kp3ajbsxidkfpp2ryb9dfh595lncg2r"; + name = "step-21.08.2.tar.xz"; }; }; svgpart = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/svgpart-21.08.1.tar.xz"; - sha256 = "1silp6k0l9xb363h8whiv4dry6gf1mj4w53mksl1i2slhqn9q96v"; - name = "svgpart-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/svgpart-21.08.2.tar.xz"; + sha256 = "14xgwdvpcvgw0jj4gy3175ah38x9f8lhknqbw5bczvm9cy8j7qfw"; + name = "svgpart-21.08.2.tar.xz"; }; }; sweeper = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/sweeper-21.08.1.tar.xz"; - sha256 = "0p25bkczxmx93igicyiasvjd4v9rc3sg7gm7b9ddgzz8rrnr0d9p"; - name = "sweeper-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/sweeper-21.08.2.tar.xz"; + sha256 = "1yvcfdhapml1vzqns67v6j2c39g752f8czxs7bnczi69fq1ksh0b"; + name = "sweeper-21.08.2.tar.xz"; }; }; umbrello = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/umbrello-21.08.1.tar.xz"; - sha256 = "0x4f3hiydyprhzd56i8lijwfhzca041bmbbxp7x1dckv3shdangc"; - name = "umbrello-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/umbrello-21.08.2.tar.xz"; + sha256 = "1xiz006ppgss6rxg7lndgnrbcdbm0iq1hjly3rjn943ff11wq5yr"; + name = "umbrello-21.08.2.tar.xz"; }; }; yakuake = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/yakuake-21.08.1.tar.xz"; - sha256 = "1x41jrkvlff8x5qcd12lcrv6zqzw7jqw02ikpmqv1v4gw7lz94w9"; - name = "yakuake-21.08.1.tar.xz"; + url = "${mirror}/stable/release-service/21.08.2/src/yakuake-21.08.2.tar.xz"; + sha256 = "1d8dh10jkpm4pm8fh1bmkdwvv59gk0fg6dr3gahlspnh4hhzy4hg"; + name = "yakuake-21.08.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.08.1"; + version = "21.08.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.1/src/zeroconf-ioslave-21.08.1.tar.xz"; - sha256 = "113sp3lqzyxx7icww4sznc23kxarmxz0158kzl6nazxj4m6cnm4r"; - name = "zeroconf-ioslave-21.08.1.tar.xz"; + 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"; }; }; } diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index b5d0578b122..8f0fe761087 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.28.6"; - sha256 = "sha256-15RRoTr+N+DsILYF1KndAwsW329w+UxHfB1VaWnkEFI="; + humioCtlVersion = "0.28.11"; + sha256 = "sha256-CdGeGpOEWYn7yIWJxWpRrSPHcuult+jtqpjYaSjfBLQ="; vendorSha256 = "sha256-fgRQ2n5tzj5s4rT65VIqh61wDwu+x/fWhpaKwyr8XWA="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index cf76eda2720..7fb0de24c11 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "archiver"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "0fdkqfs87svpijccz8m11gvby8pvmznq6fs9k94vbzak0kxhw1wg"; + sha256 = "1py186hfy4p69wghqmbsyi1r3xvw1nyl55pz8f97a5qhmwxb3mwp"; }; - vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf"; + vendorSha256 = "1y4v95z1ga111g3kdv5wvyikwifl25f36firf1i916rxli6f6g5i"; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix new file mode 100644 index 00000000000..5990bf91ea0 --- /dev/null +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -0,0 +1,163 @@ +{ lib +, stdenv +, fetchurl +, perlPackages +, makeWrapper +, wrapGAppsHook +, cairo +, dblatex +, gnumake +, gobject-introspection +, graphicsmagick +, gsettings-desktop-schemas +, gtk3 +, libnotify +, librsvg +, libxslt +, netpbm +, opencv +, pango +, perl +, pkg-config +, poppler +, auto-multiple-choice +}: +stdenv.mkDerivation rec { + pname = "auto-multiple-choice"; + version = "1.5.1"; + src = fetchurl { + url = "https://download.auto-multiple-choice.net/${pname}_${version}_precomp.tar.gz"; + sha256 = "71831122f7b43245d3289617064e0b561817c0130ee1773c1b957841b28b854c"; + }; + tlType = "run"; + + # There's only the Makefile + dontConfigure = true; + + makeFlags = [ + "PERLPATH=${perl}/bin/perl" + # We *need* to pass DESTDIR, as the Makefile ignores PREFIX. + "DESTDIR=$(out)" + # Relative paths. + "BINDIR=/bin" + "PERLDIR=/share/perl5" + "MODSDIR=/lib/" + "TEXDIR=/tex/latex/" # what texlive.combine expects + "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this? + "MAN1DIR=/share/man/man1" + "DESKTOPDIR=/share/applications" + "METAINFODIR=/share/metainfo" + "ICONSDIR=/share/auto-multiple-choice/icons" + "APPICONDIR=/share/icons/hicolor" + "LOCALEDIR=/share/locale" + "MODELSDIR=/share/auto-multiple-choice/models" + "DOCDIR=/share/doc/auto-multiple-choice" + "SHARED_MIMEINFO_DIR=/share/mime/packages" + "LANG_GTKSOURCEVIEW_DIR=/share/gtksourceview-4/language-specs" + # Pretend to be redhat so `install` doesn't try to chown/chgrp. + "SYSTEM_TYPE=rpm" + ]; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + wrapProgram $out/bin/auto-multiple-choice \ + ''${makeWrapperArgs[@]} \ + --prefix PERL5LIB : "${with perlPackages; makePerlPath [ + ArchiveZip + DBDSQLite + Cairo + CairoGObject + DBI + Glib + GlibObjectIntrospection + Gtk3 + LocaleGettext + PerlMagick + TextCSV + XMLParser + XMLSimple + XMLWriter + ]}:"$out/share/perl5 \ + --prefix XDG_DATA_DIRS : "$out/share" \ + --set TEXINPUTS ":.:$out/share/texmf/tex/latex/AMC" + ''; + + nativeBuildInputs = [ + pkg-config + makeWrapper + wrapGAppsHook + ]; + + buildInputs = [ + cairo + cairo.dev + dblatex + gnumake + gobject-introspection + graphicsmagick + gsettings-desktop-schemas + gtk3 + libnotify + librsvg + libxslt + netpbm + opencv + pango + poppler + ] ++ (with perlPackages; [ + perl + ArchiveZip + Cairo + CairoGObject + DBDSQLite + DBI + Glib + GlibObjectIntrospection + Gtk3 + LocaleGettext + PerlMagick + TextCSV + XMLParser + XMLSimple + XMLWriter + ]); + + meta = with lib; { + description = "Create and manage multiple choice questionnaires with automated marking."; + longDescription = '' + Create, manage and mark multiple-choice questionnaires. + auto-multiple-choice features automated or manual formatting with + LaTeX, shuffling of questions and answers and automated marking using + Optical Mark Recognition. + + Questionnaires can be created using either a very simple text syntax, + AMC-TXT, or LaTeX. In the latter case, your TeXLive installation must + be combined with this package. This can be done in configuration.nix + as follows: + + <screen> + … + environment.systemPackages = with pkgs; [ + auto-multiple-choice + (texlive.combine { + inherit (pkgs.texlive) scheme-full; + extra = + { + pkgs = [ auto-multiple-choice ]; + }; + }) + ]; + </screen> + + For usage instructions, see documentation at the project's homepage. + ''; + homepage = "https://www.auto-multiple-choice.net/"; + changelog = "https://gitlab.com/jojo_boulix/auto-multiple-choice/-/blob/master/ChangeLog"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.thblt ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index f7a56a48fc7..bda779dd54f 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-YKGCZm0BaFLi+kujl04B4IU1qay15XNfvelxfUkCP8o="; + sha256 = "sha256-F0p309rY0PeeOU1K9Had6qI6DCHgzauuuTjMfWoZYBQ="; }; subPackages = [ "cmd/cheat" ]; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index d4fc82b9139..61150d56fbb 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.41"; + version = "0.99.42"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-Bhk5xpJiVDSTxP1wAFTL39MgAIOa6Is9NTF1WEh6S1A="; + sha256 = "sha256-PKjl9n6J0iNdcA56CZ/nAzvgRNwqRLTHjwi3HQYWIMU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 1fec32d9f70..f7782d0a577 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.2.3"; # When updating also update fetchedMavenDeps.sha256 + version = "21.2.4"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "0xu/uMMloCUuhKs392kn6qJzlobDNuvwlHGdS/gGAB8="; + sha256 = "BPcTj2YIGyP3g4qrQlDp13lziJwSUt0Zn00CayDku9g="; }; fetchedMavenDeps = stdenv.mkDerivation { diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 35e5d59171a..67753b6e371 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper +{ stdenv, lib, fetchFromGitHub, makeWrapper, fetchpatch , pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , wayland, wayland-protocols @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-BWbvGetXXCXbfPRY+u6gEfzBmX8PLSnI6a5vfCByiC0="; }; + 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 = [ diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index 94fc91dfdb9..c054c36859c 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "flavours"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Misterio77"; repo = pname; rev = "v${version}"; - sha256 = "1bgi6p7l0bh9k4vkwvngk7q19ynia0z1ninb1cq8qnwwpll6kbya"; + sha256 = "sha256-77nSz3J/9TsptpSHRFYY8mZAvn+o35gro2OwQkGzEC0="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - cargoSha256 = "07hwxhfcbqbwb3hz18w92h1lhdiwwy7abhwpimzx7syyavp4rmn4"; + cargoSha256 = "sha256-UukLWMd8+wq5Y0dtePH312c1Nm4ztXPsoPHPN0nUb1w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 461d27a32c3..656a5f3bea4 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "ceffaa5022d76132165ca9004c1e57d7400b56c9ab3866e3bd139e2ffe38cb72"; + sha256 = "ea1a7bf908507a87edffde6d6be93b8859ab0832ca788b61690a13aa5dd52216"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index b35319c3863..04526ec3465 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv -, fetchurl +{ stdenv +, lib +, fetchFromGitLab , meson , ninja , pkg-config -, gnome , desktop-file-utils , gettext , itstool @@ -17,17 +17,21 @@ , json-glib , gnome-autoar , gspell -, libcanberra }: +, libcanberra +, nix-update-script +}: -let +stdenv.mkDerivation rec { pname = "gnome-recipes"; - version = "2.0.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "2.0.4"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "recipes"; + rev = version; + fetchSubmodules = true; + sha256 = "GyFOwEYmipQdFLtTXn7+NvhDTzxBlOAghr3cZT4QpQw="; }; nativeBuildInputs = [ @@ -53,10 +57,6 @@ in stdenv.mkDerivation rec { libcanberra ]; - # https://github.com/NixOS/nixpkgs/issues/36468 - # https://gitlab.gnome.org/GNOME/recipes/issues/76 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - postPatch = '' chmod +x src/list_to_c.py patchShebangs src/list_to_c.py @@ -64,8 +64,8 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; + updateScript = nix-update-script { + attrPath = pname; }; }; @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { description = "Recipe management application for GNOME"; homepage = "https://wiki.gnome.org/Apps/Recipes"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 03668e58611..f0eed5c1e2f 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -56,7 +56,6 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GoldenDict.app $out/Applications - wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict ''; meta = with lib; { diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index e7cfe04da6e..950cb236ecb 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -2,26 +2,14 @@ , stdenv , mkDerivation , fetchurl -, ffmpeg_3 , freetype -, gdal_2 , glib , libGL , libGLU -, libICE , libSM -, libXi -, libXv -, libav_12 , libXrender -, libXrandr -, libXfixes -, libXcursor -, libXinerama -, libXext , libX11 -, libXcomposite , libxcb , sqlite @@ -34,11 +22,8 @@ , dbus , makeWrapper -, qtlocation -, qtwebkit -, qtx11extras -, qtsensors -, qtscript +, cups +, alsa-lib , xkeyboardconfig , autoPatchelfHook @@ -50,49 +35,34 @@ let in mkDerivation rec { pname = "googleearth-pro"; - version = "7.3.3.7786"; + version = "7.3.4.8248"; src = fetchurl { url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-pro-stable/google-earth-pro-stable_${version}-r0_${arch}.deb"; - sha256 = "1s3cakwrgf702g33rh8qs657d8bl68wgg8k89rksgvswwpd2zbb3"; + sha256 = "1pbapi267snlrjari5k93y6kbrjsqhqxgkxxqaqv4r25az00dx6d"; }; nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; propagatedBuildInputs = [ xkeyboardconfig ]; buildInputs = [ dbus - ffmpeg_3 + cups fontconfig freetype - gdal_2 glib gst_all_1.gst-plugins-base gst_all_1.gstreamer libGL libGLU - libICE libSM libX11 - libXcomposite - libXcursor - libXext - libXfixes - libXi - libXinerama - libXrandr libXrender - libXv - libav_12 libproxy libxcb libxml2 - qtlocation - qtscript - qtsensors - qtwebkit - qtx11extras sqlite zlib + alsa-lib ]; doInstallCheck = true; @@ -131,17 +101,6 @@ mkDerivation rec { runHook postInstall ''; - postInstall = '' - find "$out/opt/google/earth/pro" -name "*.so.*" | \ - egrep -v 'libssl*|libcrypto*|libicu*' | \ - xargs rm - find "$out/opt/google/earth/pro" -name "*.so" | \ - egrep -v 'libgoogle*|libauth*|libbase*|libcommon*|libcommon_gui*|libcommon_platform*|libcommon_webbrowser*|libcomponentframework*|libgeobase*|libgeobaseutils*|libge_net*|libgdata*|libgoogleapi*|libmath*|libmoduleframework*|libmaps*|libport*|libprintmodule*|libprofile*|librender*|libreporting*|libsgutil*|libspatial*|libxsltransform*|libbase*|libport*|libport*|libbase*|libcomponentframework*|libIGCore*|libIGUtils*|libaction*|libapiloader*|libapiloader*|libIGCore*|libIGUtils*|libIGMath*|libfusioncommon*|libge_exif*|libaction*|libfusioncommon*|libapiloader*|liblayer*|libapiloader*|libIGAttrs*|libIGCore*|libIGGfx*|libIGMath*|libIGSg*|libIGUtils*|libwmsbase*|libwebbrowser*|libevllpro*|libalchemyext*|libge_cache*|libflightsim*|libnpgeinprocessplugin*|libmeasure*|libviewsync*|libcapture*|libtheme*|libgps*|libgisingest*|libsearchmodule*|libinput_plugin*|libnavigate*|libspnav*|libsearch*|libLeap*' | \ - xargs rm - ''; - - autoPatchelfIgnoreMissingDeps=true; - installCheckPhase = '' $out/bin/gpsbabel -V > /dev/null ''; @@ -159,5 +118,6 @@ mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ friedelino shamilton ]; platforms = platforms.linux; + knownVulnerabilities = [ "Includes vulnerable bundled libraries." ]; }; } diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index c8d6eb3b84c..8d2b95ea4f3 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -28,7 +28,6 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GPXLab/GPXLab.app $out/Applications - wrapQtApp $out/Applications/GPXLab.app/Contents/MacOS/GPXLab ''; meta = with lib; { diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index f008ea439ed..bbe77c18220 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -26,7 +26,6 @@ mkDerivation rec { postInstall = with stdenv; lib.optionalString isDarwin '' mkdir -p $out/Applications mv GPXSee.app $out/Applications - wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee ''; meta = with lib; { diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix index 16268bc76c7..e496d786457 100644 --- a/pkgs/applications/misc/gxkb/default.nix +++ b/pkgs/applications/misc/gxkb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gxkb"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "zen-tools"; repo = "gxkb"; rev = "v${version}"; - sha256 = "sha256-KIlosBNfGSYCgtxBuSVeSfHaLsANdLgG/P5UtAL6Hms="; + sha256 = "sha256-9r1eZl7PgIt2ZpK+QQHaa460imIHT3Lh5mpzcFglyWc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index d3d369368af..0aff0c6bbd1 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "2.6.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-VSj6bSb92XMsfvDH+cey2GXLnJajUBaCqLMgkv2fnSo="; + sha256 = "sha256-838uH8nTxl3FJvtYrLDmS6tYYRdNnFzftZ5RZE8tVpE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/hunter/default.nix b/pkgs/applications/misc/hunter/default.nix deleted file mode 100644 index 6c0c9b2955a..00000000000 --- a/pkgs/applications/misc/hunter/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, pkg-config, rustPlatform, fetchFromGitHub, fetchpatch -, makeWrapper, glib, gst_all_1, CoreServices, IOKit, Security }: - -rustPlatform.buildRustPackage rec { - pname = "hunter"; - version = "2020-05-25-unstable"; - - src = fetchFromGitHub { - owner = "rabite0"; - repo = "hunter"; - rev = "355d9a3101f6d8dc375807de79e368602f1cb87d"; - sha256 = "sha256-R2wNkG8bFP7X2pdlebHK6GD15qmD/zD3L0MwVthvzzQ="; - }; - - patches = [ - (fetchpatch { - name = "remove-dependencies-on-rust-nightly"; - url = "https://github.com/06kellyjac/hunter/commit/a5943578e1ee679c8bc51b0e686c6dddcf74da2a.diff"; - sha256 = "sha256-eOwBFfW5m8tPnu+whWY/53X9CaqiVj2WRr25G+Yy7qE="; - }) - (fetchpatch { - name = "fix-accessing-core-when-moved-with-another-clone"; - url = "https://github.com/06kellyjac/hunter/commit/2e95cc567c751263f8c318399f3c5bb01d36962a.diff"; - sha256 = "sha256-yTzIXUw5qEaR2QZHwydg0abyZVXfK6fhJLVHBI7EAro="; - }) - (fetchpatch { - name = "fix-resolve-breaking-changes-from-package-updates"; - url = "https://github.com/06kellyjac/hunter/commit/2484f0db580bed1972fd5000e1e949a4082d2f01.diff"; - sha256 = "sha256-K+WUxEr1eE68XejStj/JwQpMHlhkiOw6PmiSr1GO0kc="; - }) - ]; - - cargoPatches = [ - (fetchpatch { - name = "chore-cargo-update"; - url = "https://github.com/06kellyjac/hunter/commit/b0be49a82191a4420b6900737901a71140433efd.diff"; - sha256 = "sha256-ctxoDwyIJgEhMbMUfrjCTy2SeMUQqMi971szrqEOJeg="; - }) - (fetchpatch { - name = "chore-cargo-upgrade-+-cargo-update"; - url = "https://github.com/06kellyjac/hunter/commit/1b8de9248312878358afaf1dac569ebbccc4321a.diff"; - sha256 = "sha256-+4DZ8SaKwKNmr2SEgJJ7KZBIctnYFMQFKgG+yCkbUv0="; - }) - ]; - - RUSTC_BOOTSTRAP = 1; - - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ - glib - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - ]) ++ lib.optionals stdenv.isDarwin [ CoreServices IOKit Security ]; - - cargoBuildFlags = [ "--no-default-features" "--features=img,video" ]; - - postInstall = '' - wrapProgram $out/bin/hunter --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - cargoSha256 = "sha256-Bd/gilebxC4H+/1A41OSSfWBlHcSczsFcU2b+USnI74="; - - meta = with lib; { - description = "The fastest file manager in the galaxy!"; - homepage = "https://github.com/rabite0/hunter"; - license = licenses.wtfpl; - maintainers = with maintainers; [ fufexan ]; - # error[E0308]: mismatched types - # --> src/files.rs:502:62 - # expected raw pointer `*const u8`, found raw pointer `*const i8` - broken = stdenv.isAarch64; - }; -} diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index fdd606c892d..a8548f2c5c0 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -115,11 +115,6 @@ stdenv.mkDerivation rec { ++ optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; - preFixup = optionalString stdenv.isDarwin '' - # Make it work without Qt in PATH. - wrapQtApp $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC - ''; - passthru.tests = nixosTests.keepassxc; meta = { diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 7e34ec0a36d..4fb05b25c06 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.4.2"; + version = "0.4.5"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "BEDScQtGfkp74Gx3RKK8ItNQ9JD8AJkl1zdS/gZqyXk="; + sha256 = "EMybZH3heUWeCP74KdFr6zJY1R3hePo6RssbJXrkd9g="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index 8c884305277..2dfbaeb9941 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -30,9 +30,6 @@ mkDerivation rec { installPhase = '' install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin - '' + lib.optionalString stdenv.isDarwin '' - wrapQtApp $out/bin/lsd2dsl - wrapQtApp $out/bin/lsd2dsl-qtgui ''; meta = with lib; { diff --git a/pkgs/applications/misc/markmind/default.nix b/pkgs/applications/misc/markmind/default.nix new file mode 100644 index 00000000000..e44b7fe54ad --- /dev/null +++ b/pkgs/applications/misc/markmind/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: + +stdenv.mkDerivation rec { + pname = "markmind"; + version = "1.3.1"; + + src = fetchurl { + url = "https://github.com/MarkMindCkm/Mark-Mind/releases/download/v${version}/Mark.Mind-${version}.AppImage"; + sha256 = "sha256-iOJ0IOIzleA69rv94Qd35rMbHc+XSi8OPatf2V6sYrI="; + }; + + appimageContents = appimageTools.extractType2 { + name = "markmind-${version}"; + inherit src; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/markmind $out/share/applications + cp -a ${appimageContents}/{locales,resources} $out/share/markmind + cp -a ${appimageContents}/mind.desktop $out/share/applications/markmind.desktop + cp -a ${appimageContents}/usr/share/icons $out/share + substituteInPlace $out/share/applications/markmind.desktop \ + --replace 'Exec=AppRun' 'Exec=markmind' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/markmind \ + --add-flags $out/share/markmind/resources/app.asar + ''; + + meta = with lib; { + description = "Mind map and outliner editor"; + homepage = "https://github.com/MarkMindCkm/Mark-Mind"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 90d91583a26..eda540427bb 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -50,7 +50,6 @@ mkDerivation rec { mkdir -p $out/Applications mv binaries/bin/merkaartor.app $out/Applications mv binaries/bin/plugins $out/Applications/merkaartor.app/Contents - wrapQtApp $out/Applications/merkaartor.app/Contents/MacOS/merkaartor ''; meta = with lib; { diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index cc5ff18a2f3..c88ac932e4f 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4808"; + version = "4810"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "ooiXotpxdy99ViUQ0kFp0NoTowGEZjEoD31x+3XrW28="; + sha256 = "j21WTEu+MTmnFrRH5B8Eb1tS2elFR715R8jhgKZ5Gmw="; }; patches = [ diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 1d625a67b7b..3890246a63d 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python36Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }: + python3Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the # $PYTHONPATH variable containing some of their code, so that @@ -13,7 +13,7 @@ # # https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59 -python36Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "multibootusb"; name = "${pname}-${version}"; version = "9.2.0"; @@ -42,7 +42,7 @@ python36Packages.buildPythonApplication rec { buildInputs = [ libxcb - python36Packages.python + python3Packages.python qt5.full ]; @@ -58,12 +58,12 @@ python36Packages.buildPythonApplication rec { # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" doCheck = false; - pythonPath = [ - python36Packages.dbus-python - python36Packages.pyqt5 - python36Packages.pytest-shutil - python36Packages.pyudev - python36Packages.six + pythonPath = with python3Packages; [ + dbus-python + pyqt5 + pytest-shutil + pyudev + six ]; # multibootusb ships zips with various versions of syslinux, we need to patchelf them @@ -95,7 +95,7 @@ python36Packages.buildPythonApplication rec { "''${qtWrapperArgs[@]}" # Then, add the installed scripts/ directory to the python path - --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages" + --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages" # Add some runtime dependencies --prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}" diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix index c044e76c597..9e8440a4c80 100644 --- a/pkgs/applications/misc/openlp/lib.nix +++ b/pkgs/applications/misc/openlp/lib.nix @@ -5,7 +5,7 @@ # python deps , python, buildPythonPackage , alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant -, pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy_migrate +, pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate }: buildPythonPackage rec { @@ -43,7 +43,7 @@ buildPythonPackage rec { pyxdg sip_4 sqlalchemy - sqlalchemy_migrate + sqlalchemy-migrate ]; prePatch = '' diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 05cc834591f..d7969155370 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -36,7 +36,7 @@ in python.pkgs.buildPythonApplication rec { }; propagatedBuildInputs = with python.pkgs; [ - sqlalchemy_migrate + sqlalchemy-migrate python-dateutil matplotlib lxml diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index bddcfa497d9..8e19a311fce 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -17,13 +17,13 @@ mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.26.4.7"; + version = "3.26.4.10"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-of0wsuHWM2mzGQmu9P4AHqXCHew45ywnnv/Al2o47ZM="; + sha256 = "sha256-dWpItV18lYjdwUsn2wwA//AUHU5ICGfmih2cJWihvn0="; }; patches = [ diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 3605e7c416f..3809283e62a 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "0fx9ig08whl7bsii9m1h9wp361ngf1szd8v8yqglgl0x8044fwrk"; + sha256 = "1lykxkqscvpzb7bvl8kfaf23mjhr2kaaqdg0756xx4z1m0smpkgy"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index bf8a9efb9fd..94c47c23afe 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -33,10 +33,6 @@ in mkDerivation { cp sleepyhead/SleepyHead $out/bin ''; - postFixup = lib.optionalString stdenv.isDarwin '' - wrapQtApp "$out/Applications/SleepyHead.app/Contents/MacOS/SleepyHead" - ''; - meta = with lib; { homepage = "https://sleepyhead.jedimark.net/"; description = "Review and explore data produced by CPAP and related machines"; diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index 23605f683a7..a7c0f6f7047 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "slides"; - version = "0.6.2"; + version = "0.7.2"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "sha256-D2ex9/XN5JMKwn+g1cB77UMquYW9NdTzhCCvVtTOBfU="; + sha256 = "02zdgn0pnjqharvmn9rww45yrja8dzww64s3fryxx4pm8g5km9nf"; }; checkInputs = [ @@ -21,7 +21,7 @@ buildGoModule rec { go ]; - vendorSha256 = "sha256-pI5/1LJVP/ZH64Dy2rUoOXM21oqJ8KA0/L8ClGRb5UY="; + vendorSha256 = "06vb5xnss6ibgbsny6cadphfkzw8z3np5qgn3hp2wpf3hxgcnnvs"; ldflags = [ "-s" diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index e20b95922f9..7bbe6581154 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.2.6"; + version = "2.7.1"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9g6rkSDjE7x/YprPX0dkzqgpjgED5qBpUUQoVv6fGkk="; + sha256 = "sha256-fWh345J2fD9uoGrDiVZyEBiOlMy8giEGKHGMujT0mjo="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; diff --git a/pkgs/applications/misc/ssh-tools/default.nix b/pkgs/applications/misc/ssh-tools/default.nix index 8740633262f..2e79f69656f 100644 --- a/pkgs/applications/misc/ssh-tools/default.nix +++ b/pkgs/applications/misc/ssh-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ssh-tools"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "vaporup"; repo = pname; rev = "v${version}"; - sha256 = "0m0x9383p9ab4hdirncmrfha130iasa0v4cbif2y5nbxnxgh101r"; + sha256 = "sha256-PDoljR/e/qraPhG9RRjHx1gBIMtTJ815TZDJws8Qg6o="; }; installPhase = '' diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 93a8d6e088c..ae25ce358de 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.13.34"; + version = "0.13.35"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "0p0nkqvkir6lriq75ingpfywn2yvyn3l35yxzk4aiq6vr2n7h3mw"; + sha256 = "sha256-sXJto2YygPz2B5y7m8uUfOhuRCbKkZGoCmzHOhvH2MU="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "1mzc6rnqcv97dlkl4j4p180f46wlyq45lc6nq7gqw396wc6m04km"; + cargoSha256 = "sha256-mUlwpH2XhVDtjV7ChEqlEUXffOIbips4FzQyGejFvWk="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 63ac88ecac9..8c111ae6aa4 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , fetchpatch -, vala +, vala_0_52 , meson , ninja , pkg-config @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with vala 0.54 + # https://github.com/bleakgrey/tootle/issues/337 + vala_0_52 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 8e84f56c841..0d0d1c394e2 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "0.0.33"; + version = "0.0.36"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-8aa3LYLHjodyYradF2NBuZReHTYBf9TvfVCoDs0gAUw="; + sha256 = "sha256-Ew/nrsJivq/3/vlZnR1gwhqzQQ9YmrW2LPD7qjmPH4A="; }; - vendorSha256 = "sha256-DcMsxqUO9H1q5+njoOuxQ6l8ifSFuS1jdWSvY/5MDm8="; + vendorSha256 = "sha256-Q1H/Y2mDTr24JQMoTf8DL3cj5oF9lH0uaJD2g/0Yxko="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix new file mode 100644 index 00000000000..0809f835668 --- /dev/null +++ b/pkgs/applications/misc/whalebird/default.nix @@ -0,0 +1,61 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: + +stdenv.mkDerivation rec { + pname = "whalebird"; + version = "4.4.5"; + + src = fetchurl { + url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; + sha256 = "sha256-CIlj9Sc/hj2UMgQzfHA3iQYO6EPqcndqkNUCBecHq+E="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + nodePackages.asar + ]; + + buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + buildPhase = '' + runHook preBuild + + # Necessary steps to find the tray icon + asar extract opt/Whalebird/resources/app.asar "$TMP/work" + substituteInPlace $TMP/work/dist/electron/main.js \ + --replace "Mo,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" + asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + mv usr/share opt $out + + substituteInPlace $out/share/applications/whalebird.desktop \ + --replace '/opt/Whalebird' $out/bin + makeWrapper ${electron}/bin/electron $out/bin/whalebird \ + --add-flags $out/opt/Whalebird/resources/app.asar + + runHook postInstall + ''; + + meta = with lib; { + description = "Electron based Mastodon, Pleroma and Misskey client for Windows, Mac and Linux"; + homepage = "https://whalebird.social"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index e57fb75c11f..eb5ebf3a717 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -51,11 +51,6 @@ stdenv.mkDerivation rec { install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg ''; - # wrapQtAppsHook broken on macOS (https://github.com/NixOS/nixpkgs/issues/102044) - postFixup = lib.optionalString stdenv.isDarwin '' - wrapQtApp $out/bin/xpdf - ''; - meta = with lib; { homepage = "https://www.xpdfreader.com"; description = "Viewer for Portable Document Format (PDF) files"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 18de4811af7..ce69121c6ca 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -42,6 +42,7 @@ , zlib , xdg-utils , wrapGAppsHook +, commandLineArgs ? "" }: let @@ -158,6 +159,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + preFixup = '' + # Add command line args to wrapGApp. + gappsWrapperArgs+=(--add-flags ${lib.escapeShellArg commandLineArgs}) + ''; + installCheckPhase = '' # Bypass upstream wrapper which suppresses errors $out/opt/brave.com/brave/brave --version diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index aa77bae2d23..acc11144def 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "95.0.4638.54", - "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry", - "sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a", + "version": "95.0.4638.69", + "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", + "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", "deps": { "gn": { "version": "2021-08-11", @@ -12,15 +12,15 @@ } }, "chromedriver": { - "version": "95.0.4638.17", - "sha256_linux": "0jqq2h3rjancq9gk4w29gcr4b3z4irnkbvcj97fdsnksck9y5h2q", - "sha256_darwin": "0vl73i28xq3z5njg4287j08pb2sfd28amc8hkm4ddq5dgqpim0l8" + "version": "95.0.4638.54", + "sha256_linux": "0p228x7w423p3zqwfdba2jj4x4gkxz4267qzzswpba335p3k1nyk", + "sha256_darwin": "1yxi8c18fa07w8kdm63v4663lhgx1y56957bkqb7hf459bzz594l" } }, "beta": { - "version": "96.0.4664.18", - "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf", - "sha256bin64": "0pm8za2vkl30fn2nclg7cfq2ywn5irbzqb3blawybf3cv4ws8nbi", + "version": "96.0.4664.27", + "sha256": "1ym9llqmkhlnrmawc0dcnzkvr714kykvdcldkar5yqp0x46k7bi6", + "sha256bin64": "1x4y589qmiz0zgkpv17phcl8h5c7qankpfvv6c42w5bysx6mn1f7", "deps": { "gn": { "version": "2021-09-24", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "97.0.4676.0", - "sha256": "1cf660h7n1d4ds63747zfc4wmwxm348grcv40zg614cpjm4q68b5", - "sha256bin64": "116a4d47s3sx1pq8hhqybdsjxcv8657xaldrlix2z7jh94ip2nwh", + "version": "97.0.4682.3", + "sha256": "1z2d3r3d4g3ng1p73s243jllvvfkh085vvqz0vaa6pv7c9631pn4", + "sha256bin64": "0xravg4jjbwj7vifabz94mfammv0zx754hpa6kynjaqzvlxbax2a", "deps": { "gn": { "version": "2021-10-08", @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "95.0.4638.54", - "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry", - "sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a", + "version": "95.0.4638.69", + "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", + "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", "deps": { "gn": { "version": "2021-08-11", @@ -55,8 +55,8 @@ "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" }, "ungoogled-patches": { - "rev": "95.0.4638.54-1", - "sha256": "01jkkz5224aaj5cgdmqknf8v73fyaw4q8bzbqa520a0lvl7hwbg5" + "rev": "95.0.4638.69-1", + "sha256": "19azr4m4rd6za9vgcggijyq9x54jrjp0n07y4falgjrdz9q4f7aj" } } } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 50ada47a444..dbe25ea06a9 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-/VsxMpITBDKJqyMwl1oitS8aUM4AziibV/OHRSHbRjg="; + sha256 = "sha256-vyzuMU2Qfz8DMRP0+QQmSx8J40ADTMJqg2jQOZJQxUA="; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index c8f28b551cd..b0c77819c07 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -50,7 +50,7 @@ , ffmpeg , runtimeShell , mesa # firefox wants gbm for drm+dmabuf -, systemLocale ? config.i18n.defaultLocale or "en-US" +, systemLocale ? config.i18n.defaultLocale or "en_US" }: let @@ -78,7 +78,12 @@ let defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; - source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; + mozLocale = + if systemLocale == "ca_ES@valencia" + then "ca-valencia" + else lib.replaceStrings ["_"] ["-"] systemLocale; + + source = lib.findFirst (sourceMatches mozLocale) defaultSource sources; pname = "firefox-${channel}-bin-unwrapped"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2600b5209bb..a1a215aefcb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -117,9 +117,7 @@ let then overrideCC stdenv llvmPackages.clangUseLLVM else stdenv; - # Disable p11-kit support in nss until our cacert packages has caught up exposing CKA_NSS_MOZILLA_CA_POLICY - # https://github.com/NixOS/nixpkgs/issues/126065 - nss_pkg = if lib.versionOlder version "83" then nss_3_53 else nss.override { useP11kit = false; }; + nss_pkg = if lib.versionOlder version "83" then nss_3_53 else nss; # --enable-release adds -ffunction-sections & LTO that require a big amount of # RAM and the 32-bit memory space cannot handle that linking diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index c0542014b7e..6217862eb15 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-iJ6+tc5nls8E/9/Jp5OS9gfJo8SJ5bN+Im/JzEYEAfI="; + sha256 = "sha256-peBdmz/aucrKO5Vsj8WkHkpGpLm4inQHee133Zph3MM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index c959dd61bad..338d0b3b9f3 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.9.2"; + version = "2021.10.5"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-UAx3DY8d3I1g7DuNmBu4w+3NGUQqDdcScXdtq/VkpJ8="; + sha256 = "sha256-vz7S6Qzr10Idy83ogMIHEHrjxGxxjtFnzNsuhbZqUnA="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 91ccf67f557..4e4d47733c7 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "argocd"; - version = "2.1.2"; - commit = "7af9dfb3524c13e941ab604e36e49a617fe47d2e"; + version = "2.1.6"; + commit = "a346cf933e10d872eae26bff8e58c5e7ac40db25"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "1pr48z1qhv7xxnllr00zz2v0ygxmq2hjdyk0j3zazflnqr2mc596"; + sha256 = "sha256-8DeVO7Wr1bFZXTp2kaEPizDwNU5ZsA1fykccaDUivh8="; }; vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc="; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 5984710d8c2..2351b41369e 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "05qc1fcf4ahl1zvxv92mq3awiy5b1rq6r9l896b4hkp0m5lx9m3c"; + sha256 = "sha256-vIm5PkRyh41jtvDrLDxFVzSkhFipYYYEEY0/qxbOXGE="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 0867306e2f9..6065b8ad741 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.19.1"; - sha256 = "184f5q3aa4p6gjdmr8x6a97rzaj64ws8bf3q8sz4xjyznznwcpp0"; - manifestsSha256 = "1xxf572yvjmik7dvijz810lxzfj7irddznl4icidn7hrljzjrv95"; + version = "0.20.1"; + sha256 = "1cbppkfw5jb0w36jjg32a4kffq616zdmib4kdhny4wwgskq4b2ng"; + manifestsSha256 = "0hwza39a31fjk37lgd0bdk8ja46sradyvkrnq2ad587zr8a8ddvb"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -23,7 +23,7 @@ buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-1ZIeS42LoreZKkzDNZxmF17HeDWWVo49CaZDrIR2U9g="; + vendorSha256 = "sha256-pY+fTOZocHygT8GdRQGOujr+Pik2f21H8cqIFBKvzYQ="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index aa0abbae429..47da659d7e1 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.7.5"; + version = "3.7.7"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-QJXCVcEf23oaTDemoCV/2aaajbubfXg0AfZrlSTS4Ag="; + sha256 = "sha256-duNkvRMq3CKAGDDsrDWKydFZRt6fxuO0uP2Ff3HA+ek="; }; vendorSha256 = "sha256-4imZrZfpR/5tw9ZFSTr7Gx4G9O1iHNE9YRYMOJFKvHU="; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 662f9df0305..9d59bdfe088 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -13,7 +13,6 @@ , pkg-config , ethtool , util-linux -, ipset , fetchFromGitHub , fetchurl , fetchzip @@ -257,7 +256,6 @@ stdenv.mkDerivation rec { bridge-utils ethtool util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 - ipset conntrack-tools ]; diff --git a/pkgs/applications/networking/cluster/kumactl/default.nix b/pkgs/applications/networking/cluster/kumactl/default.nix new file mode 100644 index 00000000000..d13db27444f --- /dev/null +++ b/pkgs/applications/networking/cluster/kumactl/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "kumactl"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "kumahq"; + repo = "kuma"; + rev = version; + sha256 = "0b554cngg2j3wnadpqwhq3dv3la8vvvzyww2diw4il4gl4j6xj0j"; + }; + + vendorSha256 = "0r26h4vp11wbl7nk3y7c22p60q7lspy8nr58khxyczdqjk6wrdjp"; + + subPackages = [ "app/kumactl" ]; + + ldflags = let + prefix = "github.com/kumahq/kuma/pkg/version"; + in [ + "-s" "-w" + "-X ${prefix}.version=${version}" + "-X ${prefix}.gitTag=${version}" + "-X ${prefix}.gitCommit=${version}" + "-X ${prefix}.buildDate=${version}" + ]; + + meta = with lib; { + description = "Kuma service mesh controller"; + homepage = "https://kuma.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ zbioe ]; + }; +} diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 51dced0af28..958640af659 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.11.0"; - sha256 = "172in8vmr7c5sff111rrd5127lz2pv7bbh7p399xafnk8ri0fx2i"; + version = "2.11.1"; + sha256 = "09zwxcaqn537ls737js7rcsqarapw5k25gv41d844k73yvxm882c"; vendorSha256 = "sha256-c3EyVrblqtFuoP7+YdbyPN0DdN6TcQ5DTtFQ/frKM0Q="; } diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index b82b6cf610d..13d15d0bf61 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "981a3ffd4368600eb1a5bca3f12a251e80895d37"; +let rev = "08bb70f407d0334fa80b9dbc6850987f16eb27d3"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.53.2"; # Do not forget to update `rev` above + version = "0.54.0"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -17,10 +17,10 @@ buildGoModule rec { ]; src = fetchFromGitHub { - sha256 = "sha256-8bUZsknG1Z2TKWwtuJtnauK8ibikGphl3oiLXT3PZzY="; - rev = "v${version}"; - repo = "sonobuoy"; owner = "vmware-tanzu"; + repo = "sonobuoy"; + rev = "v${version}"; + sha256 = "sha256-Gtpky+zkFKukIIHF91F4uBZjaguk8KlOEVhSwTj+ccs="; }; vendorSha256 = "sha256-Lkwv95BZa7nFEXk1KcwXIRVpj9DZmqnWjkdrZkO/k24="; diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index 44ceb3f1622..50efacfd62e 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-docs"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PzGlEEhootf2SCOy7+11aST7NMTNhNMQWeZO40mrMYQ="; + sha256 = "sha256-zSSK2WfcbD1DvqsFUKdTydLfyApWzm1h+ihSnLUmq2E="; }; - vendorSha256 = "sha256-T/jgFPBUQMATX7DoWsDR/VFjka7Vxk7F4taE25cdnTk="; + vendorSha256 = "sha256-0Bkjx/gq2MAWjxoMSGtBcRzv40SSUVDZBh4PzEtKj5o="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 54959e45831..35493aa31b7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -57,6 +57,7 @@ let libvirt = callPackage ./libvirt { }; linuxbox = callPackage ./linuxbox { }; lxd = callPackage ./lxd { }; + teleport = callPackage ./teleport { }; vpsadmin = callPackage ./vpsadmin { }; vercel = callPackage ./vercel { }; } // (lib.optionalAttrs (config.allowAliases or false) { diff --git a/pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix b/pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix new file mode 100644 index 00000000000..733d1540874 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "terraform-provider-teleport"; + version = "7.3.0"; + + src = fetchFromGitHub { + owner = "gravitational"; + repo = "teleport-plugins"; + rev = "v${version}"; + sha256 = "19zn78nn64gc0nm7ycblzi4549a0asql07pfxvrphi6s9fjr5m3y"; + }; + vendorSha256 = null; + + sourceRoot = "source/terraform"; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = '' + mv $NIX_BUILD_TOP/go/bin/{terraform,terraform-provider-teleport_v${version}} + ''; + + passthru.provider-source-address = "gravitational.com/teleport/teleport"; + + meta = with lib; { + description = "Provider for managing resources in Teleport, a SSH CA management suite"; + homepage = "https://github.com/gravitational/teleport-plugins"; + license = licenses.asl20; + maintainers = with maintainers; [ justinas ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ba034056c95..8dfc8c701e3 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,8 +195,8 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.9"; - sha256 = "0g97l53xrcafjrzz5inij4q4aaadibn5ilr5j39a6569pkvcvsh3"; + version = "1.0.10"; + sha256 = "1jcgp9q99785m85754ipza7b3dd3g58adpnyh5w2imqj01cas6mb"; vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e07b9b88ddc..f2ae9a9490a 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.35.1"; + version = "0.35.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DCum3vCrN530Z0VW0WEoLtjN+kre/mU9O+sJxckZgfc="; + sha256 = "sha256-VUB1zZwRZ+TUFDcq/lBB9eAeM7d5zWhFy7nxzH5S6oc="; }; vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0="; diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/applications/networking/cluster/terranix/default.nix index 89a96cc12ca..d06393718a4 100644 --- a/pkgs/applications/networking/cluster/terranix/default.nix +++ b/pkgs/applications/networking/cluster/terranix/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - pname = "terranix"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "030067h3gjc02llaa7rx5iml0ikvw6szadm0nrss2sqzshsfimm4"; + sha256 = "sha256-3N4a5VhZqIgJW11w8oJKJ9T8mhfwEM33kEwV/zZkCs8="; }; installPhase = '' diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 289f631ee8f..65835aa10cf 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "0qb10w7pn9hiczjjpc0xanmc83p22ngcqcrkjwji5rl0sh8v9ii4"; + sha256 = "sha256-TAnGDxTKYl4niouS6nYdJDaIngAPsPHr9Bw9L3cR2Xk="; }; - cargoSha256 = "0vhr8qyw4f3lc208mgl1m3z42igkbwly6wcv7g7jrq3c6dcwyhjn"; + cargoSha256 = "sha256-MxoyYBLbrCuLVa0p8JrYKSKu2oFPnXMwab42lhhAu48="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 7fd2a9684ae..c3c58dc0756 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.0.2"; + version = "4.0.4"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-Q2yVprIB8YeB8bCAau1H2m8QOidX1RrMIRET/fXyNi4="; + sha256 = "sha256-c6+SlZx3ACG0nJRW+zcDDzVd/oSLAdSaq2fHrPpt6zw="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 424c6772104..145fae2553a 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkgs -, autoconf, automake, curl, iprange, iproute2, ipset, iptables, iputils +, autoconf, automake, curl, iprange, iproute2, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, util-linux, whois # If true, just install FireQOS without FireHOL @@ -35,13 +35,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - curl iprange iproute2 ipset iptables iputils kmod + curl iprange iproute2 iptables iputils kmod nettools procps tcpdump traceroute util-linux whois ]; preConfigure = "./autogen.sh"; configureFlags = [ "--localstatedir=/var" - "--disable-doc" "--disable-man" ] ++ + "--disable-doc" "--disable-man" + "--disable-update-ipsets" ] ++ lib.optional onlyQOS [ "--disable-firehol" ]; meta = with lib; { diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 96ed5a86a16..22fd08e3f4a 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.140"; + version = "3.1.149"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "15ngmpqqx902l7gxg2lb6h8q8vmjk247jbqhc92l1apr1imjqcc5"; + sha256 = "1yrb8cfrc6y7gpfgzn0q6ldx9vk06qp229wjs4q8rccp72p6d6gg"; }; postPatch = '' @@ -32,38 +32,36 @@ python3Packages.buildPythonApplication rec { # See https://github.com/Flexget/Flexget/blob/master/requirements.in APScheduler beautifulsoup4 - cherrypy - colorama - colorclass feedparser - flask-compress - flask-cors - flask_login - flask-restful - flask-restx - flask - greenlet guessit html5lib jinja2 jsonschema loguru more-itertools - progressbar + psutil pynzb - pyparsing PyRSS2Gen python-dateutil pyyaml rebulk requests + rich rpyc - sgmllib3k sqlalchemy - terminaltables + + # WebUI requirements + cherrypy + flask-compress + flask-cors + flask_login + flask-restful + flask-restx + flask + pyparsing zxcvbn - psutil - # plugins + + # Plugins requirements transmission-rpc ]; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index 3e0a20a371c..8d0b9915d0d 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { @@ -14,6 +15,17 @@ buildGoModule rec { sha256 = "sha256-1gOixuOvPHEjnnDNNda9sktnhffovOfeG4XDrLRRMlE="; }; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd gmailctl \ + --bash <($out/bin/gmailctl completion bash) \ + --fish <($out/bin/gmailctl completion fish) \ + --zsh <($out/bin/gmailctl completion zsh) + ''; + vendorSha256 = "sha256-Yv3OGHFOmenst/ujUgvCaSEjwwBf3W9n+55ztVhuWjo="; doCheck = false; diff --git a/pkgs/applications/networking/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix index 89c04508b70..037feccca4e 100644 --- a/pkgs/applications/networking/hyprspace/default.nix +++ b/pkgs/applications/networking/hyprspace/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hyprspace"; - version = "0.1.6"; + version = "0.1.7"; propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; @@ -10,10 +10,10 @@ buildGoModule rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-g0oyI3jnqQADyOrpnK4IvpFQPEwNrpvyDS+DhBDXZGg="; + sha256 = "sha256-Ecdxs6see4uexY6DatZ/VSGgWR81zRjo3AeAsXSjJ4A="; }; - vendorSha256 = "sha256-rw75xNBBV58F+HBVtD/EslPWxZxLbI3/mJVdJF4usKI="; + vendorSha256 = "sha256-nFiBHhtvTu9Ya6n1KUF+pOXrksHMOph7ABVtGSWVWlo="; meta = with lib; { description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks."; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 99e3a90b60b..7a241519937 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -16,9 +16,6 @@ mkDerivation rec { mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" ''; - postFixup = lib.optionalString stdenv.isDarwin '' - wrapQtApp "$out/Applications/chatterino.app/Contents/MacOS/chatterino" - ''; meta = with lib; { description = "A chat client for Twitch chat"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index ced3dcf5fe4..2b6cb9969e8 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -21,11 +21,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "1vjzv8zg9s393xw81klcgbkn4h6j2blzla9iil5kqfrw7wmldskh"; + sha256 = "1337qkpcv7j0fgws9scnk82mn2l7s17060vmrbh3ihinmxmbxg6x"; }; buildInputs = [ @@ -57,9 +57,6 @@ python3.pkgs.buildPythonApplication rec { checkInputs = [ xvfb-run dbus.daemon ]; checkPhase = '' - # https://dev.gajim.org/gajim/gajim/-/issues/10478 - rm test/lib/gajim_mocks.py test/unit/test_gui_interface.py - xvfb-run dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ ${python3.interpreter} setup.py test diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 10cbcb6c1d2..8af6811d6a5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, imagemagick, gettext, pidgin, json-glib }: stdenv.mkDerivation { pname = "purple-discord"; - version = "unstable-2018-04-10"; + version = "unstable-2021-10-17"; src = fetchFromGitHub { owner = "EionRobb"; repo = "purple-discord"; - rev = "9a97886d15a1f028de54b5e6fc54e784531063b0"; - sha256 = "0dc344zh1v4yh9c8javcw5ylzwc1wpx0ih8bww8p8cjmhr8kcl32"; + rev = "b7ac72399218d2ce011ac84bb171b572560aa2d2"; + sha256 = "0xvj9rdvgsvcr55sk9m40y07rchg699l1yr98xqwx7sc2sba3814"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ imagemagick gettext ]; buildInputs = [ pidgin json-glib ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 341d9e1d840..a7ea5bee308 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -10,6 +10,7 @@ , gnutls ? null , libgcrypt ? null , plugins, symlinkJoin +, cacert }: # FIXME: clean the mess around choosing the SSL library (nss by default) @@ -59,6 +60,7 @@ let unwrapped = stdenv.mkDerivation rec { "--with-nss-includes=${nss.dev}/include/nss" "--with-nss-libs=${nss.out}/lib" "--with-ncurses-headers=${ncurses.dev}/include" + "--with-system-ssl-certs=${cacert}/etc/ssl/certs" "--disable-meanwhile" "--disable-nm" "--disable-tcl" diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 359c0fa7aac..268a077e7c5 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -3,7 +3,6 @@ , lib , fetchFromGitHub , cmake -, qtbase , qtquickcontrols , qtquickcontrols2 , qtkeychain @@ -15,19 +14,17 @@ mkDerivation rec { pname = "quaternion"; - version = "0.0.95"; + version = "0.0.95.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = version; - sha256 = "sha256-WqhHqo4ySxufulC+TxS2ko2R5hUiORgdNAkp5Awdcw8="; + sha256 = "sha256-6FLj/hVY13WO7sMgHCHV57eMJu39cwQHXQX7m0lmv4I="; }; buildInputs = [ - qtbase qtmultimedia - qtquickcontrols qtquickcontrols2 qtkeychain libquotient @@ -47,11 +44,10 @@ mkDerivation rec { ''; meta = with lib; { - description = - "Cross-platform desktop IM client for the Matrix protocol"; + description = "Cross-platform desktop IM client for the Matrix protocol"; homepage = "https://matrix.org/docs/projects/client/quaternion.html"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - inherit (qtbase.meta) platforms; + inherit (qtquickcontrols2.meta) platforms; }; } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json new file mode 100644 index 00000000000..299598063c0 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -0,0 +1,6 @@ +{ + "version": "1.9.0-sc.1", + "srcHash": "10swz5gwz1izryzllmjm8mhhd0vqk2cp8qjcmmr5gbzspj7p3xgw", + "webYarnHash": "134llyh0197andpnbmfcxnidcgi3xxnb9v10bwfvrqysgnhb5z8v", + "desktopYarnHash": "150jc6p9kbdz599bdkinrhbhncpamhz35j6rcc008qxg2d9qfhwr" +} diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix new file mode 100644 index 00000000000..4e1d330f500 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -0,0 +1,128 @@ +{ lib +, element-desktop # for seshat and keytar +, schildichat-web +, stdenv +, fetchgit +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, fetchYarnDeps +, yarn, nodejs, fixup_yarn_lock +, electron +, Security +, AppKit +, CoreServices + +, useWayland ? false +}: + +let + pinData = lib.importJSON ./pin.json; + executableName = "schildichat-desktop"; + electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; +in +stdenv.mkDerivation rec { + pname = "schildichat-desktop"; + inherit (pinData) version; + + src = fetchgit { + url = "https://github.com/SchildiChat/schildichat-desktop/"; + rev = "v${version}"; + sha256 = pinData.srcHash; + fetchSubmodules = true; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/element-desktop/yarn.lock"; + sha256 = pinData.desktopYarnHash; + }; + + nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper copyDesktopItems ]; + inherit (element-desktop) seshat keytar; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + pushd element-desktop + yarn config --offline set yarn-offline-mirror $offlineCache + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + rm -rf node_modules/matrix-seshat node_modules/keytar + ln -s $keytar node_modules/keytar + ln -s $seshat node_modules/matrix-seshat + patchShebangs node_modules/ + popd + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + pushd element-desktop + npx tsc + yarn run i18n + node ./scripts/copy-res.js + popd + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + # resources + mkdir -p "$out/share/element" + ln -s '${schildichat-web}' "$out/share/element/webapp" + mv element-desktop "$out/share/element/electron" + cp -r "$out/share/element/electron/res/img" "$out/share/element" + cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json + ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json + + # icons + for icon in $out/share/element/electron/build/icons/*.png; do + mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/schildichat.png" + done + + # executable wrapper + makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ + --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" + + runHook postInstall + ''; + + # Do not attempt generating a tarball for element-web again. + # note: `doDist = false;` does not work. + distPhase = ";"; + + # The desktop item properties should be kept in sync with data from upstream: + # https://github.com/schildichat/element-desktop/blob/sc/package.json + desktopItems = [ + (makeDesktopItem { + name = "schildichat-desktop"; + exec = "${executableName} %u"; + icon = "schildichat"; + desktopName = "SchildiChat"; + genericName = "Matrix Client"; + comment = meta.description; + categories = "Network;InstantMessaging;Chat;"; + extraEntries = '' + StartupWMClass=schildichat + MimeType=x-scheme-handler/element; + ''; + }) + ]; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Matrix client / Element Desktop fork"; + homepage = "https://schildi.chat/"; + changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix new file mode 100644 index 00000000000..015c44e428b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -0,0 +1,86 @@ +{ stdenv, lib +, fetchgit +, fetchYarnDeps +, nodejs +, yarn +, fixup_yarn_lock +, writeText, jq, conf ? {} +}: + +let + pinData = builtins.fromJSON (builtins.readFile ./pin.json); + noPhoningHome = { + disable_guests = true; # disable automatic guest account registration at matrix.org + }; + configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); + +in stdenv.mkDerivation rec { + pname = "schildichat-web"; + inherit (pinData) version; + + src = fetchgit { + url = "https://github.com/SchildiChat/schildichat-desktop/"; + rev = "v${version}"; + sha256 = pinData.srcHash; + fetchSubmodules = true; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/element-web/yarn.lock"; + sha256 = pinData.webYarnHash; + }; + + nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$PWD/tmp + mkdir -p $HOME + pushd element-web + yarn config --offline set yarn-offline-mirror $offlineCache + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + rm -rf node_modules/matrix-react-sdk + patchShebangs node_modules/ ../matrix-react-sdk/scripts/ + ln -s $PWD/../matrix-react-sdk node_modules/ + ln -s $PWD/node_modules ../matrix-react-sdk/ + popd + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + pushd matrix-react-sdk + node_modules/.bin/reskindex -h ../element-web/src/header + popd + + pushd element-web + node scripts/copy-res.js + node_modules/.bin/reskindex -h ../element-web/src/header + node_modules/.bin/webpack --progress --mode production + popd + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mv element-web/webapp $out + jq -s '.[0] * .[1]' "configs/sc/config.json" "${configOverrides}" > "$out/config.json" + + runHook postInstall + ''; + + meta = { + description = "Matrix client / Element Web fork"; + homepage = "https://schildi.chat/"; + changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/pkgs/applications/networking/instant-messengers/schildichat/update.sh new file mode 100755 index 00000000000..3f5289de8c4 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/schildichat/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq + +if [[ "$#" -gt 1 || "$1" == -* ]]; then + echo "Regenerates packaging data for the SchildiChat packages." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +# strip leading "v" +version="${version#v}" + +src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev v${version}) +src=$(echo $src_data | jq -r .path) +src_hash=$(echo $src_data | jq -r .sha256) + +web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock) +desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) + +cat > pin.json << EOF +{ + "version": "$version", + "srcHash": "$src_hash", + "webYarnHash": "$web_yarn_hash", + "desktopYarnHash": "$desktop_yarn_hash" +} +EOF diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index ea5ca8bebfa..e83e45370cd 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.7.3"; + version = "1.7.4"; in appimageTools.wrapType2 { name = "session-desktop-appimage-${version}"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "0s0zvj9ddrngdzsx8hd07pq3150sq8ab1hbpsi9i2ir99sv1p7gn"; + sha256 = "1yjah9ip3r2irvv2g9j0ql55nkmpwml7lngmq954xrkq9smrdrm5"; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 7be5d62312d..01a214bed23 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,6 +10,7 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' +, sqlcipher }: let @@ -21,9 +22,43 @@ let in lib.optionalString (spellcheckerLanguage != null) '' --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ --set LC_MESSAGES "${spellcheckerLanguage}"''); + + sqlcipher-signal = sqlcipher.overrideAttrs (_: { + # Using the same features as the upstream signal sqlcipher build + # https://github.com/signalapp/better-sqlite3/blob/2fa02d2484e9f9a10df5ac7ea4617fb2dff30006/deps/defines.gypi + CFLAGS = [ + "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS" + "-DSQLITE_THREADSAFE=2" + "-DSQLITE_USE_URI=0" + "-DSQLITE_DEFAULT_MEMSTATUS=0" + "-DSQLITE_OMIT_DEPRECATED" + "-DSQLITE_OMIT_GET_TABLE" + "-DSQLITE_OMIT_TCL_VARIABLE" + "-DSQLITE_OMIT_PROGRESS_CALLBACK" + "-DSQLITE_OMIT_SHARED_CACHE" + "-DSQLITE_TRACE_SIZE_LIMIT=32" + "-DSQLITE_DEFAULT_CACHE_SIZE=-16000" + "-DSQLITE_DEFAULT_FOREIGN_KEYS=1" + "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1" + "-DSQLITE_ENABLE_COLUMN_METADATA" + "-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" + "-DSQLITE_ENABLE_STAT4" + "-DSQLITE_ENABLE_FTS5" + "-DSQLITE_ENABLE_JSON1" + "-DSQLITE_ENABLE_RTREE" + "-DSQLITE_INTROSPECTION_PRAGMAS" + + # SQLCipher-specific options + "-DSQLITE_HAS_CODEC" + "-DSQLITE_TEMP_STORE=2" + "-DSQLITE_SECURE_DELETE" + ]; + + LDFLAGS = [ "-lm" ]; + }); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.20.0"; # Please backport all updates to the stable channel. + version = "5.22.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +68,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0a57gajxjqkp7zcmjc3iiys06b7v53nd81gkwrsfn2gmshihlzkd"; + sha256 = "1y88qw57wk187fjb05zqvagv4pamc8171xwvznqb2k0vclsg82j8"; }; nativeBuildInputs = [ @@ -115,15 +150,10 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - # Required for $SQLCIPHER_LIB which contains "/build/" inside the path: - noAuditTmpdir = true; - preFixup = '' - export SQLCIPHER_LIB="$out/lib/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node" - test -x "$SQLCIPHER_LIB" # To ensure the location hasn't changed gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" - --prefix LD_PRELOAD : "$SQLCIPHER_LIB" + --prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so" ${customLanguageWrapperArgs} ) diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index a26fbed2a04..649cc8843d2 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,17 +1,15 @@ -{ lib, stdenv, fetchurl, fetchgit, jre_headless, coreutils, gradle_6, git, perl +{ lib, stdenv, fetchurl, fetchFromGitLab, jre_headless, coreutils, gradle_6, git, perl , makeWrapper }: let pname = "signald"; + version = "0.14.1"; - version = "0.13.1"; - - # This package uses the .git directory - src = fetchgit { - url = "https://gitlab.com/signald/signald"; + src = fetchFromGitLab { + owner = pname; + repo = pname; rev = version; - sha256 = "1ilmg0i1kw2yc7m3hxw1bqdpl3i9wwbj8623qmz9cxhhavbcd5i7"; - leaveDotGit = true; + sha256 = "K/G5+w1GINLZwJIG5a7u0TxlGe+Cyp4wQm+pgm28qCA="; }; buildConfigJar = fetchurl { @@ -19,8 +17,6 @@ let sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f"; }; - patches = [ ./git-describe-always.patch ./gradle-plugin.patch ]; - postPatch = '' patchShebangs gradlew sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle @@ -29,7 +25,7 @@ let # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { name = "${pname}-deps"; - inherit src version postPatch patches; + inherit src version postPatch; nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -45,11 +41,17 @@ let forceShare = [ "dummy" ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0w8ixp1l0ch1jc2dqzxdx3ljlh17hpgns2ba7qvj43nr4prl71l7"; + # Downloaded jars differ by platform + outputHash = { + x86_64-linux = "/gJFoT+vvdSWr33oI44XiZXlFfyUjtRVB1M6CMzSztM="; + aarch64-linux = "v71stMWBbNALasfGAHvsVTBaDOZfpKK3sQrjNJ6FG1A="; + }.${stdenv.system} or (throw "Unsupported platform"); }; in stdenv.mkDerivation rec { - inherit pname src version postPatch patches; + inherit pname src version postPatch; + + patches = [ ./gradle-plugin.patch ]; buildPhase = '' runHook preBuild @@ -90,6 +92,6 @@ in stdenv.mkDerivation rec { homepage = "https://signald.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ expipiplus1 ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch b/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch deleted file mode 100644 index 2f4830e27dd..00000000000 --- a/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/version.sh b/version.sh -index 7aeeb3c..060cba3 100755 ---- a/version.sh -+++ b/version.sh -@@ -1,3 +1,3 @@ - #!/bin/sh --VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --abbrev=0)..HEAD --count) -+VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --always --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --always --abbrev=0)..HEAD --count) - echo $VERSION diff --git a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch b/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch index 6952654758d..fec988a94e7 100644 --- a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch +++ b/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch @@ -2,7 +2,7 @@ diff --git a/build.gradle b/build.gradle index 11d7a99..66805bb 100644 --- a/build.gradle +++ b/build.gradle -@@ -3,9 +3,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal +@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.xml.sax.SAXParseException @@ -17,10 +17,3 @@ index 11d7a99..66805bb 100644 apply plugin: 'java' apply plugin: 'application' -@@ -185,4 +188,4 @@ task integrationTest(type: Test) { - testClassesDirs = sourceSets.integrationTest.output.classesDirs - classpath = sourceSets.integrationTest.runtimeClasspath - outputs.upToDateWhen { false } --} -\ No newline at end of file -+} diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix index e7ca8c320ac..7cb9798517d 100644 --- a/pkgs/applications/networking/instant-messengers/tangram/default.nix +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tangram"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Tangram"; rev = "v${version}"; - sha256 = "0bhs9s6c2k06i3cx01h2102lgl7g6vxm3k63jkkhh2bwdpc9kvn3"; + sha256 = "sha256-WI0H3bforQ6Jc/+TWFT1zUs4KRtWwvXY2/va+Fnd+iU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index d39ac978d8d..5cbb2d97470 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -29,6 +29,7 @@ , webkitgtk , jemalloc , rnnoise +, abseil-cpp # Transitive dependencies: , util-linuxMinimal , pcre @@ -57,7 +58,11 @@ # - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template let - tg_owt = callPackage ./tg_owt.nix { }; + tg_owt = callPackage ./tg_owt.nix { + abseil-cpp = abseil-cpp.override { + cxxStandard = "17"; + }; + }; in mkDerivation rec { pname = "telegram-desktop"; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 172d11f6b85..477e5442b82 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -34,7 +34,6 @@ mkDerivation rec { mkdir -p $out/Applications cp -r tensor.app $out/Applications/tensor.app - wrapQtApp $out/Applications/tensor.app/Contents/MacOS/tensor runHook postInstall '' else '' diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix new file mode 100644 index 00000000000..30bfde7a96f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, alsa-lib, glibc, gtk3, libxshmfence, mesa, nss }: + +stdenv.mkDerivation rec { + pname = "threema-desktop"; + version = "1.0.3"; + + src = fetchurl { + # As Threema only offers a Latest Release url, the plan is to upload each + # new release url to web.archive.org until their Github releases page gets populated. + url = "https://web.archive.org/web/20211027194646/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + sha256 = "sha256-qiFv52nnyfHxCWTePmyxW/MgzFy3EUxmW6n+UIkw7tk="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ alsa-lib glibc gtk3 libxshmfence mesa nss ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + # Can't unpack with the common dpkg-deb -x method + dpkg --fsys-tarfile $src | tar --extract + ''; + + installPhase = '' + runHook preInstall + + # This will cause confusion, not needed + rm -r usr/bin + mv usr $out + + runHook postInstall + ''; + + postFixup = '' + mv $out/share/applications/threema.desktop $out/share/applications/threema-desktop.desktop + makeWrapper ${electron}/bin/electron $out/bin/threema \ + --add-flags $out/lib/threema/resources/app.asar + ''; + + meta = with lib; { + description = "Desktop client for Threema, a privacy-focused end-to-end encrypted mobile messenger"; + homepage = "https://threema.ch"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index e5a2c201d87..4392f587995 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "utox"; - version = "0.17.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"; + sha256 = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 03a34a69a72..d04f2d18f97 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.8.0.16"; + version = "5.8.3.145"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "1axnh81bf3ab5gzxxqm172wpqlpfbj9a2h3cry3kyxzmrihzbwdm"; + sha256 = "1p4agpbcpk95r04m775dr17fmlm18vxq9mb65pyfbhvsd1ypw6kr"; }; }; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index 6ef9ec32538..3ec1cccd0d6 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -5,6 +5,6 @@ set -eu -o pipefail version="$(curl -Ls https://zoom.us/download\?os\=linux | \ pup '.linux-ver-text text{}' | \ - awk -F'[ ().]' '{printf $2"."$3"."$6"."$7"\n"}')" + awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')" update-source-version zoom-us "$version" diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 9148a26567d..df7168ac308 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { install_name_tool \ -add_rpath @executable_path/../Frameworks \ $out/Applications/Communi.app/Contents/MacOS/Communi - - wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi '' else '' substituteInPlace "$out/share/applications/communi.desktop" \ --replace "/usr/bin" "$out/bin" diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index baad7602cf0..432544c60c6 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.42.0"; + version = "3.42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1byi1ksimbycd0daxp5j240r3n5qlaa4b3c5l9jzkjr9g3gkclsq"; + sha256 = "nCvGMSfDS0GUQfF8zomVq+gKf9H72X896zptRy9/Xy0="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 564a4c5499e..34b25c17a25 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.42.0"; + version = "3.42.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yj2hifis5m2cy59skn07d8n69444vlsw62ildr1fv67zxbblib8"; + sha256 = "RlMq46E6aIV3GtEiNLlBQRZ67HRyOn7tE9293a767kU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 5eeec874dee..6d5ab96b4ed 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib +, fetchpatch }: stdenv.mkDerivation rec { - version = "20211022"; + version = "20211029"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-gPMbl+g9tU7YmT3uJoJozCdDBb/4eFyVyvHdREK1Ss0="; + sha256 = "sha256-haPDZorAfKuIEMiBCXJRMALAYnurQyjmCSOnj9IsoKk="; }; buildInputs = [ @@ -24,6 +25,15 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m ]; + patches = [ + # Remove on next update, see + # https://github.com/NixOS/nixpkgs/pull/143641#issuecomment-954991746 for context. + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/4242a31313e0b600693215c01047bbda8a6dd25a.patch"; + sha256 = "sha256-fcuNeBkPjqln5QA9VFcfXCQD/VrUoSEMSxQ//Xj+yxY="; + }) + ]; + enableParallelBuilding = true; postPatch = '' diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 19354df40ad..4b357324889 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.88.4"; + version = "3.89.5"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-UOb63+NfW6mHKaj3PDEzvz5hcmJBIISq02rtwgSZMjo="; + sha256 = "sha256-DBqeLoHPr/OwiA3cWO5MYoHSBqrEmP8j8q+rd50hYH8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index a14e55e51f2..e2bf0b134d5 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.15"; + version = "1.4.16"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-P1KytdS8WO2TzwsRRs7k903oHCwHol7gMu+mWUZaAnA="; + sha256 = "sha256-hw61cerm0j+5KtDITXnenDjF9iTjYUk31XS/5Jumh/k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 884e5a644fc..d87d23be429 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.17"; + version = "1.8.18"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-D92+dMGp3PZGG0obDbPk00JmGEUAxAPX8QetQttOxNM="; + sha256 = "sha256-FPxirzfr3MXtGaJFoF64N27+cBYRjwDJxZS8mZ1VYKU="; }; patches = [ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 2fa486b83a9..4a5b5708aac 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.4"; + version = "2021.5"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-JnHG4qD6nH2l7RCYHmb7Uszn0mrMsFtMHQ3cKpXcq00="; + sha256 = "186va4pllimmcqnlbry5ni8gi8p3mbpgjf7sdspmhy2hlfjvlz47"; }; nativeBuildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { mv usr/bin/* $out/bin mv opt/Mullvad\ VPN/* $out/share/mullvad - sed -i 's|\/opt\/Mullvad.*VPN|'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop + sed -i 's|\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 '$out'/bin|g' $out/share/applications/mullvad-vpn.desktop ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ Br1ght0ne ymarkus ]; + maintainers = with maintainers; [ Br1ght0ne ymarkus flexagoon ]; }; } diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/applications/networking/p2p/rqbit/default.nix index 0a77a64916e..0220b12bd4b 100644 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/pkgs/applications/networking/p2p/rqbit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - sha256 = "1dyf1sjfiwrrigk1186mzvx5vn196h45imvily394ky2di633av5"; + sha256 = "0b9wxjwnhhs3vi1x55isdqck67lh1r7nf3dwmhlwcg5887smwp5c"; }; - cargoSha256 = "02z5gdmir1x80axnv516hs00478c7zbb30rdsbs966yh1725w12z"; + cargoSha256 = "1s278d73mwqpq3n5vmrn5jb6g5dafaaplnhs8346pwcc6y16w3d3"; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 6c09043a65b..8b1a668090b 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -7,25 +7,15 @@ python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.11.2a0"; + version = "0.12.2a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "05dn6mr86ly65gdqarl16a2jk1bwiw5xa6r4kyag3s6lqsv66iw8"; + sha256 = "0sk4vgj3cn75nyrng2d6q0pj1h968kcmbpr9sv1lj1g8fc7g0n4f"; }; - # urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged - # in nixpkgs) is not uploaded to pypi and 1.0.1 has a problematic `setup.py`. - # As long as we don't have any problems installing it, no special features / specific bugs - # were fixed in 1.0.3 that aren't available in 1.0.2 are used by stig. - # See https://github.com/rndusr/stig/issues/120 - postPatch = '' - substituteInPlace setup.py \ - --replace "urwidtrees>=1.0.3dev0" "urwidtrees" - ''; - propagatedBuildInputs = with python3Packages; [ urwid urwidtrees @@ -62,7 +52,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index e5c17581cb5..01e119dafc1 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.84"; + version = "2.85"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "sha256-l3giWCMymUk5z4r4sEBZoeCh3K8jAp8TSf+xvhjeAEU="; + sha256 = "sha256-grmJ52x2NcsgXw5BWrEGF9+7TYS/45HgHUXuZB+hVK4="; }; installPhase = '' diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index ee92f4727c7..1bbf3d6554f 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,90 +1,54 @@ -{ lib, fetchFromGitHub, makeDesktopItem, makeWrapper, imagemagick -, python3Packages, wrapGAppsHook, protonvpn-cli, gtk3, pango -, gobject-introspection, libnotify, libappindicator-gtk3 -, procps, openvpn }: +{ lib, fetchFromGitHub, gobject-introspection, imagemagick, +wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }: -let - extraPath = lib.makeBinPath [ procps openvpn ]; - -in python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "protonvpn-linux-gui"; - version = "2.1.1"; + version = "1.4.1"; src = fetchFromGitHub { - owner = "protonvpn"; - repo = "linux-gui"; - rev = "v${version}"; - sha256 = "avo5/2eq53HSHCnnjtxrsmpURtHvxmLZn2BxActImGY="; - }; - - desktopItem = makeDesktopItem { - name = "ProtonVPN"; - desktopName = "ProtonVPN GUI"; - type = "Application"; - exec = "protonvpn-gui"; - icon = "protonvpn"; - categories = "Network;"; - terminal = "false"; - }; - - trayDesktopItem = makeDesktopItem { - name = "ProtonVPN Tray"; - desktopName = "ProtonVPN Tray"; - type = "Application"; - exec = "protonvpn-tray"; - icon = "protonvpn"; - categories = "Network;"; - terminal = "false"; + owner = "ProtonVPN"; + repo = "linux-app"; + rev = version; + sha256 = "sha256-08gXEKm8udgNltRdqvAMFL0pDCWZu/kfl1xGQtZPBCc="; }; - nativeBuildInputs = [ wrapGAppsHook makeWrapper imagemagick ]; - - propagatedBuildInputs = (with python3Packages; [ - pygobject3 - pycairo - requests - configparser - ]) ++ [ - protonvpn-cli - gtk3 - gobject-introspection - libnotify - libappindicator-gtk3 - ]; + strictDeps = false; - prePatch = '' - # if pkexec is used, we want to have more time to enter password - substituteInPlace linux_gui/services/login_service.py --replace 'timeout=8' 'timeout=30' - ''; + nativeBuildInputs = [ + gobject-introspection imagemagick wrapGAppsHook + ]; - postInstall = '' - # wrap binaries with extra required path - wrapProgram "$out/bin/protonvpn-tray" --prefix PATH ":" ${extraPath} - wrapProgram "$out/bin/protonvpn-gui" --prefix PATH ":" ${extraPath} + propagatedBuildInputs = with python3Packages; [ + protonvpn-nm-lib + psutil + ]; - # install desktop files - mkdir -p $out/share/applications - cp "$desktopItem/share/applications/ProtonVPN.desktop" $out/share/applications/protonvpn-gui.desktop - cp "$trayDesktopItem/share/applications/ProtonVPN Tray.desktop" $out/share/applications/protonvpn-tray.desktop + buildInputs = [ + gtk3 networkmanager webkitgtk + ]; - # create icons + postFixup = '' + # Setting icons for size in 16 32 48 64 72 96 128 192 512 1024; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize "$size"x"$size" \ - linux_gui/resources/img/logo/protonvpn_logo.png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/protonvpn.png + convert -resize $size'x'$size \ + protonvpn_gui/assets/icons/protonvpn-logo.png \ + $out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png done + + install -Dm644 protonvpn.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/protonvpn.desktop \ + --replace 'protonvpn-logo' protonvpn ''; - # no tests + # Project has a dummy test doCheck = false; meta = with lib; { description = "Linux GUI for ProtonVPN, written in Python"; - homepage = "https://github.com/ProtonVPN/linux-gui"; - maintainers = with maintainers; [ offline ]; + homepage = "https://github.com/ProtonVPN/linux-app"; + maintainers = with maintainers; [ offline wolfangaukang ]; license = licenses.gpl3Plus; platforms = platforms.linux; - mainProgram = "protonvpn-gui"; }; } diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 0f76bced878..9f8a6dfc576 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-o+9twuyH9keWJriCSNkR63+xZuuOmPjoWg+Jp616CsQ="; + sha256 = "sha256-0wwIuE6Gv8khhLAbWSHOBfHGrTUjR4f/C5bzYJpvWIQ="; }; postPatch = '' diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 446da4cdea3..b0975c56b05 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "8.0.3"; + version = "8.0.4"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "cG3OSqRhYnxlzfauQia6pM/1gu+iE5mtHTGk3kGMFH0="; + sha256 = "sha256-HIgIcw4Y/NXidCBwRMrdKojlqO8CJO+6N7s7PdBx4YQ="; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -29,6 +29,6 @@ mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ eduardosm ]; + maintainers = with maintainers; [ schmittlauch ]; }; } diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 40cf26962a1..ed8a86bc9d3 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.63"; + version = "2.71"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-sC7BUbI4BcNp7XqNtgxHuzvksyVFP+gXHxldQPy/7UU="; + sha256 = "sha256-d4Vl+HixZy7fJ8YU1fy3b2B+F/76mm0NQmFC/PDl4SY="; }; - vendorSha256 = "sha256-PEMc2NUiGKaolVGwviNRvtpVyhypWsJlNWZ0ysjy+YE="; + vendorSha256 = "sha256-oxrOjiRxgcJ5yzQYQvLXFPHlOHMB88FThw4OCVxFOwQ="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 50a28b5998e..7c9eda76260 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -66,8 +66,6 @@ in stdenv.mkDerivation { install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" done done - - wrapQtApp $out/Applications/Wireshark.app/Contents/MacOS/Wireshark '' else optionalString withQt '' install -Dm644 -t $out/share/applications ../wireshark.desktop diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index a5edbac135f..8acd862053a 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,16 +1,32 @@ -{ lib, stdenv, fetchFromGitLab, vala, python3, pkg-config, meson, ninja, gtk3 -, json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script -, libappindicator, desktop-file-utils, appstream, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitLab +, nix-update-script +, appstream +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, vala +, wrapGAppsHook +, glib +, gtk3 +, json-glib +, libappindicator +, libsoup +, webkitgtk +}: stdenv.mkDerivation rec { pname = "meteo"; - version = "0.9.8"; + version = "0.9.9.1"; src = fetchFromGitLab { owner = "bitseater"; repo = pname; rev = version; - sha256 = "1ll5fja0dqxcr6hrh2dk4hgw9gf8ms9bcp1ifznd21byxzyhdlr0"; + sha256 = "sha256-kkUVTxh5svk61oDp/dpe3ILGyexYe3UaS+LgWsy+Z9s="; }; nativeBuildInputs = [ @@ -25,7 +41,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - geocode-glib + glib gtk3 json-glib libappindicator @@ -44,12 +60,12 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { description = "Know the forecast of the next hours & days"; homepage = "https://gitlab.com/bitseater/meteo"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ bobby285271 ]; platforms = platforms.linux; + mainProgram = "com.gitlab.bitseater.meteo"; }; } diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 351609d8c05..e898a43ad97 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -37,10 +37,6 @@ stdenv.mkDerivation rec { done ''; - postInstall = lib.optionalString stdenv.isDarwin '' - wrapQtApp "$out"/bin/beamerpresenter.app/Contents/MacOS/beamerpresenter - ''; - meta = with lib; { description = "Modular multi screen pdf presentation software respecting your window manager"; homepage = "https://github.com/stiglers-eponym/BeamerPresenter"; diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index 0815dfc8982..8d241ea8303 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "17a8bcgg9z3b4y38k035hm2lgvhmf8srlz59c7n2q3fdw2i95i68"; }; - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ jdk ib-tws ]; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index f319b419fbb..7e36529e5ff 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "khronos"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "sha256-AETyVCBUuBzHwDgTkGRIokFYwcmXrb/F85J5GEIu4dE="; + sha256 = "sha256-+gZy8cdekM26J1ujqFmfBXTctXc9E//EY42ZoLq9rBs="; }; nativeBuildInputs = [ @@ -48,9 +48,6 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py - # https://github.com/lainsce/khronos/pull/75 - substituteInPlace build-aux/post_install.py \ - --replace 'gtk-update-icon-cache' 'gtk4-update-icon-cache' ''; passthru = { @@ -65,5 +62,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; + mainProgram = "io.github.lainsce.Khronos"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index abfd223fd00..f94beabd1f9 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -2,7 +2,7 @@ , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge +, icu, boost, jdk, ant, cups, xorg, fontforge , openssl, gperf, cppunit, poppler, util-linux , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr @@ -310,7 +310,6 @@ in (mkDrv rec { "--with-boost-libdir=${boost.out}/lib" "--with-beanshell-jar=${bsh}" "--with-vendor=NixOS" - "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" "--disable-report-builder" "--disable-online-update" "--enable-python=system" @@ -324,7 +323,7 @@ in (mkDrv rec { "--with-system-headers" "--with-system-openssl" "--with-system-libabw" - "--with-system-libcmis" + "--without-system-libcmis" "--with-system-libwps" "--with-system-openldap" "--with-system-coinmp" @@ -365,7 +364,6 @@ in (mkDrv rec { "--without-system-mdds" # we have mdds but our version is too new # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" - "--without-system-qrcodegen" "--without-system-xmlsec" ] ++ lib.optionals kdeIntegration [ "--enable-kf5" @@ -394,7 +392,7 @@ in (mkDrv rec { glib libmysqlclient neon nspr nss openldap openssl pam perl pkg-config poppler python3 sane-backends unzip which zip zlib - mdds bluez5 libcmis libwps libabw libzmf + mdds bluez5 libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux librevenge libe-book libmwaw glm ncurses epoxy libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index bbabd4e70be..e99ac0f66d6 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -7,13 +7,6 @@ md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { - name = "commons-logging-1.2-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; - sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; - md5 = ""; - md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; - } - { name = "apr-1.5.2.tar.gz"; url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; @@ -28,11 +21,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_71_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; - sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; + name = "boost_1_75_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_75_0.tar.xz"; + sha256 = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b"; md5 = ""; - md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; + md5name = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b-boost_1_75_0.tar.xz"; } { name = "box2d-2.3.1.tar.gz"; @@ -42,11 +35,11 @@ md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz"; } { - name = "breakpad.zip"; - url = "https://dev-www.libreoffice.org/src/breakpad.zip"; - sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; + name = "breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + sha256 = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91"; md5 = ""; - md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; + md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; } { name = "bsh-2.0b6-src.zip"; @@ -70,11 +63,11 @@ md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; - sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; + name = "libcdr-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz"; + sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"; md5 = ""; - md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; + md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -119,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.71.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; - sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772"; + name = "curl-7.78.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz"; + sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5"; md5 = ""; - md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz"; + md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -154,11 +147,11 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; - sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; + name = "libetonyek-0.1.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz"; + sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a"; md5 = ""; - md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; + md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { name = "expat-2.4.1.tar.bz2"; @@ -168,11 +161,11 @@ md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2"; } { - name = "Firebird-3.0.0.32483-0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; - sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; + name = "Firebird-3.0.7.33374-0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2"; + sha256 = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76"; md5 = ""; - md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; + md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { name = "fontconfig-2.13.91.tar.gz"; @@ -217,11 +210,11 @@ md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.00.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; - sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; + name = "liberation-fonts-ttf-2.1.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz"; + sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef"; md5 = ""; - md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; + md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -266,11 +259,11 @@ md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { - name = "culmus-0.131.tar.gz"; - url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; - sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; + name = "culmus-0.133.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; + sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; md5 = ""; - md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; + md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; @@ -378,18 +371,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-68_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz"; - sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d"; + name = "icu4c-69_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-69_1-src.tgz"; + sha256 = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"; md5 = ""; - md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz"; + md5name = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745-icu4c-69_1-src.tgz"; } { - name = "icu4c-68_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip"; - sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510"; + name = "icu4c-69_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-69_1-data.zip"; + sha256 = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"; md5 = ""; - md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip"; + md5name = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf-icu4c-69_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -476,11 +469,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2021-03-05.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2"; - sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a"; + name = "language-subtag-registry-2021-08-06.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-08-06.tar.bz2"; + sha256 = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b"; md5 = ""; - md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2"; + md5name = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b-language-subtag-registry-2021-08-06.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -560,11 +553,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.30.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; - sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; + name = "xmlsec1-1.2.32.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.32.tar.gz"; + sha256 = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043"; md5 = ""; - md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; + md5name = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043-xmlsec1-1.2.32.tar.gz"; } { name = "libxml2-2.9.12.tar.gz"; @@ -623,11 +616,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.17.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz"; - sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c"; + name = "libmwaw-0.3.19.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz"; + sha256 = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af"; md5 = ""; - md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz"; + md5name = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af-libmwaw-0.3.19.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -651,11 +644,11 @@ md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz"; } { - name = "libodfgen-0.1.6.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; - sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; + name = "libodfgen-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz"; + sha256 = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625"; md5 = ""; - md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; + md5name = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625-libodfgen-0.1.8.tar.xz"; } { name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; @@ -679,11 +672,11 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.1.1i.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.1.1i.tar.gz"; - sha256 = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"; + name = "openssl-1.1.1l.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz"; + sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1"; md5 = ""; - md5name = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242-openssl-1.1.1i.tar.gz"; + md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz"; } { name = "liborcus-0.16.1.tar.bz2"; @@ -693,13 +686,6 @@ md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; } { - name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; - md5 = ""; - md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - } - { name = "libpagemaker-0.0.4.tar.xz"; url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; @@ -707,11 +693,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-4306.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2"; - sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8"; + name = "pdfium-4500.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2"; + sha256 = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304"; md5 = ""; - md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2"; + md5name = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304-pdfium-4500.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -735,6 +721,13 @@ md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; } { + name = "poppler-data-0.4.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz"; + sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"; + md5 = ""; + md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz"; + } + { name = "postgresql-13.1.tar.bz2"; url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2"; sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f"; @@ -742,18 +735,11 @@ md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; } { - name = "Python-3.8.8rc1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz"; - sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6"; - md5 = ""; - md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz"; - } - { - name = "QR-Code-generator-1.4.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; - sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; + name = "Python-3.8.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz"; + sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9"; md5 = ""; - md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; + md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -798,18 +784,18 @@ md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { - name = "serf-1.2.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; - sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; + name = "serf-1.3.9.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/serf-1.3.9.tar.bz2"; + sha256 = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc"; md5 = ""; - md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; + md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2"; } { - name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; - sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301"; + name = "skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + sha256 = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d"; md5 = ""; - md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + md5name = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d-skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -888,4 +874,11 @@ md5 = ""; md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } + { + name = "zxing-cpp-1.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.1.1.tar.gz"; + sha256 = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86"; + md5 = ""; + md5name = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86-zxing-cpp-1.1.1.tar.gz"; + } ] diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index 193b2cd7639..1e0ee64bd1f 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -6,6 +6,6 @@ attrs: ''; configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") + "--without-system-zxing" ]; - patches = [ ../xdg-open-brief.patch ]; # drop this when switching fresh to 7.2.0 } diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index dfc680e3439..d34cfd082d0 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,8 +7,8 @@ rec { }; major = "7"; - minor = "1"; - patch = "5"; + minor = "2"; + patch = "2"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1kl54ddpvmrcs4r1vd4dfzg5a8im0kijhaqdg37zvgb5fqv31bxf"; + sha256 = "0w9bn3jhrhaj80qbbs8wp3q5yc0rrpwvqj3abgrllg4clk5c6fw1"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0nf5s012l7mkpd1srvijl9q6x8f7svm6i84bj75dwyvipkg40rxq"; + sha256 = "1rhwrax5fxgdvizv74npysam5i67669myysldiplqiah5np672lq"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1m1hxbhrkaynpcps77rym1d0kwl380jv1p7b6ibfl4by0ii2j16a"; + sha256 = "1hn56irlkk2ng7wzhiv8alpjcnf7xf95n3syzlbnmcj177kpg883"; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index 19dee4e1f13..990eeb329a3 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -35,6 +35,13 @@ md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { + name = "box2d-2.3.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz"; + sha256 = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c"; + md5 = ""; + md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz"; + } + { name = "breakpad.zip"; url = "https://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; @@ -112,11 +119,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.71.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; - sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772"; + name = "curl-7.78.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz"; + sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5"; md5 = ""; - md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz"; + md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -154,11 +161,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.8.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; - sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; + name = "expat-2.4.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2"; + sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40"; md5 = ""; - md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; + md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -329,11 +336,11 @@ md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { - name = "gpgme-1.9.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; - sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; + name = "gpgme-1.13.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2"; + sha256 = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46"; md5 = ""; - md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; + md5name = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46-gpgme-1.13.1.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -371,18 +378,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-67_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; - sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; + name = "icu4c-68_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz"; + sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d"; md5 = ""; - md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; + md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz"; } { - name = "icu4c-67_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; - sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; + name = "icu4c-68_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip"; + sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510"; md5 = ""; - md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; + md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -469,11 +476,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2020-09-29.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2"; - sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f"; + name = "language-subtag-registry-2021-03-05.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2"; + sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a"; md5 = ""; - md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2"; + md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -483,18 +490,18 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.9.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; - sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; + name = "lcms2-2.11.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz"; + sha256 = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e"; md5 = ""; - md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; + md5name = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e-lcms2-2.11.tar.gz"; } { - name = "libassuan-2.5.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; - sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; + name = "libassuan-2.5.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2"; + sha256 = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702"; md5 = ""; - md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; + md5name = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702-libassuan-2.5.3.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; @@ -525,11 +532,11 @@ md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; } { - name = "libgpg-error-1.27.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; - sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; + name = "libgpg-error-1.37.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2"; + sha256 = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"; md5 = ""; - md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; + md5name = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763-libgpg-error-1.37.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; @@ -539,11 +546,11 @@ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; - sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; + name = "libnumbertext-1.0.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz"; + sha256 = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc"; md5 = ""; - md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; + md5name = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc-libnumbertext-1.0.7.tar.xz"; } { name = "ltm-1.0.zip"; @@ -560,11 +567,11 @@ md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { - name = "libxml2-2.9.10.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; - sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; + name = "libxml2-2.9.12.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz"; + sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"; md5 = ""; - md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; + md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz"; } { name = "libxslt-1.1.34.tar.gz"; @@ -595,11 +602,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.6.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; - sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; + name = "mdds-1.7.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2"; + sha256 = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf"; md5 = ""; - md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; + md5name = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf-mdds-1.7.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -616,11 +623,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; - sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; + name = "libmwaw-0.3.17.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz"; + sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c"; md5 = ""; - md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; + md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -630,11 +637,11 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.30.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; - sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; + name = "neon-0.31.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz"; + sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678"; md5 = ""; - md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; + md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; } { name = "nss-3.55-with-nspr-4.27.tar.gz"; @@ -672,18 +679,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2t.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; - sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; + name = "openssl-1.1.1l.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz"; + sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1"; md5 = ""; - md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; + md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz"; } { - name = "liborcus-0.15.4.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; - sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; + name = "liborcus-0.16.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2"; + sha256 = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4"; md5 = ""; - md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; + md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -735,11 +742,11 @@ md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; } { - name = "Python-3.7.10.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.7.10.tar.xz"; - sha256 = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b"; + name = "Python-3.8.8rc1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz"; + sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6"; md5 = ""; - md5name = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b-Python-3.7.10.tar.xz"; + md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; @@ -798,11 +805,11 @@ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; - sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760"; + name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301"; md5 = ""; - md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -854,11 +861,11 @@ md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.11.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; - sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; + name = "libwps-0.4.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz"; + sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb"; md5 = ""; - md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; + md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 110a52ed9f9..746e7679f38 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,4 +1,4 @@ -{ lib, kdeIntegration, ... }: +{ lib, kdeIntegration, commonsLogging, ... }: attrs: { postConfigure = attrs.postConfigure + '' @@ -6,6 +6,8 @@ attrs: ''; configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") + "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" + "--without-system-qrcodegen" ]; - patches = [ ../xdg-open-brief.patch ]; + patches = [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2 } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index d42f31bff3f..df6dcb58e9e 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -7,7 +7,7 @@ rec { }; major = "7"; - minor = "0"; + minor = "1"; patch = "6"; tweak = "2"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0bk1dc6g8z5akrprfxxy3dm0vdmihaaxnsprxpqbqmqrqzkzg8cn"; + sha256 = "1g1nlnmgxka1xj3800ra7j28y08k1irz7a24awx1gyjs9fci58qq"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "04f76r311hppil656ajab52x0xwqszazlgssyi5w97wak2zkmqgj"; + sha256 = "0kblfwcnsc0pz96wxmkghmchjd31h0w1wjxlqxqbqqpz3vbr61k3"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1xmvlj9nrmg8448k4zfaxn5qqxa4amnvvhs1l1smi2bz3xh4xn2d"; + sha256 = "1b28xqgvfnx62zgnxfisi58r7nhixvz35pmq8cb20ayxhdfg6v31"; }; } diff --git a/pkgs/applications/office/timedoctor/default.nix b/pkgs/applications/office/timedoctor/default.nix index 4b97f7b3dcd..41273b7780e 100644 --- a/pkgs/applications/office/timedoctor/default.nix +++ b/pkgs/applications/office/timedoctor/default.nix @@ -119,5 +119,7 @@ appimageTools.wrapType2 { license = licenses.unfree; maintainers = with maintainers; [ kamadorueda ]; platforms = [ "x86_64-linux" ]; + # gpgme for i686-linux failed to build. + broken = true; }; } diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 3519f015ffa..2c6b5dfe3b3 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -8,14 +8,14 @@ mkDerivation rec { pname = "vnote"; - version = "3.7.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "vnotex"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-D9/4BakXTComvGTV8F131G5PzA8LhWfNSZRBOMo5t5c="; + sha256 = "sha256-GgSVBVcT0rfgglyjCmkEMbKCEltesC3eSsN38psrkS4="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index c0bca4c9043..269bc1931b3 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "zim"; - version = "0.73.5"; + version = "0.74.2"; src = fetchurl { url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; - sha256 = "sha256-o28V2Sw5lMDVWwf4MlOz2LgmvrNxSGXturwU8cyR1jo="; + sha256 = "sha256-tZxBlpps2nLThSOq3WJ42iUQ4NG1Lb463bvDQ+djZJA="; }; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix new file mode 100644 index 00000000000..9da6073ff42 --- /dev/null +++ b/pkgs/applications/office/zk/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, buildGoModule, icu }: + +buildGoModule rec { + pname = "zk"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "mickael-menu"; + repo = "zk"; + rev = "v${version}"; + sha256 = "sha256-C3/V4v8lH4F3S51egEw5d51AI0n5xzBQjwhrI64FEGA="; + }; + + vendorSha256 = "sha256-m7QGv8Vx776TsN7QHXtO+yl3U1D573UMZVyg1B4UeIk="; + + doCheck = false; + + buildInputs = [ icu ]; + + CGO_ENABLED = 1; + + ldflags = [ "-s" "-w" "-X=main.Build=${version}" ]; + + tags = [ "fts5" "icu" ]; + + meta = with lib; { + maintainers = with maintainers; [ pinpox ]; + license = licenses.gpl3; + description = "A zettelkasten plain text note-taking assistant"; + homepage = "https://github.com/mickael-menu/zk"; + }; +} diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 927fa32bd55..00e5e0089cf 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -5,17 +5,19 @@ , libusb1 , ncurses , rtl-sdr +, hackrf +, limesuite }: stdenv.mkDerivation rec { pname = "dump1090"; - version = "5.0"; + version = "6.1"; src = fetchFromGitHub { owner = "flightaware"; repo = pname; rev = "v${version}"; - sha256 = "1fckfcgypmplzl1lidd04jxiabczlfx9mv21d6rbsfknghsjpn03"; + sha256 = "sha256-OLXnT5TD6ZBNJUk4qXOMbr+NWdw3j1rv1xkFPZi4Wo8="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +27,15 @@ stdenv.mkDerivation rec { libusb1 ncurses rtl-sdr - ]; + hackrf + ] ++ lib.optional stdenv.isLinux limesuite; + + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang + "-Wno-implicit-function-declaration -Wno-int-conversion"; + + buildFlags = [ "dump1090" "view1090" ]; + + doCheck = true; installPhase = '' runHook preInstall @@ -41,7 +51,7 @@ stdenv.mkDerivation rec { description = "A simple Mode S decoder for RTLSDR devices"; homepage = "https://github.com/flightaware/dump1090"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ earldouglas ]; }; } diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 44a8ed14c2e..479b3b641cd 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -8,6 +8,7 @@ , openssl , gflags , gnuradio3_8 +, thrift , libpcap , orc , pkg-config @@ -21,6 +22,8 @@ gnuradio3_8.pkgs.mkDerivation rec { pname = "gnss-sdr"; + # There's an issue with cpufeatures on 0.0.15, see: + # https://github.com/NixOS/nixpkgs/pull/142557#issuecomment-950217925 version = "0.0.13"; src = fetchFromGitHub { @@ -56,6 +59,9 @@ gnuradio3_8.pkgs.mkDerivation rec { protobuf gnuradio3_8.pkgs.osmosdr libpcap + ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ + thrift + gnuradio3_8.unwrapped.python.pkgs.thrift ]; cmakeFlags = [ diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix index 3e423e025b7..372300895ca 100644 --- a/pkgs/applications/radio/gnuradio/3.7.nix +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -44,8 +44,6 @@ minor = "14"; patch = "0"; } -# We use our build of volk and not the one bundled with the release -, fetchSubmodules ? false }: let @@ -213,7 +211,6 @@ let sourceSha256 overrideSrc fetchFromGitHub - fetchSubmodules ; qt = qt4; gtk = gtk2; @@ -238,34 +235,34 @@ stdenv.mkDerivation rec { passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must inherit boost volk; - } // lib.optionalAttrs (hasFeature "gr-uhd" features) { + } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; }; cmakeFlags = shared.cmakeFlags # From some reason, if these are not set, libcodec2 and gsm are # not detected properly (slightly different then what's in # ./default.nix). - ++ lib.optionals (hasFeature "gr-vocoder" features) [ + ++ lib.optionals (hasFeature "gr-vocoder") [ "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_INCLUDE_DIR=${codec2}/include" "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" "-DLIBGSM_INCLUDE_DIR=${gsm}/include/gsm" ] - ++ lib.optionals (hasFeature "volk" features && volk != null) [ + ++ lib.optionals (hasFeature "volk" && volk != null) [ "-DENABLE_INTERNAL_VOLK=OFF" ] ; stripDebugList = shared.stripDebugList # gr-fcd feature was dropped in 3.8 - ++ lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ] + ++ lib.optionals (hasFeature "gr-fcd") [ "share/gnuradio/examples/fcd" ] ; preConfigure = "" # wxgui and pygtk are not looked up properly, so we force them to be # detected as found, if they are requested by the `features` attrset. - + lib.optionalString (hasFeature "gr-wxgui" features) '' + + lib.optionalString (hasFeature "gr-wxgui") '' sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt '' - + lib.optionalString (hasFeature "gnuradio-companion" features) '' + + lib.optionalString (hasFeature "gnuradio-companion") '' sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt '' ; diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 05a87a480f3..0e5b7701e98 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake # Remove gcc and python references , removeReferencesTo @@ -15,6 +16,7 @@ , python , codec2 , gsm +, thrift , fftwFloat , alsa-lib , libjack2 @@ -41,15 +43,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.8"; - minor = "3"; - patch = "1"; + minor = "4"; + patch = "0"; } -# We use our build of volk and not the one bundled with the release -, fetchSubmodules ? false }: let - sourceSha256 = "0vd39azp8n576dbqsanax7bgsnxwc80riaxid2ihxs4xzyjmbw9r"; + sourceSha256 = "sha256-C8S3iF7vj9A8SpxriW9y7idrhXzonvenoQtVAMex+Iw="; featuresInfo = { # Needed always basic = { @@ -65,7 +65,7 @@ let ] # when gr-qtgui is disabled, icu needs to be included, otherwise # building with boost 1.7x fails - ++ lib.optionals (!(hasFeature "gr-qtgui" features)) [ icu ]; + ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ Mako six @@ -101,13 +101,19 @@ let cmakeEnableFlag = "GNURADIO_RUNTIME"; }; gr-ctrlport = { - # Thrift support is not really working well, and even the patch they - # recommend applying on 0.9.2 won't apply. See: - # https://github.com/gnuradio/gnuradio/blob/v3.8.2.0/gnuradio-runtime/lib/controlport/thrift/README cmakeEnableFlag = "GR_CTRLPORT"; native = [ swig ]; + runtime = [ + thrift + ]; + pythonRuntime = with python.pkgs; [ + python.pkgs.thrift + # For gr-perf-monitorx + matplotlib + networkx + ]; }; gnuradio-companion = { pythonRuntime = with python.pkgs; [ @@ -171,9 +177,14 @@ let }; gr-utils = { cmakeEnableFlag = "GR_UTILS"; + pythonRuntime = with python.pkgs; [ + # For gr_plot + matplotlib + ]; }; gr-modtool = { pythonRuntime = with python.pkgs; [ + setuptools click click-plugins ]; @@ -208,7 +219,6 @@ let sourceSha256 overrideSrc fetchFromGitHub - fetchSubmodules ; qt = qt5; gtk = gtk3; @@ -230,12 +240,21 @@ stdenv.mkDerivation rec { dontWrapQtApps meta ; + patches = [ + # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 + ./modtool-newmod-permissions.3_8.patch + (fetchpatch { + # https://github.com/gnuradio/gnuradio/pull/5226 + url = "https://github.com/gnuradio/gnuradio/commit/9d7343526dd793120b6425cd9a6969416ed32503.patch"; + sha256 = "sha256-usSoRDDuClUfdX4yFbQNu8wDzve6UEhZYTFj1oZbFic="; + }) + ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must inherit boost volk; - } // lib.optionalAttrs (hasFeature "gr-uhd" features) { + } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; - } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { + } // lib.optionalAttrs (hasFeature "gr-qtgui") { inherit (libsForQt5) qwt; }; cmakeFlags = shared.cmakeFlags @@ -246,7 +265,7 @@ stdenv.mkDerivation rec { # # NOTE: qradiolink needs libcodec2 to be detected in # order to build, see https://github.com/qradiolink/qradiolink/issues/67 - ++ lib.optionals (hasFeature "gr-vocoder" features) [ + ++ lib.optionals (hasFeature "gr-vocoder") [ "-DLIBCODEC2_FOUND=TRUE" "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" @@ -255,7 +274,7 @@ stdenv.mkDerivation rec { "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" ] - ++ lib.optionals (hasFeature "volk" features && volk != null) [ + ++ lib.optionals (hasFeature "volk" && volk != null) [ "-DENABLE_INTERNAL_VOLK=OFF" ] ; @@ -263,7 +282,7 @@ stdenv.mkDerivation rec { postInstall = shared.postInstall # This is the only python reference worth removing, if needed (3.7 doesn't # set that reference). - + lib.optionalString (!hasFeature "python-support" features) '' + + lib.optionalString (!hasFeature "python-support") '' ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index c62b031d813..d92af80701b 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -26,6 +26,7 @@ , libsodium , libsndfile , libunwind +, thrift , cppzmq , zeromq # Needed only if qt-gui is disabled, from some reason @@ -45,14 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "2"; + minor = "3"; patch = "0"; } -, fetchSubmodules ? false }: let - sourceSha256 = "01wyqazrpphmb0fl69j93k0w4vm4d1l4177m1fyg7qx8hzia0aaq"; + sourceSha256 = "sha256-jVfExv1CcnlOaaj/XtnfhWAHnQsshZJ1l/zXo0uovdo="; featuresInfo = { # Needed always basic = { @@ -69,7 +69,7 @@ let ] # when gr-qtgui is disabled, icu needs to be included, otherwise # building with boost 1.7x fails - ++ lib.optionals (!(hasFeature "gr-qtgui" features)) [ icu ]; + ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ Mako six @@ -100,11 +100,15 @@ let ]; }; gr-ctrlport = { - # Thrift support is not really working well, and even the patch they - # recommend applying on 0.9.2 won't apply. See: - # https://github.com/gnuradio/gnuradio/blob/v3.9.0.0/gnuradio-runtime/lib/controlport/thrift/README runtime = [ libunwind + thrift + ]; + pythonRuntime = with python.pkgs; [ + python.pkgs.thrift + # For gr-perf-monitorx + matplotlib + networkx ]; cmakeEnableFlag = "GR_CTRLPORT"; }; @@ -140,6 +144,10 @@ let gr-filter = { runtime = [ fftwFloat ]; cmakeEnableFlag = "GR_FILTER"; + pythonRuntime = with python.pkgs; [ + scipy + pyqtgraph + ]; }; gr-analog = { cmakeEnableFlag = "GR_ANALOG"; @@ -174,11 +182,22 @@ let ]; cmakeEnableFlag = "GR_UHD"; }; + gr-uhd-rfnoc = { + runtime = [ + uhd + ]; + cmakeEnableFlag = "UHD_RFNOC"; + }; gr-utils = { cmakeEnableFlag = "GR_UTILS"; + pythonRuntime = with python.pkgs; [ + # For gr_plot + matplotlib + ]; }; gr-modtool = { pythonRuntime = with python.pkgs; [ + setuptools click click-plugins ]; @@ -225,7 +244,6 @@ let sourceSha256 overrideSrc fetchFromGitHub - fetchSubmodules ; qt = qt5; gtk = gtk3; @@ -248,18 +266,27 @@ stdenv.mkDerivation rec { dontWrapQtApps meta ; + patches = [ + # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 + ./modtool-newmod-permissions.patch + (fetchpatch { + # https://github.com/gnuradio/gnuradio/pull/5225 + url = "https://github.com/gnuradio/gnuradio/commit/4cef46e3ea0faf04e05ca1a5846cd1568fa51bb2.patch"; + sha256 = "sha256-6AlGbtD1S0c3I9JSoLTMP4YqwDU17i2j+XRkuR+QTuc="; + }) + ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must inherit boost volk; - } // lib.optionalAttrs (hasFeature "gr-uhd" features) { + } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; - } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { + } // lib.optionalAttrs (hasFeature "gr-qtgui") { inherit (libsForQt5) qwt; }; postInstall = shared.postInstall # This is the only python reference worth removing, if needed. - + lib.optionalString (!hasFeature "python-support" features) '' + + lib.optionalString (!hasFeature "python-support") '' ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake diff --git a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_8.patch b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_8.patch new file mode 100644 index 00000000000..f6a6a06e89c --- /dev/null +++ b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_8.patch @@ -0,0 +1,26 @@ +commit bf870157e0a9c3d19e968afb276b4e7d96b4df30 +Author: Doron Behar <doron.behar@gmail.com> +Date: Thu Oct 21 13:10:42 2021 +0300 + + gr-modtool: Don't copy source permissions + + This is needed for systems such as NixOS, where the build tree isn't + writable and the files copied should be. + + Signed-off-by: Doron Behar <doron.behar@gmail.com> + +diff --git a/gr-utils/python/modtool/core/newmod.py b/gr-utils/python/modtool/core/newmod.py +index 123059907..0c734e7ae 100644 +--- a/gr-utils/python/modtool/core/newmod.py ++++ b/gr-utils/python/modtool/core/newmod.py +@@ -78,7 +78,9 @@ class ModToolNewModule(ModTool): + self._setup_scm(mode='new') + logger.info("Creating out-of-tree module in {}...".format(self.dir)) + try: +- shutil.copytree(self.srcdir, self.dir) ++ # https://stackoverflow.com/a/17022146/4935114 ++ shutil.copystat = lambda x, y: x ++ shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) + os.chdir(self.dir) + except OSError: + raise ModToolException('Could not create directory {}.'.format(self.dir)) diff --git a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch new file mode 100644 index 00000000000..7cab73fede0 --- /dev/null +++ b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch @@ -0,0 +1,15 @@ +diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py +index babebfcde..9a02f663e 100644 +--- c/gr-utils/modtool/core/newmod.py ++++ w/gr-utils/modtool/core/newmod.py +@@ -62,7 +62,9 @@ class ModToolNewModule(ModTool): + self._setup_scm(mode='new') + logger.info(f"Creating out-of-tree module in {self.dir}...") + try: +- shutil.copytree(self.srcdir, self.dir) ++ # https://stackoverflow.com/a/17022146/4935114 ++ shutil.copystat = lambda x, y: x ++ shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) + try: + shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'), + os.path.join(self.dir, '.clang-format')) diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index f8ea2f0b160..ea97864bc61 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -11,7 +11,6 @@ # the main expressions , overrideSrc , fetchFromGitHub -, fetchSubmodules }: rec { @@ -26,12 +25,11 @@ rec { owner = "gnuradio"; rev = "v${version}"; sha256 = sourceSha256; - inherit fetchSubmodules; } ; # Check if a feature is enabled, while defaulting to true if feat is not # specified. - hasFeature = feat: features: ( + hasFeature = feat: ( if builtins.hasAttr feat features then features.${feat} else @@ -39,7 +37,7 @@ rec { ); nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat features then + if hasFeature feat then (if builtins.hasAttr "native" info then info.native else []) ++ (if builtins.hasAttr "pythonNative" info then info.pythonNative else []) else @@ -48,7 +46,7 @@ rec { ) featuresInfo); buildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat features then + if hasFeature feat then (if builtins.hasAttr "runtime" info then info.runtime else []) ++ (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) else @@ -63,7 +61,7 @@ rec { # satisfied, let only our cmakeFlags decide. "-DENABLE_DEFAULT=OFF" else - if hasFeature feat features then + if hasFeature feat then "-DENABLE_${info.cmakeEnableFlag}=ON" else "-DENABLE_${info.cmakeEnableFlag}=OFF" @@ -75,17 +73,17 @@ rec { stdenv.cc.cc ] # If python-support is disabled, we probably don't want it referenced - ++ lib.optionals (!hasFeature "python-support" features) [ python ] + ++ lib.optionals (!hasFeature "python-support") [ python ] ; # Gcc references from examples stripDebugList = [ "lib" "bin" ] - ++ lib.optionals (hasFeature "gr-audio" features) [ "share/gnuradio/examples/audio" ] - ++ lib.optionals (hasFeature "gr-uhd" features) [ "share/gnuradio/examples/uhd" ] - ++ lib.optionals (hasFeature "gr-qtgui" features) [ "share/gnuradio/examples/qt-gui" ] + ++ lib.optionals (hasFeature "gr-audio") [ "share/gnuradio/examples/audio" ] + ++ lib.optionals (hasFeature "gr-uhd") [ "share/gnuradio/examples/uhd" ] + ++ lib.optionals (hasFeature "gr-qtgui") [ "share/gnuradio/examples/qt-gui" ] ; postInstall = "" # Gcc references - + lib.optionalString (hasFeature "gnuradio-runtime" features) '' + + lib.optionalString (hasFeature "gnuradio-runtime") '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime.so) '' ; @@ -101,9 +99,9 @@ rec { featuresInfo python ; - } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { + } // lib.optionalAttrs (hasFeature "gr-qtgui") { inherit qt; - } // lib.optionalAttrs (hasFeature "gnuradio-companion" features) { + } // lib.optionalAttrs (hasFeature "gnuradio-companion") { inherit gtk; }; # Wrapping is done with an external wrapper diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 7dcb6d467d6..4cbccbd5181 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -33,25 +33,20 @@ }: let + # We don't check if `python-support` feature is on, as it's unlikely someone + # may wish to wrap GR without python support. pythonPkgs = extraPythonPackages + ++ [ (unwrapped.python.pkgs.toPythonModule unwrapped) ] # Add the extraPackages as python modules as well ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten (lib.mapAttrsToList ( feat: info: ( - if unwrapped.hasFeature feat unwrapped.features then + if unwrapped.hasFeature feat then (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) else [] ) ) unwrapped.featuresInfo) - ++ lib.optionals - (unwrapped.hasFeature "python-support" unwrapped.features) - ( - # Add unwrapped itself as a python module - [ (unwrapped.python.pkgs.toPythonModule unwrapped) ] - # Add all extraPackages as python modules - ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) - ) ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); @@ -60,8 +55,8 @@ let ] # Emulating wrapGAppsHook & wrapQtAppsHook working together ++ lib.optionals ( - (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) - || (unwrapped.hasFeature "gr-qtgui" unwrapped.features) + (unwrapped.hasFeature "gnuradio-companion") + || (unwrapped.hasFeature "gr-qtgui") ) [ "--prefix" "XDG_DATA_DIRS" ":" "$out/share" "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${name}" @@ -71,7 +66,7 @@ let # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1764890.html "--prefix" "PATH" ":" "${lib.getBin glib}/bin" ] - ++ lib.optionals (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) [ + ++ lib.optionals (unwrapped.hasFeature "gnuradio-companion") [ "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache" "--prefix" "GIO_EXTRA_MODULES" ":" "${lib.getLib dconf}/lib/gio/modules" "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share" @@ -94,7 +89,7 @@ let ++ lib.optionals (extraPackages != []) [ "--prefix" "GRC_BLOCKS_PATH" ":" "${lib.makeSearchPath "share/gnuradio/grc/blocks" extraPackages}" ] - ++ lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features) + ++ lib.optionals (unwrapped.hasFeature "gr-qtgui") # 3.7 builds with qt4 (if lib.versionAtLeast unwrapped.versionAttr.major "3.8" then [ diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 272c381db89..572efa3fac6 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -4,6 +4,7 @@ , pkg-config , qt5 , gnuradio3_8Minimal +, thrift , log4cpp , mpir , fftwFloat @@ -19,13 +20,13 @@ assert pulseaudioSupport -> libpulseaudio != null; gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.14.4"; + version = "2.14.6"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-mMaxu0jq2GaNLWjLsJQXx+zCxtyiCAZQJJZ8GJtnllQ="; + sha256 = "sha256-DMmQXcGPudAVOwuc+LVrcIzfwMMQVBZPbM6Bt1w56D8="; }; nativeBuildInputs = [ @@ -45,6 +46,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { gnuradio3_8Minimal.pkgs.osmosdr rtl-sdr hackrf + ] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [ + thrift + gnuradio3_8Minimal.unwrapped.python.pkgs.thrift ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; postInstall = '' diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix index 9d61ab4b601..0f0b89d4316 100644 --- a/pkgs/applications/radio/inspectrum/default.nix +++ b/pkgs/applications/radio/inspectrum/default.nix @@ -1,5 +1,6 @@ { lib , gnuradio3_8Minimal +, thrift , fetchFromGitHub , pkg-config , cmake @@ -28,6 +29,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { fftwFloat liquid-dsp qt5.qtbase + ] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [ + thrift + gnuradio3_8Minimal.unwrapped.python.pkgs.thrift ]; meta = with lib; { diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index 77a7d8cf69f..817013dbf3e 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -69,6 +69,6 @@ mkDerivation rec { homepage = "https://github.com/pothosware/PothosCore/wiki"; license = licenses.boost; platforms = platforms.linux; - maintainers = with maintainers; [ eduardosm ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 2f31761537d..31be8f4fb8b 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -4,6 +4,7 @@ , libconfig # Needs a gnuradio built with qt gui support , gnuradio3_8 +, thrift # Not gnuradioPackages' , codec2 , log4cpp @@ -61,6 +62,9 @@ gnuradio3_8.pkgs.mkDerivation rec { libftdi libsndfile gnuradio3_8.qwt + ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ + thrift + gnuradio3_8.unwrapped.python.pkgs.thrift ]; nativeBuildInputs = [ protobuf diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index 2324d400323..5a993f4fc10 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config -, libX11, glfw, glew, fftwFloat, volk +, libX11, glfw, glew, fftwFloat, volk, AppKit # Sources , airspy_source ? true, airspy , airspyhf_source ? true, airspyhf @@ -13,7 +13,7 @@ , sdrplay_source ? false, sdrplay , soapy_source ? true, soapysdr , spyserver_source ? true -, plutosdr_source ? true, libiio, libad9361 +, plutosdr_source ? stdenv.isLinux, libiio, libad9361 # Sinks , audio_sink ? true, rtaudio , portaudio_sink ? false, portaudio @@ -42,9 +42,12 @@ stdenv.mkDerivation rec { hash = "sha256-g9tpWvVRMXRhPfgvOeJhX6IMouF9+tLUr9wo5r35i/c="; }; + patches = [ ./runtime-prefix.patch ]; + postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "/usr" $out + --replace "/usr/share" "share" \ + --replace "set(CMAKE_INSTALL_PREFIX" "#set(CMAKE_INSTALL_PREFIX" substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \ --replace "codec2.h" "codec2/codec2.h" ''; @@ -52,6 +55,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glfw glew fftwFloat volk ] + ++ lib.optional stdenv.isDarwin AppKit ++ lib.optional stdenv.isLinux libX11 ++ lib.optional airspy_source airspy ++ lib.optional airspyhf_source airspyhf @@ -95,13 +99,18 @@ stdenv.mkDerivation rec { OPT_BUILD_RIGCTL_SERVER = rigctl_server; }; + CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++17"; + LDFLAGS = lib.optional stdenv.cc.isClang "-lc++fs"; + NIX_CFLAGS_COMPILE = "-fpermissive"; + hardeningDisable = lib.optional stdenv.cc.isClang "format"; + meta = with lib; { description = "Cross-Platform SDR Software"; homepage = "https://github.com/AlexandreRouma/SDRPlusPlus"; license = licenses.gpl3Only; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; }; } diff --git a/pkgs/applications/radio/sdrpp/runtime-prefix.patch b/pkgs/applications/radio/sdrpp/runtime-prefix.patch new file mode 100644 index 00000000000..55ecd8ce3ee --- /dev/null +++ b/pkgs/applications/radio/sdrpp/runtime-prefix.patch @@ -0,0 +1,60 @@ +From a80a739163d2013ec400223a68a387f4f9297b2a Mon Sep 17 00:00:00 2001 +From: Nikolay Korotkiy <sikmir@gmail.com> +Date: Fri, 29 Oct 2021 01:38:21 +0300 +Subject: [PATCH] Fix sdrpp breaking every time the package is rebuilt. + +On NixOS, the INSTALL_PREFIX changes on every rebuild to the package, but sdrpp +fills it in as part of the default config and then installs that config +to the users home folder. Fix this by not substituting @INSTALL_PREFIX@ in the +default config until runtime. +--- + core/src/core.cpp | 8 ++++++-- + core/src/gui/main_window.cpp | 6 ++++++ + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/core/src/core.cpp b/core/src/core.cpp +index 9546e60..98d6065 100644 +--- a/core/src/core.cpp ++++ b/core/src/core.cpp +@@ -242,8 +242,8 @@ int sdrpp_main(int argc, char *argv[]) { + defConfig["modulesDirectory"] = "./modules"; + defConfig["resourcesDirectory"] = "./res"; + #else +- defConfig["modulesDirectory"] = INSTALL_PREFIX "/lib/sdrpp/plugins"; +- defConfig["resourcesDirectory"] = INSTALL_PREFIX "/share/sdrpp"; ++ defConfig["modulesDirectory"] = "@prefix@/lib/sdrpp/plugins"; ++ defConfig["resourcesDirectory"] = "@prefix@/share/sdrpp"; + #endif + + // Load config +@@ -290,6 +290,10 @@ int sdrpp_main(int argc, char *argv[]) { + int winHeight = core::configManager.conf["windowSize"]["h"]; + maximized = core::configManager.conf["maximized"]; + std::string resDir = core::configManager.conf["resourcesDirectory"]; ++ { ++ std::size_t pos = resDir.find("@prefix@"); ++ if (pos != std::string::npos) resDir.replace(pos, 8, INSTALL_PREFIX); ++ } + json bandColors = core::configManager.conf["bandColors"]; + core::configManager.release(); + +diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp +index 954dbd6..52f0eed 100644 +--- a/core/src/gui/main_window.cpp ++++ b/core/src/gui/main_window.cpp +@@ -44,6 +44,12 @@ void MainWindow::init() { + json menuElements = core::configManager.conf["menuElements"]; + std::string modulesDir = core::configManager.conf["modulesDirectory"]; + std::string resourcesDir = core::configManager.conf["resourcesDirectory"]; ++ { ++ std::size_t pos = modulesDir.find("@prefix@"); ++ if (pos != std::string::npos) modulesDir.replace(pos, 8, INSTALL_PREFIX); ++ pos = resourcesDir.find("@prefix@"); ++ if (pos != std::string::npos) resourcesDir.replace(pos, 8, INSTALL_PREFIX); ++ } + core::configManager.release(); + + // Load menu elements +-- +2.33.0 + diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 855213fc514..5adf07053ab 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -26,6 +26,6 @@ in stdenv.mkDerivation { description = "SoapySDR plugin for RTL-SDR devices"; license = licenses.mit; maintainers = with maintainers; [ ragge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 8dbdd5d4ff2..3e889c21064 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "wsjtx"; - version = "2.4.0"; + version = "2.5.1"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; - sha256 = "sha256-LpfGzI/Hpsp7/K0ZZu2EFVlvWcN0cnAQ1RNAxCMugcg="; + sha256 = "sha256-aof+OavQ+IBw3eef1+bQ9YwIXCdecYiADS+eRXTrmvQ="; }; # Hamlib builds with autotools, wsjtx builds with cmake diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 06b7c108fa9..59af9a94d96 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; - version = "2.0.23"; + version = "2.0.24"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; - sha256 = "sha256-JSPyXOJbYOCeWY6h0v8fbmBkf1Dop1gdmnn4gKdBgac="; + sha256 = "sha256-jUU6xt3H9bY9CAQRTFQjprlsC77VwjIB/6sSRNzE+Lw="; }; # glib-2.62 deprecations diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 898885047a0..f54dcb94e23 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -28,10 +28,6 @@ mkDerivation rec { 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Stellarium.app/Contents")' ''; - postFixup = lib.optionalString stdenv.isDarwin '' - wrapQtApp "$out"/Stellarium.app/Contents/MacOS/stellarium - ''; - meta = with lib; { description = "Free open-source planetarium"; homepage = "http://stellarium.org/"; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 6224ccabb06..36dddad5db5 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.20210317"; + version = "1.0.20211006"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "05rjk0xsrzcxa979vlx25k1rdz1in84gkfm9l1h9f7k4a4aa5r6j"; + sha256 = "sha256-fQAVOzynMdSLDfhcYWcaXkFW/mnv4zySGLVJNE7ql/c="; }; nativeBuildInputs = [ cmake git ]; diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index 96a2c9a0489..987f6156b4b 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/bancika/diy-layout-creator/releases"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ eduardosm ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 346483b9231..b30a1893121 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.2.6"; + version = "3.3.0"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; rev = "v${version}"; - sha256 = "sha256-GRHRrAxZ10hmAXkGGSQEwNJTbnMbJ9jMyKnOUq+KoWo="; + sha256 = "sha256-uNpELHhSAVRJL/4iypvnl3nX45SqB419r37lthd2WmQ="; }; # make sure bundled dependencies don't get in the way - install also otherwise # copies them in full to the output, bloating the package diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index ae403d3f733..463e5b7d821 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,25 +3,25 @@ { "kicad" = { kicadVersion = { - version = "5.1.10"; + version = "5.1.11"; src = { - rev = "88a1d61d58fdd62149bd1e00984e01540148ca1b"; - sha256 = "10ix560bqy0lprnik1bprxw9ix4g8w2ipvyikx551ak9ryvgwjcc"; + rev = "d6b7f2349bcdbc45b223e7fe0460d9f169343209"; + sha256 = "03658kfd313lnvr4jihq1i72g2dfbzba8j1z2y4fxg3vrs54y7a0"; }; }; libVersion = { - version = "5.1.10"; + version = "5.1.11"; libSources = { - i18n.rev = "f081afe79be4660d5c49a9d674e3cb666d76d4d0"; + i18n.rev = "0b8cef6bd08818cc0360f240544733dce509da3f"; i18n.sha256 = "0y51l0r62cnxkvpc21732p3cx7pjvaqjih8193502hlv9kv1j9p6"; - symbols.rev = "6dec5004b6a2679c19d4857bda2f90c5ab3a5726"; - symbols.sha256 = "0n25rq32jwyigfw26faqraillwv6zbi2ywy26dkz5zqlf5xp56ad"; - templates.rev = "1ccbaf3704e8ff4030d0915f71e051af621ef7d7"; - templates.sha256 = "1a8xfcbdbb4ylrb5m7n2jjk9kwvgmlx1pmnn2cwj327a2b3m4jjs"; - footprints.rev = "302ac78bac21825532f970fb92714fa5973ad79b"; - footprints.sha256 = "0gyqxryda273hjn2rv8dha461j9bjh054y5dlpiw1wiha65lrf9i"; - packages3d.rev = "7abe02f30fd79b8f4f66c01589861df7f8f72f04"; - packages3d.sha256 = "1szcin52fcsyb55bj7xq7lz6ig187dpz3lk7blwab7b9c4dn3c3y"; + symbols.rev = "7d4cbbddceafa1f69858449e16ac7229abef3c9a"; + symbols.sha256 = "1zdajim409570xzis53kmrbdcf7000v2vmc90f49h214lrx2zhr2"; + templates.rev = "f4c74f4130c8432399089c8b2dc21319b769bbe9"; + templates.sha256 = "1fbhn1l3j2rwc29aida9b408wif55i23bp9ddcs7dvf83smjm05g"; + footprints.rev = "e53d53ac4a30959b03ed3297d7659ea82244fb45"; + footprints.sha256 = "0qpii55dgv2gxqg1qq0dngdnbb9din790qi5qv0l6qqrzx843h5s"; + packages3d.rev = "be0ba9377b4ec0f11a4b9aceda150eed93027f72"; + packages3d.sha256 = "12w7m5nbk9kcnlnlg4sk1sd7xgb9i2kxfi0jcbd0phs89qyl7wjr"; }; }; }; diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix index 8dee645646c..e5779478936 100644 --- a/pkgs/applications/science/geometry/antiprism/default.nix +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "antiprism"; - version = "0.26"; + version = "0.29"; src = fetchFromGitHub { owner = "antiprism"; repo = pname; rev = version; - sha256 = "sha256-5FE6IbYKk7eMT985R9NCX3GDXE8SrdVHFcCpKeJvKtQ="; + sha256 = "sha256-MHzetkmRDLBXq3KrfXmUhxURY60/Y8z5zQsExT6N4cY="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch index b382e6f9e75..48b1263e796 100644 --- a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch @@ -1,11 +1,11 @@ diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs -index fd9fe74..0fefa39 100644 +index c51e76d..d0a26d7 100644 --- a/src/elan-dist/src/component/package.rs +++ b/src/elan-dist/src/component/package.rs -@@ -50,11 +50,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) - }; - - try!(entry.unpack(&full_path).chain_err(|| ErrorKind::ExtractingPackage)); +@@ -56,11 +56,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) + entry + .unpack(&full_path) + .chain_err(|| ErrorKind::ExtractingPackage)?; + nix_patchelf_if_needed(&full_path); } diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 987068d9bbb..fb636da0ec4 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl -, fetchpatch , openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }: let @@ -8,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "0xmml81krr0i18b14dymfdq43szpzws7qj8k404qab51lkqxyxsb"; + sha256 = "0gql015zb3y95v68kmv2dscz7fnh89x1shrqxxqk5a0jhd2z93n1"; }; - cargoSha256 = "sha256-xjJ39hoSDn0VUH0YcL+mQBXbzFcIvZ38dPjBxV/yVNc="; + cargoSha256 = "sha256-rL++3RstCSBMYFj9BeOo6gepfId/sje4ES3Wm+Mb4cQ="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -41,11 +40,6 @@ rustPlatform.buildRustPackage rec { --subst-var dynamicLinker \ --subst-var libPath '') - # fix build, will be included in 1.1.1 - (fetchpatch { - url = "https://github.com/leanprover/elan/commit/8d1dec09d67b2ac1768b111d24f1a1cabdd563fa.patch"; - sha256 = "sha256-yMdnXqycu4VF9EKavZ85EuspvAqvzDSIm5894SB+3+A="; - }) ]; postInstall = '' diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 0c21ce109b8..218a2754187 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.33.0"; + version = "3.35.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "a0fb1e8c7ac81dfd2e80ad0de08f4e57ee853d82"; - sha256 = "03xz3c3dzjhvjzpa8811cgzzqzw8fpajmspykavmb259i391w0y7"; + rev = "a68d251bfc57341d8f1f6d8c6e548a0b08ff3b92"; + sha256 = "0f91kvd4z7rsjyagfx56y1vxmf4wjds7bnz6yh3sd4xx770z58d4"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index b9f14332f9d..78631486554 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # S-expression output for why3pp ppx_deriving ppx_sexp_conv # Coq Support - coqPackages.coq coqPackages.flocq ocamlPackages.camlp5 + coqPackages.coq coqPackages.flocq ]; propagatedBuildInputs = with ocamlPackages; [ camlzip num re sexplib ]; diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index c5fc3a73837..c81d5a9ca61 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { sha256 = "1jx3854zxvfhxrdshbipxfgyq1yxb9ll9agjc2n0cj4vxkjyh9mn"; }; + patches = [ + # musl las no ldconfig, create symlinks explicitly + ./linux-no-ldconfig.patch + ]; + postPatch = "patchShebangs tests/regress/check.sh"; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ cudd gmp-static gperf libpoly ]; configureFlags = @@ -23,22 +29,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - # Usual shenanigans - patchPhase = "patchShebangs tests/regress/check.sh"; - - # Includes a fix for the embedded soname being libyices.so.X.Y, but - # only installing the libyices.so.X.Y.Z file. - installPhase = let - ver_XdotY = lib.versions.majorMinor version; - in '' - make install LDCONFIG=true - # guard against packaging of unstable versions: they - # have a soname of hext (not current) release. - echo "Checking expected library version to be ${version}" - [ -f $out/lib/libyices.so.${version} ] - ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}} - ''; - meta = with lib; { description = "A high-performance theorem prover and SMT solver"; homepage = "http://yices.csl.sri.com"; diff --git a/pkgs/applications/science/logic/yices/linux-no-ldconfig.patch b/pkgs/applications/science/logic/yices/linux-no-ldconfig.patch new file mode 100644 index 00000000000..bad3da6ad4a --- /dev/null +++ b/pkgs/applications/science/logic/yices/linux-no-ldconfig.patch @@ -0,0 +1,13 @@ +--- a/Makefile.build ++++ b/Makefile.build +@@ -474,8 +474,9 @@ install-darwin: install-default + install-solaris: install-default + $(LDCONFIG) -n $(DESTDIR)$(libdir) && (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so) + ++# avoid ldconfig as it's not present on musl + install-linux install-unix: install-default +- $(LDCONFIG) -n $(DESTDIR)$(libdir) && (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so) ++ (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so.$(MAJOR).$(MINOR) && $(LN_S) -f libyices.so.$(MAJOR).$(MINOR) libyices.so) + + # on FreeBSD: the library file is libyices.so.X.Y and ldconfig does not take -n + # TODO: fix this. We must also create a symbolic link: libyices.so.X in libdir diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 1494b532487..85bcd1b2d2f 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "bcal"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "4vR5rcbNkoEdSRNoMH9qMHP3iWFxejkVfXNiYfwbo/A="; + sha256 = "sha256-1k8Q+I1Mc196QL+x4yXzRi7WLBf30U4sJyl0rXisW7k="; }; buildInputs = [ readline ]; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index cbf07135dec..97888b712eb 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://vapier.github.io/pcalc/"; description = "Programmer's calculator"; - license = licenses.gpl2; - maintainers = with lib.maintainers; [ ftrvxmtrx ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ftrvxmtrx ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 3ab7d57f95a..783381f9db0 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "0zgsq9qnyvmq96pgf7372r16rm034fd0r4qa72xi9zbd4f2r7z8w"; + sha256 = "sha256-7YDmojzQujHrsDuB7WC0C3Z2srTd9QUveh1baod3KvU="; }; patches = [ diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bdec2ccc669..f7756f33499 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,12 +1,7 @@ -{ lib, stdenv -, fetchurl -, cmake -, hwloc -, fftw -, perl +{ lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit , singlePrec ? true -, mpiEnabled ? false -, mpi +, enableMpi ? false +, enableCuda ? false , cpuAcceleration ? null }: @@ -24,20 +19,32 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2020.4"; + version = "2021.3"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "1rplvgna60nqyb8nspaz3bfkwb044kv3zxdaa5whql5m441nj6am"; + sha256 = "4QmFbsREdo373kHzBZ4xI6vbj+Vsozsag/Me1FdaHMY="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ fftw perl hwloc ] - ++ (lib.optionals mpiEnabled [ mpi ]); + + buildInputs = [ + fftw + perl + hwloc + blas + lapack + ] ++ lib.optional enableMpi mpi + ++ lib.optional enableCuda cudatoolkit + ; + + propagatedBuildInputs = lib.optional enableMpi mpi; + propagatedUserEnvPkgs = lib.optional enableMpi mpi; cmakeFlags = [ "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" "-DGMX_OPENMP:BOOL=TRUE" + "-DBUILD_SHARED_LIBS=ON" ] ++ ( if singlePrec then [ "-DGMX_DOUBLE=OFF" @@ -46,13 +53,15 @@ in stdenv.mkDerivation rec { "-DGMX_DEFAULT_SUFFIX=OFF" ] ) ++ ( - if mpiEnabled then [ - "-DGMX_MPI:BOOL=TRUE" - "-DGMX_THREAD_MPI:BOOL=FALSE" - ] else [ - "-DGMX_MPI:BOOL=FALSE" - ] - ); + if enableMpi + then [ + "-DGMX_MPI:BOOL=TRUE" + "-DGMX_THREAD_MPI:BOOL=FALSE" + ] + else [ + "-DGMX_MPI:BOOL=FALSE" + ] + ) ++ lib.optional enableCuda "-DGMX_GPU=CUDA"; meta = with lib; { homepage = "http://www.gromacs.org"; @@ -78,5 +87,6 @@ in stdenv.mkDerivation rec { See: http://www.gromacs.org/About_Gromacs for details. ''; platforms = platforms.unix; + maintainers = with maintainers; [ sheepforce markuskowa ]; }; } diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index f5d36c332ae..6b535e5ad41 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , meson @@ -13,18 +14,21 @@ , libwnck , libgee , libgtop +, libhandy +, sassc +, udisks2 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "monitor"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-Gin/1vbQbOAKFrjzDuDTNDQlTGTIlb0NUfIWWXd5tQ4="; + sha256 = "sha256-xWhhjn7zk/juXx50wLG2TpB5aqU+588kWBBquWrVJbM="; fetchSubmodules = true; }; @@ -45,7 +49,10 @@ stdenv.mkDerivation rec { pantheon.wingpanel libgee libgtop + libhandy libwnck + sassc + udisks2 ]; postPatch = '' @@ -70,5 +77,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; + mainProgram = "com.github.stsdc.monitor"; }; } diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 0a23d63e3ea..a25613ba58e 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , rustPlatform , cmake @@ -87,6 +88,14 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; + patches = [ + # Handle PTY EIO error for Rust 1.55+ + (fetchpatch { + url = "https://github.com/alacritty/alacritty/commit/58985a4dcbe464230b5d2566ee68e2d34a1788c8.patch"; + sha256 = "sha256-Z6589yRrQtpx3/vNqkMiGgGsLysd/QyfaX7trqX+k5c="; + }) + ]; + postPatch = '' substituteInPlace alacritty/src/config/ui_config.rs \ --replace xdg-open ${xdg-utils}/bin/xdg-open diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 1d200824535..423c31fd05b 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "sha256-w+FISIeGf3K1dnykIEzU3KevyaFNl4X0beT6DdLW+zQ="; + sha256 = "sha256-4C0vx4m/ojOJl5ownsbasSFiIrJ9kfJJWh0y4j/DGIQ="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index cfd46a613f7..4cd8f72b790 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -100,6 +100,9 @@ buildPythonApplication rec { else "linux-package/bin"; in '' + # Fontconfig error: Cannot load default config file: No such file: (null) + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py ''; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 46d19f2814d..acf647901e9 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.8.3"; + version = "0.9.2"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-lwdsl3dzqrIL1JoBFmldwsCvNCWUcTlgeoEoCvmlTCQ="; + sha256 = "sha256-DJG8C7oSTf4YKeSVytN4pVF4qVImg1bsTYbnfkR+U94="; }; - cargoSha256 = "sha256-7TvxkSJ3iWJnjD3Xe7WDXBNWIyl8U9XTCn9muUG1AmI="; + cargoSha256 = "sha256-mweH+ZIcNGGmoGUhnmZzaB5y14eO/XkHqrL8Nz/b3Jg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 9fa8e6e6253..17484ea3139 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-70FmFN76azRqnAZ9SLgr/V8moqkWoBbDB6IdSXM7Vmg="; + sha256 = "sha256-/czexUqpdsFQAteZ75ur2SFibrtZWffHpPBEPlLQXSY="; }; - vendorSha256 = "sha256-004TspNwjCWnrD86HEf5wGpt8OCP5qIrTwlGWSRNUmg="; + vendorSha256 = "sha256-slMl5dCyyVNBgDbpYECfYUbpJJ7sWuSGSutYR3rTzj0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 6bdefb8cb38..521e42e845f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.33.0"; + version = "2.33.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0kqcs8nj5h7rh3q86pw5777awq7gn77lgxk88ynjl1rfz2snlg5z"; + sha256 = "sha256-4FSm5sKwiL0b/19h7ZulqpHJo81QlTmktBxd3wIgHy8="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -338,6 +338,8 @@ stdenv.mkDerivation { disable_test t6300-for-each-ref #===( 22665;1651 9/? 1/? 0/? 0/? )= =/private/tmp/nix-build-git-2.33.0.drv-2/git-2.33.0/t/../contrib/completion/git-completion.bash: line 405: compgen: command not found disable_test t9902-completion + # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin) + disable_test t5003-archive-zip '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix index 71c40e86aa9..7fd83e6bf7b 100644 --- a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix @@ -2,6 +2,8 @@ , rustPlatform , fetchFromGitHub , withOpenCL ? true +, stdenv +, OpenCL , ocl-icd }: @@ -18,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY="; - buildInputs = lib.optional withOpenCL [ ocl-icd ]; + buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features"; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 0eb806bfeea..c5422d9a6c6 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0989wai2k1gzkmwk5x6f6llsf0nn5jr5dpwayw4f8bws09da6dm6"; + sha256 = "0k2pzbhd95xixh5aqdwf5pafilg85wl46d04xbb4lx6k3gkfv0f3"; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 849965e15f5..24a78848f91 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.17.2"; + version = "2.17.3"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-JfT0jW6aUZAYESQI0tFfnITFv20Jk7DWbvz8Ipt4t1Y="; + sha256 = "sha256-ez+Egl9vvfEZbeIEx7hHmH2Lhyvl93UHRkvkHaG46RQ="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index de0e97501fd..ab84a5143d2 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.5"; + version = "1.15.6"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-W+czWzo4keTLRPDLcTeYl3JSccwfq+P6k4ELADO9FVM="; + sha256 = "sha256-FMM/iQAxJcymv4jYBzaBXG0Uy8UxHh9gFWB5gzV9cn0="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 5e8061c157c..a13aa4ddfab 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "github-desktop"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - sha256 = "sha256-e3XDjVQ5VcsS/MGxNsDs2h77joZAz8mNn+SwrqiUAR0="; + sha256 = "sha256-CcAOATIEcrUKhVQWFr0dMvY9Q5rHWQI9/KdSEZ/ncD4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9f7323f3bf0..279d17937ec 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.3.3", - "repo_hash": "1sh8lf6arqljzc0hmajl2r2j38ahk9hl6kikg9inw72xycrll7dk", - "yarn_hash": "0b6brkxg93gv4gjp1f7qlx7v7q7mb8z9vikcz98igdnhm46nl4dn", + "version": "14.4.1", + "repo_hash": "0sm44iyn32frc7njg6ypgbcip77mj5c3agn3cihk3lz7z5kr48lm", + "yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.3.3-ee", + "rev": "v14.4.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.3.3", - "GITLAB_PAGES_VERSION": "1.44.0", + "GITALY_SERVER_VERSION": "14.4.1", + "GITLAB_PAGES_VERSION": "1.46.0", "GITLAB_SHELL_VERSION": "13.21.1", - "GITLAB_WORKHORSE_VERSION": "14.3.3" + "GITLAB_WORKHORSE_VERSION": "14.4.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 7e53e4ff15b..fe43c494dd4 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -36,6 +36,15 @@ let buildInputs = [ file ]; buildFlags = [ "--enable-system-libraries" ]; }; + # the included yarn rake task attaches the yarn:install task + # to assets:precompile, which is both unnecessary (since we + # run `yarn install` ourselves) and undoes the shebang patches + # in node_modules + railties = x.railties // { + dontBuild = false; + patches = [ ./railties-remove-yarn-install-enhancement.patch ]; + patchFlags = "-p2"; + }; }; groups = [ "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 7eaf3c0f218..662252527f9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.1' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.3.2' +gem 'activesupport', '~> 6.1.4.1' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false @@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.20.0' +gem 'gitlab-labkit', '~> 0.21.1' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index dba345db638..05e75a52413 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.1.3.2) - actionview (= 6.1.3.2) - activesupport (= 6.1.3.2) + actionpack (6.1.4.1) + actionview (= 6.1.4.1) + activesupport (= 6.1.4.1) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.3.2) - activesupport (= 6.1.3.2) + actionview (6.1.4.1) + activesupport (= 6.1.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.3.2) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -65,10 +65,10 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.20.0) + gitlab-labkit (0.21.2) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - grpc (~> 1.19) + grpc (~> 1.30) jaeger-client (~> 1.1) opentracing (~> 0.4) pg_query (~> 2.1) @@ -94,7 +94,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.10.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -139,7 +139,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rainbow (3.0.0) rbtrace (0.4.14) @@ -147,7 +147,7 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (6.3.2) - redis (4.2.5) + redis (4.4.0) regexp_parser (1.8.1) reverse_markdown (1.4.0) nokogiri @@ -197,7 +197,7 @@ GEM stringex (2.8.5) thor (1.1.0) thread_safe (0.3.6) - thrift (0.14.1) + thrift (0.15.0) timecop (0.9.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) @@ -216,13 +216,13 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.3.2) + activesupport (~> 6.1.4.1) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.20.0) + gitlab-labkit (~> 0.21.1) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.17.0) grpc (~> 1.30.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 26deabcc230..c6f4df53774 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -20,7 +20,7 @@ let }; }; }; - version = "14.3.3"; + version = "14.4.1"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -32,7 +32,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-WC361E+p3i02n2YCOwUzRxCWFt5UMEfJi6tHZPj1dgo="; + sha256 = "sha256-bATqaB7q3MlyacEiBXdcEDs+xsJUbULVnYTSpEznxFg="; }; vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index dea32e94b13..4aad9394cd6 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5"; + sha256 = "0xgysqnibjsy6kdz10x2xb3kwa6lssiqhh0zggrbgs31ypwhlpia"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn"; + sha256 = "1yf4ic5kl324rs0raralpwx24s6hvvdzxfhinafylf8f3x7jj23z"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -269,10 +269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1krn6vi33i5vqbz3gmwzj9f9ifda41a3as3chpl899mrgni61q6r"; + sha256 = "0xkzm6kri1dzjrmicm3wgbnxi9gk0byanr6ibfrflv7spd98fz19"; type = "gem"; }; - version = "0.20.0"; + version = "0.21.2"; }; gitlab-markup = { groups = ["default"]; @@ -383,10 +383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly"; + sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; type = "gem"; }; - version = "2.10.0"; + version = "2.12.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -643,10 +643,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; + sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.2"; }; rainbow = { source = { @@ -682,10 +682,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48"; + sha256 = "1ig832dp0xmpp6a934nifzaj7wm9lzjxzasw911fagycs8p6m720"; type = "gem"; }; - version = "4.2.5"; + version = "4.4.0"; }; regexp_parser = { groups = ["default" "development" "test"]; @@ -899,10 +899,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfa4120a7yl3gxjcx990gyawsshfr22gfv5rvgpk72l2p9j2420"; + sha256 = "0rb9nax4k72zbriq7k98shfcj4lf54sqjpin2xm6ma7bb48ra8mc"; type = "gem"; }; - version = "0.14.1"; + version = "0.15.0"; }; timecop = { source = { diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 3e3bc25162b..63df2be4a27 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.3.3"; + version = "14.4.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-piA14jYFV+FD20kR38rN1o329eeYAW/PmS0QI1GaU50="; + vendorSha256 = "sha256-yLZY9FFUS4nJl4TkE6MwICCEwtPTXFc5zuj4FgiIy74="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch b/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch new file mode 100644 index 00000000000..25cbf775e63 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch @@ -0,0 +1,13 @@ +diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake +index 0226da721a..365cdeb0f9 100644 +--- a/railties/lib/rails/tasks/yarn.rake ++++ b/railties/lib/rails/tasks/yarn.rake +@@ -27,8 +27,3 @@ namespace :yarn do + exit 1 + end + end +- +-# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use. +-if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn")) +- Rake::Task["assets:precompile"].enhance [ "yarn:install" ] +-end diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 08a9b090c66..0713560ead8 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.3.2' +gem 'rails', '~> 6.1.4.1' gem 'bootsnap', '~> 1.4.6' @@ -92,7 +92,7 @@ gem 'net-ldap', '~> 0.16.3' # API gem 'grape', '~> 1.5.2' -gem 'grape-entity', '~> 0.9.0' +gem 'grape-entity', '~> 0.10.0' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' # GraphQL API @@ -129,7 +129,7 @@ gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.1.1', require: false +gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false # for Google storage gem 'google-api-client', '~> 0.33' @@ -154,7 +154,7 @@ gem 'html-pipeline', '~> 2.13.2' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.21' +gem 'commonmarker', '~> 0.23.2' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -165,7 +165,7 @@ gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.5.0', require: false -gem 'rouge', '~> 3.26.0' +gem 'rouge', '~> 3.26.1' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.11.4' @@ -195,10 +195,10 @@ gem 'state_machines-activerecord', '~> 0.8.0' gem 'acts-as-taggable-on', '~> 7.0' # Background jobs -gem 'sidekiq', '~> 5.2.7' +gem 'sidekiq', '~> 6.2.2' gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.8.1' -gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch' +gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'fugit', '~> 1.2.1' @@ -229,7 +229,7 @@ gem 'js_regex', '~> 3.7' gem 'device_detector' # Redis -gem 'redis', '~> 4.1.4' +gem 'redis', '~> 4.4.0' gem 'connection_pool', '~> 2.0' # Redis session store @@ -341,7 +341,7 @@ group :development do gem 'lefthook', '~> 0.7.0', require: false gem 'solargraph', '~> 0.43', require: false - gem 'letter_opener_web', '~> 1.4.0' + gem 'letter_opener_web', '~> 1.4.1' # Better errors handler gem 'better_errors', '~> 2.9.0' @@ -355,7 +355,7 @@ group :development, :test do gem 'bullet', '~> 6.1.3' gem 'pry-byebug' gem 'pry-rails', '~> 0.3.9' - gem 'pry-shell', '~> 0.4.0' + gem 'pry-shell', '~> 0.5.0' gem 'awesome_print', require: false @@ -424,7 +424,7 @@ group :test do gem 'webmock', '~> 3.9.1' gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 0.12.0' + gem 'test-prof', '~> 1.0.7' gem 'rspec_junit_formatter' gem 'guard-rspec' @@ -474,7 +474,7 @@ end gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.3.0.pre.rc1' +gem 'gitaly', '~> 14.3.0.pre.rc2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 51ccc8a03cc..8a135d809ba 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -4,63 +4,63 @@ GEM RedCloth (4.3.2) acme-client (2.0.6) faraday (>= 0.17, < 2.0.0) - actioncable (6.1.3.2) - actionpack (= 6.1.3.2) - activesupport (= 6.1.3.2) + actioncable (6.1.4.1) + actionpack (= 6.1.4.1) + activesupport (= 6.1.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.3.2) - actionpack (= 6.1.3.2) - activejob (= 6.1.3.2) - activerecord (= 6.1.3.2) - activestorage (= 6.1.3.2) - activesupport (= 6.1.3.2) + actionmailbox (6.1.4.1) + actionpack (= 6.1.4.1) + activejob (= 6.1.4.1) + activerecord (= 6.1.4.1) + activestorage (= 6.1.4.1) + activesupport (= 6.1.4.1) mail (>= 2.7.1) - actionmailer (6.1.3.2) - actionpack (= 6.1.3.2) - actionview (= 6.1.3.2) - activejob (= 6.1.3.2) - activesupport (= 6.1.3.2) + actionmailer (6.1.4.1) + actionpack (= 6.1.4.1) + actionview (= 6.1.4.1) + activejob (= 6.1.4.1) + activesupport (= 6.1.4.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.3.2) - actionview (= 6.1.3.2) - activesupport (= 6.1.3.2) + actionpack (6.1.4.1) + actionview (= 6.1.4.1) + activesupport (= 6.1.4.1) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.3.2) - actionpack (= 6.1.3.2) - activerecord (= 6.1.3.2) - activestorage (= 6.1.3.2) - activesupport (= 6.1.3.2) + actiontext (6.1.4.1) + actionpack (= 6.1.4.1) + activerecord (= 6.1.4.1) + activestorage (= 6.1.4.1) + activesupport (= 6.1.4.1) nokogiri (>= 1.8.5) - actionview (6.1.3.2) - activesupport (= 6.1.3.2) + actionview (6.1.4.1) + activesupport (= 6.1.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.3.2) - activesupport (= 6.1.3.2) + activejob (6.1.4.1) + activesupport (= 6.1.4.1) globalid (>= 0.3.6) - activemodel (6.1.3.2) - activesupport (= 6.1.3.2) - activerecord (6.1.3.2) - activemodel (= 6.1.3.2) - activesupport (= 6.1.3.2) + activemodel (6.1.4.1) + activesupport (= 6.1.4.1) + activerecord (6.1.4.1) + activemodel (= 6.1.4.1) + activesupport (= 6.1.4.1) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.1.3.2) - actionpack (= 6.1.3.2) - activejob (= 6.1.3.2) - activerecord (= 6.1.3.2) - activesupport (= 6.1.3.2) + activestorage (6.1.4.1) + actionpack (= 6.1.4.1) + activejob (= 6.1.4.1) + activerecord (= 6.1.4.1) + activesupport (= 6.1.4.1) marcel (~> 1.0.0) - mini_mime (~> 1.0.2) - activesupport (6.1.3.2) + mini_mime (>= 1.1.0) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -193,8 +193,7 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.21.0) - ruby-enum (~> 0.5) + commonmarker (0.23.2) concurrent-ruby (1.1.9) connection_pool (2.2.2) contracts (0.11.0) @@ -446,7 +445,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.3.0.pre.rc1) + gitaly (14.3.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -461,7 +460,7 @@ GEM activesupport (>= 3.0) request_store (>= 1.0) scientist (~> 1.6, >= 1.6.0) - gitlab-fog-azure-rm (1.1.1) + gitlab-fog-azure-rm (1.2.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) @@ -484,8 +483,8 @@ GEM addressable (~> 2.7) omniauth (~> 1.9) openid_connect (~> 1.2) - gitlab-sidekiq-fetcher (0.5.6) - sidekiq (~> 5) + gitlab-sidekiq-fetcher (0.8.0) + sidekiq (~> 6.1) gitlab-styles (6.3.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) @@ -499,8 +498,8 @@ GEM omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) gon (6.4.0) actionpack (>= 3.0.20) i18n (>= 0.7) @@ -536,7 +535,7 @@ GEM mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - grape-entity (0.9.0) + grape-entity (0.10.0) activesupport (>= 3.0.0) multi_json (>= 1.3.2) grape-path-helpers (1.7.0) @@ -693,7 +692,7 @@ GEM lefthook (0.7.5) letter_opener (1.7.0) launchy (~> 2.2) - letter_opener_web (1.4.0) + letter_opener_web (1.4.1) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -740,7 +739,7 @@ GEM mime-types-data (3.2020.0512) mini_histogram (0.3.1) mini_magick (4.10.1) - mini_mime (1.0.2) + mini_mime (1.1.1) mini_portile2 (2.5.3) minitest (5.11.3) mixlib-cli (2.1.8) @@ -777,7 +776,7 @@ GEM net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.0.0) netrc (0.11.0) - nio4r (2.5.4) + nio4r (2.5.8) no_proxy_fix (0.1.2) nokogiri (1.11.7) mini_portile2 (~> 2.5.0) @@ -901,7 +900,7 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.2.3) - pg_query (2.1.0) + pg_query (2.1.1) google-protobuf (>= 3.17.1) plist (3.6.0) png_quantizator (0.2.1) @@ -927,7 +926,7 @@ GEM pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) - pry-shell (0.4.1) + pry-shell (0.5.0) pry (~> 0.13.0) tty-markdown tty-prompt @@ -953,27 +952,25 @@ GEM httpclient json-jwt (>= 1.11.0) rack (>= 2.1.0) - rack-protection (2.0.5) - rack rack-proxy (0.6.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.1.3.2) - actioncable (= 6.1.3.2) - actionmailbox (= 6.1.3.2) - actionmailer (= 6.1.3.2) - actionpack (= 6.1.3.2) - actiontext (= 6.1.3.2) - actionview (= 6.1.3.2) - activejob (= 6.1.3.2) - activemodel (= 6.1.3.2) - activerecord (= 6.1.3.2) - activestorage (= 6.1.3.2) - activesupport (= 6.1.3.2) + rails (6.1.4.1) + actioncable (= 6.1.4.1) + actionmailbox (= 6.1.4.1) + actionmailer (= 6.1.4.1) + actionpack (= 6.1.4.1) + actiontext (= 6.1.4.1) + actionview (= 6.1.4.1) + activejob (= 6.1.4.1) + activemodel (= 6.1.4.1) + activerecord (= 6.1.4.1) + activestorage (= 6.1.4.1) + activesupport (= 6.1.4.1) bundler (>= 1.15.0) - railties (= 6.1.3.2) + railties (= 6.1.4.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -987,11 +984,11 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.3.2) - actionpack (= 6.1.3.2) - activesupport (= 6.1.3.2) + railties (6.1.4.1) + actionpack (= 6.1.4.1) + activesupport (= 6.1.4.1) method_source - rake (>= 0.8.7) + rake (>= 0.13) thor (~> 1.0) rainbow (3.0.0) rake (13.0.6) @@ -1011,7 +1008,7 @@ GEM recaptcha (4.13.1) json recursive-open-struct (1.1.3) - redis (4.1.4) + redis (4.4.0) redis-actionpack (5.2.0) actionpack (>= 5, < 7) redis-rack (>= 2.1.0, < 3) @@ -1045,7 +1042,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (3.26.0) + rouge (3.26.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1109,8 +1106,6 @@ GEM rubocop-rspec (1.44.1) rubocop (~> 0.87) rubocop-ast (>= 0.7.1) - ruby-enum (0.8.0) - i18n ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-magic (0.4.0) @@ -1169,11 +1164,10 @@ GEM shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) - sidekiq (5.2.9) - connection_pool (~> 2.2, >= 2.2.2) + sidekiq (6.2.2) + connection_pool (>= 2.2.2) rack (~> 2.0) - rack-protection (>= 1.5.0) - redis (>= 3.3.5, < 4.2) + redis (>= 4.2.0) sidekiq-cron (1.0.4) fugit (~> 1.1) sidekiq (>= 4.2.1) @@ -1251,7 +1245,7 @@ GEM unicode-display_width (~> 1.1, >= 1.1.1) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (0.12.0) + test-prof (1.0.7) test_file_finder (0.1.4) faraday (~> 1.0) text (1.3.1) @@ -1351,7 +1345,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.6.1) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) wikicloth (0.8.1) @@ -1408,7 +1402,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.21) + commonmarker (~> 0.23.2) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) @@ -1458,19 +1452,19 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.3.0.pre.rc1) + gitaly (~> 14.3.0.pre.rc2) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 2.3.0) gitlab-experiment (~> 0.6.4) - gitlab-fog-azure-rm (~> 1.1.1) + gitlab-fog-azure-rm (~> 1.2.0) gitlab-labkit (~> 0.21.1) gitlab-license (~> 2.0) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.8.0) - gitlab-sidekiq-fetcher (= 0.5.6) + gitlab-sidekiq-fetcher (= 0.8.0) gitlab-styles (~> 6.3.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) @@ -1479,7 +1473,7 @@ DEPENDENCIES google-protobuf (~> 3.17.1) gpgme (~> 2.0.19) grape (~> 1.5.2) - grape-entity (~> 0.9.0) + grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.0) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) @@ -1512,7 +1506,7 @@ DEPENDENCIES kramdown (~> 2.3.1) kubeclient (~> 4.9.2) lefthook (~> 0.7.0) - letter_opener_web (~> 1.4.0) + letter_opener_web (~> 1.4.1) license_finder (~> 6.0) licensee (~> 9.14.1) lockbox (~> 0.6.2) @@ -1563,7 +1557,7 @@ DEPENDENCIES prometheus-client-mmap (~> 0.15.0) pry-byebug pry-rails (~> 0.3.9) - pry-shell (~> 0.4.0) + pry-shell (~> 0.5.0) puma (~> 5.3.1) puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) @@ -1572,7 +1566,7 @@ DEPENDENCIES rack-oauth2 (~> 1.16.0) rack-proxy (~> 0.6.0) rack-timeout (~> 0.5.1) - rails (~> 6.1.3.2) + rails (~> 6.1.4.1) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) @@ -1581,14 +1575,14 @@ DEPENDENCIES rdoc (~> 6.3.2) re2 (~> 1.2.0) recaptcha (~> 4.11) - redis (~> 4.1.4) + redis (~> 4.4.0) redis-actionpack (~> 5.2.0) redis-namespace (~> 1.8.1) request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 3.26.0) + rouge (~> 3.26.1) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 5.0.1) @@ -1611,7 +1605,7 @@ DEPENDENCIES sentry-raven (~> 3.1) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) - sidekiq (~> 5.2.7) + sidekiq (~> 6.2.2) sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.18.5) @@ -1628,7 +1622,7 @@ DEPENDENCIES state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.1.6) terser (= 1.0.2) - test-prof (~> 0.12.0) + test-prof (~> 1.0.7) test_file_finder (~> 0.1.3) thin (~> 1.8.0) thrift (>= 0.14.0) @@ -1650,4 +1644,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.2.20 + 2.2.24 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 0eb5dc16a3f..2c1f53c0b3a 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15r6ab17iwhhq92by4ah9z4wwvjbr07qn16x8pn2ypgqwvfy74h7"; + sha256 = "0ilq5mniarm0zlvnkagqj9n9p73ljrhphciz02aymrpfxxxclz2x"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1r3x9fbq5wlgn4xhqw48la09q7f97zna7ld5fglk3jpmh973x5"; + sha256 = "16azdnjws215clb056b9mabglx4b8f61hr82hv7hm80dmn89zqq6"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqdaykzgib8fsldkxdkw0w44jzz4grvb028crzg0qpwvv03g2wp"; + sha256 = "00s07l2ac5igch1g2rpa0linmiq7mhgk6v6wxkckg8gbiqijb592"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5"; + sha256 = "0xgysqnibjsy6kdz10x2xb3kwa6lssiqhh0zggrbgs31ypwhlpia"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zfrkcnp9wy1dm4b6iqf29858dp04a62asfmldainqmv4a7931q7"; + sha256 = "0m4fy4qqh09vnzbhx383vjdfid6fzbs49bzzg415x05nmmjkx582"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn"; + sha256 = "1yf4ic5kl324rs0raralpwx24s6hvvdzxfhinafylf8f3x7jj23z"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p80rbahcxhxlkxgf4bh580hbifn9q4gr5g9fy8fd0z5g6gr9xxq"; + sha256 = "1q7c0i0kwarxgcbxk71wa9jnlg45grbxmhlrh7dk9bgcv7r7r7hn"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpd3hh4ryyr84drj6m0b5sy6929nyf50bfgksw1hpc594542nal"; + sha256 = "16ixam4lni8b5lgx0whnax0imzh1dh10fy5r9pxs52n83yz5nbq3"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fg58qma2zgrz0gr61p61qcz8c3h88fd5lbdrkpkm96aq5shwh68"; + sha256 = "1ccgvlj767ybps3pxlaa4iw77n7wbriw2sr8754id3ngjfap08ja"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sbpkk3r8qi47bd0ilznq4gpfyfwm2bwvxqb5z0wc75h3zj1jhqg"; + sha256 = "17knzz9fvqg4x582vy0xmlgjkxfb13xyzl2rgw19qfma86hxsvvi"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -790,15 +790,14 @@ version = "3.1.2"; }; commonmarker = { - dependencies = ["ruby-enum"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vwpkmwfr8lx8b6cfvwh56f1ygyf2da5ah37mxbdr9mxmfwig5fr"; + sha256 = "0sshs8mvjgk73sfz3bi9apq0p99kfj7n9bg1cyldl4yyy2z05prs"; type = "gem"; }; - version = "0.21.0"; + version = "0.23.2"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -1911,10 +1910,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k0jrimdg0pij75hndkrl28hqgvsnl7sdn5k6mjv3sjwbm1p217w"; + sha256 = "197db842msm326ib8r3gqlavf5d11r4cd9jg4wjnyar3ccyr9dn7"; type = "gem"; }; - version = "14.3.0.pre.rc1"; + version = "14.3.0.pre.rc2"; }; github-markup = { groups = ["default"]; @@ -1976,10 +1975,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k5f3vyy2jqv3zdkdqal6sgn447zakz8xcc04432qd806s7g9i89"; + sha256 = "1hi9v0zy863gnk17w0fp1ks2kr1s2z6q0bkx5wdbq6yawycjs94h"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2049,10 +2048,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0838p0vnyl65571d8j5hljwyfyhsnfs6dlj6di57gpmwrbl9sdpr"; + sha256 = "0qkkwd2sj9l6nmvipd1308ni01m2n8ixqwl6syl493cm5am4qmlw"; type = "gem"; }; - version = "0.5.6"; + version = "0.8.0"; }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; @@ -2093,10 +2092,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; + sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; type = "gem"; }; - version = "0.4.2"; + version = "0.5.2"; }; gon = { dependencies = ["actionpack" "i18n" "multi_json" "request_store"]; @@ -2191,10 +2190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqk33djlyvkinj0vxblfcib86bk9dy0iq2c3j2yalxyrpns3kfr"; + sha256 = "1zic5fx8s0424vdarhslmxdqmfnlfv3k4prfyxrrwvf9pdy1xvcs"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; grape-path-helpers = { dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; @@ -2832,10 +2831,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pianlrbf9n7jrqxpyxgsfk1j1d312d57d6gq7yxni6ax2q0293q"; + sha256 = "0kgz2n0cyw3m8ipvijlikb6bldmzhnq451b9d7w5l74gw2fhqckg"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; libyajl2 = { groups = ["default"]; @@ -3054,10 +3053,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + sha256 = "173dp4vqvx1sl6aq83daxwn5xvb5rn3jgynjmb91swl7gmgp17yl"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.1"; }; mini_portile2 = { groups = ["default" "development" "test"]; @@ -3302,10 +3301,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; type = "gem"; }; - version = "2.5.4"; + version = "2.5.8"; }; no_proxy_fix = { groups = ["default" "development"]; @@ -3805,10 +3804,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12dibsqndfnckc24yryy8v467rxp7p80jx21jhm8z7swp8118jhx"; + sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; plist = { groups = ["default"]; @@ -3927,10 +3926,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wyx2rz58lfys1h62h6inz7ggq8xckqyfxndk8jq2cbkkdi2n6d7"; + sha256 = "1jn3f5d9h2kg3hc4q7nzxfian4bhs23hh8n6g6hm9nzxqqbh9448"; type = "gem"; }; - version = "0.4.1"; + version = "0.5.0"; }; public_suffix = { groups = ["default" "development" "test"]; @@ -4048,17 +4047,6 @@ }; version = "1.16.0"; }; - rack-protection = { - dependencies = ["rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; - type = "gem"; - }; - version = "2.0.5"; - }; rack-proxy = { dependencies = ["rack"]; groups = ["default"]; @@ -4097,10 +4085,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0flnpli87b9j0zvb3c4l5addjbznbpkbmp1wzfjc1gh8qxlhcs1n"; + sha256 = "1y59m2x8rdc581bjgyyr9dabi3vk3frqhhpbb5ldpbj622kxfpbz"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4152,10 +4140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17r1pr8d467vh3zkciw4wmrcixj9zjrvd11nxn2z091bkzf66xq2"; + sha256 = "1kwpm068cqys34p2g0j3l1g0cd5f3kxnsay5v7lmbd0sgarac0vy"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -4300,10 +4288,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0p82yb2a0z2sv38jq9xdzs0kvbslpyfdxky9f3znpy3igxj6yh"; + sha256 = "1ig832dp0xmpp6a934nifzaj7wm9lzjxzasw911fagycs8p6m720"; type = "gem"; }; - version = "4.1.4"; + version = "4.4.0"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -4465,14 +4453,14 @@ version = "6.2.0"; }; rouge = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; + sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; type = "gem"; }; - version = "3.26.0"; + version = "3.26.1"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4671,17 +4659,6 @@ }; version = "1.44.1"; }; - ruby-enum = { - dependencies = ["i18n"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d3dyx2z41zd6va9dwn3q8caf710vzdaf57xspc0y17aqmnprwnw"; - type = "gem"; - }; - version = "0.8.0"; - }; ruby-fogbugz = { dependencies = ["crack"]; groups = ["default"]; @@ -5008,15 +4985,15 @@ version = "4.0.1"; }; sidekiq = { - dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kw4z9mr8h1rddx6f81gf7glw9pf90w0kvgc2fx4g9hspgh9xh7y"; + sha256 = "104a97cl94aclg71ngrr097zjbdf6cibnz4q3rqjb88izmd7cfk6"; type = "gem"; }; - version = "5.2.9"; + version = "6.2.2"; }; sidekiq-cron = { dependencies = ["fugit" "sidekiq"]; @@ -5351,10 +5328,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdb0szrj4mbczhlx2inszpj54rgnayvy2f2fff4q7jll2iz61i0"; + sha256 = "1vg0zjfgibdcgkzb4c25v0f4v6v8mvpzvgcag194rwglmkkyrwkx"; type = "gem"; }; - version = "0.12.0"; + version = "1.0.7"; }; test_file_finder = { dependencies = ["faraday"]; @@ -5824,10 +5801,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; + sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.5"; }; websocket-extensions = { groups = ["default" "test"]; diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 33716a48fb0..dd9b07f7faf 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,8 +4,8 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2056"; - sha256 = "08472214kazx9fdw7y8gy0bp63mqxcpa79myn2w95wdp0mrlr119"; + buildVersion = "2063"; + sha256 = "l6vxcOIQ3kQqNzLkf3PbuU3DpDfLh0tXCl/LnJsCt2k="; } {}; sublime-merge-dev = common { diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 84716e76081..3f33edc9538 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "vcsh"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0qdd4f6rm5rhnym9f114pcj9vafhjjpg962c4g420rn78fxhpz1z"; + sha256 = "sha256-W/Ql2J9HTDQPu0el34mHVzqe85KGWLPph2sHyuEzPPI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix new file mode 100644 index 00000000000..1575421175d --- /dev/null +++ b/pkgs/applications/video/entangle/default.nix @@ -0,0 +1,125 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, libxml2 +, meson +, ninja +, perl +, python3 +, pkgconf +, wrapGAppsHook +, at-spi2-core +, dbus +, elfutils +, epoxy +, gexiv2 +, glib +, gobject-introspection +, gst-plugins-base +, gstreamer +, gtk3 +, lcms2 +, libdatrie +, libgphoto2 +, libgudev +, libpeas +, libraw +, libselinux +, libsepol +, libthai +, libunwind +, libxkbcommon +, orc +, pcre +, udev +, util-linux +, xorg +}: + +stdenv.mkDerivation rec { + pname = "entangle"; + version = "3.0"; + + src = fetchFromGitLab { + owner = "entangle"; + repo = "entangle"; + rev = "v${version}"; + sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0="; + }; + + nativeBuildInputs = [ + cmake + glib.dev + libxml2.bin # for xmllint + meson + ninja + perl # for pod2man and build scripts + python3 # for build scripts + pkgconf + wrapGAppsHook + ]; + + buildInputs = [ + at-spi2-core + dbus + epoxy + elfutils + gexiv2 + glib + gobject-introspection + gst-plugins-base + gstreamer + gtk3 + lcms2 + libdatrie + libgphoto2 + libgudev + libpeas + libraw + libselinux + libsepol + libthai + libunwind + libxkbcommon + orc + pcre + udev + util-linux + ] ++ (with xorg; [ + libXdmcp + libXtst + ]); + + dontUseCmakeConfigure = true; + + # Disable building of doc/reference since it requires network connection to render XML to HTML + # Patch build script shebangs + postPatch = '' + sed -i "/subdir('reference')/d" "docs/meson.build" + patchShebangs --build build-aux meson_post_install.py + sed -i meson_post_install.py \ + -e "/print('Update icon cache...')/d" \ + -e "/gtk-update-icon-cache/d" + ''; + + postInstall = '' + substituteInPlace "$out/share/applications/org.entangle_photo.Manager.desktop" \ + --replace "Exec=entangle" "Exec=$out/bin/entangle" + ''; + + meta = with lib; { + description = "Tethered camera control and capture"; + longDescription = '' + Entangle uses GTK and libgphoto2 to provide a graphical interface + for tethered photography with digital cameras. + It includes control over camera shooting and configuration settings + and 'hands off' shooting directly from the controlling computer. + This app can also serve as a camera app for mobile devices. + ''; + homepage = "https://gitlab.com/entangle/entangle"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 8c23bfc5c29..82d34d188ff 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -94,9 +94,6 @@ mkDerivation rec { mv $out/Resources/* "$out/Applications/Jellyfin Media Player.app/Contents/Resources/" rmdir $out/Resources - # fix 'Could not find the Qt platform plugin "cocoa" in ""' error - wrapQtApp "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" - ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer ''; diff --git a/pkgs/applications/video/kodi-packages/jellyfin/default.nix b/pkgs/applications/video/kodi-packages/jellyfin/default.nix index b162ca11fa8..59aaa2e8b26 100644 --- a/pkgs/applications/video/kodi-packages/jellyfin/default.nix +++ b/pkgs/applications/video/kodi-packages/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "0.7.4"; + version = "0.7.7"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "1ykgz1l2gmpdlsp3fbm31q8757879i9dd13svslqykvxadg69x03"; + sha256 = "06glhnpayldficvvhlkbxg7zizl2wqms66fnc3p63nm3y7mqa9dd"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/youtube/default.nix b/pkgs/applications/video/kodi-packages/youtube/default.nix index 7c16aa606f2..090e09d55ef 100644 --- a/pkgs/applications/video/kodi-packages/youtube/default.nix +++ b/pkgs/applications/video/kodi-packages/youtube/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "6.8.17+matrix.1"; + version = "6.8.18+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "AuYoUyv0DDtHnxFiNl3AF5jrMjuNRXdlJvw7d7b+yh8="; + sha256 = "F950rnE/YxwWI0ieHC2TdGNSfrQDHlStnxLbA6UjEaM="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 1ad0dee49c7..7221e668f4e 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -38,15 +38,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20211006"; - kodiVersion = "19.2"; + kodiReleaseDate = "20211024"; + kodiVersion = "19.3"; rel = "Matrix"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "sha256-w5m7xlnjQDJ4l75b3ctF0wMZ4kqi+H0X6WFLs0gV6lM="; + sha256 = "02bnknk87zzv9j6b6k9c0xx47q2gh399j6v25rm94g7rhzf8phbw"; }; ffmpeg = stdenv.mkDerivation rec { diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/applications/video/molotov/default.nix index 3015bc1191b..670eef3aa3e 100644 --- a/pkgs/applications/video/molotov/default.nix +++ b/pkgs/applications/video/molotov/default.nix @@ -3,17 +3,16 @@ let pname = "molotov"; version = "4.4.0"; - name = "${pname}-${version}"; src = fetchurl { url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage"; sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D \ ${appimageContents}/@molotovdesktop-wrapper.desktop \ $out/share/applications/${pname}.desktop diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 37daa870c6e..fd5b2888d63 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sub-batch"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "kl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5fDnSmnnVB1RGrNrnmp40OGFF+OAhppnhOjVgnYxXr0="; + sha256 = "sha256-WUW+lOGbZ82NJxmW+Ogxslf3COOp62aZ/08Yn26l4T0="; }; - cargoSha256 = "sha256-+ufa4Cgue8o9CTB3JDcQ38SlUq8PcRDyj+qNSAFpTas="; + cargoSha256 = "sha256-m9nBubmuuOcJyegmYGJizY/2b7oamBHKFNIaxOtikcA="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 933747f3989..580c10da1d5 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "3.27"; + version = "4.6"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - sha256 = "1max2171abdpix0wq7mdkji5lvkfzisj166qfgmqkkwc2nh721iw"; + sha256 = "sha256-FBgnE9EKZf3aYrGNf9cday9r4Q7Ztu7g+0LnFKAhvrI="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 265ef82528d..c45c982d651 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.4.7"; + version = "2.5.6"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - sha256 = "sha256-hDJ/DemWuLddDvXGqxkSTIqATlWUjolcP7ojjhK2CDk="; + sha256 = "sha256-hgP8EIGwEPj30fijZzcujnvutG+acU4qqqvgY6FB/z4="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 6f701779d4d..d694ad8004e 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -130,12 +130,12 @@ in { epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; - version = "20191202"; + version = "2.4.1"; src = fetchgit { url = "git://projects.vdr-developer.org/vdr-plugin-epgsearch.git"; - sha256 = "18kskwnnscr4rb4yzfikw1la318zjgraf340cl7n9z77chi2gi8m"; - rev = "602d66c55964998ce25c6c57b302949a9517f149"; + sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U="; + rev = "v${version}"; }; postPatch = '' diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 1788c970f29..c91bf3d142a 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -11,7 +11,6 @@ , yajl , nixosTests , criu -, system }: let @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { buildInputs = [ libcap libseccomp systemd yajl ] # Criu currently only builds on x86_64-linux - ++ lib.optional (lib.elem system criu.meta.platforms) criu; + ++ lib.optional (lib.elem stdenv.hostPlatform.system criu.meta.platforms) criu; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/ignite/default.nix b/pkgs/applications/virtualization/ignite/default.nix index 5439ad57b1a..9ab1d36fef5 100644 --- a/pkgs/applications/virtualization/ignite/default.nix +++ b/pkgs/applications/virtualization/ignite/default.nix @@ -11,13 +11,13 @@ buildGoModule rec{ pname = "ignite"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "ignite"; rev = "v${version}"; - sha256 = "sha256-rjCsZ12DHcSw5GZu6jGTtqCPOZDSbYoMplkqvspbvO8="; + sha256 = "sha256-WCgNh+iLtxLslzcHuIwVLZpUEhvBJFe1Y84PaPtbtcY="; leaveDotGit = true; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 224969cc264..4e0f459ac28 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -92,6 +92,11 @@ stdenv.mkDerivation rec { sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2"; revert = true; }) + (fetchpatch { + name = "CVE-2021-3713.patch"; # remove with next release + url = "https://gitlab.com/qemu-project/qemu/-/commit/13b250b12ad3c59114a6a17d59caf073ce45b33a.patch"; + sha256 = "0lkzfc7gdlvj4rz9wk07fskidaqysmx8911g914ds1jnczgk71mf"; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index 054918dabf1..6161c006357 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, dtc, nixosTests, fetchpatch }: +{ lib, stdenv, fetchgit, dtc, fetchpatch }: stdenv.mkDerivation rec { pname = "spike"; @@ -28,9 +28,20 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests = { - can-run-hello-world = nixosTests.spike; - }; + # To test whether spike is working, we run the RISC-V hello applications using the RISC-V proxy + # kernel on the Spike emulator and see whether we get the expected output. + doInstallCheck = true; + installCheckPhase = + let + riscvPkgs = import ../../../.. { crossSystem = lib.systems.examples.riscv64-embedded; }; + in + '' + runHook preInstallCheck + + $out/bin/spike -m64 ${riscvPkgs.riscv-pk}/bin/pk ${riscvPkgs.hello}/bin/hello | grep -Fq "Hello, world" + + runHook postInstallCheck + ''; meta = with lib; { description = "A RISC-V ISA Simulator"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 0d6d707a60d..98c7f80df8a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,14 +23,14 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.26"; + version = "6.1.28"; in stdenv.mkDerivation { pname = "virtualbox"; inherit version; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195"; + sha256 = "8d34993d8e9c0cf35e7bd44dd26c8c757f17a3b7d5a64052f945d00fd798ebfe"; }; outputs = [ "out" "modsrc" ]; @@ -94,9 +94,6 @@ in stdenv.mkDerivation { }) ++ [ ./qtx11extras.patch - # Temporary workaround for broken build - # https://www.virtualbox.org/pipermail/vbox-dev/2021-July/015670.html - ./fix-configure-pkgconfig-qt.patch # https://github.com/NixOS/nixpkgs/issues/123851 ./fix-audio-driver-loading.patch ]; @@ -202,11 +199,6 @@ in stdenv.mkDerivation { done ''} - # https://github.com/NixOS/nixpkgs/issues/137104 - ${optionalString (enableHardening || headless) '' - rm $libexec/components/VBoxREM.so - ''} - cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 5ed763fa2e7..7842e0ce89f 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "aaa1a1f8615d5bd2e08b158ce6f415262fbb595e169e2d415c5b1844ac258eee"; + let value = "85d7858a95d802c41cb86e1b573dc501d782e5d040937e0d8505a37c29509774"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 66bd2966f5d..83dd8f6e793 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "22d02ec417cd7723d7269dbdaa71c48815f580c0ca7a0606c42bd623f84873d7"; + sha256 = "eab85206cfb9d7087982deb2635d19a4244a3c6783622a4817fb1a31e48e98e5"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index 180ea88461e..786a476df51 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -1,8 +1,8 @@ diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h -index c1daa8f..8618371 100644 +index 25b918d1..1420ff1d 100644 --- a/include/iprt/mangling.h +++ b/include/iprt/mangling.h -@@ -1440,6 +1440,7 @@ +@@ -1695,6 +1695,7 @@ # define RTPathStripSuffix RT_MANGLER(RTPathStripSuffix) # define RTPathStripFilename RT_MANGLER(RTPathStripFilename) # define RTPathStripTrailingSlash RT_MANGLER(RTPathStripTrailingSlash) @@ -10,7 +10,7 @@ index c1daa8f..8618371 100644 # define RTPathTemp RT_MANGLER(RTPathTemp) # define RTPathTraverseList RT_MANGLER(RTPathTraverseList) # define RTPathUnlink RT_MANGLER(RTPathUnlink) -@@ -1478,6 +1479,7 @@ +@@ -1734,6 +1735,7 @@ # define RTProcGetAffinityMask RT_MANGLER(RTProcGetAffinityMask) # define RTProcGetExecutablePath RT_MANGLER(RTProcGetExecutablePath) # define RTProcGetPriority RT_MANGLER(RTProcGetPriority) @@ -19,13 +19,14 @@ index c1daa8f..8618371 100644 # define RTProcQueryParent RT_MANGLER(RTProcQueryParent) # define RTProcQueryUsername RT_MANGLER(RTProcQueryUsername) diff --git a/include/iprt/path.h b/include/iprt/path.h -index 8bd42bc..2c23d3e 100644 +index 99060e35..ccfbeb76 100644 --- a/include/iprt/path.h +++ b/include/iprt/path.h -@@ -1064,6 +1064,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, +@@ -1221,6 +1221,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, const char *p + */ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath); - - /** + ++/** + * Gets the path to the NixOS setuid wrappers directory. + * + * @returns iprt status code. @@ -34,18 +35,18 @@ index 8bd42bc..2c23d3e 100644 + */ +RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath); + -+/** + /** * Gets the user home directory. * - * @returns iprt status code. diff --git a/include/iprt/process.h b/include/iprt/process.h -index 043653e..1070280 100644 +index f4f67dd4..ab882a19 100644 --- a/include/iprt/process.h +++ b/include/iprt/process.h -@@ -327,6 +327,16 @@ RTR3DECL(const char *) RTProcShortName(void); +@@ -352,6 +352,16 @@ RTR3DECL(const char *) RTProcExecutablePath(void); + */ RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath); - - /** + ++/** + * Gets the path to the NixOS setuid wrappers directory. + * + * @returns pszExecPath on success. NULL on buffer overflow or other errors. @@ -55,15 +56,14 @@ index 043653e..1070280 100644 + */ +RTR3DECL(char *) RTProcGetSuidPath(char *pszExecPath, size_t cbExecPath); + -+/** + /** * Daemonize the current process, making it a background process. * - * The way this work is that it will spawn a detached / backgrounded / diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp -index ce0f288..6193108 100644 +index 75ff8572..18a077b7 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp -@@ -1502,9 +1502,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo +@@ -1531,9 +1531,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo bool fBad = !fRelaxed || pFsObjState->Stat.st_gid != 2 /*bin*/ || suplibHardenedStrCmp(pszPath, "/usr/lib/iconv"); # else NOREF(fRelaxed); @@ -75,20 +75,46 @@ index ce0f288..6193108 100644 return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo, "An unknown (and thus untrusted) group has write access to '", pszPath, "' and we therefore cannot trust the directory content or that of any subdirectory"); +diff --git a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp +index 2991d3a7..d042a08b 100644 +--- a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp ++++ b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp +@@ -90,7 +90,7 @@ int MachineLaunchVMCommonWorker(const Utf8Str &aNameOrId, + + /* Get the path to the executable directory w/ trailing slash: */ + char szPath[RTPATH_MAX]; +- int vrc = RTPathAppPrivateArch(szPath, sizeof(szPath)); ++ int vrc = RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers/bin"); + AssertRCReturn(vrc, vrc); + size_t cbBufLeft = RTPathEnsureTrailingSeparator(szPath, sizeof(szPath)); + AssertReturn(cbBufLeft > 0, VERR_FILENAME_TOO_LONG); +diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp +index 2e57690a..3272c840 100644 +--- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp ++++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp +@@ -188,7 +188,7 @@ int NetworkServiceRunner::start(bool aKillProcessOnStop) + * ASSUME it is relative to the directory that holds VBoxSVC. + */ + char szExePath[RTPATH_MAX]; +- AssertReturn(RTProcGetExecutablePath(szExePath, RTPATH_MAX), VERR_FILENAME_TOO_LONG); ++ AssertReturn(RTProcGetSuidPath(szExePath, RTPATH_MAX), VERR_FILENAME_TOO_LONG); + RTPathStripFilename(szExePath); + int vrc = RTPathAppend(szExePath, sizeof(szExePath), m->pszProcName); + AssertLogRelRCReturn(vrc, vrc); diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp -index 98dc91a..43a819f 100644 +index af155966..3b8e793d 100644 --- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp +++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp -@@ -47,7 +47,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char +@@ -48,7 +48,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char const char *args[] = { NULL, pcszIfName, pszAddr, pszOption, pszMask, NULL }; - + char szAdpCtl[RTPATH_MAX]; - int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME)); + int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME)); if (RT_FAILURE(rc)) { LogRel(("NetIfAdpCtl: failed to get program path, rc=%Rrc.\n", rc)); -@@ -89,7 +89,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch +@@ -95,7 +95,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch int NetIfAdpCtlOut(const char * pcszName, const char * pcszCmd, char *pszBuffer, size_t cBufSize) { char szAdpCtl[RTPATH_MAX]; @@ -97,23 +123,23 @@ index 98dc91a..43a819f 100644 if (RT_FAILURE(rc)) { LogRel(("NetIfAdpCtlOut: Failed to get program path, rc=%Rrc\n", rc)); -@@ -201,7 +201,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox, +@@ -210,7 +210,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox, progress.queryInterfaceTo(aProgress); - + char szAdpCtl[RTPATH_MAX]; -- int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " add")); -+ int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " add")); - if (RT_FAILURE(rc)) +- vrc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " add")); ++ vrc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " add")); + if (RT_FAILURE(vrc)) { progress->i_notifyComplete(E_FAIL, diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp -index 944848e..744a261 100644 +index 4b1a0ada..7f6dd707 100644 --- a/src/VBox/Runtime/r3/path.cpp +++ b/src/VBox/Runtime/r3/path.cpp @@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath) } - - + + +RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath) +{ + return RTStrCopy(pszPath, cchPath, "/run/wrappers/bin"); @@ -124,13 +150,13 @@ index 944848e..744a261 100644 { #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE) diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp -index 2aab645..9795f21 100644 +index 5f7c7a87..59461cfa 100644 --- a/src/VBox/Runtime/r3/process.cpp +++ b/src/VBox/Runtime/r3/process.cpp -@@ -111,6 +111,26 @@ RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath) - return NULL; +@@ -117,6 +117,25 @@ RTR3DECL(const char *) RTProcExecutablePath(void) + return g_szrtProcExePath; } - + +/* + * Note the / at the end! This is important, because the functions using this + * will cut off everything after the rightmost / as this function is analogous @@ -150,33 +176,6 @@ index 2aab645..9795f21 100644 + AssertMsgFailed(("Buffer too small (%zu <= %zu)\n", cbExecPath, sizeof(SUIDDIR))); + return NULL; +} -+ - + RTR3DECL(const char *) RTProcShortName(void) { -diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp -index 2e57690..3272c84 100644 ---- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp -+++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp -@@ -188,7 +188,7 @@ int NetworkServiceRunner::start(bool aKillProcessOnStop) - * ASSUME it is relative to the directory that holds VBoxSVC. - */ - char szExePath[RTPATH_MAX]; -- AssertReturn(RTProcGetExecutablePath(szExePath, RTPATH_MAX), VERR_FILENAME_TOO_LONG); -+ AssertReturn(RTProcGetSuidPath(szExePath, RTPATH_MAX), VERR_FILENAME_TOO_LONG); - RTPathStripFilename(szExePath); - int vrc = RTPathAppend(szExePath, sizeof(szExePath), m->pszProcName); - AssertLogRelRCReturn(vrc, vrc); -diff --git a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp -index 2991d3a7..d042a08b 100644 ---- a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp -+++ b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp -@@ -90,7 +90,7 @@ int MachineLaunchVMCommonWorker(const Utf8Str &aNameOrId, - - /* Get the path to the executable directory w/ trailing slash: */ - char szPath[RTPATH_MAX]; -- int vrc = RTPathAppPrivateArch(szPath, sizeof(szPath)); -+ int vrc = RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers/bin"); - AssertRCReturn(vrc, vrc); - size_t cbBufLeft = RTPathEnsureTrailingSeparator(szPath, sizeof(szPath)); - AssertReturn(cbBufLeft > 0, VERR_FILENAME_TOO_LONG); diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix new file mode 100644 index 00000000000..08160690dcb --- /dev/null +++ b/pkgs/applications/window-managers/eww/default.nix @@ -0,0 +1,43 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, gtk3 +, withWayland ? false +, gtk-layer-shell +}: + +rustPlatform.buildRustPackage rec { + pname = "eww"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "elkowar"; + repo = pname; + rev = "v${version}"; + sha256 = "050zc3w1z9f2vg6sz86mdxf345gd3s3jf09gf4y8y1mqkzs86b8x"; + }; + + cargoSha256 = "sha256-LejnTVv9rhL9CVW1fgj2gFv4amHQeziu5uaH2ae8AAw="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ] ++ lib.optional withWayland gtk-layer-shell; + + cargoBuildFlags = [ "--bin" "eww" ] ++ lib.optionals withWayland [ + "--no-default-features" + "--features=wayland" + ]; + + cargoTestFlags = cargoBuildFlags; + + # requires unstable rust features + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "ElKowars wacky widgets"; + homepage = "https://github.com/elkowar/eww"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda legendofmiracles ]; + }; +} diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 7aa62e69df9..0d07ce4e8d1 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.19.2"; + version = "4.20"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-im7hd2idzyKWTSC2CTAU7k+gQZNF0/1RXVUS2ZgLsnk="; + sha256 = "sha256-jPTxdPbPVU84VjOAaBq+JYaOmVWIN5HgmG7NicU6wyI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 8ab8c5630d0..6884e5ea7a1 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -2,13 +2,13 @@ i3.overrideAttrs (oldAttrs : rec { pname = "i3-gaps"; - version = "4.19.1"; + version = "4.20"; src = fetchFromGitHub { owner = "Airblader"; repo = "i3"; rev = version; - sha256 = "sha256-Ydks0hioGAnVBGKraoy3a7Abq9/vHmSne+VFbrYXCug="; + sha256 = "sha256-D16wMwCabEOG0AfAhohwcCHeUSvVF93i3zT/yu0FCu8="; }; meta = with lib; { diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index d3b685e7dcd..d01e1bfdf97 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -1,14 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: +{ lib, stdenv, fetchbzr, cmake, pkg-config, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "jwm-settings-manager"; - version = "2018-10-19"; + version = "2019-01-27"; - src = fetchFromGitHub { - owner = "Israel-D"; - repo = "jwm-settings-manager"; - rev = "cb32a70563cf1f3927339093481542b85ec3c8c8"; - sha256 = "0d5bqf74p8zg8azns44g46q973blhmp715k8kcd73x88g7sfir8s"; + src = fetchbzr { + url = "lp:${pname}"; + rev = "292"; + sha256 = "1yqc1ac2pbkc88z7p1qags1jygdlr5y1rhc5mx6gapcf54bk0lmi"; }; nativeBuildInputs = [ @@ -34,6 +33,11 @@ stdenv.mkDerivation { --replace 'DESTINATION usr/share' "DESTINATION share" ''; + postConfigure = '' + substituteInPlace cmake_install.cmake \ + --replace "/var/empty" "/usr" + ''; + meta = with lib; { description = "A full configuration manager for JWM"; homepage = "https://joewing.net/projects/jwm"; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index e8330ee2936..9379fb358b3 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-T4A9NGT6sUSTKmLcAWjcp3Y8QQzZFAVSXevXtGm3szY="; + sha256 = "sha256:0w4afhrp2cxz0nmpvalyaxz1dpywajjj2wschw8dpkvgxqs64gd5"; }; - cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE="; + cargoSha256 = "sha256:0r0smpv50gim2naaa0qf6yhvqvsa2f40rkgiryi686y69m5ii7mv"; buildInputs = rpathLibs; diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 8cf72adbf85..ff253b951b8 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-09-30"; + version = "unstable-2021-11-01"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "e6bb373240bc08668c8e6e14996a3f8765941158"; - sha256 = "sha256-dYruRpsud2XYrVY2f4f2dkRRSh1oU9rn2GRwAkJqW3A="; + rev = "363fd3f6a466004eec157a40e51684e56992b857"; + sha256 = "sha256-RzReUo1p2z4UQaO5n6PKQlEv0vTBGg+1Wq1UIYii0Mo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 7bcb26e0c97..827fce89702 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -52,7 +52,10 @@ in symlinkJoin { ${optionalString (extraOptions != []) "${concatMapStrings (x: " --add-flags " + x) extraOptions}"} ''; - passthru.providedSessions = [ "sway" ]; + passthru = { + inherit (sway.passthru) tests; + providedSessions = [ "sway" ]; + }; inherit (sway) meta; } |