diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 61211f99f36c..454cb3da93aa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19830,12 +19830,6 @@ githubId = 70602908; github = "nikolaizombie1"; }; - niksingh710 = { - email = "nik.singh710@gmail.com"; - name = "Nikhil Singh"; - github = "niksingh710"; - githubId = 60490474; - }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; @@ -25008,6 +25002,12 @@ githubId = 33031; name = "Greg Pfeil"; }; + semi710 = { + email = "nik.singh710@gmail.com"; + name = "Nikhil Singh"; + github = "semi710"; + githubId = 60490474; + }; sempiternal-aurora = { email = "myrialsarvay@gmail.com"; github = "sempiternal-aurora"; diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 7b2e263e401e..be4522299c5b 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -559,7 +559,7 @@ def install_bootloader() -> None: if config('secureBoot', 'enable'): sbctl = os.path.join(str(config('secureBoot', 'sbctl')), 'bin', 'sbctl') - if not os.path.exists("/var/lib/sbctl") and config('secureBoot', 'autoGenerateKeys'): + if not os.path.exists("/var/lib/sbctl/keys") and config('secureBoot', 'autoGenerateKeys'): print('auto generating keys') try: subprocess.run([sbctl, 'create-keys']) diff --git a/pkgs/by-name/an/andagii/package.nix b/pkgs/by-name/an/andagii/package.nix index 4d7a886ac548..8a6dd0c13ebb 100644 --- a/pkgs/by-name/an/andagii/package.nix +++ b/pkgs/by-name/an/andagii/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation { @@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-U7wC55G8jIvMMyPcEiJQ700A7nkWdgWK1LM0F/wgDCg="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "http://www.i18nguy.com/unicode/unicode-font.html"; diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 73b79c9cb7b5..55001df3cdea 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -313,9 +313,9 @@ ssh = mkAzExtension rec { pname = "ssh"; - version = "2.0.8"; + version = "2.0.9"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/ssh-${version}-py3-none-any.whl"; - hash = "sha256-eX42Pr1rTPWqUna4nvNMv7sWtIGcXyc/CbmhwRjQxoM="; + hash = "sha256-OdE4FZckAeM0eFI5/QPBtLJnCIs7fQF/M47B7ULqxFY="; description = "SSH into Azure VMs using RBAC and AAD OpenSSH Certificates"; propagatedBuildInputs = with python3Packages; [ oras diff --git a/pkgs/by-name/ca/caddyfile-language-server/package.nix b/pkgs/by-name/ca/caddyfile-language-server/package.nix deleted file mode 100644 index de354fbb2d1e..000000000000 --- a/pkgs/by-name/ca/caddyfile-language-server/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchPnpmDeps, - pnpm_8, - nodejs, - pnpmConfigHook, - makeBinaryWrapper, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "caddyfile-language-server"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "caddyserver"; - repo = "vscode-caddyfile"; - tag = "v${finalAttrs.version}"; - hash = "sha256-IusP9Z3e8mQ0mEhI1o1zIqPDB/i0pqlMfnt6M8bzb2w="; - }; - - pnpmWorkspaces = [ "@caddyserver/caddyfile-language-server" ]; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) - pname - version - src - pnpmWorkspaces - ; - pnpm = pnpm_8; - fetcherVersion = 3; - hash = "sha256-D9kYFkmFlvg4r6vR9PHHAwF0qglHsTuRae0Z7CzDq1M="; - }; - - nativeBuildInputs = [ - pnpm_8 - pnpmConfigHook - nodejs - makeBinaryWrapper - ]; - - buildPhase = '' - runHook preBuild - - pnpm --filter=@caddyserver/caddyfile-language-server run build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - rm -rf node_modules packages/server/node_modules - pnpm install --production --offline --force --filter=@caddyserver/caddyfile-language-server - mkdir -p $out/lib/node_modules/caddyfile-language-server/ - mv packages/server/dist/* $out/lib/node_modules/caddyfile-language-server/ - - makeWrapper ${lib.getExe nodejs} $out/bin/caddyfile-language-server \ - --add-flags "$out/lib/node_modules/caddyfile-language-server/index.js" - - runHook postInstall - ''; - - meta = { - changelog = "https://github.com/caddyserver/vscode-caddyfile/releases/tag/v${finalAttrs.version}"; - description = "Basic language server for caddyfile"; - homepage = "https://github.com/caddyserver/vscode-caddyfile"; - mainProgram = "caddyfile-language-server"; - maintainers = with lib.maintainers; [ pyrox0 ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index d38502cc5d7f..7f35e06af773 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -4,6 +4,7 @@ let "bat" "bottom" "btop" + "delta" "element" "grub" "hyprland" @@ -90,6 +91,14 @@ let hash = "sha256-mEGZwScVPWGu+Vbtddc/sJ+mNdD2kKienGZVUcTSl+c="; }; + delta = fetchFromGitHub { + name = "delta"; + owner = "catppuccin"; + repo = "delta"; + rev = "011516f5d14f66b771b3e716f29c77231e008c74"; + hash = "sha256-lztkxX9O41YossvRzpR7tqxMhDNT1Efy2JvkCwtsiXQ="; + }; + element = fetchFromGitHub { name = "element"; owner = "catppuccin"; @@ -268,6 +277,11 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO mkdir -p "$out/bottom" cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom" + '' + + lib.optionalString (lib.elem "delta" themeList) '' + mkdir -p "$out/delta" + cp "${sources.delta}/catppuccin.gitconfig" "$out/delta" + '' + lib.optionalString (lib.elem "element" themeList) '' mkdir -p "$out/element" diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix index 7a36bdfd60f8..63bb12ed9baa 100644 --- a/pkgs/by-name/ch/choose-gui/package.nix +++ b/pkgs/by-name/ch/choose-gui/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/chipsenkbeil/choose/blob/${version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ heywoodlh - niksingh710 + semi710 ]; mainProgram = "choose"; }; diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index cd47766a5210..47ad70b28786 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -7,7 +7,7 @@ versionCheckHook, }: let - version = "1.38.0"; + version = "1.38.2"; inherit (stdenvNoCC.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -20,8 +20,8 @@ let hash = { - aarch64-linux = "sha256-nwBnjAzEM9ejQsQiQV6z/dFj53QUruXFtXwEvX1XlFQ="; - x86_64-linux = "sha256-zKMSp8P5GFLyhJmVyJUTDFmELiG6eH3JC6+kAm1sXsw="; + aarch64-linux = "sha256-nHFdDu2KrzqZgw7glwvDtevH1CIbvB4vP/chBWHanX0="; + x86_64-linux = "sha256-h3RKH8mY1ncHjJcDEToZLQgwutxoiGYkQWMoR/yziJk="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/fa/falcon/bump-minimum-cmake-required-version.patch b/pkgs/by-name/fa/falcon/bump-minimum-cmake-required-version.patch deleted file mode 100644 index 5f72338cc57e..000000000000 --- a/pkgs/by-name/fa/falcon/bump-minimum-cmake-required-version.patch +++ /dev/null @@ -1,250 +0,0 @@ -From a1f4fa1607249b0356c2cd2c54134cb3dc2dc231 Mon Sep 17 00:00:00 2001 -From: Stanislas Marquis -Date: Fri, 3 Mar 2023 12:44:09 +0100 -Subject: [PATCH] Update cmake minimum version >= 3.16.3 (ubuntu FF) - ---- - CMakeLists.txt | 2 +- - apps/faldoc/CMakeLists.txt | 2 +- - clt/falcon/editline/CMakeLists.txt | 4 ++-- - dist/nsis/CMakeLists.txt | 2 +- - modules/native/MP/CMakeLists.txt | 2 +- - modules/native/conio/CMakeLists.txt | 2 +- - modules/native/curl/CMakeLists.txt | 2 +- - modules/native/dbi/CMakeLists.txt | 2 +- - modules/native/dbus/CMakeLists.txt | 2 +- - modules/native/dynlib/CMakeLists.txt | 2 +- - modules/native/feathers/CMakeLists.txt | 2 +- - modules/native/gd2/CMakeLists.txt | 2 +- - modules/native/gtk/CMakeLists.txt | 2 +- - modules/native/hpdf/CMakeLists.txt | 2 +- - modules/native/sdl/CMakeLists.txt | 2 +- - modules/native/wopi/CMakeLists.txt | 2 +- - tests/native/dynlib/CMakeLists.txt | 2 +- - 17 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 81c404677..de2125e3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,7 +34,7 @@ - # List of available modules: CURL DBI DBUS DYNLIB GD2 GTK PDF SDL - # - --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - project(Falcon) - - -diff --git a/apps/faldoc/CMakeLists.txt b/apps/faldoc/CMakeLists.txt -index 3e0867f63..7ef40d7b3 100644 ---- a/apps/faldoc/CMakeLists.txt -+++ b/apps/faldoc/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for Feather modules - #################################################################### - --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - project(falcon-app-faldoc) - - set(FALDOC_DIR "${FALCON_APP_DIR}/faldoc" ) -diff --git a/clt/falcon/editline/CMakeLists.txt b/clt/falcon/editline/CMakeLists.txt -index 8b51862ad..933ef0a13 100644 ---- a/clt/falcon/editline/CMakeLists.txt -+++ b/clt/falcon/editline/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(Editline) - - find_package(Curses REQUIRED) -@@ -23,4 +23,4 @@ configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/config.h - ) -- -\ No newline at end of file -+ -diff --git a/dist/nsis/CMakeLists.txt b/dist/nsis/CMakeLists.txt -index c6e0110bb..996ce5436 100644 ---- a/dist/nsis/CMakeLists.txt -+++ b/dist/nsis/CMakeLists.txt -@@ -1,7 +1,7 @@ - # - # Configurator for NSIS installer - # --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - - # - # Files to be configured -diff --git a/modules/native/MP/CMakeLists.txt b/modules/native/MP/CMakeLists.txt -index 2b86107e0..f8eba5c40 100644 ---- a/modules/native/MP/CMakeLists.txt -+++ b/modules/native/MP/CMakeLists.txt -@@ -5,7 +5,7 @@ - #################################################################### - - PROJECT(MP) --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - # Set here project-wide options - # OPTION( WITH_OPT "An poption" OFF) -diff --git a/modules/native/conio/CMakeLists.txt b/modules/native/conio/CMakeLists.txt -index 104c9bcec..d828d7e09 100644 ---- a/modules/native/conio/CMakeLists.txt -+++ b/modules/native/conio/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for @PROJECT_NAME@ - #################################################################### - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(conio) - - # find the falcon installation. Set CMAKE_INSTALL_PREFIX to the falcon root -diff --git a/modules/native/curl/CMakeLists.txt b/modules/native/curl/CMakeLists.txt -index 2f1e908e7..7d7a2377c 100644 ---- a/modules/native/curl/CMakeLists.txt -+++ b/modules/native/curl/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for curl - #################################################################### - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(Falcon_curl) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - -diff --git a/modules/native/dbi/CMakeLists.txt b/modules/native/dbi/CMakeLists.txt -index 3a3f72c5f..20dbee902 100644 ---- a/modules/native/dbi/CMakeLists.txt -+++ b/modules/native/dbi/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - # CMake configuration file for DBI - #################################################################### --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - project(Falcon_DBI) - - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -diff --git a/modules/native/dbus/CMakeLists.txt b/modules/native/dbus/CMakeLists.txt -index 4bd76ce38..09f575fa7 100644 ---- a/modules/native/dbus/CMakeLists.txt -+++ b/modules/native/dbus/CMakeLists.txt -@@ -5,7 +5,7 @@ - #################################################################### - - PROJECT(dbus) --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - - INCLUDE( ${CMAKE_ROOT}/Modules/FindPkgConfig.cmake) - -diff --git a/modules/native/dynlib/CMakeLists.txt b/modules/native/dynlib/CMakeLists.txt -index 92bc09e59..6e1f31ec9 100644 ---- a/modules/native/dynlib/CMakeLists.txt -+++ b/modules/native/dynlib/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for dynlib - #################################################################### - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(Falcon_dynlib) - - find_package(Falcon REQUIRED) -diff --git a/modules/native/feathers/CMakeLists.txt b/modules/native/feathers/CMakeLists.txt -index 7be6dca12..3591a4b9a 100644 ---- a/modules/native/feathers/CMakeLists.txt -+++ b/modules/native/feathers/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - # CMake configuration file for Feather modules - #################################################################### --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - PROJECT(Falcon_Feathers) - - # Find our Find*.cmake files -diff --git a/modules/native/gd2/CMakeLists.txt b/modules/native/gd2/CMakeLists.txt -index 7d775d1e7..73692d4fd 100644 ---- a/modules/native/gd2/CMakeLists.txt -+++ b/modules/native/gd2/CMakeLists.txt -@@ -5,7 +5,7 @@ - #################################################################### - - PROJECT(gd2) --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - MESSAGE(STATUS "Building GD2 module" ) - - -diff --git a/modules/native/gtk/CMakeLists.txt b/modules/native/gtk/CMakeLists.txt -index 0f08e4bb3..f1bc647e9 100644 ---- a/modules/native/gtk/CMakeLists.txt -+++ b/modules/native/gtk/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - project( gtk ) - --cmake_minimum_required( VERSION 2.6.3 ) -+cmake_minimum_required( VERSION 3.16.3 ) - - list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) - -diff --git a/modules/native/hpdf/CMakeLists.txt b/modules/native/hpdf/CMakeLists.txt -index 679444146..cf86e9392 100644 ---- a/modules/native/hpdf/CMakeLists.txt -+++ b/modules/native/hpdf/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for Feather modules - #################################################################### - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(falcon-module-hpdf) - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -diff --git a/modules/native/sdl/CMakeLists.txt b/modules/native/sdl/CMakeLists.txt -index 32a07dfd5..7d46ae513 100644 ---- a/modules/native/sdl/CMakeLists.txt -+++ b/modules/native/sdl/CMakeLists.txt -@@ -6,7 +6,7 @@ - if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 OLD) - endif(COMMAND cmake_policy) --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - PROJECT(Falcon_SDL) - - -diff --git a/modules/native/wopi/CMakeLists.txt b/modules/native/wopi/CMakeLists.txt -index 3f711cd6d..56e6c539b 100644 ---- a/modules/native/wopi/CMakeLists.txt -+++ b/modules/native/wopi/CMakeLists.txt -@@ -3,7 +3,7 @@ - # Falcon Web Oriented Programming Interface - # - --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - project( falcon_wopi ) - - ###################################################################### -diff --git a/tests/native/dynlib/CMakeLists.txt b/tests/native/dynlib/CMakeLists.txt -index 1781380d9..ed3f1e99f 100644 ---- a/tests/native/dynlib/CMakeLists.txt -+++ b/tests/native/dynlib/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - # CMake configuration file for dynlib - TESTS - #################################################################### --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/pkgs/by-name/fa/falcon/package.nix b/pkgs/by-name/fa/falcon/package.nix deleted file mode 100644 index 26c8c902fba9..000000000000 --- a/pkgs/by-name/fa/falcon/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - pcre, - zlib, - sqlite, -}: - -stdenv.mkDerivation { - pname = "falcon"; - version = "0-unstable-2023-11-19"; - - src = fetchFromGitHub { - owner = "falconpl"; - repo = "falcon"; - rev = "fc403c6e8c1f3d8c2a5a6ebce5db6f1b3e355808"; - hash = "sha256-0yLhwDVFNbfiW23hNxrvItCCkyaOvEbFSg1ZQuJvhIs="; - }; - - patches = [ - # https://github.com/falconpl/falcon/pull/11 - ./bump-minimum-cmake-required-version.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = [ - pcre - zlib - sqlite - ]; - - meta = { - description = "Programming language with macros and syntax at once"; - homepage = "https://github.com/falconpl/falcon"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ pSub ]; - platforms = with lib.platforms; unix; - broken = stdenv.cc.isClang; - }; -} diff --git a/pkgs/by-name/fi/filebrowser-quantum/package.nix b/pkgs/by-name/fi/filebrowser-quantum/package.nix index ab80d372ed04..7a1e4580c9c5 100644 --- a/pkgs/by-name/fi/filebrowser-quantum/package.nix +++ b/pkgs/by-name/fi/filebrowser-quantum/package.nix @@ -6,13 +6,13 @@ }: let - version = "1.2.2-stable"; + version = "1.3.3-stable"; src = fetchFromGitHub { owner = "gtsteffaniak"; repo = "filebrowser"; tag = "v${version}"; - hash = "sha256-MWFBoVr5WRfLhDUGEGS6ntb3v23HcOcm91x3fGriM2A="; + hash = "sha256-Q4TtC5x/nAbeZzICH9R9LBqe/8tbQOFR8vAImhQ5sYM="; }; frontend = buildNpmPackage { @@ -20,7 +20,7 @@ let inherit version src; sourceRoot = "${src.name}/frontend"; - npmDepsHash = "sha256-brW5YR/DNBOCPBDMEjSzyk+YTbrP5ppdQ0US/DLbyIs="; + npmDepsHash = "sha256-+2CHRhu+cEmA0OvvU8ZKZ7Q5rTUX2KCSXFeVdievoYQ="; buildPhase = '' runHook preBuild @@ -47,7 +47,7 @@ buildGoModule { sourceRoot = "${src.name}/backend"; - vendorHash = "sha256-pU5qtWvhLbMdxzXK6uKxEkvbZdb2oa4ZHKaCPm0bIwU="; + vendorHash = "sha256-Fq5FqsZ4m5j+UIn1RsElhNUb4guwI9wo48SjQdvESRU="; preBuild = '' mkdir -p http/embed diff --git a/pkgs/by-name/fz/fzf-preview/package.nix b/pkgs/by-name/fz/fzf-preview/package.nix index a055104b3779..fd874ef3e364 100644 --- a/pkgs/by-name/fz/fzf-preview/package.nix +++ b/pkgs/by-name/fz/fzf-preview/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { version = "0-unstable-2026-02-22"; src = fetchFromGitHub { - owner = "niksingh710"; + owner = "semi710"; repo = "fzf-preview"; rev = "5e5a5a5c4258fa86300cb56224e31416ff7401b5"; hash = "sha256-ZjBoTsZ2ymfhmUbMpMWT1MB20kLf0BILnCDu75F6WEQ="; @@ -79,10 +79,10 @@ stdenv.mkDerivation { be simple, fast, and highly compatible, making it a useful tool for anyone leveraging fzf for file navigation or search. ''; - homepage = "https://github.com/niksingh710/fzf-preview"; + homepage = "https://github.com/semi710/fzf-preview"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ - niksingh710 + semi710 ]; mainProgram = "fzf-preview"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gi/gitte/package.nix b/pkgs/by-name/gi/gitte/package.nix index fc9a7365be79..acc2e07f3183 100644 --- a/pkgs/by-name/gi/gitte/package.nix +++ b/pkgs/by-name/gi/gitte/package.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gitte"; - version = "0.7.0"; + version = "0.7.1"; __structuredAttrs = true; @@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "ckruse"; repo = "Gitte"; tag = finalAttrs.version; - hash = "sha256-oZJmjpPAiMNlHJBdTLXmT7FOf9dCITPuazEU7GtWmM8="; + hash = "sha256-R2Y/nmj509yo0ueh0nMxUsoqdJBaGUdSHj69QHZBVTQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-PZ1Q1GREBiZHQyEe/NrKFJ16ynuuPA/hXUhsP3r6WMg="; + hash = "sha256-QTnstnFJYlasY9JSXT+OMjxWYawQbNpQzI0FDpLWknM="; }; strictDeps = true; diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 2dba788bc092..51a6d4b2e13e 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; - version = "3.14.1"; + version = "3.15.1"; src = fetchurl { # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; - hash = "sha256-j8+PIbNySlwELKKdsYQe53++w9zunKaN9TRqZq+LpYI="; + hash = "sha256-Uv6w3XEySoqsKCmZVmiDkGfmeretHfvpwFmYMJz0mv4="; }; # - HMCL prompts users to download prebuilt Terracotta binary for diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 045f45d4e8d2..b8215ce31fb2 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -114,9 +114,10 @@ rustPlatform.buildRustPackage { description = "Handy way to save and run project-specific commands"; license = lib.licenses.cc0; maintainers = with lib.maintainers; [ - xrelkd jk ryan4yin + xrelkd + yvnth ]; mainProgram = "just"; }; diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index d7c10b95a3f6..9c6e7361eebc 100644 --- a/pkgs/by-name/ki/kiro/package.nix +++ b/pkgs/by-name/ki/kiro/package.nix @@ -14,7 +14,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = extraCommandLineArgs; - version = "0.12.301"; + version = "0.12.333"; pname = "kiro"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json index 7b95fb488123..08221c497282 100644 --- a/pkgs/by-name/ki/kiro/sources.json +++ b/pkgs/by-name/ki/kiro/sources.json @@ -1,14 +1,14 @@ { "x86_64-linux": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.301/tar/kiro-ide-0.12.301-stable-linux-x64.tar.gz", - "hash": "sha256-TSsezw9e4qwehiw1ZRkGIcNgsm9bfORqNZN+wBeoxZM=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.333/tar/kiro-ide-0.12.333-stable-linux-x64.tar.gz", + "hash": "sha256-EEj0hz3fxPtesifXuFb0DQfFHaYgOQ1wgkaqcNMeX84=" }, "x86_64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.301/kiro-ide-0.12.301-stable-darwin-x64.dmg", - "hash": "sha256-t/UxzyVzx0+zlC6T2Rs3cmWObRYNdmhKoIobYGa+Yq4=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-x64.dmg", + "hash": "sha256-5oPK6JGrY+0+i/VnvRlSM/5XQJkq3pPsUB1IaoruJzw=" }, "aarch64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.301/kiro-ide-0.12.301-stable-darwin-arm64.dmg", - "hash": "sha256-Ofi+JB7aLSVYFnP3bUnkGGg900/pUu8bpEbnYfW1sDI=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-arm64.dmg", + "hash": "sha256-Wu5dpXzth/TTly3k019ln/cHl3ZgtS8PenGTzwR5b6Y=" } } diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index eefd6b8f17ff..64b675fc5db4 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -48,13 +48,13 @@ let in buildGoModule (finalAttrs: { pname = "nezha"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "nezhahq"; repo = "nezha"; tag = "v${finalAttrs.version}"; - hash = "sha256-40GirWaa03sX5UNL0ZI8qcFqYV2ZuRniWofKluKeW+0="; + hash = "sha256-Vj9vgLT38HbdF4mWQkv3Yrshdv/kQpWk51teyl9qzF0="; }; proxyVendor = true; diff --git a/pkgs/by-name/sp/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix index e2c12556559e..dd5f6f64c675 100644 --- a/pkgs/by-name/sp/spotify/darwin.nix +++ b/pkgs/by-name/sp/spotify/darwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { inherit pname; - version = "1.2.89.539"; + version = "1.2.92.147"; src = # WARNING: This Wayback Machine URL redirects to the closest timestamp. @@ -20,13 +20,13 @@ stdenv.mkDerivation { # https://web.archive.org/web/*/https://download.scdn.co/Spotify.dmg if stdenv.hostPlatform.isAarch64 then (fetchurl { - url = "https://web.archive.org/web/20260510001507/https://download.scdn.co/SpotifyARM64.dmg"; - hash = "sha256-m7Wbcl1ewIa92n/eCTgF62EN63KJyWPRW2ZF71/8btk="; + url = "https://web.archive.org/web/20260607203830/https://download.scdn.co/SpotifyARM64.dmg"; + hash = "sha256-rQuvF7LWHBR3q8GJQWO671n1NRDKinQps+zYfXPktrU="; }) else (fetchurl { - url = "https://web.archive.org/web/20260510001458/https://download.scdn.co/Spotify.dmg"; - hash = "sha256-BjZ0WT00QvLQvLBWnHzE/POf82cUxZUW4BIJsk2hAaw="; + url = "https://web.archive.org/web/20260607203705/https://download.scdn.co/Spotify.dmg"; + hash = "sha256-jX7nBPiwxnKXWpN4/XiXKBl6Eg01954+VDwWRoJfdbk="; }); nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix index fbb4336d19ea..692f3b8a7fcf 100644 --- a/pkgs/by-name/sp/spotify/linux.nix +++ b/pkgs/by-name/sp/spotify/linux.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.86.502.g8cd7fb22"; + version = "1.2.90.451.gb094aab0"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "94"; + rev = "96"; # fetch from snapcraft instead of the debian repository most repos fetch from. # That is a bit more cumbersome. But the debian repository only keeps the last @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { name = "spotify-${finalAttrs.version}-${finalAttrs.rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${finalAttrs.rev}.snap"; - hash = "sha512-wp+DHLFJM1yWhp2WNCnvUrLJUhdWqB7OvkIuljLNmmlDm0T+0Vt+/zYyx/pGCVqhv5zzMl6e+32hPD/elHMADA=="; + hash = "sha512-rdffEwzlUf/kmxcO79+TzF0OKszWQhTdJgqQp/zhy+O5Ov+JhhjW2hXoltkhJbpQ2pJD9l4nuVDpTjQAc3VzAA=="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 64d07c69e477..c77cf5cc28c3 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.87"; + version = "3.16.89"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-R/Q5obcebCN/YPjtuo+Fh1EVgNiGFPajJm8V4s7UQRo="; + hash = "sha256-HRk8pd3FAj5P3KObzO91NF2BrYV8Wo7hDA8xWYsbTm4="; }; outputs = [ diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/by-name/st/stumpwm/package.nix similarity index 74% rename from pkgs/applications/window-managers/stumpwm/default.nix rename to pkgs/by-name/st/stumpwm/package.nix index 13f192272038..7a51145dffad 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/by-name/st/stumpwm/package.nix @@ -1,5 +1,5 @@ { - stdenv, + stdenvNoCC, lib, fetchFromGitHub, autoreconfHook, @@ -7,20 +7,30 @@ texinfo, }: -stdenv.mkDerivation (finalAttrs: { +let + sbclWithPkgs = sbcl.withPackages ( + ps: with ps; [ + alexandria + cl-ppcre + clx + fiasco + ] + ); +in +stdenvNoCC.mkDerivation (finalAttrs: { pname = "stumpwm"; version = "24.11"; src = fetchFromGitHub { owner = "stumpwm"; repo = "stumpwm"; - rev = "${finalAttrs.version}"; + tag = "${finalAttrs.version}"; hash = "sha256-Ba2HcAmNcZvnqU0jpLTxsBe8L+4aHbO/oM4Bp/IYEC0="; }; nativeBuildInputs = [ autoreconfHook - sbcl + sbclWithPkgs texinfo ]; diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix index 76c6eecaf0e5..7dfe44e304d4 100644 --- a/pkgs/by-name/us/usage/package.nix +++ b/pkgs/by-name/us/usage/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "usage"; - version = "3.2.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "jdx"; repo = "usage"; tag = "v${finalAttrs.version}"; - hash = "sha256-L8OQ6GdHoxJROA/lczichG4nNx5UGKxInihel5AaFIc="; + hash = "sha256-ZXjOuf8xjKtFnxzrb4mU6TBae75Nyl6zGllT9orbNMY="; }; - cargoHash = "sha256-JauKSCp5Fk1shzXE2dy/joYamv7XW2rnIsu4hjIkBUA="; + cargoHash = "sha256-78lTRHIy1VYJP3dxljfrsMh1MXT7dyVw2yxHNrGJJk0="; postPatch = '' substituteInPlace ./examples/*.sh \ @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ # has --include-bash-completion-lib so requires external lib downloaded on runtime - "--skip=test_bash_completion_integration" + "--skip=test_bash_completion_init_integration" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index c1c2f2eaaac0..d4a12395995d 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.11.19"; + version = "0.11.21"; __structuredAttrs = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-2NZVsYK0lZHX5xQqQXXczoaBzEMIGHjT0ls55BVu0RM="; + hash = "sha256-2PhGJbgCSqOiDVv8ktVkAaADhPxvKp1/JqkNQspt2Pc="; }; - cargoHash = "sha256-gMCvZUzqLe/Q7O1tWWPJs7pxWklb3LN9QQIULIq4oUU="; + cargoHash = "sha256-0hfLpfU2WaWFkqcSMJctLM5UDeTnIibuog/0U+DBzmI="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/va/vazir-code-font/package.nix b/pkgs/by-name/va/vazir-code-font/package.nix index 2d1ac5467d54..8b5814a0ff31 100644 --- a/pkgs/by-name/va/vazir-code-font/package.nix +++ b/pkgs/by-name/va/vazir-code-font/package.nix @@ -2,26 +2,24 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "vazir-code-font"; version = "1.1.2"; src = fetchFromGitHub { owner = "rastikerdar"; repo = "vazir-code-font"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iBojse3eHr4ucZtPfpkN+mmO6sEExY8WcAallyPgMsI="; }; - - installPhase = '' - runHook preInstall - - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; - - runHook postInstall - ''; + outputs = [ + "out" + "webfont" + ]; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://github.com/rastikerdar/vazir-code-font"; @@ -30,4 +28,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.dearrude ]; }; -} +}) diff --git a/pkgs/by-name/vi/vi-mongo/package.nix b/pkgs/by-name/vi/vi-mongo/package.nix index 97a6202e5e12..be406acf0858 100644 --- a/pkgs/by-name/vi/vi-mongo/package.nix +++ b/pkgs/by-name/vi/vi-mongo/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "vi-mongo"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "kopecmaciej"; repo = "vi-mongo"; tag = "v${finalAttrs.version}"; - hash = "sha256-0TMrQ1dbAP7HOjrVVcnoHPchf7e14Qzcl5lAD0rHTDs="; + hash = "sha256-wPijV+5wTZWG60E2Tdp+mj75eh8go6JVZF2JTcp1Ais="; }; vendorHash = "sha256-CuFoH6crS6BOsSj2hNGw7loi4RixHbyJGySfxglUUmg="; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 5f84895c5032..85dd966cceb0 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -10,12 +10,12 @@ buildPythonPackage (finalAttrs: { pname = "awscrt"; - version = "0.31.3"; + version = "0.33.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-FswDgO7wc6Ljfv8BqY8/IQjq1tu0qRnUD2VtsNitS3E="; + hash = "sha256-K0wP8DsZQmeNhvcJQ0LeyUZLTfC6PjaSsoQXyVuVp9s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index be54c6dde815..adce4d6a71de 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,12 +11,12 @@ buildPythonPackage (finalAttrs: { pname = "publicsuffixlist"; - version = "1.0.2.20260611"; + version = "1.0.2.20260615"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-zwFR1F4yqo0O7rLHbhQcaPlxVnttEaylk/duiX7SxcY="; + hash = "sha256-jVK3tbW3XxG6xMA0p7GB0f0csn3UQKII4RwiZuYxiYs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index aef8ebb23cf8..fd6fd8d3bf85 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "sabctools"; - version = "9.4.0"; + version = "9.4.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JkRRtZnzp83dMKXiuqOXaTm8UOpkkhmjH2ysS8TY0DI="; + hash = "sha256-MU2vgWX7ojy5OYllEJTHrz9z7mvrJq3mrfRUM2jQ9ws="; }; build-system = [ setuptools ]; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index a597cea10f5d..53d45a00b92c 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -521,7 +521,7 @@ in rtpFilePath = "minimal.tmux"; version = "0-unstable-2025-06-04"; src = fetchFromGitHub { - owner = "niksingh710"; + owner = "semi710"; repo = "minimal-tmux-status"; rev = "de2bb049a743e0f05c08531a0461f7f81da0fc72"; hash = "sha256-0gXtFVan+Urb79AjFOjHdjl3Q73m8M3wFSo3ZhjxcBA="; @@ -534,10 +534,10 @@ in quickly identify the prefix state. Designed to be minimal in appearance and dependencies, it is ideal for users who want essential information without clutter. ''; - homepage = "https://github.com/niksingh710/minimal-tmux-status.git"; + homepage = "https://github.com/semi710/minimal-tmux-status.git"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - niksingh710 + semi710 ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d514fe34a78..581296f20a61 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -429,6 +429,7 @@ mapAliases { bzip2_1_1 = throw "'bzip2_1_1' has been removed as it was an unmaintained 2020 snapshot with no remaining users; use 'bzip2' instead"; # Added 2026-05-31 bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20 c0 = throw "'c0' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 + caddyfile-language-server = throw "'caddyfile-language-server' has been removed as it is unmaintained upstream"; # Added 2026-06-17 caido = warnAlias "'caido' has been split into 'caido-cli' and 'caido-desktop'." caido-desktop; # Added 2026-03-03 calculix = throw "'calculix' has been renamed to/replaced by 'calculix-ccx'"; # Converted to throw 2025-10-27 calligra = throw "'calligra' has been renamed to/replaced by 'kdePackages.calligra'"; # Converted to throw 2025-10-27 @@ -733,6 +734,7 @@ mapAliases { ex_doc = warnAlias "'ex_doc' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.ex_doc' instead." beamPackages.ex_doc; # added 2026-06-15 f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18 fabs = throw "'fabs' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 + falcon = throw "'falcon' has been removed as it is unmaintained and depends on pcre, which is deprecated"; # Added 2026-06-16 fancontrol-gui = throw "'fancontrol-gui' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 fast-cli = throw "'fast-cli' has been removed because it was unmaintainable in nixpkgs"; # Added 2025-11-17 fastfetchMinimal = warnAlias "'fastfetchMinimal' has been renamed to 'fastfetch.minimal'" fastfetch.minimal; # Added 2026-05-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fc105e69a33..6155474c3ccf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9475,18 +9475,6 @@ with pkgs; inherit (ocaml-ng.ocamlPackages) stog; - stumpwm = callPackage ../applications/window-managers/stumpwm { - stdenv = stdenvNoCC; - sbcl = sbcl.withPackages ( - ps: with ps; [ - alexandria - cl-ppcre - clx - fiasco - ] - ); - }; - stumpwm-unwrapped = sbcl.pkgs.stumpwm; sublime3Packages = recurseIntoAttrs (