srhb

git bisect start
# good: [8d1510abfb592339e13ce8f6db6f29c1f8b72924] Merge pull request #67606 from endocrimes/r-vault-1.2.2
git bisect good 8d1510abfb592339e13ce8f6db6f29c1f8b72924
# bad: [e19054ab3cd5b7cc9a01d0efc71c8fe310541065] python3Packages.django_2_2: 2.2.4 -> 2.2.5
git bisect bad e19054ab3cd5b7cc9a01d0efc71c8fe310541065
# good: [b466079cd675aa7452a5cf76e9fca4065d4eea15] haskell.packages.ghc881.memory: fix build
git bisect good b466079cd675aa7452a5cf76e9fca4065d4eea15
# good: [d8d68e1af16e734a7bddfd491e30549896bde8a1] fava: 1.10 -> 1.11
git bisect good d8d68e1af16e734a7bddfd491e30549896bde8a1
# bad: [66bc7fc1b3e7a85a2cfde9bb121498a181d411a4] Merge master into staging-next

srhb

let
  workingRev = "8d1510a";
  brokenRev = "57b66eb";
  nixpkgs = rev: builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
  machine = rev:
    (import (nixpkgs rev + "/nixos") {
      configuration = { ... }: {
        services.xserver = {
          enable = true;
          displayManager.lightdm.enable = true;

srhb

let
  overlay = self: super: {
    howdy = super.runCommand "howdy" {} ''
      mkdir -p $out/bin

      ${self.bbe}/bin/bbe -e \
        's/Hello/Howdy/' \
        ${super.hello}/bin/hello \
        > $out/bin/howdy

srhb

diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index 4e490f7e7be..6f360d6e944 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -38,7 +38,7 @@ let
                     -f --cluster ${clusterName} --id ${daemonId} --setuser ceph \
                     --setgroup ${if daemonType == "osd" then "disk" else "ceph"}'';
     } // extraServiceConfig
-      // optionalAttrs (daemonType == "osd") { ExecStartPre = ''${ceph.out}/libexec/ceph/ceph-osd-prestart.sh \
+      // optionalAttrs (daemonType == "osd") { ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh \

srhb

{ pkgs ? import <nixpkgs> {} }:
pkgs.haskellPackages.shellFor {
  packages = _: [ (pkgs.haskellPackages.callPackage ./default.nix {}) ];
  buildInputs = with pkgs; [
    ghcid
    cabal-install
  ];
}

srhb

{ lib, pkgs, config, ... }:
let

cfg = config.services.nixos-rollback;

get-system-generation = pkgs.writeShellScriptBin "get-system-generation" ''
  #!${pkgs.stdenv.shell}
  set -euo pipefail

  /var/run/current-system/sw/bin/nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current | ${pkgs.gawk}/bin/awk '{print $1}'

srhb

{ lib, pkgs, config, ... }:
let

cfg = config.services.nixos-rollback;

get-system-generation = pkgs.writeShellScriptBin "get-system-generation" ''
  #!${pkgs.stdenv.shell}
  set -euo pipefail

  /var/run/current-system/sw/bin/nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current | ${pkgs.gawk}/bin/awk '{print $1}'

srhb

machine: must succeed: nixos-container destroy foo
machine# [   47.087873] systemd[1]: Stopping Container 'foo'...
machine# [   47.095529] systemd-machined[3926]: Failed to drop reference to machine scope, ignoring: Unit has not been referenced yet.
machine# [   47.106594] nscd[722]: 722 monitoring file `/etc/passwd` (1)
machine# [   47.109695] nscd[722]: 722 monitoring directory `/etc` (2)
machine# [   47.113461] nscd[722]: 722 monitoring file `/etc/group` (3)
machine# [   47.117609] container foo[8800]: cat: /run/containers/foo.pid: No such file or directory
machine# [   47.119245] nscd[722]: 722 monitoring directory `/etc` (2)
machine# [   47.120492] systemd[1]: [email protected]: Control process exited, code=exited, status=1/FAILURE
machine# [   47.122389] nscd[722]: 722 monitoring file `/etc/resolv.conf` (5)

srhb

{ stdenv
, callPackage
, lib
, dpkg
# Package dependencies
, fetchurl
, fuse
, curl
, libevent
, libsearpc

srhb

diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 368e02cb33..73f68d18f6 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -1,3 +1,4 @@
+#pragma GCC diagnostic ignored "-Wshadow"
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "conf-parser.h"
@@ -319,6 +320,12 @@ static const char* const config_file[] = {