pyfa: init at 2.60.1

NixOS · Oct 7, 2024 · 6d96ae9 · 6d96ae9
1 parent fe9be28
commit 6d96ae9
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
@@ -5,29 +5,47 @@
 }:
 let
   pname = "pyfa";
+<<<<<<< HEAD
   version = "v2.58.3";
   src = fetchurl {
     url = "https://github.com/pyfa-org/Pyfa/releases/download/${version}/pyfa-${version}-linux.AppImage";
     name = "pyfa-${version}";
     sha256 = "opzZSiVWfJv//KONocL9byZKqX/hWkPU+ssdceUDXh0=";
+=======
+  version = "2.60.1";
+  src = fetchurl {
+    url = "https://github.com/pyfa-org/Pyfa/releases/download/v${version}/pyfa-v${version}-linux.AppImage";
+    name = "pyfa-${version}";
+    hash = "sha256-+nyIG6pweIgC6ZiWJaO4E2Fp0/zP+DhQrUWzHnIBQXk=";
+>>>>>>> 56e0d2dacf70 (pyfa: init at 2.60.1)
   };
   appimageContents = appimageTools.extractType1 { inherit pname version src; };
 in
 appimageTools.wrapType1 {
   inherit pname version src;
 
   extraInstallCommands = ''
+<<<<<<< HEAD
     install -m 444 -D ${appimageContents}/pyfa.desktop -t $out/share/applications
     substituteInPlace $out/share/applications/pyfa.desktop \
       --replace-warn 'Exec=pyfa' 'Exec=${pname}'
 
+=======
+>>>>>>> 56e0d2dacf70 (pyfa: init at 2.60.1)
     cp -r ${appimageContents}/pyfa.png $out/share
   '';
 
   meta = with lib; {
     description = "Python fitting assistant, cross-platform fitting tool for EVE Online";
     homepage = "https://github.com/pyfa-org/Pyfa";
     license = licenses.gpl3;
+<<<<<<< HEAD
+=======
+    maintainers = with maintainers; [
+      toasteruwu
+      cholli
+    ];
+>>>>>>> 56e0d2dacf70 (pyfa: init at 2.60.1)
     mainProgram = "pyfa";
   };
 }