Compare commits
No commits in common. "9c4a68e3aa5dc9ab9dbcf63b6fe8e721ed793b3c" and "202ea9929b3296ed462e77d6172231df3963a0c6" have entirely different histories.
9c4a68e3aa
...
202ea9929b
47
default.nix
47
default.nix
@ -63,25 +63,38 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# A functional Jetbrains IDE-with-plugins package set.
|
# A functional Jetbrains IDE-with-plugins package set.
|
||||||
jetbrains = pkgs.dontRecurseIntoAttrs rec {
|
jetbrains =
|
||||||
jetbrainsPluginsFor = variant: import ./pkgs/top-level/jetbrains-plugins.nix {
|
let
|
||||||
inherit (pkgs) lib newScope stdenv fetchzip;
|
mkJetbrainsPlugins = import ./pkgs/applications/editors/jetbrains/common-plugins.nix {
|
||||||
inherit variant;
|
inherit (pkgs) callPackage;
|
||||||
|
};
|
||||||
|
mkIdeaPlugins = import ./pkgs/applications/editors/jetbrains/idea-plugins.nix {
|
||||||
|
inherit (pkgs) callPackage;
|
||||||
|
};
|
||||||
|
|
||||||
|
builder = import ./pkgs/applications/editors/jetbrains/builder.nix {
|
||||||
|
inherit (pkgs) lib;
|
||||||
|
};
|
||||||
|
|
||||||
|
jbScope = pkgs.lib.makeScope pkgs.newScope (self: pkgs.lib.makeOverridable
|
||||||
|
({ jetbrainsPlugins ? mkJetbrainsPlugins
|
||||||
|
, ideaPlugins ? mkIdeaPlugins
|
||||||
|
}: ({ }
|
||||||
|
// jetbrainsPlugins // { inherit jetbrainsPlugins; }
|
||||||
|
// ideaPlugins // { inherit ideaPlugins; }
|
||||||
|
// {
|
||||||
|
jetbrainsWithPlugins = builder self;
|
||||||
|
}))
|
||||||
|
{ });
|
||||||
|
in
|
||||||
|
rec {
|
||||||
|
inherit (jbScope) jetbrainsWithPlugins;
|
||||||
|
clionWithPlugins = jetbrainsWithPlugins pkgs.jetbrains.clion;
|
||||||
|
ideaCommunityWithPlugins = jetbrainsWithPlugins pkgs.jetbrains.idea-community;
|
||||||
|
ideaUltimateWithPlugins = jetbrainsWithPlugins pkgs.jetbrains.idea-ultimate;
|
||||||
|
plugins = jbScope;
|
||||||
};
|
};
|
||||||
|
|
||||||
pluginBuild = jetbrainsPlatforms: pkgs.callPackage ./pkgs/build-support/jetbrains/plugin.nix {
|
|
||||||
inherit jetbrains jetbrainsPlatforms;
|
|
||||||
};
|
|
||||||
|
|
||||||
clionPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion);
|
|
||||||
ideaCommunityPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community);
|
|
||||||
ideaUltimatePlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate);
|
|
||||||
|
|
||||||
clionWithPlugins = clionPlugins.jetbrainsWithPlugins;
|
|
||||||
ideaCommunityWithPlugins = ideaCommunityPlugins.jetbrainsWithPlugins;
|
|
||||||
ideaUltimateWithPlugins = ideaUltimatePlugins.jetbrainsWithPlugins;
|
|
||||||
};
|
|
||||||
|
|
||||||
libhl = pkgs.callPackage ./pkgs/development/libraries/libhl { };
|
libhl = pkgs.callPackage ./pkgs/development/libraries/libhl { };
|
||||||
|
|
||||||
mopidy-subidy = pkgs.callPackage ./pkgs/applications/audio/mopidy/subidy.nix {
|
mopidy-subidy = pkgs.callPackage ./pkgs/applications/audio/mopidy/subidy.nix {
|
||||||
|
@ -13,12 +13,6 @@ in
|
|||||||
options.services.amdgpu.fan = {
|
options.services.amdgpu.fan = {
|
||||||
enable = mkEnableOption "amdgpu-fan";
|
enable = mkEnableOption "amdgpu-fan";
|
||||||
|
|
||||||
package = mkOption {
|
|
||||||
type = types.package;
|
|
||||||
default = pkgs.amdgpu-fan or (import ../../.. { inherit pkgs; }).amdgpu-fan;
|
|
||||||
defaultText = "pkgs.amdgpu-fan";
|
|
||||||
};
|
|
||||||
|
|
||||||
speedMatrix = mkOption {
|
speedMatrix = mkOption {
|
||||||
type = with types; listOf (listOf int);
|
type = with types; listOf (listOf int);
|
||||||
# Translated from upstream default config. Since it tries to write the
|
# Translated from upstream default config. Since it tries to write the
|
||||||
@ -51,7 +45,7 @@ in
|
|||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
assertions = singleton {
|
assertions = singleton {
|
||||||
assertion = all (speeds: length speeds == 2) cfg.speedMatrix;
|
assertion = all (speeds: length speeds == 2) cfg.speedMatrix;
|
||||||
message = "services.amdgpu.fan.speedMatrix must be a list of paired lists";
|
message = "services.amdgpu-fan.speedMatrix must be a list of paired lists";
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.etc."amdgpu-fan.yml".text = builtins.toJSON {
|
environment.etc."amdgpu-fan.yml".text = builtins.toJSON {
|
||||||
@ -66,9 +60,9 @@ in
|
|||||||
amdgpu-fan = {
|
amdgpu-fan = {
|
||||||
description = "amdgpu fan controller";
|
description = "amdgpu fan controller";
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = [ "default.target" ];
|
||||||
after = [ "amdgpu-pwm.service" ];
|
after = [ "enable-manual-amdgpu-fan.service" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${cfg.package}/bin/amdgpu-fan";
|
ExecStart = "${pkgs.amdgpu-fan}/bin/amdgpu-fan";
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -11,12 +11,6 @@ in
|
|||||||
{
|
{
|
||||||
options.services.radeon-profile-daemon = {
|
options.services.radeon-profile-daemon = {
|
||||||
enable = mkEnableOption "radeon-profile-daemon";
|
enable = mkEnableOption "radeon-profile-daemon";
|
||||||
|
|
||||||
package = mkOption {
|
|
||||||
type = types.package;
|
|
||||||
default = pkgs.radeon-profile-daemon or (import ../../.. { inherit pkgs; }).radeon-profile-daemon;
|
|
||||||
defaultText = "pkgs.radeon-profile-daemon";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
@ -24,10 +18,10 @@ in
|
|||||||
radeon-profile-daemon = {
|
radeon-profile-daemon = {
|
||||||
description = "radeon-profile daemon";
|
description = "radeon-profile daemon";
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
after = [ "amdgpu-pwm.service" ];
|
after = [ "enable-manual-amdgpu-fan.service" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${package}/bin/radeon-profile-daemon";
|
ExecStart = "${pkgs.radeon-profile-daemon}/bin/radeon-profile-daemon";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ lib
|
{ stdenv
|
||||||
, stdenv
|
|
||||||
, fetchzip
|
, fetchzip
|
||||||
, jetbrainsPlatforms
|
, jetbrainsPlatforms
|
||||||
}:
|
}:
|
||||||
@ -13,21 +12,19 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit pname version;
|
inherit pname version jetbrainsPlatforms;
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
inherit sha256;
|
inherit sha256;
|
||||||
url = "https://plugins.jetbrains.com/files/${toString pluginId}/${toString versionId}/${filename}";
|
url = "https://plugins.jetbrains.com/files/${toString pluginId}/${toString versionId}/${filename}";
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = { inherit jetbrainsPlatforms; };
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
cp -r * $out/
|
cp -r * $out/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://plugins.jetbrains.com/plugin/${pluginId}-${lib.toLower pname}";
|
homepage = "https://plugins.jetbrains.com/plugin/${pluginId}-${stdenv.lib.toLower pname}";
|
||||||
};
|
};
|
||||||
}
|
}
|
@ -12,20 +12,22 @@ let
|
|||||||
then pluginsFun self
|
then pluginsFun self
|
||||||
else pluginsFun;
|
else pluginsFun;
|
||||||
|
|
||||||
# FIXME: Is this still needed?
|
|
||||||
info = builtins.parseDrvName package.name;
|
info = builtins.parseDrvName package.name;
|
||||||
|
|
||||||
badPlugins = filter (p: ! elem info.name p.jetbrainsPlatforms) plugins;
|
badPlugins = filter (p: ! elem info.name p.jetbrainsPlatforms) plugins;
|
||||||
errorMsg = "plugins [ ${toString (map (p: p.name) badPlugins)} ] are not available for platform ${info.name}";
|
errorMsg = "plugins [ ${toString (map (p: p.name) badPlugins)} ] are not available for platform ${info.name}";
|
||||||
in
|
in
|
||||||
|
|
||||||
assert assertMsg (length badPlugins == 0) errorMsg;
|
assert assertMsg (length badPlugins == 0) errorMsg;
|
||||||
|
|
||||||
appendToName "with-plugins" (package.overrideAttrs (oldAttrs: {
|
package.overrideAttrs (oldAttrs: {
|
||||||
passthru = { inherit plugins; };
|
# FIXME: versioning: could just expose upstream
|
||||||
# TODO: Purely aesthetics, but link the plugin to its name instead of hash-name-version
|
name = "${info.name}-with-plugins-${info.version}";
|
||||||
|
|
||||||
|
inherit plugins;
|
||||||
installPhase = oldAttrs.installPhase + ''
|
installPhase = oldAttrs.installPhase + ''
|
||||||
for plugin in $plugins; do
|
for plugin in $plugins; do
|
||||||
ln -s "$plugin" "$out/$name/plugins/$(basename $plugin)"
|
ln -s "$plugin" "$out/$name/plugins/$(basename $plugin)"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
}))
|
})
|
@ -1,11 +1,6 @@
|
|||||||
{ lib, stdenv, fetchzip }:
|
{ callPackage }:
|
||||||
|
|
||||||
self:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
mkPlugin = callPackage ./build-plugin.nix {
|
||||||
commonBuild = import ../../../build-support/jetbrains/plugin.nix {
|
|
||||||
inherit lib stdenv fetchzip;
|
|
||||||
jetbrainsPlatforms = [
|
jetbrainsPlatforms = [
|
||||||
"clion"
|
"clion"
|
||||||
"datagrip"
|
"datagrip"
|
||||||
@ -20,22 +15,30 @@ let
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
ideavim = mkPlugin {
|
||||||
|
pname = "IdeaVim";
|
||||||
|
version = "0.57";
|
||||||
|
pluginId = 164;
|
||||||
|
versionId = 85009;
|
||||||
|
sha256 = "1rwfwj0b0nwi7jxhzxk1r0xc190nf4i3b59i0zknpmgb4yc5clzw";
|
||||||
|
};
|
||||||
|
|
||||||
generateCommon = lib.makeOverridable ({
|
checkstyle-idea = mkPlugin {
|
||||||
common ? ./manual-common-packages.nix
|
pname = "CheckStyle-IDEA";
|
||||||
}: let
|
version = "5.42.0";
|
||||||
|
pluginId = 1065;
|
||||||
imported = import common {
|
versionId = 95757;
|
||||||
inherit (self) callPackage;
|
sha256 = "0sji3649n5zz84dlidqaklipq6vaiafxsvg0gzy3j59mvkz6dk14";
|
||||||
};
|
};
|
||||||
|
|
||||||
super = imported;
|
|
||||||
|
|
||||||
overrides = { };
|
|
||||||
|
|
||||||
jetbrainsPlugins = super // overrides;
|
|
||||||
|
|
||||||
in jetbrainsPlugins // { inherit commonBuild; });
|
|
||||||
|
|
||||||
in generateCommon { }
|
|
||||||
|
|
||||||
|
google-java-format = mkPlugin rec {
|
||||||
|
pname = "google-java-format";
|
||||||
|
version = "1.7.0.4";
|
||||||
|
pluginId = 8527;
|
||||||
|
versionId = 83164;
|
||||||
|
sha256 = "1pmnn1ksiv44kdga53gi3psrm2sva4bqrxizagbr0if2n0rrvgii";
|
||||||
|
filename = "${pname}.zip";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
@ -1,29 +1,15 @@
|
|||||||
{ lib, stdenv, fetchzip }:
|
{ callPackage }:
|
||||||
|
|
||||||
self:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
mkPlugin = callPackage ./build-plugin.nix {
|
||||||
ideaBuild = import ../../../build-support/jetbrains/plugin.nix {
|
|
||||||
inherit lib stdenv fetchzip;
|
|
||||||
jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
|
jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
|
||||||
};
|
};
|
||||||
|
in
|
||||||
generateIdea = lib.makeOverridable ({
|
{
|
||||||
idea ? ./manual-idea-packages.nix
|
spring-assistant = mkPlugin {
|
||||||
}: let
|
pname = "intellij-spring-assistant";
|
||||||
|
version = "0.12.0";
|
||||||
imported = import idea {
|
pluginId = 10229;
|
||||||
inherit (self) callPackage;
|
versionId = 44968;
|
||||||
};
|
sha256 = "13cglywzhb4j0qj0bs2jwaz2k8pxrxalv35wgkmgkxr635bxmwsj";
|
||||||
|
};
|
||||||
super = imported;
|
}
|
||||||
|
|
||||||
overrides = { };
|
|
||||||
|
|
||||||
ideaPlugins = super // overrides;
|
|
||||||
|
|
||||||
in ideaPlugins // { inherit ideaBuild; });
|
|
||||||
|
|
||||||
in generateIdea { }
|
|
||||||
|
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
{ callPackage }:
|
|
||||||
{
|
|
||||||
ideavim = callPackage
|
|
||||||
({ commonBuild }: commonBuild {
|
|
||||||
pname = "IdeaVim";
|
|
||||||
version = "0.57";
|
|
||||||
pluginId = 164;
|
|
||||||
versionId = 85009;
|
|
||||||
sha256 = "1rwfwj0b0nwi7jxhzxk1r0xc190nf4i3b59i0zknpmgb4yc5clzw";
|
|
||||||
})
|
|
||||||
{ };
|
|
||||||
|
|
||||||
checkstyle-idea = callPackage
|
|
||||||
({ commonBuild }: commonBuild {
|
|
||||||
pname = "CheckStyle-IDEA";
|
|
||||||
version = "5.42.0";
|
|
||||||
pluginId = 1065;
|
|
||||||
versionId = 95757;
|
|
||||||
sha256 = "0sji3649n5zz84dlidqaklipq6vaiafxsvg0gzy3j59mvkz6dk14";
|
|
||||||
})
|
|
||||||
{ };
|
|
||||||
|
|
||||||
google-java-format = callPackage
|
|
||||||
({ commonBuild }: commonBuild rec {
|
|
||||||
pname = "google-java-format";
|
|
||||||
version = "1.7.0.4";
|
|
||||||
pluginId = 8527;
|
|
||||||
versionId = 83164;
|
|
||||||
sha256 = "1pmnn1ksiv44kdga53gi3psrm2sva4bqrxizagbr0if2n0rrvgii";
|
|
||||||
filename = "${pname}.zip";
|
|
||||||
})
|
|
||||||
{ };
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
{ callPackage }:
|
|
||||||
{
|
|
||||||
spring-assistant = callPackage
|
|
||||||
({ ideaBuild }: ideaBuild {
|
|
||||||
pname = "intellij-spring-assistant";
|
|
||||||
version = "0.12.0";
|
|
||||||
pluginId = 10229;
|
|
||||||
versionId = 44968;
|
|
||||||
sha256 = "13cglywzhb4j0qj0bs2jwaz2k8pxrxalv35wgkmgkxr635bxmwsj";
|
|
||||||
})
|
|
||||||
{ };
|
|
||||||
}
|
|
@ -1,33 +0,0 @@
|
|||||||
{ lib
|
|
||||||
, newScope
|
|
||||||
, stdenv
|
|
||||||
, fetchzip
|
|
||||||
|
|
||||||
, variant
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
mkJetbrainsPlugins = import ../applications/editors/jetbrains/common-plugins.nix {
|
|
||||||
inherit lib stdenv fetchzip;
|
|
||||||
};
|
|
||||||
|
|
||||||
mkIdeaPlugins = import ../applications/editors/jetbrains/idea-plugins.nix {
|
|
||||||
inherit lib stdenv fetchzip;
|
|
||||||
};
|
|
||||||
|
|
||||||
jetbrainsWithPlugins = import ../applications/editors/jetbrains/wrapper.nix {
|
|
||||||
inherit lib;
|
|
||||||
};
|
|
||||||
|
|
||||||
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