From ea8bbfcae0508d4eff626a8467aa3ca69af46d1a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 29 Jun 2021 13:24:32 +0200 Subject: [PATCH 01/16] signal-desktop: 5.6.2 -> 5.7.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2189d1b0ba21..30f90006239d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.6.2"; # Please backport all updates to the stable channel. + version = "5.7.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: @@ -38,7 +38,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 = "0cdzww741l4s95n5gq5zx5l3zvxinxbqa9y6wf8wjq7rzn6bwqx3"; + sha256 = "170x2zsp3z95b123ybs8zqr8sasd5jgd4gl1q32wvhk7m41fvkmd"; }; nativeBuildInputs = [ From e885ec3084ccc755fd1633c3ef45b77d7b00d802 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 30 Jun 2021 01:05:30 +0200 Subject: [PATCH 02/16] mixxx: 2.2.4 -> 2.3.0 * version update * replace scons with cmake * add new dependencies: - hidapi, lame, libebur128, libkeyfinder, libmodplug, libsecret, qtkeychain, serd, sord, soundtouch, sratom, wavpack * use latest libshout again - streaming issues have been fixed --- pkgs/applications/audio/mixxx/default.nix | 132 ++++++++++++++++------ 1 file changed, 100 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 7af4b585adfa..6f0d34b870aa 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,49 +1,117 @@ -{ lib, mkDerivation, fetchurl, fetchFromGitHub, chromaprint -, fftw, flac, faad2, glibcLocales, mp4v2 -, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis -, libGLU, libxcb, lilv, lv2, opusfile -, pkg-config, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg -, qtx11extras, rubberband, sconsPackages, sqlite, taglib, upower, vamp-plugin-sdk +{ lib +, mkDerivation +, fetchurl +, fetchFromGitHub +, chromaprint +, cmake +, faad2 +, ffmpeg +, fftw +, flac +, glibcLocales +, hidapi +, lame +, libebur128 +, libGLU +, libid3tag +, libkeyfinder +, libmad +, libmodplug +, libopus +, libsecret +, libshout +, libsndfile +, libusb1 +, libvorbis +, libxcb +, lilv +, lv2 +, mp4v2 +, opusfile +, pcre +, pkg-config +, portaudio +, portmidi +, protobuf +, qtbase +, qtkeychain +, qtscript +, qtsvg +, qtx11extras +, rubberband +, serd +, sord +, soundtouch +, sratom +, sqlite +, taglib +, upower +, vamp-plugin-sdk +, wavpack }: -let - # Because libshout 2.4.2 and newer seem to break streaming in mixxx, build it - # with 2.4.1 instead. - libshout241 = libshout.overrideAttrs (o: rec { - name = "libshout-2.4.1"; - src = fetchurl { - url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; - sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k"; - }; - }); -in mkDerivation rec { pname = "mixxx"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; - rev = "release-${version}"; - sha256 = "1dj9li8av9b2kbm76jvvbdmihy1pyrw0s4xd7dd524wfhwr1llxr"; + rev = version; + sha256 = "18sx4l3zzbn5142xfv5bp0crdd615a5728fkprqacnx3zpa144x6"; }; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ - chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile - libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkg-config portaudio portmidi protobuf qtbase qtscript qtsvg - qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk + chromaprint + faad2 + ffmpeg + fftw + flac + glibcLocales + hidapi + lame + libebur128 + libGLU + libid3tag + libkeyfinder + libmad + libmodplug + libopus + libsecret + libshout + libsndfile + libusb1 + libvorbis + libxcb + lilv + lv2 + mp4v2 + opusfile + pcre + portaudio + portmidi + protobuf + qtbase + qtkeychain + qtscript + qtsvg + qtx11extras + rubberband + serd + sord + soundtouch + sratom + sqlite + taglib + upower + vamp-plugin-sdk + wavpack ]; enableParallelBuilding = true; - sconsFlags = [ - "build=release" - "qtdir=${qtbase}" - "faad=1" - "opus=1" - ]; - qtWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ]; @@ -52,7 +120,7 @@ mkDerivation rec { homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu maintainers.bfortz ]; + maintainers = with maintainers; [ goibhniu bfortz ]; platforms = platforms.linux; }; } From 5853503f7a56affe833bd806bfcf8422d7f8565a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 29 Jun 2021 21:21:55 -0300 Subject: [PATCH 03/16] kirc: init at 0.2.7 --- .../networking/irc/kirc/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/networking/irc/kirc/default.nix diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix new file mode 100644 index 000000000000..c4f63613fc57 --- /dev/null +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "kirc"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "mcpcpc"; + repo = pname; + rev = version; + hash = "sha256-iaqj4xB15DB3w/RaiCOMdAu8eONhTw1Dz0j5kykAHV4="; + }; + + dontConfigure = true; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + homepage = "http://kirc.io/"; + description = "Tiny IRC client written in C99"; + longDescription = '' + kirc is a tiny open-source Internet Relay Chat (IRC) client designed with + usability and cross-platform compatibility in mind. + + It features: + - No dependencies other than a C99 compiler. + - Simple Authentication and Security Layer (SASL) procotol support. + - Client-to-client (CTCP) protocol support. + - Transport Layer Security (TLS) protocol support (via external + utilities). + - Simple chat history logging. + - Asynchronous message handling. + - Multi-channel joining at server connection. + - Full support for all RFC 2812 commands. + - Easy customized color scheme definition. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7107b3f4f9ae..a624ed0d168c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24846,6 +24846,8 @@ in irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; + kirc = callPackage ../applications/networking/irc/kirc { }; + ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; istioctl = callPackage ../applications/networking/cluster/istioctl { }; From bd414007c95701172a57a46663a19055ff90ad75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 08:36:19 +0000 Subject: [PATCH 04/16] alsa-utils: 1.2.5 -> 1.2.5.1 --- pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index 37bda86b0a6a..782e6ffce8cb 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.5"; + version = "1.2.5.1"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "15wrl7jsprpcqdk01a3hdh2lak5jhp5jgflkr80h1crqb3q0m5q9"; + sha256 = "sha256-nBaa43pJKV+bl7kqzncoA9r2tlEKGVdOC3j4flYhGNA="; }; nativeBuildInputs = [ gettext makeWrapper ]; From 5622fd5f6c188d12ffff9fd8e92fd58f43d983b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 09:40:10 +0000 Subject: [PATCH 05/16] cinnamon.bulky: 1.4 -> 1.6 --- pkgs/desktops/cinnamon/bulky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 7797586f5abd..16d4e1400e30 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.4"; + version = "1.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - sha256 = "sha256-i6OmkZGgZpfp8G2T6CDFQmIG/0V36YFbWBR7MvDi6Ew="; + sha256 = "sha256-cO6AhQ0g1N43du74fljfI1M68jb9N04FKUyzjbzC3K0="; }; nativeBuildInputs = [ From b3519ced7d0de81573ee0f0874657c76f2d944b5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 30 Jun 2021 14:58:07 +0200 Subject: [PATCH 06/16] soapyairpsy: 0.1.2 -> 0.2.0 --- pkgs/applications/radio/soapyairspy/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 0541c3abf914..7e8a09d67b98 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -2,18 +2,15 @@ , airspy, soapysdr } : -let - version = "0.1.2"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "soapyairspy"; - inherit version; + version = "0.2.0"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyAirspy"; rev = "soapy-airspy-${version}"; - sha256 = "061r77vs6ywxbxfif12y6v5xkz6gcvbz9k060q12vmdh6sisdwk2"; + sha256 = "0g23yybnmq0pg2m8m7dbhif8lw0hdsmnnjym93fdyxfk5iln7fsc"; }; nativeBuildInputs = [ cmake ]; From cb546b29e05978fc36c9d34e9fc085e68e73b327 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 29 Jun 2021 14:18:27 +0200 Subject: [PATCH 07/16] python3Packages.pyfritzhome: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/pyfritzhome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 7c0982d490ba..0bfda48269e1 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "hthiery"; repo = "python-fritzhome"; rev = version; - sha256 = "sha256-CEoXb7D/8Iksw4aJYNqANkmfhd0yxIIuabaTdWI3RNc="; + sha256 = "1hwxq9w5qmiky8gpp623nabmydr3yv6hvgzk24fdbmkglfp6ja1v"; }; propagatedBuildInputs = [ requests ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; checkPhase = '' - nosetests --with-coverage + nosetests ''; pythonImportsCheck = [ "pyfritzhome" ]; From ca3af0a389d6e5fa92a54bae0345195735360836 Mon Sep 17 00:00:00 2001 From: Max Hille Date: Wed, 30 Jun 2021 15:04:59 +0200 Subject: [PATCH 08/16] trezor-suite: remove sandbox startup --- pkgs/applications/blockchains/trezor-suite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index bd9e26ae73ab..4bb5f1f7a6b4 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -46,7 +46,7 @@ appimageTools.wrapType2 rec { install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' # symlink system binaries instead bundled ones mkdir -p $out/share/${pname}/resources/bin/{bridge,tor} From 798c901fdc836a5b4cc07c57a433dc003c2d572a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 30 Jun 2021 16:15:50 +0200 Subject: [PATCH 09/16] soapysdr: 0.7.2 -> 0.8.0 --- pkgs/applications/radio/soapysdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index ea8c8fad1068..ccd4b8799cef 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -8,7 +8,7 @@ let - version = "0.7.2"; + version = "0.8.0"; modulesVersion = with lib; versions.major version + "." + versions.minor version; modulesPath = "lib/SoapySDR/modules" + modulesVersion; extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapySDR"; rev = "soapy-sdr-${version}"; - sha256 = "102wnpjxrwba20pzdh1vvx0yg1h8vqd8z914idxflg9p14r6v5am"; + sha256 = "1dy25zxk7wmg7ik82dx7h3bbbynvalbz1dxsl7kgm3374yxhnixv"; }; nativeBuildInputs = [ cmake makeWrapper pkg-config ]; From cc84f3906e1386fd4008e78130566c96776ba44e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 30 Jun 2021 09:41:10 +0200 Subject: [PATCH 10/16] coq: fix issue introduced in #128603 This triggerred coq-community/coq-nix-toolbox#42. --- pkgs/applications/science/logic/coq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 69753fcef2d0..b5c66289c9d3 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -130,7 +130,7 @@ self = stdenv.mkDerivation { (if versionAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]) - ++ optional (versionAtLeast "8.14") [ ocamlPackages.dune_2 ] + ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2 ; postPatch = '' From 0c21d0fd7035d65e48d561a64d1ad1454c640aff Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 30 Jun 2021 14:50:25 +0000 Subject: [PATCH 11/16] linuxPackages_latest: 5.12.12 -> 5.13 Fixes: 367a53a82b0 ("linux_5_13: init at 5.13") --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ff5b177760c..84a91cd44e47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21075,7 +21075,7 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_12; + linuxPackages_latest = linuxPackages_5_13; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. From eda6c0fd65b90474c9a3fe4ac2ee9f1d5beae3c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= <123550+andresilva@users.noreply.github.com> Date: Wed, 30 Jun 2021 16:17:15 +0100 Subject: [PATCH 12/16] ledger-live-desktop: 2.26.1 -> 2.29.0 (#128773) --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 298ae39716bb..0692f40e35f1 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.26.1"; + version = "2.29.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0zbzqq3c0q45dz4vvgfbvqcgda7413mnwixi7yi78qb9mp8zxkhy"; + sha256 = "1y4xvnwh2mqbc39pmnpgjg8mlx208s2pipm7dazq4bgmay7k9zh0"; }; appimageContents = appimageTools.extractType2 { From cba629ef41903cbc078e7de1fdcfd993823f0d99 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 30 Jun 2021 23:41:24 +0800 Subject: [PATCH 13/16] linuxPackages.perf: fix build for 5.13 --- pkgs/os-specific/linux/kernel/perf.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index ae27839c8cd3..cc335aec4c8f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation { postPatch = '' patchShebangs scripts/bpf_helpers_doc.py + patchShebangs scripts/bpf_doc.py ''; doCheck = false; # requires "sparse" From cb3db6473725d4b882539310a1fb9dda04a7914e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 30 Jun 2021 18:13:36 +0200 Subject: [PATCH 14/16] dino: remove unused argument This argument was forgotten in 70173c1519118a5ec79b8e7969b2f91c78e8c297, where the need for fetchpatch was removed. --- pkgs/applications/networking/instant-messengers/dino/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index d4332c0265c5..7f0127c28fd8 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -4,7 +4,6 @@ , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c -, fetchpatch , libgcrypt , epoxy , at-spi2-core From 5ef8322daa6007ef0256460c0de339f70d718e50 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 30 Jun 2021 16:20:22 +0000 Subject: [PATCH 15/16] zfsUnstable: 2.1.0-rc7 -> 2.1.0-rc8 https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc8 --- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 73c3f82e8b05..7d715cc3c092 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -205,12 +205,12 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc7"; + version = "2.1.0-rc8"; - sha256 = "11dvz8r5l7cbhbx2j02y6335i2vibh29dqrqk4kmw4lf87g1isni"; + sha256 = "0c53ca6xd59c30h3b2hmvyy63yqyk745x1kdfypnfqj3lnsj1pac"; isUnstable = true; }; From 4afb7c8e2c631f5c191aaf586673430b72e4b15e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 17:12:51 +0000 Subject: [PATCH 16/16] greenfoot: 3.6.1 -> 3.7.0 --- pkgs/applications/editors/greenfoot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 34f489bfba3e..962710be2f50 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "112h6plpclj8kbv093m4pcczljhpd8d47d7a2am1yfgbyckx6hf0"; + sha256 = "sha256-K9faU3ZarcR4g8riHpoZYVH0sXtueqfm3Fo+sZAHJA8="; }; nativeBuildInputs = [ makeWrapper ];