diff options
author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2019-08-26 21:40:19 +0000 |
commit | 35d68ef143412f579544eaac7aaa87e29f84b15e (patch) | |
tree | 7e4cc2079e73fde7e1cacdbeb17a4ea290f0a02e /lib | |
parent | fe9c9f719d143632d31ac2b01f5f7cfbad161ce1 (diff) | |
download | nixlib-35d68ef143412f579544eaac7aaa87e29f84b15e.tar nixlib-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.gz nixlib-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.bz2 nixlib-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.lz nixlib-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.xz nixlib-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.zst nixlib-35d68ef143412f579544eaac7aaa87e29f84b15e.zip |
treewide: remove redundant quotes
Diffstat (limited to 'lib')
-rw-r--r-- | lib/lists.nix | 4 | ||||
-rw-r--r-- | lib/systems/default.nix | 22 | ||||
-rw-r--r-- | lib/systems/platforms.nix | 22 | ||||
-rw-r--r-- | lib/types.nix | 2 |
4 files changed, 25 insertions, 25 deletions
diff --git a/lib/lists.nix b/lib/lists.nix index 30d87ece6641..93a554f24f84 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -446,11 +446,11 @@ rec { if length list < 2 then # finish { result = list; } - else if dfsthis ? "cycle" + else if dfsthis ? cycle then # there's a cycle, starting from the current vertex, return it { cycle = reverseList ([ dfsthis.cycle ] ++ dfsthis.visited); inherit (dfsthis) loops; } - else if toporest ? "cycle" + else if toporest ? cycle then # there's a cycle somewhere else in the graph, return it toporest # Slow, but short. Can be made a bit faster with an explicit stack. diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 8aa413f53817..0c0cdf1f11b1 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -58,13 +58,13 @@ rec { uname = { # uname -s system = { - "linux" = "Linux"; - "windows" = "Windows"; - "darwin" = "Darwin"; - "netbsd" = "NetBSD"; - "freebsd" = "FreeBSD"; - "openbsd" = "OpenBSD"; - "wasi" = "Wasi"; + linux = "Linux"; + windows = "Windows"; + darwin = "Darwin"; + netbsd = "NetBSD"; + freebsd = "FreeBSD"; + openbsd = "OpenBSD"; + wasi = "Wasi"; }.${final.parsed.kernel.name} or null; # uname -p @@ -86,10 +86,10 @@ rec { else if final.isx86_64 then "x86_64" else if final.isx86 then "i386" else { - "powerpc" = "ppc"; - "powerpcle" = "ppc"; - "powerpc64" = "ppc64"; - "powerpc64le" = "ppc64le"; + powerpc = "ppc"; + powerpcle = "ppc"; + powerpc64 = "ppc64"; + powerpc64le = "ppc64le"; }.${final.parsed.cpu.name} or final.parsed.cpu.name; emulator = pkgs: let diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index a2b43c970a41..ab3cf1d54301 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -456,16 +456,16 @@ rec { }; selectBySystem = system: { - "i486-linux" = pc32; - "i586-linux" = pc32; - "i686-linux" = pc32; - "x86_64-linux" = pc64; - "armv5tel-linux" = sheevaplug; - "armv6l-linux" = raspberrypi; - "armv7a-linux" = armv7l-hf-multiplatform; - "armv7l-linux" = armv7l-hf-multiplatform; - "aarch64-linux" = aarch64-multiplatform; - "mipsel-linux" = fuloong2f_n32; - "powerpc64le-linux" = powernv; + i486-linux = pc32; + i586-linux = pc32; + i686-linux = pc32; + x86_64-linux = pc64; + armv5tel-linux = sheevaplug; + armv6l-linux = raspberrypi; + armv7a-linux = armv7l-hf-multiplatform; + armv7l-linux = armv7l-hf-multiplatform; + aarch64-linux = aarch64-multiplatform; + mipsel-linux = fuloong2f_n32; + powerpc64le-linux = powernv; }.${system} or pcBase; } diff --git a/lib/types.nix b/lib/types.nix index 9c00656ab918..f7e6d5335b11 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -42,7 +42,7 @@ rec { # Default type functor defaultFunctor = name: { inherit name; - type = types."${name}" or null; + type = types.${name} or null; wrapped = null; payload = null; binOp = a: b: null; |