top-level/platforms.nix: Reformat and clean up whitespace #24804
+313
−318
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@Ericson2314, thanks for your PR! By analyzing the history of the files in this pull request, we identified @viric, @dezgeg and @rickynils to be potential reviewers. |
|
CC @abbradar you were the last person to touch this? |
|
Very crude diff of how things evaluate: # run before and after this PR to make what is diffed
# n.b. this is a fish script, I think just replace `\\\\` with `\\` for bourne-like shell.
printf ":p import pkgs/top-level/platforms.nix\n:q" | nix-repl | sed -E 's_(;|\\\\n)_\n_g' > platforms.txtdiff --git a/home/john/Code/git/nixpkgs-base/platforms.txt b/home/john/Code/git/nixpkgs/platforms.txt
index 3127bc42c7..9cbb47bdbf 100644
--- a/home/john/Code/git/nixpkgs-base/platforms.txt
+++ b/home/john/Code/git/nixpkgs/platforms.txt
@@ -222,7 +222,7 @@ FUSE_FS m
# systemd uses cgroups
CGROUPS y
-# Latencytop
+# Latencytop
LATENCYTOP y
# Ubi for the mtd
@@ -360,7 +360,7 @@ FUSE_FS m
# nixos mounts some cgroup
CGROUPS y
-# Latencytop
+# Latencytop
LATENCYTOP y
"
kernelHeadersBaseConfig = "bcm2835_defconfig"
@@ -374,77 +374,77 @@ LATENCYTOP y
kernelAutoModules = false
kernelBaseConfig = "bcm2709_defconfig"
kernelDTB = true
- kernelExtraConfig = " BLK_DEV_RAM y
- BLK_DEV_INITRD y
- BLK_DEV_CRYPTOLOOP m
- BLK_DEV_DM m
- DM_CRYPT m
- MD y
- REISERFS_FS m
- BTRFS_FS y
- XFS_FS m
- JFS_FS y
- EXT4_FS y
-
- IP_PNP y
- IP_PNP_DHCP y
- NFS_FS y
- ROOT_NFS y
- TUN m
- NFS_V4 y
- NFS_V4_1 y
- NFS_FSCACHE y
- NFSD m
- NFSD_V2_ACL y
- NFSD_V3 y
- NFSD_V3_ACL y
- NFSD_V4 y
- NETFILTER y
- IP_NF_IPTABLES y
- IP_NF_FILTER y
- IP_NF_MATCH_ADDRTYPE y
- IP_NF_TARGET_LOG y
- IP_NF_MANGLE y
- IPV6 m
- VLAN_8021Q m
-
- CIFS y
- CIFS_XATTR y
- CIFS_POSIX y
- CIFS_FSCACHE y
- CIFS_ACL y
-
- ZRAM m
-
- # Disable OABI to have seccomp_filter (required for systemd)
- # https://github.com/raspberrypi/firmware/issues/651
- OABI_COMPAT n
-
- # Fail to build
- DRM n
- SCSI_ADVANSYS n
- USB_ISP1362_HCD n
- SND_SOC n
- SND_ALI5451 n
- FB_SAVAGE n
- SCSI_NSP32 n
- ATA_SFF n
- SUNGEM n
- IRDA n
- ATM_HE n
- SCSI_ACARD n
- BLK_DEV_CMD640_ENHANCED n
-
- FUSE_FS m
-
- # nixos mounts some cgroup
- CGROUPS y
-
- # Latencytop
- LATENCYTOP y
-
- # Disable the common config Xen, it doesn't build on ARM
-\tXEN? n
+ kernelExtraConfig = "BLK_DEV_RAM y
+BLK_DEV_INITRD y
+BLK_DEV_CRYPTOLOOP m
+BLK_DEV_DM m
+DM_CRYPT m
+MD y
+REISERFS_FS m
+BTRFS_FS y
+XFS_FS m
+JFS_FS y
+EXT4_FS y
+
+IP_PNP y
+IP_PNP_DHCP y
+NFS_FS y
+ROOT_NFS y
+TUN m
+NFS_V4 y
+NFS_V4_1 y
+NFS_FSCACHE y
+NFSD m
+NFSD_V2_ACL y
+NFSD_V3 y
+NFSD_V3_ACL y
+NFSD_V4 y
+NETFILTER y
+IP_NF_IPTABLES y
+IP_NF_FILTER y
+IP_NF_MATCH_ADDRTYPE y
+IP_NF_TARGET_LOG y
+IP_NF_MANGLE y
+IPV6 m
+VLAN_8021Q m
+
+CIFS y
+CIFS_XATTR y
+CIFS_POSIX y
+CIFS_FSCACHE y
+CIFS_ACL y
+
+ZRAM m
+
+# Disable OABI to have seccomp_filter (required for systemd)
+# https://github.com/raspberrypi/firmware/issues/651
+OABI_COMPAT n
+
+# Fail to build
+DRM n
+SCSI_ADVANSYS n
+USB_ISP1362_HCD n
+SND_SOC n
+SND_ALI5451 n
+FB_SAVAGE n
+SCSI_NSP32 n
+ATA_SFF n
+SUNGEM n
+IRDA n
+ATM_HE n
+SCSI_ACARD n
+BLK_DEV_CMD640_ENHANCED n
+
+FUSE_FS m
+
+# nixos mounts some cgroup
+CGROUPS y
+
+# Latencytop
+LATENCYTOP y
+
+# Disable the common config Xen, it doesn't build on ARM
+XEN? n
"
kernelHeadersBaseConfig = "multi_v7_defconfig"
kernelMajor = "2.6"
@@ -539,7 +539,7 @@ FUSE_FS m
# systemd uses cgroups
CGROUPS y
-# Latencytop
+# Latencytop
LATENCYTOP y
# Ubi for the mtd
|
Ericson2314
force-pushed
the
platform-whitespace
branch
from
f90cf2d to
f3055a3
Compare
dezgeg
approved these changes
Apr 10, 2017
|
Thanks @dezgeg |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Cleanliness
Things done
Need to confirm no mass rebuilds on
hydra.nixos.orgare caused by this.(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)