Compare commits
3 Commits
46b331a413
...
ff061257b4
Author | SHA1 | Date | |
---|---|---|---|
ff061257b4 | |||
a83dcb3ed5 | |||
a70a0e914b |
6
ci.nix
6
ci.nix
@ -9,7 +9,7 @@
|
|||||||
# then your CI will be able to build and cache only those packages for
|
# then your CI will be able to build and cache only those packages for
|
||||||
# which this is possible.
|
# which this is possible.
|
||||||
|
|
||||||
{ pkgs ? import <nixpkgs> {} }:
|
{ pkgs ? import <nixpkgs> { } }:
|
||||||
|
|
||||||
with builtins;
|
with builtins;
|
||||||
|
|
||||||
@ -29,8 +29,8 @@ let
|
|||||||
let
|
let
|
||||||
f = p:
|
f = p:
|
||||||
if shouldRecurseForDerivations p then flattenPkgs p
|
if shouldRecurseForDerivations p then flattenPkgs p
|
||||||
else if isDerivation p then [p]
|
else if isDerivation p then [ p ]
|
||||||
else [];
|
else [ ];
|
||||||
in
|
in
|
||||||
concatMap f (attrValues s);
|
concatMap f (attrValues s);
|
||||||
|
|
||||||
|
@ -28,10 +28,10 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
overlays = import ./overlays // {
|
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;
|
xeals = nixpkgs.lib.composeExtensions self.overlays.pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -41,7 +41,7 @@
|
|||||||
xPkgs = import ./pkgs/top-level/all-packages.nix { inherit pkgs; };
|
xPkgs = import ./pkgs/top-level/all-packages.nix { inherit pkgs; };
|
||||||
in
|
in
|
||||||
lib.filterAttrs
|
lib.filterAttrs
|
||||||
(attr: drv: builtins.elem system (drv.meta.platforms or [ ]))
|
(_attr: drv: builtins.elem system (drv.meta.platforms or [ ]))
|
||||||
xPkgs);
|
xPkgs);
|
||||||
|
|
||||||
apps = forAllSystems (system:
|
apps = forAllSystems (system:
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# case where you don't want to add the whole NUR namespace to your
|
# case where you don't want to add the whole NUR namespace to your
|
||||||
# configuration.
|
# configuration.
|
||||||
|
|
||||||
self: super:
|
_self: super:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, python3Packages
|
, python3Packages
|
||||||
|
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
|
|
||||||
, cmake
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, alsaLib
|
, alsaLib
|
||||||
, dbus
|
, dbus
|
||||||
|
@ -21,9 +21,10 @@ let
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
generateCommon = lib.makeOverridable ({
|
generateCommon = lib.makeOverridable (
|
||||||
common ? ./manual-common-packages.nix
|
{ common ? ./manual-common-packages.nix
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
|
|
||||||
imported = import common {
|
imported = import common {
|
||||||
inherit (self) callPackage;
|
inherit (self) callPackage;
|
||||||
@ -35,7 +36,10 @@ let
|
|||||||
|
|
||||||
jetbrainsPlugins = super // overrides;
|
jetbrainsPlugins = super // overrides;
|
||||||
|
|
||||||
in jetbrainsPlugins // { inherit commonBuild; });
|
in
|
||||||
|
jetbrainsPlugins // { inherit commonBuild; }
|
||||||
|
);
|
||||||
|
|
||||||
in generateCommon { }
|
in
|
||||||
|
generateCommon { }
|
||||||
|
|
||||||
|
@ -9,9 +9,10 @@ let
|
|||||||
jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
|
jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
generateIdea = lib.makeOverridable ({
|
generateIdea = lib.makeOverridable (
|
||||||
idea ? ./manual-idea-packages.nix
|
{ idea ? ./manual-idea-packages.nix
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
|
|
||||||
imported = import idea {
|
imported = import idea {
|
||||||
inherit (self) callPackage;
|
inherit (self) callPackage;
|
||||||
@ -23,7 +24,10 @@ let
|
|||||||
|
|
||||||
ideaPlugins = super // overrides;
|
ideaPlugins = super // overrides;
|
||||||
|
|
||||||
in ideaPlugins // { inherit ideaBuild; });
|
in
|
||||||
|
ideaPlugins // { inherit ideaBuild; }
|
||||||
|
);
|
||||||
|
|
||||||
in generateIdea { }
|
in
|
||||||
|
generateIdea { }
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, buildGoModule
|
, buildGoModule
|
||||||
|
|
||||||
|
@ -1,16 +1,12 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, fetchzip
|
|
||||||
|
|
||||||
, cereal
|
, cereal
|
||||||
, cmake
|
, cmake
|
||||||
, git
|
|
||||||
, libGL
|
, libGL
|
||||||
, libX11
|
, libX11
|
||||||
, libinput
|
, libinput
|
||||||
, libxkbcommon
|
, libxkbcommon
|
||||||
, mesa
|
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pixman
|
, pixman
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, buildGoModule
|
, buildGoModule
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
@ -64,5 +63,6 @@ buildGoModule rec {
|
|||||||
homepage = "https://github.com/therecipe/qt";
|
homepage = "https://github.com/therecipe/qt";
|
||||||
description = "Qt bindings for Go";
|
description = "Qt bindings for Go";
|
||||||
license = licenses.lgpl3;
|
license = licenses.lgpl3;
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
, lib
|
, lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
|
||||||
, coreutils
|
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
}:
|
}:
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
|
||||||
, python3Packages
|
, python3Packages
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, makeWrapper
|
|
||||||
|
|
||||||
, curl
|
, curl
|
||||||
, gnumake
|
, gnumake
|
||||||
, gnutls
|
, gnutls
|
||||||
|
@ -1,16 +1,22 @@
|
|||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, lame
|
, lame
|
||||||
|
|
||||||
, aacSupport ? false, faac
|
, aacSupport ? false
|
||||||
, alacSupport ? false, libav
|
, faac
|
||||||
, flacSupport ? false, flac
|
, alacSupport ? false
|
||||||
, m4aSupport ? false, mp4Support ? false, fdk-aac-encoder
|
, libav
|
||||||
, oggSupport ? false, vorbisTools
|
, flacSupport ? false
|
||||||
, opusSupport ? false, opusTools
|
, flac
|
||||||
|
, m4aSupport ? false
|
||||||
|
, mp4Support ? false
|
||||||
|
, fdk-aac-encoder
|
||||||
|
, oggSupport ? false
|
||||||
|
, vorbisTools
|
||||||
|
, opusSupport ? false
|
||||||
|
, opusTools
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert aacSupport -> faac.meta.available;
|
assert aacSupport -> faac.meta.available;
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
|
||||||
, python3
|
, python3
|
||||||
, ffmpeg }:
|
, ffmpeg
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ytarchive";
|
pname = "ytarchive";
|
||||||
|
@ -42,7 +42,7 @@ rec {
|
|||||||
|
|
||||||
pam_gnupg = pkgs.callPackage ../os-specific/linux/pam_gnupg { };
|
pam_gnupg = pkgs.callPackage ../os-specific/linux/pam_gnupg { };
|
||||||
|
|
||||||
picom-animations = pkgs.picom.overrideAttrs (oldAttrs: {
|
picom-animations = pkgs.picom.overrideAttrs (_oldAttrs: {
|
||||||
pname = "picom-animations";
|
pname = "picom-animations";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "jonaburg";
|
owner = "jonaburg";
|
||||||
|
@ -20,14 +20,16 @@ let
|
|||||||
inherit lib;
|
inherit lib;
|
||||||
};
|
};
|
||||||
|
|
||||||
in lib.makeScope newScope (self: lib.makeOverridable ({
|
in
|
||||||
jetbrainsPlugins ? mkJetbrainsPlugins self
|
lib.makeScope newScope (self: lib.makeOverridable
|
||||||
|
({ jetbrainsPlugins ? mkJetbrainsPlugins self
|
||||||
, ideaPlugins ? mkIdeaPlugins self
|
, ideaPlugins ? mkIdeaPlugins self
|
||||||
}: ({ }
|
}: ({ }
|
||||||
// jetbrainsPlugins // { inherit jetbrainsPlugins; }
|
// jetbrainsPlugins // { inherit jetbrainsPlugins; }
|
||||||
// ideaPlugins // { inherit ideaPlugins; }
|
// ideaPlugins // { inherit ideaPlugins; }
|
||||||
// {
|
// {
|
||||||
inherit variant;
|
inherit variant;
|
||||||
jetbrainsWithPlugins = jetbrainsWithPlugins self variant;
|
jetbrainsWithPlugins = jetbrainsWithPlugins self variant;
|
||||||
})
|
})
|
||||||
) { })
|
)
|
||||||
|
{ })
|
||||||
|
Loading…
Reference in New Issue
Block a user