various fixes
This commit is contained in:
parent
3814a28f79
commit
51bfe7feb8
|
@ -43,7 +43,7 @@
|
||||||
deluge
|
deluge
|
||||||
gmpc
|
gmpc
|
||||||
vlc
|
vlc
|
||||||
youtubeDL
|
youtube-dl
|
||||||
spotdl
|
spotdl
|
||||||
ffmpeg
|
ffmpeg
|
||||||
syncplay
|
syncplay
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
inherit name;
|
inherit name;
|
||||||
desktopName = name;
|
desktopName = name;
|
||||||
exec = command;
|
exec = command;
|
||||||
terminal = "true";
|
terminal = true;
|
||||||
};
|
};
|
||||||
superSimpleDesktopItem = name: simpleDesktopItem name name;
|
superSimpleDesktopItem = name: simpleDesktopItem name name;
|
||||||
terminalDesktopItem = name: namedTerminalDesktopItem name name;
|
terminalDesktopItem = name: namedTerminalDesktopItem name name;
|
||||||
|
|
|
@ -188,10 +188,10 @@
|
||||||
"homepage": null,
|
"homepage": null,
|
||||||
"owner": "maralorn",
|
"owner": "maralorn",
|
||||||
"repo": "taskwarrior-git-backend",
|
"repo": "taskwarrior-git-backend",
|
||||||
"rev": "e29c4335e2cb10d6c73832dcbdf931fdc6872e94",
|
"rev": "a2cc4629f158608d89014aee0e134d8d519d3344",
|
||||||
"sha256": "0pq2s75mj9dpk5lk7igx88641zs0bihp6yx8l5gipaqy2daydrz6",
|
"sha256": "1pai42da31428nh8qrl2x3yhk4fa23fmn8i12wdsy9ng6qwkg8k3",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/maralorn/taskwarrior-git-backend/archive/e29c4335e2cb10d6c73832dcbdf931fdc6872e94.tar.gz",
|
"url": "https://github.com/maralorn/taskwarrior-git-backend/archive/a2cc4629f158608d89014aee0e134d8d519d3344.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"wizards-dialog": {
|
"wizards-dialog": {
|
||||||
|
|
|
@ -2,11 +2,6 @@ final: prev: let
|
||||||
haskellPackages = prev.haskellPackages.extend (self: super: {
|
haskellPackages = prev.haskellPackages.extend (self: super: {
|
||||||
kassandra = self.callCabal2nix "kassandra" (prev.sources.kassandra + "/kassandra") {};
|
kassandra = self.callCabal2nix "kassandra" (prev.sources.kassandra + "/kassandra") {};
|
||||||
standalone = self.callCabal2nix "standalone" (prev.sources.kassandra + "/standalone") {};
|
standalone = self.callCabal2nix "standalone" (prev.sources.kassandra + "/standalone") {};
|
||||||
taskwarrior = self.callHackageDirect {
|
|
||||||
pkg = "taskwarrior";
|
|
||||||
ver = "0.5.0.0";
|
|
||||||
sha256 = "sha256-elDUtz0NSG4WHxkyCQ1CunYXWIVRj6EqkKSchPy+c3E=";
|
|
||||||
} {};
|
|
||||||
});
|
});
|
||||||
in {
|
in {
|
||||||
kassandra = haskellPackages.standalone;
|
kassandra = haskellPackages.standalone;
|
||||||
|
|
|
@ -91,6 +91,7 @@ self: super: {
|
||||||
desktop-pkgs = {
|
desktop-pkgs = {
|
||||||
inherit
|
inherit
|
||||||
(self)
|
(self)
|
||||||
|
dconf
|
||||||
lm_sensors
|
lm_sensors
|
||||||
xwayland
|
xwayland
|
||||||
xdg_utils
|
xdg_utils
|
||||||
|
@ -127,7 +128,6 @@ self: super: {
|
||||||
});
|
});
|
||||||
inherit
|
inherit
|
||||||
(self.gnome)
|
(self.gnome)
|
||||||
dconf
|
|
||||||
dconf-editor
|
dconf-editor
|
||||||
gnome-tweaks
|
gnome-tweaks
|
||||||
gnome-shell-extensions
|
gnome-shell-extensions
|
||||||
|
@ -136,7 +136,6 @@ self: super: {
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
home-pkgs = {
|
home-pkgs = {
|
||||||
inherit (self.pythonPackages) yapf jsbeautifier;
|
|
||||||
inherit
|
inherit
|
||||||
(self)
|
(self)
|
||||||
go
|
go
|
||||||
|
@ -144,7 +143,6 @@ self: super: {
|
||||||
mpc_cli
|
mpc_cli
|
||||||
ncmpcpp
|
ncmpcpp
|
||||||
shfmt
|
shfmt
|
||||||
htmlTidy
|
|
||||||
astyle
|
astyle
|
||||||
nodejs
|
nodejs
|
||||||
tasksh
|
tasksh
|
||||||
|
|
Loading…
Reference in a new issue