From 3d332125a4ebdcbf0c9b6d3cf76203d8eee6bd64 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 11 Aug 2022 11:51:58 -0700 Subject: [PATCH 01/17] discourse.plugins.discourse-bbcode-color: init --- .../web-apps/discourse/plugins/all-plugins.nix | 1 + .../plugins/discourse-bbcode-color/default.nix | 17 +++++++++++++++++ pkgs/servers/web-apps/discourse/update.py | 1 + 3 files changed, 19 insertions(+) create mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index e36f1416456a..7279f1d419b0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -4,6 +4,7 @@ let in { discourse-assign = callPackage ./discourse-assign {}; + discourse-bbcode-color = callPackage ./discourse-bbcode-color {}; discourse-calendar = callPackage ./discourse-calendar {}; discourse-canned-replies = callPackage ./discourse-canned-replies {}; discourse-chat-integration = callPackage ./discourse-chat-integration {}; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix new file mode 100644 index 000000000000..43f7849bc8a7 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix @@ -0,0 +1,17 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-bbcode-color"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-bbcode-color"; + rev = "e58c38930122772aef15738676683f7d7ff68411"; + sha256 = "sha256-/uHJ9HMXx7YMYsAc3t/s//ucI8I9Wh3wtC/dQCbtbGU="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-bbcode-color"; + maintainers = with maintainers; [ ryantm ]; + license = licenses.mit; + description = "Support BBCode color tags."; + }; +} diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 64f374bad703..a245e1cebc7d 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -283,6 +283,7 @@ def update_plugins(): """Update plugins to their latest revision.""" plugins = [ {'name': 'discourse-assign'}, + {'name': 'discourse-bbcode-color'}, {'name': 'discourse-calendar'}, {'name': 'discourse-canned-replies'}, {'name': 'discourse-chat-integration'}, From 80930924f82d0b744d362791f84289b8f4ce5b9c Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 14 Sep 2022 14:08:03 -0400 Subject: [PATCH 02/17] ripdrag: init at 0.1.5 --- pkgs/tools/misc/ripdrag/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/ripdrag/default.nix diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix new file mode 100644 index 000000000000..f6c7c79bfd81 --- /dev/null +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchCrate, pkg-config, gtk4 }: + +rustPlatform.buildRustPackage rec { + pname = "ripdrag"; + version = "0.1.5"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-Pa/QYxdPt95deEjSXEVhm2jR3r8rTaKQj2DltT7EVAw="; + }; + + cargoSha256 = "sha256-jI7nF8Q8sA4AxkXvQ43r5GqcbTWffuf453DLGUs7I98="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk4 ]; + + meta = with lib; { + description = "An application that lets you drag and drop files from and to the terminal"; + homepage = "https://github.com/nik012003/ripdrag"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c094df38748b..be0f3feb855d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10296,6 +10296,8 @@ with pkgs; rig = callPackage ../tools/misc/rig { }; + ripdrag = callPackage ../tools/misc/ripdrag { }; + riseup-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { provider = "riseup"; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; From 9138b16625ca5b1878e670b77b3719900b0bb57c Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 14 Sep 2022 17:49:38 -0400 Subject: [PATCH 03/17] cargo-edit: 0.10.4 -> 0.11.0 --- pkgs/development/tools/rust/cargo-edit/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 6e3d6904eb00..81297a2b4596 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -5,27 +5,25 @@ , openssl , zlib , stdenv -, libiconv , Security }: rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-U3B/Tb7q61R5jmBni1QKqqul2JJgjtmh3st04apu0xE="; + hash = "sha256-vVl3RnI3ulgiAMBFENhvu99+9+kLtKtCubpBhCja5kU="; }; - cargoSha256 = "sha256-e8ICBRI6kNfItu3CxxbIY+56/2ho0Rnn1B3w/WJX+KM="; + cargoSha256 = "sha256-EbppWbOaz75beERULV0ZAvkGm3Ap7g3gSDUz80a3pZg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.isDarwin [ - libiconv Security ]; From 1a325c4ac872c8351578aff14f22e7266e2d70ea Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 14 Sep 2022 15:48:34 -0400 Subject: [PATCH 04/17] cargo-zigbuild: 0.12.0 -> 0.12.3 --- pkgs/development/tools/rust/cargo-zigbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index ce6cd32fa553..da5e54245477 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.12.0"; + version = "0.12.3"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nBncU5rM3gS5e/Qs14U/ZwAkLFLdNuO2DhSQW+7xGQk="; + sha256 = "sha256-qwOlYy9pNAKEJDgt3ML4dxDwlkyPIVO+X/q/YijEHo0="; }; - cargoSha256 = "sha256-Zq+RG36aeNd8G+LSdiyLK8SYC0MckGUIBTvia4H9OJY="; + cargoSha256 = "sha256-8x2B8WBN9u17HS58bAwMNPEoSabNX6KzyPBLEvaGOBk="; nativeBuildInputs = [ makeWrapper ]; From bd8735e672e2511c0bcaf0113a17d9e3ab3ce694 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 18:22:14 +0000 Subject: [PATCH 05/17] python310Packages.astropy-healpix: 0.6 -> 0.7 --- pkgs/development/python-modules/astropy-healpix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 80ef403b2cc0..a690e45f0b7b 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit version; pname = lib.replaceStrings ["-"] ["_"] pname; - sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690"; + sha256 = "sha256-iMOE60MimXpY3ok46RrJ/5D2orbLKuI+IWnHQFrdOtg="; }; nativeBuildInputs = [ From 02646c661e46e929924bca1efdd788460c7b78bf Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 11 Sep 2022 15:40:06 +0300 Subject: [PATCH 06/17] vcmi: init at 1.0.0 --- pkgs/games/vcmi/default.nix | 97 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 99 insertions(+) create mode 100644 pkgs/games/vcmi/default.nix diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix new file mode 100644 index 000000000000..d16f3870d828 --- /dev/null +++ b/pkgs/games/vcmi/default.nix @@ -0,0 +1,97 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, SDL2_image +, SDL2_mixer +, SDL2_ttf +, boost +, cmake +, ffmpeg +, innoextract +, luajit +, minizip +, ninja +, pkg-config +, python3 +, qtbase +, tbb +, wrapQtAppsHook +, zlib +, testers +, vcmi +}: + +stdenv.mkDerivation rec { + pname = "vcmi"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "vcmi"; + repo = "vcmi"; + rev = version; + fetchSubmodules = true; + hash = "sha256-5PuFq6wDSj5Ye2fUjqcr/VRU0ocus6h2nn+myQTOrhU="; + }; + + postPatch = '' + substituteInPlace Version.cpp.in \ + --subst-var-by GIT_SHA1 "0000000"; + ''; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + python3 + wrapQtAppsHook + ]; + + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + boost + ffmpeg + luajit + minizip + qtbase + tbb + zlib + ]; + + cmakeFlags = [ + "-DENABLE_TEST:BOOL=NO" + "-DENABLE_PCH:BOOL=NO" + # Make libvcmi.so discoverable in a non-standard location. + "-DCMAKE_INSTALL_RPATH:STRING=${placeholder "out"}/lib/vcmi" + # Upstream assumes relative value while Nixpkgs passes absolute. + # Both should be allowed: https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html + # Meanwhile work it around by passing a relative value. + "-DCMAKE_INSTALL_LIBDIR:STRING=lib" + ]; + + postFixup = '' + wrapProgram $out/bin/vcmibuilder \ + --prefix PATH : "${lib.makeBinPath [ innoextract ]}" + ''; + + passthru.tests.version = testers.testVersion { + package = vcmi; + command = '' + XDG_DATA_HOME=$PWD XDG_CACHE_HOME=$PWD XDG_CONFIG_HOME=$PWD \ + vcmiclient --version + ''; + }; + + meta = with lib; { + description = "Open-source engine for Heroes of Might and Magic III"; + homepage = "https://vcmi.eu"; + changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog"; + license = with licenses; [ gpl2Only cc-by-sa-40 ]; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.linux; + mainProgram = "vcmiclient"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee4e22440c57..4459204e105a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11927,6 +11927,8 @@ with pkgs; vcftools = callPackage ../applications/science/biology/vcftools { }; + vcmi = libsForQt5.callPackage ../games/vcmi { }; + vcsh = callPackage ../applications/version-management/vcsh { }; vcs_query = callPackage ../tools/misc/vcs_query { }; From f5e5daa0c82e53a01c8a16a44d3e595044330acd Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 15 Sep 2022 22:04:50 -0400 Subject: [PATCH 07/17] cargo-edit: 0.11.0 -> 0.11.1 --- pkgs/development/tools/rust/cargo-edit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 81297a2b4596..16083cc0686b 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-vVl3RnI3ulgiAMBFENhvu99+9+kLtKtCubpBhCja5kU="; + hash = "sha256-TqRz1Og5wsKsiIESmplnTsGLRboEQ20cViWgXfwEHGQ="; }; - cargoSha256 = "sha256-EbppWbOaz75beERULV0ZAvkGm3Ap7g3gSDUz80a3pZg="; + cargoSha256 = "sha256-4DVek/R7VABzSJ8vEb6f3Tgf1vVLIKAWj80Il5gWu2g="; nativeBuildInputs = [ pkg-config ]; From 67ee06f34374a0eccd76802e38402e5faedbfbb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 09:46:10 +0000 Subject: [PATCH 08/17] appthreat-depscan: 2.1.7 -> 2.1.9 --- pkgs/development/tools/appthreat-depscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 0481c8a5be0e..ea7d1bb2d2c9 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "2.1.7"; + version = "2.1.9"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-hudPySVFewKrXI5FAYBCPTkjI4W7/kmnNwhnjxMhkrw="; + hash = "sha256-3K8dIKeb9bqopu8B8f1fHLIzXHTfmn4ZtDztRBSm10k="; }; propagatedBuildInputs = with python3.pkgs; [ From 44b3ce9b90051910372eed5111e2a919ab19432d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 16 Sep 2022 10:46:02 +0100 Subject: [PATCH 09/17] python3Packages.bitcoinlib: fix segfault during tests --- pkgs/development/python-modules/bitcoinlib/default.nix | 2 +- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index 8daff7913cc2..f91ade7d10b3 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace bitcoin/core/key.py --replace \ - "ctypes.util.find_library('ssl') or 'libeay32'" \ + "ctypes.util.find_library('ssl.35') or ctypes.util.find_library('ssl') or 'libeay32'" \ "'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63218f729214..79181b69b536 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1344,7 +1344,9 @@ in { bitbox02 = callPackage ../development/python-modules/bitbox02 { }; - bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { + openssl = pkgs.openssl_1_1; + }; bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { }; From ce181f4c83b2fd24a9e8f3bc10e75388bd661513 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 10:53:44 +0000 Subject: [PATCH 10/17] comma: 1.2.3 -> 1.3.0 --- pkgs/tools/package-management/comma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index 74e59c2c6aca..35fd4ff2b989 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - sha256 = "sha256-emhvBaicLAnu/Kn4oxHngGa5BSxOEwbkhTLO5XvauMw="; + sha256 = "sha256-rXAX14yB8v9BOG4ZsdGEedpZAnNqhQ4DtjQwzFX/TLY="; }; - cargoSha256 = "sha256-mQxNo4VjW2Q0MYfU+RCb4Ayl9ClpxrSV8X4EKZ7PewA="; + cargoSha256 = "sha256-9PVbiWmaTDx4iob5g9tXC+FV5Jmy6Id9tQxm05fJLkM="; nativeBuildInputs = [ makeWrapper ]; From 71abff51b1679e0c19ed607bb824befb1a810c89 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Fri, 16 Sep 2022 09:09:38 -0700 Subject: [PATCH 11/17] simg2img: Add support for darwin platforms --- pkgs/tools/filesystems/simg2img/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix index d0d7304c9d20..69ac44257aa5 100644 --- a/pkgs/tools/filesystems/simg2img/default.nix +++ b/pkgs/tools/filesystems/simg2img/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" "DEP_CXX:=$(CXX)" ]; meta = with lib; { description = "Tool to convert Android sparse images to raw images"; homepage = "https://github.com/anestisb/android-simg2img"; license = licenses.asl20; - platforms = platforms.linux; - maintainers = [ maintainers.dezgeg ]; + platforms = platforms.unix; + maintainers = with maintainers; [ dezgeg arkivm ]; }; } From 782b9c8adf877b9ab82163353d912f4a477486be Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Sep 2022 10:19:17 +0200 Subject: [PATCH 12/17] ungoogled-chromium: 105.0.5195.102 -> 105.0.5195.127 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 359b0a026c98..74e2798c89e4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "105.0.5195.102", - "sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw", - "sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa", + "version": "105.0.5195.127", + "sha256": "1q15i5vcb7q20awib7csh2v7mzjnppb4pqgqzgqiixs9wj710j3m", + "sha256bin64": null, "deps": { "gn": { "version": "2022-07-11", @@ -56,8 +56,8 @@ "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" }, "ungoogled-patches": { - "rev": "105.0.5195.102-1", - "sha256": "17n06lqzbz19a3fdqbv5wj7s6v3rc0bfshdz8syw0k2gkw3x6ivc" + "rev": "105.0.5195.127-1", + "sha256": "0iinags8lvfiw0l55fc3ldq92qw6p01a62zs8q2av0srzpx0xd0b" } } } From f3cd1ff30faf2c62f01433469d1185f6eb96a8f6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Sep 2022 10:18:20 +0200 Subject: [PATCH 13/17] chromium: 105.0.5195.102 -> 105.0.5195.125 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 359b0a026c98..5acd80cd78cc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "105.0.5195.102", - "sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw", - "sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa", + "version": "105.0.5195.125", + "sha256": "0rhay46fnfffqcpk6c856hj414508fmhda600lz5whcacr25q6r0", + "sha256bin64": "14knj758nzihs4yh6gb6w0l4i985cnrd0y5hdmz3yd49n9a7s5hv", "deps": { "gn": { "version": "2022-07-11", From bf2d2a7fbb5c8fd2f963d8da177e57cb34cc2f29 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 16 Sep 2022 22:24:56 +0200 Subject: [PATCH 14/17] chromiumBeta: 106.0.5249.30 -> 106.0.5249.40 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 359b0a026c98..ae7b8b26f2c9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "106.0.5249.30", - "sha256": "11sn0syhxzjz4lcw09aifcnrj2nf72siqh8v60zx6cpqj8jpgk48", - "sha256bin64": "13yg8kb1k3n2vgh5l71vjyx6jf5zsibn41wvqnk0qds0kq6vnxxm", + "version": "106.0.5249.40", + "sha256": "14nidf49nqpirsd0qpq91pvsyhc7ngkhcyq3n3yl37mswvaalnm1", + "sha256bin64": "17x0mx4kzrrl2calibi9cjsq80kn30c396pv20qf5n6850dc0rx2", "deps": { "gn": { "version": "2022-08-11", From b7e5d303be0eaf9f6565b375e2eceb8d97bcb9db Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 16 Sep 2022 22:24:56 +0200 Subject: [PATCH 15/17] chromiumDev: 107.0.5286.2 -> 107.0.5300.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 359b0a026c98..8083902b4ac7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "107.0.5286.2", - "sha256": "111dk9qdxbad2agvnh8ijb18ip9vw32gdfxajqkrlqgcmmj61vsz", - "sha256bin64": "0l19ylpcrnzqj2imlhl13h0f5773znwx6h4xjzrac2z2lxkzmkmk", + "version": "107.0.5300.0", + "sha256": "1h059sma9g6kzaip3rvnb569d3x11h669330a68sif2krpl91bnv", + "sha256bin64": "1kwmhjc15d35lxmdn7f5v8nm8yfs4ckaks9zvxm73wlnvwv0i1qj", "deps": { "gn": { - "version": "2022-08-31", + "version": "2022-09-08", "url": "https://gn.googlesource.com/gn", - "rev": "00b741b1568d56cf4e117dcb9f70cd42653b4c78", - "sha256": "0vi9gigzdyji8fql8k8sv1v5z0icjph8awz49xidn26bvly6526g" + "rev": "b4851eb2062f76a880c07f7fa0d12913beb6d79e", + "sha256": "1cz7155rzsydg02j1yprczm4qjk5g4lqbnh5qdky8p1ghg3miq3i" } } }, From 0e74fea61206171ead75eeb197d5b942978a1e92 Mon Sep 17 00:00:00 2001 From: Alexander Polakov Date: Sat, 17 Sep 2022 01:12:00 +0400 Subject: [PATCH 16/17] neovide: fix build on darwin --- pkgs/applications/editors/neovim/neovide/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index d806e6e7d56e..77f0735ec989 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -22,6 +22,11 @@ , enableWayland ? stdenv.isLinux , wayland , xorg +, xcbuild +, Security +, ApplicationServices +, AppKit +, Carbon }: rustPlatform.buildRustPackage rec { pname = "neovide"; @@ -75,7 +80,7 @@ rustPlatform.buildRustPackage rec { python2 # skia-bindings python3 # rust-xcb llvmPackages.clang # skia - ]; + ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; # All tests passes but at the end cargo prints for unknown reason: # error: test failed, to rerun pass '--bin neovide' @@ -98,7 +103,7 @@ rustPlatform.buildRustPackage rec { })) ]; })) - ]; + ] ++ lib.optionals stdenv.isDarwin [ Security ApplicationServices Carbon AppKit ]; postFixup = let libPath = lib.makeLibraryPath ([ @@ -128,7 +133,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Kethku/neovide"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; - platforms = platforms.linux; + platforms = platforms.all; mainProgram = "neovide"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfafedc083a3..f43068a6fa4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31886,7 +31886,9 @@ with pkgs; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovide = callPackage ../applications/editors/neovim/neovide { }; + neovide = callPackage ../applications/editors/neovim/neovide { + inherit (darwin.apple_sdk.frameworks) Security ApplicationServices Carbon AppKit; + }; neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; From 2912f1ccedcef3f7f57017e2e3a9c912b0251351 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 23:52:47 +0000 Subject: [PATCH 17/17] nixpacks: 0.3.12 -> 0.5.6 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 63e8858e58c4..511e332c4f17 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.3.12"; + version = "0.5.6"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wzbyBofWYXkOx+kNAmo9lDQdfkYLndh+Pw09+bxNqbU="; + sha256 = "sha256-pYqaBLrGEZUhIqaoYhkXrf2OoaAfswQntSa8FnYMBLA="; }; - cargoSha256 = "sha256-0KMs4YeWMj4Wz+iIVQ5XEwswVRs0q5Vibcy5fFNbH04="; + cargoSha256 = "sha256-ud6bhyWePINiddSuWcpUkMjp3q6/Xd9TK3CaoFZFB20="; # skip test due FHS dependency doCheck = false;