From 07d1e51694445620464acbf6caece8eafc0ba560 Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 17 Sep 2025 23:51:48 +0800 Subject: [PATCH 01/25] staruml: 6.3.4 -> 7.0.0 --- pkgs/by-name/st/staruml/package.nix | 86 +++++++++++++++-------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index c2ebe9fc8f34..69c661228528 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -24,48 +24,17 @@ at-spi2-core, cups, libxkbcommon, + bintools, + libGL, }: -let - LD_LIBRARY_PATH = lib.makeLibraryPath [ - glib - gtk3 - xorg.libXdamage - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libxshmfence - libxkbcommon - nss - nspr - atk - at-spi2-atk - dbus - gdk-pixbuf - pango - cairo - xorg.libXrandr - expat - libdrm - libgbm - alsa-lib - at-spi2-core - cups - ]; -in stdenv.mkDerivation (finalAttrs: { - version = "6.3.4"; + version = "7.0.0"; pname = "staruml"; src = fetchurl { - url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-Qo5hBdVl/pDBkfBYhNF31P3Tii/V6Iczc7BOvagxjxE="; + url = "https://files.staruml.io/releases-v7/StarUML_${finalAttrs.version}_amd64.deb"; + hash = "sha256-z25qeE2G9F010IE1WFxwIifYqowjB4dpUDgRg38RtQc="; }; nativeBuildInputs = [ @@ -78,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: { ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin mv opt $out @@ -85,22 +56,55 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/share/doc substituteInPlace $out/share/applications/staruml.desktop \ - --replace "/opt/StarUML/staruml" "$out/bin/staruml" + --replace-fail "/opt/StarUML/staruml" "$out/bin/staruml" mkdir -p $out/lib ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/opt/StarUML/staruml + patchelf --interpreter ${bintools.dynamicLinker} --add-needed libGL.so.1 $out/opt/StarUML/staruml ln -s $out/opt/StarUML/staruml $out/bin/staruml + + runHook postInstall ''; preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH ':' $out/lib:${LD_LIBRARY_PATH} + --prefix LD_LIBRARY_PATH : $out/lib:${ + lib.makeLibraryPath [ + glib + gtk3 + xorg.libXdamage + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + xorg.libxshmfence + libxkbcommon + nss + nspr + atk + at-spi2-atk + dbus + gdk-pixbuf + pango + cairo + xorg.libXrandr + expat + libdrm + libgbm + alsa-lib + at-spi2-core + cups + libGL + ] + } ) ''; -- knotmirror 0.0.1 From c6ad3bad2ebd0c0f21908a03cc144942bc6222d1 Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 17 Sep 2025 23:52:24 +0800 Subject: [PATCH 02/25] staruml: remove with lib --- pkgs/by-name/st/staruml/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index 69c661228528..8bcfe77a47fa 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -108,12 +108,12 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - meta = with lib; { + meta = { description = "Sophisticated software modeler"; homepage = "https://staruml.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ kashw2 ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ kashw2 ]; platforms = [ "x86_64-linux" ]; mainProgram = "staruml"; }; -- knotmirror 0.0.1 From cc8ade27ab28da5c23c1ce5ea25f4b200b9f37cf Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 23 Sep 2025 10:30:34 +0800 Subject: [PATCH 03/25] spicetify-cli: 2.41.0 -> 2.42.0 Diff: https://github.com/spicetify/cli/compare/v2.41.0...v2.42.0 --- pkgs/by-name/sp/spicetify-cli/package.nix | 19 ++++++++----------- pkgs/by-name/sp/spicetify-cli/version.patch | 14 -------------- 2 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 pkgs/by-name/sp/spicetify-cli/version.patch diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 5c570d231d9c..74247a932a35 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -3,34 +3,31 @@ buildGoModule, fetchFromGitHub, testers, - replaceVars, spicetify-cli, }: buildGoModule (finalAttrs: { pname = "spicetify-cli"; - version = "2.41.0"; + version = "2.42.0"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-07++H76LBlfCcdm5uEpQrS5UMCZadLp1I6J4ZMaIPUo="; + hash = "sha256-beMxE5ZpFqilgk4Xa0mvJyexDAFdwKUa1rJipFXBM7I="; }; - vendorHash = "sha256-W5i7R/maFvoouoSzPFEJMAp64H1Zsac24CiKuDt/cMY="; + vendorHash = "sha256-UwZ5wtZ5akmn3GF93XAqJqr9mUfbFQTD/LU8YUeoaGA="; + + postPatch = '' + substituteInPlace src/preprocess/preprocess.go \ + --replace-fail 'version != "Dev"' 'version != "${finalAttrs.version}"' + ''; ldflags = [ "-s -w" "-X 'main.version=${finalAttrs.version}'" ]; - patches = [ - # Stops spicetify from attempting to fetch a newer css-map.json - (replaceVars ./version.patch { - inherit (finalAttrs) version; - }) - ]; - postInstall = /* jsHelper and css-map.json are required at runtime diff --git a/pkgs/by-name/sp/spicetify-cli/version.patch b/pkgs/by-name/sp/spicetify-cli/version.patch deleted file mode 100644 index a6e1fede5a2d..000000000000 --- a/pkgs/by-name/sp/spicetify-cli/version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/preprocess/preprocess.go b/src/preprocess/preprocess.go -index ac0f084..f38ece2 100644 ---- a/src/preprocess/preprocess.go -+++ b/src/preprocess/preprocess.go -@@ -66,7 +66,7 @@ func Start(version string, extractedAppsPath string, flags Flag) { - var cssTranslationMap = make(map[string]string) - // readSourceMapAndGenerateCSSMap(appPath) - -- if version != "Dev" { -+ if version != "@version@" { - tag, err := FetchLatestTagMatchingOrMain(version) - if err != nil { - utils.PrintWarning("Cannot fetch version tag for CSS mappings") - -- knotmirror 0.0.1 From 108ef9653fff16264441347bf0fa861f2ad8177b Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Mon, 22 Sep 2025 22:48:05 -0400 Subject: [PATCH 04/25] harmonoid: init at 0.3.10 Co-authored-by: Emily Trau --- pkgs/by-name/ha/harmonoid/package.nix | 103 ++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 pkgs/by-name/ha/harmonoid/package.nix diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix new file mode 100644 index 000000000000..599b30fe749c --- /dev/null +++ b/pkgs/by-name/ha/harmonoid/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + fetchurl, + undmg, + autoPatchelfHook, + makeWrapper, + cairo, + gdk-pixbuf, + gtk3, + libz, + pango, + harfbuzz, + atkmm, + libcxx, + mpv-unwrapped, +}: +let + version = "0.3.10"; + url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}"; + url = + rec { + x86_64-linux = "${url_base}/harmonoid-linux-x86_64.tar.gz"; + x86_64-darwin = "${url_base}/harmonoid-macos-universal.dmg"; + aarch64-darwin = x86_64-darwin; + } + .${stdenv.hostPlatform.system} + or (throw "${stdenv.hostPlatform.system} is an unsupported platform"); + hash = + rec { + x86_64-linux = "sha256-GTF9KrcTolCc1w/WT0flwlBCBitskFPaJuNUdxCW9gs="; + x86_64-darwin = "sha256-7qcUnYBasUqisEW56fq4JGgojBmfqycrDIMpCCWLxlc="; + aarch64-darwin = x86_64-darwin; + } + .${stdenv.hostPlatform.system}; +in +stdenv.mkDerivation (finalAttrs: { + pname = "harmonoid"; + inherit version; + + src = fetchurl { + inherit url hash; + }; + + nativeBuildInputs = [ + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + undmg + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + cairo + gdk-pixbuf + gtk3 + libz + pango + harfbuzz + atkmm + libcxx + ]; + + installPhase = '' + runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir -p $out + cp -r bin $out + mkdir -p $out + cp -r share $out + wrapProgram $out/bin/harmonoid --prefix LD_LIBRARY_PATH : $out/share/harmonoid/lib:${ + lib.makeLibraryPath [ mpv-unwrapped ] + } + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + cp -r . $out/Applications/Harmonoid.app + '' + + '' + runHook postInstall + ''; + + meta = { + description = "Plays & manages your music library"; + homepage = "https://harmonoid.com/"; + changelog = "https://github.com/harmonoid/harmonoid/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ ivyfanchiang ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + license = { + fullName = "PolyForm Strict License 1.0.0"; + url = "https://polyformproject.org/licenses/strict/1.0.0/"; + free = false; + }; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) -- knotmirror 0.0.1 From 8529bb5b1601d3ce08783fbfa880702bca88bc96 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Sat, 20 Sep 2025 23:18:33 -0400 Subject: [PATCH 05/25] zuo: 1.9 -> 1.12 --- pkgs/by-name/zu/zuo/package.nix | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/zu/zuo/package.nix b/pkgs/by-name/zu/zuo/package.nix index 00b4ece29cd2..e8feefb28059 100644 --- a/pkgs/by-name/zu/zuo/package.nix +++ b/pkgs/by-name/zu/zuo/package.nix @@ -2,27 +2,39 @@ lib, stdenv, fetchFromGitHub, + autoreconfHook, + buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zuo"; - version = "1.9"; + version = "1.12"; src = fetchFromGitHub { owner = "racket"; repo = "zuo"; - rev = "v${version}"; - hash = "sha256-F7ba/4VVVhNDK/wqk+kgJKYxETS2pR9ZiDh0O0aOWn0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-BUJtAKB2tz04LhkCsDWBjgTTymU4U3Zcdm+RDYawfxQ="; }; + strictDeps = true; + enableParallelBuilding = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ + "CC_FOR_BUILD=cc" + ]; + doCheck = true; + enableParallelChecking = true; - meta = with lib; { + meta = { description = "Tiny Racket for Scripting"; mainProgram = "zuo"; homepage = "https://github.com/racket/zuo"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.RossSmyth ]; }; -} +}) -- knotmirror 0.0.1 From 876223d2edffadef9ede3af6d23622d9b5b37d50 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Sat, 20 Sep 2025 19:03:58 -0400 Subject: [PATCH 06/25] chez: Use Nixpkgs deps, make more cross-compatible --- pkgs/by-name/ch/chez/package.nix | 118 +++++++++++++++++++++---------- 1 file changed, 80 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix index 7cfb7e682c43..42035a6a82ba 100644 --- a/pkgs/by-name/ch/chez/package.nix +++ b/pkgs/by-name/ch/chez/package.nix @@ -1,26 +1,54 @@ { lib, stdenv, - fetchurl, - coreutils, + fetchFromGitHub, + zuo, + zlib, + lz4, + libffi, cctools, darwin, ncurses, libiconv, libX11, - libuuid, testers, -}@args: + writableTmpDirAsHomeHook, + buildPackages, +}: +let + inherit (stdenv.hostPlatform) extensions; + arch = + { + "x86_64-linux" = "ta6le"; + "x86-linux" = "ti3le"; + "aarch64-linux" = "tarm64le"; + "x86_64-darwin" = "ta6osx"; + "aarch64-darwin" = "tarm64osx"; + "x86_64-windows" = "ta6nt"; + "aarch64-windows" = "tarm64nt"; + } + .${stdenv.hostPlatform.system} + or (throw "Unsupported host system, try checking https://cisco.github.io/ChezScheme/release_notes/latest/release_notes.html to see if ${stdenv.hostPlatform.system} is supported"); +in stdenv.mkDerivation (finalAttrs: { pname = "chez-scheme"; version = "10.2.0"; - src = fetchurl { - url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; - hash = "sha256-t5WRbUz+1ZJAxfRLG1B6hlfv0o5i5y4TTQNIbp8+N0o="; + src = fetchFromGitHub { + owner = "cisco"; + repo = "ChezScheme"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wAEnuC6hktCK/l00G48jYD9fwdyiXkzHjC2YYVeCJXo="; + # Vendored nanopass and stex + fetchSubmodules = true; }; + strictDeps = true; + depsBuildBuild = [ + zuo # Used as the build driver + buildPackages.stdenv.cc # Needed for cross + ]; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools @@ -28,42 +56,54 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; + buildInputs = [ ncurses libiconv + zlib + lz4 + libffi + ] + ++ lib.optionals stdenv.hostPlatform.isUnix [ libX11 - libuuid ]; - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; - /* - ** We have to fix a few occurrences to tools with absolute - ** paths in some helper scripts, otherwise the build will fail on - ** NixOS or in any chroot build. - */ - patchPhase = '' - substituteInPlace ./makefiles/installsh \ - --replace-warn "/usr/bin/true" "${coreutils}/bin/true" - - substituteInPlace zlib/configure \ - --replace-warn "/usr/bin/libtool" libtool - ''; - - /* - ** Don't use configureFlags, since that just implicitly appends - ** everything onto a --prefix flag, which ./configure gets very angry - ** about. + ** Set to use Nixpkgs dependencies when possible + ** instead of vendored dependencies. ** - ** Also, carefully set a manual workarea argument, so that we + ** Carefully set a manual workarea argument, so that we ** can later easily find the machine type that we built Chez ** for. */ - configurePhase = '' - ./configure --as-is --threads --installprefix=$out --installman=$out/share/man - ''; + enableParallelBuilding = true; + dontAddPrefix = true; + configurePlatforms = [ ]; # So it doesn't add the default --build --host flags + configureFlags = [ + # Skip submodule update + "--as-is" + # Threaded version + "--threads" + "--installprefix=${placeholder "out"}" + "--installman=${placeholder "out"}/share/man" + "--enable-libffi" + "CC_FOR_BUILD=cc" + # Use Nixpkgs dependencies + "ZUO=zuo" + "ZLIB=${zlib}/lib/libz${extensions.sharedLibrary}" + "LZ4=${lz4.lib}/lib/liblz4${extensions.sharedLibrary}" + # Append to CFLAGS or else get errors + # Don't set CFLAGS so it can do some detections stuff + "CFLAGS+=${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}" + ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross" + "-m=${arch}" + ]; + + enableParallelChecking = true; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + doCheck = false; # Filesystem checks are impure # ** Clean up some of the examples from the build output. postInstall = '' @@ -72,18 +112,20 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; }; meta = { description = "Powerful and incredibly fast R6RS Scheme compiler"; homepage = "https://cisco.github.io/ChezScheme/"; + changelog = "https://cisco.github.io/ChezScheme/release_notes/v${finalAttrs.version}/release_notes.html"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ thoughtpolice ]; - platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + thoughtpolice + RossSmyth + ]; + platforms = lib.platforms.all; mainProgram = "scheme"; }; }) -- knotmirror 0.0.1 From ebb14544edebcb045907acf527659db710111bb1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 29 Sep 2025 21:20:25 +0200 Subject: [PATCH 07/25] =?UTF-8?q?ocamlPackages.mirage:=204.4.2=20=E2=86=92?= =?UTF-8?q?=204.10.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/functoria/default.nix | 48 ------------------- .../ocaml-modules/functoria/runtime.nix | 27 ----------- .../ocaml-modules/mirage/default.nix | 29 ++++++----- .../ocaml-modules/mirage/runtime.nix | 15 ++++-- pkgs/top-level/ocaml-packages.nix | 4 -- 5 files changed, 26 insertions(+), 97 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/functoria/default.nix delete mode 100644 pkgs/development/ocaml-modules/functoria/runtime.nix diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix deleted file mode 100644 index 79cf437d87fe..000000000000 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildDunePackage, - cmdliner, - functoria-runtime, - rresult, - astring, - fmt, - logs, - bos, - fpath, - emile, - uri, - alcotest, -}: - -buildDunePackage { - pname = "functoria"; - inherit (functoria-runtime) version src; - - minimalOCamlVersion = "4.08"; - - propagatedBuildInputs = [ - cmdliner - rresult - astring - fmt - logs - bos - fpath - emile - uri - ]; - - # Tests are not compatible with cmdliner 1.3 - doCheck = false; - checkInputs = [ - alcotest - functoria-runtime - ]; - - meta = with lib; { - description = "DSL to organize functor applications"; - homepage = "https://github.com/mirage/functoria"; - license = licenses.isc; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/functoria/runtime.nix b/pkgs/development/ocaml-modules/functoria/runtime.nix deleted file mode 100644 index 16978f71fbdd..000000000000 --- a/pkgs/development/ocaml-modules/functoria/runtime.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - buildDunePackage, - fetchurl, - cmdliner, -}: - -buildDunePackage rec { - pname = "functoria-runtime"; - version = "4.4.2"; - - src = fetchurl { - url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; - hash = "sha256-fPJou5EYmIFfa54BMiFvS7BKQq0u1pkA9MVHXt8boPk="; - }; - - minimalOCamlVersion = "4.08"; - - propagatedBuildInputs = [ cmdliner ]; - - meta = with lib; { - homepage = "https://github.com/mirage/functoria"; - license = licenses.isc; - description = "Runtime support library for functoria-generated code"; - maintainers = [ maintainers.sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 018f818d6350..090df1651e9c 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -1,21 +1,24 @@ { buildDunePackage, ocaml, - alcotest, - functoria, mirage-runtime, + astring, bos, + cmdliner, + emile, + fmt, + fpath, ipaddr, - astring, logs, - stdlib-shims, + rresult, + uri, }: buildDunePackage rec { pname = "mirage"; inherit (mirage-runtime) version src; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13"; outputs = [ "out" @@ -23,20 +26,20 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ - ipaddr - functoria - mirage-runtime - bos astring + bos + cmdliner + emile + fmt + fpath + ipaddr logs - stdlib-shims + rresult + uri ]; # Tests need opam-monorepo doCheck = false; - checkInputs = [ - alcotest - ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index c3843217a9c0..f3c185ab7555 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -1,22 +1,27 @@ { lib, + fetchurl, buildDunePackage, + cmdliner, ipaddr, - functoria-runtime, logs, lwt, alcotest, }: -buildDunePackage { +buildDunePackage (finalAttrs: { pname = "mirage-runtime"; - inherit (functoria-runtime) src version; + version = "4.10.1"; + src = fetchurl { + url = "https://github.com/mirage/mirage/releases/download/v${finalAttrs.version}/mirage-${finalAttrs.version}.tbz"; + hash = "sha256:1155b5e9a585d3b44dfdd72777d94a7222b0f88a1737593bfb1f09954b6fb914"; + }; minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ + cmdliner ipaddr - functoria-runtime logs lwt ]; @@ -29,4 +34,4 @@ buildDunePackage { license = licenses.isc; maintainers = with maintainers; [ sternenseemann ]; }; -} +}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f884a3d7ad7f..ba6c7253d0ec 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -661,10 +661,6 @@ let frontc = callPackage ../development/ocaml-modules/frontc { }; - functoria = callPackage ../development/ocaml-modules/functoria { }; - - functoria-runtime = callPackage ../development/ocaml-modules/functoria/runtime.nix { }; - functory = callPackage ../development/ocaml-modules/functory { }; ### G ### -- knotmirror 0.0.1 From d8709d664e490d30b9bd67bd2c501d408fb2bf44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Sep 2025 01:12:16 +0000 Subject: [PATCH 08/25] last: 1645 -> 1648 --- pkgs/by-name/la/last/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index 9af741b13067..a2762f99b713 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1645"; + version = "1648"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-oIGs5taAfT448BxXv6/ND+8CXAWgGd2jt7fO+vIXOZU="; + hash = "sha256-U1FGP6jzB36HLwTFKm/VMZWPPjo6mVuV/ePhGIkQgpg="; }; nativeBuildInputs = [ -- knotmirror 0.0.1 From 8d4ac26d1d4b3b50942db7d53c1a006005351408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Fri, 3 Oct 2025 10:03:49 +0200 Subject: [PATCH 09/25] rstudio: v2025.09.0+387 -> v2025.09.1+401 Simple update to bugfix release --- pkgs/by-name/rs/rstudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 49ba9ec88850..94ee478ea25f 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -88,13 +88,13 @@ let in stdenv.mkDerivation rec { pname = "RStudio"; - version = "2025.09.0+387"; + version = "2025.09.1+401"; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; tag = "v${version}"; - hash = "sha256-je2nfWIToGGizWyH/YbhtD4XhtP39qUIhatzDOUnsSc="; + hash = "sha256-FVK/1trMVFEv17HbUpaISC9gyE2HBKtdZWjxbgdXALc="; }; # sources fetched into _deps via cmake's FetchContent -- knotmirror 0.0.1 From 79847f67b982038a2a8cc8989da764e197f54298 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Oct 2025 11:50:00 +0000 Subject: [PATCH 10/25] ramalama: 0.12.2 -> 0.12.3 --- pkgs/by-name/ra/ramalama/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix index b80c6d1a9bc8..8b47d46fa573 100644 --- a/pkgs/by-name/ra/ramalama/package.nix +++ b/pkgs/by-name/ra/ramalama/package.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ramalama"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; src = fetchFromGitHub { owner = "containers"; repo = "ramalama"; tag = "v${version}"; - hash = "sha256-v9/cE6GFOUT5urHQwif7skP5vnRCdu435QGAAypWX0w="; + hash = "sha256-PnuAPQ9RF7IRnmHtUrwDRXIKEzZBDEU2mWfG5FyfY0c="; }; build-system = with python3.pkgs; [ -- knotmirror 0.0.1 From 4386aefe998c0eee8b0f06a321fc7ff7844c5085 Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 5 Oct 2025 04:19:17 -0500 Subject: [PATCH 11/25] lmstudio: 0.3.27.4 -> 0.3.28.2 --- pkgs/by-name/lm/lmstudio/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index abd8342e999c..3f6eddb71be0 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.27-4"; - hash_aarch64-darwin = "sha256-KEgUgfYG6yHZzTaKpGiSkyhZcb3W2KTlIhnbQdKpYm0="; - version_x86_64-linux = "0.3.27-4"; - hash_x86_64-linux = "sha256-CU7kfcyo054UvjSar5QB2aGrCPAdh1EMqEJyZkv7Mdk="; + version_aarch64-darwin = "0.3.28-2"; + hash_aarch64-darwin = "sha256-7sxhKZwZKzA2VUPHsChgysxXMB7SKEd9zK4kIPbWYjo="; + version_x86_64-linux = "0.3.28-2"; + hash_x86_64-linux = "sha256-ewVjJ0Sy5Zwf9tvlfngQKnAfAv3BvPIAO+p1tJ3mO8M="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; -- knotmirror 0.0.1 From f6620e26a4e1a1e8774b8a367a8d848518d9e216 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 22 Aug 2025 18:00:44 +0300 Subject: [PATCH 12/25] cbc: 2.10.4 -> 2.10.12 Also: - migrate the package to finalAttrs - fetch sources via fetchFromGitHub to prevent xz-style issues - add new dependencies cgl and clp, as well as pkg-config to discover them - drop link to now fixed https://github.com/coin-or/Clp/issues/130 --- pkgs/by-name/cb/cbc/package.nix | 34 +++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/cb/cbc/package.nix b/pkgs/by-name/cb/cbc/package.nix index 3cc7618781eb..f50429737041 100644 --- a/pkgs/by-name/cb/cbc/package.nix +++ b/pkgs/by-name/cb/cbc/package.nix @@ -1,21 +1,23 @@ { lib, stdenv, - fetchurl, - zlib, + fetchFromGitHub, bzip2, + cgl, + clp, + pkg-config, + zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cbc"; - version = "2.10.4"; + version = "2.10.12"; - # Note: Cbc 2.10.5 contains Clp 1.17.5 which hits this bug - # that breaks or-tools https://github.com/coin-or/Clp/issues/130 - - src = fetchurl { - url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz"; - sha256 = "0zq66j1vvpslswhzi9yfgkv6vmg7yry4pdmfgqaqw2vhyqxnsy39"; + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Cbc"; + tag = "releases/${finalAttrs.version}"; + sha256 = "sha256-0Sz4/7CRKrArIUy/XxGIP7WMmICqDJ0VxZo62thChYQ="; }; # or-tools has a hard dependency on Cbc static libraries, so we build both @@ -25,13 +27,21 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.cc.isClang [ "CXXFLAGS=-std=c++14" ]; + nativeBuildInputs = [ pkg-config ]; + enableParallelBuilding = true; hardeningDisable = [ "format" ]; buildInputs = [ - zlib bzip2 + zlib + ]; + + # cbc lists cgl and clp in its .pc requirements, so it needs to be propagated. + propagatedBuildInputs = [ + cgl + clp ]; # FIXME: move share/coin/Data to a separate output? @@ -43,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; description = "Mixed integer programming solver"; }; -} +}) -- knotmirror 0.0.1 From df5c36fbc7965904e176deacb2d79d1f9f797b6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Oct 2025 18:51:38 +0000 Subject: [PATCH 13/25] cargo-nextest: 0.9.104 -> 0.9.105 --- pkgs/by-name/ca/cargo-nextest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index c073518318f6..77b2be8479f5 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.104"; + version = "0.9.105"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-CZNnOuMF5P3OgdwlAfUgbbXnDVm4IQ7P617Rblq0lgk="; + hash = "sha256-IBw6adO9Mzv878n+glLJTNeFykx6bGxfrPGxl014/7o="; }; - cargoHash = "sha256-jppSWm20Md++mxvs/h1pB1Bh/02muWqUm1DyR46nusY="; + cargoHash = "sha256-qHiifv1je7oNwOGYeT/QGcfagiXcLTCTG2kHV1rJJ4o="; cargoBuildFlags = [ "-p" -- knotmirror 0.0.1 From e0d5027e8873eaa5e8f74fba39072fcb231f4b4b Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 5 Oct 2025 15:16:28 -0400 Subject: [PATCH 14/25] treewide: migrate to by-name --- .../ca/carapace/package.nix} | 0 .../coq => by-name/co/coq-kernel}/kernel.nix | 0 .../co/coq-kernel/package.nix} | 0 .../cy/cyclonedx-gomod/package.nix} | 0 .../dee/0001-Fix-build-with-Vala-0.54.patch | 0 .../de/dee/package.nix} | 0 .../di/directx-shader-compiler/package.nix} | 0 .../el/elinks/package.nix} | 0 .../em/embree/package.nix} | 0 .../em/emojione/package.nix} | 0 .../et/etcd_3_4/package.nix} | 0 .../fa/falcon/package.nix} | 0 .../fc/fclones/package.nix} | 0 .../fs/fswatch/package.nix} | 0 .../ge/geos/package.nix} | 0 .../libraries => by-name/ge}/geos/tests.nix | 0 .../gs/gsmlib/package.nix} | 0 .../he/headscale/package.nix} | 0 .../kd/kdbg/package.nix} | 0 .../li/libcoap/package.nix} | 0 .../li/libmodsecurity/package.nix} | 0 ...to-maintain-the-list-of-cached-rv-ts.patch | 0 .../li}/libxslt/new-unified-atype-extra.patch | 0 .../li/libxslt/package.nix} | 0 .../ma/mandelbulber/package.nix} | 0 .../mi/mitscheme/package.nix} | 0 ...naries-instead-of-Python-interpreter.patch | 0 .../mkosi/0002-Fix-library-resolving.patch | 0 .../mkosi/0003-Fix-QEMU-firmware-path.patch | 0 .../mk/mkosi/package.nix} | 0 .../mup/ghostscript-permit-file-write.patch | 0 .../mu/mup/package.nix} | 0 .../networkmanager/fix-install-paths.patch | 0 .../ne}/networkmanager/fix-paths.patch | 0 .../ne/networkmanager/package.nix} | 0 .../on/onlykey/package.nix} | 0 .../op/openems/package.nix} | 0 .../pa/parcellite/package.nix} | 0 .../qd/qdigidoc/package.nix} | 0 .../qd}/qdigidoc/vendor/.editorconfig | 0 .../qd}/qdigidoc/vendor/config.json | 0 .../qd}/qdigidoc/vendor/config.pub | 0 .../qd}/qdigidoc/vendor/config.rsa | 0 .../qd}/qdigidoc/vendor/eu-lotl.xml | 0 .../sc/schroedinger/package.nix} | 0 .../sp/sparse/package.nix} | 0 .../analysis => by-name/sp}/sparse/tests.nix | 0 .../tt/ttfautohint/package.nix} | 0 .../ui}/uim/data-hook.patch | 0 .../ui/uim/package.nix} | 0 .../linux => by-name/v4}/v4l-utils/musl.patch | 0 .../v4/v4l-utils/package.nix} | 0 .../va}/vampire/minisat-fenv.patch | 0 .../va/vampire/package.nix} | 0 .../vi/virt-manager/package.nix} | 0 .../wh}/whalebird/missing-hashes.json | 0 .../wh/whalebird/package.nix} | 0 .../x2/x2goclient/package.nix} | 0 .../ze/zexy/package.nix} | 0 pkgs/top-level/all-packages.nix | 74 ------------------- 60 files changed, 74 deletions(-) rename pkgs/{shells/carapace/default.nix => by-name/ca/carapace/package.nix} (100%) rename pkgs/{applications/editors/jupyter-kernels/coq => by-name/co/coq-kernel}/kernel.nix (100%) rename pkgs/{applications/editors/jupyter-kernels/coq/default.nix => by-name/co/coq-kernel/package.nix} (100%) rename pkgs/{tools/security/cyclonedx-gomod/default.nix => by-name/cy/cyclonedx-gomod/package.nix} (100%) rename pkgs/{development/libraries => by-name/de}/dee/0001-Fix-build-with-Vala-0.54.patch (100%) rename pkgs/{development/libraries/dee/default.nix => by-name/de/dee/package.nix} (100%) rename pkgs/{tools/graphics/directx-shader-compiler/default.nix => by-name/di/directx-shader-compiler/package.nix} (100%) rename pkgs/{applications/networking/browsers/elinks/default.nix => by-name/el/elinks/package.nix} (100%) rename pkgs/{development/libraries/embree/default.nix => by-name/em/embree/package.nix} (100%) rename pkgs/{data/fonts/emojione/default.nix => by-name/em/emojione/package.nix} (100%) rename pkgs/{servers/etcd/3_4/default.nix => by-name/et/etcd_3_4/package.nix} (100%) rename pkgs/{development/interpreters/falcon/default.nix => by-name/fa/falcon/package.nix} (100%) rename pkgs/{tools/misc/fclones/default.nix => by-name/fc/fclones/package.nix} (100%) rename pkgs/{development/tools/misc/fswatch/default.nix => by-name/fs/fswatch/package.nix} (100%) rename pkgs/{development/libraries/geos/default.nix => by-name/ge/geos/package.nix} (100%) rename pkgs/{development/libraries => by-name/ge}/geos/tests.nix (100%) rename pkgs/{development/libraries/gsmlib/default.nix => by-name/gs/gsmlib/package.nix} (100%) rename pkgs/{servers/headscale/default.nix => by-name/he/headscale/package.nix} (100%) rename pkgs/{development/tools/misc/kdbg/default.nix => by-name/kd/kdbg/package.nix} (100%) rename pkgs/{applications/networking/libcoap/default.nix => by-name/li/libcoap/package.nix} (100%) rename pkgs/{tools/security/libmodsecurity/default.nix => by-name/li/libmodsecurity/package.nix} (100%) rename pkgs/{development/libraries => by-name/li}/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch (100%) rename pkgs/{development/libraries => by-name/li}/libxslt/new-unified-atype-extra.patch (100%) rename pkgs/{development/libraries/libxslt/default.nix => by-name/li/libxslt/package.nix} (100%) rename pkgs/{applications/graphics/mandelbulber/default.nix => by-name/ma/mandelbulber/package.nix} (100%) rename pkgs/{development/compilers/mit-scheme/default.nix => by-name/mi/mitscheme/package.nix} (100%) rename pkgs/{tools/virtualization => by-name/mk}/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch (100%) rename pkgs/{tools/virtualization => by-name/mk}/mkosi/0002-Fix-library-resolving.patch (100%) rename pkgs/{tools/virtualization => by-name/mk}/mkosi/0003-Fix-QEMU-firmware-path.patch (100%) rename pkgs/{tools/virtualization/mkosi/default.nix => by-name/mk/mkosi/package.nix} (100%) rename pkgs/{applications/audio => by-name/mu}/mup/ghostscript-permit-file-write.patch (100%) rename pkgs/{applications/audio/mup/default.nix => by-name/mu/mup/package.nix} (100%) rename pkgs/{tools/networking => by-name/ne}/networkmanager/fix-install-paths.patch (100%) rename pkgs/{tools/networking => by-name/ne}/networkmanager/fix-paths.patch (100%) rename pkgs/{tools/networking/networkmanager/default.nix => by-name/ne/networkmanager/package.nix} (100%) rename pkgs/{tools/security/onlykey/default.nix => by-name/on/onlykey/package.nix} (100%) rename pkgs/{applications/science/electronics/openems/default.nix => by-name/op/openems/package.nix} (100%) rename pkgs/{tools/misc/parcellite/default.nix => by-name/pa/parcellite/package.nix} (100%) rename pkgs/{tools/security/qdigidoc/default.nix => by-name/qd/qdigidoc/package.nix} (100%) rename pkgs/{tools/security => by-name/qd}/qdigidoc/vendor/.editorconfig (100%) rename pkgs/{tools/security => by-name/qd}/qdigidoc/vendor/config.json (100%) rename pkgs/{tools/security => by-name/qd}/qdigidoc/vendor/config.pub (100%) rename pkgs/{tools/security => by-name/qd}/qdigidoc/vendor/config.rsa (100%) rename pkgs/{tools/security => by-name/qd}/qdigidoc/vendor/eu-lotl.xml (100%) rename pkgs/{development/libraries/schroedinger/default.nix => by-name/sc/schroedinger/package.nix} (100%) rename pkgs/{development/tools/analysis/sparse/default.nix => by-name/sp/sparse/package.nix} (100%) rename pkgs/{development/tools/analysis => by-name/sp}/sparse/tests.nix (100%) rename pkgs/{tools/misc/ttfautohint/default.nix => by-name/tt/ttfautohint/package.nix} (100%) rename pkgs/{tools/inputmethods => by-name/ui}/uim/data-hook.patch (100%) rename pkgs/{tools/inputmethods/uim/default.nix => by-name/ui/uim/package.nix} (100%) rename pkgs/{os-specific/linux => by-name/v4}/v4l-utils/musl.patch (100%) rename pkgs/{os-specific/linux/v4l-utils/default.nix => by-name/v4/v4l-utils/package.nix} (100%) rename pkgs/{applications/science/logic => by-name/va}/vampire/minisat-fenv.patch (100%) rename pkgs/{applications/science/logic/vampire/default.nix => by-name/va/vampire/package.nix} (100%) rename pkgs/{applications/virtualization/virt-manager/default.nix => by-name/vi/virt-manager/package.nix} (100%) rename pkgs/{applications/misc => by-name/wh}/whalebird/missing-hashes.json (100%) rename pkgs/{applications/misc/whalebird/default.nix => by-name/wh/whalebird/package.nix} (100%) rename pkgs/{applications/networking/remote/x2goclient/default.nix => by-name/x2/x2goclient/package.nix} (100%) rename pkgs/{applications/audio/pd-plugins/zexy/default.nix => by-name/ze/zexy/package.nix} (100%) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/by-name/ca/carapace/package.nix similarity index 100% rename from pkgs/shells/carapace/default.nix rename to pkgs/by-name/ca/carapace/package.nix diff --git a/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix b/pkgs/by-name/co/coq-kernel/kernel.nix similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/coq/kernel.nix rename to pkgs/by-name/co/coq-kernel/kernel.nix diff --git a/pkgs/applications/editors/jupyter-kernels/coq/default.nix b/pkgs/by-name/co/coq-kernel/package.nix similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/coq/default.nix rename to pkgs/by-name/co/coq-kernel/package.nix diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/by-name/cy/cyclonedx-gomod/package.nix similarity index 100% rename from pkgs/tools/security/cyclonedx-gomod/default.nix rename to pkgs/by-name/cy/cyclonedx-gomod/package.nix diff --git a/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch b/pkgs/by-name/de/dee/0001-Fix-build-with-Vala-0.54.patch similarity index 100% rename from pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch rename to pkgs/by-name/de/dee/0001-Fix-build-with-Vala-0.54.patch diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/by-name/de/dee/package.nix similarity index 100% rename from pkgs/development/libraries/dee/default.nix rename to pkgs/by-name/de/dee/package.nix diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/by-name/di/directx-shader-compiler/package.nix similarity index 100% rename from pkgs/tools/graphics/directx-shader-compiler/default.nix rename to pkgs/by-name/di/directx-shader-compiler/package.nix diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/by-name/el/elinks/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/elinks/default.nix rename to pkgs/by-name/el/elinks/package.nix diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/by-name/em/embree/package.nix similarity index 100% rename from pkgs/development/libraries/embree/default.nix rename to pkgs/by-name/em/embree/package.nix diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/by-name/em/emojione/package.nix similarity index 100% rename from pkgs/data/fonts/emojione/default.nix rename to pkgs/by-name/em/emojione/package.nix diff --git a/pkgs/servers/etcd/3_4/default.nix b/pkgs/by-name/et/etcd_3_4/package.nix similarity index 100% rename from pkgs/servers/etcd/3_4/default.nix rename to pkgs/by-name/et/etcd_3_4/package.nix diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/by-name/fa/falcon/package.nix similarity index 100% rename from pkgs/development/interpreters/falcon/default.nix rename to pkgs/by-name/fa/falcon/package.nix diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/by-name/fc/fclones/package.nix similarity index 100% rename from pkgs/tools/misc/fclones/default.nix rename to pkgs/by-name/fc/fclones/package.nix diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/by-name/fs/fswatch/package.nix similarity index 100% rename from pkgs/development/tools/misc/fswatch/default.nix rename to pkgs/by-name/fs/fswatch/package.nix diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/by-name/ge/geos/package.nix similarity index 100% rename from pkgs/development/libraries/geos/default.nix rename to pkgs/by-name/ge/geos/package.nix diff --git a/pkgs/development/libraries/geos/tests.nix b/pkgs/by-name/ge/geos/tests.nix similarity index 100% rename from pkgs/development/libraries/geos/tests.nix rename to pkgs/by-name/ge/geos/tests.nix diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/by-name/gs/gsmlib/package.nix similarity index 100% rename from pkgs/development/libraries/gsmlib/default.nix rename to pkgs/by-name/gs/gsmlib/package.nix diff --git a/pkgs/servers/headscale/default.nix b/pkgs/by-name/he/headscale/package.nix similarity index 100% rename from pkgs/servers/headscale/default.nix rename to pkgs/by-name/he/headscale/package.nix diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/by-name/kd/kdbg/package.nix similarity index 100% rename from pkgs/development/tools/misc/kdbg/default.nix rename to pkgs/by-name/kd/kdbg/package.nix diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/by-name/li/libcoap/package.nix similarity index 100% rename from pkgs/applications/networking/libcoap/default.nix rename to pkgs/by-name/li/libcoap/package.nix diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/by-name/li/libmodsecurity/package.nix similarity index 100% rename from pkgs/tools/security/libmodsecurity/default.nix rename to pkgs/by-name/li/libmodsecurity/package.nix diff --git a/pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch b/pkgs/by-name/li/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch similarity index 100% rename from pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch rename to pkgs/by-name/li/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch diff --git a/pkgs/development/libraries/libxslt/new-unified-atype-extra.patch b/pkgs/by-name/li/libxslt/new-unified-atype-extra.patch similarity index 100% rename from pkgs/development/libraries/libxslt/new-unified-atype-extra.patch rename to pkgs/by-name/li/libxslt/new-unified-atype-extra.patch diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/by-name/li/libxslt/package.nix similarity index 100% rename from pkgs/development/libraries/libxslt/default.nix rename to pkgs/by-name/li/libxslt/package.nix diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/by-name/ma/mandelbulber/package.nix similarity index 100% rename from pkgs/applications/graphics/mandelbulber/default.nix rename to pkgs/by-name/ma/mandelbulber/package.nix diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/by-name/mi/mitscheme/package.nix similarity index 100% rename from pkgs/development/compilers/mit-scheme/default.nix rename to pkgs/by-name/mi/mitscheme/package.nix diff --git a/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch b/pkgs/by-name/mk/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch similarity index 100% rename from pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch rename to pkgs/by-name/mk/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch diff --git a/pkgs/tools/virtualization/mkosi/0002-Fix-library-resolving.patch b/pkgs/by-name/mk/mkosi/0002-Fix-library-resolving.patch similarity index 100% rename from pkgs/tools/virtualization/mkosi/0002-Fix-library-resolving.patch rename to pkgs/by-name/mk/mkosi/0002-Fix-library-resolving.patch diff --git a/pkgs/tools/virtualization/mkosi/0003-Fix-QEMU-firmware-path.patch b/pkgs/by-name/mk/mkosi/0003-Fix-QEMU-firmware-path.patch similarity index 100% rename from pkgs/tools/virtualization/mkosi/0003-Fix-QEMU-firmware-path.patch rename to pkgs/by-name/mk/mkosi/0003-Fix-QEMU-firmware-path.patch diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/by-name/mk/mkosi/package.nix similarity index 100% rename from pkgs/tools/virtualization/mkosi/default.nix rename to pkgs/by-name/mk/mkosi/package.nix diff --git a/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch b/pkgs/by-name/mu/mup/ghostscript-permit-file-write.patch similarity index 100% rename from pkgs/applications/audio/mup/ghostscript-permit-file-write.patch rename to pkgs/by-name/mu/mup/ghostscript-permit-file-write.patch diff --git a/pkgs/applications/audio/mup/default.nix b/pkgs/by-name/mu/mup/package.nix similarity index 100% rename from pkgs/applications/audio/mup/default.nix rename to pkgs/by-name/mu/mup/package.nix diff --git a/pkgs/tools/networking/networkmanager/fix-install-paths.patch b/pkgs/by-name/ne/networkmanager/fix-install-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/fix-install-paths.patch rename to pkgs/by-name/ne/networkmanager/fix-install-paths.patch diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/by-name/ne/networkmanager/fix-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/fix-paths.patch rename to pkgs/by-name/ne/networkmanager/fix-paths.patch diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/by-name/ne/networkmanager/package.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/default.nix rename to pkgs/by-name/ne/networkmanager/package.nix diff --git a/pkgs/tools/security/onlykey/default.nix b/pkgs/by-name/on/onlykey/package.nix similarity index 100% rename from pkgs/tools/security/onlykey/default.nix rename to pkgs/by-name/on/onlykey/package.nix diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/by-name/op/openems/package.nix similarity index 100% rename from pkgs/applications/science/electronics/openems/default.nix rename to pkgs/by-name/op/openems/package.nix diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/by-name/pa/parcellite/package.nix similarity index 100% rename from pkgs/tools/misc/parcellite/default.nix rename to pkgs/by-name/pa/parcellite/package.nix diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/by-name/qd/qdigidoc/package.nix similarity index 100% rename from pkgs/tools/security/qdigidoc/default.nix rename to pkgs/by-name/qd/qdigidoc/package.nix diff --git a/pkgs/tools/security/qdigidoc/vendor/.editorconfig b/pkgs/by-name/qd/qdigidoc/vendor/.editorconfig similarity index 100% rename from pkgs/tools/security/qdigidoc/vendor/.editorconfig rename to pkgs/by-name/qd/qdigidoc/vendor/.editorconfig diff --git a/pkgs/tools/security/qdigidoc/vendor/config.json b/pkgs/by-name/qd/qdigidoc/vendor/config.json similarity index 100% rename from pkgs/tools/security/qdigidoc/vendor/config.json rename to pkgs/by-name/qd/qdigidoc/vendor/config.json diff --git a/pkgs/tools/security/qdigidoc/vendor/config.pub b/pkgs/by-name/qd/qdigidoc/vendor/config.pub similarity index 100% rename from pkgs/tools/security/qdigidoc/vendor/config.pub rename to pkgs/by-name/qd/qdigidoc/vendor/config.pub diff --git a/pkgs/tools/security/qdigidoc/vendor/config.rsa b/pkgs/by-name/qd/qdigidoc/vendor/config.rsa similarity index 100% rename from pkgs/tools/security/qdigidoc/vendor/config.rsa rename to pkgs/by-name/qd/qdigidoc/vendor/config.rsa diff --git a/pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml b/pkgs/by-name/qd/qdigidoc/vendor/eu-lotl.xml similarity index 100% rename from pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml rename to pkgs/by-name/qd/qdigidoc/vendor/eu-lotl.xml diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/by-name/sc/schroedinger/package.nix similarity index 100% rename from pkgs/development/libraries/schroedinger/default.nix rename to pkgs/by-name/sc/schroedinger/package.nix diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/by-name/sp/sparse/package.nix similarity index 100% rename from pkgs/development/tools/analysis/sparse/default.nix rename to pkgs/by-name/sp/sparse/package.nix diff --git a/pkgs/development/tools/analysis/sparse/tests.nix b/pkgs/by-name/sp/sparse/tests.nix similarity index 100% rename from pkgs/development/tools/analysis/sparse/tests.nix rename to pkgs/by-name/sp/sparse/tests.nix diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/by-name/tt/ttfautohint/package.nix similarity index 100% rename from pkgs/tools/misc/ttfautohint/default.nix rename to pkgs/by-name/tt/ttfautohint/package.nix diff --git a/pkgs/tools/inputmethods/uim/data-hook.patch b/pkgs/by-name/ui/uim/data-hook.patch similarity index 100% rename from pkgs/tools/inputmethods/uim/data-hook.patch rename to pkgs/by-name/ui/uim/data-hook.patch diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/by-name/ui/uim/package.nix similarity index 100% rename from pkgs/tools/inputmethods/uim/default.nix rename to pkgs/by-name/ui/uim/package.nix diff --git a/pkgs/os-specific/linux/v4l-utils/musl.patch b/pkgs/by-name/v4/v4l-utils/musl.patch similarity index 100% rename from pkgs/os-specific/linux/v4l-utils/musl.patch rename to pkgs/by-name/v4/v4l-utils/musl.patch diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/by-name/v4/v4l-utils/package.nix similarity index 100% rename from pkgs/os-specific/linux/v4l-utils/default.nix rename to pkgs/by-name/v4/v4l-utils/package.nix diff --git a/pkgs/applications/science/logic/vampire/minisat-fenv.patch b/pkgs/by-name/va/vampire/minisat-fenv.patch similarity index 100% rename from pkgs/applications/science/logic/vampire/minisat-fenv.patch rename to pkgs/by-name/va/vampire/minisat-fenv.patch diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/by-name/va/vampire/package.nix similarity index 100% rename from pkgs/applications/science/logic/vampire/default.nix rename to pkgs/by-name/va/vampire/package.nix diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/by-name/vi/virt-manager/package.nix similarity index 100% rename from pkgs/applications/virtualization/virt-manager/default.nix rename to pkgs/by-name/vi/virt-manager/package.nix diff --git a/pkgs/applications/misc/whalebird/missing-hashes.json b/pkgs/by-name/wh/whalebird/missing-hashes.json similarity index 100% rename from pkgs/applications/misc/whalebird/missing-hashes.json rename to pkgs/by-name/wh/whalebird/missing-hashes.json diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/by-name/wh/whalebird/package.nix similarity index 100% rename from pkgs/applications/misc/whalebird/default.nix rename to pkgs/by-name/wh/whalebird/package.nix diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/by-name/x2/x2goclient/package.nix similarity index 100% rename from pkgs/applications/networking/remote/x2goclient/default.nix rename to pkgs/by-name/x2/x2goclient/package.nix diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/by-name/ze/zexy/package.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/zexy/default.nix rename to pkgs/by-name/ze/zexy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cf07ca6e30b..f99569d43778 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1081,8 +1081,6 @@ with pkgs; makehuman = libsForQt5.callPackage ../applications/misc/makehuman { }; - mkosi = callPackage ../tools/virtualization/mkosi { }; - mkosi-full = mkosi.override { withQemu = true; }; mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { }; @@ -1629,8 +1627,6 @@ with pkgs; inherit (cue) writeCueValidator; - cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { }; - dazel = python3Packages.callPackage ../development/tools/dazel { }; detect-secrets = with python3Packages; toPythonApplication detect-secrets; @@ -2707,8 +2703,6 @@ with pkgs; callPackage ../servers/search/elasticsearch/plugins.nix { } ); - embree = callPackage ../development/libraries/embree { }; - emborg = python3Packages.callPackage ../development/python-modules/emborg { }; encfs = callPackage ../tools/filesystems/encfs { @@ -3003,8 +2997,6 @@ with pkgs; gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa; - gsmlib = callPackage ../development/libraries/gsmlib { }; - gssdp = callPackage ../development/libraries/gssdp { }; gssdp_1_6 = callPackage ../development/libraries/gssdp/1.6.nix { }; @@ -3062,8 +3054,6 @@ with pkgs; threadsafe = true; }; - headscale = callPackage ../servers/headscale { }; - highlight = callPackage ../tools/text/highlight { lua = lua5; }; @@ -3226,8 +3216,6 @@ with pkgs; ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; - libcoap = callPackage ../applications/networking/libcoap { }; - libcryptui = callPackage ../development/libraries/libcryptui { gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; }; @@ -3258,8 +3246,6 @@ with pkgs; lua = lua5_2_compat; }; - kdbg = callPackage ../development/tools/misc/kdbg { }; - kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; lagrange-tui = lagrange.override { enableTUI = true; }; @@ -3562,8 +3548,6 @@ with pkgs; nodejs = nodejs_20; }; - networkmanager = callPackage ../tools/networking/networkmanager { }; - libnma-gtk4 = libnma.override { withGtk4 = true; }; inherit (callPackages ../servers/nextcloud { }) @@ -3646,8 +3630,6 @@ with pkgs; ome_zarr = with python3Packages; toPythonApplication ome-zarr; - onlykey = callPackage ../tools/security/onlykey { }; - ophcrack-cli = ophcrack.override { enableGui = false; }; open-interpreter = with python3Packages; toPythonApplication open-interpreter; @@ -3764,8 +3746,6 @@ with pkgs; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; - parcellite = callPackage ../tools/misc/parcellite { }; - patchutils = callPackage ../tools/text/patchutils { }; patchutils_0_3_3 = callPackage ../tools/text/patchutils/0.3.3.nix { }; @@ -3921,8 +3901,6 @@ with pkgs; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; - qdigidoc = callPackage ../tools/security/qdigidoc { }; - qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { }; @@ -4203,7 +4181,6 @@ with pkgs; trytond = with python3Packages; toPythonApplication trytond; - ttfautohint = callPackage ../tools/misc/ttfautohint { }; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; twilight = callPackage ../tools/graphics/twilight { @@ -4229,8 +4206,6 @@ with pkgs; vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum { }; - vampire = callPackage ../applications/science/logic/vampire { }; - vcmi = libsForQt5.callPackage ../games/vcmi { }; video2midi = callPackage ../tools/audio/video2midi { @@ -4306,8 +4281,6 @@ with pkgs; ufmt = with python3Packages; toPythonApplication ufmt; - uim = callPackage ../tools/inputmethods/uim { }; - unbound-with-systemd = unbound.override { withSystemd = true; }; @@ -4446,8 +4419,6 @@ with pkgs; }; bashInteractiveFHS = bashFHS; - carapace = callPackage ../shells/carapace { }; - wrapFish = callPackage ../shells/fish/wrapper.nix { }; fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); @@ -5092,8 +5063,6 @@ with pkgs; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; - falcon = callPackage ../development/interpreters/falcon { }; - dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { }); gopro-tool = callPackage ../by-name/go/gopro-tool/package.nix { @@ -5349,8 +5318,6 @@ with pkgs; jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - mitscheme = callPackage ../development/compilers/mit-scheme { }; - mitschemeX11 = mitscheme.override { enableX11 = true; }; @@ -6669,8 +6636,6 @@ with pkgs; ); }; - fswatch = callPackage ../development/tools/misc/fswatch { }; - gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -6959,8 +6924,6 @@ with pkgs; snowman = qt5.callPackage ../development/tools/analysis/snowman { }; - sparse = callPackage ../development/tools/analysis/sparse { }; - speedtest-cli = with python3Packages; toPythonApplication speedtest-cli; splint = callPackage ../development/tools/analysis/splint { @@ -7230,8 +7193,6 @@ with pkgs; makeDBusConf = callPackage ../development/libraries/dbus/make-dbus-conf.nix { }; - dee = callPackage ../development/libraries/dee { }; - draco = callPackage ../development/libraries/draco { tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { }; }; @@ -7388,8 +7349,6 @@ with pkgs; geoip = callPackage ../development/libraries/geoip { }; - geos = callPackage ../development/libraries/geos { }; - gettext = callPackage ../development/libraries/gettext { }; gdalMinimal = gdal.override { @@ -8174,8 +8133,6 @@ with pkgs; libxmlxx = callPackage ../development/libraries/libxmlxx { }; libxmlxx3 = callPackage ../development/libraries/libxmlxx/v3.nix { }; - libxslt = callPackage ../development/libraries/libxslt { }; - libwpe = callPackage ../development/libraries/libwpe { }; libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { }; @@ -8700,8 +8657,6 @@ with pkgs; rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; - schroedinger = callPackage ../development/libraries/schroedinger { }; - SDL = SDL_compat; SDL2 = sdl2-compat; @@ -9412,12 +9367,9 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; - directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { }; - dodgy = with python3Packages; toPythonApplication dodgy; etcd = etcd_3_5; - etcd_3_4 = callPackage ../servers/etcd/3_4 { }; etcd_3_5 = callPackage ../servers/etcd/3_5 { }; prosody = callPackage ../servers/xmpp/prosody { @@ -9631,8 +9583,6 @@ with pkgs; ]; }; - libmodsecurity = callPackage ../tools/security/libmodsecurity { }; - nsd = callPackage ../servers/dns/nsd (config.nsd or { }); nsdiff = perlPackages.nsdiff; @@ -10569,8 +10519,6 @@ with pkgs; withLastlog = false; }; - v4l-utils = callPackage ../os-specific/linux/v4l-utils { }; - windows = recurseIntoAttrs (callPackages ../os-specific/windows { }); cygwin = recurseIntoAttrs (callPackages ../os-specific/cygwin { }); @@ -10652,8 +10600,6 @@ with pkgs; moeli = eduli; - emojione = callPackage ../data/fonts/emojione { }; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -11142,8 +11088,6 @@ with pkgs; elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; - elinks = callPackage ../applications/networking/browsers/elinks { }; - inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs30 emacs30-gtk3 @@ -11264,8 +11208,6 @@ with pkgs; libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; }; }; - fclones = callPackage ../tools/misc/fclones { }; - buildMozillaMach = opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { }; @@ -11947,8 +11889,6 @@ with pkgs; shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { }; }; - mandelbulber = callPackage ../applications/graphics/mandelbulber { }; - mastodon-bot = nodePackages.mastodon-bot; matrix-commander = @@ -12115,8 +12055,6 @@ with pkgs; mumble_overlay = (callPackages ../applications/networking/mumble { }).overlay; - mup = callPackage ../applications/audio/mup { }; - musescore = qt6.callPackage ../applications/audio/musescore { }; mwic = callPackage ../applications/misc/mwic { @@ -12953,8 +12891,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - virt-manager = callPackage ../applications/virtualization/virt-manager { }; - virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; @@ -13121,8 +13057,6 @@ with pkgs; xwaylandSupport = false; }; - whalebird = callPackage ../applications/misc/whalebird { }; - inherit (windowmaker) dockapps; wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { }; @@ -13135,8 +13069,6 @@ with pkgs; wsjtx = qt5.callPackage ../applications/radio/wsjtx { }; - x2goclient = callPackage ../applications/networking/remote/x2goclient { }; - x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { }; x32edit = callPackage ../applications/audio/midas/x32edit.nix { }; @@ -13242,8 +13174,6 @@ with pkgs; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; - zexy = callPackage ../applications/audio/pd-plugins/zexy { }; - zed-editor-fhs = zed-editor.fhs; zgv = callPackage ../applications/graphics/zgv { @@ -14247,8 +14177,6 @@ with pkgs; coq ; - coq-kernel = callPackage ../applications/editors/jupyter-kernels/coq { }; - cubicle = callPackage ../applications/science/logic/cubicle { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -14376,8 +14304,6 @@ with pkgs; withNgshared = false; }; - openems = callPackage ../applications/science/electronics/openems { }; - xyce-parallel = callPackage ../by-name/xy/xyce/package.nix { withMPI = true; trilinos = trilinos-mpi; -- knotmirror 0.0.1 From aca4cec72c03e562e99f81879dad442eef48402b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Oct 2025 22:36:42 +0000 Subject: [PATCH 15/25] terraform-providers.buildkite: 1.24.0 -> 1.26.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 238d0928c0a8..0032545a1813 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -225,13 +225,13 @@ "vendorHash": "sha256-pCBmeisWcyw/Box1yrWwYj+hSrsqmToiiom2jS8I1SU=" }, "buildkite": { - "hash": "sha256-w+ljPDKyVlylr87tFhuu/7oCkY/fFeK+LPr7mY7rbP0=", + "hash": "sha256-WP1CcGYtyItpMzKvYFiv5q0jQfvB5nSv8suDmSB1tSs=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.24.0", + "rev": "v1.26.0", "spdx": "MIT", - "vendorHash": "sha256-2xZ2//qMKfgqob39k++fX6vJEx9YE1NJpGCbDyM1L10=" + "vendorHash": "sha256-nKXQsAu1tHOHnle7G0Bt+CCNU9AGvxIIv6LJ/INiU7g=" }, "ccloud": { "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=", -- knotmirror 0.0.1 From 05a468e57405cf934d342fc1125490ff0f200982 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 00:21:39 +0000 Subject: [PATCH 16/25] terraform-providers.google: 7.4.0 -> 7.5.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 238d0928c0a8..8ab32ab9f71f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -525,11 +525,11 @@ "vendorHash": "sha256-29uvPCepGHRPohGY7viaPD9VQPPj9XB/plragACC4e4=" }, "google": { - "hash": "sha256-xQW0UxGIcxD0Y4zdCBnGJhUWfWdMIERk0lkot96ztzI=", + "hash": "sha256-463G4/NtViaBH1B1XVzHT6KVQu+4HnqGWX7hw4CjgNA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v7.4.0", + "rev": "v7.5.0", "spdx": "MPL-2.0", "vendorHash": "sha256-cQybnUaDLVmQrtFkiI5k3OwqN9Oks+J1H2kbkNjO4jc=" }, -- knotmirror 0.0.1 From 1cfea9657a3101a8ee7e794e268b3c52d11c1020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Schr=C3=B6der?= Date: Sun, 5 Oct 2025 17:18:58 +0200 Subject: [PATCH 17/25] warpinator: fix "Connect manually" not working When you clicked on "Connect manually" in the menu, nothing will happen and in the console you see ``` File "/nix/store/764ilfz0lhln19gx470fas661l9g7324-warpinator-1.8.10/libexec/warpinator/warpinator.py", line 839, in manual_connect self.connect_dialog = ManualConnectDialog(self) ~~~~~~~~~~~~~~~~~~~^^^^^^ File "/nix/store/764ilfz0lhln19gx470fas661l9g7324-warpinator-1.8.10/libexec/warpinator/warpinator.py", line 1215, in __init__ img = qr.make_image() File "/nix/store/8akrxjps12p9jgj3j26dd0av7iz04q3h-python3-3.13.7-env/lib/python3.13/site-packages/qrcode/main.py", line 364, in make_image from qrcode.image.pil import Image, PilImage File "/nix/store/8akrxjps12p9jgj3j26dd0av7iz04q3h-python3-3.13.7-env/lib/python3.13/site-packages/qrcode/image/pil.py", line 2, in from PIL import Image, ImageDraw ModuleNotFoundError: No module named 'PIL' ``` --- pkgs/by-name/wa/warpinator/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix index 61e5c92ac7fa..effc1b047dde 100644 --- a/pkgs/by-name/wa/warpinator/package.nix +++ b/pkgs/by-name/wa/warpinator/package.nix @@ -19,7 +19,9 @@ let pythonEnv = python3.withPackages ( - pp: with pp; [ + pp: + with pp; + [ grpcio-tools protobuf pygobject3 @@ -35,6 +37,7 @@ let ifaddr qrcode ] + ++ qrcode.optional-dependencies.pil ); in stdenv.mkDerivation rec { -- knotmirror 0.0.1 From e7b87f3a8a4b0838c5eea9a630f7d299903c120e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 00:40:37 +0000 Subject: [PATCH 18/25] sbt: 1.11.6 -> 1.11.7 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 773f442194e3..c6f0d8c5f7e8 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.11.6"; + version = "1.11.7"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-zkmV6GrPf91X23hZXNaRjAF4Gmp0EXDmQJrbpZfg2D0="; + hash = "sha256-EjKBj5HDljmpO74RCOEtlMcESmRqeEfxo5d7nkZxbNY="; }; postPatch = '' -- knotmirror 0.0.1 From d8a9b1dca86c388f7d96f75d7de08752a31085d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 01:14:18 +0000 Subject: [PATCH 19/25] limine: 10.0.1 -> 10.1.0 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index a10bc7303242..fbaad5b4a2a4 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -42,14 +42,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "10.0.1"; + version = "10.1.0"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-7P8N/HomleQBnoaX6S5V7KwX1GYVIY7XkUYU9Xo9jlk="; + hash = "sha256-Hn1njCaHcdCocnKpAZhkcMXG6tAojVQQtVAW4pVUFGI="; }; enableParallelBuilding = true; -- knotmirror 0.0.1 From e958f7d8ed46436ab97e7d42e3ba3dcc424ec551 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 01:35:16 +0000 Subject: [PATCH 20/25] files-cli: 2.15.104 -> 2.15.111 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index e211784bace8..765f6860e3b7 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.15.104"; + version = "2.15.111"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-7HXLDFTLKHKOhjs01lUPSIW3btvCnffiJZ2VKgHwGiY="; + hash = "sha256-M6SVLloMn/6AmIpfZ0Ib0yUQ33hC9MFjbFTxOlN7kqs="; }; - vendorHash = "sha256-I829gWaDUgbMhnp99p5SvtBRePefCZ86iztHqtWEEzs="; + vendorHash = "sha256-fxh9YOO0xnYo04HwJyctspipSXgWcDoUu40UwhDf8Uk="; ldflags = [ "-s" -- knotmirror 0.0.1 From 61e617498bc95a5b4e717e04e8e06851896daa12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 01:53:30 +0000 Subject: [PATCH 21/25] steam-devices-udev-rules: 1.0.0.61-unstable-2024-05-22 -> 1.0.0.61-unstable-2025-09-26 --- pkgs/by-name/st/steam-devices-udev-rules/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/steam-devices-udev-rules/package.nix b/pkgs/by-name/st/steam-devices-udev-rules/package.nix index b6bc54e2da11..a276442ea802 100644 --- a/pkgs/by-name/st/steam-devices-udev-rules/package.nix +++ b/pkgs/by-name/st/steam-devices-udev-rules/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation { pname = "steam-devices-udev-rules"; - version = "1.0.0.61-unstable-2024-05-22"; + version = "1.0.0.61-unstable-2025-09-26"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "steam-devices"; - rev = "e2971e45063f6b327ccedbf18e168bda6749155c"; - hash = "sha256-kBqWw3TlCSWS7gJXgza2ghemypQ0AEg7NhWqAFnal04="; + rev = "d3f7cd6a955d2191800f01d6d2efb2ee196127c5"; + hash = "sha256-IMrKU6zyR+oTc4Wqca8JBvxoslKUuz8peHMudfwewf0="; }; nativeBuildInputs = [ -- knotmirror 0.0.1 From a7a9ed60f1532b97a13187fa4acd2ca9071358b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 03:02:52 +0000 Subject: [PATCH 22/25] terraform-providers.azuread: 3.5.0 -> 3.6.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 238d0928c0a8..66a13139410f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -144,11 +144,11 @@ "vendorHash": "sha256-xIROXf39bvPjtiKpfn7bfL7SXwHOqUxNqlhrCmDLYGA=" }, "azuread": { - "hash": "sha256-7dbBhQz0MDUAaz4U1ewM2RayWtp5gbo3FrrQ762Tb6A=", + "hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v3.5.0", + "rev": "v3.6.0", "spdx": "MPL-2.0", "vendorHash": null }, -- knotmirror 0.0.1 From 0815ad332bb756585957f0ce516571db02176cdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 03:03:08 +0000 Subject: [PATCH 23/25] terraform-providers.rootly: 4.1.0 -> 4.2.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 238d0928c0a8..7eaa49cf357f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1138,13 +1138,13 @@ "vendorHash": "sha256-vsnihN98O5RzMZk5YNycCnjpvxklQoLbZolCJXbJRMU=" }, "rootly": { - "hash": "sha256-SRE1T9C3qggCwjl/PdehkabdnuRV8ZW58dc8zhSwPXo=", + "hash": "sha256-6m4jzzn5kTGUqY5bitPZI82v+/RA3BXqCYy5aWUCO4c=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v4.1.0", + "rev": "v4.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-39OiEYntUmX2fJZh7G/LcCNFXFmHwdLgFGYz6BUEyOA=" + "vendorHash": "sha256-auyQLDDQ+tfMQCqICDR5tfvaYrO89Eani7lAsfoPwwU=" }, "routeros": { "hash": "sha256-k+q4n20bvYK7nn9ZGQEQH70xt6ugNKzK58XyzwrKh0Q=", -- knotmirror 0.0.1 From 03fd6c71c77a710e9b74ea8a14c6d95c113acd57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 04:18:50 +0000 Subject: [PATCH 24/25] terraform-providers.aws: 6.14.1 -> 6.15.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 238d0928c0a8..c4a6a11c00ef 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -126,13 +126,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-k2lbdaDt/jpkoF5jKll7ZxU+3zkspGvGx/kToqYipAo=", + "hash": "sha256-6ZBQ2AFZBwyEUylCqHn4pn6hmYLIpjMzv5L2pvmCT5Q=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.14.1", + "rev": "v6.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hG1XnJtN95+jW6AGnV4+EkKaVZwG0PPTMLyHFQ3nXtc=" + "vendorHash": "sha256-j4tAFLBdQR35EvQNd12XwQ0kD5wSSVi9/f/N1YbI6IM=" }, "awscc": { "hash": "sha256-wAQLtx+eVtKucdokQLfq1zTAOdMPI2Frio5ILxLGyt8=", -- knotmirror 0.0.1 From 3efd73e3428d1967b7d51cafd1790bd6714755f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 04:42:20 +0000 Subject: [PATCH 25/25] jna: 5.18.0 -> 5.18.1 --- pkgs/by-name/jn/jna/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jn/jna/package.nix b/pkgs/by-name/jn/jna/package.nix index 642dbfc3d3c3..2f676c76419e 100644 --- a/pkgs/by-name/jn/jna/package.nix +++ b/pkgs/by-name/jn/jna/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jna"; - version = "5.18.0"; + version = "5.18.1"; src = fetchFromGitHub { owner = "java-native-access"; repo = "jna"; rev = finalAttrs.version; - hash = "sha256-7ErF/AQntDfxXdHr9HUCM4JoFBNX3sXhJvKE/kzrZZg="; + hash = "sha256-S0magEmA/Gw/26ZdjVnRTOJxBmRiw8DLQg49pRmaUU4="; }; nativeBuildInputs = [ -- knotmirror 0.0.1