| 26 Dec 2023 |
Lily Foster | * So I'm not sure this is a bug so much as an unfortunate consequence of ofborg relying on invisible magic and that magic being broken by the nix derivation refactor that made that common function | 01:39:50 |
Lily Foster | a minor refactor that is something like this would make the magic work again if you really wanted it to trofi:
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index 0ea47dd7e17c..6d62d8a31bfd 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -5,7 +5,7 @@
, hash ? null
, src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit hash; }
, patches ? [ ]
-, maintainers ? with lib.maintainers; [ eelco lovesegfault artturin ]
+, meta ? {}
}:
assert (hash == null) -> (src != null);
let
@@ -243,10 +243,10 @@ self = stdenv.mkDerivation {
'';
homepage = "https://nixos.org/";
license = licenses.lgpl2Plus;
- inherit maintainers;
+ maintainers = with lib.maintainers; [ eelco lovesegfault artturin ];
platforms = platforms.unix;
outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
mainProgram = "nix";
- };
+ } // meta;
};
in self
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4652ddb76a5b..e1d566ecabaa 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -157,7 +157,7 @@ in lib.makeExtensible (self: ({
patches = [
patch-monitorfdhup
];
- maintainers = with lib.maintainers; [ flokli raitobezarius ];
+ meta.maintainers = with lib.maintainers; [ flokli raitobezarius ];
}).override { boehmgc = boehmgc-nix_2_3; };
nix_2_10 = common {
| 01:53:44 |
raitobezarius | In reply to @lily:lily.flowers
a minor refactor that is something like this would make the magic work again if you really wanted it to trofi:
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index 0ea47dd7e17c..6d62d8a31bfd 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -5,7 +5,7 @@
, hash ? null
, src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit hash; }
, patches ? [ ]
-, maintainers ? with lib.maintainers; [ eelco lovesegfault artturin ]
+, meta ? {}
}:
assert (hash == null) -> (src != null);
let
@@ -243,10 +243,10 @@ self = stdenv.mkDerivation {
'';
homepage = "https://nixos.org/";
license = licenses.lgpl2Plus;
- inherit maintainers;
+ maintainers = with lib.maintainers; [ eelco lovesegfault artturin ];
platforms = platforms.unix;
outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
mainProgram = "nix";
- };
+ } // meta;
};
in self
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4652ddb76a5b..e1d566ecabaa 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -157,7 +157,7 @@ in lib.makeExtensible (self: ({
patches = [
patch-monitorfdhup
];
- maintainers = with lib.maintainers; [ flokli raitobezarius ];
+ meta.maintainers = with lib.maintainers; [ flokli raitobezarius ];
}).override { boehmgc = boehmgc-nix_2_3; };
nix_2_10 = common {
please send the patch; looks good to me :( | 05:16:21 |
trofi | I must say I expected $attr.meta.maintainers to Just Work :( | 07:50:13 |
trofi | Filed https://github.com/NixOS/ofborg/issues/668 if that makes sense. | 10:03:50 |
trofi | As a workaround WDYT of adding a pos attribute to the lookup list? I could sprinkle a few pos = allocations for nix edit to do the right thing. | 10:36:42 |
trofi | * As a workaround WDYT of adding a pos attribute to the lookup list? I could sprinkle a few pos = annotations for nix edit to do the right thing. | 10:36:55 |
trofi | Proposed ofborg change as https://github.com/NixOS/ofborg/pull/669 | 10:42:59 |
trofi | And proposed nix pos change as https://github.com/NixOS/nixpkgs/pull/276892 | 10:49:12 |
| 28 Dec 2023 |
| piegames changed their display name from piegames to piegames [☎ 9712]. | 01:33:45 |
| 30 Dec 2023 |
trofi | Looking at https://github.com/NixOS/nixpkgs/pull/277751 and at https://github.com/NixOS/nixpkgs/pull/277741 would it be reasonable for ofborg to try to eval all of passthru? Just an eval for uncatchable errors a few levels deep (like 2-3). | 16:59:31 |
| raitobezarius changed their display name from raitobezarius (DECT 2128) to raitobezarius. | 19:53:26 |
| 31 Dec 2023 |
| piegames changed their display name from piegames [☎ 9712] to piegames. | 12:40:53 |
| 2 Jan 2024 |
@janik0:matrix.org | Hi, I don't know too much about ofborg but shouldn't it still ping maintainers even if it doesn't end up rebuilding the package? https://github.com/NixOS/nixpkgs/pull/277747 | 02:20:37 |
Lily Foster | In reply to @janik0:matrix.org Hi, I don't know too much about ofborg but shouldn't it still ping maintainers even if it doesn't end up rebuilding the package? https://github.com/NixOS/nixpkgs/pull/277747 not currently since it bases maintainer pings on attr rebuilds correlated to changed files. but i may end up changing it to also ping maintainers for all packages mentioned in commits | 02:21:44 |
| 4 Jan 2024 |
| @a-n-n-a-l-e-e:matrix.org joined the room. | 13:18:25 |
| 5 Jan 2024 |
@adam:robins.wtf | is there a way to rerun the auto detected build and tests? | 18:01:22 |
Lily Foster | In reply to @adam:robins.wtf is there a way to rerun the auto detected build and tests? @ofborg build [attr] [attr].passthru.tests and it'll overwrite the original checks with a new build since the check name would match | 18:02:07 |
@adam:robins.wtf | thanks. i would be nice to have a keyword that could just do that for us. e.g. @ofborg rebuild or something | 18:02:47 |