From 01649bd81cfcd13d7ffc869de139802a8c84a2d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 07:41:46 +0000 Subject: [PATCH 01/19] directx-shader-compiler: 1.7.2308 -> 1.8.2405 --- pkgs/tools/graphics/directx-shader-compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix index 1bd0293f39b5..6e30baaf74a8 100644 --- a/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "directx-shader-compiler"; - version = "1.7.2308"; + version = "1.8.2405"; # Put headers in dev, there are lot of them which aren't necessary for # using the compiler binary. @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "microsoft"; repo = "DirectXShaderCompiler"; rev = "v${version}"; - hash = "sha256-pfdAD+kRpmqW29Y8jn6+X5Ujy/9cIvisYr0tH1PuxsY="; + hash = "sha256-p1sQcKWSQo0VU1JwB7J0eqT85CzNWxAMqC4HZ95NySg="; fetchSubmodules = true; }; From 9e2b80d4de1dcd0aae81df33216666e1dc9e5cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 2 Jun 2024 18:42:02 -0400 Subject: [PATCH 02/19] quickemu: format with nixfmt-rfc-style --- pkgs/by-name/qu/quickemu/package.nix | 71 +++++++++++++++------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix index 9280eaa99007..664da83ba62b 100644 --- a/pkgs/by-name/qu/quickemu/package.nix +++ b/pkgs/by-name/qu/quickemu/package.nix @@ -1,32 +1,33 @@ -{ lib -, fetchFromGitHub -, stdenv -, makeWrapper -, cdrtools -, curl -, gawk -, gnugrep -, gnused -, jq -, ncurses -, pciutils -, procps -, python3 -, qemu -, socat -, spice-gtk -, swtpm -, usbutils -, util-linux -, unzip -, xdg-user-dirs -, xrandr -, zsync -, OVMF -, OVMFFull -, quickemu -, testers -, installShellFiles +{ + lib, + fetchFromGitHub, + stdenv, + makeWrapper, + cdrtools, + curl, + gawk, + gnugrep, + gnused, + jq, + ncurses, + pciutils, + procps, + python3, + qemu, + socat, + spice-gtk, + swtpm, + usbutils, + util-linux, + unzip, + xdg-user-dirs, + xrandr, + zsync, + OVMF, + OVMFFull, + quickemu, + testers, + installShellFiles, }: let runtimePaths = [ @@ -52,7 +53,7 @@ let ]; in -stdenv.mkDerivation (finalAttrs : { +stdenv.mkDerivation (finalAttrs: { pname = "quickemu"; version = "4.9.4"; @@ -72,7 +73,10 @@ stdenv.mkDerivation (finalAttrs : { quickemu ''; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; installPhase = '' runHook preInstall @@ -98,6 +102,9 @@ stdenv.mkDerivation (finalAttrs : { homepage = "https://github.com/quickemu-project/quickemu"; mainProgram = "quickemu"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fedx-sudo flexiondotorg ]; + maintainers = with lib.maintainers; [ + fedx-sudo + flexiondotorg + ]; }; }) From 1fe0639a8bf30c22f2ca2e33a77576e4055b5231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 2 Jun 2024 18:45:43 -0400 Subject: [PATCH 03/19] quickemu: decrease windows ram requirements --- pkgs/by-name/qu/quickemu/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix index 664da83ba62b..b650ef91f88e 100644 --- a/pkgs/by-name/qu/quickemu/package.nix +++ b/pkgs/by-name/qu/quickemu/package.nix @@ -28,6 +28,7 @@ quickemu, testers, installShellFiles, + fetchpatch2, }: let runtimePaths = [ @@ -73,6 +74,16 @@ stdenv.mkDerivation (finalAttrs: { quickemu ''; + patches = [ + # reduces windows vm ram requirements to 4G, to match microsoft recommendations + # TODO: remove on next release + (fetchpatch2 { + name = "decrease-windows-ram-requirements.patch"; + url = "https://github.com/quickemu-project/quickemu/commit/f51697593a4650c5486661292e2febe1d16f8c71.patch"; + hash = "sha256-J5hIvQGtkufOcjk2FZN65iox/W2zkLlg+Veg9TF11Fs="; + }) + ]; + nativeBuildInputs = [ makeWrapper installShellFiles From 831bdcb97432536391e3a6ccab6b1c6c8649f374 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jun 2024 04:20:13 +0000 Subject: [PATCH 04/19] sdrangel: 7.21.1 -> 7.21.2 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 9509c47c1583..94758e9b00e6 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.21.1"; + version = "7.21.2"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-l80CgR8Io4HlSuUU3HWM1sInKSRH+F0N55CIWdu/tao="; + hash = "sha256-cFSD3zroKJPJk1mhXLnSDoSS6p9AU6YN2LJpb+E6HDI="; }; nativeBuildInputs = [ From edcdf6ad3b6534ee5a848db43b8601824d930977 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 10 Jun 2024 22:16:20 +0200 Subject: [PATCH 05/19] nixos/freshrss: fix reload when config changes --- nixos/modules/services/web-apps/freshrss.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 77c5ecb24617..1035c961c02c 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -255,13 +255,10 @@ in { description = "Set up the state directory for FreshRSS before use"; wantedBy = [ "multi-user.target" ]; - serviceConfig = defaultServiceConfig //{ - Type = "oneshot"; - User = "freshrss"; - Group = "freshrss"; - StateDirectory = "freshrss"; - WorkingDirectory = cfg.package; + serviceConfig = defaultServiceConfig // { + RemainAfterExit = true; }; + restartIfChanged = true; environment = { DATA_PATH = cfg.dataDir; }; @@ -299,7 +296,7 @@ in environment = { DATA_PATH = cfg.dataDir; }; - serviceConfig = defaultServiceConfig //{ + serviceConfig = defaultServiceConfig // { ExecStart = "${cfg.package}/app/actualize_script.php"; }; }; From 5a8e780abcd8280fc15e377cf2c78175905e3dad Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Mon, 10 Jun 2024 15:20:08 -0700 Subject: [PATCH 06/19] vimPlugins.nvim-genghis: init at 2024-05-21 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++++ .../editors/vim/plugins/vim-plugin-names | 5 +++++ 3 files changed, 25 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 803b5b1211f1..9a19115e98c0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -17418,4 +17418,17 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; + nvim-genghis = buildVimPlugin { + pname = "nvim-genghis"; + version = "2024-05-21"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "nvim-genghis"; + rev = "7ed82d0d0513946bbc678f326e5750c79a942351"; + sha256 = "sha256-R3YHrcpRJ8bbVctKTWQbouyCYcbKpQ2Sz6NWDOkqLYI="; + }; + meta.homepage = "https://github.com/chrisgrieser/nvim-genghis"; + }; + + } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 18b91a24bb28..f9c3cc0a0bc8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1042,6 +1042,13 @@ nvimRequireCheck = "dapui"; }; + nvim-genghis = super.nvim-genghis.overrideAttrs { + dependencies = [ self.dressing-nvim ]; + + doInstallCheck = true; + nvimRequireCheck = "genghis"; + }; + nvim-lsputils = super.nvim-lsputils.overrideAttrs { dependencies = with self; [ popfix ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2336e0441b55..76a1bc2a3604 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1,4 +1,5 @@ repo,branch,alias +https://codeberg.org/FelipeLema/cmp-async-path/,, https://github.com/euclidianAce/BetterLua.vim/,, https://github.com/vim-scripts/BufOnly.vim/,, https://github.com/jackMort/ChatGPT.nvim/,HEAD, @@ -131,8 +132,11 @@ https://github.com/laytan/cloak.nvim/,HEAD, https://github.com/asheq/close-buffers.vim/,HEAD, https://github.com/Civitasv/cmake-tools.nvim/,, https://github.com/winston0410/cmd-parser.nvim/,, +<<<<<<< HEAD https://github.com/tzachar/cmp-ai/,HEAD, https://codeberg.org/FelipeLema/cmp-async-path/,, +======= +>>>>>>> 8c49439301ad (vimPlugins.nvim-genghis: init at 2024-05-21) https://github.com/crispgm/cmp-beancount/,HEAD, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, @@ -657,6 +661,7 @@ https://github.com/allendang/nvim-expand-expr/,, https://github.com/vijaymarupudi/nvim-fzf/,, https://github.com/vijaymarupudi/nvim-fzf-commands/,, https://github.com/sakhnik/nvim-gdb/,, +https://github.com/chrisgrieser/nvim-genghis/,HEAD, https://github.com/smiteshp/nvim-gps/,, https://github.com/brenoprata10/nvim-highlight-colors/,HEAD, https://github.com/Iron-E/nvim-highlite/,, From 1a19d3af33b7185173263748d23b6a08207e8f9d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Jun 2024 01:24:36 +0200 Subject: [PATCH 07/19] evcc: 0.126.5 -> 0.127.0 https://github.com/evcc-io/evcc/releases/tag/0.127.0 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index d6c8fcb83688..a54b8b59f94e 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -21,20 +21,20 @@ in buildGoModule rec { pname = "evcc"; - version = "0.126.5"; + version = "0.127.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-hw8DImLXFwTEAyPEFUVnyNPXrQTfEk7OOk+w/izJz9s="; + hash = "sha256-Kvpi9HE7dr3StLEihJDF5z1fQELsOv0/5jLLmEEtOJ8="; }; - vendorHash = "sha256-gfKJiZ7wSFWEEB/UCAbH18jdZdgG/58q3Yj0FQqMH8E="; + vendorHash = "sha256-MdfLJpPEi6Cr34W6eJSraKJwBPtR66HM2tJIbPE9mZs="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-ghDLmsmcG+qDItiqaZy8MTYw/AU58bZfUzYY32XKNyk="; + hash = "sha256-6Dxf32myqRbKIlYFcQhkuqZVz+lVvmeJ5lqiWPCQAzA="; }; nativeBuildInputs = [ From a2395a2e722fb106c1ea977dd2aef84fc0699dc2 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 13 Jun 2024 01:34:44 +0200 Subject: [PATCH 08/19] magnetico: fix build --- .../networking/p2p/magnetico/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index 6c09ae892e27..f3579c494ba8 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -1,10 +1,12 @@ { lib , fetchFromGitHub +, fetchpatch , nixosTests , buildGoModule +, sqlite }: -buildGoModule rec { +buildGoModule { pname = "magnetico"; version = "unstable-2022-08-10"; @@ -12,10 +14,20 @@ buildGoModule rec { owner = "ireun"; repo = "magnetico"; rev = "828e230d3b3c0759d3274e27f5a7b70400f4d6ea"; - sha256 = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; + hash = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; }; - vendorHash = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU="; + patches = [ + # https://github.com/ireun/magnetico/pull/15 + (fetchpatch { + url = "https://github.com/ireun/magnetico/commit/90db34991aa44af9b79ab4710c638607c6211c1c.patch"; + hash = "sha256-wC9lVQqfngQ5AaRgb4TtoWSgbQ2iSHeQ2UBDUyWjMK8="; + }) + ]; + + vendorHash = "sha256-JDrBXjnQAcWp8gKvnm+q1F5oV+FozKUvhHK/Me/Cyj8="; + + buildInputs = [ sqlite ]; buildPhase = '' runHook preBuild @@ -26,18 +38,16 @@ buildGoModule rec { ''; checkPhase = '' - runHook preBuild + runHook preCheck make test - runHook postBuild + runHook postCheck ''; passthru.tests = { inherit (nixosTests) magnetico; }; meta = with lib; { - # Build fails with Go >=1.21, couldn't be fixed by updating module dependencies. - broken = true; description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; homepage = "https://github.com/ireun/magnetico"; license = licenses.agpl3Only; From 377053a7161cc92b1e4dc889747c7171e9502514 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 02:35:45 +0000 Subject: [PATCH 09/19] python311Packages.openai: 1.33.0 -> 1.34.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 c1af50e582de..82688e240206 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.33.0"; + version = "1.34.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-vnIkShEi5ilcrf4DhP33mKijFgb3bfIxoO6vt5VL1MM="; + hash = "sha256-ES0lA/eMll35MhL1evegyp5VOIdHPTRF1Jckl+n250E="; }; build-system = [ From 25765e4bf26d23078011a83508573380c1ce684e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 13:35:35 +0000 Subject: [PATCH 10/19] fnm: 1.37.0 -> 1.37.1 --- pkgs/development/tools/fnm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 010f95e76ddc..7b521856a3e8 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.37.0"; + version = "1.37.1"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ruEv46jzO79l2Nvs3UjWHal2lBmhjdIKC99va/2cGio="; + sha256 = "sha256-x6w2g7U/FbJBycMAF4PUyaoIazp/w6imIpy+N7Cf0qk="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoHash = "sha256-ez6rzmVa/eRcd4bdCM4JEaNILpavub34kaonX4BRjW8="; + cargoHash = "sha256-b15m5DjTDNWJBHOaKSEMwkO/o+0mV+JMBDBurml7xOs="; doCheck = false; From d7d3e88bce755ac882782da8d081ac1cb9809aa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 13:48:23 +0000 Subject: [PATCH 11/19] konstraint: 0.36.0 -> 0.37.0 --- pkgs/development/tools/konstraint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index cc9845219be7..f2f9e0340481 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GQ79xsvlRDwrthtYgykwAJLP9rkk5iNHGelWAQzOZoA="; + sha256 = "sha256-poIXY4++nv2bCkcHdZHb0dRa5NVxsw9Vmg7nMVh1ocI="; }; - vendorHash = "sha256-EBlJCcF8UcstaD1ztaAFL4MSfBOYvpeUygzXnQbW8N8="; + vendorHash = "sha256-0V8B/w4K3r23tINDfjLAKe5wMpJ+8uiF4nCMr062pb0="; # Exclude go within .github folder excludedPackages = ".github"; From 42519bf8d4acaf2636ad2a4c7c9d817866958c46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 15:18:24 +0000 Subject: [PATCH 12/19] swego: 1.1 -> 1.12 --- pkgs/servers/swego/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index b8362d2d8675..a44664809944 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "swego"; - version = "1.1"; + version = "1.12"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "refs/tags/v${version}"; - hash = "sha256-O/wczHyaMev0CpAXoDxiN7TtHDsthG+jaH31SPMEB34="; + hash = "sha256-roaAzh6Mncu4qtaxEoXk41Mrmz/l7X1+n+Yh5skA65A="; }; vendorHash = "sha256-mJWJdwbZq042//hM3WWp2rnLC1GebckUnsIopbF858Q="; From 0894cda89cb984301b99b085bdf18680c9ae0713 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 15:53:41 +0000 Subject: [PATCH 13/19] rbspy: 0.21.0 -> 0.22.0 --- pkgs/development/tools/rbspy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 10b84ccaf9b6..b37f745e6808 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; rev = "refs/tags/v${version}"; - hash = "sha256-FnnpMin0hDNjQ/CpTBme4RUrp7+A5FH1DkQ8FcqwK7Q="; + hash = "sha256-MZ6SN/zrcIKnpm2o5w6d5Vx0YmeuS+zMfsPdZmRKewY="; }; - cargoHash = "sha256-HzXbNoColjxrbswAPY/cr3p6qWXb/0os8VYi/nQyEgo="; + cargoHash = "sha256-+Jb+btXU+fsVXWCmafY5ZaGLvFIA/wFzVNkO0O8QaVw="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 89fffd65586f5133372af5dd0274f07cc0bbeed3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 16:16:28 +0000 Subject: [PATCH 14/19] dracula-theme: 4.0.0-unstable-2024-06-03 -> 4.0.0-unstable-2024-06-11 --- pkgs/data/themes/dracula-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index cdbaeeda9271..85a7d205a918 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2024-06-03"; + version = "4.0.0-unstable-2024-06-11"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "48bdcc5e37c90d74e7e2139412a89209cc05a672"; - hash = "sha256-KkKmiLENEiZSe56TRP8zMiGt6i9uaFCLJ+ajap0asZc="; + rev = "4a5fe924a2b17f82a617f79ef661f1783cacc988"; + hash = "sha256-azwkng3JTTBlSaisbJUdh9NlMZfDbD3OvTQP++J0oO8="; }; propagatedUserEnvPkgs = [ From 7d31596266d642db778b0eeda36f6decb0d883f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 16:16:42 +0000 Subject: [PATCH 15/19] python311Packages.nibe: 2.10.0 -> 2.10.1 --- pkgs/development/python-modules/nibe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 1df23ea573cb..79b7833c9efc 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.10.0"; + version = "2.10.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-g43lXQzsQ1Serq6oIMcnAYwUppdEVcBkYGEoy3NIwqo="; + hash = "sha256-rm0SV48vo68aiiFcvuSSGwCvQEsagIMh2EQXXmUU5dc="; }; build-system = [ setuptools ]; From ed21b753bb9cab729a1a846aead138389cd94b33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 17:00:21 +0000 Subject: [PATCH 16/19] vencord: 1.8.8 -> 1.8.9 --- pkgs/by-name/ve/vencord/package-lock.json | 19 +++++++++++-------- pkgs/by-name/ve/vencord/package.nix | 8 ++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package-lock.json b/pkgs/by-name/ve/vencord/package-lock.json index 19d768389c4c..df5bb7242cb0 100644 --- a/pkgs/by-name/ve/vencord/package-lock.json +++ b/pkgs/by-name/ve/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.8.8", + "version": "1.8.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.8.8", + "version": "1.8.9", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -662,6 +662,7 @@ "version": "0.11.14", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "deprecated": "Use @eslint/config-array instead", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^2.0.2", @@ -689,6 +690,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", "dev": true }, "node_modules/@jridgewell/gen-mapping": { @@ -880,9 +882,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==", + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==", "dev": true }, "node_modules/@types/minimist": { @@ -4352,6 +4354,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", + "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", "dev": true, "engines": { "node": ">=0.6.0", @@ -5277,9 +5280,9 @@ } }, "node_modules/terser": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz", - "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==", + "version": "5.31.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz", + "integrity": "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index fcf9c10fda47..ae0127e0d555 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.8.8"; - gitHash = "a66138f"; + version = "1.8.9"; + gitHash = "008227c"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-1T5WvD7z/WhU0X2LiuUNtlncKrGyDO5j1oB6VCD7V6w="; + hash = "sha256-ASIb7iNtbdx9zAe9o/73M1hF9uBvXid63Vlx7wLpV5U="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-QYsiRsWP5LljD4e4FUmlIRutnzr5dIOZ6dqUMEECPcw="; + npmDepsHash = "sha256-4yC//tdUiEDoAV1lGYdFLW/bO69IMvG4SQV7bDotfyk="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; From 6e11b53199679aeefd1023870a9b4aa06ede7c95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 17:19:51 +0000 Subject: [PATCH 17/19] python311Packages.unstructured: 0.14.4 -> 0.14.5 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index bfaa9f4cb5d2..38bfa9ac7208 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.14.4"; + version = "0.14.5"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-1pkBa9SO0PJM0U0EWBtwUjdEnGQB1tSQvdjwb6FIIB8="; + hash = "sha256-LkzSFIQX9WaffUkQ7JWhK6cZfc7DngLYYOxe1Jl5+gA="; }; propagatedBuildInputs = [ From 9c51d83ba84f61e9ad7ccb8062d0760006dd7ad5 Mon Sep 17 00:00:00 2001 From: Vri Date: Thu, 13 Jun 2024 20:04:37 +0200 Subject: [PATCH 18/19] forgejo: 7.0.3 -> 7.0.4 --- pkgs/by-name/fo/forgejo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 06e4cb86dfd4..94e3dc878199 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "7.0.3"; + version = "7.0.4"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-P+HVZmfNA1ao+fQ253tK8A2DNGNPxvdyzCvByQJ0FGA="; + hash = "sha256-WtJJdqPbx5k9U+u3ZpI3q/dm3eidxdkFgc8IskaJg88="; }; - vendorHash = "sha256-8qMpnGL5GXJuxOpxh9a1Bcxd7tVweUKwbun8UBxCfQA="; + vendorHash = "sha256-TYVWou9fIVL4od2o1uOb/MRBpf2lIg/9Tem9w+ihYzU="; subPackages = [ "." "contrib/environment-to-ini" ]; From 50261c0602f9df33074dae65c871d354517db4f7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 13 Jun 2024 21:00:43 +0300 Subject: [PATCH 19/19] config.rust: update references from rustc `rustc.config` is called `rust.rustcTarget` now, and `{rustc -> rust}.platform`. This is the new way (tm), and is preferred since https://github.com/NixOS/nixpkgs/pull/271707 - though the documentation still is outdated, and some expressions in nixpkgs were using the old interface. This updates both. --- doc/languages-frameworks/rust.section.md | 14 +++++++------- lib/systems/examples.nix | 6 +++--- .../rust-hypervisor-firmware/default.nix | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 8a1007b7bb8a..e12bbe02bfb5 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -254,7 +254,7 @@ By default, it takes the `stdenv.hostPlatform.config` and replaces components where they are known to differ. But there are ways to customize the argument: - To choose a different target by name, define - `stdenv.hostPlatform.rustc.config` as that name (a string), and that + `stdenv.hostPlatform.rust.rustcTarget` as that name (a string), and that name will be used instead. For example: @@ -262,7 +262,7 @@ where they are known to differ. But there are ways to customize the argument: ```nix import { crossSystem = (import ).systems.examples.armhf-embedded // { - rustc.config = "thumbv7em-none-eabi"; + rust.rustcTarget = "thumbv7em-none-eabi"; }; } ``` @@ -274,10 +274,10 @@ where they are known to differ. But there are ways to customize the argument: ``` - To pass a completely custom target, define - `stdenv.hostPlatform.rustc.config` with its name, and - `stdenv.hostPlatform.rustc.platform` with the value. The value will be + `stdenv.hostPlatform.rust.rustcTarget` with its name, and + `stdenv.hostPlatform.rust.platform` with the value. The value will be serialized to JSON in a file called - `${stdenv.hostPlatform.rustc.config}.json`, and the path of that file + `${stdenv.hostPlatform.rust.rustcTarget}.json`, and the path of that file will be used instead. For example: @@ -285,8 +285,8 @@ where they are known to differ. But there are ways to customize the argument: ```nix import { crossSystem = (import ).systems.examples.armhf-embedded // { - rustc.config = "thumb-crazy"; - rustc.platform = { foo = ""; bar = ""; }; + rust.rustcTarget = "thumb-crazy"; + rust.platform = { foo = ""; bar = ""; }; }; } ``` diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 79ec4461e419..6a9427b2d9de 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -59,7 +59,7 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; - rustc.config = "armv7-linux-androideabi"; + rust.rustcTarget = "armv7-linux-androideabi"; sdkVer = "28"; ndkVer = "24"; useAndroidPrebuilt = true; @@ -67,7 +67,7 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; - rustc.config = "aarch64-linux-android"; + rust.rustcTarget = "aarch64-linux-android"; sdkVer = "28"; ndkVer = "24"; useAndroidPrebuilt = true; @@ -207,7 +207,7 @@ rec { aarch64-embedded = { config = "aarch64-none-elf"; libc = "newlib"; - rustc.config = "aarch64-unknown-none"; + rust.rustcTarget = "aarch64-unknown-none"; }; aarch64be-embedded = { diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index 3441b625c45e..8b408cc96ed4 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -17,8 +17,8 @@ let cross = import ../../../.. { system = hostPlatform.system; crossSystem = lib.systems.examples."${arch}-embedded" // { - rustc.config = "${arch}-unknown-none"; - rustc.platform = lib.importJSON target; + rust.rustcTarget = "${arch}-unknown-none"; + rust.platform = lib.importJSON target; }; };