pkgs/*: migrate stdenv -> stdenvNoCC for packages which dont need a compiler

pkgs/by-name/cassini/package.nix

@@ -4,8 +4,8 @@
   fetchFromGitea,
   fetchpatch,
   python3,
-  stdenv,
+  stdenvNoCC,
-}: stdenv.mkDerivation (finalAttrs: {
+}: stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cassini";
   version = "0-unstable-2024-03-30";
 

pkgs/by-name/codemadness-frontends/package.nix

@@ -1,17 +1,16 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchgit
+  stdenv,
-, libressl
+  fetchgit,
+  libressl,
 }:
-
+stdenv.mkDerivation (finalAttrs: {
-let
-self = stdenv.mkDerivation rec {
   pname = "codemadness-frontends";
   version = "0.8";
 
   src = fetchgit {
     url = "git://git.codemadness.org/frontends";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-KRQZKP3i7EKidUejk3iw/Jh6Dpcp0NJZmRXCStMAtCM=";
   };
 
@@ -41,7 +40,7 @@ self = stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    v0_6 = self.overrideAttrs (_: rec {
+    v0_6 = finalAttrs.finalPackage.overrideAttrs (_: rec {
       version = "0.6";
       src = fetchgit {
         url = "git://git.codemadness.org/frontends";
@@ -58,6 +57,5 @@ self = stdenv.mkDerivation rec {
     homepage = "https://codemadness.org/idiotbox.html";
     license = licenses.isc;
   };
-};
+})
-in self
 

pkgs/by-name/docsets/lua-std/package.nix

@@ -1,9 +1,9 @@
 {
   dashing,
   lua,
-  stdenv,
+  stdenvNoCC,
 }:
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "docsets-lua-std";
   inherit (lua) version;
 

pkgs/by-name/docsets/nix-builtins/package.nix

@@ -3,7 +3,7 @@
   jq,
   nix,
   runCommand,
-  stdenv,
+  stdenvNoCC,
 }:
 let
   # nix has logic to build an attrset of all the items which make it into `nix.doc`
@@ -18,7 +18,7 @@ let
     nix __dump-language | jq . > $out/locations.json
   '';
 
-  docset = stdenv.mkDerivation {
+  docset = stdenvNoCC.mkDerivation {
     pname = "nix-builtins";
     version = nix.version;
 

pkgs/by-name/docsets/nixpkgs-lib/package.nix

@@ -7,7 +7,7 @@
   docsets,
   lib,
   # nixpkgs-manual,
-  stdenv,
+  stdenvNoCC,
 }:
 let
   # nixpkgs has logic to build an attrset of all the items which make it into nixpkgs-manual.
@@ -21,7 +21,7 @@ let
     '';
   });
 
-in stdenv.mkDerivation {
+in stdenvNoCC.mkDerivation {
   pname = "nixpkgs-lib";
   version = lib.version;
 

pkgs/by-name/euicc-manual/package.nix

@@ -6,12 +6,10 @@
   fetchFromGitea,
   hugo,
   lib,
-  stdenv,
+  stdenvNoCC,
   unstableGitUpdater,
 }:
-let
+stdenvNoCC.mkDerivation (finalAttrs: {
-  self = stdenv.mkDerivation
-{
   pname = "euicc-manual";
   version = "0-unstable-2025-05-20";
 
@@ -37,8 +35,8 @@ let
 
   passthru = {
     updateScript = unstableGitUpdater { };
-    ci_manifest = "${self}/share/doc/euicc-manual/docs/pki/eum/manifest.json";
+    ci_manifest = "${finalAttrs.finalPackage}/share/doc/euicc-manual/docs/pki/eum/manifest.json";
-    eum_manifest = "${self}/share/doc/euicc-manual/docs/pki/ci/manifest.json";
+    eum_manifest = "${finalAttrs.finalPackage}/share/doc/euicc-manual/docs/pki/ci/manifest.json";
   };
 
   meta = with lib; {
@@ -47,5 +45,4 @@ let
     repo = "https://gitea.osmocom.org/sim-card/euicc-manual";
     maintainers = with maintainers; [ colinsane ];
   };
-};
+})
-in self

pkgs/by-name/feeds/template.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchurl,
   update-feed,
 }:
@@ -8,7 +8,7 @@
 # feed-specific args
 { feedName, jsonPath, url }:
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = feedName;
   version = "20230112";
   src = fetchurl {
@@ -19,6 +19,11 @@ stdenv.mkDerivation {
   ];
   meta = {
     description = "metadata about any feeds available at ${feedName}";
+    longDescription = ''
+      this package isn't meant to actually be built;
+      it exists to provide an `updateScript` for a given feed,
+      so that feed metadata can be sync'd from the web into nix-native data structures.
+    '';
     homepage = feedName;
     maintainers = with lib.maintainers; [ colinsane ];
     platforms = lib.platforms.all;

pkgs/by-name/feedsearch-crawler/package.nix

@@ -2,10 +2,10 @@
   lib,
   fetchFromGitHub,
   python3,
-  stdenv,
+  stdenvNoCC,
   unstableGitUpdater,
 }:
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "feedsearch-crawler";
   version = "0.2.7-unstable-2022-05-28";
   format = "pyproject";

pkgs/by-name/geoclue-ols/package.nix

@@ -3,8 +3,8 @@
   fetchFromGitea,
   fastcluster,
   python3,
-  stdenv,
+  stdenvNoCC,
-}: stdenv.mkDerivation {
+}: stdenvNoCC.mkDerivation {
   pname = "ols";
   version = "0.1.0-unstable-2024-06-30";
   format = "pyproject";

pkgs/by-name/gopass-native-messaging-host/package.nix

@@ -2,7 +2,7 @@
   bash,
   gopass-jsonapi,
   replaceVarsWith,
-  stdenv,
+  stdenvNoCC,
 }:
 let
   gopass-wrapper = replaceVarsWith {
@@ -13,7 +13,7 @@ let
     };
   };
 in
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "gopass-native-messaging-host";
   version = "1.0";
   src = ./.;

pkgs/by-name/listparser/package.nix

@@ -3,9 +3,9 @@
   lib,
   nix-update-script,
   python3,
-  stdenv,
+  stdenvNoCC,
 }:
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "listparser";
   version = "0.20";
 

pkgs/by-name/ollamaPackages/deepseek-r1-14b.nix

@@ -2,7 +2,7 @@
 { mkOllamaModel }: mkOllamaModel {
   modelName = "deepseek-r1";
   variant = "14b";
-  manifestHash = "sha256-6jXf4YGC9jXuKyFOowt1IP4a2mjaAY+LOVtES2YtTxo=";
+  manifestHash = "sha256-wzO3IyvbUhI2aU/7tfWmsRzEXZjpFCxzEjtnD8pACwk=";
   modelBlob = "6e9f90f02bb3b39b59e81916e8cfce9deb45aeaeb9a54a5be4414486b907dc1e";
   modelBlobHash = "sha256-bp+Q8Cuzs5tZ6BkW6M/OnetFrq65pUpb5EFEhrkH3B4=";
   paramsBlob = "f4d24e9138dd4603380add165d2b0d970bef471fac194b436ebd50e6147c6588";

pkgs/by-name/ollamaPackages/deepseek-r1-1_5b.nix

@@ -2,7 +2,7 @@
 { mkOllamaModel }: mkOllamaModel {
   modelName = "deepseek-r1";
   variant = "1.5b";
-  manifestHash = "sha256-pCsl2MEKhBvSRyQwmJiuhRRmaWp9fzoKQIuJVTjMvJY=";
+  manifestHash = "sha256-4JeWMttaiNGlOITLKpQXctEP9dBVqrqmgBxONvOmwtc=";
   modelBlob = "aabd4debf0c8f08881923f2c25fc0fdeed24435271c2b3e92c4af36704040dbc";
   modelBlobHash = "sha256-qr1N6/DI8IiBkj8sJfwP3u0kQ1JxwrPpLErzZwQEDbw=";
   paramsBlob = "f4d24e9138dd4603380add165d2b0d970bef471fac194b436ebd50e6147c6588";

pkgs/by-name/ollamaPackages/deepseek-r1-7b.nix

@@ -2,7 +2,7 @@
 { mkOllamaModel }: mkOllamaModel {
   modelName = "deepseek-r1";
   variant = "7b";
-  manifestHash = "sha256-CowmaRAjL9MpHnHluh4FjMWvnUERks+IttMOkrbnMWM=";
+  manifestHash = "sha256-dVztAs5779sTt8p04eTQjN26SYav22OkgPLJPTFAOD8=";
   modelBlob = "96c415656d377afbff962f6cdb2394ab092ccbcbaab4b82525bc4ca800fe8a49";
   modelBlobHash = "sha256-lsQVZW03evv/li9s2yOUqwksy8uqtLglJbxMqAD+ikk=";
   paramsBlob = "f4d24e9138dd4603380add165d2b0d970bef471fac194b436ebd50e6147c6588";

pkgs/by-name/ollamaPackages/mkOllamaModel.nix

@@ -2,7 +2,7 @@
   fetchurl,
   jq,
   lib,
-  stdenv,
+  stdenvNoCC,
 }:
 {
   modelName,
@@ -18,29 +18,32 @@
   systemBlob ? "",
   systemBlobHash ? "",
 }:
-stdenv.mkDerivation {
+let
-  name = modelName;
+  longModelName = "${modelName}-${variant}";
+in
+stdenvNoCC.mkDerivation {
+  name = longModelName;
   srcs = [
     (fetchurl {
-      name = "manifest";
+      name = "${longModelName}/manifest";
       url = "https://registry.ollama.ai/v2/${owner}/${modelName}/manifests/${variant}";
       hash = manifestHash;
     })
   ] ++ lib.optionals (modelBlob != "") [
     (fetchurl {
-      name = "model-blob";
+      name = "${longModelName}/model-blob";
       url = "https://registry.ollama.ai/v2/llama/${modelName}:${variant}/blobs/sha256-${modelBlob}";
       hash = modelBlobHash;
     })
   ] ++ lib.optionals (paramsBlob != "") [
     (fetchurl {
-      name = "params-blob";
+      name = "${longModelName}/params-blob";
       url = "https://registry.ollama.ai/v2/llama/${modelName}:${variant}/blobs/sha256-${paramsBlob}";
       hash = paramsBlobHash;
     })
   ] ++ lib.optionals (systemBlob != "") [
     (fetchurl {
-      name = "system-blob";
+      name = "${longModelName}/system-blob";
       url = "https://registry.ollama.ai/v2/llama/${modelName}:${variant}/blobs/sha256-${systemBlob}";
       hash = systemBlobHash;
     })
@@ -53,8 +56,13 @@ stdenv.mkDerivation {
   unpackPhase = ''
     runHook preUnpack
 
+    # unpack all the name-hashed sources to have names more easy to work with:
+    # - manifest
+    # - model-blob
+    # - ...
     for _src in $srcs; do
-      _srcName=$(stripHash "$_src")
+      _longSrcName=$(stripHash "$_src")
+      _srcName="''${_longSrcName/${longModelName}-/}"
       ln -s "$_src" "$_srcName"
     done
 

pkgs/by-name/opencellid/package.nix

@@ -6,11 +6,11 @@
   gzip,
   lib,
   nix-update-script,
-  stdenv,
+  stdenvNoCC,
   writeShellApplication,
 }:
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "opencellid";
   version = "0-unstable-2025-06-04";
 

pkgs/by-name/pa-dlna/package.nix

@@ -4,10 +4,10 @@
   libpulseaudio,
   pulseaudio,
   python3,
-  stdenv,
+  stdenvNoCC,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pa-dlna";
   version = "0.7";
   format = "pyproject";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "xdegaye";
     repo = "pa-dlna";
-    rev = "v${finalAttrs.version}";
+    rev = "${finalAttrs.version}";
     hash = "sha256-tc3AjxTMeLH82d8R95xsqLeAH1t/orW7c9DGjBwDWaU=";
   };
 

pkgs/by-name/pine64-alsa-ucm/package.nix

@@ -2,10 +2,10 @@
   fetchFromGitLab,
   gnused,
   lib,
-  stdenv,
+  stdenvNoCC,
   withVoiceCall ? false,  #< enable the "Voice Call" audio variants, which frequently don't work and idk what they're *supposed* to do
 }:
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "pine64-alsa-ucm";
   version = "unstable-2021-12-10";
 

pkgs/by-name/podcastindex-db/package.nix

@@ -7,11 +7,11 @@
   lib,
   nix-update-script,
   sqlite,
-  stdenv,
+  stdenvNoCC,
   writeShellApplication,
 }:
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "podcastindex-db";
   version = "0-unstable-2025-06-02";
 

pkgs/by-name/pyln-client/package.nix

@@ -4,10 +4,10 @@
   pyln-bolt7,
   pyln-proto,
   python3,
-  stdenv,
+  stdenvNoCC,
   unzip,
 }:
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "pyln-client";
   format = "pyproject";
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     unzip  # used by `unpackPhase`
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     pyln-bolt7
     pyln-proto
   ];

pkgs/by-name/pyln-proto/package.nix

@@ -2,11 +2,11 @@
 {
   clightning,
   python3,
-  stdenv,
+  stdenvNoCC,
   unzip,
 }:
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "pyln-proto";
   format = "pyproject";
 

pkgs/by-name/sane-backgrounds/package.nix

@@ -3,10 +3,11 @@
 #   - <https://github.com/NixOS/nixos-artwork/issues/50>  (colorful; unmerged)
 #   - <https://github.com/NixOS/nixos-artwork/pull/60/files>  (desktop-oriented; clean; unmerged)
 # - <https://itsfoss.com/content/images/2023/04/nixos-tutorials.png>
-{ stdenv
+{
-, inkscape
+  stdenvNoCC,
+  inkscape,
 }:
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "sane-backgrounds";
   version = "0.3";
 

pkgs/by-name/sane-nix-files/package.nix

@@ -1,14 +1,13 @@
-{ stdenv ? null }:
+{ stdenvNoCC ? null }:
-with builtins;
 let
-  src = filterSource
+  src = builtins.filterSource
     (path: type:
-      let name = baseNameOf path;
+      let name = builtins.baseNameOf path;
     in !(
       # mimic .gitignore
       (name == ".working")
       || (name == "result")
-      || (match "^result-.*" name != null)
+      || (builtins.match "^result-.*" name != null)
     ))
     ../../../.
   ;
@@ -20,7 +19,7 @@ let
     # so just yield something importable.
     outPath = src;
   };
-  realDeriv = stdenv.mkDerivation {
+  realDeriv = stdenvNoCC.mkDerivation {
     name = "sane-nix-files";
     inherit src;
     installPhase = ''
@@ -48,7 +47,7 @@ let
   #   ];
   # };
 in
-  if stdenv == null then
+  if stdenvNoCC == null then
     fakeDeriv
   else
     realDeriv

pkgs/by-name/sane-scripts/package.nix

@@ -2,7 +2,7 @@
   lib,
   python3,
   static-nix-shell,
-  stdenv,
+  stdenvNoCC,
   symlinkJoin,
   transmission_4,
 }:
@@ -11,7 +11,7 @@ let
   sane-lib = {
     # TODO: we could simplify the lib/ folder structure
     # by auto-generating the setup.py files in `postPatch`, below
-    bt = stdenv.mkDerivation {
+    bt = stdenvNoCC.mkDerivation {
       pname = "sane-lib-bt";
       version = "0.1.0";
       src = ./src/lib/bt;
@@ -32,7 +32,7 @@ let
       doCheck = true;
       strictDeps = true;
     };
-    ssdp = stdenv.mkDerivation {
+    ssdp = stdenvNoCC.mkDerivation {
       pname = "sane-lib-ssdp";
       version = "0.1.0";
       src = ./src/lib/ssdp;

pkgs/by-name/static-nix-shell/package.nix

@@ -5,7 +5,7 @@
   makeBinaryWrapper,
   oils-for-unix,
   python3,
-  stdenv,
+  stdenvNoCC,
   zsh,
 }:
 
@@ -77,7 +77,7 @@ in rec {
     # -p python3.pkgs.foo.propagatedBuildInputs
     pkgsEnv' = lib.flatten pkgsEnv;
   in
-    stdenv.mkDerivation (final: {
+    stdenvNoCC.mkDerivation ({
       version = "0.1.0";  # default version
       preferLocalBuild = true;
 

pkgs/by-name/trivial-builders/package.nix

@@ -4,12 +4,12 @@
   linkIntoOwnPackage,
   rmDbusServicesInPlace,
   runCommandLocalOverridable,
-  stdenv,
+  stdenvNoCC,
   symlinkJoin,
 }:
 {
   # like `runCommandLocal`, but can be `.overrideAttrs` and supports standard phases/hooks like `postBuild`, etc.
-  runCommandLocalOverridable = name: env: buildPhase: stdenv.mkDerivation {
+  runCommandLocalOverridable = name: env: buildPhase: stdenvNoCC.mkDerivation {
     inherit name;
     preferLocalBuild = true;
     dontUnpack = true;

pkgs/by-name/uassets/package.nix

@@ -1,9 +1,10 @@
-{ stdenv
+{
-, lib
+  stdenvNoCC,
-, fetchFromGitHub
+  lib,
-, nix-update-script
+  fetchFromGitHub,
+  nix-update-script,
 }:
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "uassets";
   version = "0-unstable-2025-06-04";
   src = fetchFromGitHub {

pkgs/by-name/zimPackages/mkVersionedHttpZim.nix

@@ -4,7 +4,7 @@
 {
   directoryListingUpdater,
   fetchurl,
-  stdenv,
+  stdenvNoCC,
 }:
 {
   pname,
@@ -16,7 +16,7 @@ let
   tail = "${pname}_${version}.zim";
   prefix = if owner != null then "${owner}/" else "";
 in
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   inherit pname version;
 
   src = fetchurl {