From cf1143a3fc235ba6cb3c94ff0d420bf241559c4e Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sat, 6 Jul 2024 14:52:23 -0600 Subject: [PATCH] updated download script install method --- flake.lock | 44 ++++++++++++++++++------------------ modules/scripts/download.nix | 11 +++------ 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 3d4a661..b79edab 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1719827385, - "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "391ca6e950c2525b4f853cbe29922452c14eda82", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "master": { "locked": { - "lastModified": 1719853907, - "narHash": "sha256-2r/j/Io+COZddjFfMCijIeisLDlFT0l8P8inhMg4vHc=", + "lastModified": 1720296704, + "narHash": "sha256-ySwT5h4bfJocJXnV2tLoM6p3uoHQwl1HX4+iC0hVNL8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfdae65b07b95ddd0bddd3af65e171fffd2f85e2", + "rev": "c32d4a84fa92a0f2df474e47a6fc5242d8d88bc5", "type": "github" }, "original": { @@ -77,11 +77,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1719710498, - "narHash": "sha256-+yqI1zvk1jNcNTWA3CGnp5N2jSXr/q/CggYZYvGsdNc=", + "lastModified": 1720185178, + "narHash": "sha256-9KJ7KXQYDhnAfPIAvYYAEFW+85Gk9gm5W1pMoE/VMFg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "774908e566a0b3b702219fdf90a5ed4551b3688d", + "rev": "6caa391790442baea22260296041429fb365e0ce", "type": "github" }, "original": { @@ -120,27 +120,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719663039, - "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "lastModified": 1719720450, + "narHash": "sha256-57+R2Uj3wPeDeq8p8un19tzFFlgWiXJ8PbzgKtBgBX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", + "rev": "78f8641796edff3bfabbf1ef5029deadfe4a21d0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1719707984, - "narHash": "sha256-RoxIr/fbndtuKqulGvNCcuzC6KdAib85Q8gXnjzA1dw=", + "lastModified": 1720110830, + "narHash": "sha256-E5dN9GDV4LwMEduhBLSkyEz51zM17XkWZ3/9luvNOPs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7dca15289a1c2990efbe4680f0923ce14139b042", + "rev": "c0d0be00d4ecc4b51d2d6948e37466194c1e6c51", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719716556, - "narHash": "sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8+awNMyqs=", + "lastModified": 1720187017, + "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b5974d4331fb6c893e808977a2e1a6d34b3162d6", + "rev": "1b11e208cee97c47677439625dc22e5289dcdead", "type": "github" }, "original": { @@ -184,11 +184,11 @@ }, "unstable": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { diff --git a/modules/scripts/download.nix b/modules/scripts/download.nix index 263d34b..15665ee 100644 --- a/modules/scripts/download.nix +++ b/modules/scripts/download.nix @@ -7,14 +7,9 @@ pname = "download"; version = "2.5"; src = ../../scripts/download/.; - buildInputs = [ python3Packages.setuptools ]; - propagatedBuildInputs = [ - python3Packages.pyyaml - python3Packages.types-pyyaml - yt-dlp - gallery-dl - ffmpeg - ]; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ pyyaml types-pyyaml yt-dlp ]; + propagatedBuildInputs = [ gallery-dl ffmpeg ]; }; in { home-manager.users.jawz = {