Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8acf4cd06cd5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a25b5c3cbea
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Oct 6, 2019

  1. nixos/blcr: remove

    @joachifm
    joachifm committed Oct 6, 2019
    2
    Copy the full SHA
    923c449 View commit details

  2. linuxPackages.blcr: remove 

    blcr is only supported for pre v4 kernels.
    @joachifm
    joachifm committed Oct 6, 2019
    Copy the full SHA
    83ffa14 View commit details

  3. Merge pull request #70503 from joachifm/feat/remove-blcr 

    Remove blcr package & nixos module
    @teto
    teto authored Oct 6, 2019
    Copy the full SHA
    2a25b5c View commit details
Showing with 3 additions and 73 deletions.
  1. +0 −1 nixos/modules/module-list.nix
  2. +0 −27 nixos/modules/programs/blcr.nix
  3. +3 −0 nixos/modules/rename.nix
  4. +0 −43 pkgs/os-specific/linux/blcr/default.nix
  5. +0 −2 pkgs/top-level/all-packages.nix
1 change: 0 additions & 1 deletion nixos/modules/module-list.nix
View file
Original file line number Diff line number Diff line change
@@ -98,7 +98,6 @@
./programs/autojump.nix
./programs/bash/bash.nix
./programs/bcc.nix
./programs/blcr.nix
./programs/browserpass.nix
./programs/captive-browser.nix
./programs/ccache.nix
27 changes: 0 additions & 27 deletions nixos/modules/programs/blcr.nix
View file

This file was deleted.

3 changes: 3 additions & 0 deletions nixos/modules/rename.nix
View file
Original file line number Diff line number Diff line change
@@ -275,6 +275,9 @@ with lib;
(mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
(mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])

# BLCR
(mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed")

# Redis
(mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
(mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
43 changes: 0 additions & 43 deletions pkgs/os-specific/linux/blcr/default.nix
View file

This file was deleted.

2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -15910,8 +15910,6 @@ in

ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };

blcr = if stdenv.lib.versionOlder "3.18" kernel.version then callPackage ../os-specific/linux/blcr { } else null;

chipsec = callPackage ../tools/security/chipsec {
inherit kernel;
withDriver = true;