about summary refs log tree commit diff
path: root/packages
diff options
context:
space:
mode:
authorBaitinq <manuelpalenzuelamerino@gmail.com>2022-06-18 22:01:22 +0200
committerBaitinq <manuelpalenzuelamerino@gmail.com>2022-06-18 22:01:22 +0200
commit71ce8a0a5a1df3ba630b597fd1026ea3447710fe (patch)
treef77df125d18486645bb4639958d8c9f094b902d4 /packages
parentAdded patched kcc and kindlegen (diff)
downloadnixos-config-71ce8a0a5a1df3ba630b597fd1026ea3447710fe.tar.gz
nixos-config-71ce8a0a5a1df3ba630b597fd1026ea3447710fe.tar.bz2
nixos-config-71ce8a0a5a1df3ba630b597fd1026ea3447710fe.zip
Refactor custom packages
Diffstat (limited to 'packages')
-rw-r--r--packages/anime-downloader/default.nix4
-rw-r--r--packages/kindlegen/default.nix10
-rw-r--r--packages/trackma/default.nix4
3 files changed, 4 insertions, 14 deletions
diff --git a/packages/anime-downloader/default.nix b/packages/anime-downloader/default.nix
index 35f625f..12038f8 100644
--- a/packages/anime-downloader/default.nix
+++ b/packages/anime-downloader/default.nix
@@ -1,6 +1,6 @@
 { pkgs, lib }:
 
-pkgs.python38.pkgs.buildPythonPackage rec {
+pkgs.python3.pkgs.buildPythonPackage rec {
   pname = "anime-downloader";
   version = "5.0.14";
 
@@ -11,7 +11,7 @@ pkgs.python38.pkgs.buildPythonPackage rec {
     sha256 = "1ai71g8cp2i37p53lm32nl3h8cq7rcxifhnj1z1cfvxbqjvackaj";
   };
 
-  propagatedBuildInputs = with pkgs.python38.pkgs; [
+  propagatedBuildInputs = with pkgs.python3.pkgs; [
     pySmartDL
     cfscrape
     beautifulsoup4
diff --git a/packages/kindlegen/default.nix b/packages/kindlegen/default.nix
index e2000b4..dd86dec 100644
--- a/packages/kindlegen/default.nix
+++ b/packages/kindlegen/default.nix
@@ -6,20 +6,10 @@ let
 
   sha256 = {
     x86_64-linux = "sha256-2ZLFM5YcV2Ym38hxU8WMrRDjHDF6edqYohLeM+ASgpk=";
-    i686-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
-    x86_64-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
-    i686-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
-    x86_64-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
-    i686-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
   }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported");
 
   url = {
     x86_64-linux = "https://archive.org/download/kindlegen_linux_2_6_i386_v2_9/kindlegen_linux_2.6_i386_v2_9.tar.gz";
-    i686-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
-    x86_64-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
-    i686-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
-    x86_64-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
-    i686-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
   }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported");
 
 in
diff --git a/packages/trackma/default.nix b/packages/trackma/default.nix
index 5494253..1c81f5c 100644
--- a/packages/trackma/default.nix
+++ b/packages/trackma/default.nix
@@ -1,12 +1,12 @@
 { pkgs, lib }:
 
-pkgs.python38.pkgs.buildPythonApplication rec {
+pkgs.python3.pkgs.buildPythonApplication rec {
   pname = "trackma";
   version = "0.8.4";
 
   buildInputs = with pkgs; [ gobject-introspection gtk3 gnome.adwaita-icon-theme ];
   nativeBuildInputs = with pkgs; [ wrapGAppsHook ];
-  propagatedBuildInputs = with pkgs.python38.pkgs; [ setuptools pygobject3 pycairo pillow ];
+  propagatedBuildInputs = with pkgs.python3.pkgs; [ setuptools pygobject3 pycairo pillow ];
 
   #bug with fetchFromGithub?
   src = pkgs.fetchgit {