From eafa0f0f42b400302d1f85399d5345c658f4700d Mon Sep 17 00:00:00 2001 From: Taufik Hidayat Date: Sun, 30 Jun 2024 05:57:07 +0700 Subject: [PATCH 01/19] maintainers: add tfkhdyt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7352b09c2db1..815cbc92292a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19847,6 +19847,12 @@ githubId = 29044; name = "Jacek Galowicz"; }; + tfkhdyt = { + email = "tfkhdyt@proton.me"; + name = "Taufik Hidayat"; + github = "tfkhdyt"; + githubId = 47195537; + }; tfmoraes = { name = "Thiago Franco de Moraes"; github = "tfmoraes"; From 662ad7a3f626760fa964b63d699a2a3a29b85b90 Mon Sep 17 00:00:00 2001 From: Taufik Hidayat Date: Sun, 30 Jun 2024 05:58:28 +0700 Subject: [PATCH 02/19] urban-cli: init at 0.2.4 --- pkgs/by-name/ur/urban-cli/package.nix | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ur/urban-cli/package.nix diff --git a/pkgs/by-name/ur/urban-cli/package.nix b/pkgs/by-name/ur/urban-cli/package.nix new file mode 100644 index 000000000000..fb05c8e7686e --- /dev/null +++ b/pkgs/by-name/ur/urban-cli/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "urban-cli"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "tfkhdyt"; + repo = "urban-cli"; + rev = "v${version}"; + hash = "sha256-URTEhtOiwb3IDyjRUtUmVTaeDXw4Beg0woWdGxeq098="; + }; + + vendorHash = "sha256-fEZzX+ecSWKITXczcwm5BGw5OWuixa4XKrEx8z0pxXQ="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Blazingly fast command line interface for Urban Dictionary"; + homepage = "https://github.com/tfkhdyt/urban-cli"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tfkhdyt ]; + mainProgram = "urban-cli"; + }; +} From 1237d58e07f37836f1dced1502003d4c8d168042 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 21:40:05 +0200 Subject: [PATCH 03/19] font-awesome: 6.5.2 -> 6.6.0 --- pkgs/data/fonts/font-awesome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index 8705a07d2593..16000388091e 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -48,7 +48,7 @@ in hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo="; }; v6 = font-awesome { - version = "6.5.2"; - hash = "sha256-kUa/L/Krxb5v8SmtACCSC6CI3qTTOTr4Ss/FMRBlKuw="; + version = "6.6.0"; + hash = "sha256-tQ9Hxph5YiPZMiO9gs2HCkRJ8cdECa2swgS++cytEnM="; }; } From d67000f0aacd4339255a4806cda9fc359f2acc6a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 21:40:41 +0200 Subject: [PATCH 04/19] font-awesome: reformat --- pkgs/data/fonts/font-awesome/default.nix | 63 ++++++++++++++---------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index 16000388091e..f0622f56cd95 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -1,35 +1,48 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: let - font-awesome = { version, hash, rev ? version }: stdenvNoCC.mkDerivation { - pname = "font-awesome"; - inherit version; + font-awesome = + { + version, + hash, + rev ? version, + }: + stdenvNoCC.mkDerivation { + pname = "font-awesome"; + inherit version; - src = fetchFromGitHub { - owner = "FortAwesome"; - repo = "Font-Awesome"; - inherit rev hash; - }; + src = fetchFromGitHub { + owner = "FortAwesome"; + repo = "Font-Awesome"; + inherit rev hash; + }; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf + install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf - runHook postInstall - ''; - - meta = with lib; { - description = "Font Awesome - OTF font"; - longDescription = '' - Font Awesome gives you scalable vector icons that can instantly be customized. - This package includes only the OTF font. For full CSS etc. see the project website. + runHook postInstall ''; - homepage = "https://fontawesome.com/"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ abaldeau johnazoidberg ]; + + meta = with lib; { + description = "Font Awesome - OTF font"; + longDescription = '' + Font Awesome gives you scalable vector icons that can instantly be customized. + This package includes only the OTF font. For full CSS etc. see the project website. + ''; + homepage = "https://fontawesome.com/"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ + abaldeau + johnazoidberg + ]; + }; }; - }; in { # Keeping version 4 and 5 because version 6 is incompatible for some icons. That From 00cc3c437b763e32d571ecd420a4b08da02ee595 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 02:46:29 +0000 Subject: [PATCH 05/19] qdmr: 0.11.3 -> 0.12.0 --- pkgs/applications/radio/qdmr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 6217a169ef25..b76821f5a5f9 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -22,13 +22,13 @@ in stdenv.mkDerivation rec { pname = "qdmr"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "hmatuschek"; repo = "qdmr"; rev = "v${version}"; - hash = "sha256-YLGsKGcKIPd0ihd5IzlT71dYkxZfeH7BpnKQMEyY8dI="; + hash = "sha256-8NV0+M9eMcvkP3UERDkaimbapTKxB4rYRLbHZjzG4Ws="; }; nativeBuildInputs = [ From d7b8d5f1ed809a0edd9d5c7ea5c59a7b88638adb Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 17 Jul 2024 12:12:35 +0100 Subject: [PATCH 06/19] python3Packages.whool: init at 1.0.1 @moduon MT-1075 --- .../python-modules/whool/default.nix | 49 +++++++++++++++++++ .../python-modules/whool/setup-hook.sh | 16 ++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/whool/default.nix create mode 100644 pkgs/development/python-modules/whool/setup-hook.sh diff --git a/pkgs/development/python-modules/whool/default.nix b/pkgs/development/python-modules/whool/default.nix new file mode 100644 index 000000000000..60cb6bf111f9 --- /dev/null +++ b/pkgs/development/python-modules/whool/default.nix @@ -0,0 +1,49 @@ +{ + buildPythonPackage, + fetchFromGitHub, + git, + hatch-vcs, + lib, + manifestoo-core, + pytestCheckHook, + pythonOlder, + tomli, + wheel, +}: + +buildPythonPackage rec { + pname = "whool"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sbidoul"; + repo = "whool"; + rev = "refs/tags/v${version}"; + hash = "sha256-skJoMDIgZgRjfp4tsc6TKYVe09XBvg8Fk2BQfqneCYI="; + }; + + build-system = [ hatch-vcs ]; + + dependencies = [ + manifestoo-core + wheel + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + pythonImportsCheck = [ "whool" ]; + + nativeCheckInputs = [ + pytestCheckHook + git + ]; + + setupHook = ./setup-hook.sh; + + meta = { + description = "Standards-compliant Python build backend to package Odoo addons"; + homepage = "https://github.com/sbidoul/whool"; + changelog = "https://github.com/sbidoul/whool/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.yajo ]; + }; +} diff --git a/pkgs/development/python-modules/whool/setup-hook.sh b/pkgs/development/python-modules/whool/setup-hook.sh new file mode 100644 index 000000000000..1c8ecdf2c663 --- /dev/null +++ b/pkgs/development/python-modules/whool/setup-hook.sh @@ -0,0 +1,16 @@ +# Avoid using git to auto-bump the addon version +# DOCS https://github.com/sbidoul/whool/?tab=readme-ov-file#configuration +whool-post-version-strategy-hook() { + # DOCS https://stackoverflow.com/a/13864829/1468388 + if [ -z ${WHOOL_POST_VERSION_STRATEGY_OVERRIDE+x} ]; then + echo Setting WHOOL_POST_VERSION_STRATEGY_OVERRIDE to none + export WHOOL_POST_VERSION_STRATEGY_OVERRIDE=none + fi + + # Make sure you can import the built addon + for manifest in $(find -L . -name __manifest__.py); do + export pythonImportsCheck="$pythonImportsCheck odoo.addons.$(basename $(dirname $(realpath $manifest)))" + done +} + +preBuildHooks+=(whool-post-version-strategy-hook) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89e2ad56dce7..3a4c4e25abe2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17248,6 +17248,8 @@ self: super: with self; { whoisdomain = callPackage ../development/python-modules/whoisdomain { }; + whool = callPackage ../development/python-modules/whool { }; + whoosh = callPackage ../development/python-modules/whoosh { }; widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; From 056d2189fff7c710c53f94c4e3b789c075489ca0 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Thu, 25 Jul 2024 17:17:12 +0200 Subject: [PATCH 07/19] gnulib: Fix path to perl in prefix-gnulib-mk --- pkgs/development/tools/gnulib/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index be6719c3512c..1a5f173317d1 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromSavannah, python3 }: +{ lib, stdenv, fetchFromSavannah, python3, perl }: stdenv.mkDerivation rec { pname = "gnulib"; @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs gnulib-tool.py + substituteInPlace build-aux/{prefix-gnulib-mk,useless-if-before-free,update-copyright,gitlog-to-changelog,announce-gen} \ + --replace-fail 'exec perl' 'exec ${lib.getExe perl}' ''; buildInputs = [ python3 ]; From dd4feba205556412799f6328fb55ec88ec5d03ea Mon Sep 17 00:00:00 2001 From: magnouvean Date: Fri, 26 Jul 2024 11:55:05 +0200 Subject: [PATCH 08/19] g4music: rename to gapless and move to pkgs/by-name --- .../g4music/default.nix => by-name/ga/gapless/package.nix} | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{applications/audio/g4music/default.nix => by-name/ga/gapless/package.nix} (93%) diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/by-name/ga/gapless/package.nix similarity index 93% rename from pkgs/applications/audio/g4music/default.nix rename to pkgs/by-name/ga/gapless/package.nix index cbf5aef45c27..4df77bb601a3 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -14,7 +14,7 @@ , wrapGAppsHook4 }: stdenv.mkDerivation (finalAttrs: { - pname = "g4music"; + pname = "gapless"; version = "3.7.2"; src = fetchFromGitLab { @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "g4music"; homepage = "https://gitlab.gnome.org/neithern/g4music"; license = licenses.gpl3Only; - maintainers = with maintainers; [ magnouvean ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 99116ed6f119..81004e5303b3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -460,6 +460,7 @@ mapAliases ({ ### G ### + g4music = gapless; # Added 2024-07-26 g4py = python3Packages.geant4; # Added 2020-06-06 garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 965fa97f3885..fbf2eb057ace 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30910,8 +30910,6 @@ with pkgs; svox = callPackage ../applications/audio/svox { }; - g4music = callPackage ../applications/audio/g4music { }; - genesys = callPackage ../applications/misc/genesys { }; giada = callPackage ../applications/audio/giada { }; From 2677665935c408b655d70dee6c8b44f87565ed8b Mon Sep 17 00:00:00 2001 From: magnouvean Date: Fri, 26 Jul 2024 11:57:34 +0200 Subject: [PATCH 09/19] gapless: 3.7.2 -> 3.8 --- pkgs/by-name/ga/gapless/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index 4df77bb601a3..136afb521110 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gapless"; - version = "3.7.2"; + version = "3.8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-fG8OBAzdCdr3Yo8Vei93HlNa2TIL5gxWG+0jFYjSDZ8="; + hash = "sha256-AZoMAbQ3foW2jx+mBam925a8ykMtGvaiVg9N8/Ggny0="; }; nativeBuildInputs = [ From d99035decc3dc184a49539e5feb5093bcf41f571 Mon Sep 17 00:00:00 2001 From: Aleksana Date: Fri, 26 Jul 2024 22:17:50 +0800 Subject: [PATCH 10/19] gapless: add aleksana to maintainers --- pkgs/by-name/ga/gapless/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index 136afb521110..9852ab96a125 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "g4music"; homepage = "https://gitlab.gnome.org/neithern/g4music"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; }; }) From 05ffd360b5fb3f93061dbbf5440ad99a8f88a054 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Jul 2024 20:56:33 +0200 Subject: [PATCH 11/19] grafana: 11.1.0 -> 11.1.3 ChangeLog: * https://github.com/grafana/grafana/releases/tag/v11.1.3 * https://github.com/grafana/grafana/releases/tag/v11.1.2 * https://github.com/grafana/grafana/releases/tag/v11.1.1 --- pkgs/servers/monitoring/grafana/default.nix | 23 +++------------------ 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ad285956866a..a26d3418e075 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -6,19 +6,9 @@ , faketty }: -let - # Grafana seems to just set it to the latest version available - # nowadays. - patchGoVersion = '' - substituteInPlace go.{mod,work} pkg/build/wire/go.mod \ - --replace-fail "go 1.22.4" "go 1.22.3" - substituteInPlace Makefile \ - --replace-fail "GO_VERSION = 1.22.4" "GO_VERSION = 1.22.3" - ''; -in buildGoModule rec { pname = "grafana"; - version = "11.1.0"; + version = "11.1.3"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -26,7 +16,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-iTTT10YN8jBT4/ukGXNK1QHcyzXnAqg2LiFtNiwnENw="; + hash = "sha256-PfkKBKegMk+VjVJMocGj+GPTuUJipjD8+857skwmoco="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -46,9 +36,6 @@ buildGoModule rec { jq moreutils python3 # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild` ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; - postPatch = '' - ${patchGoVersion} - ''; buildPhase = '' runHook preBuild export HOME="$(mktemp -d)" @@ -73,17 +60,13 @@ buildGoModule rec { disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-Ny/SoelFVPvBBn50QpHcLTuVY3ynKbCegM1uQkJzB9Y="; + vendorHash = "sha256-vd3hb7+lmhQPTZO/Xqi59XSPGj5sd218xQAD1bRbUz8="; proxyVendor = true; nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; - postPatch = '' - ${patchGoVersion} - ''; - postConfigure = '' # Generate DI code that's required to compile the package. # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35 From ac93a0467d7a9b85d62fd10e838ad362ec458c83 Mon Sep 17 00:00:00 2001 From: pizmovc Date: Thu, 4 Jul 2024 21:47:50 +0200 Subject: [PATCH 12/19] argc: 1.14.0 -> 1.19.0 --- pkgs/by-name/ar/argc/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index 8c286ebff9e6..4e98fd790039 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -4,6 +4,7 @@ pkgsCross, rustPlatform, stdenv, + glibcLocales, fetchFromGitHub, installShellFiles, }: @@ -13,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.14.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "argc"; rev = "v${version}"; - hash = "sha256-Li/K5/SLG6JuoRJDz2DQoj1Oi9LQgZWHNvtZ1HVbj88="; + hash = "sha256-I5dx0/aHCGmzgAEBL9gZcG7DFWCkSpndGvv2enQIZGU="; }; - cargoHash = "sha256-D1T9FWTvwKtAYoqFlR2OmLRLGWhPJ9D8J7lq/QKcBoM="; + cargoHash = "sha256-30BY6ceJj0UeZE30O/LovR+YXSd7jIxFo6ojKFuecFM="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; @@ -37,6 +38,14 @@ rustPlatform.buildRustPackage rec { disallowedReferences = lib.optional (!canExecuteHost) buildPackages.argc; + env = + { + LANG = "C.UTF-8"; + } + // lib.optionalAttrs (glibcLocales != null) { + LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + }; + passthru = { tests = { cross = From e42fd4b9792e1aa111624a3619f5bd3eae75781d Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Fri, 26 Jul 2024 22:45:02 +0200 Subject: [PATCH 13/19] luaPackages.haskell-tools.nvim: 3.1.10 -> 4.0.0 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ------------ pkgs/applications/editors/vim/plugins/overrides.nix | 2 ++ .../editors/vim/plugins/vim-plugin-names | 1 - pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 114952110ef7..2d082a653de3 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4618,18 +4618,6 @@ final: prev: meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; - haskell-tools-nvim = buildNeovimPlugin { - pname = "haskell-tools.nvim"; - version = "2024-07-14"; - src = fetchFromGitHub { - owner = "MrcJkb"; - repo = "haskell-tools.nvim"; - rev = "b003e20e99aa79bfec7c632e5ab817e1c10c8036"; - sha256 = "18gjqnf66nxq76bcb0icihyplmzs0nwav6qpxmszqm05cm1m8l30"; - }; - meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; - }; - haskell-vim = buildVimPlugin { pname = "haskell-vim"; version = "2021-01-19"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b4826109a7dd..d3086565b931 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -844,6 +844,8 @@ dependencies = with self; [ nvim-treesitter ]; }; + haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "haskell-tools-nvim"; }; + hex-nvim = super.hex-nvim.overrideAttrs { postPatch = '' substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 6e9e858c56d1..c9224e059be6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -386,7 +386,6 @@ https://github.com/ThePrimeagen/harpoon/,master, https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD, https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD, -https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index b19c2f826eab..6bf15fc6f83a 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -620,14 +620,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "3.1.10-1"; + version = "4.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-3.1.10-1.rockspec"; - sha256 = "0s7haq3l29b26x9yj88j4xh70gm9bnnqn4q7qnkrwand3bj9m48q"; + url = "mirror://luarocks/haskell-tools.nvim-4.0.0-1.rockspec"; + sha256 = "1iz7bgy7a0zclsg31rmf6hcrjxnikhqwzh5blirif3m9bdi9mv6v"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.10.zip"; - sha256 = "1cxfv2f4vvkqmx1k936k476mxsy1yn85blg0qyfsjfagca25ymmv"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.0.zip"; + sha256 = "0k6kw42n4c2hc7mqjv8ahwcwqia7wdgmszy1np96sc9dd0bkiqx9"; }; disabled = luaOlder "5.1"; From 0aca8d3568d43ffddeab580ac4552e499ce2e6f0 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 14:46:02 -0700 Subject: [PATCH 14/19] live-server: init at 0.7.0 --- pkgs/by-name/li/live-server/package.nix | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/li/live-server/package.nix diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix new file mode 100644 index 000000000000..b7c1152d6a56 --- /dev/null +++ b/pkgs/by-name/li/live-server/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + darwin, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "live-server"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "lomirus"; + repo = "live-server"; + rev = "v${version}"; + hash = "sha256-BSAsD9nRlHaTDbBpLBxN9OOQ9SekRwQeYUWV1CZO4oY="; + }; + + cargoHash = "sha256-RwueYpa/CMriSOWwGZhkps6jHmqOdRuz+ECRq/ThPs0="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + SystemConfiguration + ] + ); + + meta = with lib; { + description = "Local network server with live reload feature for static pages"; + downloadPage = "https://github.com/lomirus/live-server/releases"; + homepage = "https://github.com/lomirus/live-server"; + license = licenses.mit; + mainProgram = "live-server"; + maintainers = [ maintainers.philiptaron ]; + platforms = platforms.unix; + }; +} From db44a65a614454a06e36ced9bb2c746ba596c6d9 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 27 Jul 2024 01:40:29 +0200 Subject: [PATCH 15/19] nixos/radicle: fix support for encrypted privateKeyFile --- nixos/modules/services/misc/radicle.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix index 7d7804c6eadd..3a393bf0f1f2 100644 --- a/nixos/modules/services/misc/radicle.nix +++ b/nixos/modules/services/misc/radicle.nix @@ -119,7 +119,8 @@ in enable = mkEnableOption "Radicle Seed Node"; package = mkPackageOption pkgs "radicle-node" { }; privateKeyFile = mkOption { - type = types.path; + # Note that a key encrypted by systemd-creds is not a path but a str. + type = with types; either path str; description = '' Absolute file path to an SSH private key, usually generated by `rad auth`. From c7792bba4eecb26f87c8011c79b3300cd30363a0 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Sat, 27 Jul 2024 12:14:26 +0530 Subject: [PATCH 16/19] maintainers: update email address for getpsyched --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 864367a22444..5e0c6883f3e0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7353,7 +7353,7 @@ }; getpsyched = { name = "Priyanshu Tripathi"; - email = "priyanshu@getpsyched.dev"; + email = "nixos@getpsyched.dev"; matrix = "@getpsyched:matrix.org"; github = "getpsyched"; githubId = 43472218; From a8c851bd922128068f79bb3f631ddd5a5b63ebbd Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 27 Jul 2024 10:05:10 +0300 Subject: [PATCH 17/19] kdePackages.kdenlive, plasma5Packages.kdenlive: drop glaxnimate from inputs It's not actually needed as a library, only as a binary, and adding it leaks duplicate OpenCVs into the closure, which breaks rendering. Fixes #329747 Fixes #209941 --- pkgs/applications/kde/kdenlive/default.nix | 1 - pkgs/kde/gear/kdenlive/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix index d5d465b8c4fe..13a208fd9971 100644 --- a/pkgs/applications/kde/kdenlive/default.nix +++ b/pkgs/applications/kde/kdenlive/default.nix @@ -82,7 +82,6 @@ mkDerivation { kpurpose kdeclarative wrapGAppsHook3 - glaxnimate ]; # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index 059ed9456f18..cee597bce71f 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -36,7 +36,6 @@ mkKdeDerivation { mlt shared-mime-info libv4l - glaxnimate ]; qtWrapperArgs = [ From b5251c9822f7d916b4f544dbbf3b12884461e8a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 07:40:21 +0000 Subject: [PATCH 18/19] cargo-public-api: 0.36.0 -> 0.37.0 --- pkgs/development/tools/rust/cargo-public-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 6509fa381c88..aa55cac49d75 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.36.0"; + version = "0.37.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Umxkm+GCXsb60l9Gq417cynoy7D30Hlh6r04HoWGVPA="; + hash = "sha256-BwCqGQJpFjrZtQpjZ7FIIUfIaIXBTJWDzjZoktSa2Zg="; }; - cargoHash = "sha256-Aj9SykzdAZJSw8wQ5QHLhtWaxo2tnjjdJZnPIp3fsVw="; + cargoHash = "sha256-McqRVfTX8z3NkkIvp3jqJlhtOhOGdcahTghDCMY2E6c="; nativeBuildInputs = [ pkg-config ]; From 1ceba038c42ef9b4ecc629dab2d76ee4a06c06cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 07:40:44 +0000 Subject: [PATCH 19/19] dqlite: 1.16.5 -> 1.16.6 --- pkgs/development/libraries/dqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index d0a8bdbafb24..0821488c1652 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.16.5"; + version = "1.16.6"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dk4OEQuADPMfdfAmrgA36Bdzo6qm5Ak4/Rw/L9C75a0="; + hash = "sha256-NtBEhtK6PysRqCUNcbFvPMBEmDR9WWJkWdFdzTOKt/8="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ];