From 5f39102589973735fcc154a22f7d2122359fc417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 24 Nov 2021 17:40:40 +0100 Subject: [PATCH 01/67] tribler: 7.4.4 -> 7.10.0 This also adds old versions of apispec and webargs that tribler requires, and aiohttp-apispec as well. (cherry picked from commit 2d083acf666f7f7c7a4ca6e5c665207aa58d1ba2) --- .../networking/p2p/tribler/default.nix | 66 ++++++++++--------- .../aiohttp-apispec/unstable.nix | 37 +++++++++++ pkgs/development/python-modules/apispec/3.nix | 47 +++++++++++++ pkgs/development/python-modules/jinja2/2.nix | 2 +- .../python-modules/webargs/default.nix | 2 +- pkgs/top-level/python-packages.nix | 4 +- 6 files changed, 123 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/python-modules/aiohttp-apispec/unstable.nix create mode 100644 pkgs/development/python-modules/apispec/3.nix diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 3aa5b4a8da82..774aea642d43 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,26 +1,35 @@ -{ stdenv, fetchurl, python3Packages, makeWrapper -, enablePlayer ? true, libvlc, qt5, lib }: +{ stdenv, lib, fetchurl, python3, makeWrapper +, libtorrent-rasterbar-1_2_x, qt5 +}: +let + libtorrent = (python3.pkgs.toPythonModule ( + libtorrent-rasterbar-1_2_x.override { python = python3; })).python; + + aiohttp-apispec = python3.pkgs.callPackage + ../../../../development/python-modules/aiohttp-apispec/unstable.nix { }; +in stdenv.mkDerivation rec { pname = "tribler"; - version = "7.4.4"; + version = "7.10.0"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0hxiyf1k07ngym2p8r1b5mcx1y2crkyz43gi9sgvsvsyijyaff3p"; + sha256 = "1x45z23d1cqf0lai7wg5ki7gi2vba5hqk0swhggzplcjwma4wmh9"; }; nativeBuildInputs = [ - python3Packages.wrapPython + python3.pkgs.wrapPython makeWrapper ]; buildInputs = [ - python3Packages.python + python3.pkgs.python ]; - pythonPath = with python3Packages; [ - libtorrent-rasterbar + pythonPath = [ + libtorrent + ] ++ (with python3.pkgs; [ twisted netifaces pycrypto @@ -42,49 +51,44 @@ stdenv.mkDerivation rec { pony lz4 pyqtgraph + pyyaml + aiohttp + aiohttp-apispec + faker + sentry-sdk + pytest-asyncio + pytest-timeout + asynctest + yappi # there is a BTC feature, but it requires some unclear version of # bitcoinlib, so this doesn't work right now. # bitcoinlib - ]; - - postPatch = '' - ${lib.optionalString enablePlayer '' - substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')" - substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \ - --replace "if vlc and vlc.plugin_path" "if vlc" \ - --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'" - ''} - ''; + ]); installPhase = '' mkdir -pv $out # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. wrapPythonPrograms cp -prvd ./* $out/ - makeWrapper ${python3Packages.python}/bin/python $out/bin/tribler \ + makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ - --set _TRIBLERPATH $out \ - --set PYTHONPATH $out:$program_PYTHONPATH \ + --set _TRIBLERPATH $out/src \ + --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ --set NO_AT_BRIDGE 1 \ --run 'cd $_TRIBLERPATH' \ - --add-flags "-O $out/run_tribler.py" \ - ${lib.optionalString enablePlayer '' - --prefix LD_LIBRARY_PATH : ${libvlc}/lib - ''} + --add-flags "-O $out/src/run_tribler.py" - mkdir -p $out/share/applications $out/share/icons $out/share/man/man1 - cp $out/Tribler/Main/Build/Ubuntu/tribler.desktop $out/share/applications/tribler.desktop - cp $out/Tribler/Main/Build/Ubuntu/tribler_big.xpm $out/share/icons/tribler.xpm - cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1 + mkdir -p $out/share/applications $out/share/icons + cp $out/build/debian/tribler/usr/share/applications/tribler.desktop $out/share/applications/tribler.desktop + cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm ''; meta = with lib; { - maintainers = with maintainers; [ xvapx ]; + maintainers = with maintainers; [ xvapx viric ]; homepage = "https://www.tribler.org/"; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; license = licenses.lgpl21; platforms = platforms.linux; - broken = true; # 2021-03-17 see https://github.com/NixOS/nixpkgs/issues/93053 }; } diff --git a/pkgs/development/python-modules/aiohttp-apispec/unstable.nix b/pkgs/development/python-modules/aiohttp-apispec/unstable.nix new file mode 100644 index 000000000000..73a28de7b40d --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-apispec/unstable.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, aiohttp, webargs, fetchFromGitHub, callPackage +}: + +let + apispec3 = callPackage ../apispec/3.nix {}; + jinja2 = callPackage ../jinja2/2.nix {}; +in +buildPythonPackage rec { + pname = "aiohttp-apispec"; + version = "unstable-2021-21-08"; + + # unstable so we can use latest webargs + src = fetchFromGitHub { + owner = "maximdanilchenko"; + repo = "aiohttp-apispec"; + rev = "cfa19646394480dda289f6b7af19b7d50f245d81"; + sha256 = "uEgDRAlMjTa4rvdE3fkORCHIlCLzxPJJ2/m4ZRU3eIQ="; + fetchSubmodules = false; + }; + + propagatedBuildInputs = [ aiohttp webargs apispec3 jinja2 ]; + + pythonImportsCheck = [ + "aiohttp_apispec" + ]; + + # Requires pytest-sanic, currently broken in nixpkgs + doCheck = false; + + meta = with lib; { + description = "Build and document REST APIs with aiohttp and apispec"; + homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/"; + license = licenses.mit; + maintainers = [ maintainers.viric ]; + }; +} diff --git a/pkgs/development/python-modules/apispec/3.nix b/pkgs/development/python-modules/apispec/3.nix new file mode 100644 index 000000000000..e60a440df3f4 --- /dev/null +++ b/pkgs/development/python-modules/apispec/3.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyyaml +, prance +, marshmallow +, pytestCheckHook +, mock +, openapi-spec-validator +}: + +buildPythonPackage rec { + pname = "apispec"; + version = "3.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad"; + }; + + propagatedBuildInputs = [ + pyyaml + prance + ]; + + postPatch = '' + rm tests/test_ext_marshmallow.py + ''; + + checkInputs = [ + openapi-spec-validator + marshmallow + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "apispec" + ]; + + meta = with lib; { + description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification"; + homepage = "https://github.com/marshmallow-code/apispec"; + license = licenses.mit; + maintainers = [ maintainers.viric ]; + }; +} diff --git a/pkgs/development/python-modules/jinja2/2.nix b/pkgs/development/python-modules/jinja2/2.nix index dce93d33ab50..153aebcc818e 100644 --- a/pkgs/development/python-modules/jinja2/2.nix +++ b/pkgs/development/python-modules/jinja2/2.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !stdenv.is32bit || isPy3k; checkPhase = '' - pytest -v tests + pytest -v tests -W ignore::ResourceWarning -W ignore::DeprecationWarning ''; meta = with lib; { diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index 63ad60c9f084..e92b47d20933 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { "webargs" ]; - propagatedBuildInputs = [ marshmallow ]; + checkInputs = [ pytestCheckHook pytest-aiohttp diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 304a31e77c88..798f375dd894 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9930,6 +9930,8 @@ in { weasyprint = callPackage ../development/python-modules/weasyprint { }; + webargs = callPackage ../development/python-modules/webargs { }; + webapp2 = callPackage ../development/python-modules/webapp2 { }; webassets = callPackage ../development/python-modules/webassets { }; @@ -9948,8 +9950,6 @@ in { webhelpers = callPackage ../development/python-modules/webhelpers { }; - webargs = callPackage ../development/python-modules/webargs { }; - webob = callPackage ../development/python-modules/webob { }; weboob = callPackage ../development/python-modules/weboob { }; From 45e1cb1c847986e0b0512d56de38613b5a5dcb7a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 28 Nov 2021 15:26:40 +0000 Subject: [PATCH 02/67] libreoffice-fresh: 7.2.2.2 -> 7.2.3.2 (cherry picked from commit 722bfae4875783c086bbd102a63c16eb6f93ad33) --- .../office/libreoffice/src-fresh/download.nix | 34 +++++++++---------- .../office/libreoffice/src-fresh/primary.nix | 8 ++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index e99ac0f66d6f..9fdff0766b6e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -49,11 +49,11 @@ md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { - name = "bzip2-1.0.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; - sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; - md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; - md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + name = "bzip2-1.0.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz"; + sha256 = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"; + md5 = ""; + md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; } { name = "cairo-1.16.0.tar.xz"; @@ -112,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.78.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz"; - sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5"; + name = "curl-7.79.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz"; + sha256 = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689"; md5 = ""; - md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz"; + md5name = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689-curl-7.79.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -665,11 +665,11 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "openldap-2.4.45.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; - sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; + name = "openldap-2.4.59.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz"; + sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34"; md5 = ""; - md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; + md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { name = "openssl-1.1.1l.tar.gz"; @@ -728,11 +728,11 @@ 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"; + name = "postgresql-13.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2"; + sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3"; md5 = ""; - md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; + md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2"; } { name = "Python-3.8.10.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index d34cfd082d08..684383980bc4 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "2"; - patch = "2"; + patch = "3"; 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 = "0w9bn3jhrhaj80qbbs8wp3q5yc0rrpwvqj3abgrllg4clk5c6fw1"; + sha256 = "sha256-VslzdJVtmMjvzW1YdxwJUMimQe2E/WTbZjgohMTDtFE="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1rhwrax5fxgdvizv74npysam5i67669myysldiplqiah5np672lq"; + sha256 = "sha256-B/UVlPyzL7M3PpQwS63huRtti1VR+OaI2nd+T1IESOw="; }; # 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 = "1hn56irlkk2ng7wzhiv8alpjcnf7xf95n3syzlbnmcj177kpg883"; + sha256 = "sha256-CH4URClK/lq0nqN6LHjAVcKjkADol5AX3WuyAl0srnk="; }; } From db620d7715016dadfd6a6eb51e480577e88edad0 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 25 Nov 2021 21:48:37 +1000 Subject: [PATCH 03/67] jpsxdec: init at 1.05 (cherry picked from commit b56089454542ca92634ecdff6c4fe04f723f5f51) --- ...psxdec-hackfix-build-with-newer-JDKs.patch | 43 ++++++++++ pkgs/tools/games/jpsxdec/default.nix | 84 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 131 insertions(+) create mode 100644 pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch create mode 100644 pkgs/tools/games/jpsxdec/default.nix diff --git a/pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch b/pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch new file mode 100644 index 000000000000..17899ef328f1 --- /dev/null +++ b/pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch @@ -0,0 +1,43 @@ +From 52662c71f7b043f374d4062d07a28b59ef010cbe Mon Sep 17 00:00:00 2001 +From: Zane van Iperen +Date: Wed, 22 Sep 2021 18:41:36 +1000 +Subject: [PATCH] jpsxdec: hackfix build with newer JDKs + +--- + jpsxdec/build.xml | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/jpsxdec/build.xml b/jpsxdec/build.xml +index 713941c..f5aa902 100644 +--- a/jpsxdec/build.xml ++++ b/jpsxdec/build.xml +@@ -43,8 +43,8 @@ + + + +- +- ++ ++ + + + +@@ -76,7 +76,6 @@ + + + +- + + + +@@ -109,7 +108,6 @@ + + + +- + + + +-- +2.31.1 + diff --git a/pkgs/tools/games/jpsxdec/default.nix b/pkgs/tools/games/jpsxdec/default.nix new file mode 100644 index 000000000000..2c18f29bbf33 --- /dev/null +++ b/pkgs/tools/games/jpsxdec/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, lib +, fetchFromGitHub +, jdk +/* + * jPSXdec needs to be built with no later than JDK8, but + * should be run with the latest to get HiDPI fixes, etc. + */ +, jre ? jdk +, ant +, unoconv +, makeWrapper +, makeDesktopItem +}: +let + pname = "jpsxdec"; + version = "1.05"; + + description = "Cross-platform PlayStation 1 audio and video converter"; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = description; + desktopName = "jPSXdec"; + categories = "AudioVideo;Utility;"; + }; +in +stdenv.mkDerivation rec { + inherit pname version; + + src = fetchFromGitHub { + owner = "m35"; + repo = pname; + rev = "v${version}"; + sha256 = "0wnfvvcyldf699b08lzlc0gshl7rn09a6q4i7jmr41izlcdszdbz"; + }; + + nativeBuildInputs = [ ant jdk unoconv makeWrapper ]; + buildInputs = [ jre ]; + + patches = [ + ./0001-jpsxdec-hackfix-build-with-newer-JDKs.patch + ]; + + buildPhase = '' + runHook preBuild + + cd jpsxdec + mkdir -p _ant/release/doc/ + unoconv -d document -f pdf -o _ant/release/doc/jPSXdec-manual.pdf doc/jPSXdec-manual.odt + + ant release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/pixmaps} + mv _ant/release $out/jpsxdec + + makeWrapper ${jre}/bin/java $out/bin/jpsxdec \ + --add-flags "-jar $out/jpsxdec/jpsxdec.jar" + + cp ${src}/jpsxdec/src/jpsxdec/gui/icon48.png $out/share/pixmaps/${pname}.png + ln -s ${desktopItem}/share/applications $out/share + + runHook postInstall + ''; + + meta = with lib; { + inherit description; + homepage = "https://jpsxdec.blogspot.com/"; + platforms = platforms.all; + license = { + url = "https://raw.githubusercontent.com/m35/jpsxdec/readme/.github/LICENSE.md"; + free = true; + }; + maintainers = with maintainers; [ zane ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 628d18f70595..1375eceaa970 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27469,6 +27469,10 @@ with pkgs; wxGTK = wxGTK30-gtk3; }; + jpsxdec = callPackage ../tools/games/jpsxdec { + jdk = openjdk8; + }; + pdfslicer = callPackage ../applications/misc/pdfslicer { }; pekwm = callPackage ../applications/window-managers/pekwm { }; From 4f06ac1644673274c99df7c7c9aa30012ad8bc11 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 27 Nov 2021 04:39:48 +0200 Subject: [PATCH 04/67] grub2: switch to release tarball for the localization files (cherry picked from commit 76e515cb267c6de577d14aeab1c2efe7cb2d84a6) --- pkgs/tools/misc/grub/2.0x.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d9c4ceeca2c0..661d6be21042 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool +{ lib, stdenv, fetchurl, flex, bison, python3, autoreconfHook, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , buildPackages , fetchpatch @@ -51,10 +51,9 @@ stdenv.mkDerivation rec { pname = "grub"; inherit version; - src = fetchgit { - url = "git://git.savannah.gnu.org/grub.git"; - rev = "${pname}-${version}"; - sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f"; + src = fetchurl { + url = "mirror://gnu/grub/grub-${version}.tar.xz"; + sha256 = "sha256-t56kSvkbk9F80/6Ava5u1DdwZ4qaWuGSzOqAPrtlfuE="; }; patches = [ @@ -75,7 +74,7 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake gettext freetype ]; + nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoreconfHook ]; buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -109,8 +108,6 @@ stdenv.mkDerivation rec { patchShebangs . - ./bootstrap --no-git --gnulib-srcdir=${gnulib} - substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; From 2ee7f2c4536dd072ecd896aa508d86f8774f2074 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 27 Nov 2021 06:19:49 +0200 Subject: [PATCH 05/67] grub2: fix buildPackage bash shebang (cherry picked from commit 8191c8e226fc158e73358d4951b5f09471753a5a) --- pkgs/tools/misc/grub/2.0x.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 661d6be21042..ea983d6f0437 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, flex, bison, python3, autoreconfHook, gnulib, libtool +{ lib, stdenv, fetchurl, flex, bison, python3, autoreconfHook, gnulib, libtool, bash , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , buildPackages , fetchpatch @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoreconfHook ]; - buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ] + buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool bash ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -141,6 +141,9 @@ stdenv.mkDerivation rec { postInstall = '' # Avoid a runtime reference to gcc sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" + # just adding bash to buildInputs wasn't enough to fix the shebang + substituteInPlace $out/lib/grub/*/modinfo.sh \ + --replace ${buildPackages.bash} "/usr/bin/bash" ''; passthru.tests = { From e8d01304c6fcf6e2055a55e3df6502c4009aa519 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:18:37 -0800 Subject: [PATCH 06/67] aws-c-common: 0.6.14 -> 0.6.17 (cherry picked from commit 9d21602e75d7383cf2ee01fa657f423f205c7805) --- pkgs/development/libraries/aws-c-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index c927ca53336a..e7a09a19ece5 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.14"; + version = "0.6.17"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JEaRB0k6zyk5UKuB2hEZUAsnp2SuI9mrok/EvwclUJk="; + sha256 = "sha256-+FzTEpotxco4+9gLVUL+rkCWoMjRCorKQ47JINHsnNA="; }; nativeBuildInputs = [ cmake ]; From 7d75970813580c7a660de28130b49d037d82f5b6 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:18:49 -0800 Subject: [PATCH 07/67] aws-c-http: 0.6.8 -> 0.6.10 (cherry picked from commit ea80624cdc9e5d1718f4d53ade4abdb6aa7d2367) --- pkgs/development/libraries/aws-c-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index a57747260513..a25231ee8831 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.8"; + version = "0.6.10"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-JqFvKoWW/2UV0jcR50QlD+LEPwQ4qwPoaPpioAuwf90="; + sha256 = "sha256-R+teEKSQjSFYt3+XXvooAy4GJwN4yzEhJtiuknBZIgU="; }; nativeBuildInputs = [ From b9651a8f39b38c43d90f353274f054ebbb2e6b7b Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:19:04 -0800 Subject: [PATCH 08/67] aws-crt-cpp: 0.17.0 -> 0.17.8 (cherry picked from commit 2eb081deb2327d44c78d0ed5cc3c32b5010f0297) --- pkgs/development/libraries/aws-crt-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 68414931e413..5d4a44ccf159 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.17.0"; + version = "0.17.8"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "0ijvyg3hrh1d0npca62syz8qy6nkqh90fq54cqyln0p333z16q52"; + sha256 = "sha256-eHABIg3v5ycpQzacW/8C74PT6yDOXGmJqDa9P1hN7Mo="; }; postPatch = '' From cb29fe37e9b38786db278e15437162b144482229 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:31:45 -0800 Subject: [PATCH 09/67] s2n-tls: 1.0.17 -> 1.3.0 (cherry picked from commit 592924102351bcc3133e7a244722ebd3a6e88562) --- pkgs/development/libraries/s2n-tls/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 1ce6f2672104..35a37fbddb86 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -1,29 +1,20 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , openssl }: stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.0.17"; + version = "1.3.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4="; + sha256 = "sha256-gd91thIcJO6Bhn1ENkW0k2iDzu1CvSYwWVv0VEM9umU="; }; - patches = [ - # Fix FindLibCrypto paths (https://github.com/aws/s2n-tls/pull/3067) - (fetchpatch { - url = "https://github.com/aws/s2n-tls/commit/bda649524402be4018c44bff07f6c64502a351ec.patch"; - sha256 = "02jmxsrd506vhjzlrgh1p2z1f1sn4v8klks25zisiykyqkyaczkv"; - }) - ]; - nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev"]; From b7dcc76890b603cb1257d89a73080979f23f691d Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:27:04 -0800 Subject: [PATCH 10/67] aws-c-auth: 0.6.5 -> 0.6.8 (cherry picked from commit ec720845982d64209866288c55a749a56a150681) --- pkgs/development/libraries/aws-c-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 7de352328100..ad1f3483cff0 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.5"; + version = "0.6.8"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-d3UdZucicp+Z0EjWNE5Xa/EMIGPk6GtQc7f0H8RBHA8="; + sha256 = "sha256-cZyWe3kX5JiB6th1VkkBFKa2MEilRtU+tHvu7c9e+Yw="; }; nativeBuildInputs = [ From 8e9c4eb652e6c6384b2362ad63636db8d73517bf Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:27:14 -0800 Subject: [PATCH 11/67] aws-c-mqtt: 0.7.8 -> 0.7.9 (cherry picked from commit 181ee83bff05cf9ae056e703ca87c018f27713d7) --- pkgs/development/libraries/aws-c-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index 39a75c511622..f75b744c3a91 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"; + sha256 = "sha256-YMAqK4DOFA5TkMNwLHRk1m14V8lN6X5SDAwrTYWdGMc="; }; nativeBuildInputs = [ From dae67f6209b79bab8a0b4cb84c482ae75e3c442d Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:29:31 -0800 Subject: [PATCH 12/67] aws-c-cal: 0.5.11 -> 0.5.12 (cherry picked from commit f09fff1e1f0d6a671f713006367474314dc5649f) --- pkgs/development/libraries/aws-c-cal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index d0bcfc901084..87d66e15355d 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.11"; + version = "0.5.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rmEsDsY50IKpCpQTvAFEkgCtuHwwgwMwcRpBUyyZGGc="; + sha256 = "sha256-KzuaT9c1l9Uhyj6IEy8JfDYzEYI2OcUkq+KRDoJx+Cc="; }; nativeBuildInputs = [ cmake ]; From ea9b10b45172bc1a76d34955dca477d5ad28a6d5 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:30:30 -0800 Subject: [PATCH 13/67] aws-c-io: 0.10.12 -> 0.10.13 (cherry picked from commit 184f85323948abbcfa5e079bb3684a7ab7bf315d) --- pkgs/development/libraries/aws-c-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 1ff28dccc9ef..2cfba1bd2046 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.12"; + version = "0.10.13"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8v38NN9qrgdrshMx3l2wLrl7l77HjsW2GPu8IwkclJQ="; + sha256 = "sha256-wdsSxEY9FwJoqdi0S8TNoyq8oxoZORKWeorsSpn+1IY="; }; nativeBuildInputs = [ cmake ]; From 159e6637c062ed826dc0f4a1651ea4d4960f2458 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 08:43:33 +0800 Subject: [PATCH 14/67] pantheon.switchboard-plug-sound: 2.2.7 -> 2.3.0 (cherry picked from commit 96e5b267fde523b75df3e0177ffee250604e8cd0) --- .../apps/switchboard-plugs/sound/default.nix | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 7719477ce702..b003ac1ce807 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson @@ -17,28 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.2.7"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0yjqws7ryfid9lcafgzzbfnjjwccsankscwdwqfw486qid85whzc"; - }; - - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-sound/pull/203 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-sound/commit/1f3b9f001ace4c457ab194158dff04ba5e25d278.patch"; - sha256 = "1lmf2bbif2wkfv500nxbqxp8jdmnjg8yk8xhx3g2g55d15rc5hk4"; - }) - ]; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-yHuboDpIcioZPNgpmnrM6J2eUCJpoNDdvgu27YuN65I="; }; nativeBuildInputs = [ @@ -57,6 +42,12 @@ stdenv.mkDerivation rec { switchboard ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Sound Plug"; homepage = "https://github.com/elementary/switchboard-plug-sound"; From 818cb2a6abb9ec05a724b16b1f961d2bf258f0c2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 08:44:44 +0800 Subject: [PATCH 15/67] pantheon.switchboard-plug-keyboard: 2.5.1 -> 2.6.0 (cherry picked from commit f3b5da17e8501ec8279c3daead6bc41f1ec56cf8) --- .../apps/switchboard-plugs/keyboard/default.nix | 14 ++++++++++---- .../switchboard-plugs/keyboard/fix-paths.patch | 17 +++++++++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index c3860ba22789..8c5071745178 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -8,32 +9,35 @@ , pkg-config , vala , libgee +, gnome-settings-daemon , granite +, gsettings-desktop-schemas , gtk3 , libhandy , libxml2 , libgnomekbd , libxklavier , ibus +, onboard , switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y"; + sha256 = "sha256-Bl0T+8upTdBnLs03UIimcAg0LO40KwuMZRNSM+y/3Hc="; }; patches = [ ./0001-Remove-Install-Unlisted-Engines-function.patch (substituteAll { src = ./fix-paths.patch; - ibus = ibus; + inherit ibus onboard; }) ]; @@ -52,7 +56,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gnome-settings-daemon # media-keys granite + gsettings-desktop-schemas gtk3 ibus libgee diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch index bb21712a5bc4..0b5c8b8fd27e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala -index 6d79fdc..de4276e 100644 +index 7f73c1e1..1f0d6400 100644 --- a/src/Views/InputMethod.vala +++ b/src/Views/InputMethod.vala -@@ -325,7 +325,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid { +@@ -328,7 +328,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid { private void spawn_ibus_daemon () { bool is_spawn_succeeded = false; try { @@ -11,3 +11,16 @@ index 6d79fdc..de4276e 100644 } catch (GLib.SpawnError e) { warning (e.message); set_visible_view (e.message); +diff --git a/src/Views/Layout.vala b/src/Views/Layout.vala +index 75d2d805..b86252a4 100644 +--- a/src/Views/Layout.vala ++++ b/src/Views/Layout.vala +@@ -219,7 +219,7 @@ namespace Pantheon.Keyboard { + + onscreen_keyboard_settings.clicked.connect (() => { + try { +- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE); ++ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE); + appinfo.launch (null, null); + } catch (Error e) { + warning ("Unable to launch onboard-settings: %s", e.message); From e3f6a6e92df5bbd5ae2817ea841506702bb56420 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 08:47:09 +0800 Subject: [PATCH 16/67] pantheon.wingpanel-indicator-network: 2.3.1 -> 2.3.2 (cherry picked from commit 26c04f9942bc8d462cef49e321ca470f17afb159) --- .../wingpanel-indicators/network/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 560d16111c50..a7ba66707a6e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -18,19 +18,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-xr1ZihWK8fU8M/rXRKk5dOjoQNe3aJO8ouKC/iVZ7Sk="; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-4Fg8/Gm9mUqaL3wEc8h+/pMvOfD75ILjo7LhLz6LQmo="; }; nativeBuildInputs = [ @@ -49,6 +43,12 @@ stdenv.mkDerivation rec { wingpanel ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Network Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-network"; From 7580f49fc1e42f4fe551d9d4079f7a2a9e37d794 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:43:41 +0800 Subject: [PATCH 17/67] pantheon.elementary-camera: 6.0.1 -> 6.0.2 (cherry picked from commit 079cbad8d958e9f6835dbfc401462d100e11de2f) --- pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 708041bd88a8..6a61c11d2dcb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "elementary-camera"; - version = "6.0.1"; + version = "6.0.2"; repoName = "camera"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-OdBinryF6XTcvtY4A1wdDVazjf/VritEGF97ts6d4RY="; + sha256 = "sha256-uVeV+LKA/W7WVUAvVWaSNRzeh1MUrhRjvS0HuhZZJ04="; }; nativeBuildInputs = [ From 9b729138d9ed416649da947f3b858f0133702797 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:47:09 +0800 Subject: [PATCH 18/67] pantheon.switchboard-plug-security-privacy: 2.2.5 -> 2.3.0 (cherry picked from commit 884945d69c24f82741f2b30a0d4eddced68123c3) --- .../security-privacy/default.nix | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 986aa171e920..98aa0926a4fb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson @@ -8,8 +8,10 @@ , ninja , pkg-config , vala +, elementary-settings-daemon , libgee , granite +, gsettings-desktop-schemas , gala , gtk3 , glib @@ -20,28 +22,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "2.2.5"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1ydr1xpbyxjcnd36c9j7a64srbz6gpbshwhcqj6591kmiqhmvknk"; - }; - - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-security-privacy/pull/130 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/18fe438baba651670d7f0534856c3b2433e3d75d.patch"; - sha256 = "19qwm725k6h41kgg4a98i4rxx45s4bb1wxx0fzkh75gz9syfi58w"; - }) - ]; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-pkpS7BR/eXA0rWV1C5AR+FdF5OkDnV8YDBAt1ZkaVPo="; }; nativeBuildInputs = [ @@ -53,9 +40,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + elementary-settings-daemon # settings schema gala glib granite + gsettings-desktop-schemas gtk3 libgee polkit @@ -68,6 +57,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Security & Privacy Plug"; homepage = "https://github.com/elementary/switchboard-plug-security-privacy"; From 7811213408160e6ecf62b86a0e615359a2927df9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:48:23 +0800 Subject: [PATCH 19/67] pantheon.appcenter: 3.8.2 -> 3.9.0 (cherry picked from commit 59c9786c5be350cb2838ca63f88b63819b997b1b) --- pkgs/desktops/pantheon/apps/appcenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index a7e5af3370c3..18cf1787f6db 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.8.2"; + version = "3.9.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-NHKP1vzb8qu+EkUWDvLWLl4U4pW9ZxbE7YFI6Vwesfg="; + sha256 = "sha256-+r19n42FPoBArZNDF4ZAdUBZqsSxpLwpeBoyaRJBCrg="; }; passthru = { From ff9563ad050f9ff68c598cf6b0c42eff11ae5953 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:50:25 +0800 Subject: [PATCH 20/67] pantheon.elementary-onboarding: 6.0.0 -> 6.1.0 (cherry picked from commit a9f302e1a2dedd1ea74f9bc847c2aac1515da3e5) --- .../desktop/elementary-onboarding/default.nix | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 3235442e332f..a7ee4ee7455a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , pantheon @@ -14,6 +16,7 @@ , libgee , elementary-icon-theme , elementary-gtk-theme +, elementary-settings-daemon , gettext , libhandy , wrapGAppsHook @@ -22,7 +25,7 @@ stdenv.mkDerivation rec { pname = "elementary-onboarding"; - version = "6.0.0"; + version = "6.1.0"; repoName = "onboarding"; @@ -30,13 +33,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1mpw0j8ymb41py9v9qlk4nwy1lnwj7k388c7gqdv34ynck0ymfi4"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-9voy9eje3VlV4IMM664EyjKWTfSVogX5JoRCqhsUXTE="; }; nativeBuildInputs = [ @@ -52,6 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ elementary-gtk-theme elementary-icon-theme + elementary-settings-daemon # settings schema glib granite gtk3 @@ -64,6 +62,12 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; appcenter = appcenter; }) + # Provides the directory where the locales are actually installed + # https://github.com/elementary/onboarding/pull/147 + (fetchpatch { + url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch"; + sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs="; + }) ]; postPatch = '' @@ -71,6 +75,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Onboarding app for new users designed for elementary OS"; homepage = "https://github.com/elementary/onboarding"; From 9337a88fc266eb45bef1b6b18278f02f2e8cbf2d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:52:51 +0800 Subject: [PATCH 21/67] pantheon.switchboard-plug-pantheon-shell: 6.0.0 -> 6.1.0 (cherry picked from commit e5afe95fe7d4e2028741a3721eeb846e328925dd) --- .../pantheon-shell/default.nix | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 69242e8132f1..4932694eebd3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson @@ -25,28 +25,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0349150kxdv14ald79pzn7lasiqipyc37fgchygbc8hsy62d9a32"; - }; - - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-pantheon-shell/pull/286 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/0c3207ffaeaa82ca3c743bc9ec772185fbd7e8cf.patch"; - sha256 = "11ymzqx6has4zf8y0xy7pfhymcl128hzzjcgp46inshjf99v5kiv"; - }) - ]; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-rwneQ1bqpWDyTHULMtGqhPdpSDa4ObnVortmL0E+gHA="; }; nativeBuildInputs = [ @@ -73,6 +58,12 @@ stdenv.mkDerivation rec { wingpanel ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Desktop Plug"; homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell"; From 2a4ad08206ea46f0319fb6d9df163d4082331a38 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:54:56 +0800 Subject: [PATCH 22/67] pantheon.granite: 6.1.2 -> 6.2.0 (cherry picked from commit 110e1931cec2162d4976a44382d43e5f445c32cb) --- pkgs/desktops/pantheon/granite/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 20b5729ac302..68ea9eb1417f 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , python3 @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "6.1.2"; + version = "6.2.0"; outputs = [ "out" "dev" ]; @@ -26,13 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-d48KQH8uwkSZWQEFSq1BD+TVUi9PWVVtMjKYmleRW58="; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-WM0Wo9giVP5pkMFaPCHsMfnAP6xD71zg6QLCYV6lmkY="; }; nativeBuildInputs = [ @@ -58,6 +53,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "An extension to GTK used by elementary OS"; longDescription = '' From 4826051256590fcd624c69d55d7694f69e78f36c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:56:33 +0800 Subject: [PATCH 23/67] pantheon.elementary-gtk-theme: 6.1.0 -> 6.1.1 (cherry picked from commit 2361a73786b9c6eb125aaf31a2ae0b3a331f131b) --- .../artwork/elementary-gtk-theme/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 439a8986ea46..6af2cbb8866d 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "6.1.0"; + version = "6.1.1"; repoName = "stylesheet"; @@ -18,13 +19,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-YvBjMbC3aQtYc/jPZmGdL4VfBH/VuxQ70PD0BWg9DTg="; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-gciBn5MQ5Cu+dROL5kCt2GCbNA7W4HOWXyjMBd4OP+8="; }; nativeBuildInputs = [ @@ -34,6 +29,12 @@ stdenv.mkDerivation rec { sassc ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "GTK theme designed to be smooth, attractive, fast, and usable"; homepage = "https://github.com/elementary/stylesheet"; From 80cf8a68b746c8f774f2c87712680fb2a312d467 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:57:56 +0800 Subject: [PATCH 24/67] pantheon.elementary-icon-theme: 6.0.0 -> 6.1.0 (cherry picked from commit 87a5c67107cd6b803c743e55664bdd7319c3eb8f) --- .../artwork/elementary-icon-theme/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index abaf8d6c31c5..2b5fa77b72ac 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { pname = "elementary-icon-theme"; - version = "6.0.0"; + version = "6.1.0"; repoName = "icons"; @@ -21,13 +22,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0k94zi8fzi0nf5q471fmrlz8jjkv8m6vav1spzv7ynkg2hik8d9b"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-WR4HV0nJKj0WeSFHXLK64O0LhX8myAJE4w0aztyhPn4="; }; nativeBuildInputs = [ @@ -57,6 +52,12 @@ stdenv.mkDerivation rec { postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Named, vector icons for elementary OS"; longDescription = '' From a4a01603fa4396f1d91e11a37aa6dac8751c1541 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 10:18:09 +0800 Subject: [PATCH 25/67] pantheon.elementary-dock: unstable-2021-07-16 -> unstable-2021-11-08 (cherry picked from commit 7e43f2f8500441e93a2fe75cb4ce5183d7eacca3) --- pkgs/desktops/pantheon/apps/elementary-dock/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index 0a534e5e7d04..6b27441584a2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , vala , atk @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { pname = "elementary-dock"; - version = "unstable-2021-07-16"; + version = "unstable-2021-11-08"; outputs = [ "out" "dev" ]; @@ -37,8 +38,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = "05fd6fccdf1a769f6737a0d7e57e092825348660"; - sha256 = "0lqqq5cx0kk8y7qyjx7z2k3v1kw2xxzns968ianarcji19wzcns4"; + rev = "51e8d3ddfbed0dfce3158d80f997ab183e92567b"; + sha256 = "sha256-w6HGxEAXNod/uMEEfSz9nRNTRrCbcEqJCP9EFkVbX1U="; }; nativeBuildInputs = [ From 15a7a8161181936790c65291631b937493eaca3d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:45:53 +0800 Subject: [PATCH 26/67] pantheon.elementary-code: 6.0.1 -> 6.1.0 (cherry picked from commit 5a61f08144fcc7386ca0980dc3b37861c7937e63) --- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 018e8cb775c3..f35fec275299 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "6.0.1"; + version = "6.1.0"; repoName = "code"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "120328pprzqj4587yj54yya9v2mv1rfwylpmxyr5l2qf80cjxi9d"; + sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw="; }; passthru = { From da475fa087411406609b90d03da4759f983cd62a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:26:31 +0800 Subject: [PATCH 27/67] pantheon.gala: 6.2.1 -> 6.3.0 (cherry picked from commit d5aaed533cb321c2e12182f811fe28401df3fb5d) --- .../pantheon/desktop/gala/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 208ea7cd8bd4..7dc6d79fee16 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -16,14 +16,11 @@ , granite , libgee , bamf -, libcanberra , libcanberra-gtk3 , gnome-desktop , mutter , clutter -, elementary-dock , elementary-icon-theme -, elementary-settings-daemon , gnome-settings-daemon , wrapGAppsHook , gexiv2 @@ -31,23 +28,22 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.2.1"; + version = "6.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1phnhj731kvk8ykmm33ypcxk8fkfny9k6kdapl582qh4d47wcy6f"; + sha256 = "sha256-f/WDm9/+lXgplg9tGpct4f+1cOhKgdypwiDRBhewRGw="; }; patches = [ ./plugins-dir.patch - # Multitasking view: Don't use smooth scroll events to handle mouse wheel - # Avoid breaking the multitasking view scroll once xf86-input-libinput 1.2.0 lands - # https://github.com/elementary/gala/pull/1266 + # Session crashes when switching windows with Alt+Tab + # https://github.com/elementary/gala/issues/1312 (fetchpatch { - url = "https://github.com/elementary/gala/commit/d2dcfdefdf97c1b49654179a7acd01ebfe017308.patch"; - sha256 = "sha256-2lKrCz3fSjrfKfysuUHzeUjhmMm84K47n882CLpfAyg="; + url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch"; + sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc="; }) ]; @@ -66,20 +62,23 @@ stdenv.mkDerivation rec { buildInputs = [ bamf clutter - elementary-dock elementary-icon-theme - elementary-settings-daemon gnome-settings-daemon gexiv2 gnome-desktop granite gtk3 - libcanberra libcanberra-gtk3 libgee mutter ]; + mesonFlags = [ + # TODO: enable this and remove --builtin flag from session-settings + # https://github.com/NixOS/nixpkgs/pull/140429 + "-Dsystemd=false" + ]; + postPatch = '' chmod +x build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py @@ -91,7 +90,7 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = with lib; { description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon"; homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; From 3ae62e6e62e2eccf2c9824f53df9e6322175d4da Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Nov 2021 09:32:52 +0800 Subject: [PATCH 28/67] pantheon.wingpanel-applications-menu: 2.9.1 -> 2.10.1 (cherry picked from commit a54db1668b888c1f6dddd8c644b203df21697088) --- .../wingpanel-indicators/applications-menu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index c2a4ad64ce95..15c301eee15a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.9.1"; + version = "2.10.1"; repoName = "applications-menu"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-Q0ee8S8wWhK0Y16SWfE79Us6QD/oRE5Pxm3o//eb/po="; + sha256 = "sha256-e9InWx5b2DAFK7m7z/oCW7Mw/ymBNz1Sc7vT65kkZ9o="; }; patches = [ From f8bd98726b6e93f58194d958648460d338780435 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 25 Nov 2021 15:10:03 +0800 Subject: [PATCH 29/67] pantheon.wingpanel-indicator-datetime: use upstreamed patch (cherry picked from commit ca71d0b22a47e07bfe0008737e238fd50e27b83b) --- .../wingpanel-indicators/datetime/default.nix | 6 ++++- .../datetime/fix-incorrect-month.patch | 26 ------------------- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 8226ed5b0b3c..d9c2cdc90338 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , pantheon @@ -40,7 +41,10 @@ stdenv.mkDerivation rec { }) # Fix incorrect month shown on re-opening indicator if previously changed month # https://github.com/elementary/wingpanel-indicator-datetime/pull/284 - ./fix-incorrect-month.patch + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch"; + sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch deleted file mode 100644 index 7e0dc09b16c2..000000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 401cb05d7181e69ae8edd347644f2518904e9acb Mon Sep 17 00:00:00 2001 -From: Jeremy Paul Wootten -Date: Sat, 30 Oct 2021 17:44:12 +0100 -Subject: [PATCH] Reset position and relative position after rebuilding - carousel - ---- - src/Widgets/calendar/CalendarView.vala | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala -index a41b37a4..f946b91c 100644 ---- a/src/Widgets/calendar/CalendarView.vala -+++ b/src/Widgets/calendar/CalendarView.vala -@@ -216,7 +216,11 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { - carousel.add (right_grid); - carousel.scroll_to (start_month_grid); - label.label = calmodel.month_start.format (_("%OB, %Y")); -+ -+ position = 1; -+ rel_postion = 0; - } -+ - carousel.no_show_all = false; - } - From dd160ba3c71d43d51cb5daa166346bf5279d5265 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Nov 2021 09:25:24 +0800 Subject: [PATCH 30/67] pantheon.switchboard-plug-onlineaccounts: 6.2.1 -> 6.2.2 (cherry picked from commit 9949f1009d9ce7c58d94cf69b4de3bd58087cf98) --- .../onlineaccounts/default.nix | 40 ++++++------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 5e8447f629a3..409679407d81 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,42 +1,30 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config , vala -, libgee +, evolution-data-server +, glib , granite , gtk3 -, libaccounts-glib , libgdata , libhandy -, libsignon-glib -, json-glib -, librest -, webkitgtk -, libsoup , sqlite , switchboard -, evolution-data-server }: stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; - version = "6.2.1"; + version = "6.2.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1q3f7zr04p2100mb255zy38il2i47l6vqdc9a9acjbk3n7q5sf92"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-L1SL8YbsYKdE+mvRW/fxjNoiyXRXTyV2ru7/tZzgTfM="; }; nativeBuildInputs = [ @@ -48,23 +36,20 @@ stdenv.mkDerivation rec { buildInputs = [ evolution-data-server + glib granite gtk3 - json-glib - libaccounts-glib libgdata - libgee libhandy - libsignon-glib - libsoup - librest sqlite # needed for camel-1.2 switchboard - webkitgtk ]; - PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers"; - PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services"; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; meta = with lib; { description = "Switchboard Online Accounts Plug"; @@ -73,5 +58,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = teams.pantheon.members; }; - } From 2a4446a175eabf0f99b96f16dab4abb92080ae5b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Nov 2021 16:51:18 +0800 Subject: [PATCH 31/67] pkgs/pantheon: remove unused `pantheon` from args (cherry picked from commit 7bec0408e7b9f9d176a2adbcc8184cdfeb39c617) --- pkgs/desktops/pantheon/apps/appcenter/default.nix | 1 - .../pantheon/apps/elementary-calculator/default.nix | 4 ++-- .../pantheon/apps/elementary-calendar/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-dock/default.nix | 1 - .../pantheon/apps/elementary-feedback/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-files/default.nix | 1 - pkgs/desktops/pantheon/apps/elementary-mail/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-music/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 6 +++--- .../pantheon/apps/elementary-screenshot/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-tasks/default.nix | 4 ++-- .../pantheon/apps/elementary-terminal/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 1 - pkgs/desktops/pantheon/apps/sideload/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/a11y/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/about/default.nix | 4 ++-- .../apps/switchboard-plugs/applications/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/datetime/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/display/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/keyboard/default.nix | 1 - .../apps/switchboard-plugs/mouse-touchpad/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/network/default.nix | 5 ++--- .../apps/switchboard-plugs/notifications/default.nix | 4 ++-- .../apps/switchboard-plugs/pantheon-shell/default.nix | 1 - .../pantheon/apps/switchboard-plugs/power/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/printers/default.nix | 4 ++-- .../apps/switchboard-plugs/security-privacy/default.nix | 1 - .../pantheon/apps/switchboard-plugs/sharing/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/sound/default.nix | 1 - .../pantheon/apps/switchboard-plugs/wacom/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/switchboard/default.nix | 4 ++-- .../pantheon/artwork/elementary-gtk-theme/default.nix | 1 - .../pantheon/artwork/elementary-icon-theme/default.nix | 1 - .../artwork/elementary-redacted-script/default.nix | 4 ++-- .../pantheon/artwork/elementary-sound-theme/default.nix | 4 ++-- .../pantheon/artwork/elementary-wallpapers/default.nix | 4 ++-- .../desktop/elementary-default-settings/default.nix | 1 - .../pantheon/desktop/elementary-greeter/default.nix | 4 ++-- .../pantheon/desktop/elementary-onboarding/default.nix | 1 - .../pantheon/desktop/elementary-print-shim/default.nix | 4 ++-- .../desktop/elementary-session-settings/default.nix | 4 ++-- .../desktop/elementary-shortcut-overlay/default.nix | 1 - .../desktop/extra-elementary-contracts/default.nix | 3 ++- pkgs/desktops/pantheon/desktop/gala/default.nix | 1 - .../desktop/wingpanel-indicators/a11y/default.nix | 4 ++-- .../wingpanel-indicators/applications-menu/default.nix | 4 ++-- .../desktop/wingpanel-indicators/bluetooth/default.nix | 4 ++-- .../desktop/wingpanel-indicators/datetime/default.nix | 1 - .../desktop/wingpanel-indicators/keyboard/default.nix | 4 ++-- .../desktop/wingpanel-indicators/network/default.nix | 1 - .../desktop/wingpanel-indicators/nightlight/default.nix | 4 ++-- .../wingpanel-indicators/notifications/default.nix | 4 ++-- .../desktop/wingpanel-indicators/power/default.nix | 4 ++-- .../desktop/wingpanel-indicators/session/default.nix | 4 ++-- .../desktop/wingpanel-indicators/sound/default.nix | 1 - pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 4 ++-- pkgs/desktops/pantheon/granite/default.nix | 1 - pkgs/desktops/pantheon/services/contractor/default.nix | 4 ++-- .../services/elementary-capnet-assist/default.nix | 4 ++-- .../services/elementary-notifications/default.nix | 4 ++-- .../services/elementary-settings-daemon/default.nix | 4 ++-- .../pantheon/services/pantheon-agent-geoclue2/default.nix | 8 ++++---- .../pantheon/services/pantheon-agent-polkit/default.nix | 4 ++-- 66 files changed, 99 insertions(+), 117 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 18cf1787f6db..6492c9332940 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -21,7 +21,6 @@ , meson , ninja , packagekit -, pantheon , pkg-config , python3 , vala diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 2e52d39a6da4..2878d750db8b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index d46e3c9c8ee9..019e2cf5a242 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 6a61c11d2dcb..0d434084c235 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index f35fec275299..97f6e1d5e80b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index 6b27441584a2..f23120c0b6dd 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -21,7 +21,6 @@ , gnome-menus , libgee , wrapGAppsHook -, pantheon , meson , ninja , granite diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 05ac02150d79..8a9256f2a615 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index bddc9d5acff6..dcd4591f1363 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index dd3e5268f9c2..402612108b66 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index c2b89e7111d0..bee11ed055bc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 103d4692521b..ca7b6fd3a7d1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = with lib; { description = "Photo viewer and organizer designed for elementary OS"; homepage = "https://github.com/elementary/photos"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index a4d966c6fc85..f2f4360aa59e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index 478fdc1db96c..52bda92ceb0d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , appstream , desktop-file-utils , meson diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 76c36f9e0704..f7799810ed81 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index a87ac48c7f30..faeaab7ece18 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 98f4d9f3c91d..a065966ba1e3 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , desktop-file-utils , nix-update-script , elementary-gtk-theme @@ -13,7 +14,6 @@ , libhandy , meson , ninja -, pantheon , pkg-config , python3 , vala diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 949f1ecc3d0b..bcb7c39d17b4 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , substituteAll , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index f196ba970bd6..d48704736b1d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , substituteAll , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 22c2f4f64af7..d24b75502600 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 2238125fe2f6..8f4b9fe32b27 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index b4518ea1e440..09717a584ce0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , substituteAll diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 8e6cbf080631..c25188add450 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 8c5071745178..01a3da26b1d5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , substituteAll , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 0368314e7b4f..a765eca6de2d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , substituteAll -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 7ccfb265e9e9..b88f3f72d035 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { description = "Switchboard Networking Plug"; homepage = "https://github.com/elementary/switchboard-plug-network"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 42cddfd2d67f..fd5dfa328104 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 4932694eebd3..6fc961e4b5f5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 6a9848b34a7d..0e8168d299aa 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index cae5b570547f..dbca28038ab3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 98aa0926a4fb..550562f19b17 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , python3 , ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 2eacf5585109..f41cfa2f7457 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index b003ac1ce807..8a23f09838eb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index 9268fa76aefc..e31768c764d4 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 418b0b931967..e78f4472a7bb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 6af2cbb8866d..b76a874490ed 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , gettext diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 2b5fa77b72ac..450275d1050d 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , python3 , ninja diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index b9c51f5688c2..97df0f9c78ac 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, pantheon }: stdenv.mkDerivation { diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index 6fe18119b458..6bad05693fea 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 9fd0a4d1a4e8..1ae25be5dcaf 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , gettext diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 7b0ea248ed61..a96bba4ab115 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , nixos-artwork diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 3d698a7807f9..18e00e63bccb 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , linkFarm , substituteAll , elementary-greeter -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index a7ee4ee7455a..e7a3d10b4fde 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -4,7 +4,6 @@ , fetchpatch , nix-update-script , substituteAll -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index b305c7626cba..119d5be21381 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index e3d0cb8c7282..2c0d2ae100c7 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , desktop-file-utils , pkg-config , writeScript -, pantheon , gnome-keyring , gnome-session , wingpanel diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index eb8563bc50d7..fbde187ce6dc 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix index 2db483cb5c7e..c579997f5e83 100644 --- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , substituteAll , fetchFromGitHub , file-roller diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 7dc6d79fee16..06021a37f511 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index 7e185ece23ac..7ffc2cebab79 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 15c301eee15a..d74907db9118 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , substituteAll , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index a9b13650ddba..56d59ed4614a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index d9c2cdc90338..708e2b6eb0cc 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -4,7 +4,6 @@ , fetchpatch , nix-update-script , substituteAll -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 6d5227b7139f..4ce8fb0434f9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index a7ba66707a6e..fdb6481f7e7f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nix-update-script , substituteAll -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 23f9e400c01b..ecaa05bc356c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 5adf2c7da6f5..a0a687985f91 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index f3d3ac0e46d5..38a8fb23701f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , substituteAll , nix-update-script -, pantheon , gnome , pkg-config , meson diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index eaccad35aa0b..510558f3cb6a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 19f44d8d165e..16e04bedcb93 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index e22c654e1ef8..709a4e3e6140 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , wrapGAppsHook , pkg-config , meson diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 68ea9eb1417f..ec2255bbbc19 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -8,7 +8,6 @@ , vala , pkg-config , libgee -, pantheon , gtk3 , glib , gettext diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 226344204879..a6c0cb8a3c53 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , python3 , ninja diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index c687b281a2a7..ed9919b0b037 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 9dd5a8695258..2ea13c9cb595 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -10,7 +11,6 @@ , libgee , libhandy , libcanberra-gtk3 -, pantheon , python3 , wrapGAppsHook }: diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 79ced4bfe582..69a0c2a7bb1a 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja -, pantheon , pkg-config , python3 , vala diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index e2053ebf6a31..c135ea4e18ed 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsHook - ]; + ]; buildInputs = [ geoclue2 gtk3 libgee - ]; + ]; # This should be provided by a post_install.py script - See -> https://github.com/elementary/pantheon-agent-geoclue2/pull/21 postInstall = '' diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 4bef7fd5e08e..3644d9665df0 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja From 342191649937a185c108fa186dba38541c6ee836 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 28 Nov 2021 19:25:12 +0800 Subject: [PATCH 32/67] pantheon.switchboard: remove clutter-gtk from buildInputs (cherry picked from commit b1005e8b3d0fa1b95fc624b078b5db65b22ff0c9) --- pkgs/desktops/pantheon/apps/switchboard/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index e78f4472a7bb..c8e6f11f111c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -13,7 +13,6 @@ , libhandy , granite , gettext -, clutter-gtk , elementary-icon-theme , wrapGAppsHook }: @@ -46,7 +45,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter-gtk elementary-icon-theme granite gtk3 From 36c54caf302220e3d6d96da0bd50aabebe25e2c5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 28 Nov 2021 19:26:55 +0800 Subject: [PATCH 33/67] pantheon.elementary-code: remove zeitgeist from buildInputs (cherry picked from commit c0966f8571c17fceb93aef059ddbf321e5b0fefd) --- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 97f6e1d5e80b..078dc5d5f047 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -21,7 +21,6 @@ , libsoup , vte , webkitgtk -, zeitgeist , ctags , libgit2-glib , wrapGAppsHook @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { libsoup vte webkitgtk - zeitgeist ]; # install script fails with UnicodeDecodeError because of printing a fancy elipsis character From 5b966518ce0f9f023e0bb2cb5a7bbc0f19ca4068 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 30 Nov 2021 09:13:44 +0800 Subject: [PATCH 34/67] pantheon.elementary-files: 6.0.4 -> 6.1.0 (cherry picked from commit 94d1b0d54154614c17be5e4c9465f05b45cf851d) --- .../apps/elementary-files/default.nix | 6 ++-- ...-portal-hardcode-gsettings-for-nixos.patch | 28 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index dcd4591f1363..91dc48cf1c2f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.0.4"; + version = "6.1.0"; repoName = "files"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-FH6EYtgKADp8jjBoCwsdRdknlKS9v3iOtPiT3CyEc/8="; + sha256 = "sha256-aGiFEeSvDV5rPD2Ll/BuDoWclEPhR1UuoCxUSS9CGmw="; }; passthru = { @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { chmod +x meson/post_install.py patchShebangs meson/post_install.py - substituteInPlace filechooser-portal/LegacyFileChooserDialog.vala \ + substituteInPlace filechooser-portal/FileChooserDialog.vala \ --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch b/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch index b04208cc8b86..9ad9ee542728 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch +++ b/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch @@ -1,24 +1,24 @@ -From 726ab4c0ab01273cb2197e4c151a5b69ff0954b6 Mon Sep 17 00:00:00 2001 +From 256d80aa2ab2b84316260d0be5263b02fd5e796f Mon Sep 17 00:00:00 2001 From: Bobby Rong -Date: Fri, 16 Jul 2021 18:24:58 +0800 +Date: Tue, 30 Nov 2021 10:24:39 +0800 Subject: [PATCH] filechooser-portal: hardcode gsettings for nixos --- - filechooser-portal/LegacyFileChooserDialog.vala | 4 +++- + filechooser-portal/FileChooserDialog.vala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/filechooser-portal/LegacyFileChooserDialog.vala b/filechooser-portal/LegacyFileChooserDialog.vala -index 330718f..f383bb1 100644 ---- a/filechooser-portal/LegacyFileChooserDialog.vala -+++ b/filechooser-portal/LegacyFileChooserDialog.vala -@@ -60,7 +60,9 @@ public class Files.LegacyFileChooserDialog : Object { - /* If not local only during creation, strange bug occurs on fresh installs */ - chooser_dialog.local_only = true; +diff --git a/filechooser-portal/FileChooserDialog.vala b/filechooser-portal/FileChooserDialog.vala +index 4a84016db..4bf2b32a1 100755 +--- a/filechooser-portal/FileChooserDialog.vala ++++ b/filechooser-portal/FileChooserDialog.vala +@@ -160,7 +160,9 @@ public class Files.FileChooserDialog : Hdy.Window, Xdp.Request { + accept_button.grab_default (); + setup_chooser (); -- var chooser_settings = new Settings ("io.elementary.files.file-chooser"); +- var settings = new Settings ("io.elementary.files.file-chooser"); + SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); + SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false); -+ var chooser_settings = new Settings.full (chooser_schema, null, null); - - action_area = (Gtk.ButtonBox) chooser_dialog.get_action_area (); ++ var settings = new Settings.full (chooser_schema, null, null); + int width, height; + settings.get ("window-size", "(ii)", out width, out height); From 9fd82b4dd00540e8f27b2cf2902089e5a5321d03 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 30 Nov 2021 15:38:11 +0800 Subject: [PATCH 35/67] pantheon.elementary-files: drop filechooser-portal-hardcode-gsettings-for-nixos.patch (cherry picked from commit 0a989ec7caa63aabd47b4aff5aecd5a754cd6cea) --- .../apps/elementary-files/default.nix | 8 +------ ...-portal-hardcode-gsettings-for-nixos.patch | 24 ------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 91dc48cf1c2f..747f9662680d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { bamf elementary-dock elementary-icon-theme + glib granite gtk3 libcanberra @@ -82,16 +83,9 @@ stdenv.mkDerivation rec { zeitgeist ]; - patches = [ - ./filechooser-portal-hardcode-gsettings-for-nixos.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py - - substituteInPlace filechooser-portal/FileChooserDialog.vala \ - --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch b/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch deleted file mode 100644 index 9ad9ee542728..000000000000 --- a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 256d80aa2ab2b84316260d0be5263b02fd5e796f Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Tue, 30 Nov 2021 10:24:39 +0800 -Subject: [PATCH] filechooser-portal: hardcode gsettings for nixos - ---- - filechooser-portal/FileChooserDialog.vala | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/filechooser-portal/FileChooserDialog.vala b/filechooser-portal/FileChooserDialog.vala -index 4a84016db..4bf2b32a1 100755 ---- a/filechooser-portal/FileChooserDialog.vala -+++ b/filechooser-portal/FileChooserDialog.vala -@@ -160,7 +160,9 @@ public class Files.FileChooserDialog : Hdy.Window, Xdp.Request { - accept_button.grab_default (); - setup_chooser (); - -- var settings = new Settings ("io.elementary.files.file-chooser"); -+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); -+ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false); -+ var settings = new Settings.full (chooser_schema, null, null); - int width, height; - - settings.get ("window-size", "(ii)", out width, out height); From 09ec5e68dc8b33721acc0b2eb46a44d0990b0905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Nov 2021 10:57:42 +0100 Subject: [PATCH 36/67] Revert "nix-direnv: use nix (2.4) and remove enableFlakes" This reverts commit c03040cfd5fef7dc99a7663c30e33df5ebec6984. --- pkgs/tools/misc/nix-direnv/default.nix | 9 +++++++-- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 0de14426f213..1873cc60557d 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -2,9 +2,14 @@ , stdenv , fetchFromGitHub , gnugrep -, nix -, enableFlakes ? null # deprecated +, nixStable +, nixUnstable +, enableFlakes ? false }: + +let + nix = if enableFlakes then nixUnstable else nixStable; +in stdenv.mkDerivation rec { pname = "nix-direnv"; version = "1.5.0"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1df00dbf2fa5..b69d06466e6b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -598,7 +598,6 @@ mapAliases ({ nfsUtils = nfs-utils; # added 2014-12-06 nginxUnstable = nginxMainline; # added 2018-04-25 nilfs_utils = nilfs-utils; # added 2018-04-25 - nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # added 2019-12-22 nixFlakes = nix_2_4; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcfacdda181e..e0b4411749d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3369,6 +3369,7 @@ with pkgs; nfstrace = callPackage ../tools/networking/nfstrace { }; nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; }; nix-output-monitor = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-output-monitor); From 5f9bb7f371d992fd35db06ec5ec1f5ce86237587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Nov 2021 11:00:16 +0100 Subject: [PATCH 37/67] nix-direnv: use nix_2_4 fixes https://github.com/NixOS/nixpkgs/issues/147974 --- pkgs/tools/misc/nix-direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 1873cc60557d..20eb6c781998 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -3,12 +3,12 @@ , fetchFromGitHub , gnugrep , nixStable -, nixUnstable +, nix_2_4 , enableFlakes ? false }: let - nix = if enableFlakes then nixUnstable else nixStable; + nix = if enableFlakes then nix_2_4 else nixStable; in stdenv.mkDerivation rec { pname = "nix-direnv"; From c43ec919ae0b4dc6f9227326e2a300bfe9eef53a Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 28 Nov 2021 09:29:49 -0500 Subject: [PATCH 38/67] python3Packages.pyarrow: enable dataset module (cherry picked from commit 442468f4ade3b315e1c9e092536109a79f600d9b) --- pkgs/development/python-modules/pyarrow/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 7360cab01f37..762b1db02c51 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -17,7 +17,10 @@ buildPythonPackage rec { checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; PYARROW_BUILD_TYPE = "release"; + + PYARROW_WITH_DATASET = true; PYARROW_WITH_PARQUET = true; + PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" @@ -62,6 +65,6 @@ buildPythonPackage rec { homepage = "https://arrow.apache.org/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ veprbl ]; + maintainers = with maintainers; [ veprbl cpcloud ]; }; } From 15be21ccfbbcabb844fd66c47bb87adb5b793f34 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 28 Nov 2021 09:30:24 -0500 Subject: [PATCH 39/67] python3Packages.pyarrow: enable flight module (cherry picked from commit da8dfd5128d9ba847b48ea21fbf4da7a313cfb34) --- pkgs/development/libraries/arrow-cpp/default.nix | 3 +++ pkgs/development/python-modules/pyarrow/default.nix | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 574ba3b12501..55efb99b8bd0 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -238,4 +238,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; }; + passthru = { + inherit enableFlight enableJemalloc enableS3 enableGcs; + }; } diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 762b1db02c51..9c74f0a5ea6a 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { PYARROW_BUILD_TYPE = "release"; PYARROW_WITH_DATASET = true; + PYARROW_WITH_FLIGHT = _arrow-cpp.enableFlight; PYARROW_WITH_PARQUET = true; PYARROW_CMAKE_OPTIONS = [ @@ -28,9 +29,13 @@ buildPythonPackage rec { # ourselves "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; + ARROW_HOME = _arrow-cpp; PARQUET_HOME = _arrow-cpp; + ARROW_TEST_DATA = lib.optionalString doCheck _arrow-cpp.ARROW_TEST_DATA; + + doCheck = true; dontUseCmakeConfigure = true; preBuild = '' From f366a8caa38f3b7c34d14c50a24a46d8e14ea90f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 30 Nov 2021 11:59:48 +0100 Subject: [PATCH 40/67] warzone2100: 4.2.2 -> 4.2.3 (cherry picked from commit 87aed70b18c88598f7f27d79e0e53f673a7e5094) --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 96d2e303bceb..9dc3cb1dd3af 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-F7TlnlQeEfGp1IBXlfKUgILKukUQxBFkoqXYmxfQOpk="; + sha256 = "sha256-nmHl/Qk8Knck9kDF8cuPUzOUxNNx0Vk/g1NW/H82vo0="; }; buildInputs = [ From 6a65c74d127cc4cd528fed80b1f67d27d732e6ea Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 18 Nov 2021 21:47:12 +0100 Subject: [PATCH 41/67] nixos/nginx: fix start when recommendedOptimisation is off Also done by other distros for example Fedora https://bodhi.fedoraproject.org/updates/FEDORA-2020-78690e2cdd (cherry picked from commit 9cb930ff687a6f5dc9d37477e50ad24aea38fd5f) --- nixos/modules/services/web-servers/nginx/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 5717b86b3bea..96e45cfc4f77 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -79,6 +79,11 @@ let # we use a list of mime types from the mailcap package, which is also # used by most other Linux distributions by default. include ${pkgs.mailcap}/etc/nginx/mime.types; + # When recommendedOptimisation is disabled nginx fails to start because the mailmap mime.types database + # contains 1026 enries and the default is only 1024. Setting to a higher number to remove the need to + # overwrite it because nginx does not allow duplicated settings. + types_hash_max_size 4096; + include ${cfg.package}/conf/fastcgi.conf; include ${cfg.package}/conf/uwsgi_params; @@ -113,7 +118,6 @@ let tcp_nopush on; tcp_nodelay on; keepalive_timeout 65; - types_hash_max_size 4096; ''} ssl_protocols ${cfg.sslProtocols}; From 88a4d7d1f4a4afb39c756f354071d1c3a5a953bd Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 25 Nov 2021 11:07:52 -0700 Subject: [PATCH 42/67] matrix-synapse: 1.47.1 -> 1.48.0 (cherry picked from commit 1b6daffd8494af0ed1504370cb7f541fd93bb7cd) --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 7e2b2e0ceeda..37ca8d235749 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.47.1"; + version = "1.48.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ldk14yMaFZ1uegiTwB6txomGJTV1Gf/LqJyWJARmhJ4="; + sha256 = "sha256-G09VbfC9mZ0+shLHRNutR91URewvLW4l4lQaVrsZYaQ="; }; patches = [ From f2f48f1c014d5f7551825984757de2aaa7777e2e Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 30 Nov 2021 11:12:50 +0100 Subject: [PATCH 43/67] nextcloud21: 21.0.5 -> 21.0.7 (cherry picked from commit b5a27cef4bb1d99b1e7bc61c07f84b6f4f2a383b) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0b7fb6f50fe7..348ffa0e37e0 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,8 +46,8 @@ in { ''; nextcloud21 = generic { - version = "21.0.5"; - sha256 = "1q46h480kn97k7h3xm7r5gsa8l3f0kfiicapi46sh0p39pbjbyhv"; + version = "21.0.7"; + sha256 = "sha256-WZMhWW613q5c6grR/dzVSCKJKru7XPtRoxgBhi8VE7c="; }; nextcloud22 = generic { From 644525083ac2f8986eacd196fb842bb6ca0eb148 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 27 Nov 2021 15:03:03 +0100 Subject: [PATCH 44/67] suricata: 6.0.3 -> 6.0.4 https://forum.suricata.io/t/suricata-6-0-4-and-5-0-8-released/1942 Fixes CVE-2021-37592. (cherry picked from commit 856a428ecf003bb955841708696a4e2bd10e7efb) --- pkgs/applications/networking/ids/suricata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 5d24f589abca..4edc97a0640d 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-2vE0uy18mAA16a5g96rzEzI6gJNAAJ8m5IEQzN6B9gI="; + sha256 = "sha256-qPGX4z0WeGieu/e8Gr6Ek0xGXSLFBMR8LH6bdKoELQ0="; }; nativeBuildInputs = [ From 71547a6a0076e327ef271760399643ebe066a141 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Dec 2021 15:22:12 +1000 Subject: [PATCH 45/67] yt-dlp: 2021.11.10.1 -> 2021.12.1 https://github.com/yt-dlp/yt-dlp/releases/tag/2021.12.01 (cherry picked from commit 5ecb046485782e458943c387e4cd0c2a8b0ea547) --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 6a6a019dcbee..e694e1561365 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.11.10.1"; + version = "2021.12.1"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "f0ad6ae2e2838b608df2fd125f2a777a7ad832d3e757ee6d4583b84b21e44388"; + sha256 = "sha256-WNpbltSDT+gTDJYLnf1nDNLQ5TtlDNkuXEOBckFRuA8="; }; propagatedBuildInputs = [ websockets mutagen ] From 5867d6cdd8e5cf62d5fcb192dde8fae967396eb8 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Tue, 30 Nov 2021 21:03:43 -0800 Subject: [PATCH 46/67] mrtrix: 3.0.2 -> unstable-2021-11-25 The latest stable version fails to build with latest eigen (> 3). https://github.com/MRtrix3/mrtrix3/pull/2368 (cherry picked from commit b1d95dca5645c107f49873ad5ab08e6d01c416cf) --- pkgs/applications/science/biology/mrtrix/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index e0b122778d1b..10bfb633f4af 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchFromGitHub, python, makeWrapper , eigen, fftw, libtiff, libpng, zlib, ants, bc , qt5, libGL, libGLU, libX11, libXext -, withGui ? true }: +, withGui ? true, less }: stdenv.mkDerivation rec { pname = "mrtrix"; - version = "3.0.2"; + version = "unstable-2021-11-25"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; - rev = version; - sha256 = "0p4d1230j6664rnb9l65cpyfj9ncbcm39yv1r9y77br9rkkv1za3"; + rev = "994498557037c9e4f7ba67f255820ef84ea899d9"; + sha256 = "sha256-8eFDS5z4ZxMzi9Khk90KAS4ndma/Syd6JDXM2Fpr0M8="; fetchSubmodules = true; }; @@ -44,6 +44,9 @@ stdenv.mkDerivation rec { substituteInPlace ./run_tests \ --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" + + substituteInPlace ./build \ + --replace '"less -RX "' '"${less}/bin/less -RX "' ''; configurePhase = '' From 66760548841c1ef10750f72f1bde9377725096d2 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 25 Nov 2021 23:49:15 +0800 Subject: [PATCH 47/67] stretchly: 1.7.0 -> 1.8.1 It contains the fix of a critical bug which which shows empty window and basically lock users out. https://github.com/hovancik/stretchly/commit/4f0df79bc6645ae16e9b8bbe4d4c5596482e840f (cherry picked from commit edc83a9bf0544787d25efd0964734503d5f179bf) --- pkgs/applications/misc/stretchly/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 9c0cc7d08e7c..d333640fc50b 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "stretchly"; - version = "1.7.0"; + version = "1.8.1"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; - sha256 = "sha256-F6p+g0yuDMpNq+cVgA3ZhUwCIiIU1QfYM90lmaNnRWw="; + sha256 = "sha256-/v74vDGxD5iiOPeBXPAaV42JpyBjeJSO/Lk88pCkDng="; }; icon = fetchurl { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin $out/share/${pname}/ - mv resources/app.asar $out/share/${pname}/ + mv resources/app.asar* $out/share/${pname}/ mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://hovancik.net/stretchly"; downloadPage = "https://hovancik.net/stretchly/downloads/"; license = licenses.bsd2; - maintainers = with maintainers; [ _1000101 ]; + maintainers = with maintainers; [ _1000101 oxalica ]; platforms = platforms.linux; }; } From b36a27af4c1966bf47bae27fff893d983c0a4f61 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Tue, 30 Nov 2021 20:19:31 -0800 Subject: [PATCH 48/67] lush2: remove package No releases or activity after v2.0.1 (since 2011) (cherry picked from commit 12cb1380061ba95afee747eca670ae2370082e93) --- .../development/interpreters/lush/default.nix | 29 ------------------- .../interpreters/lush/default.upstream | 4 --- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 35 deletions(-) delete mode 100644 pkgs/development/interpreters/lush/default.nix delete mode 100644 pkgs/development/interpreters/lush/default.upstream diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix deleted file mode 100644 index fe51d154956a..000000000000 --- a/pkgs/development/interpreters/lush/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL -, blas, libbfd, intltool, gettext, zlib, libSM}: - -stdenv.mkDerivation rec { - baseName = "lush"; - version = "2.0.1"; - name = "${baseName}-${version}"; - - src = fetchurl { - url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz"; - sha256 = "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; - }; - - buildInputs = [ - libX11 libSM xorgproto indent readline gsl freeglut libGLU libGL SDL blas libbfd - intltool gettext zlib - ]; - - hardeningDisable = [ "pic" ]; - - NIX_LDFLAGS=" -lz "; - - meta = { - description = "Lisp Universal SHell"; - license = lib.licenses.gpl2Plus ; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream deleted file mode 100644 index 8a8b08fcd68a..000000000000 --- a/pkgs/development/interpreters/lush/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/lush/files/lush2/ -version_link '[.]tar[.]gz/download$' -SF_redirect -minimize_overwrite diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03bd0847e955..327dd9a64393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13414,8 +13414,6 @@ with pkgs; ### End of CuboCore - lush2 = callPackage ../development/interpreters/lush {}; - maude = callPackage ../development/interpreters/maude { stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; From 55f738bf7713a4953c86d8afc2e05f0db7f77955 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 30 Nov 2021 17:57:50 -0300 Subject: [PATCH 49/67] pythonPackages.debugpy: add aarch64-linux compile flags (cherry picked from commit ed5709050c6963a798ff41567b410ae677df6a98) --- pkgs/development/python-modules/debugpy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index ed3e70e3ab2e..bf2ed3628675 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; + "aarch64-linux" = "-shared -o attach_linux_arm64.so"; "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; @@ -87,6 +88,6 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/debugpy"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "i686-darwin" "aarch64-darwin" ]; }; } From bbb796562b76c68f375213544b849511a4bd37a6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Nov 2021 07:31:44 +0000 Subject: [PATCH 50/67] =?UTF-8?q?ocamlPackages.merlin:=204.3.1=20=E2=86=92?= =?UTF-8?q?=204.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0c5915f44389e0dc844872128937b83bbd0bd333) --- pkgs/development/tools/ocaml/merlin/4.x.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 5554ce163502..831360cd858d 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,11 +15,12 @@ }: let - merlinVersion = "4.3.1"; + merlinVersion = "4.4"; hashes = { - "4.3.1-411" = "0lhxkd1wa8k3fkcnhvzlahx3g519cdi5h7lgs60khqqm8nfvfcr5"; - "4.3.1-412" = "0ah2zbj1hhrrfxp4nhfh47jsbkvm0b30dr7ikjpmvb13wa8h20sr"; + "4.4-411" = "sha256:0chx28098mmnjbnaz5wgzsn82rh1w9dhzqmsykb412cq13msl1q4"; + "4.4-412" = "sha256:18xjpsiz7xbgjdnsxfc52l7yfh22harj0birlph4xm42d14pkn0n"; + "4.4-413" = "sha256:1ilmh2gqpwgr51w2ba8r0s5zkj75h00wkw4az61ssvivn9jxr7k0"; }; ocamlVersionShorthand = lib.concatStrings @@ -37,7 +38,7 @@ buildDunePackage { inherit version; src = fetchurl { - url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; sha256 = hashes."${version}"; }; @@ -47,10 +48,12 @@ buildDunePackage { dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_2}/bin/dune"; }) + ] ++ lib.optional (!lib.versionAtLeast ocaml.version "4.12") # This fixes the test-suite on macOS # See https://github.com/ocaml/merlin/pull/1399 + # Fixed in 4.4 for OCaml ≥ 4.12 ./test.patch - ]; + ; useDune2 = true; From abca7d975e60c306ddef93cba5067d6feba58119 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Nov 2021 10:34:03 +0000 Subject: [PATCH 51/67] coqPackages.serapi: remove with Coq 8.14 (cherry picked from commit 0b40bc9df9ff70ba17773ba4c9cf3c5ee7163aac) --- pkgs/development/coq-modules/serapi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index f70cdcc9322a..301e5975c576 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -28,7 +28,6 @@ in inherit version release; defaultVersion = with versions; switch coq.version [ - { case = isEq "8.14"; out = "8.14+rc1+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } { case = isEq "8.12"; out = "8.12.0+0.12.1"; } { case = isEq "8.11"; out = "8.11.0+0.11.1"; } From 37a7d2c2719b4242788ee279ffe4647d3f031b1c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Nov 2021 10:33:29 +0000 Subject: [PATCH 52/67] =?UTF-8?q?coq=5F8=5F14:=208.14.0=20=E2=86=92=208.14?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And build Coq ≥ 8.14 with OCaml 4.12 (cherry picked from commit 7c973564b86f4cd9d755afcf78f21f7b258c2ab6) --- pkgs/applications/science/logic/coq/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/coq-packages.nix | 9 +++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 16db7384df17..02082663516e 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -7,7 +7,7 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null -, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses +, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses , buildIde ? true , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , csdp ? null @@ -45,6 +45,7 @@ let "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; + "8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix @@ -62,10 +63,11 @@ let '' else ""; ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages else with versions; switch coq-version [ + { case = range "8.14" "8.14"; out = ocamlPackages_4_12; } { case = range "8.11" "8.13"; out = ocamlPackages_4_10; } { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } - ] ocamlPackages_4_10; + ] ocamlPackages_4_12; ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] ++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!versionAtLeast "8.13") ocamlPackages.num diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 327dd9a64393..df05d8e64eb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31495,7 +31495,7 @@ with pkgs; cadical = callPackage ../applications/science/logic/cadical {}; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; + inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12; }) mkCoqPackages coqPackages_8_5 coq_8_5 coqPackages_8_6 coq_8_6 diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 38599e3646cc..7add7b587876 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 -, ocamlPackages_4_10, fetchpatch, makeWrapper, coq2html +, ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html }@args: let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let @@ -112,7 +112,12 @@ let ) (lib.attrNames set) ); mkCoq = version: callPackage ../applications/science/logic/coq { - inherit version ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; + inherit version + ocamlPackages_4_05 + ocamlPackages_4_09 + ocamlPackages_4_10 + ocamlPackages_4_12 + ; }; in rec { From 3ffa5512dc638bcccfcc29ee35cd36c7e0a72fbe Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 1 Dec 2021 08:25:08 -0500 Subject: [PATCH 53/67] [21.11] python3Packages.tensorflow: patch for compatibility with h5py 3.0.0+ --- pkgs/development/python-modules/tensorflow/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index e088dec77994..b9e5bb0c2344 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -361,6 +361,12 @@ in buildPythonPackage { # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 postInstall = '' rm $out/bin/tensorboard + '' + # Workaround https://github.com/tensorflow/tensorflow/issues/44467#issuecomment-720042186 + + '' + substituteInPlace "$out"/${python.sitePackages}/tensorflow/python/keras/saving/hdf5_format.py \ + --replace ".decode('utf-8')" "" \ + --replace ".decode('utf8')" "" ''; setupPyGlobalFlags = [ "--project_name ${pname}" ]; From 70a50a33ced6d4da9ee450507a250d98cbb27919 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 21 Nov 2021 12:26:56 +0100 Subject: [PATCH 54/67] vengi-tools: init at 0.0.14 (cherry picked from commit 218f14351463ed26809479410600f2ef136d05b4) --- .../graphics/vengi-tools/default.nix | 117 ++++++++++++++++++ .../vengi-tools/test-voxconvert-roundtrip.nix | 15 +++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 136 insertions(+) create mode 100644 pkgs/applications/graphics/vengi-tools/default.nix create mode 100644 pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix new file mode 100644 index 000000000000..3ddbea105b53 --- /dev/null +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -0,0 +1,117 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchurl + +, cmake +, pkg-config +, ninja +, python3 +, makeWrapper + +, glm +, lua5_4 +, SDL2 +, SDL2_mixer +, enet +, libuv +, libuuid +, wayland-protocols +, Carbon +# optionals +, opencl-headers +, OpenCL + +, callPackage +}: + +# cmake 3.21 inserts invalid `ldd` and `-Wl,--no-as-needed` calls, apparently +# related to +# https://cmake.org/cmake/help/v3.21/prop_tgt/LINK_WHAT_YOU_USE.html +let cmake3_22 = cmake.overrideAttrs (old: { + version = "3.22.0"; + src = fetchurl { + url = "https://cmake.org/files/v3.22/cmake-3.22.0.tar.gz"; + sha256 = "sha256-mYx7o0d40t/bPfimlUaeJLEeK/oh++QbNho/ReHJNF4="; + }; +}); + +in stdenv.mkDerivation rec { + pname = "vengi-tools"; + version = "0.0.14"; + + src = fetchFromGitHub { + owner = "mgerhardy"; + repo = "engine"; + rev = "v${version}"; + sha256 = "sha256-v82hKskTSwM0NDgLVHpHZNRQW6tWug4pPIt91MrUwUo="; + }; + + nativeBuildInputs = [ + cmake3_22 + pkg-config + ninja + python3 + makeWrapper + ]; + + buildInputs = [ + glm + lua5_4 + SDL2 + SDL2_mixer + enet + libuv + libuuid + # Only needed for the game + #postgresql + #libpqxx + #mosquitto + ] ++ lib.optional stdenv.isLinux wayland-protocols + ++ lib.optionals stdenv.isDarwin [ Carbon OpenCL ] + ++ lib.optional (!stdenv.isDarwin) opencl-headers; + + cmakeFlags = [ + # Disable tests due to a problem in linking gtest: + # ld: /build/vengi-tests-core.LDHlV1.ltrans0.ltrans.o: in function `main': + # :(.text.startup+0x3f): undefined reference to `testing::InitGoogleMock(int*, char**)' + "-DUNITTESTS=OFF" + "-DVISUALTESTS=OFF" + # We're only interested in the generic tools + "-DGAMES=OFF" + "-DMAPVIEW=OFF" + "-DAIDEBUG=OFF" + ]; + + # Set the data directory for each executable. We cannot set it at build time + # with the PKGDATADIR cmake variable because each executable needs a specific + # one. + # This is not needed on darwin, since on that platform data files are saved + # in *.app/Contents/Resources/ too, and are picked up automatically. + postInstall = lib.optionalString (!stdenv.isDarwin) '' + for prog in $out/bin/*; do + wrapProgram "$prog" \ + --set CORE_PATH $out/share/$(basename "$prog")/ + done + ''; + + passthru.tests = { + voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {}; + }; + + meta = with lib; { + description = "Tools from the vengi voxel engine, including a thumbnailer, a converter, and the VoxEdit voxel editor"; + longDescription = '' + Tools from the vengi C++ voxel game engine. It includes a voxel editor + with character animation support and loading/saving into a lot of voxel + volume formats. There are other tools like e.g. a thumbnailer for your + filemanager and a command line tool to convert between several voxel + formats. + ''; + homepage = "https://mgerhardy.github.io/engine/"; + downloadPage = "https://github.com/mgerhardy/engine/releases"; + license = [ licenses.mit licenses.cc-by-sa-30 ]; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix new file mode 100644 index 000000000000..27b0305615a8 --- /dev/null +++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix @@ -0,0 +1,15 @@ +{ stdenv +, vengi-tools +}: + +stdenv.mkDerivation { + name = "vengi-tools-test-voxconvert-roundtrip"; + meta.timeout = 10; + buildCommand = '' + ${vengi-tools}/bin/vengi-voxconvert ${vengi-tools}/share/vengi-voxedit/chr_knight.qb chr_knight.vox + ${vengi-tools}/bin/vengi-voxconvert chr_knight.vox chr_knight.qb + ${vengi-tools}/bin/vengi-voxconvert chr_knight.qb chr_knight1.vox + diff chr_knight.vox chr_knight1.vox + touch $out + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df05d8e64eb1..b0e34ab8d01f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28763,6 +28763,10 @@ with pkgs; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; + vengi-tools = callPackage ../applications/graphics/vengi-tools { + inherit (darwin.apple_sdk.frameworks) Carbon OpenCL; + }; + verbiste = callPackage ../applications/misc/verbiste { inherit (gnome2) libgnomeui; }; From 5b0c1f79dd7a400f4afec84aa97c607ce9e579a1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 21 Nov 2021 18:09:17 +0100 Subject: [PATCH 55/67] nixosTests.vengi-tools: init (cherry picked from commit 324e9f686ec39ba5d4a760d957509c52039cec27) --- nixos/tests/all-tests.nix | 1 + nixos/tests/vengi-tools.nix | 29 +++++++++++++++++++ .../graphics/vengi-tools/default.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 nixos/tests/vengi-tools.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b8219416dc42..ab107dfdcff7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -486,6 +486,7 @@ in vault-postgresql = handleTest ./vault-postgresql.nix {}; vaultwarden = handleTest ./vaultwarden.nix {}; vector = handleTest ./vector.nix {}; + vengi-tools = handleTest ./vengi-tools.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; vikunja = handleTest ./vikunja.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; diff --git a/nixos/tests/vengi-tools.nix b/nixos/tests/vengi-tools.nix new file mode 100644 index 000000000000..6b90542887d5 --- /dev/null +++ b/nixos/tests/vengi-tools.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "vengi-tools"; + meta = with pkgs.lib.maintainers; { + maintainers = [ fgaz ]; + }; + + machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + environment.systemPackages = [ pkgs.vengi-tools ]; + }; + + enableOCR = true; + + testScript = + '' + machine.wait_for_x() + machine.execute("vengi-voxedit >&2 &") + machine.wait_for_window("voxedit") + # OCR on voxedit's window is very expensive, so we avoid wasting a try + # by letting the window load fully first + machine.sleep(15) + machine.wait_for_text("Palette") + machine.screenshot("screen") + ''; +}) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 3ddbea105b53..00b3d80adf04 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -23,6 +23,7 @@ , OpenCL , callPackage +, nixosTests }: # cmake 3.21 inserts invalid `ldd` and `-Wl,--no-as-needed` calls, apparently @@ -97,6 +98,7 @@ in stdenv.mkDerivation rec { passthru.tests = { voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {}; + run-voxedit = nixosTests.vengi-tools; }; meta = with lib; { From c6df6d5094ed884e7e99e283cb717d835d62eb14 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Dec 2021 04:20:00 +0000 Subject: [PATCH 56/67] ncspot: 0.9.0 -> 0.9.2 https://github.com/hrkfdn/ncspot/releases/tag/v0.9.1 https://github.com/hrkfdn/ncspot/releases/tag/v0.9.2 (cherry picked from commit eea9da363dde044099f9a9249ded3d17300c11c2) --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 29a244f19d7a..d9df34c41f78 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "07qqs5q64zaxl3b2091vjihqb35fm0136cm4zibrgpx21akmbvr2"; + sha256 = "sha256-fZ0yQGLGnEFxt+OiG9J+niYzvttybudfciu5xo104Qo="; }; - cargoSha256 = "0sdbba32f56z2q7kha5fxw2f00hikbz9sf4zl4wfl2i9b13j7mj0"; + cargoSha256 = "sha256-i3/96rVfP8TbIz3pNArTp8w27rfp1aPhohfFMMHgubo="; nativeBuildInputs = [ pkg-config ]; From a640d8394f34714578f3e6335fc767d0755d78f9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Dec 2021 14:21:39 +0100 Subject: [PATCH 57/67] compcert: fix for Coq 8.14.1 (cherry picked from commit 482c273534482e95000c4419a213788dddbfb159) --- pkgs/development/coq-modules/compcert/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 253b710048d4..9757b3e43c8b 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -106,6 +106,15 @@ compcert.overrideAttrs (o: }) ]; } + { cases = [ (isEq "8.14") "3.10" ]; + out = [ + # Support for Coq 8.14.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/a79f0f99831aa0b0742bf7cce459cc9353bd7cd0.patch"; + sha256 = "sha256:0g20x8gfzvplpad9y9vr1p33k6qv6rsp691x6687v9ffvz7zsz94"; + }) + ]; + } ] []; } ) From eab845a526459884d620c77839f23bd0bd991db6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 8 Oct 2021 17:06:03 +0200 Subject: [PATCH 58/67] ec2-amis.nix -> amazon-ec2-amis.nix, new format (cherry picked from commit 5a6c43dda3f74e78ba1c143cb2ee2652567e362c) --- .../virtualisation/amazon-ec2-amis.nix | 371 +++++++++++++++++ nixos/modules/virtualisation/ec2-amis.nix | 380 +----------------- 2 files changed, 380 insertions(+), 371 deletions(-) create mode 100644 nixos/modules/virtualisation/amazon-ec2-amis.nix diff --git a/nixos/modules/virtualisation/amazon-ec2-amis.nix b/nixos/modules/virtualisation/amazon-ec2-amis.nix new file mode 100644 index 000000000000..6905080f6352 --- /dev/null +++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix @@ -0,0 +1,371 @@ +let self = { + "14.04".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-71c6f470"; + "14.04".ap-northeast-1.x86_64-linux.pv-ebs = "ami-4dcbf84c"; + "14.04".ap-northeast-1.x86_64-linux.pv-s3 = "ami-8fc4f68e"; + "14.04".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-da280888"; + "14.04".ap-southeast-1.x86_64-linux.pv-ebs = "ami-7a9dbc28"; + "14.04".ap-southeast-1.x86_64-linux.pv-s3 = "ami-c4290996"; + "14.04".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-ab523e91"; + "14.04".ap-southeast-2.x86_64-linux.pv-ebs = "ami-6769055d"; + "14.04".ap-southeast-2.x86_64-linux.pv-s3 = "ami-15533f2f"; + "14.04".eu-central-1.x86_64-linux.hvm-ebs = "ami-ba0234a7"; + "14.04".eu-west-1.x86_64-linux.hvm-ebs = "ami-96cb63e1"; + "14.04".eu-west-1.x86_64-linux.pv-ebs = "ami-b48c25c3"; + "14.04".eu-west-1.x86_64-linux.pv-s3 = "ami-06cd6571"; + "14.04".sa-east-1.x86_64-linux.hvm-ebs = "ami-01b90e1c"; + "14.04".sa-east-1.x86_64-linux.pv-ebs = "ami-69e35474"; + "14.04".sa-east-1.x86_64-linux.pv-s3 = "ami-61b90e7c"; + "14.04".us-east-1.x86_64-linux.hvm-ebs = "ami-58ba3a30"; + "14.04".us-east-1.x86_64-linux.pv-ebs = "ami-9e0583f6"; + "14.04".us-east-1.x86_64-linux.pv-s3 = "ami-9cbe3ef4"; + "14.04".us-west-1.x86_64-linux.hvm-ebs = "ami-0bc3d74e"; + "14.04".us-west-1.x86_64-linux.pv-ebs = "ami-8b1703ce"; + "14.04".us-west-1.x86_64-linux.pv-s3 = "ami-27ccd862"; + "14.04".us-west-2.x86_64-linux.hvm-ebs = "ami-3bf1bf0b"; + "14.04".us-west-2.x86_64-linux.pv-ebs = "ami-259bd515"; + "14.04".us-west-2.x86_64-linux.pv-s3 = "ami-07094037"; + + "14.12".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-24435f25"; + "14.12".ap-northeast-1.x86_64-linux.pv-ebs = "ami-b0425eb1"; + "14.12".ap-northeast-1.x86_64-linux.pv-s3 = "ami-fed3c6ff"; + "14.12".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-6c765d3e"; + "14.12".ap-southeast-1.x86_64-linux.pv-ebs = "ami-6a765d38"; + "14.12".ap-southeast-1.x86_64-linux.pv-s3 = "ami-d1bf9183"; + "14.12".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-af86f395"; + "14.12".ap-southeast-2.x86_64-linux.pv-ebs = "ami-b386f389"; + "14.12".ap-southeast-2.x86_64-linux.pv-s3 = "ami-69c5ae53"; + "14.12".eu-central-1.x86_64-linux.hvm-ebs = "ami-4a497a57"; + "14.12".eu-central-1.x86_64-linux.pv-ebs = "ami-4c497a51"; + "14.12".eu-central-1.x86_64-linux.pv-s3 = "ami-60f2c27d"; + "14.12".eu-west-1.x86_64-linux.hvm-ebs = "ami-d126a5a6"; + "14.12".eu-west-1.x86_64-linux.pv-ebs = "ami-0126a576"; + "14.12".eu-west-1.x86_64-linux.pv-s3 = "ami-deda5fa9"; + "14.12".sa-east-1.x86_64-linux.hvm-ebs = "ami-2d239e30"; + "14.12".sa-east-1.x86_64-linux.pv-ebs = "ami-35239e28"; + "14.12".sa-east-1.x86_64-linux.pv-s3 = "ami-81e3519c"; + "14.12".us-east-1.x86_64-linux.hvm-ebs = "ami-0c463a64"; + "14.12".us-east-1.x86_64-linux.pv-ebs = "ami-ac473bc4"; + "14.12".us-east-1.x86_64-linux.pv-s3 = "ami-00e18a68"; + "14.12".us-west-1.x86_64-linux.hvm-ebs = "ami-ca534a8f"; + "14.12".us-west-1.x86_64-linux.pv-ebs = "ami-3e534a7b"; + "14.12".us-west-1.x86_64-linux.pv-s3 = "ami-2905196c"; + "14.12".us-west-2.x86_64-linux.hvm-ebs = "ami-fb9dc3cb"; + "14.12".us-west-2.x86_64-linux.pv-ebs = "ami-899dc3b9"; + "14.12".us-west-2.x86_64-linux.pv-s3 = "ami-cb7f2dfb"; + + "15.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-58cac236"; + "15.09".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-39c8c057"; + "15.09".ap-northeast-1.x86_64-linux.pv-ebs = "ami-5ac9c134"; + "15.09".ap-northeast-1.x86_64-linux.pv-s3 = "ami-03cec66d"; + "15.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-2fc2094c"; + "15.09".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-9ec308fd"; + "15.09".ap-southeast-1.x86_64-linux.pv-ebs = "ami-95c00bf6"; + "15.09".ap-southeast-1.x86_64-linux.pv-s3 = "ami-bfc00bdc"; + "15.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-996c4cfa"; + "15.09".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-3f6e4e5c"; + "15.09".ap-southeast-2.x86_64-linux.pv-ebs = "ami-066d4d65"; + "15.09".ap-southeast-2.x86_64-linux.pv-s3 = "ami-cc6e4eaf"; + "15.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-3f8c6b50"; + "15.09".eu-central-1.x86_64-linux.hvm-s3 = "ami-5b836434"; + "15.09".eu-central-1.x86_64-linux.pv-ebs = "ami-118c6b7e"; + "15.09".eu-central-1.x86_64-linux.pv-s3 = "ami-2c977043"; + "15.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-9cf04aef"; + "15.09".eu-west-1.x86_64-linux.hvm-s3 = "ami-2bea5058"; + "15.09".eu-west-1.x86_64-linux.pv-ebs = "ami-c9e852ba"; + "15.09".eu-west-1.x86_64-linux.pv-s3 = "ami-c6f64cb5"; + "15.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-6e52df02"; + "15.09".sa-east-1.x86_64-linux.hvm-s3 = "ami-1852df74"; + "15.09".sa-east-1.x86_64-linux.pv-ebs = "ami-4368e52f"; + "15.09".sa-east-1.x86_64-linux.pv-s3 = "ami-f15ad79d"; + "15.09".us-east-1.x86_64-linux.hvm-ebs = "ami-84a6a0ee"; + "15.09".us-east-1.x86_64-linux.hvm-s3 = "ami-06a7a16c"; + "15.09".us-east-1.x86_64-linux.pv-ebs = "ami-a4a1a7ce"; + "15.09".us-east-1.x86_64-linux.pv-s3 = "ami-5ba8ae31"; + "15.09".us-west-1.x86_64-linux.hvm-ebs = "ami-22c8bb42"; + "15.09".us-west-1.x86_64-linux.hvm-s3 = "ami-a2ccbfc2"; + "15.09".us-west-1.x86_64-linux.pv-ebs = "ami-10cebd70"; + "15.09".us-west-1.x86_64-linux.pv-s3 = "ami-fa30429a"; + "15.09".us-west-2.x86_64-linux.hvm-ebs = "ami-ce57b9ae"; + "15.09".us-west-2.x86_64-linux.hvm-s3 = "ami-2956b849"; + "15.09".us-west-2.x86_64-linux.pv-ebs = "ami-005fb160"; + "15.09".us-west-2.x86_64-linux.pv-s3 = "ami-cd55bbad"; + + "16.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-40619d21"; + "16.03".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-ce629eaf"; + "16.03".ap-northeast-1.x86_64-linux.pv-ebs = "ami-ef639f8e"; + "16.03".ap-northeast-1.x86_64-linux.pv-s3 = "ami-a1609cc0"; + "16.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-deca00b0"; + "16.03".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-a3b77dcd"; + "16.03".ap-northeast-2.x86_64-linux.pv-ebs = "ami-7bcb0115"; + "16.03".ap-northeast-2.x86_64-linux.pv-s3 = "ami-a2b77dcc"; + "16.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0dff9562"; + "16.03".ap-south-1.x86_64-linux.hvm-s3 = "ami-13f69c7c"; + "16.03".ap-south-1.x86_64-linux.pv-ebs = "ami-0ef39961"; + "16.03".ap-south-1.x86_64-linux.pv-s3 = "ami-e0c8a28f"; + "16.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-5e964a3d"; + "16.03".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-4d964a2e"; + "16.03".ap-southeast-1.x86_64-linux.pv-ebs = "ami-ec9b478f"; + "16.03".ap-southeast-1.x86_64-linux.pv-s3 = "ami-999b47fa"; + "16.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-9f7359fc"; + "16.03".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-987359fb"; + "16.03".ap-southeast-2.x86_64-linux.pv-ebs = "ami-a2705ac1"; + "16.03".ap-southeast-2.x86_64-linux.pv-s3 = "ami-a3705ac0"; + "16.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-17a45178"; + "16.03".eu-central-1.x86_64-linux.hvm-s3 = "ami-f9a55096"; + "16.03".eu-central-1.x86_64-linux.pv-ebs = "ami-c8a550a7"; + "16.03".eu-central-1.x86_64-linux.pv-s3 = "ami-6ea45101"; + "16.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-b5b3d5c6"; + "16.03".eu-west-1.x86_64-linux.hvm-s3 = "ami-c986e0ba"; + "16.03".eu-west-1.x86_64-linux.pv-ebs = "ami-b083e5c3"; + "16.03".eu-west-1.x86_64-linux.pv-s3 = "ami-3c83e54f"; + "16.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-f6eb7f9a"; + "16.03".sa-east-1.x86_64-linux.hvm-s3 = "ami-93e773ff"; + "16.03".sa-east-1.x86_64-linux.pv-ebs = "ami-cbb82ca7"; + "16.03".sa-east-1.x86_64-linux.pv-s3 = "ami-abb82cc7"; + "16.03".us-east-1.x86_64-linux.hvm-ebs = "ami-c123a3d6"; + "16.03".us-east-1.x86_64-linux.hvm-s3 = "ami-bc25a5ab"; + "16.03".us-east-1.x86_64-linux.pv-ebs = "ami-bd25a5aa"; + "16.03".us-east-1.x86_64-linux.pv-s3 = "ami-a325a5b4"; + "16.03".us-west-1.x86_64-linux.hvm-ebs = "ami-748bcd14"; + "16.03".us-west-1.x86_64-linux.hvm-s3 = "ami-a68dcbc6"; + "16.03".us-west-1.x86_64-linux.pv-ebs = "ami-048acc64"; + "16.03".us-west-1.x86_64-linux.pv-s3 = "ami-208dcb40"; + "16.03".us-west-2.x86_64-linux.hvm-ebs = "ami-8263a0e2"; + "16.03".us-west-2.x86_64-linux.hvm-s3 = "ami-925c9ff2"; + "16.03".us-west-2.x86_64-linux.pv-ebs = "ami-5e61a23e"; + "16.03".us-west-2.x86_64-linux.pv-s3 = "ami-734c8f13"; + + # 16.09.1508.3909827 + "16.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-68453b0f"; + "16.09".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-f9bec09e"; + "16.09".ap-northeast-1.x86_64-linux.pv-ebs = "ami-254a3442"; + "16.09".ap-northeast-1.x86_64-linux.pv-s3 = "ami-ef473988"; + "16.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-18ae7f76"; + "16.09".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-9eac7df0"; + "16.09".ap-northeast-2.x86_64-linux.pv-ebs = "ami-57aa7b39"; + "16.09".ap-northeast-2.x86_64-linux.pv-s3 = "ami-5cae7f32"; + "16.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-b3f98fdc"; + "16.09".ap-south-1.x86_64-linux.hvm-s3 = "ami-98e690f7"; + "16.09".ap-south-1.x86_64-linux.pv-ebs = "ami-aef98fc1"; + "16.09".ap-south-1.x86_64-linux.pv-s3 = "ami-caf88ea5"; + "16.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-80fb51e3"; + "16.09".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-2df3594e"; + "16.09".ap-southeast-1.x86_64-linux.pv-ebs = "ami-37f05a54"; + "16.09".ap-southeast-1.x86_64-linux.pv-s3 = "ami-27f35944"; + "16.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-57ece834"; + "16.09".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-87f4f0e4"; + "16.09".ap-southeast-2.x86_64-linux.pv-ebs = "ami-d8ede9bb"; + "16.09".ap-southeast-2.x86_64-linux.pv-s3 = "ami-a6ebefc5"; + "16.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-9f863bfb"; + "16.09".ca-central-1.x86_64-linux.hvm-s3 = "ami-ea85388e"; + "16.09".ca-central-1.x86_64-linux.pv-ebs = "ami-ce8a37aa"; + "16.09".ca-central-1.x86_64-linux.pv-s3 = "ami-448a3720"; + "16.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-1b884774"; + "16.09".eu-central-1.x86_64-linux.hvm-s3 = "ami-b08c43df"; + "16.09".eu-central-1.x86_64-linux.pv-ebs = "ami-888946e7"; + "16.09".eu-central-1.x86_64-linux.pv-s3 = "ami-06874869"; + "16.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-1ed3e76d"; + "16.09".eu-west-1.x86_64-linux.hvm-s3 = "ami-73d1e500"; + "16.09".eu-west-1.x86_64-linux.pv-ebs = "ami-44c0f437"; + "16.09".eu-west-1.x86_64-linux.pv-s3 = "ami-f3d8ec80"; + "16.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-2c9c9648"; + "16.09".eu-west-2.x86_64-linux.hvm-s3 = "ami-6b9e940f"; + "16.09".eu-west-2.x86_64-linux.pv-ebs = "ami-f1999395"; + "16.09".eu-west-2.x86_64-linux.pv-s3 = "ami-bb9f95df"; + "16.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-a11882cd"; + "16.09".sa-east-1.x86_64-linux.hvm-s3 = "ami-7726bc1b"; + "16.09".sa-east-1.x86_64-linux.pv-ebs = "ami-9725bffb"; + "16.09".sa-east-1.x86_64-linux.pv-s3 = "ami-b027bddc"; + "16.09".us-east-1.x86_64-linux.hvm-ebs = "ami-854ca593"; + "16.09".us-east-1.x86_64-linux.hvm-s3 = "ami-2241a834"; + "16.09".us-east-1.x86_64-linux.pv-ebs = "ami-a441a8b2"; + "16.09".us-east-1.x86_64-linux.pv-s3 = "ami-e841a8fe"; + "16.09".us-east-2.x86_64-linux.hvm-ebs = "ami-3f41645a"; + "16.09".us-east-2.x86_64-linux.hvm-s3 = "ami-804065e5"; + "16.09".us-east-2.x86_64-linux.pv-ebs = "ami-f1466394"; + "16.09".us-east-2.x86_64-linux.pv-s3 = "ami-05426760"; + "16.09".us-west-1.x86_64-linux.hvm-ebs = "ami-c2efbca2"; + "16.09".us-west-1.x86_64-linux.hvm-s3 = "ami-d71042b7"; + "16.09".us-west-1.x86_64-linux.pv-ebs = "ami-04e8bb64"; + "16.09".us-west-1.x86_64-linux.pv-s3 = "ami-31e9ba51"; + "16.09".us-west-2.x86_64-linux.hvm-ebs = "ami-6449f504"; + "16.09".us-west-2.x86_64-linux.hvm-s3 = "ami-344af654"; + "16.09".us-west-2.x86_64-linux.pv-ebs = "ami-6d4af60d"; + "16.09".us-west-2.x86_64-linux.pv-s3 = "ami-de48f4be"; + + # 17.03.885.6024dd4067 + "17.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-dbd0f7bc"; + "17.03".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-7cdff81b"; + "17.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-c59a48ab"; + "17.03".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-0b944665"; + "17.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-4f413220"; + "17.03".ap-south-1.x86_64-linux.hvm-s3 = "ami-864033e9"; + "17.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-e08c3383"; + "17.03".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-c28f30a1"; + "17.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-fca9a69f"; + "17.03".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-3daaa55e"; + "17.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-9b00bdff"; + "17.03".ca-central-1.x86_64-linux.hvm-s3 = "ami-e800bd8c"; + "17.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-5450803b"; + "17.03".eu-central-1.x86_64-linux.hvm-s3 = "ami-6e2efe01"; + "17.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-10754c76"; + "17.03".eu-west-1.x86_64-linux.hvm-s3 = "ami-11734a77"; + "17.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-ff1d099b"; + "17.03".eu-west-2.x86_64-linux.hvm-s3 = "ami-fe1d099a"; + "17.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-d95d3eb5"; + "17.03".sa-east-1.x86_64-linux.hvm-s3 = "ami-fca2c190"; + "17.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0940c61f"; + "17.03".us-east-1.x86_64-linux.hvm-s3 = "ami-674fc971"; + "17.03".us-east-2.x86_64-linux.hvm-ebs = "ami-afc2e6ca"; + "17.03".us-east-2.x86_64-linux.hvm-s3 = "ami-a1cde9c4"; + "17.03".us-west-1.x86_64-linux.hvm-ebs = "ami-587b2138"; + "17.03".us-west-1.x86_64-linux.hvm-s3 = "ami-70411b10"; + "17.03".us-west-2.x86_64-linux.hvm-ebs = "ami-a93daac9"; + "17.03".us-west-2.x86_64-linux.hvm-s3 = "ami-5139ae31"; + + # 17.09.2681.59661f21be6 + "17.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-a30192da"; + "17.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-295a414d"; + "17.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-8c0eb9f1"; + "17.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-266cfe49"; + "17.09".us-east-1.x86_64-linux.hvm-ebs = "ami-40bee63a"; + "17.09".us-east-2.x86_64-linux.hvm-ebs = "ami-9d84aff8"; + "17.09".us-west-1.x86_64-linux.hvm-ebs = "ami-d14142b1"; + "17.09".us-west-2.x86_64-linux.hvm-ebs = "ami-3eb40346"; + "17.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-ca8207ae"; + "17.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-84bccff8"; + "17.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0dc5386f"; + "17.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-89b921ef"; + "17.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-179b3b79"; + "17.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-4762202b"; + "17.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-4e376021"; + + # 18.03.132946.1caae7247b8 + "18.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-065c46ec"; + "18.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-64f31903"; + "18.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-5a8d3d27"; + "18.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-09faf9e2"; + "18.03".us-east-1.x86_64-linux.hvm-ebs = "ami-8b3538f4"; + "18.03".us-east-2.x86_64-linux.hvm-ebs = "ami-150b3170"; + "18.03".us-west-1.x86_64-linux.hvm-ebs = "ami-ce06ebad"; + "18.03".us-west-2.x86_64-linux.hvm-ebs = "ami-586c3520"; + "18.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-aca72ac8"; + "18.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-aa0b4d40"; + "18.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-d0f254b2"; + "18.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-456511a8"; + "18.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-3366d15d"; + "18.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-163e1f7a"; + "18.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-6a390b05"; + + # 18.09.910.c15e342304a + "18.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-0f412186fb8a0ec97"; + "18.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0dada3805ce43c55e"; + "18.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-074df85565f2e02e2"; + "18.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-07c9b884e679df4f8"; + "18.09".us-east-1.x86_64-linux.hvm-ebs = "ami-009c9c3f1af480ff3"; + "18.09".us-east-2.x86_64-linux.hvm-ebs = "ami-08199961085ea8bc6"; + "18.09".us-west-1.x86_64-linux.hvm-ebs = "ami-07aa7f56d612ddd38"; + "18.09".us-west-2.x86_64-linux.hvm-ebs = "ami-01c84b7c368ac24d1"; + "18.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-04f66113f76198f6c"; + "18.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0892c7e24ebf2194f"; + "18.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-010730f36424b0a2c"; + "18.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0cdba8e998f076547"; + "18.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0400a698e6a9f4a15"; + "18.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-0e4a8a47fd6db6112"; + "18.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-0880a678d3f555313"; + + # 19.03.172286.8ea36d73256 + "19.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-0fe40176548ff0940"; + "19.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-03a40fd3a02fe95ba"; + "19.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-0436f9da0f20a638e"; + "19.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-0022b8ea9efde5de4"; + "19.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0efc58fb70ae9a217"; + "19.03".us-east-2.x86_64-linux.hvm-ebs = "ami-0abf711b1b34da1af"; + "19.03".us-west-1.x86_64-linux.hvm-ebs = "ami-07d126e8838c40ec5"; + "19.03".us-west-2.x86_64-linux.hvm-ebs = "ami-03f8a737546e47fb0"; + "19.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-03f9fd0ef2e035ede"; + "19.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0cff66114c652c262"; + "19.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-054c73a7f8d773ea9"; + "19.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-00db62688900456a4"; + "19.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0485cdd1a5fdd2117"; + "19.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-0c6a43c6e0ad1f4e2"; + "19.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0303deb1b5890f878"; + + # 19.09.2243.84af403f54f + "19.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-071082f0fa035374f"; + "19.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0d9dc33c54d1dc4c3"; + "19.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-09566799591d1bfed"; + "19.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-015f8efc2be419b79"; + "19.09".eu-north-1.x86_64-linux.hvm-ebs = "ami-07fc0a32d885e01ed"; + "19.09".us-east-1.x86_64-linux.hvm-ebs = "ami-03330d8b51287412f"; + "19.09".us-east-2.x86_64-linux.hvm-ebs = "ami-0518b4c84972e967f"; + "19.09".us-west-1.x86_64-linux.hvm-ebs = "ami-06ad07e61a353b4a6"; + "19.09".us-west-2.x86_64-linux.hvm-ebs = "ami-0e31e30925cf3ce4e"; + "19.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-07df50fc76702a36d"; + "19.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0f71ae5d4b0b78d95"; + "19.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-057bbf2b4bd62d210"; + "19.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-02a62555ca182fb5b"; + "19.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0219dde0e6b7b7b93"; + "19.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-066f7f2a895c821a1"; + "19.09".ap-east-1.x86_64-linux.hvm-ebs = "ami-055b2348db2827ff1"; + "19.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-018aab68377227e06"; + + # 20.03.1554.94e39623a49 + "20.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-02c34db5766cc7013"; + "20.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-0e32bd8c7853883f1"; + "20.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-061edb1356c1d69fd"; + "20.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-0a1a94722dcbff94c"; + "20.03".eu-north-1.x86_64-linux.hvm-ebs = "ami-02699abfacbb6464b"; + "20.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0c5e7760748b74e85"; + "20.03".us-east-2.x86_64-linux.hvm-ebs = "ami-030296bb256764655"; + "20.03".us-west-1.x86_64-linux.hvm-ebs = "ami-050be818e0266b741"; + "20.03".us-west-2.x86_64-linux.hvm-ebs = "ami-06562f78dca68eda2"; + "20.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-02365684a173255c7"; + "20.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0dbf353e168d155f7"; + "20.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-04c0f3a75f63daddd"; + "20.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-093d9cc49c191eb6c"; + "20.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0087df91a7b6ebd45"; + "20.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0a1a6b569af04af9d"; + "20.03".ap-east-1.x86_64-linux.hvm-ebs = "ami-0d18fdd309cdefa86"; + "20.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-09859378158ae971d"; + + # 20.09.2016.19db3e5ea27 + "20.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-0057cb7d614329fa2"; + "20.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0d46f16e0bb0ec8fd"; + "20.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-0e8985c3ea42f87fe"; + "20.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-0eed77c38432886d2"; + "20.09".eu-north-1.x86_64-linux.hvm-ebs = "ami-0be5bcadd632bea14"; + "20.09".us-east-1.x86_64-linux.hvm-ebs = "ami-0a2cce52b42daccc8"; + "20.09".us-east-2.x86_64-linux.hvm-ebs = "ami-09378bf487b07a4d8"; + "20.09".us-west-1.x86_64-linux.hvm-ebs = "ami-09b4337b2a9e77485"; + "20.09".us-west-2.x86_64-linux.hvm-ebs = "ami-081d3bb5fbee0a1ac"; + "20.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-020c24c6c607e7ac7"; + "20.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-08f648d5db009e67d"; + "20.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0be390efaccbd40f9"; + "20.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0c3311601cbe8f927"; + "20.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0020146701f4d56cf"; + "20.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-0117e2bd876bb40d1"; + "20.09".ap-east-1.x86_64-linux.hvm-ebs = "ami-0c42f97e5b1fda92f"; + "20.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-021637976b094959d"; + + # 21.05.740.aa576357673 + "21.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-048dbc738074a3083"; + "21.05".eu-west-2.x86_64-linux.hvm-ebs = "ami-0234cf81fec68315d"; + "21.05".eu-west-3.x86_64-linux.hvm-ebs = "ami-020e459baf709107d"; + "21.05".eu-central-1.x86_64-linux.hvm-ebs = "ami-0857d5d1309ab8b77"; + "21.05".eu-north-1.x86_64-linux.hvm-ebs = "ami-05403e3ae53d3716f"; + "21.05".us-east-1.x86_64-linux.hvm-ebs = "ami-0d3002ba40b5b9897"; + "21.05".us-east-2.x86_64-linux.hvm-ebs = "ami-069a0ca1bde6dea52"; + "21.05".us-west-1.x86_64-linux.hvm-ebs = "ami-0b415460a84bcf9bc"; + "21.05".us-west-2.x86_64-linux.hvm-ebs = "ami-093cba49754abd7f8"; + "21.05".ca-central-1.x86_64-linux.hvm-ebs = "ami-065c13e1d52d60b33"; + "21.05".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-04f570c70ff9b665e"; + "21.05".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-02a3d1df595df5ef6"; + "21.05".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-027836fddb5c56012"; + "21.05".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0edacd41dc7700c39"; + "21.05".ap-south-1.x86_64-linux.hvm-ebs = "ami-0b279b5bb55288059"; + "21.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-06dc98082bc55c1fc"; + "21.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-04737dd49b98936c6"; + + latest = self."21.05"; +}; in self diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index d38f41ab39d7..1ffb326ba7a8 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -1,371 +1,9 @@ -let self = { - "14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470"; - "14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c"; - "14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e"; - "14.04".ap-southeast-1.hvm-ebs = "ami-da280888"; - "14.04".ap-southeast-1.pv-ebs = "ami-7a9dbc28"; - "14.04".ap-southeast-1.pv-s3 = "ami-c4290996"; - "14.04".ap-southeast-2.hvm-ebs = "ami-ab523e91"; - "14.04".ap-southeast-2.pv-ebs = "ami-6769055d"; - "14.04".ap-southeast-2.pv-s3 = "ami-15533f2f"; - "14.04".eu-central-1.hvm-ebs = "ami-ba0234a7"; - "14.04".eu-west-1.hvm-ebs = "ami-96cb63e1"; - "14.04".eu-west-1.pv-ebs = "ami-b48c25c3"; - "14.04".eu-west-1.pv-s3 = "ami-06cd6571"; - "14.04".sa-east-1.hvm-ebs = "ami-01b90e1c"; - "14.04".sa-east-1.pv-ebs = "ami-69e35474"; - "14.04".sa-east-1.pv-s3 = "ami-61b90e7c"; - "14.04".us-east-1.hvm-ebs = "ami-58ba3a30"; - "14.04".us-east-1.pv-ebs = "ami-9e0583f6"; - "14.04".us-east-1.pv-s3 = "ami-9cbe3ef4"; - "14.04".us-west-1.hvm-ebs = "ami-0bc3d74e"; - "14.04".us-west-1.pv-ebs = "ami-8b1703ce"; - "14.04".us-west-1.pv-s3 = "ami-27ccd862"; - "14.04".us-west-2.hvm-ebs = "ami-3bf1bf0b"; - "14.04".us-west-2.pv-ebs = "ami-259bd515"; - "14.04".us-west-2.pv-s3 = "ami-07094037"; - - "14.12".ap-northeast-1.hvm-ebs = "ami-24435f25"; - "14.12".ap-northeast-1.pv-ebs = "ami-b0425eb1"; - "14.12".ap-northeast-1.pv-s3 = "ami-fed3c6ff"; - "14.12".ap-southeast-1.hvm-ebs = "ami-6c765d3e"; - "14.12".ap-southeast-1.pv-ebs = "ami-6a765d38"; - "14.12".ap-southeast-1.pv-s3 = "ami-d1bf9183"; - "14.12".ap-southeast-2.hvm-ebs = "ami-af86f395"; - "14.12".ap-southeast-2.pv-ebs = "ami-b386f389"; - "14.12".ap-southeast-2.pv-s3 = "ami-69c5ae53"; - "14.12".eu-central-1.hvm-ebs = "ami-4a497a57"; - "14.12".eu-central-1.pv-ebs = "ami-4c497a51"; - "14.12".eu-central-1.pv-s3 = "ami-60f2c27d"; - "14.12".eu-west-1.hvm-ebs = "ami-d126a5a6"; - "14.12".eu-west-1.pv-ebs = "ami-0126a576"; - "14.12".eu-west-1.pv-s3 = "ami-deda5fa9"; - "14.12".sa-east-1.hvm-ebs = "ami-2d239e30"; - "14.12".sa-east-1.pv-ebs = "ami-35239e28"; - "14.12".sa-east-1.pv-s3 = "ami-81e3519c"; - "14.12".us-east-1.hvm-ebs = "ami-0c463a64"; - "14.12".us-east-1.pv-ebs = "ami-ac473bc4"; - "14.12".us-east-1.pv-s3 = "ami-00e18a68"; - "14.12".us-west-1.hvm-ebs = "ami-ca534a8f"; - "14.12".us-west-1.pv-ebs = "ami-3e534a7b"; - "14.12".us-west-1.pv-s3 = "ami-2905196c"; - "14.12".us-west-2.hvm-ebs = "ami-fb9dc3cb"; - "14.12".us-west-2.pv-ebs = "ami-899dc3b9"; - "14.12".us-west-2.pv-s3 = "ami-cb7f2dfb"; - - "15.09".ap-northeast-1.hvm-ebs = "ami-58cac236"; - "15.09".ap-northeast-1.hvm-s3 = "ami-39c8c057"; - "15.09".ap-northeast-1.pv-ebs = "ami-5ac9c134"; - "15.09".ap-northeast-1.pv-s3 = "ami-03cec66d"; - "15.09".ap-southeast-1.hvm-ebs = "ami-2fc2094c"; - "15.09".ap-southeast-1.hvm-s3 = "ami-9ec308fd"; - "15.09".ap-southeast-1.pv-ebs = "ami-95c00bf6"; - "15.09".ap-southeast-1.pv-s3 = "ami-bfc00bdc"; - "15.09".ap-southeast-2.hvm-ebs = "ami-996c4cfa"; - "15.09".ap-southeast-2.hvm-s3 = "ami-3f6e4e5c"; - "15.09".ap-southeast-2.pv-ebs = "ami-066d4d65"; - "15.09".ap-southeast-2.pv-s3 = "ami-cc6e4eaf"; - "15.09".eu-central-1.hvm-ebs = "ami-3f8c6b50"; - "15.09".eu-central-1.hvm-s3 = "ami-5b836434"; - "15.09".eu-central-1.pv-ebs = "ami-118c6b7e"; - "15.09".eu-central-1.pv-s3 = "ami-2c977043"; - "15.09".eu-west-1.hvm-ebs = "ami-9cf04aef"; - "15.09".eu-west-1.hvm-s3 = "ami-2bea5058"; - "15.09".eu-west-1.pv-ebs = "ami-c9e852ba"; - "15.09".eu-west-1.pv-s3 = "ami-c6f64cb5"; - "15.09".sa-east-1.hvm-ebs = "ami-6e52df02"; - "15.09".sa-east-1.hvm-s3 = "ami-1852df74"; - "15.09".sa-east-1.pv-ebs = "ami-4368e52f"; - "15.09".sa-east-1.pv-s3 = "ami-f15ad79d"; - "15.09".us-east-1.hvm-ebs = "ami-84a6a0ee"; - "15.09".us-east-1.hvm-s3 = "ami-06a7a16c"; - "15.09".us-east-1.pv-ebs = "ami-a4a1a7ce"; - "15.09".us-east-1.pv-s3 = "ami-5ba8ae31"; - "15.09".us-west-1.hvm-ebs = "ami-22c8bb42"; - "15.09".us-west-1.hvm-s3 = "ami-a2ccbfc2"; - "15.09".us-west-1.pv-ebs = "ami-10cebd70"; - "15.09".us-west-1.pv-s3 = "ami-fa30429a"; - "15.09".us-west-2.hvm-ebs = "ami-ce57b9ae"; - "15.09".us-west-2.hvm-s3 = "ami-2956b849"; - "15.09".us-west-2.pv-ebs = "ami-005fb160"; - "15.09".us-west-2.pv-s3 = "ami-cd55bbad"; - - "16.03".ap-northeast-1.hvm-ebs = "ami-40619d21"; - "16.03".ap-northeast-1.hvm-s3 = "ami-ce629eaf"; - "16.03".ap-northeast-1.pv-ebs = "ami-ef639f8e"; - "16.03".ap-northeast-1.pv-s3 = "ami-a1609cc0"; - "16.03".ap-northeast-2.hvm-ebs = "ami-deca00b0"; - "16.03".ap-northeast-2.hvm-s3 = "ami-a3b77dcd"; - "16.03".ap-northeast-2.pv-ebs = "ami-7bcb0115"; - "16.03".ap-northeast-2.pv-s3 = "ami-a2b77dcc"; - "16.03".ap-south-1.hvm-ebs = "ami-0dff9562"; - "16.03".ap-south-1.hvm-s3 = "ami-13f69c7c"; - "16.03".ap-south-1.pv-ebs = "ami-0ef39961"; - "16.03".ap-south-1.pv-s3 = "ami-e0c8a28f"; - "16.03".ap-southeast-1.hvm-ebs = "ami-5e964a3d"; - "16.03".ap-southeast-1.hvm-s3 = "ami-4d964a2e"; - "16.03".ap-southeast-1.pv-ebs = "ami-ec9b478f"; - "16.03".ap-southeast-1.pv-s3 = "ami-999b47fa"; - "16.03".ap-southeast-2.hvm-ebs = "ami-9f7359fc"; - "16.03".ap-southeast-2.hvm-s3 = "ami-987359fb"; - "16.03".ap-southeast-2.pv-ebs = "ami-a2705ac1"; - "16.03".ap-southeast-2.pv-s3 = "ami-a3705ac0"; - "16.03".eu-central-1.hvm-ebs = "ami-17a45178"; - "16.03".eu-central-1.hvm-s3 = "ami-f9a55096"; - "16.03".eu-central-1.pv-ebs = "ami-c8a550a7"; - "16.03".eu-central-1.pv-s3 = "ami-6ea45101"; - "16.03".eu-west-1.hvm-ebs = "ami-b5b3d5c6"; - "16.03".eu-west-1.hvm-s3 = "ami-c986e0ba"; - "16.03".eu-west-1.pv-ebs = "ami-b083e5c3"; - "16.03".eu-west-1.pv-s3 = "ami-3c83e54f"; - "16.03".sa-east-1.hvm-ebs = "ami-f6eb7f9a"; - "16.03".sa-east-1.hvm-s3 = "ami-93e773ff"; - "16.03".sa-east-1.pv-ebs = "ami-cbb82ca7"; - "16.03".sa-east-1.pv-s3 = "ami-abb82cc7"; - "16.03".us-east-1.hvm-ebs = "ami-c123a3d6"; - "16.03".us-east-1.hvm-s3 = "ami-bc25a5ab"; - "16.03".us-east-1.pv-ebs = "ami-bd25a5aa"; - "16.03".us-east-1.pv-s3 = "ami-a325a5b4"; - "16.03".us-west-1.hvm-ebs = "ami-748bcd14"; - "16.03".us-west-1.hvm-s3 = "ami-a68dcbc6"; - "16.03".us-west-1.pv-ebs = "ami-048acc64"; - "16.03".us-west-1.pv-s3 = "ami-208dcb40"; - "16.03".us-west-2.hvm-ebs = "ami-8263a0e2"; - "16.03".us-west-2.hvm-s3 = "ami-925c9ff2"; - "16.03".us-west-2.pv-ebs = "ami-5e61a23e"; - "16.03".us-west-2.pv-s3 = "ami-734c8f13"; - - # 16.09.1508.3909827 - "16.09".ap-northeast-1.hvm-ebs = "ami-68453b0f"; - "16.09".ap-northeast-1.hvm-s3 = "ami-f9bec09e"; - "16.09".ap-northeast-1.pv-ebs = "ami-254a3442"; - "16.09".ap-northeast-1.pv-s3 = "ami-ef473988"; - "16.09".ap-northeast-2.hvm-ebs = "ami-18ae7f76"; - "16.09".ap-northeast-2.hvm-s3 = "ami-9eac7df0"; - "16.09".ap-northeast-2.pv-ebs = "ami-57aa7b39"; - "16.09".ap-northeast-2.pv-s3 = "ami-5cae7f32"; - "16.09".ap-south-1.hvm-ebs = "ami-b3f98fdc"; - "16.09".ap-south-1.hvm-s3 = "ami-98e690f7"; - "16.09".ap-south-1.pv-ebs = "ami-aef98fc1"; - "16.09".ap-south-1.pv-s3 = "ami-caf88ea5"; - "16.09".ap-southeast-1.hvm-ebs = "ami-80fb51e3"; - "16.09".ap-southeast-1.hvm-s3 = "ami-2df3594e"; - "16.09".ap-southeast-1.pv-ebs = "ami-37f05a54"; - "16.09".ap-southeast-1.pv-s3 = "ami-27f35944"; - "16.09".ap-southeast-2.hvm-ebs = "ami-57ece834"; - "16.09".ap-southeast-2.hvm-s3 = "ami-87f4f0e4"; - "16.09".ap-southeast-2.pv-ebs = "ami-d8ede9bb"; - "16.09".ap-southeast-2.pv-s3 = "ami-a6ebefc5"; - "16.09".ca-central-1.hvm-ebs = "ami-9f863bfb"; - "16.09".ca-central-1.hvm-s3 = "ami-ea85388e"; - "16.09".ca-central-1.pv-ebs = "ami-ce8a37aa"; - "16.09".ca-central-1.pv-s3 = "ami-448a3720"; - "16.09".eu-central-1.hvm-ebs = "ami-1b884774"; - "16.09".eu-central-1.hvm-s3 = "ami-b08c43df"; - "16.09".eu-central-1.pv-ebs = "ami-888946e7"; - "16.09".eu-central-1.pv-s3 = "ami-06874869"; - "16.09".eu-west-1.hvm-ebs = "ami-1ed3e76d"; - "16.09".eu-west-1.hvm-s3 = "ami-73d1e500"; - "16.09".eu-west-1.pv-ebs = "ami-44c0f437"; - "16.09".eu-west-1.pv-s3 = "ami-f3d8ec80"; - "16.09".eu-west-2.hvm-ebs = "ami-2c9c9648"; - "16.09".eu-west-2.hvm-s3 = "ami-6b9e940f"; - "16.09".eu-west-2.pv-ebs = "ami-f1999395"; - "16.09".eu-west-2.pv-s3 = "ami-bb9f95df"; - "16.09".sa-east-1.hvm-ebs = "ami-a11882cd"; - "16.09".sa-east-1.hvm-s3 = "ami-7726bc1b"; - "16.09".sa-east-1.pv-ebs = "ami-9725bffb"; - "16.09".sa-east-1.pv-s3 = "ami-b027bddc"; - "16.09".us-east-1.hvm-ebs = "ami-854ca593"; - "16.09".us-east-1.hvm-s3 = "ami-2241a834"; - "16.09".us-east-1.pv-ebs = "ami-a441a8b2"; - "16.09".us-east-1.pv-s3 = "ami-e841a8fe"; - "16.09".us-east-2.hvm-ebs = "ami-3f41645a"; - "16.09".us-east-2.hvm-s3 = "ami-804065e5"; - "16.09".us-east-2.pv-ebs = "ami-f1466394"; - "16.09".us-east-2.pv-s3 = "ami-05426760"; - "16.09".us-west-1.hvm-ebs = "ami-c2efbca2"; - "16.09".us-west-1.hvm-s3 = "ami-d71042b7"; - "16.09".us-west-1.pv-ebs = "ami-04e8bb64"; - "16.09".us-west-1.pv-s3 = "ami-31e9ba51"; - "16.09".us-west-2.hvm-ebs = "ami-6449f504"; - "16.09".us-west-2.hvm-s3 = "ami-344af654"; - "16.09".us-west-2.pv-ebs = "ami-6d4af60d"; - "16.09".us-west-2.pv-s3 = "ami-de48f4be"; - - # 17.03.885.6024dd4067 - "17.03".ap-northeast-1.hvm-ebs = "ami-dbd0f7bc"; - "17.03".ap-northeast-1.hvm-s3 = "ami-7cdff81b"; - "17.03".ap-northeast-2.hvm-ebs = "ami-c59a48ab"; - "17.03".ap-northeast-2.hvm-s3 = "ami-0b944665"; - "17.03".ap-south-1.hvm-ebs = "ami-4f413220"; - "17.03".ap-south-1.hvm-s3 = "ami-864033e9"; - "17.03".ap-southeast-1.hvm-ebs = "ami-e08c3383"; - "17.03".ap-southeast-1.hvm-s3 = "ami-c28f30a1"; - "17.03".ap-southeast-2.hvm-ebs = "ami-fca9a69f"; - "17.03".ap-southeast-2.hvm-s3 = "ami-3daaa55e"; - "17.03".ca-central-1.hvm-ebs = "ami-9b00bdff"; - "17.03".ca-central-1.hvm-s3 = "ami-e800bd8c"; - "17.03".eu-central-1.hvm-ebs = "ami-5450803b"; - "17.03".eu-central-1.hvm-s3 = "ami-6e2efe01"; - "17.03".eu-west-1.hvm-ebs = "ami-10754c76"; - "17.03".eu-west-1.hvm-s3 = "ami-11734a77"; - "17.03".eu-west-2.hvm-ebs = "ami-ff1d099b"; - "17.03".eu-west-2.hvm-s3 = "ami-fe1d099a"; - "17.03".sa-east-1.hvm-ebs = "ami-d95d3eb5"; - "17.03".sa-east-1.hvm-s3 = "ami-fca2c190"; - "17.03".us-east-1.hvm-ebs = "ami-0940c61f"; - "17.03".us-east-1.hvm-s3 = "ami-674fc971"; - "17.03".us-east-2.hvm-ebs = "ami-afc2e6ca"; - "17.03".us-east-2.hvm-s3 = "ami-a1cde9c4"; - "17.03".us-west-1.hvm-ebs = "ami-587b2138"; - "17.03".us-west-1.hvm-s3 = "ami-70411b10"; - "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; - "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; - - # 17.09.2681.59661f21be6 - "17.09".eu-west-1.hvm-ebs = "ami-a30192da"; - "17.09".eu-west-2.hvm-ebs = "ami-295a414d"; - "17.09".eu-west-3.hvm-ebs = "ami-8c0eb9f1"; - "17.09".eu-central-1.hvm-ebs = "ami-266cfe49"; - "17.09".us-east-1.hvm-ebs = "ami-40bee63a"; - "17.09".us-east-2.hvm-ebs = "ami-9d84aff8"; - "17.09".us-west-1.hvm-ebs = "ami-d14142b1"; - "17.09".us-west-2.hvm-ebs = "ami-3eb40346"; - "17.09".ca-central-1.hvm-ebs = "ami-ca8207ae"; - "17.09".ap-southeast-1.hvm-ebs = "ami-84bccff8"; - "17.09".ap-southeast-2.hvm-ebs = "ami-0dc5386f"; - "17.09".ap-northeast-1.hvm-ebs = "ami-89b921ef"; - "17.09".ap-northeast-2.hvm-ebs = "ami-179b3b79"; - "17.09".sa-east-1.hvm-ebs = "ami-4762202b"; - "17.09".ap-south-1.hvm-ebs = "ami-4e376021"; - - # 18.03.132946.1caae7247b8 - "18.03".eu-west-1.hvm-ebs = "ami-065c46ec"; - "18.03".eu-west-2.hvm-ebs = "ami-64f31903"; - "18.03".eu-west-3.hvm-ebs = "ami-5a8d3d27"; - "18.03".eu-central-1.hvm-ebs = "ami-09faf9e2"; - "18.03".us-east-1.hvm-ebs = "ami-8b3538f4"; - "18.03".us-east-2.hvm-ebs = "ami-150b3170"; - "18.03".us-west-1.hvm-ebs = "ami-ce06ebad"; - "18.03".us-west-2.hvm-ebs = "ami-586c3520"; - "18.03".ca-central-1.hvm-ebs = "ami-aca72ac8"; - "18.03".ap-southeast-1.hvm-ebs = "ami-aa0b4d40"; - "18.03".ap-southeast-2.hvm-ebs = "ami-d0f254b2"; - "18.03".ap-northeast-1.hvm-ebs = "ami-456511a8"; - "18.03".ap-northeast-2.hvm-ebs = "ami-3366d15d"; - "18.03".sa-east-1.hvm-ebs = "ami-163e1f7a"; - "18.03".ap-south-1.hvm-ebs = "ami-6a390b05"; - - # 18.09.910.c15e342304a - "18.09".eu-west-1.hvm-ebs = "ami-0f412186fb8a0ec97"; - "18.09".eu-west-2.hvm-ebs = "ami-0dada3805ce43c55e"; - "18.09".eu-west-3.hvm-ebs = "ami-074df85565f2e02e2"; - "18.09".eu-central-1.hvm-ebs = "ami-07c9b884e679df4f8"; - "18.09".us-east-1.hvm-ebs = "ami-009c9c3f1af480ff3"; - "18.09".us-east-2.hvm-ebs = "ami-08199961085ea8bc6"; - "18.09".us-west-1.hvm-ebs = "ami-07aa7f56d612ddd38"; - "18.09".us-west-2.hvm-ebs = "ami-01c84b7c368ac24d1"; - "18.09".ca-central-1.hvm-ebs = "ami-04f66113f76198f6c"; - "18.09".ap-southeast-1.hvm-ebs = "ami-0892c7e24ebf2194f"; - "18.09".ap-southeast-2.hvm-ebs = "ami-010730f36424b0a2c"; - "18.09".ap-northeast-1.hvm-ebs = "ami-0cdba8e998f076547"; - "18.09".ap-northeast-2.hvm-ebs = "ami-0400a698e6a9f4a15"; - "18.09".sa-east-1.hvm-ebs = "ami-0e4a8a47fd6db6112"; - "18.09".ap-south-1.hvm-ebs = "ami-0880a678d3f555313"; - - # 19.03.172286.8ea36d73256 - "19.03".eu-west-1.hvm-ebs = "ami-0fe40176548ff0940"; - "19.03".eu-west-2.hvm-ebs = "ami-03a40fd3a02fe95ba"; - "19.03".eu-west-3.hvm-ebs = "ami-0436f9da0f20a638e"; - "19.03".eu-central-1.hvm-ebs = "ami-0022b8ea9efde5de4"; - "19.03".us-east-1.hvm-ebs = "ami-0efc58fb70ae9a217"; - "19.03".us-east-2.hvm-ebs = "ami-0abf711b1b34da1af"; - "19.03".us-west-1.hvm-ebs = "ami-07d126e8838c40ec5"; - "19.03".us-west-2.hvm-ebs = "ami-03f8a737546e47fb0"; - "19.03".ca-central-1.hvm-ebs = "ami-03f9fd0ef2e035ede"; - "19.03".ap-southeast-1.hvm-ebs = "ami-0cff66114c652c262"; - "19.03".ap-southeast-2.hvm-ebs = "ami-054c73a7f8d773ea9"; - "19.03".ap-northeast-1.hvm-ebs = "ami-00db62688900456a4"; - "19.03".ap-northeast-2.hvm-ebs = "ami-0485cdd1a5fdd2117"; - "19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2"; - "19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878"; - - # 19.09.2243.84af403f54f - "19.09".eu-west-1.hvm-ebs = "ami-071082f0fa035374f"; - "19.09".eu-west-2.hvm-ebs = "ami-0d9dc33c54d1dc4c3"; - "19.09".eu-west-3.hvm-ebs = "ami-09566799591d1bfed"; - "19.09".eu-central-1.hvm-ebs = "ami-015f8efc2be419b79"; - "19.09".eu-north-1.hvm-ebs = "ami-07fc0a32d885e01ed"; - "19.09".us-east-1.hvm-ebs = "ami-03330d8b51287412f"; - "19.09".us-east-2.hvm-ebs = "ami-0518b4c84972e967f"; - "19.09".us-west-1.hvm-ebs = "ami-06ad07e61a353b4a6"; - "19.09".us-west-2.hvm-ebs = "ami-0e31e30925cf3ce4e"; - "19.09".ca-central-1.hvm-ebs = "ami-07df50fc76702a36d"; - "19.09".ap-southeast-1.hvm-ebs = "ami-0f71ae5d4b0b78d95"; - "19.09".ap-southeast-2.hvm-ebs = "ami-057bbf2b4bd62d210"; - "19.09".ap-northeast-1.hvm-ebs = "ami-02a62555ca182fb5b"; - "19.09".ap-northeast-2.hvm-ebs = "ami-0219dde0e6b7b7b93"; - "19.09".ap-south-1.hvm-ebs = "ami-066f7f2a895c821a1"; - "19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1"; - "19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06"; - - # 20.03.1554.94e39623a49 - "20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013"; - "20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1"; - "20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd"; - "20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c"; - "20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b"; - "20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85"; - "20.03".us-east-2.hvm-ebs = "ami-030296bb256764655"; - "20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741"; - "20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2"; - "20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7"; - "20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7"; - "20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd"; - "20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c"; - "20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45"; - "20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d"; - "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86"; - "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d"; - - # 20.09.2016.19db3e5ea27 - "20.09".eu-west-1.hvm-ebs = "ami-0057cb7d614329fa2"; - "20.09".eu-west-2.hvm-ebs = "ami-0d46f16e0bb0ec8fd"; - "20.09".eu-west-3.hvm-ebs = "ami-0e8985c3ea42f87fe"; - "20.09".eu-central-1.hvm-ebs = "ami-0eed77c38432886d2"; - "20.09".eu-north-1.hvm-ebs = "ami-0be5bcadd632bea14"; - "20.09".us-east-1.hvm-ebs = "ami-0a2cce52b42daccc8"; - "20.09".us-east-2.hvm-ebs = "ami-09378bf487b07a4d8"; - "20.09".us-west-1.hvm-ebs = "ami-09b4337b2a9e77485"; - "20.09".us-west-2.hvm-ebs = "ami-081d3bb5fbee0a1ac"; - "20.09".ca-central-1.hvm-ebs = "ami-020c24c6c607e7ac7"; - "20.09".ap-southeast-1.hvm-ebs = "ami-08f648d5db009e67d"; - "20.09".ap-southeast-2.hvm-ebs = "ami-0be390efaccbd40f9"; - "20.09".ap-northeast-1.hvm-ebs = "ami-0c3311601cbe8f927"; - "20.09".ap-northeast-2.hvm-ebs = "ami-0020146701f4d56cf"; - "20.09".ap-south-1.hvm-ebs = "ami-0117e2bd876bb40d1"; - "20.09".ap-east-1.hvm-ebs = "ami-0c42f97e5b1fda92f"; - "20.09".sa-east-1.hvm-ebs = "ami-021637976b094959d"; - - # 21.05.740.aa576357673 - "21.05".eu-west-1.hvm-ebs = "ami-048dbc738074a3083"; - "21.05".eu-west-2.hvm-ebs = "ami-0234cf81fec68315d"; - "21.05".eu-west-3.hvm-ebs = "ami-020e459baf709107d"; - "21.05".eu-central-1.hvm-ebs = "ami-0857d5d1309ab8b77"; - "21.05".eu-north-1.hvm-ebs = "ami-05403e3ae53d3716f"; - "21.05".us-east-1.hvm-ebs = "ami-0d3002ba40b5b9897"; - "21.05".us-east-2.hvm-ebs = "ami-069a0ca1bde6dea52"; - "21.05".us-west-1.hvm-ebs = "ami-0b415460a84bcf9bc"; - "21.05".us-west-2.hvm-ebs = "ami-093cba49754abd7f8"; - "21.05".ca-central-1.hvm-ebs = "ami-065c13e1d52d60b33"; - "21.05".ap-southeast-1.hvm-ebs = "ami-04f570c70ff9b665e"; - "21.05".ap-southeast-2.hvm-ebs = "ami-02a3d1df595df5ef6"; - "21.05".ap-northeast-1.hvm-ebs = "ami-027836fddb5c56012"; - "21.05".ap-northeast-2.hvm-ebs = "ami-0edacd41dc7700c39"; - "21.05".ap-south-1.hvm-ebs = "ami-0b279b5bb55288059"; - "21.05".ap-east-1.hvm-ebs = "ami-06dc98082bc55c1fc"; - "21.05".sa-east-1.hvm-ebs = "ami-04737dd49b98936c6"; - - latest = self."21.05"; -}; in self +# Compatibility shim +let + lib = import ../../../lib; + inherit (lib) mapAttrs; + everything = import ./amazon-ec2-amis.nix; + doAllVersions = mapAttrs (versionName: doRegion); + doRegion = mapAttrs (regionName: systems: systems.x86_64-linux); +in + doAllVersions everything From 1d5cfac9f191b858fa0c5388cb8f0565db46f68d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 8 Oct 2021 17:29:33 +0200 Subject: [PATCH 59/67] amazon-ec2-amis: Add aarch64 amis (cherry picked from commit 00563d4f076a476c670635fbe266689af1a73f07) --- .../virtualisation/amazon-ec2-amis.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/nixos/modules/virtualisation/amazon-ec2-amis.nix b/nixos/modules/virtualisation/amazon-ec2-amis.nix index 6905080f6352..b3459ba3d650 100644 --- a/nixos/modules/virtualisation/amazon-ec2-amis.nix +++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix @@ -328,6 +328,23 @@ let self = { "20.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0a1a6b569af04af9d"; "20.03".ap-east-1.x86_64-linux.hvm-ebs = "ami-0d18fdd309cdefa86"; "20.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-09859378158ae971d"; + # 20.03.2351.f8248ab6d9e-aarch64-linux + "20.03".eu-west-1.aarch64-linux.hvm-ebs = "ami-0a4c46dfdfe921aab"; + "20.03".eu-west-2.aarch64-linux.hvm-ebs = "ami-0b47871912b7d36f9"; + "20.03".eu-west-3.aarch64-linux.hvm-ebs = "ami-01031e1aa505b8935"; + "20.03".eu-central-1.aarch64-linux.hvm-ebs = "ami-0bb4669de1f477fd1"; + # missing "20.03".eu-north-1.aarch64-linux.hvm-ebs = "ami-"; + "20.03".us-east-1.aarch64-linux.hvm-ebs = "ami-01d2de16a1878271c"; + "20.03".us-east-2.aarch64-linux.hvm-ebs = "ami-0eade0158b1ff49c0"; + "20.03".us-west-1.aarch64-linux.hvm-ebs = "ami-0913bf30cb9a764a4"; + "20.03".us-west-2.aarch64-linux.hvm-ebs = "ami-073449580ff8e82b5"; + "20.03".ca-central-1.aarch64-linux.hvm-ebs = "ami-050f2e923c4d703c0"; + "20.03".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-0d11ef6705a9a11a7"; + "20.03".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-05446a2f818cd3263"; + "20.03".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-0c057f010065d2453"; + "20.03".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-0e90eda7f24eb33ab"; + "20.03".ap-south-1.aarch64-linux.hvm-ebs = "ami-03ba7e9f093f568bc"; + "20.03".sa-east-1.aarch64-linux.hvm-ebs = "ami-0a8344c6ce6d0c902"; # 20.09.2016.19db3e5ea27 "20.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-0057cb7d614329fa2"; @@ -347,6 +364,24 @@ let self = { "20.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-0117e2bd876bb40d1"; "20.09".ap-east-1.x86_64-linux.hvm-ebs = "ami-0c42f97e5b1fda92f"; "20.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-021637976b094959d"; + # 20.09.2016.19db3e5ea27-aarch64-linux + "20.09".eu-west-1.aarch64-linux.hvm-ebs = "ami-00a02608ff45ff8f9"; + "20.09".eu-west-2.aarch64-linux.hvm-ebs = "ami-0e991d0f8dca21e20"; + "20.09".eu-west-3.aarch64-linux.hvm-ebs = "ami-0d18eec4dc48c6f3b"; + "20.09".eu-central-1.aarch64-linux.hvm-ebs = "ami-01691f25d08f48c9e"; + "20.09".eu-north-1.aarch64-linux.hvm-ebs = "ami-09bb5aabe567ec6f4"; + "20.09".us-east-1.aarch64-linux.hvm-ebs = "ami-0504bd006f9eaae42"; + "20.09".us-east-2.aarch64-linux.hvm-ebs = "ami-00f0f8f2ab2d695ad"; + "20.09".us-west-1.aarch64-linux.hvm-ebs = "ami-02d147d2cb992f878"; + "20.09".us-west-2.aarch64-linux.hvm-ebs = "ami-07f40006cf4d4820e"; + "20.09".ca-central-1.aarch64-linux.hvm-ebs = "ami-0e5f563919a987894"; + "20.09".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-083e35d1acecae5c1"; + "20.09".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-052cdc008b245b067"; + "20.09".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-05e137f373bd72c0c"; + "20.09".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-020791fe4c32f851a"; + "20.09".ap-south-1.aarch64-linux.hvm-ebs = "ami-0285bb96a0f2c3955"; + "20.09".sa-east-1.aarch64-linux.hvm-ebs = "ami-0a55ab650c32be058"; + # 21.05.740.aa576357673 "21.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-048dbc738074a3083"; From fd5d262d799821b7efe36229b91d9ab66fb669b7 Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Sun, 6 Jun 2021 12:45:40 +0200 Subject: [PATCH 60/67] qemu, runInLinuxVM: fix KVM availability check KVM should only be considered abailable if /dev/kvm exists and is read-writable by the user that is trying to launch it. The previous check for existance only had the consequence that on some Linux distributions running VMs with Nix's QEMU only worked if KVM was NOT installed. fixes #124371 (cherry picked from commit 046392279ca41abc36e61a839d4679e40f6e9a3c) --- pkgs/applications/virtualization/qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 93a215f1003b..7e89871786d6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -231,7 +231,7 @@ stdenv.mkDerivation rec { if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ $out/bin/qemu-kvm \ - --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" + --add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)" fi ''; From 5aafeded5bf8f9dab1ca7aff73b772b9ddff31b6 Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Fri, 5 Nov 2021 19:13:47 +0100 Subject: [PATCH 61/67] qemu: emit warnings when KVM acceleration is not usable This fixes the qemu-kvm wrapper we add for convenience silently not using KVM, when the system would support it by at least leaving an indication in the log that the build ran slower because it ran without KVM. (cherry picked from commit 5718276542100f9e779f2c2113e3d0f6c45da054) --- .../virtualization/qemu/default.nix | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7e89871786d6..b4a31c657cdc 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool -, makeWrapper, autoPatchelfHook +, makeWrapper, autoPatchelfHook, runtimeShell , attr, libcap, libcap_ng , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl @@ -228,9 +228,12 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' + cp -- $emitKvmWarningsPath $out/libexec/emit-kvm-warnings + chmod a+x -- $out/libexec/emit-kvm-warnings if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ $out/bin/qemu-kvm \ + --run $out/libexec/emit-kvm-warnings \ --add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)" fi ''; @@ -242,6 +245,26 @@ stdenv.mkDerivation rec { # Builds in ~3h with 2 cores, and ~20m with a big-parallel builder. requiredSystemFeatures = [ "big-parallel" ]; + emitKvmWarnings = '' + #!${runtimeShell} + WARNCOL='\033[1;35m' + NEUTRALCOL='\033[0m' + WARNING="''${WARNCOL}warning:''${NEUTRALCOL}" + if [ ! -e /dev/kvm ]; then + echo -e "''${WARNING} KVM is not available - execution will be slow" >&2 + echo "Consider installing KVM for hardware-accelerated execution." >&2 + echo "If KVM is already installed make sure the kernel module is loaded." >&2 + elif [ ! -r /dev/kvm -o ! -w /dev/kvm ]; then + echo -e "''${WARNING} /dev/kvm is not read-/writable - execution will be slow" >&2 + echo "/dev/kvm needs to be read-/writable by the user executing QEMU." >&2 + echo "" >&2 + echo "For hardware-acceleration inside the nix build sandbox /dev/kvm" >&2 + echo "must be world-read-/writable (rw-rw-rw-)." >&2 + fi + ''; + + passAsFile = [ "emitKvmWarnings" ]; + meta = with lib; { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; From 82dab2172a8086d79ac7a91d947dc870ea04faf2 Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Mon, 22 Nov 2021 16:38:20 +0100 Subject: [PATCH 62/67] qemu, runInLinuxVM: change default cpu to qemu64 The flag -cpu max leaves QEMU 6.1.0 stuck on some systems, for example when /dev/kvm is not read-writable. This does not happen with -cpu qemu64. Getting stuck like that is a regression in 6.1.0 not yet present in 6.0.0 and should be fixed with 6.2.0 according to early testing with rc1. We should consider reverting this change when we merge QEMU 6.2.0. See #146526. fixes #141596 (cherry picked from commit abbe8cbc4843c213947abef70eb11f10ebea96f1) --- nixos/lib/qemu-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 1a1f7531feb0..f3af85040bd6 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -22,7 +22,7 @@ rec { else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; From 7c0aac7a632d55774fc48ffb299820e05057b151 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 30 Nov 2021 23:14:55 -0500 Subject: [PATCH 63/67] =?UTF-8?q?protontricks:=201.6.1=20=E2=86=92=201.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit bc25e8f24f317daadaa8b19ed3d5c1937ae9cb69) --- .../protontricks/default.nix | 9 +++++-- .../protontricks/steam-run.patch | 26 +++++++++---------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index aab524d77a28..125b96953734 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -9,17 +9,18 @@ , winetricks , yad , pytestCheckHook +, nix-update-script }: buildPythonApplication rec { pname = "protontricks"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "sha256-2ZOVcPCF1o8mNfHOWRFTjAEu0dWzaMxlMTcctn/ScxY="; + sha256 = "sha256-XC5ip12wlXRo/AaTFJWEZvEZPPC1WtXTyeYivvyHZaE="; }; patches = [ @@ -55,6 +56,10 @@ buildPythonApplication rec { pythonImportsCheck = [ "protontricks" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index eead5ef6f49e..d27289bb3f5c 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,5 +1,5 @@ diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py -index d811cb7..a376a34 100755 +index bd651aa..2b82aea 100755 --- a/src/protontricks/cli/main.py +++ b/src/protontricks/cli/main.py @@ -14,8 +14,8 @@ import sys @@ -57,9 +57,9 @@ index d811cb7..a376a34 100755 use_steam_runtime=use_steam_runtime, - legacy_steam_runtime_path=legacy_steam_runtime_path, use_bwrap=use_bwrap, - command=[str(winetricks_path)] + args.winetricks_command) - elif args.command: -@@ -296,7 +285,6 @@ def main(args=None): + command=[str(winetricks_path)] + args.winetricks_command + ) +@@ -297,7 +286,6 @@ def main(args=None): steam_app=steam_app, command=args.command, use_steam_runtime=use_steam_runtime, @@ -121,7 +121,7 @@ index be5322b..552f894 100644 APPINFO_STRUCT_SECTION = " Date: Wed, 1 Dec 2021 17:19:34 -0300 Subject: [PATCH 64/67] clj-kondo: 2021.10.19 -> 2021.12.01 (cherry picked from commit 1195e8cecc8651d7168e4064a4d4c4e6e83a985a) --- pkgs/development/tools/clj-kondo/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index df6a5e0f90ef..206b4d727266 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2021.10.19"; + version = "2021.12.01"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-i0OeQPZfQPUeXC/Bs84I91IahBKK6W1mFix97s8/lVA="; + sha256 = "sha256-AH2MAz++jjBNHWAsUOWkfdzyWzGfmcDBNKcJp4xbPxQ="; }; extraNativeImageBuildArgs = [ @@ -18,6 +18,7 @@ buildGraalvmNativeImage rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; license = licenses.epl10; + changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${versiont}/CHANGELOG.md"; maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; }; } From d868445b74a4ef6933e3a4f75965a11a820020ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 28 Nov 2021 15:41:19 +0100 Subject: [PATCH 65/67] unbound-full: fix the build again ... by not avoiding openssl dependency in .lib. dnstap part of code ran into issues with this during checkPhase. The benefit of withSlimLib is mainly for `unbound`; for the fuller builds it doesn't seem important. (cherry picked from commit 9a0723cc3f472d5e36ff622eb47303da5291d156) --- pkgs/tools/networking/unbound/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 98b7b2547d69..f9ff82735b90 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -32,6 +32,9 @@ , withDNSTAP ? false , withTFO ? false , withRedis ? false +# Avoid .lib depending on openssl.out +# The build gets a little hacky, so in some cases we disable this approach. +, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP , libnghttp2 }: @@ -105,10 +108,9 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; - preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit + preFixup = lib.optionalString withSlimLib # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. - # There was some problem with this on Darwin; let's not complicate non-Linux. '' configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only" configurePhase From 77435019411213185513e1917117cca8043c9010 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Nov 2021 10:34:09 +0100 Subject: [PATCH 66/67] esphome: 2021.10.1 -> 2021.11.4 (cherry picked from commit f69af24c74715039420a999690870433ef991127) --- pkgs/tools/misc/esphome/dashboard.nix | 4 ++-- pkgs/tools/misc/esphome/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 1ce5ced3f3ed..5a44d7e84606 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20211021.0"; + version = "20211201.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-stJ6fUs02XpCN671EztHTLkXd57eMo6472Q1e1/cbHY="; + sha256 = "sha256-/VARM59TI2Ff70Jq0smFMrt4o2G/wKSdcOreLfxMAMQ="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index dbe57f1bdf5b..243629ec24b5 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.10.1"; + version = "2021.11.4"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-zVZantMYtDWkvFrXmX0HpUchmc3T2gbkrMiWGP2ibNc="; + sha256 = "sha256-hPnng3Jkb2FucEOar/MIjvWHKbT3NNxEn6CIr3sd1Ng="; }; patches = [ From 563375a2239f870b465da054fe120a1fe738197b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Dec 2021 20:01:05 +0100 Subject: [PATCH 67/67] esphome: apply patch to fix subprocess usage (cherry picked from commit a542c7c8c52b1d7ba014c326126cd298f8e0720e) --- pkgs/tools/misc/esphome/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 243629ec24b5..6f5725b2b313 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -2,6 +2,7 @@ , pkgs , python3 , fetchFromGitHub +, fetchpatch , platformio , esptool , git @@ -28,7 +29,11 @@ with python.pkgs; buildPythonApplication rec { patches = [ # fix missing write permissions on src files before modifing them - ./fix-src-permissions.patch + ./fix-src-permissions.patch + (fetchpatch { + url = "https://github.com/esphome/esphome/commit/fbe1bca1b9896ba8c8b754c5a4faf790bffd887b.patch"; + sha256 = "sha256-Iyc79iL2YkLGD81TbFK3GaCY2L9nTE9mKz6MQSNQWr8="; + }) ]; postPatch = ''