Compare commits
No commits in common. "ff061257b4bdfac696348e01a1dd101483d48c7b" and "46b331a41316e44cba93af1db42465e830c94361" have entirely different histories.
ff061257b4
...
46b331a413
6
ci.nix
6
ci.nix
@ -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,8 +29,8 @@ 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);
|
||||
|
||||
|
@ -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:
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ config, lib, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
# case where you don't want to add the whole NUR namespace to your
|
||||
# configuration.
|
||||
|
||||
_self: super:
|
||||
self: super:
|
||||
|
||||
let
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
|
||||
, cmake
|
||||
, pkg-config
|
||||
, alsaLib
|
||||
, dbus
|
||||
|
@ -21,10 +21,9 @@ 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;
|
||||
@ -36,10 +35,7 @@ let
|
||||
|
||||
jetbrainsPlugins = super // overrides;
|
||||
|
||||
in
|
||||
jetbrainsPlugins // { inherit commonBuild; }
|
||||
);
|
||||
in jetbrainsPlugins // { inherit commonBuild; });
|
||||
|
||||
in
|
||||
generateCommon { }
|
||||
in generateCommon { }
|
||||
|
||||
|
@ -9,10 +9,9 @@ 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;
|
||||
@ -24,10 +23,7 @@ let
|
||||
|
||||
ideaPlugins = super // overrides;
|
||||
|
||||
in
|
||||
ideaPlugins // { inherit ideaBuild; }
|
||||
);
|
||||
in ideaPlugins // { inherit ideaBuild; });
|
||||
|
||||
in
|
||||
generateIdea { }
|
||||
in generateIdea { }
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
|
||||
|
@ -1,12 +1,16 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchzip
|
||||
|
||||
, cereal
|
||||
, cmake
|
||||
, git
|
||||
, libGL
|
||||
, libX11
|
||||
, libinput
|
||||
, libxkbcommon
|
||||
, mesa
|
||||
, meson
|
||||
, ninja
|
||||
, pixman
|
||||
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
@ -2,6 +2,7 @@
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
|
||||
, coreutils
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
|
||||
, python3Packages
|
||||
|
@ -1,6 +1,8 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
|
||||
, curl
|
||||
, gnumake
|
||||
, gnutls
|
||||
|
@ -1,22 +1,16 @@
|
||||
{ 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;
|
||||
|
@ -3,8 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
|
||||
, python3
|
||||
, ffmpeg
|
||||
}:
|
||||
, ffmpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ytarchive";
|
||||
|
@ -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";
|
||||
|
@ -20,16 +20,14 @@ let
|
||||
inherit lib;
|
||||
};
|
||||
|
||||
in
|
||||
lib.makeScope newScope (self: lib.makeOverridable
|
||||
({ jetbrainsPlugins ? mkJetbrainsPlugins self
|
||||
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;
|
||||
})
|
||||
)
|
||||
{ })
|
||||
) { })
|
||||
|
Loading…
Reference in New Issue
Block a user