~kaction/config

315c1fe698f708e60aa404e8e6d9a91b8f4f825e — Dmitry Bogatov 7 months ago 8084b99
Upgrade base snapshot to release 20.09

It resulted in some regressions (nixfmt not building, some forbidden
dependencies slipping into dependency tree), which will be fixed by
other commits before this branch can be merged into master.
4 files changed, 15 insertions(+), 17 deletions(-)

M flake.lock
M flake.nix
M universe/default.nix
M universe/libusb1/default.nix
M flake.lock => flake.lock +7 -8
@@ 2,18 2,17 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
        "lastModified": 1606194000,
        "narHash": "sha256-pDD4Qz+NHM25IX1Ercy9kqh1HyeVg7xlgUOZ7MZBSs8=",
        "ref": "fork/0",
        "rev": "4882bdae7c4471279515dc1f427f6762429cb2f4",
        "revCount": 250143,
        "lastModified": 1612057845,
        "narHash": "sha256-FslNuG72XCR+Sbxl0jgw71ccSgdLm2iTVI7h/LtUDM0=",
        "ref": "master",
        "rev": "3682b2d9affc30f1fa02028ed8e8cfae88ef5cc2",
        "revCount": 267091,
        "type": "git",
        "url": "https://github.com/kaction/nixpkgs"
        "url": "https://github.com/nixos/nixpkgs?tag=20.09"
      },
      "original": {
        "ref": "fork/0",
        "type": "git",
        "url": "https://github.com/kaction/nixpkgs"
        "url": "https://github.com/nixos/nixpkgs?tag=20.09"
      }
    },
    "root": {

M flake.nix => flake.nix +1 -2
@@ 5,8 5,7 @@
# me. Maybe I will regret it, who knows?
{
  description = "Personal flake of ~kaction";
  inputs.nixpkgs.url = "git+https://github.com/kaction/nixpkgs?ref=fork/0";

  inputs.nixpkgs.url = "git+https://github.com/nixos/nixpkgs?tag=20.09";
  outputs = { self, nixpkgs }:
    let
      system = "x86_64-linux"; # See note [On supported architectures]

M universe/default.nix => universe/default.nix +6 -6
@@ 9,13 9,13 @@ let
  banished = with pkgs; builtins.concatLists (map outputs [
    pristine-execline
    systemd
    pam
    kerberos
    ## pam
    ## kerberos
    dbus
    coreutils
    ## coreutils
    man
    acl
    attr
    ## acl
    ## attr
    libusb1
    xorg.libX11
  ]);


@@ 58,7 58,7 @@ let
      mutt
      newsboat
      nix # unstable Nix with flakes support
      nixfmt
      ## nixfmt
      nnn # file manager for poorly named files
      openssh
      pkgsStatic.par # Like fmt(1), but better.

M universe/libusb1/default.nix => universe/libusb1/default.nix +1 -1
@@ 1,4 1,4 @@
{ libusb1 }:
let
  stage1 = libusb1.override { enableSystemd = false; };
  stage1 = libusb1.override { enableUdev = false; };
in stage1