summaryrefslogtreecommitdiff
path: root/overlays
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-03-13 18:35:03 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2022-03-13 18:35:03 +0100
commit1e7de7c2823a9beea7103249b732f14b1b1e8f78 (patch)
treeec073e219d67c52a163ae7ce2ca00737c21d2a31 /overlays
parent49375b980197db7b4e0d17327b52d37d6ce33f35 (diff)
downloadnixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.tar
nixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.tar.gz
nixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.tar.bz2
nixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.tar.xz
nixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.zip
nvfetcher
Diffstat (limited to 'overlays')
-rw-r--r--overlays/afew.nix9
-rw-r--r--overlays/clevis.nix3
-rw-r--r--overlays/fast-cli.nix12
-rw-r--r--overlays/inwx-cdnskey/default.nix2
-rw-r--r--overlays/lego.nix2
-rw-r--r--overlays/ma1sd.nix60
-rw-r--r--overlays/nerdfonts.nix2
-rw-r--r--overlays/nftables-prometheus-exporter/default.nix2
-rw-r--r--overlays/persistent-nix-shell/default.nix2
-rw-r--r--overlays/pidgin.nix57
-rw-r--r--overlays/ppp.nix2
-rw-r--r--overlays/sshpass-secret.nix2
-rw-r--r--overlays/uhk-agent.nix13
-rw-r--r--overlays/urxvt/default.nix2
-rw-r--r--overlays/v4l2loopback.nix12
-rw-r--r--overlays/worktime/default.nix2
-rw-r--r--overlays/xcompose.nix16
-rw-r--r--overlays/zte-prometheus-exporter/default.nix2
18 files changed, 23 insertions, 179 deletions
diff --git a/overlays/afew.nix b/overlays/afew.nix
index 5075d678..17331799 100644
--- a/overlays/afew.nix
+++ b/overlays/afew.nix
@@ -1,11 +1,6 @@
1final: prev: { 1{ final, prev, sources, ... }: {
2 afew = prev.afew.overrideAttrs (oldAttrs: { 2 afew = prev.afew.overrideAttrs (oldAttrs: {
3 src = prev.fetchgit { 3 inherit (sources.afew) version afew;
4 url = "https://github.com/gkleen/afew.git";
5 rev = "7b96c73000152188bf8ec9168721f26f5bd01aa6";
6 sha256 = "09pmfyxq2j0rqvdisahpxpskvxckksx6gq9axdc83ppkws25iprm";
7 leaveDotGit = true;
8 };
9 4
10 nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ final.git ]; 5 nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ final.git ];
11 }); 6 });
diff --git a/overlays/clevis.nix b/overlays/clevis.nix
index a786340c..1cc1a717 100644
--- a/overlays/clevis.nix
+++ b/overlays/clevis.nix
@@ -1,5 +1,4 @@
1final: prev: 1{ final, prev, ... }: {
2{
3 clevis = prev.clevis.overrideAttrs (oldAttrs: { 2 clevis = prev.clevis.overrideAttrs (oldAttrs: {
4 buildInputs = (oldAttrs.buildInputs or []) ++ [final.tpm2-tools]; 3 buildInputs = (oldAttrs.buildInputs or []) ++ [final.tpm2-tools];
5 nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [final.makeWrapper]; 4 nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [final.makeWrapper];
diff --git a/overlays/fast-cli.nix b/overlays/fast-cli.nix
index 314d3796..932c5a38 100644
--- a/overlays/fast-cli.nix
+++ b/overlays/fast-cli.nix
@@ -1,14 +1,8 @@
1final: prev: { 1{ final, prev, sources, ... }: {
2 fast-cli = prev.buildGoModule rec { 2 fast-cli = prev.buildGoModule rec {
3 pname = "fast-cli"; 3 pname = "fast-cli";
4 version = "0.2.10";
5 4
6 src = prev.fetchFromGitHub { 5 inherit (sources.fast-cli) version src;
7 owner = "gesquive";
8 repo = pname;
9 rev = "v${version}";
10 hash = "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=";
11 };
12 vendorSha256 = "sha256-XM/5kUau0JBMxN0UpX6QNI31i8/+HNFvgFUFtlJsBh0="; 6 vendorSha256 = "sha256-XM/5kUau0JBMxN0UpX6QNI31i8/+HNFvgFUFtlJsBh0=";
13 7
14 preBuild = let 8 preBuild = let
@@ -34,7 +28,7 @@ final: prev: {
34 ''; 28 '';
35 29
36 ldflags = [ 30 ldflags = [
37 "-X main.version=${version}" 31 "-X main.version=${prev.lib.removePrefix "v" version}"
38 ]; 32 ];
39 }; 33 };
40} 34}
diff --git a/overlays/inwx-cdnskey/default.nix b/overlays/inwx-cdnskey/default.nix
index c19c2df5..cd564f24 100644
--- a/overlays/inwx-cdnskey/default.nix
+++ b/overlays/inwx-cdnskey/default.nix
@@ -1,4 +1,4 @@
1final: prev: 1{ final, prev, ... }:
2let 2let
3 packageOverrides = final.callPackage ./python-packages.nix {}; 3 packageOverrides = final.callPackage ./python-packages.nix {};
4 inpPython = final.python39.override { inherit packageOverrides; }; 4 inpPython = final.python39.override { inherit packageOverrides; };
diff --git a/overlays/lego.nix b/overlays/lego.nix
index 80e9bd4b..83b1e2e8 100644
--- a/overlays/lego.nix
+++ b/overlays/lego.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 lego = prev.lego.override { 2 lego = prev.lego.override {
3 buildGoModule = args: prev.buildGoModule (args // { 3 buildGoModule = args: prev.buildGoModule (args // {
4 patches = (args.patches or []) ++ prev.lib.lists.singleton (prev.fetchpatch { 4 patches = (args.patches or []) ++ prev.lib.lists.singleton (prev.fetchpatch {
diff --git a/overlays/ma1sd.nix b/overlays/ma1sd.nix
deleted file mode 100644
index 3218879b..00000000
--- a/overlays/ma1sd.nix
+++ /dev/null
@@ -1,60 +0,0 @@
1final: prev: {
2 ma1sd = let
3 pname = "ma1sd";
4 version = "2.5.0";
5 rev = version;
6
7 src = prev.fetchFromGitHub {
8 inherit rev;
9 owner = "ma1uta";
10 repo = "ma1sd";
11 hash = "sha256-K3kaujAhWsRQuTMW3SZOnE7Rmu8+tDXaxpLrb45OI4A=";
12 };
13
14
15 deps = prev.stdenv.mkDerivation {
16 pname = "${pname}-deps";
17 inherit src version;
18 nativeBuildInputs = with final; [ gradle_6 perl git ];
19
20 buildPhase = ''
21 export MA1SD_BUILD_VERSION=${rev}
22 export GRADLE_USER_HOME=$(mktemp -d);
23 gradle --no-daemon build -x test
24 '';
25
26 # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
27 installPhase = ''
28 find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
29 | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
30 | sh
31 '';
32
33 dontStrip = true;
34
35 outputHashAlgo = "sha256";
36 outputHashMode = "recursive";
37 outputHash = "sha256-P81aY1rOnZdb2UskPIrBe8dfWAicJ3TivBv/NEns5ro=";
38 };
39 in prev.stdenv.mkDerivation {
40 inherit pname src version;
41 nativeBuildInputs = with final; [ gradle_6 perl makeWrapper ];
42 buildInputs = with final; [ jre ];
43
44 buildPhase = ''
45 runHook preBuild
46 export MA1SD_BUILD_VERSION=${rev}
47 export GRADLE_USER_HOME=$(mktemp -d)
48 sed -ie "s#mavenCentral()#mavenLocal(); maven { url '${deps}' }#g; s#mavenCentral()##g" build.gradle
49 gradle --offline --no-daemon build -x test
50 runHook postBuild
51 '';
52
53 installPhase = ''
54 runHook preInstall
55 install -D build/libs/source.jar $out/lib/ma1sd.jar
56 makeWrapper ${final.jre}/bin/java $out/bin/ma1sd --add-flags "-jar $out/lib/ma1sd.jar"
57 runHook postInstall
58 '';
59 };
60}
diff --git a/overlays/nerdfonts.nix b/overlays/nerdfonts.nix
index 28581d72..f4fc6f14 100644
--- a/overlays/nerdfonts.nix
+++ b/overlays/nerdfonts.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 nerdfonts = prev.nerdfonts.override { 2 nerdfonts = prev.nerdfonts.override {
3 fonts = ["FiraMono" "FiraCode"]; 3 fonts = ["FiraMono" "FiraCode"];
4 }; 4 };
diff --git a/overlays/nftables-prometheus-exporter/default.nix b/overlays/nftables-prometheus-exporter/default.nix
index 452f160f..aab0c8e9 100644
--- a/overlays/nftables-prometheus-exporter/default.nix
+++ b/overlays/nftables-prometheus-exporter/default.nix
@@ -1,4 +1,4 @@
1final: prev: 1{ final, prev, ... }:
2let 2let
3 inpPython = final.python310; 3 inpPython = final.python310;
4in { 4in {
diff --git a/overlays/persistent-nix-shell/default.nix b/overlays/persistent-nix-shell/default.nix
index 60396335..c36b9e86 100644
--- a/overlays/persistent-nix-shell/default.nix
+++ b/overlays/persistent-nix-shell/default.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 persistent-nix-shell = prev.stdenv.mkDerivation { 2 persistent-nix-shell = prev.stdenv.mkDerivation {
3 name = "persistent-nix-shell"; 3 name = "persistent-nix-shell";
4 src = ./persistent-nix-shell; 4 src = ./persistent-nix-shell;
diff --git a/overlays/pidgin.nix b/overlays/pidgin.nix
deleted file mode 100644
index 4c315f55..00000000
--- a/overlays/pidgin.nix
+++ /dev/null
@@ -1,57 +0,0 @@
1final: prev:
2let
3 mucHistory = prev.fetchpatch {
4 url = "https://developer.pidgin.im/raw-attachment/ticket/16524/0001-only-request-unseed-chat-history-from-jabber-group-c.patch";
5 sha256 = "083wvmq7417xz55fxxhllqwql1hgjvin2sak08844121yw1jvc44";
6 };
7
8 pidginWrapper = { symlinkJoin, pidgin, makeWrapper, plugins }:
9 let
10 extraArgs = map (x: x.wrapArgs or "") plugins;
11 majorVersion = prev.lib.versions.major pidgin.version;
12 in symlinkJoin {
13 name = "pidgin-with-plugins-${pidgin.version}";
14
15 paths = [ pidgin ] ++ plugins;
16
17 buildInputs = [ makeWrapper ];
18
19 postBuild = ''
20 wrapProgram $out/bin/pidgin \
21 --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion} $out/lib/pidgin" \
22 ${toString extraArgs}
23 wrapProgram $out/bin/finch \
24 --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion}" \
25 ${toString extraArgs}
26 '';
27 };
28in {
29 pidgin-rocketchat = let
30 rev = "5c08ad0eacd39914d27b692d7eb42a94a991fb4c";
31 in prev.stdenv.mkDerivation {
32 pname = "pidgin-rocketchat";
33 version = builtins.substring 0 8 rev;
34
35 src = prev.fetchFromGitHub {
36 owner = "EionRobb";
37 repo = "purple-rocketchat";
38 inherit rev;
39 hash = "sha256-UBIp5tpj4Xfo+mPhY51+rzs+ojKr90zWK+XLiK7XvWM=";
40 };
41
42 nativeBuildInputs = with final; [ pidgin json-glib glib discount ];
43
44 installFlags = [
45 "ROCKETCHAT_DEST=$(out)/lib/purple-2"
46 "ROCKETCHAT_ICONS_DEST=$(out)/share/pixmaps/pidgin/protocols"
47 ];
48 };
49
50 pidgin-with-plugins = pidginWrapper {
51 inherit (prev) makeWrapper symlinkJoin;
52 plugins = with final; [ purple-lurch pidgin-carbons pidgin-opensteamworks pidgin-xmpp-receipts pidgin-rocketchat ];
53 pidgin = prev.pidgin.overrideAttrs (oldAttrs: {
54 patches = (oldAttrs.patches or []) ++ [mucHistory];
55 });
56 };
57}
diff --git a/overlays/ppp.nix b/overlays/ppp.nix
index 38aeaef0..8c6b0798 100644
--- a/overlays/ppp.nix
+++ b/overlays/ppp.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 ppp = prev.ppp.overrideAttrs (oldAttrs: { 2 ppp = prev.ppp.overrideAttrs (oldAttrs: {
3 buildInputs = (oldAttrs.buildInputs or []) ++ [ final.systemd ]; 3 buildInputs = (oldAttrs.buildInputs or []) ++ [ final.systemd ];
4 makeFlags = (oldAttrs.makeFlags or []) ++ [ "SYSTEMD=yes" ]; 4 makeFlags = (oldAttrs.makeFlags or []) ++ [ "SYSTEMD=yes" ];
diff --git a/overlays/sshpass-secret.nix b/overlays/sshpass-secret.nix
index 2f3d6169..388471cb 100644
--- a/overlays/sshpass-secret.nix
+++ b/overlays/sshpass-secret.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 sshpassSecret = prev.writeScriptBin "sshpass-secret" '' 2 sshpassSecret = prev.writeScriptBin "sshpass-secret" ''
3 #!${final.zsh}/bin/zsh -e 3 #!${final.zsh}/bin/zsh -e
4 4
diff --git a/overlays/uhk-agent.nix b/overlays/uhk-agent.nix
index 1b37121f..fcf66c0b 100644
--- a/overlays/uhk-agent.nix
+++ b/overlays/uhk-agent.nix
@@ -1,19 +1,12 @@
1final: prev: 1{ final, prev, sources, ... }:
2{ 2{
3 uhk-agent = 3 uhk-agent =
4 let 4 let
5 version = "1.5.15"; 5 image = prev.stdenv.mkDerivation (sources.uhk-agent // {
6
7 image = prev.stdenv.mkDerivation {
8 name = "uhk-agent-image";
9 src = prev.fetchurl {
10 url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
11 hash = "sha256-t2Jwd/x0eTZ4xBaCb/FomH/zSRLt7IIERUF9n9ONCpE=";
12 };
13 buildCommand = '' 6 buildCommand = ''
14 install -m 0644 $src $out 7 install -m 0644 $src $out
15 ''; 8 '';
16 }; 9 });
17 10
18 appimage-run' = prev.appimage-run.override { 11 appimage-run' = prev.appimage-run.override {
19 extraPkgs = p: with p; [ 12 extraPkgs = p: with p; [
diff --git a/overlays/urxvt/default.nix b/overlays/urxvt/default.nix
index 3c57d000..77a2c51f 100644
--- a/overlays/urxvt/default.nix
+++ b/overlays/urxvt/default.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 rxvt_unicode-with-plugins = prev.rxvt-unicode.override { 2 rxvt_unicode-with-plugins = prev.rxvt-unicode.override {
3 configure = { availablePlugins, ... }: { 3 configure = { availablePlugins, ... }: {
4 plugins = [ final.urxvt_osc_52 ] ++ builtins.attrValues availablePlugins; 4 plugins = [ final.urxvt_osc_52 ] ++ builtins.attrValues availablePlugins;
diff --git a/overlays/v4l2loopback.nix b/overlays/v4l2loopback.nix
index 335f86a3..bb59961f 100644
--- a/overlays/v4l2loopback.nix
+++ b/overlays/v4l2loopback.nix
@@ -1,16 +1,8 @@
1final: prev: { 1{ final, prev, sources, ... }: {
2 linuxPackages_latest = prev.linuxPackages_latest.extend (self: super: { 2 linuxPackages_latest = prev.linuxPackages_latest.extend (self: super: {
3 v4l2loopback = super.stdenv.mkDerivation rec { 3 v4l2loopback = super.stdenv.mkDerivation rec {
4 name = "v4l2loopback-${version}-${self.kernel.version}"; 4 name = "v4l2loopback-${version}-${self.kernel.version}";
5 version = "f62fb9076b6313e5eb82fdcaceadb6b3052f346e"; 5 inherit (sources.v4l2loopback) version src;
6
7 src = prev.fetchFromGitHub {
8 owner = "umlaeute";
9 repo = "v4l2loopback";
10 rev = "${version}";
11 sha256 = "VRFtimQQtT8vd1dx5KtUDkmXo3DSOybhNLcAIxQba44=";
12 fetchSubmodules = true;
13 };
14 6
15 hardeningDisable = [ "format" "pic" ]; 7 hardeningDisable = [ "format" "pic" ];
16 8
diff --git a/overlays/worktime/default.nix b/overlays/worktime/default.nix
index a8fe79c6..4322f719 100644
--- a/overlays/worktime/default.nix
+++ b/overlays/worktime/default.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 worktime = prev.stdenv.mkDerivation rec { 2 worktime = prev.stdenv.mkDerivation rec {
3 name = "worktime"; 3 name = "worktime";
4 src = ./worktime.py; 4 src = ./worktime.py;
diff --git a/overlays/xcompose.nix b/overlays/xcompose.nix
index 2bcd6c01..e7603b83 100644
--- a/overlays/xcompose.nix
+++ b/overlays/xcompose.nix
@@ -1,17 +1,5 @@
1final: prev: { 1{ final, prev, sources, ... }: {
2 xcompose = prev.stdenv.mkDerivation (let 2 xcompose = prev.stdenv.mkDerivation (sources.xcompose // {
3 rev = "150c47fabb9f45e81138f71347dc75f69b5dd987";
4 in {
5 pname = "xcompose";
6 version = builtins.substring 0 8 rev;
7
8 src = prev.fetchFromGitHub {
9 owner = "kragen";
10 repo = "xcompose";
11 inherit rev;
12 hash = "sha256-XQ0ZuXGvDLz9fJ0yGHtgL4wl9Jx3SG30cGBM2b947iY=";
13 };
14
15 nativeBuildInputs = with final; [ perl ]; 3 nativeBuildInputs = with final; [ perl ];
16 4
17 postPatch = '' 5 postPatch = ''
diff --git a/overlays/zte-prometheus-exporter/default.nix b/overlays/zte-prometheus-exporter/default.nix
index 1609724b..2188e7b3 100644
--- a/overlays/zte-prometheus-exporter/default.nix
+++ b/overlays/zte-prometheus-exporter/default.nix
@@ -1,4 +1,4 @@
1final: prev: 1{ final, prev, ... }:
2let 2let
3 packageOverrides = final.callPackage ./python-packages.nix {}; 3 packageOverrides = final.callPackage ./python-packages.nix {};
4 inpPython = final.python310.override { inherit packageOverrides; }; 4 inpPython = final.python310.override { inherit packageOverrides; };