Include my external overlay

It includes packages that are proably useful for other people outside of
my own system configuration.
This commit is contained in:
Simon Bruder 2021-05-13 13:42:36 +02:00
parent dc1698ffaa
commit a861fbd725
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
4 changed files with 34 additions and 37 deletions

View file

@ -201,6 +201,32 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-overlay": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nix-pre-commit-hooks": [
"nix-pre-commit-hooks"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1620905093,
"narHash": "sha256-GskjPH+DhTylKOWRDaFVzpH/1s4zKO4MAdL9IOlbR6M=",
"ref": "master",
"rev": "09fbbfd0f98ba82e1dc9fd0d21ab898b901ea5e8",
"revCount": 6,
"type": "git",
"url": "https://git.sbruder.de/simon/nixpkgs-overlay"
},
"original": {
"type": "git",
"url": "https://git.sbruder.de/simon/nixpkgs-overlay"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1620387763, "lastModified": 1620387763,
@ -229,6 +255,7 @@
"nix-pre-commit-hooks": "nix-pre-commit-hooks", "nix-pre-commit-hooks": "nix-pre-commit-hooks",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-overlay": "nixpkgs-overlay",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }

View file

@ -26,6 +26,11 @@
infinisilSystem.url = "github:Infinisil/system/91c5df20db68a995155218c5334db0e394185ca8"; infinisilSystem.url = "github:Infinisil/system/91c5df20db68a995155218c5334db0e394185ca8";
infinisilSystem.flake = false; infinisilSystem.flake = false;
nixpkgs-overlay.url = "git+https://git.sbruder.de/simon/nixpkgs-overlay";
nixpkgs-overlay.inputs.flake-utils.follows = "flake-utils";
nixpkgs-overlay.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs-overlay.inputs.nix-pre-commit-hooks.follows = "nix-pre-commit-hooks";
bang-evaluator.url = "git+https://git.sbruder.de/simon/bangs"; bang-evaluator.url = "git+https://git.sbruder.de/simon/bangs";
bang-evaluator.inputs.flake-utils.follows = "flake-utils"; bang-evaluator.inputs.flake-utils.follows = "flake-utils";
bang-evaluator.inputs.nixpkgs.follows = "nixpkgs"; bang-evaluator.inputs.nixpkgs.follows = "nixpkgs";
@ -51,6 +56,7 @@
, nix-pre-commit-hooks , nix-pre-commit-hooks
, nixos-hardware , nixos-hardware
, nixpkgs , nixpkgs
, nixpkgs-overlay
, nixpkgs-unstable , nixpkgs-unstable
, sops-nix , sops-nix
}: flake-utils.lib.eachDefaultSystem }: flake-utils.lib.eachDefaultSystem
@ -190,6 +196,7 @@
({ config, ... }: { ({ config, ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
self.overlay self.overlay
nixpkgs-overlay.overlay
(final: prev: { (final: prev: {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
inherit system; inherit system;

View file

@ -1,35 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, ffmpeg
, libcdio
, libcdio-paranoia
, curl
, libmusicbrainz5
}:
stdenv.mkDerivation rec {
pname = "cyanrip";
version = "0.7.0";
src = fetchFromGitHub {
owner = "cyanreg";
repo = pname;
rev = "v${version}";
sha256 = "0lgb92sfpf4w3nj5vlj6j7931mj2q3cmcx1app9snf853jk9ahmw";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ ffmpeg libcdio libcdio-paranoia curl libmusicbrainz5 ];
meta = with lib; {
description = "Fully featured CD ripping program able to take out most of the tedium";
homepage = "https://github.com/cyanreg/cyanrip";
license = with licenses; [ lgpl21Plus lgpl3Plus ]; # some files have lgpl21Plus header, repo has lgpl3Plus LICENSE
maintainers = with maintainers; [ sbruder ];
platforms = platforms.unix;
};
}

View file

@ -44,8 +44,6 @@ in
]; ];
}); });
cyanrip = callPackage ./cyanrip { };
# TODO: Remove when pavucontrol > 4.0 is released # TODO: Remove when pavucontrol > 4.0 is released
pavucontrol = prev.pavucontrol.overrideAttrs (o: o // { pavucontrol = prev.pavucontrol.overrideAttrs (o: o // {
patches = [ patches = [