!sBfrWMVsLoSyFTCkNv:nixos.org

OfBorg

166 Members
Number of builds and evals in queue: <TBD>62 Servers

Load older messages


SenderMessageTime
7 Jul 2021
@andi:kack.itandi-

Perhaps this is cleaner:

diff --git a/default.nix b/default.nix
index 644ebb0..ed618f0 100644
--- a/default.nix
+++ b/default.nix
@@ -4,25 +4,39 @@
 }:

 let
-  pkg = pkgs.rustPlatform.buildRustPackage {
+  inherit (pkgs) lib;
+
+  pkg = pkgs.callPackage ({ lib
+  , stdenv
+  , rustPlatform
+  , pkgconfig
+  , rustPackages
+  , darwin
+  , nix-gitignore
+  , openssl
+  , nix
+  }: rustPlatform.buildRustPackage {
     name = "ofborg";
-    src = pkgs.nix-gitignore.gitignoreSource [] ./.;
+    src = nix-gitignore.gitignoreSource [] ./.;

-    nativeBuildInputs = with pkgs; [
+    nativeBuildInputs = [
       pkgconfig
       pkgs.rustPackages.clippy
     ];

-    buildInputs = with pkgs; [
+    buildInputs = [
       openssl
-    ];
+    ] ++ lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      Security
+      CoreFoundation
+    ]);

     preBuild = ''
       cargo clippy
     '';

     doCheck = false; # Tests require access to a /nix/ and a nix daemon
-    checkInputs = with pkgs; [
+    checkInputs = [
       nix
     ];

@@ -32,7 +46,7 @@ let
         "hubcaps-0.3.16" = "1p7rn8y71fjwfag65437gz7a56pysz9n69smaknvblyxpjdzmh4d";
       };
     };
-  };
+  }) {};
21:42:49
@cole-h:matrix.orgcole-h andi-: Thanks -- the darwin machine is back up :) 21:59:02
@andi:kack.itandi-the one single darwin machine. That is a nice summary of Darwin support ;-)21:59:30
@cole-h:matrix.orgcole-hlol21:59:35
@andi:kack.itandi-did you also deploy the PHP part? That is the one I am scare about22:00:16
@andi:kack.itandi-I never ever tried running that22:00:24
@cole-h:matrix.orgcole-hYep, everything is totally deployed :P22:00:26
@cole-h:matrix.orgcole-hofborg is responding to PR's, so I believe that the PHP stuff is all good22:02:04
@andi:kack.itandi-fascinating22:02:15
@cole-h:matrix.orgcole-h(Since the php stuff is only for the webhook AFAICT)22:02:16
@andi:kack.itandi-It is only used for the webhooks yeah22:02:33
@cole-h:matrix.orgcole-hphew, crisis averted22:02:43
@andi:kack.itandi-For the purpose of maintainability I could open a PR that swaps it with a simple python script that I use elsewhere for GitHub events22:03:01
@cole-h:matrix.orgcole-hTBH sounds like a net-good, but we'd have to discuss with Graham. Maybe start with a draft / WIP PR, if you feel like investing the time into an uncertain prospect? :P22:03:56
@cole-h:matrix.orgcole-h(Rather, I'd have to discuss with him -- though I do the bulk of maintenance now, I defer to him for "larger" decisions like these)22:04:18
@andi:kack.itandi- cole-h: What is the strategy towards keeping the nixpkgs pin up2date within ofborg? The Hydra jobset already builds against the latest release IIRC. What is used for deployment? The pin in the JSON file? 22:13:26
8 Jul 2021
@cole-h:matrix.orgcole-hhttps://github.com/ofborg/infrastructure/blob/master/nix/sources.json <-- this is what's used for deployment07:30:39
@cole-h:matrix.orgcole-hThe nixpkgs update strategy is really just kinda "leave it alone until an urgent security update is merged" or something of similar priority.07:31:12
@andi:kack.itandi-Ok, I would have proposed niv + the GitHub Action that updates those pins.07:37:09
@cole-h:matrix.orgcole-hhttps://github.com/ofborg/infrastructure/blob/master/nix/sources.json <-- this is what's used for deployment15:22:15
@cole-h:matrix.orgcole-h(For whatever reason, that didn't send when I answered your question.....)15:22:32
@andi:kack.itandi-It did. I see it twice.16:26:11
@cole-h:matrix.orgcole-hfdskl;jkl19:20:12
@cole-h:matrix.orgcole-hMatrix blah19:20:17
11 Jul 2021
@joaquinito2051:tedomum.netjoaquinito2051 joined the room.13:46:33
@mjolnir:nixos.orgNixOS Moderation Bot banned @joaquinito2051:tedomum.netjoaquinito2051 (ban evasion).17:00:10
16 Jul 2021
@sandro:supersandro.deSandroI just opened https://github.com/NixOS/ofborg/pull/572 because I just hunted some aliases in unfree packages08:27:17
@sandro:supersandro.deSandroI hope that change should catch them but it might create some regressions08:27:36
20 Jul 2021
@cw:kernelpanic.cafeChinchilla Wetreat changed their display name from cw (Vi/Vim) to continuouswave.20:34:38
23 Jul 2021
@sandro:supersandro.deSandroWhy is ofborg never building python3Packages? Am I and most people do something wrong or can't it detect those?12:09:32

Show newer messages


Back to Room ListRoom Version: 6