xin/nur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #36 from divanorama/nixpkgs_fmt

Browse source 
[RFC] Run nixpkgs-fmt .
This commit is contained in:
Jörg Thalheim 2020-12-28 06:26:03 +00:00 committed by GitHub
commit 435192e36f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ci.nix
View file

@ -12,9 +12,7 @@
{ pkgs ? import <nixpkgs> { } }: { pkgs ? import <nixpkgs> { } }:
with builtins; with builtins;
let let
isReserved = n: n == "lib" || n == "overlays" || n == "modules"; isReserved = n: n == "lib" || n == "overlays" || n == "modules";
isDerivation = p: isAttrs p && p ? type && p.type == "derivation"; isDerivation = p: isAttrs p && p ? type && p.type == "derivation";
isBuildable = p: !(p.meta.broken or false) && p.meta.license.free or true; isBuildable = p: !(p.meta.broken or false) && p.meta.license.free or true;
@ -46,7 +44,6 @@ let
(attrNames nurAttrs)))); (attrNames nurAttrs))));
in in
rec { rec {
buildPkgs = filter isBuildable nurPkgs; buildPkgs = filter isBuildable nurPkgs;
cachePkgs = filter isCacheable buildPkgs; cachePkgs = filter isCacheable buildPkgs;

1
default.nix
View file

@ -18,4 +18,3 @@
# some-qt5-package = pkgs.libsForQt5.callPackage ./pkgs/some-qt5-package { }; # some-qt5-package = pkgs.libsForQt5.callPackage ./pkgs/some-qt5-package { };
# ... # ...
} }

1
lib/default.nix
View file

@ -5,4 +5,3 @@ with pkgs.lib; {
# #
# hexint = x: hexvals.${toLower x}; # hexint = x: hexvals.${toLower x};
} }

1
modules/default.nix
View file

@ -3,4 +3,3 @@
# #
# my-module = ./my-module; # my-module = ./my-module;
} }

3
overlay.nix
View file

@ -3,15 +3,12 @@
# configuration. # configuration.
self: super: self: super:
let let
isReserved = n: n == "lib" || n == "overlays" || n == "modules"; isReserved = n: n == "lib" || n == "overlays" || n == "modules";
nameValuePair = n: v: { name = n; value = v; }; nameValuePair = n: v: { name = n; value = v; };
nurAttrs = import ./default.nix { pkgs = super; }; nurAttrs = import ./default.nix { pkgs = super; };
in in
builtins.listToAttrs builtins.listToAttrs
(map (n: nameValuePair n nurAttrs.${n}) (map (n: nameValuePair n nurAttrs.${n})
(builtins.filter (n: !isReserved n) (builtins.filter (n: !isReserved n)

1
overlays/default.nix
View file

@ -3,4 +3,3 @@
# #
# my-overlay = import ./my-overlay; # my-overlay = import ./my-overlay;
} }

1
pkgs/example-package/default.nix
View file

@ -7,4 +7,3 @@ stdenv.mkDerivation rec {
buildPhase = "echo echo Hello World > example"; buildPhase = "echo echo Hello World > example";
installPhase = "install -Dm755 example $out"; installPhase = "install -Dm755 example $out";
} }