Compare commits

..

No commits in common. "ff061257b4bdfac696348e01a1dd101483d48c7b" and "46b331a41316e44cba93af1db42465e830c94361" have entirely different histories.

20 changed files with 79 additions and 83 deletions

16
ci.nix
View File

@ -9,7 +9,7 @@
# then your CI will be able to build and cache only those packages for
# which this is possible.
{ pkgs ? import <nixpkgs> { } }:
{ pkgs ? import <nixpkgs> {} }:
with builtins;
@ -29,10 +29,10 @@ let
let
f = p:
if shouldRecurseForDerivations p then flattenPkgs p
else if isDerivation p then [ p ]
else [ ];
else if isDerivation p then [p]
else [];
in
concatMap f (attrValues s);
concatMap f (attrValues s);
outputsOf = p: map (o: p.${o}) p.outputs;
@ -40,10 +40,10 @@ let
nurPkgs =
flattenPkgs
(listToAttrs
(map (n: nameValuePair n nurAttrs.${n})
(filter (n: !isReserved n)
(attrNames nurAttrs))));
(listToAttrs
(map (n: nameValuePair n nurAttrs.${n})
(filter (n: !isReserved n)
(attrNames nurAttrs))));
in

View File

@ -28,10 +28,10 @@
};
overlays = import ./overlays // {
pkgs = _final: prev: import ./pkgs/top-level/all-packages.nix { pkgs = prev; };
pkgs = final: prev: import ./pkgs/top-level/all-packages.nix { pkgs = prev; };
};
overlay = _final: _prev: {
overlay = final: prev: {
xeals = nixpkgs.lib.composeExtensions self.overlays.pkgs;
};
@ -41,7 +41,7 @@
xPkgs = import ./pkgs/top-level/all-packages.nix { inherit pkgs; };
in
lib.filterAttrs
(_attr: drv: builtins.elem system (drv.meta.platforms or [ ]))
(attr: drv: builtins.elem system (drv.meta.platforms or [ ]))
xPkgs);
apps = forAllSystems (system:

View File

@ -1,4 +1,4 @@
{ lib, ... }:
{ config, lib, pkgs, ... }:
with lib;

View File

@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
with lib;

View File

@ -2,7 +2,7 @@
# case where you don't want to add the whole NUR namespace to your
# configuration.
_self: super:
self: super:
let

View File

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, fetchFromGitHub
, python3Packages

View File

@ -1,7 +1,9 @@
{ lib
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, cmake
, pkg-config
, alsaLib
, dbus

View File

@ -21,25 +21,21 @@ let
];
};
generateCommon = lib.makeOverridable (
{ common ? ./manual-common-packages.nix
}:
let
generateCommon = lib.makeOverridable ({
common ? ./manual-common-packages.nix
}: let
imported = import common {
inherit (self) callPackage;
};
imported = import common {
inherit (self) callPackage;
};
super = imported;
super = imported;
overrides = { };
overrides = { };
jetbrainsPlugins = super // overrides;
jetbrainsPlugins = super // overrides;
in
jetbrainsPlugins // { inherit commonBuild; }
);
in jetbrainsPlugins // { inherit commonBuild; });
in
generateCommon { }
in generateCommon { }

View File

@ -9,25 +9,21 @@ let
jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
};
generateIdea = lib.makeOverridable (
{ idea ? ./manual-idea-packages.nix
}:
let
generateIdea = lib.makeOverridable ({
idea ? ./manual-idea-packages.nix
}: let
imported = import idea {
inherit (self) callPackage;
};
imported = import idea {
inherit (self) callPackage;
};
super = imported;
super = imported;
overrides = { };
overrides = { };
ideaPlugins = super // overrides;
ideaPlugins = super // overrides;
in
ideaPlugins // { inherit ideaBuild; }
);
in ideaPlugins // { inherit ideaBuild; });
in
generateIdea { }
in generateIdea { }

View File

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, fetchFromGitHub
, buildGoModule

View File

@ -1,12 +1,16 @@
{ stdenv
, lib
, fetchFromGitLab
, fetchzip
, cereal
, cmake
, git
, libGL
, libX11
, libinput
, libxkbcommon
, mesa
, meson
, ninja
, pixman

View File

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, fetchFromGitHub
, buildGoModule
, makeWrapper
@ -63,6 +64,5 @@ buildGoModule rec {
homepage = "https://github.com/therecipe/qt";
description = "Qt bindings for Go";
license = licenses.lgpl3;
broken = true;
};
}

View File

@ -2,6 +2,7 @@
, lib
, fetchFromGitHub
, coreutils
, autoreconfHook
}:

View File

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
}:

View File

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, fetchFromGitHub
, python3Packages

View File

@ -1,6 +1,8 @@
{ stdenv
, lib
, fetchFromGitHub
, makeWrapper
, curl
, gnumake
, gnutls

View File

@ -1,30 +1,24 @@
{ lib
{ stdenv
, lib
, fetchFromGitHub
, python3Packages
, lame
, aacSupport ? false
, faac
, alacSupport ? false
, libav
, flacSupport ? false
, flac
, m4aSupport ? false
, mp4Support ? false
, fdk-aac-encoder
, oggSupport ? false
, vorbisTools
, opusSupport ? false
, opusTools
, aacSupport ? false, faac
, alacSupport ? false, libav
, flacSupport ? false, flac
, m4aSupport ? false, mp4Support ? false, fdk-aac-encoder
, oggSupport ? false, vorbisTools
, opusSupport ? false, opusTools
}:
assert aacSupport -> faac.meta.available;
assert alacSupport -> libav.meta.available;
assert flacSupport -> flac.meta.available;
assert aacSupport -> faac.meta.available;
assert alacSupport -> libav.meta.available;
assert flacSupport -> flac.meta.available;
assert m4aSupport || mp4Support -> fdk-aac-encoder.meta.available;
assert oggSupport -> vorbisTools.meta.available;
assert opusSupport -> opusTools.meta.available;
assert oggSupport -> vorbisTools.meta.available;
assert opusSupport -> opusTools.meta.available;
python3Packages.buildPythonApplication rec {
pname = "spotify-ripper";

View File

@ -3,8 +3,7 @@
, fetchFromGitHub
, python3
, ffmpeg
}:
, ffmpeg }:
stdenv.mkDerivation rec {
pname = "ytarchive";

View File

@ -42,7 +42,7 @@ rec {
pam_gnupg = pkgs.callPackage ../os-specific/linux/pam_gnupg { };
picom-animations = pkgs.picom.overrideAttrs (_oldAttrs: {
picom-animations = pkgs.picom.overrideAttrs (oldAttrs: {
pname = "picom-animations";
src = pkgs.fetchFromGitHub {
owner = "jonaburg";

View File

@ -20,16 +20,14 @@ let
inherit lib;
};
in
lib.makeScope newScope (self: lib.makeOverridable
({ jetbrainsPlugins ? mkJetbrainsPlugins self
, ideaPlugins ? mkIdeaPlugins self
}: ({ }
// jetbrainsPlugins // { inherit jetbrainsPlugins; }
// ideaPlugins // { inherit ideaPlugins; }
// {
in lib.makeScope newScope (self: lib.makeOverridable ({
jetbrainsPlugins ? mkJetbrainsPlugins self
, ideaPlugins ? mkIdeaPlugins self
}: ({ }
// jetbrainsPlugins // { inherit jetbrainsPlugins; }
// ideaPlugins // { inherit ideaPlugins; }
// {
inherit variant;
jetbrainsWithPlugins = jetbrainsWithPlugins self variant;
})
)
{ })
) { })