From 220d6c532c236f8af2ec37a86548d965c8255336 Mon Sep 17 00:00:00 2001 From: jpts Date: Tue, 27 Jun 2023 22:57:08 +0100 Subject: [PATCH 01/51] maintainers: add jpts --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 114248d005b0..8d29c7499713 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8818,6 +8818,12 @@ githubId = 752510; name = "Martin Potier"; }; + jpts = { + email = "james+nixpkgs@cleverley-prance.uk"; + github = "jpts"; + githubId = 5352661; + name = "James Cleverley-Prance"; + }; jqqqqqqqqqq = { email = "jqqqqqqqqqq@gmail.com"; github = "jqqqqqqqqqq"; From 9f3a78c8f21864acc1ff23e960063b317a229dfc Mon Sep 17 00:00:00 2001 From: jpts Date: Fri, 27 Oct 2023 00:13:37 +0100 Subject: [PATCH 02/51] python3Packages.cherrypy-cors: init at 1.7.0 --- .../python-modules/cherrypy-cors/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/cherrypy-cors/default.nix diff --git a/pkgs/development/python-modules/cherrypy-cors/default.nix b/pkgs/development/python-modules/cherrypy-cors/default.nix new file mode 100644 index 000000000000..72af66bbef75 --- /dev/null +++ b/pkgs/development/python-modules/cherrypy-cors/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, setuptools-scm +, httpagentparser +, cherrypy +, pytestCheckHook +}: +buildPythonPackage rec { + pname = "cherrypy-cors"; + version = "1.7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gzhM1mSnq4uat9SSb+lxOs/gvONmXuKBiaD6BLnyEtY="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + httpagentparser + cherrypy + ]; + + pythonImportsCheck = [ "cherrypy_cors" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "CORS support for CherryPy"; + homepage = "https://github.com/cherrypy/cherrypy-cors"; + license = licenses.mit; + maintainers = with maintainers; [ jpts ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 311415f7c3d4..ed5c2a483c72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1964,6 +1964,8 @@ self: super: with self; { cherrypy = callPackage ../development/python-modules/cherrypy { }; + cherrypy-cors = callPackage ../development/python-modules/cherrypy-cors { }; + chess = callPackage ../development/python-modules/chess { }; chevron = callPackage ../development/python-modules/chevron { }; From 236bdb034addda9dd9b45f222379e03966cf2d6c Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Wed, 22 Nov 2023 18:20:35 +0100 Subject: [PATCH 03/51] maintainers: add dblsaiko --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 04c939fd6a48..473ad97942ee 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4177,6 +4177,12 @@ fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36"; }]; }; + dblsaiko = { + email = "me@dblsaiko.net"; + github = "2xsaiko"; + githubId = 3987560; + name = "Marco Rebhan"; + }; dbohdan = { email = "dbohdan@dbohdan.com"; github = "dbohdan"; From cdbb25cf40e64b01fe07b5847d0be1376dcfe29e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Dec 2023 00:14:24 +0000 Subject: [PATCH 04/51] tutanota-desktop: 3.118.27 -> 3.119.3 --- .../networking/mailreaders/tutanota-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 0d0be882f430..7f83f9dc7d9d 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.118.27"; + version = "3.119.3"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - hash = "sha256-z2Ir8O7IDiE7cYuLshpMQMnOJanaECUvKlUEyPayIPo="; + hash = "sha256-TdjvU12nh1sTfGTdBn+7dbEunaF38YjDvceEns4iRbA="; }; nativeBuildInputs = [ From 91cae38e4520812edd48620b2cd158dd3fa1cdca Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 01:27:14 +0100 Subject: [PATCH 05/51] tracebox: fix build with gcc 11+ --- pkgs/tools/networking/tracebox/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 33bb443e3710..dce1fc532046 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -37,8 +37,11 @@ stdenv.mkDerivation rec { "--with-libpcap=yes" ]; - PCAPLIB="-lpcap"; - LUA_LIB="-llua"; + env = { + CXXFLAGS = "-std=c++14"; + LUA_LIB = "-llua"; + PCAPLIB = "-lpcap"; + }; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..7cc7d423066d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14096,7 +14096,7 @@ with pkgs; traceroute = callPackage ../tools/networking/traceroute { }; - tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; }; + tracebox = callPackage ../tools/networking/tracebox { }; tracee = callPackage ../tools/security/tracee { clang = clang_14; From 0244f8703c3c8edcebda449448100610e56e2240 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Dec 2023 05:37:27 +0000 Subject: [PATCH 06/51] k3s: 1.27.7+k3s2 -> 1.27.8+k3s2 --- .../applications/networking/cluster/k3s/1_27/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index abe8e933d11e..a6e40bbcead6 100644 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.27.7+k3s2"; - k3sCommit = "575bce7689f4be112bd0099362fb8d5f2e39398e"; - k3sRepoSha256 = "1k8hmxdc45pxwkpkq3y1jpx1ybv1h9y4sk7zb09y0487jqqgd15f"; - k3sVendorHash = "sha256-IqnBau4uBIN8ccnoX1P3ud8ZoMR3BjhchLU32tq0YWQ="; + k3sVersion = "1.27.8+k3s2"; + k3sCommit = "02fcbd1f57f0bc0ca1dc68f98cfa0e7d3b008225"; + k3sRepoSha256 = "02g741b43s2ss1mdjnrs7fx4bhv9k55k4n350h9qp5jgqg8ldbdi"; + k3sVendorHash = "sha256-mCPr+Y8wiWyW5T/iYH7Y4tz+nrqGyD2IQnIFd0EgdjI="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; From b75cc1d316d2934bf56307f245574928b778249d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Dec 2023 02:25:38 +0000 Subject: [PATCH 07/51] alfaview: 9.5.0 -> 9.7.0 --- .../networking/instant-messengers/alfaview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 69515f82ddf7..f969a3c5163c 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.5.0"; + version = "9.7.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-UQg7yGKdjZWrJpPAaHpPz9aQuxLvuRDXeQaOg7WorwE="; + hash = "sha256-nqIMnMz2FysBOyKpoHXQw9Gl0lmQg5oXmnZDqlPNZ+A="; }; nativeBuildInputs = [ From 09fb5164a191d62488c23b2257130bb9d11ecaa6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Dec 2023 04:47:55 +0000 Subject: [PATCH 08/51] arkade: 0.10.15 -> 0.10.17 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 9c5225eb1b4b..6f5827a7552b 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.10.15"; + version = "0.10.17"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-1r/f3CoTaOA2ZfM9UBGftZDZdCL9JIrs6SvaSO8BI6w="; + hash = "sha256-Ubj2jrQFmMTSY2+Z4pqDIQ+K8JycX+NOpgcuyCrD4uo="; }; CGO_ENABLED = 0; From 90f634616291f83981cd76d4701022c895a05572 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Dec 2023 05:04:20 +0000 Subject: [PATCH 09/51] aseprite: 1.3 -> 1.3.2 --- pkgs/applications/editors/aseprite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 784d4986b207..92d8771383dc 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "aseprite"; - version = "1.3"; + version = "1.3.2"; src = fetchFromGitHub { owner = "aseprite"; repo = "aseprite"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-MSLStUmKAbGKFOQmUcRVrkjZCDglSjTmC6MGWJOCjKU="; + hash = "sha256-8PXqMDf2ATxmtFqyZlGip+DhGrdK8M6Ztte7fGH6Fmo="; }; nativeBuildInputs = [ From 0d6c4e0b314d7a9297d56fcc3348b6613d110b9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Dec 2023 08:18:51 +0000 Subject: [PATCH 10/51] boogie: 3.0.6 -> 3.0.9 --- pkgs/by-name/bo/boogie/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 8355ef00b3e8..0a8fed374b19 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.0.6"; + version = "3.0.9"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-A/nshihI1DxV0mvYYDLPWTNQkuduppxNC7OyWuGNCD8="; + sha256 = "sha256-8hujTiUO62yfv3T/Fu5unTuvJXLGgn9BXoCA2oag3jQ="; }; projectFile = [ "Source/Boogie.sln" ]; From 423bb23f0ca0d2b3c0e555762e0b47b0473b68c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Dec 2023 17:08:09 +0000 Subject: [PATCH 11/51] changie: 1.16.0 -> 1.16.1 --- pkgs/development/tools/changie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index 2aca42bbb262..7679541e4174 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "changie"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-lFe59ITcPJ69x0COV+WlX500Hl96XqWLCz5gJMqX6qQ="; + hash = "sha256-NN/ohZPwgvl1ZUqFI06vKfUYs4KG9dtBKSz76+FR6pM="; }; vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40="; From dad002c322a8a4a697791d6c238d06b518b1c563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Wed, 13 Dec 2023 20:03:55 +0100 Subject: [PATCH 12/51] unison-ucm: M5j -> 0.5.11 --- pkgs/development/compilers/unison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 392a699857a3..75df4243e573 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -11,17 +11,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "M5j"; + version = "0.5.11"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-CDm5a4TR8GfM8QK5mYmEb63PSz469X3R5LaikAcvILI="; + hash = "sha256-e6arK4TpN7CXOZWjlVx0ReI6hz8sEHFMgpl5/S04aEs="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-5H4qOPh2tFgOp+uHNndwwh1K+Wb42Umfl0ok9Ixrlc8="; + hash = "sha256-GlHy2/g64kvKHNltgUOdHrpjt6nFh9gl9KXk4JFrrig="; }; # The tarball is just the prebuilt binary, in the archive root. From 3e92c6f562aa84ce0ca43326aacf9d13af67cf51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Dec 2023 11:53:00 +0000 Subject: [PATCH 13/51] doomretro: 5.0.7 -> 5.1.1 --- pkgs/games/doom-ports/doomretro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/games/doom-ports/doomretro/default.nix index d73ebf88de70..c997af7aa58e 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/games/doom-ports/doomretro/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.0.7"; + version = "5.1.1"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-Jh0NcZRiNrztGTHKKaSXbU2l8zgXsfAVlhBIJ9/sQ3c="; + hash = "sha256-OxnsjY+Czo8nWLSBwPd1HlggPbkogC9l8CVuOyJ/vBo="; }; nativeBuildInputs = [ From 318a5c604c1bba8ee1cc7be86eac2b319c3ef0f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 04:08:00 +0000 Subject: [PATCH 14/51] fvwm3: 1.0.8 -> 1.0.9 --- pkgs/applications/window-managers/fvwm/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix index 611749c7e9b3..31d29af44d80 100644 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ b/pkgs/applications/window-managers/fvwm/3.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fvwm3"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm3"; rev = finalAttrs.version; - hash = "sha256-nIxFoKo2HTF2qCawxN0WySwfjaNqtfBg1BMo0P6ZY88="; + hash = "sha256-SjAccEAQsrzfVCtesqULONmb9TLD5IF8uIwEX3UhrxU="; }; nativeBuildInputs = [ From c93e8f3e628eb71456b10b628c50ec561f01b8fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 07:02:17 +0000 Subject: [PATCH 15/51] doublecmd: 1.1.5 -> 1.1.7 --- pkgs/by-name/do/doublecmd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 048b29d3e0bb..8134e8264354 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.5"; + version = "1.1.7"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-W0WrI58RgAzxV9WiDAqmz800lcU67uk4IFetUR4Embg="; + hash = "sha256-eY8hYstNJ5RMiz3TUfgPFpvKycxTMVaZ6PE69Glxa0I="; }; nativeBuildInputs = [ From b122013b2373776f4d232692a7e9bf6cb5a832d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 11:36:26 +0000 Subject: [PATCH 16/51] go-mockery: 2.36.0 -> 2.38.0 --- pkgs/development/tools/go-mockery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 552b71cc7067..148e814b5568 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.36.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-lJkxN0FtwfuOMCMGEISkZMMKULE5X5kTltIgDm7Ta0Y="; + sha256 = "sha256-fWS4oF/CWlOX6XgeLxsmEfPDDgp1WBSDC4fx2Aid9p0="; }; preCheck = '' @@ -24,7 +24,7 @@ buildGoModule rec { CGO_ENABLED = false; proxyVendor = true; - vendorHash = "sha256-HxxtKtjc1EuONG4bYTZc9i40X6Q75bQzV1Wi6Qb/Id0="; + vendorHash = "sha256-iAZjWRW2TWKqcs94lepkcIXUPyPl9qlGhxlX84rN3ok="; passthru.tests = { generateMock = runCommand "${pname}-test" { From dfa0eb52866b822e7e60c1fad3b8b685d5740efa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 20:13:33 +0000 Subject: [PATCH 17/51] messer-slim: 4.0.1 -> 4.1 --- pkgs/applications/science/biology/messer-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 456e8f42dbac..d4ce4071a274 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.1"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-KC9MbIJi//ZYreoRS+DED8eQW7e4IPvGT+rLI+f7Zrk="; + sha256 = "sha256-mb6xcu28QYAFm2906lRNY0zciQBKSGcz3q/cvOEh/VE="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; From 24b51ca50a343127c7ed396c83c24f093337444c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 09:39:01 +0000 Subject: [PATCH 18/51] octavePackages.ocl: 1.2.1 -> 1.2.2 --- pkgs/development/octave-modules/ocl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix index 6c6d306abd1d..eb20f7dc7c77 100644 --- a/pkgs/development/octave-modules/ocl/default.nix +++ b/pkgs/development/octave-modules/ocl/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "ocl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-NVUefSGv5/l1B7sES7NG1gU8Ms2gfmb8OGxQrhzWlus="; + sha256 = "sha256-ErVMfYkWcdS+UqUH7q7gNQXQwAjrcyiUkWxagAKj3w0="; }; meta = with lib; { From d2a58d52e7dbce020b9e6e4ce087b776de6bff4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 10:46:56 +0000 Subject: [PATCH 19/51] openai: 1.3.7 -> 1.5.0 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3c13e035bf02..903d8181b0a7 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.3.7"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Pa53s3U5vby1Fq14WMCJnSR6KA3xkVHmBexkNoX/0sk="; + hash = "sha256-KLXDzXpT9F/JqA8Jeo8AF/eTD3hHXQQcTrblQJ4BHug="; }; nativeBuildInputs = [ From 20992f16402b6de54a4e7a9b064e2b8de30bcf36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 21:31:28 +0000 Subject: [PATCH 20/51] pocketbase: 0.20.0 -> 0.20.1 --- pkgs/servers/pocketbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 8e24c465fa62..c5ed1ff169f4 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-bVquPokjZn260Xs1EqSRGQY7+gr/qLwVtZkKT8Lc1DM="; + hash = "sha256-dJfQ/y5pMhQZfGLUUpsBZ0tZ1BBjBeIgzcOpyR7We64="; }; vendorHash = "sha256-Y70GNXThSZdG+28/ZQgxXhyZWAtMu0OM97Yhmo0Eigc="; From f87188abaf14f24bd0a23f5ef473d468a53f7a90 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Dec 2023 01:10:37 +0100 Subject: [PATCH 21/51] cmdstan: refactor --- .../development/compilers/cmdstan/default.nix | 68 ++++++++++++------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 8d3e738aa1b4..ad84e13d369e 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, stanc, python3, buildPackages, runtimeShell }: +{ lib +, stdenv +, fetchFromGitHub +, python3 +, stanc +, buildPackages +, runtimeShell +, runCommandCC +, cmdstan +}: stdenv.mkDerivation rec { pname = "cmdstan"; @@ -12,39 +21,43 @@ stdenv.mkDerivation rec { hash = "sha256-c+L/6PjW7YgmXHuKhKjiRofBRAhKYCzFCZ6BOX5AmC4="; }; - nativeBuildInputs = [ stanc ]; - - buildFlags = [ "build" ]; - enableParallelBuilding = true; - - doCheck = true; - nativeCheckInputs = [ python3 ]; - - CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_BOOST_LGAMMA"; - postPatch = '' substituteInPlace stan/lib/stan_math/make/libraries \ --replace "/usr/bin/env bash" "bash" - patchShebangs . - '' + lib.optionalString stdenv.isAarch64 '' - sed -z -i "s/TEST(CommandStansummary, check_console_output).*TEST(CommandStansummary, check_csv_output)/TEST(CommandStansummary, check_csv_output)/" \ - src/test/interface/stansummary_test.cpp ''; + nativeBuildInputs = [ + python3 + stanc + ]; + preConfigure = '' + patchShebangs test-all.sh runCmdStanTests.py stan/ + '' + # Fix inclusion of hardcoded paths in PCH files, by building in the store. + + '' + mkdir -p $out/opt + cp -R . $out/opt/cmdstan + cd $out/opt/cmdstan mkdir -p bin ln -s ${buildPackages.stanc}/bin/stanc bin/stanc ''; - makeFlags = lib.optional stdenv.isDarwin "arch=${stdenv.hostPlatform.darwinArch}"; + makeFlags = [ + "build" + ] ++ lib.optionals stdenv.isDarwin [ + "arch=${stdenv.hostPlatform.darwinArch}" + ]; - checkPhase = '' - ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface - ''; + # Disable inclusion of timestamps in PCH files when using Clang. + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Xclang -fno-pch-timestamp"; + + enableParallelBuilding = true; installPhase = '' - mkdir -p $out/opt $out/bin - cp -r . $out/opt/cmdstan + runHook preInstall + + mkdir -p $out/bin ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary cat > $out/bin/stan < Date: Mon, 18 Dec 2023 06:10:03 +0000 Subject: [PATCH 22/51] nsz: 4.5.0 -> 4.6.0 --- pkgs/development/python-modules/nsz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index 06cb7a9457b1..bd6ff0a05acb 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nsz"; - version = "4.5.0"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nicoboss"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/46qOQEuzSBmnFG0XW4z71HAHpuyqhia29KQkUlDsgg="; + hash = "sha256-2Df+xvfDHtZt3XW4ShKZFsjsFigW+3Avz8uStVtC1i4="; }; propagatedBuildInputs = [ From 6f9c7fb1f82a748a4899ea5ffa6235e492bf7ab0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 05:41:47 +0000 Subject: [PATCH 23/51] earthly: 0.7.22 -> 0.7.23 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 2248484d217d..fee62a7fd981 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.22"; + version = "0.7.23"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-4KZLr5qryaKGJwwtwkiUfoqh01O5ObtHo0Myh8gokYY="; + hash = "sha256-YXfW+O7u97x8YoWLNFSU/OIB9DGsqWEIwUpfvnXySMg="; }; - vendorHash = "sha256-tDA0ciO3Y1o7hfWvBTqf612gWUGLQ0XcNQndGTDo1pY="; + vendorHash = "sha256-Tr9clCUS7T0295Oxe6wvQN0oXCg1G48rzGXBL3R9TYU="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; From d4c7a536c0bc1c74dfd8eedd7cb9c225ba599a39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 08:11:30 +0000 Subject: [PATCH 24/51] leetcode-cli: 0.4.2 -> 0.4.3 --- pkgs/applications/misc/leetcode-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index 4ea55b39c531..0784ff3ddc94 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { pname = "leetcode-cli"; - version = "0.4.2"; + version = "0.4.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Yr8Jsy8863O6saaFRAxssni+PtK7XYe+Iifgxu8Rx6Q="; + sha256 = "sha256-y5zh93WPWSMDXqYangqrxav+sC0b0zpFIp6ZIew6KMo="; }; - cargoHash = "sha256-rab/oLr27UOlnwUUB1RXC/egLoYyzmVtzN1L+AGed8o="; + cargoHash = "sha256-VktDiLsU+GOsa6ba9JJZGEPTavSKp+aSZm2dfhPEqMs="; nativeBuildInputs = [ pkg-config From 387bf0b967220ec3fa38e56abd8dcec61465b5f5 Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Tue, 19 Dec 2023 13:10:44 +0100 Subject: [PATCH 25/51] Revert "maintainer-list: drop gm6k" --- maintainers/maintainer-list.nix | 4 ++++ pkgs/by-name/mi/minetest-mapserver/package.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d487d752094d..31948d66d50b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6766,6 +6766,10 @@ githubId = 1447245; name = "Robin Gloster"; }; + gm6k = { + email = "nix@quidecco.pl"; + name = "Isidor Zeuner"; + }; gmemstr = { email = "git@gmem.ca"; github = "gmemstr"; diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix index 67f16cdea2a1..629a46511f50 100644 --- a/pkgs/by-name/mi/minetest-mapserver/package.nix +++ b/pkgs/by-name/mi/minetest-mapserver/package.nix @@ -23,6 +23,6 @@ buildGoModule rec { changelog = "https://github.com/${pname}/mapserver/releases/tag/v${version}"; license = with licenses; [ mit cc-by-sa-30 ]; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ gm6k ]; }; } From 75684ee6c21838a719cf207726a7e00fc3b770bd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 16 Dec 2023 21:21:00 +0000 Subject: [PATCH 26/51] iwd: fix unit/test-dpp for aarch64-linux (upstream backport) Without the change `iwd` sometimes sends more bytes to encrypt than expected and fails tests on `aarch64-linux`. --- pkgs/os-specific/linux/iwd/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index bea03fc1e8a2..e54916f45901 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -22,13 +22,12 @@ stdenv.mkDerivation rec { hash = "sha256-kE9GBVTKNpgEuE9jQ7k85OhEAN3VWgjmAgifvZfq46I="; }; - # Revert test that's broken on aarch64 - # FIXME: fix this properly patches = [ + # Fix unit/test-dpp on aarch64. (fetchpatch { - url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=aabedeeb6c20c0c053f11ef53413d542442a8f62"; - revert = true; - hash = "sha256-hO4KzdLzW6Tn/4NNJEQO2OvgjSPVl46cwwZfv53R84U="; + name = "size_t-vararg.patch"; + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=688d27700833258a139a6fbd5661334bd2c9fa98"; + hash = "sha256-g3gG1c25o6ODFfHL4a0HcnNJBBOKRbdo+ZuVbzoxCLs="; }) ]; From c8c68e50a5ea392c3ae3f59994275f7f08cfa7d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 13:54:53 +0000 Subject: [PATCH 27/51] python310Packages.folium: 0.15.0 -> 0.15.1 --- pkgs/development/python-modules/folium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 8b29b61fe698..f46220cd7fef 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "folium"; - version = "0.15.0"; + version = "0.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - hash = "sha256-xaz9oelkyS8lWECCmKs8P3mHB3Usv0KMUoh/K7rBnAs="; + hash = "sha256-CHPHxp8xEZhEEMLvhs/xAiOr2Hw6B+5svFNY+QvQa+U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -41,6 +41,7 @@ buildPythonPackage rec { jinja2 numpy requests + xyzservices ]; nativeCheckInputs = [ @@ -50,7 +51,6 @@ buildPythonPackage rec { pillow pytestCheckHook selenium - xyzservices ]; disabledTests = [ From eb5760d61f83df3f75109c74ee275311a59c9bb3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 20 Dec 2023 10:31:53 +0900 Subject: [PATCH 28/51] python311Packages.folium: switch to pypa build --- pkgs/development/python-modules/folium/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index f46220cd7fef..d5384fc221c6 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -12,14 +12,16 @@ , pythonOlder , requests , selenium +, setuptools , setuptools-scm +, wheel , xyzservices }: buildPythonPackage rec { pname = "folium"; version = "0.15.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -33,7 +35,9 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm + wheel ]; propagatedBuildInputs = [ From 4cbd22dee9bb9d1cd3481ca47819943e7130d997 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 02:54:44 +0000 Subject: [PATCH 29/51] python310Packages.hcloud: 1.32.0 -> 1.33.0 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 1e460fa3c7fa..bc8de7d67972 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.32.0"; + version = "1.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vX85fDFNGJ8zJe6YCPn7VFOdvPkT35VbM3Do+cP2b/Y="; + hash = "sha256-xkANXrFG6Tm/fz9Hnutga1q4uw43xaAT1rlmUbTag/g="; }; propagatedBuildInputs = [ From 2d37ce5265576f42b25a218b02e1ecc90b5d9446 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 05:49:26 +0000 Subject: [PATCH 30/51] goredo: 2.5.0 -> 2.6.0 --- pkgs/by-name/go/goredo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix index a1c144508acd..beb62fc1ce8a 100644 --- a/pkgs/by-name/go/goredo/package.nix +++ b/pkgs/by-name/go/goredo/package.nix @@ -9,11 +9,11 @@ buildGoModule rec { pname = "goredo"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; - hash = "sha256-kVxCHXQ9PjaLYviB8sf8oHiFniyNrHMO6C/qSZhjK7k="; + hash = "sha256-XTL/otfCKC55TsUBBVors2kgFpOFh+6oekOOafOhcUs="; }; patches = [ From f67fbb1e6a5d8a9232feb7c09b97d90c7a42e814 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 06:58:31 +0000 Subject: [PATCH 31/51] leo-editor: 6.7.5 -> 6.7.6 --- pkgs/applications/editors/leo-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 94d554abd591..49ac3fa018d2 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.7.5"; + version = "6.7.6"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-Y0g4mpEf4+hApHFHaqB8esVep2OyqWLo7YGLf/7eCYg="; + sha256 = "sha256-AWno/LccMMXZ7Aw4FYQCJSoB3dRRONoT/iex0jPFng0="; }; dontBuild = true; From 7d5c09cbb818f577cf34fc7208a2ebc14c0ebba6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 12:43:47 +0000 Subject: [PATCH 32/51] python310Packages.intellifire4py: 3.5.0 -> 3.6.1 --- pkgs/development/python-modules/intellifire4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 8c7a9f69d50e..620ca2e6e6ee 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "3.5.0"; + version = "3.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lbBQbcVhozca7gYkeUFClS+5WaPaTajQMdfqDL07xdk="; + hash = "sha256-ovJUL8Z98F6gyKG04CoOiQE5dJbp9yTVHcTgniJBvOw="; }; nativeBuildInputs = [ From 15cf1bacec81d3905d40b8005f88bb3ad8dc5a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 20 Dec 2023 03:45:17 +0100 Subject: [PATCH 33/51] treewide: don't use pname for mainProgram where pname is static --- pkgs/applications/backup/proxmox-backup-client/default.nix | 2 +- pkgs/applications/blockchains/lndinit/default.nix | 2 +- pkgs/applications/editors/bluej/default.nix | 2 +- pkgs/applications/editors/greenfoot/default.nix | 2 +- pkgs/applications/misc/chrysalis/default.nix | 2 +- pkgs/applications/misc/tsukae/default.nix | 2 +- pkgs/applications/networking/cluster/k0sctl/default.nix | 2 +- pkgs/applications/window-managers/dwm/dwm-status.nix | 2 +- pkgs/by-name/as/asm-lsp/package.nix | 2 +- pkgs/by-name/aw/aws-gate/package.nix | 2 +- pkgs/by-name/no/nofi/package.nix | 2 +- pkgs/development/interpreters/tinyscheme/default.nix | 2 +- pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 2 +- pkgs/tools/inputmethods/keyd/default.nix | 2 +- pkgs/tools/llm/heygpt/default.nix | 2 +- pkgs/tools/misc/asciinema/default.nix | 2 +- pkgs/tools/misc/etcher/default.nix | 2 +- pkgs/tools/misc/rot8/default.nix | 2 +- pkgs/tools/text/yx/default.nix | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/backup/proxmox-backup-client/default.nix b/pkgs/applications/backup/proxmox-backup-client/default.nix index 77b674d9a1d1..e074c131e39e 100644 --- a/pkgs/applications/backup/proxmox-backup-client/default.nix +++ b/pkgs/applications/backup/proxmox-backup-client/default.nix @@ -150,6 +150,6 @@ rustPlatform.buildRustPackage { license = licenses.agpl3Only; maintainers = with maintainers; [ cofob christoph-heiss ]; platforms = platforms.linux; - mainProgram = pname; + mainProgram = "proxmox-backup-client"; }; } diff --git a/pkgs/applications/blockchains/lndinit/default.nix b/pkgs/applications/blockchains/lndinit/default.nix index 4d982183a36c..839d3402acc4 100644 --- a/pkgs/applications/blockchains/lndinit/default.nix +++ b/pkgs/applications/blockchains/lndinit/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Wallet initializer utility for lnd"; homepage = "https://github.com/lightninglabs/lndinit"; - mainProgram = pname; + mainProgram = "lndinit"; license = licenses.mit; maintainers = with maintainers; [aldoborrero]; }; diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index a90cfba529fb..32dc84f33a69 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://www.bluej.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; - mainProgram = pname; + mainProgram = "bluej"; maintainers = with maintainers; [ chvp ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index cc195fbeb116..4a3ae555f21e 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://www.greenfoot.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; - mainProgram = pname; + mainProgram = "greenfoot"; maintainers = [ maintainers.chvp ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index bb445422d030..0852e886c54b 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -44,6 +44,6 @@ in appimageTools.wrapType2 rec { license = licenses.gpl3Only; maintainers = with maintainers; [ aw ]; platforms = [ "x86_64-linux" ]; - mainProgram = pname; + mainProgram = "chrysalis"; }; } diff --git a/pkgs/applications/misc/tsukae/default.nix b/pkgs/applications/misc/tsukae/default.nix index 0a01758b2c47..fcd211769677 100644 --- a/pkgs/applications/misc/tsukae/default.nix +++ b/pkgs/applications/misc/tsukae/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { description = "Show off your most used shell commands."; homepage = "https://github.com/irevenko/tsukae"; license = licenses.mit; - mainProgram = pname; + mainProgram = "tsukae"; maintainers = with maintainers; [ l3af ]; }; } diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 2d0854ba365e..05294c0d437b 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -41,7 +41,7 @@ buildGo121Module rec { description = "A bootstrapping and management tool for k0s clusters."; homepage = "https://k0sproject.io/"; license = licenses.asl20; - mainProgram = pname; + mainProgram = "k0sctl"; maintainers = with maintainers; [ nickcao qjoly ]; }; } diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 424528e9c1aa..1d5f84abe288 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Gerschtli/dwm-status/blob/master/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; - mainProgram = pname; + mainProgram = "dwm-status"; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 19dcf84116dc..b68123dd42b1 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/bergercookie/asm-lsp"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ NotAShelf ]; - mainProgram = pname; + mainProgram = "asm-lsp"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/aw/aws-gate/package.nix b/pkgs/by-name/aw/aws-gate/package.nix index b1606d3db080..77e56026665d 100644 --- a/pkgs/by-name/aw/aws-gate/package.nix +++ b/pkgs/by-name/aw/aws-gate/package.nix @@ -50,6 +50,6 @@ python3Packages.buildPythonApplication rec { license = licenses.bsd3; maintainers = with maintainers; [ tirimia ]; platforms = with platforms; linux ++ darwin; - mainProgram = pname; + mainProgram = "aws-gate"; }; } diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix index d1b39b789600..8418a30e6541 100644 --- a/pkgs/by-name/no/nofi/package.nix +++ b/pkgs/by-name/no/nofi/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ellsclytn/nofi/"; changelog = "https://github.com/ellsclytn/nofi/raw/v${version}/CHANGELOG.md"; license = [ licenses.asl20 /* or */ licenses.mit ]; - mainProgram = pname; + mainProgram = "nofi"; maintainers = [ maintainers.magnetophon ]; }; } diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index fef3f5daceeb..e22f74c40599 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://tinyscheme.sourceforge.net/"; changelog = "https://tinyscheme.sourceforge.net/CHANGES"; license = licenses.bsdOriginal; - mainProgram = pname; + mainProgram = "tinyscheme"; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 03ad03a472d4..dcdd22044e2a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; maintainers = with maintainers; [ abbradar ]; - mainProgram = pname; + mainProgram = "nvidia-persistenced"; }; } diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix index 95eb1a2339a9..a059be9a0f9d 100644 --- a/pkgs/tools/inputmethods/keyd/default.nix +++ b/pkgs/tools/inputmethods/keyd/default.nix @@ -37,7 +37,7 @@ let install -Dm555 -t $out/bin scripts/${pname} ''; - meta.mainProgram = pname; + meta.mainProgram = "keyd-application-mapper"; }; in diff --git a/pkgs/tools/llm/heygpt/default.nix b/pkgs/tools/llm/heygpt/default.nix index db11d391d7a1..e371673739fa 100644 --- a/pkgs/tools/llm/heygpt/default.nix +++ b/pkgs/tools/llm/heygpt/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { description = "A simple command-line interface for ChatGPT API."; homepage = "https://github.com/fuyufjh/heygpt"; license = licenses.mit; - mainProgram = pname; + mainProgram = "heygpt"; maintainers = with maintainers; [aldoborrero]; }; } diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 2643cdd474b3..ff8d6cd4b1e5 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -40,6 +40,6 @@ python3Packages.buildPythonApplication rec { license = with lib.licenses; [ gpl3Plus ]; maintainers = with lib.maintainers; [ eclairevoyant ]; platforms = lib.platforms.all; - mainProgram = pname; + mainProgram = "asciinema"; }; } diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index af9d5d6470d2..4b27f35cf53c 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "Flash OS images to SD cards and USB drives, safely and easily"; homepage = "https://etcher.io/"; license = licenses.asl20; - mainProgram = pname; + mainProgram = "etcher"; maintainers = with maintainers; [ wegank ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/tools/misc/rot8/default.nix b/pkgs/tools/misc/rot8/default.nix index aa4d925f5aed..6a62d05b5a5d 100644 --- a/pkgs/tools/misc/rot8/default.nix +++ b/pkgs/tools/misc/rot8/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/efernau/rot8"; license = licenses.mit; maintainers = [ maintainers.smona ]; - mainProgram = pname; + mainProgram = "rot8"; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/yx/default.nix b/pkgs/tools/text/yx/default.nix index bff2b955fb42..629cf442c48b 100644 --- a/pkgs/tools/text/yx/default.nix +++ b/pkgs/tools/text/yx/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ twz123 ]; - mainProgram = pname; + mainProgram = "yx"; }; } From 175bd3f587eaec79f0a19d8913f89afff1ce0a3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Dec 2023 14:51:53 +0100 Subject: [PATCH 34/51] python311Packages.shodan: 1.30.1 -> 1.31.0 Changelog: https://github.com/achillean/shodan-python/blob/1.31.0/CHANGELOG.md --- pkgs/development/python-modules/shodan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 0c4b1afb930c..29fc4789d177 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.30.1"; + version = "1.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vttujCtEWVksG8F7TUtX2rDLWKRVrVie4mpjBCQs1QU="; + hash = "sha256-xzJ1OG6gI5DhlsNcZgcGoo3U1TfFoh6zh6tiNvrCUfY="; }; propagatedBuildInputs = [ From 6734f4475e1b28c9a7b7269bdedadd4f9f2d44bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 13:59:43 +0000 Subject: [PATCH 35/51] python310Packages.jupyter-server-fileid: 0.9.0 -> 0.9.1 --- .../python-modules/jupyter-server-fileid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server-fileid/default.nix b/pkgs/development/python-modules/jupyter-server-fileid/default.nix index 4ef40134152d..f58197b30bef 100644 --- a/pkgs/development/python-modules/jupyter-server-fileid/default.nix +++ b/pkgs/development/python-modules/jupyter-server-fileid/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jupyter-server-fileid"; - version = "0.9.0"; + version = "0.9.1"; disables = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jupyter-server"; repo = "jupyter_server_fileid"; rev = "refs/tags/v${version}"; - hash = "sha256-3dwj8GV0FmbhSsC2uWOLcU5ofrvBBGJ/2F/noFh4RCU="; + hash = "sha256-rEjrfioAmqijyObiK7CMLWhLqVpfcmNYhjdjKjkMp6s="; }; nativeBuildInputs = [ From ccef392fae92ab5ba71594edc48f3e2627e1b37d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Dec 2023 15:01:17 +0100 Subject: [PATCH 36/51] python311Packages.niapy: 2.0.5 -> 2.1.0 Diff: https://github.com/NiaOrg/NiaPy/compare/refs/tags/2.0.5...2.1.0 Changelog: https://github.com/NiaOrg/NiaPy/releases/tag/2.1.0 --- pkgs/development/python-modules/niapy/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index b0748f64b805..c05c0fb25a74 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -5,14 +5,15 @@ , numpy , openpyxl , pandas +, poetry-core , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "niapy"; - version = "2.0.5"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,9 +21,13 @@ buildPythonPackage rec { owner = "NiaOrg"; repo = "NiaPy"; rev = "refs/tags/${version}"; - hash = "sha256-qstTxUo4jZ8YKbEjtDtSZUvR67VNkBQJdXeERJPOMDw="; + hash = "sha256-cT5CU1r3LZ9ValJwRUA0PaISmF6kXAz40alXbWYogGA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ matplotlib numpy From 4d7a20fefe49ac9f4699f300853a350fa0049fe5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Dec 2023 15:05:05 +0100 Subject: [PATCH 37/51] python311Packages.sqlmodel: 0.0.12 -> 0.0.14 Changelog: https://github.com/tiangolo/sqlmodel/releases/tag/0.0.14 --- pkgs/development/python-modules/sqlmodel/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix index 5b7449d4a796..26a0c7f5c907 100644 --- a/pkgs/development/python-modules/sqlmodel/default.nix +++ b/pkgs/development/python-modules/sqlmodel/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, dirty-equals , fastapi , fetchFromGitHub , poetry-core @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "sqlmodel"; - version = "0.0.12"; + version = "0.0.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "sqlmodel"; rev = "refs/tags/${version}"; - hash = "sha256-ER8NGDcCCCXT8lsm8fgJUaLyjdf5v2/UdrBw5T9EeXQ="; + hash = "sha256-EEOS7c0ospo7qjqPQkKwYXeVmBR5DueONzmjspV6w7w="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + dirty-equals fastapi pytest-asyncio pytestCheckHook @@ -45,7 +47,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Coverage - "tests/test_tutorial/test_create_db_and_table/test_tutorial001.py" + "docs_src/tutorial/" + "tests/test_tutorial/" ]; meta = with lib; { From fd0d3d68cd75cf38856a76379b9c912526fb33e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 14:12:15 +0000 Subject: [PATCH 38/51] python310Packages.k-diffusion: 0.1.1 -> 0.1.1.post1 --- pkgs/development/python-modules/k-diffusion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/k-diffusion/default.nix b/pkgs/development/python-modules/k-diffusion/default.nix index 4a2c6f0a1d32..8393bc6309f0 100644 --- a/pkgs/development/python-modules/k-diffusion/default.nix +++ b/pkgs/development/python-modules/k-diffusion/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "k-diffusion"; - version = "0.1.1"; + version = "0.1.1.post1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "crowsonkb"; repo = "k-diffusion"; rev = "refs/tags/v${version}"; - hash = "sha256-ef4NhViHQcV+4T+GXpg+Qev5IC0Cid+XWE3sFVx7w4w="; + hash = "sha256-x/UHzobQv5ov0luUHqC8OA5YbtF+aWL39/SQtzTm0RM="; }; propagatedBuildInputs = [ From eb265b37c2fc2a8a6563b11985e07639ff372f32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Dec 2023 15:43:55 +0100 Subject: [PATCH 39/51] python311Packages.intellifire4py: update changelog entry --- .../python-modules/intellifire4py/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 620ca2e6e6ee..15045b4695c4 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jeeftor"; - repo = pname; + repo = "intellifire4py"; rev = "refs/tags/v${version}"; hash = "sha256-ovJUL8Z98F6gyKG04CoOiQE5dJbp9yTVHcTgniJBvOw="; }; @@ -37,19 +37,20 @@ buildPythonPackage rec { rich ]; - pythonImportsCheck = [ - "intellifire4py" - ]; nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook ]; + pythonImportsCheck = [ + "intellifire4py" + ]; + meta = with lib; { description = "Module to read Intellifire fireplace status data"; homepage = "https://github.com/jeeftor/intellifire4py"; - changelog = "https://github.com/jeeftor/intellifire4py/blob/${version}/CHANGELOG"; + changelog = "https://github.com/jeeftor/intellifire4py/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 20460837bd552d3845f32dafe5ed62c219630dc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 15:25:42 +0000 Subject: [PATCH 40/51] python310Packages.labelbox: 3.57.0 -> 3.58.1 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 2c10a95ca5d1..d79aba465eee 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.57.0"; + version = "3.58.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-pAJGgkIWBjBF+9aWGhAz+QZtSiOlip3SIYI4nRQj/oQ="; + hash = "sha256-H6fn+TpfYbu/warhr9XcQjfxSThIjBp9XwelA5ZvTBE="; }; postPatch = '' From 354f5a4c8fd4a920f1d44b101222986eda01ade6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 15:28:32 +0000 Subject: [PATCH 41/51] python310Packages.langsmith: 0.0.69 -> 0.0.72 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 78337124ca8f..888147b4b571 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.69"; + version = "0.0.72"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-LP97bGCmLw2uFcFdFcDWM7hSuki7r7T6WFHI6i3rF34="; + hash = "sha256-o7KERA+fYo69jR8LSsa901nE1r3GD38rYO7sj0QsOgM="; }; sourceRoot = "${src.name}/python"; From 627158b1c9ce99a57479b7da24ba5f2eca030627 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 16:40:12 +0100 Subject: [PATCH 42/51] linux_5_15: 5.15.143 -> 5.15.144 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 8a553b1f227c..09d8aaa9caab 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:1qc4cwqlfni9i6mzh6arghdsd842hp9lb7s832dxw1p261mg4prn" }, "5.15": { - "version": "5.15.143", - "hash": "sha256:00lyv7zsj97mkg9i7dkb1a6km22mnr0qr687d9zz4ckjq1pb2sq9" + "version": "5.15.144", + "hash": "sha256:0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh" }, "5.10": { "version": "5.10.204", From f5b0d443580f7df7037ef160b29e77fa79a60558 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 16:40:19 +0100 Subject: [PATCH 43/51] linux_5_10: 5.10.204 -> 5.10.205 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 09d8aaa9caab..072fd80b0c92 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh" }, "5.10": { - "version": "5.10.204", - "hash": "sha256:1vnamiyr378q52xgkg7kvpx80zck729dim77vp06a3q6n580g5gz" + "version": "5.10.205", + "hash": "sha256:0qw8g0h4k0b4dyvspbj51cwr68ihwjzsi2b2261ipy3l1nl1fln5" }, "5.4": { "version": "5.4.264", From b909f817cddc78f8922c4c241692a6f48550b920 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 16:40:28 +0100 Subject: [PATCH 44/51] linux_5_4: 5.4.264 -> 5.4.265 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 072fd80b0c92..4ebc501cdc40 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0qw8g0h4k0b4dyvspbj51cwr68ihwjzsi2b2261ipy3l1nl1fln5" }, "5.4": { - "version": "5.4.264", - "hash": "sha256:1c5n47dq9khb15hz24a000k3hj913vv1dda6famnm8wpjbfr176k" + "version": "5.4.265", + "hash": "sha256:05cvvwjiznn7hfd02qklklalg0chahvh5v18w64lcva6kzj9kbjd" }, "4.19": { "version": "4.19.302", From 32e35d09e38d952a40238b000c4aacdce7b24c28 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 16:40:35 +0100 Subject: [PATCH 45/51] linux_4_19: 4.19.302 -> 4.19.303 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 4ebc501cdc40..550962a39bdb 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:05cvvwjiznn7hfd02qklklalg0chahvh5v18w64lcva6kzj9kbjd" }, "4.19": { - "version": "4.19.302", - "hash": "sha256:1kkkpm34p5rq0iijzrzwaq0cb62w543argargw5p1wzg8803rlsk" + "version": "4.19.303", + "hash": "sha256:0dlbl47xs7z4yf9cxbxqzd7zs1f9070jr6ck231wgppa6lwwwb82" }, "4.14": { "version": "4.14.333", From 803f9dc0588621ddd0b11d48443e4120f1691d56 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 16:40:43 +0100 Subject: [PATCH 46/51] linux_4_14: 4.14.333 -> 4.14.334 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 550962a39bdb..e10215142aa1 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:0dlbl47xs7z4yf9cxbxqzd7zs1f9070jr6ck231wgppa6lwwwb82" }, "4.14": { - "version": "4.14.333", - "hash": "sha256:0j5nrankrhi56qzmyjg1pznqx1zgk5f7cfa154smjbn3zlm7lcv6" + "version": "4.14.334", + "hash": "sha256:0iaaqdkszmfarvjfszc9rf7y9zsv3w82934xmvmzmsbiz86547ca" }, "6.6": { "version": "6.6.7", From f29d0e8cb6ff32146a5539fa4ae7ec5790d1e7b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 16:17:41 +0000 Subject: [PATCH 47/51] python310Packages.limnoria: 2023.9.24 -> 2023.11.18 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 0cc2d73d969b..b791095ed68d 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2023.9.24"; + version = "2023.11.18"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VJXIuGcgwAEObCCah+yc/o3IEpe4ln5F4wVwCy54Auc="; + hash = "sha256-Ftm5OGTt1emQsYso3hAUA9yMNBkIK5jybdFaRKJJk0o="; }; propagatedBuildInputs = [ From d2df37e211d21db71b34e97085ec00ae36c90e08 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 17:47:25 +0100 Subject: [PATCH 48/51] linux_6_6: 6.6.7 -> 6.6.8 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e10215142aa1..d11a0b2d6574 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,7 +32,7 @@ "hash": "sha256:0iaaqdkszmfarvjfszc9rf7y9zsv3w82934xmvmzmsbiz86547ca" }, "6.6": { - "version": "6.6.7", - "hash": "sha256:0hfqdyxl4nqmm4pspfm1ang8616dbsaj0d968c0186ch0738xrhc" + "version": "6.6.8", + "hash": "sha256:05i4ayj9wyjkd1s8ixx7bxwcyagqyx8rhj1zvbc3cjqyw4sc8djh" } } From 0e0566d0be5e54590414fb1ddd22919e236580ac Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 17:47:46 +0100 Subject: [PATCH 49/51] linux_6_1: 6.1.68 -> 6.1.69 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index d11a0b2d6574..bddd68d46ae4 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq" }, "6.1": { - "version": "6.1.68", - "hash": "sha256:1qc4cwqlfni9i6mzh6arghdsd842hp9lb7s832dxw1p261mg4prn" + "version": "6.1.69", + "hash": "sha256:0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby" }, "5.15": { "version": "5.15.144", From e93fba74a28b60122a543b466b0d39a7743b5ea0 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Wed, 22 Nov 2023 18:20:56 +0100 Subject: [PATCH 50/51] srm-cuarzo: init at 0.4.0-1 --- pkgs/by-name/sr/srm-cuarzo/package.nix | 62 ++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/sr/srm-cuarzo/package.nix diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix new file mode 100644 index 000000000000..9e04a71d469b --- /dev/null +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, libdisplay-info +, libdrm +, libGL +, libinput +, mesa +, seatd +, udev +}: +stdenv.mkDerivation (self: { + pname = "srm-cuarzo"; + version = "0.4.0-1"; + rev = "v${self.version}"; + hash = "sha256-PWtDSBYw62sfyN2lpd7NY8SbqDrt5IN1rdLZRtDfals="; + + src = fetchFromGitHub { + inherit (self) rev hash; + owner = "CuarzoSoftware"; + repo = "SRM"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + libdisplay-info + libdrm + libGL + libinput + mesa + seatd + udev + ]; + + outputs = [ "out" "dev" ]; + + postPatch = '' + substituteInPlace src/meson.build \ + --replace "/usr/include/drm" "${libdrm.dev}/include/drm" \ + --replace "/usr/include/libdrm" "${libdrm.dev}/include/libdrm" + ''; + + preConfigure = '' + # The root meson.build file is in src/ + cd src + ''; + + meta = { + description = "Simple Rendering Manager"; + homepage = "https://github.com/CuarzoSoftware/SRM"; + maintainers = [ lib.maintainers.dblsaiko ]; + platforms = lib.platforms.linux; + }; +}) From a5bd05ad09b6b32d6494b96217099a6c28fefac6 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Wed, 22 Nov 2023 18:21:08 +0100 Subject: [PATCH 51/51] louvre: init at 1.1.0-1 --- pkgs/by-name/lo/louvre/package.nix | 73 ++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pkgs/by-name/lo/louvre/package.nix diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix new file mode 100644 index 000000000000..a6445fad4347 --- /dev/null +++ b/pkgs/by-name/lo/louvre/package.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, fontconfig +, icu +, libdrm +, libGL +, libinput +, libX11 +, libXcursor +, libxkbcommon +, mesa +, pixman +, seatd +, srm-cuarzo +, udev +, wayland +, xorgproto +}: +stdenv.mkDerivation (self: { + pname = "louvre"; + version = "1.1.0-1"; + rev = "v${self.version}"; + hash = "sha256-HwvX0ykl2+4MBcIixmEknFtsB0QC4w1QDzQz1589bl0="; + + src = fetchFromGitHub { + inherit (self) rev hash; + owner = "CuarzoSoftware"; + repo = "Louvre"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + fontconfig + icu + libdrm + libGL + libinput + libX11 + libXcursor + libxkbcommon + mesa + pixman + seatd + srm-cuarzo + udev + wayland + xorgproto + ]; + + outputs = [ "out" "dev" ]; + + preConfigure = '' + # The root meson.build file is in src/ + cd src + ''; + + meta = { + description = "C++ library for building Wayland compositors"; + homepage = "https://github.com/CuarzoSoftware/Louvre"; + mainProgram = "louvre-views"; + maintainers = [ lib.maintainers.dblsaiko ]; + platforms = lib.platforms.linux; + }; +})