summaryrefslogtreecommitdiffstats
path: root/pkgs/by-name/ro/rollup/patches2/0007-flake.nix-Don-t-perform-source-mapping-via-sources-a.patch
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-11-04 17:56:37 +0100
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-11-05 22:47:43 +0100
commit36e836abf8ead21c88154a7e962a8d397d74b78f (patch)
treef8336765778eb22e847e11bfb9d7c92e334810cd /pkgs/by-name/ro/rollup/patches2/0007-flake.nix-Don-t-perform-source-mapping-via-sources-a.patch
parentflake.nix: Don't perform source mapping via sources and raw_sources (diff)
downloadnixos-config-36e836abf8ead21c88154a7e962a8d397d74b78f.zip
pkgs/rollup: Init
Diffstat (limited to 'pkgs/by-name/ro/rollup/patches2/0007-flake.nix-Don-t-perform-source-mapping-via-sources-a.patch')
-rw-r--r--pkgs/by-name/ro/rollup/patches2/0007-flake.nix-Don-t-perform-source-mapping-via-sources-a.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/pkgs/by-name/ro/rollup/patches2/0007-flake.nix-Don-t-perform-source-mapping-via-sources-a.patch b/pkgs/by-name/ro/rollup/patches2/0007-flake.nix-Don-t-perform-source-mapping-via-sources-a.patch
new file mode 100644
index 00000000..83b4beaa
--- /dev/null
+++ b/pkgs/by-name/ro/rollup/patches2/0007-flake.nix-Don-t-perform-source-mapping-via-sources-a.patch
@@ -0,0 +1,65 @@
+From d0ff20e0e24023c120f47cc3a7b9782152daaa19 Mon Sep 17 00:00:00 2001
+From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
+Date: Mon, 2 Nov 2026 19:56:49 +0100
+Subject: [PATCH 7/7] flake.nix: Don't perform source mapping via sources and
+ raw_sources
+
+---
+ flake.nix | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/flake.nix b/flake.nix
+index 860ce277..9b729bd0 100644
+--- a/flake.nix
++++ b/flake.nix
+@@ -4,16 +4,13 @@
+ inputs = {};
+
+ outputs = {self, ...}: let
+- raw_sources = import ./unflake.nix;
++ sources = import ./unflake.nix;
+
+ system = "x86_64-linux";
+
+- # Filter out the nixpkgs's from the sources, so we always use the `packageSets`.
+- sources = builtins.removeAttrs raw_sources ["nixpkgs-stable" "nixpkgs-unstable" "library"];
+-
+ packageSets = rec {
+- stable = raw_sources.nixpkgs-stable.legacyPackages.${system};
+- unstable = raw_sources.nixpkgs-unstable.legacyPackages.${system};
++ stable = sources.nixpkgs-stable.legacyPackages.${system};
++ unstable = sources.nixpkgs-unstable.legacyPackages.${system};
+
+ in_tree = import ./pkgs {
+ unstable_pkgs = unstable;
+@@ -22,7 +19,7 @@
+ };
+ };
+ lib = packageSets.unstable.lib;
+- extra_lib = raw_sources.library.nixLib;
++ extra_lib = sources.library.extraLib {inherit lib;};
+
+ extra_modules = {
+ nixos = {
+@@ -37,7 +34,8 @@
+ };
+ home = {
+ nix-index-database = sources.nix-index-database.homeModules.nix-index;
+- nixvim = sources.nixvim.homeManagerModule;
++ nixvim = sources.nixvim.homeModules.nixvim;
++ turtle = sources.turtle.nixosModules.home-manager;
+ };
+ };
+ module_args = {
+@@ -76,7 +74,7 @@
+ system
+ ;
+ inherit
+- (raw_sources)
++ (sources)
+ nixpkgs-unstable
+ nixpkgs-stable
+ deploy-rs
+--
+2.55.0
+