From 32016912f45a53cdb05a53245bc6d6e91d7f595b Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 27 Apr 2024 17:29:58 +0530 Subject: syslog-ng: move to finalAttrs explicitly use lib where needed --- pkgs/by-name/sy/syslogng/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix index 8b261dcb060f9..c8f45f834a671 100644 --- a/pkgs/by-name/sy/syslogng/package.nix +++ b/pkgs/by-name/sy/syslogng/package.nix @@ -59,14 +59,14 @@ let ]; py = python3.withPackages python-deps; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "syslog-ng"; version = "4.7.1"; src = fetchFromGitHub { owner = "syslog-ng"; repo = "syslog-ng"; - rev = "syslog-ng-${version}"; + rev = "syslog-ng-${finalAttrs.version}"; hash = "sha256-runFMUxQv7B023I38QfGqn89ZbzA5vMXHOOkYwMxArI="; fetchSubmodules = true; }; @@ -117,11 +117,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://www.syslog-ng.com"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; - maintainers = with maintainers; [ vifino ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with lib.maintainers; [ vifino ]; + platforms = lib.platforms.linux; }; -} +}) -- cgit 1.4.1 From ffe2d584e8e6d715573b89324accf603846f3266 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 27 Apr 2024 18:44:45 +0530 Subject: lager: move to finalAttrs explicitly use lib where needed --- pkgs/by-name/la/lager/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/la/lager/package.nix b/pkgs/by-name/la/lager/package.nix index 11b7595fcccb3..1786e0cc503d1 100644 --- a/pkgs/by-name/la/lager/package.nix +++ b/pkgs/by-name/la/lager/package.nix @@ -8,15 +8,17 @@ , zug }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lager"; version = "0.1.0"; + src = fetchFromGitHub { owner = "arximboldi"; repo = "lager"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-KTHrVV/186l4klwlcfDwFsKVoOVqWCUPzHnIbWuatbg="; }; + buildInputs = [ boost immer @@ -28,10 +30,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Dlager_BUILD_EXAMPLES=OFF" ]; - meta = with lib; { - homepage = "https://github.com/arximboldi/lager"; + + meta = { + homepage = "https://github.com/arximboldi/lager"; description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++"; - license = licenses.mit; - maintainers = with maintainers; [ nek0 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nek0 ]; }; -} +}) -- cgit 1.4.1 From 01429c022fcb611d72e74ee48f351fcdbea3e304 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 28 Apr 2024 23:25:41 -0300 Subject: live555: 2024.04.14 -> 2024.04.19 --- pkgs/by-name/li/live555/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 746aa71125319..cb8e08b02fe85 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2024.04.14"; + version = "2024.04.19"; src = fetchurl { urls = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-mR5rKGKtTwMq3p+xAAGdo0DNNnIe4KHladLPlnhVhNY="; + hash = "sha256-5sLr/sZ3LB83CEJx5OUjarx/Dh/ESJ+YaXY0QCAN3MI="; }; patches = [ @@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: { config.linux '' # condition from icu/base.nix - + lib.optionalString (stdenv.hostPlatform.libc == "glibc" - || stdenv.hostPlatform.libc == "musl") '' + + lib.optionalString (lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" ]) '' substituteInPlace liveMedia/include/Locale.hh \ --replace '' '' ''; -- cgit 1.4.1 From 63b0fa4b600f97d926167dd0534af6157fcde551 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 10:29:57 +0200 Subject: shell_gpt: move to pkgs/by-name --- pkgs/by-name/sh/shell-gpt/package.nix | 48 +++++++++++++++++++++++++++++++++++ pkgs/tools/llm/shell_gpt/default.nix | 48 ----------------------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 48 insertions(+), 50 deletions(-) create mode 100644 pkgs/by-name/sh/shell-gpt/package.nix delete mode 100644 pkgs/tools/llm/shell_gpt/default.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix new file mode 100644 index 0000000000000..4db72ae505864 --- /dev/null +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -0,0 +1,48 @@ +{ lib +, python3 +, fetchPypi +, nix-update-script +}: + +python3.pkgs.buildPythonApplication rec { + pname = "shell_gpt"; + version = "1.4.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-zSgWSC60ypOQ1IENcxObBezAfHosQWBD9ft06yh5iV4="; + }; + + nativeBuildInputs = with python3.pkgs; [ + python3.pkgs.pythonRelaxDepsHook + python3 + pip + ]; + + propagatedBuildInputs = with python3.pkgs; [ + markdown-it-py + rich + distro + typer + requests + hatchling + openai + instructor + ]; + + pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ]; + + passthru.updateScript = nix-update-script { }; + + doCheck = false; + + meta = with lib; { + mainProgram = "sgpt"; + homepage = "https://github.com/TheR1D/shell_gpt"; + description = "Access ChatGPT from your terminal"; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/tools/llm/shell_gpt/default.nix b/pkgs/tools/llm/shell_gpt/default.nix deleted file mode 100644 index 4db72ae505864..0000000000000 --- a/pkgs/tools/llm/shell_gpt/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, python3 -, fetchPypi -, nix-update-script -}: - -python3.pkgs.buildPythonApplication rec { - pname = "shell_gpt"; - version = "1.4.3"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-zSgWSC60ypOQ1IENcxObBezAfHosQWBD9ft06yh5iV4="; - }; - - nativeBuildInputs = with python3.pkgs; [ - python3.pkgs.pythonRelaxDepsHook - python3 - pip - ]; - - propagatedBuildInputs = with python3.pkgs; [ - markdown-it-py - rich - distro - typer - requests - hatchling - openai - instructor - ]; - - pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ]; - - passthru.updateScript = nix-update-script { }; - - doCheck = false; - - meta = with lib; { - mainProgram = "sgpt"; - homepage = "https://github.com/TheR1D/shell_gpt"; - description = "Access ChatGPT from your terminal"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ mglolenstine ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3eb44f6b4185..da904303ad45e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34427,8 +34427,6 @@ with pkgs; shavee = callPackage ../applications/misc/shavee { }; - shell_gpt = callPackage ../tools/llm/shell_gpt { }; - shfmt = callPackage ../tools/text/shfmt { }; shipments = callPackage ../applications/misc/shipments { }; -- cgit 1.4.1 From 722a13160288c6ff8e4e36b708b9cdf85d45bb0c Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 27 Apr 2024 19:01:08 +0530 Subject: keydb: move to finalAttrs, cleanup explicitly use lib where needed --- pkgs/by-name/ke/keydb/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ke/keydb/package.nix b/pkgs/by-name/ke/keydb/package.nix index 3fc085b40ad9f..3be46ff770a09 100644 --- a/pkgs/by-name/ke/keydb/package.nix +++ b/pkgs/by-name/ke/keydb/package.nix @@ -18,14 +18,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keydb"; version = "6.3.4"; src = fetchFromGitHub { owner = "snapchat"; repo = "keydb"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-j6qgK6P3Fv+b6k9jwKQ5zW7XLkKbXXcmHKBCQYvwEIU="; }; @@ -94,13 +94,13 @@ stdenv.mkDerivation rec { passthru.tests.redis = nixosTests.redis; passthru.serverBin = "keydb-server"; - meta = with lib; { + meta = { homepage = "https://keydb.dev"; description = "A Multithreaded Fork of Redis"; - license = licenses.bsd3; - platforms = platforms.all; - changelog = "https://github.com/Snapchat/KeyDB/raw/v${version}/00-RELEASENOTES"; - maintainers = teams.helsinki-systems.members; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + changelog = "https://github.com/Snapchat/KeyDB/raw/v${finalAttrs.version}/00-RELEASENOTES"; + maintainers = lib.teams.helsinki-systems.members; mainProgram = "keydb-cli"; }; -} +}) -- cgit 1.4.1 From dd38d7938e4e5fdf029ce79430db1ddbf5408401 Mon Sep 17 00:00:00 2001 From: nat Date: Tue, 30 Apr 2024 15:13:24 +0200 Subject: lunar-client: 3.2.5 -> 3.2.6 --- pkgs/by-name/lu/lunar-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 180abae393373..f507a4dbc3117 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "lunar-client"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-flve07l13w4aRPPMhbf1Nbaxy6i1ljxx2J/9vg4WLQK4k09PVJKGn6b8nxe5d90LCYMhwEHfEvrHFB/tNFKJ9w=="; + hash = "sha512-JZ6fXUDurLxe6acRRXTHot2GTUqMaSwy7N5K4cmFmOn4s8W2aXek+o8med3ytaxoTd6FmibXmCxrjnOVMHBRGA=="; }; extraInstallCommands = -- cgit 1.4.1 From c743f45a766662f66e6c18abc67963a011e739eb Mon Sep 17 00:00:00 2001 From: Manuel Sanchez Pinar Date: Tue, 30 Apr 2024 15:28:08 +0200 Subject: silverbullet: 0.7.6 -> 0.7.7 --- pkgs/by-name/si/silverbullet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/si/silverbullet/package.nix b/pkgs/by-name/si/silverbullet/package.nix index b8732b4c69971..4a41b37014277 100644 --- a/pkgs/by-name/si/silverbullet/package.nix +++ b/pkgs/by-name/si/silverbullet/package.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "silverbullet"; - version = "0.7.6"; + version = "0.7.7"; src = fetchurl { url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet.js"; - hash = "sha256-bnD9iZVRIg6otgDi4yNWySqmJsJJIVnjFGsTrGCMw/o="; + hash = "sha256-EhHPysliRi1bv/skS4+ljQW6qFsijmSup1+7/fVfFdg="; }; dontUnpack = true; -- cgit 1.4.1 From 5f1a99cdaa5113174815f73741ebb20496c92b7f Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:37:24 +0200 Subject: scotch: move to pkgs/by-name --- pkgs/applications/science/math/scotch/default.nix | 36 ----------------------- pkgs/by-name/sc/scotch/package.nix | 36 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 pkgs/applications/science/math/scotch/default.nix create mode 100644 pkgs/by-name/sc/scotch/package.nix (limited to 'pkgs/by-name') diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix deleted file mode 100644 index 1eb057cfc7c5c..0000000000000 --- a/pkgs/applications/science/math/scotch/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}: - -stdenv.mkDerivation rec { - version = "6.1.1"; - pname = "scotch"; - src_name = "scotch_${version}"; - - buildInputs = [ bison mpi flex zlib ]; - - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; - sha256 = "sha256-OQUvWf9HSkppzvwlzzyvhClACIneugEO5kA8oYj4sxE="; - }; - - sourceRoot = "${src_name}/src"; - - preConfigure = '' - ln -s Make.inc/Makefile.inc.x86-64_pc_linux2 Makefile.inc - ''; - - buildFlags = [ "scotch ptscotch" ]; - installFlags = [ "prefix=\${out}" ]; - - meta = { - description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering"; - longDescription = '' - Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, - and sparse matrix ordering. - ''; - homepage = "http://www.labri.fr/perso/pelegrin/scotch"; - license = lib.licenses.cecill-c; - maintainers = [ lib.maintainers.bzizou ]; - platforms = lib.platforms.linux; - }; -} - diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix new file mode 100644 index 0000000000000..1eb057cfc7c5c --- /dev/null +++ b/pkgs/by-name/sc/scotch/package.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}: + +stdenv.mkDerivation rec { + version = "6.1.1"; + pname = "scotch"; + src_name = "scotch_${version}"; + + buildInputs = [ bison mpi flex zlib ]; + + src = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; + sha256 = "sha256-OQUvWf9HSkppzvwlzzyvhClACIneugEO5kA8oYj4sxE="; + }; + + sourceRoot = "${src_name}/src"; + + preConfigure = '' + ln -s Make.inc/Makefile.inc.x86-64_pc_linux2 Makefile.inc + ''; + + buildFlags = [ "scotch ptscotch" ]; + installFlags = [ "prefix=\${out}" ]; + + meta = { + description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering"; + longDescription = '' + Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, + and sparse matrix ordering. + ''; + homepage = "http://www.labri.fr/perso/pelegrin/scotch"; + license = lib.licenses.cecill-c; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaba80f5715d0..db156a5eee062 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39056,8 +39056,6 @@ with pkgs; scilla = callPackage ../tools/security/scilla { }; - scotch = callPackage ../applications/science/math/scotch { }; - mininet = callPackage ../tools/virtualization/mininet { }; msieve = callPackage ../applications/science/math/msieve { }; -- cgit 1.4.1 From 285278da9867f6dcb5ae6f3891b0ea22f8d166b7 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:53:31 +0200 Subject: scotch: use fetchFromGitLab and format --- pkgs/by-name/sc/scotch/package.nix | 42 +++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 14 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 1eb057cfc7c5c..7a93705cd9140 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -1,24 +1,39 @@ -{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}: - -stdenv.mkDerivation rec { - version = "6.1.1"; +{ + lib, + stdenv, + fetchFromGitLab, + bison, + mpi, + flex, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - src_name = "scotch_${version}"; - - buildInputs = [ bison mpi flex zlib ]; + version = "6.1.1"; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; - sha256 = "sha256-OQUvWf9HSkppzvwlzzyvhClACIneugEO5kA8oYj4sxE="; + buildInputs = [ + bison + mpi + flex + zlib + ]; + + src = fetchFromGitLab { + domain = "gitlab.inria.fr"; + owner = "scotch"; + repo = "scotch"; + rev = "v${finalAttrs.version}"; + hash = "sha256-GUV6s+P56OAJq9AMe+LZOMPICQO/RuIi+hJAecmO5Wc="; }; - sourceRoot = "${src_name}/src"; - preConfigure = '' + cd src ln -s Make.inc/Makefile.inc.x86-64_pc_linux2 Makefile.inc ''; buildFlags = [ "scotch ptscotch" ]; + installFlags = [ "prefix=\${out}" ]; meta = { @@ -32,5 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.linux; }; -} - +}) -- cgit 1.4.1 From 08150fb723af988f1e57ea1592698c2ff7b56f5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Apr 2024 16:44:48 +0200 Subject: shell-gpt: refactor --- pkgs/by-name/sh/shell-gpt/package.nix | 50 ++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index 4db72ae505864..a7eae5f68ad9c 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -1,48 +1,54 @@ { lib +, fetchFromGitHub , python3 -, fetchPypi -, nix-update-script }: python3.pkgs.buildPythonApplication rec { - pname = "shell_gpt"; + pname = "shell-gpt"; version = "1.4.3"; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-zSgWSC60ypOQ1IENcxObBezAfHosQWBD9ft06yh5iV4="; + src = fetchFromGitHub { + owner = "TheR1D"; + repo = "shell_gpt"; + rev = "refs/tags/${version}"; + hash = "sha256-T37L4U1kOrrIQJ2znq2UupD3pyit9xd8rAsEwUvGiQ8="; }; + pythonRelaxDeps = [ + "requests" + "rich" + "distro" + "typer" + "instructor" + ]; + + build-system = with python3.pkgs; [ + hatchling + ]; + nativeBuildInputs = with python3.pkgs; [ - python3.pkgs.pythonRelaxDepsHook - python3 - pip + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ - markdown-it-py - rich + click distro - typer - requests - hatchling - openai instructor + openai + rich + typer ]; - pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ]; - - passthru.updateScript = nix-update-script { }; - + # Tests want to read the OpenAI API key from stdin doCheck = false; meta = with lib; { - mainProgram = "sgpt"; - homepage = "https://github.com/TheR1D/shell_gpt"; description = "Access ChatGPT from your terminal"; - platforms = platforms.unix; + homepage = "https://github.com/TheR1D/shell_gpt"; + changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ mglolenstine ]; + mainProgram = "sgpt"; }; } -- cgit 1.4.1 From 8d2927a9dcf0a0ce32b99f949d888d55ace1f9c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Apr 2024 16:45:17 +0200 Subject: shell-gpt: format with nixfmt --- pkgs/by-name/sh/shell-gpt/package.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index a7eae5f68ad9c..92f451b24088f 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -19,17 +20,13 @@ python3.pkgs.buildPythonApplication rec { "requests" "rich" "distro" - "typer" + "typer" "instructor" ]; - build-system = with python3.pkgs; [ - hatchling - ]; + build-system = with python3.pkgs; [ hatchling ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ click -- cgit 1.4.1 From 155b3e9e7282ea7c4f1359ae6fae423eb5d76a60 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 30 Apr 2024 22:03:44 +0200 Subject: puppet-bolt: fix pname --- pkgs/by-name/pu/puppet-bolt/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/pu/puppet-bolt/package.nix b/pkgs/by-name/pu/puppet-bolt/package.nix index 23047c3cff479..7340ed9eb751e 100644 --- a/pkgs/by-name/pu/puppet-bolt/package.nix +++ b/pkgs/by-name/pu/puppet-bolt/package.nix @@ -7,7 +7,7 @@ testers, }: -bundlerApp { +(bundlerApp { pname = "bolt"; gemdir = ./.; @@ -42,4 +42,6 @@ bundlerApp { maintainers = with lib.maintainers; [ uvnikita anthonyroussel ]; platforms = lib.platforms.unix; }; -} +}).overrideAttrs (old: { + name = "puppet-bolt-${(import ./gemset.nix).bolt.version}"; +}) -- cgit 1.4.1 From 9a9a80c0b9c0d505985899703885be08114452b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Apr 2024 22:41:23 +0000 Subject: unciv: 4.11.8 -> 4.11.9 --- pkgs/by-name/un/unciv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index d548184ab7509..d55a5d06ec9a0 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.11.8"; + version = "4.11.9"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-iNcz6kfzlr1f1kC6xo1htyT46JjgEMeo21JIfOBxeQw="; + hash = "sha256-fAosJmEAQGA1QAyabcmqwuDeqUM+t3mNIfSOrAwc5hg="; }; dontUnpack = true; -- cgit 1.4.1 From 1a8a40c15ea166b671f5e1d24ef930aa7a241b62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 02:24:03 +0000 Subject: kor: 0.3.7 -> 0.3.8 --- pkgs/by-name/ko/kor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index ee9d43af7c592..09abafc69d7cc 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kor"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-wjq4IkF3agmculIH+WfBAGd0ciJBX9aj4EsmUvje9Aw="; + hash = "sha256-4lXLmh8BP7h6k8Tt/oklvv7fmDvmdKQP0P7gaCM2TK0="; }; - vendorHash = "sha256-UN3Zf8eo6kMNNzkGsnqyDVMgE2QXRn4wg+XULu/uBGE="; + vendorHash = "sha256-ScV12Xb+tVluXC2Jat44atkKXZIzIcUdZ+lyD1Y3dIM="; preCheck = '' HOME=$(mktemp -d) -- cgit 1.4.1 From 5c6686a809ef2ae1493ca07441d3606d705e51f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 05:42:13 +0000 Subject: anytype: 0.40.2 -> 0.40.8 --- pkgs/by-name/an/anytype/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 5d526ea0725d5..53c2996834f7b 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -2,12 +2,12 @@ let pname = "anytype"; - version = "0.40.2"; + version = "0.40.8"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; name = "Anytype-${version}.AppImage"; - hash = "sha256-RO8rYH0wHPxwey1ICAVK1jURs7b+oxLXRlychgi6c1c="; + hash = "sha256-Rvl52nKrOWQfT2qgssEpFjQCjva54zPvm6aEXmO0NTc="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in appimageTools.wrapType2 { -- cgit 1.4.1 From d46c1ddb17da38cc900bb0813f3fec61c655c0d4 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 1 May 2024 14:44:03 +0900 Subject: pinact: 0.1.2 -> 0.1.3 --- pkgs/by-name/pi/pinact/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index a5cee76cd9c6a..7e710c8f270ec 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -7,18 +7,18 @@ let pname = "pinact"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; rev = "v${version}"; - hash = "sha256-OQo21RHk0c+eARKrA2qB4NAWWanb94DOZm4b9lqDz8o="; + hash = "sha256-ifUnF7u4/vMy89xb7sk4tPKQYdFBYAIHc0GYVBMWvWM="; }; in buildGoModule { inherit pname version src; - vendorHash = "sha256-g7rdIE+w/pn70i8fOmAo/QGjpla3AUWm7a9MOhNmrgE="; + vendorHash = "sha256-ht4eV62w9AWKYahrd83LmBI+Tu2Q64YA3t90N4BR1e4="; doCheck = true; -- cgit 1.4.1 From eadb991a164c14f3e921cf629a678e74440b96f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 06:14:05 +0000 Subject: dmarc-report-converter: 0.7.1 -> 0.7.2 --- pkgs/by-name/dm/dmarc-report-converter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix index 5fff732e84fc5..488ce0a92d648 100644 --- a/pkgs/by-name/dm/dmarc-report-converter/package.nix +++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "dmarc-report-converter"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "tierpod"; repo = "dmarc-report-converter"; rev = "v${version}"; - hash = "sha256-cP96tiBpMFNEHuIF0sovi+Q4yW8wMUqr138RyMOFoho="; + hash = "sha256-93sNEBV7MxZr6tqPaFKgY0KA1J3W0HoCiIDZg268Smc="; }; vendorHash = null; -- cgit 1.4.1 From 7cdddf2b22fac740779b7f7fdd528eb2021b861f Mon Sep 17 00:00:00 2001 From: DataHearth Date: Wed, 1 May 2024 09:55:03 +0200 Subject: hoppscotch: 24.3.1-2 -> 24.3.2-1 --- pkgs/by-name/ho/hoppscotch/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index ba08dbcc24233..c076f484a84b7 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -7,20 +7,20 @@ let pname = "hoppscotch"; - version = "24.3.1-2"; + version = "24.3.2-1"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-F4vQwdNObIE8Fx75TfwI0QxbY5n2syT4sEIhgAu2Z5c="; + hash = "sha256-/Sa51x/Hy4mOxNL+6r+5sk/cF4iBbup9UBaWqzsnrBM="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-itC6PdNdzcw5Lv/hQkT0AsTGQ8kmTwT6cipyaAynph8="; + hash = "sha256-6vm3pQPg5OKRtP6W1CNQxy4fi9niw4Y4nXjargwHxuA="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-vj9UYizRmyIK9mLNSW/qFc/QmnWNhniqJf3gG66WPb0="; + hash = "sha256-iGD/9alVwSsIhbSl9HZXdB5MQNSjn18YdgebyoizriE="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); -- cgit 1.4.1 From bebd9af58e29ea54e54d8c33fa461fea77982b50 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 1 May 2024 12:37:49 +0200 Subject: gpt4all: 2.7.3 -> 2.7.4 --- pkgs/by-name/gp/gpt4all/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 83705d3906379..0d3d41a551822 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-hIfeADP3tiooGZr/OMVFIkOAniMWXj9AsVzMPlVbucE="; + hash = "sha256-G22d2Q6z7DmPHM/DEE7iyJ8SWRZdoVdSWw+gnPVHdEg="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; @@ -23,11 +23,6 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/gpt4all-chat"; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'set(CMAKE_INSTALL_PREFIX ''${CMAKE_BINARY_DIR}/install)' "" - ''; - nativeBuildInputs = [ cmake qt6.wrapQtAppsHook -- cgit 1.4.1