From 77e969952ec4759ceaf3a231dd1b1113c6291976 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Sat, 17 Apr 2021 23:16:48 -0400 Subject: [PATCH] sourcehut: refactor --- .../version-management/sourcehut/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 8d2e8ceed33..43d783e1934 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,14 +1,16 @@ -{ python38, openssl -, callPackage, recurseIntoAttrs }: +{ python3 +, openssl +, callPackage +, recurseIntoAttrs +}: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` # Then we expose them through all-packages.nix as an application through `toPythonApplication` # https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781 - let fetchNodeModules = callPackage ./fetchNodeModules.nix { }; - python = python38.override { + python = python3.override { packageOverrides = self: super: { srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; @@ -26,7 +28,8 @@ let scmsrht = self.callPackage ./scm.nix { }; }; }; -in with python.pkgs; recurseIntoAttrs { +in +with python.pkgs; recurseIntoAttrs { inherit python; buildsrht = toPythonApplication buildsrht; dispatchsrht = toPythonApplication dispatchsrht;