pkgs/by-name/at/atlauncher/package.nix

@@ -0,0 +1,46 @@
+{ stdenv
+, lib
+, fetchurl
+, makeWrapper
+, jdk17
+, udev
+, xorg
+}:
+
+stdenv.mkDerivation rec {
+  pname = "atlauncher";
+  version = "3.4.35.4";
+
+  src = fetchurl {
+    url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${version}/ATLauncher-${version}.jar";
+    hash = "sha256-M8ygN70yizJM6VEffBh/lH/DneKAzQ5UFzc3g51dja0=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/java
+    cp $src $out/share/java/ATLauncher.jar
+    makeWrapper ${jdk17}/bin/java $out/bin/atlauncher \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm udev ]}" \
+      --add-flags "-jar $out/share/java/ATLauncher.jar" \
+      --add-flags "--working-dir \''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher" \
+      --add-flags "--no-launcher-update"
+  '';
+
+  meta = {
+    description = "Minecraft launcher";
+    longDescription = ''
+      ATLauncher is a Launcher for Minecraft which integrates multiple different
+      ModPacks to allow you to download and install ModPacks easily and quickly.
+    '';
+    sourceProvenance = [
+      (lib.sourceTypes.binaryBytecode or { shortName = "binaryBytecode"; isSource = false; })
+    ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    homepage = "https://atlauncher.com/";
+  };
+}

pkgs/by-name/be/betanin/package.nix

@@ -1,73 +1,71 @@
 { lib
-, buildNpmPackage
+, callPackage
 , fetchFromGitHub
 , python3
 , beets
 }:
 
 let
-  version = "0.5.6";
+  py = python3.pkgs;
+
+  version = "0.4.0.ffe45c02";
 
   src = fetchFromGitHub {
-    owner = "sentriz";
+    owner = "xeals";
     repo = "betanin";
-    rev = "v${version}";
-    hash = "sha256-8JzZfxXzey6vGwsnpXTea/gTMFwmeeavimn5njHIEg0=";
+    rev = "ffe45c028037fc1659f62a9cdc9e1413dc2f358d";
+    hash = "sha256-5d8Y7PDlhkdVRVX+KvpiQ2WYNRELwc+ya5s4Qi+YQpI=";
   };
 
-  client = buildNpmPackage {
-    pname = "betanin_client";
-    inherit version src;
-
-    sourceRoot = "${src.name}/betanin_client";
-
-    npmDepsHash = "sha256-VkCQKpkDCTDejv8eRAN2Zfbq8TlWLdtqVJU3fo9hQrI=";
-    NODE_OPTIONS = "--openssl-legacy-provider";
+  client = callPackage ./client {
+    inherit src version;
   };
 in
-python3.pkgs.buildPythonApplication {
+py.buildPythonApplication {
   pname = "betanin";
   inherit version src;
-  format = "pyproject";
+
+  clientDistDir = "${client}/lib/node_modules/betanin/dist/";
+
+  doCheck = false;
 
   patches = [ ./paths.patch ];
   postPatch = ''
-    export clientDistDir="${client}/lib/node_modules/betanin/dist/"
     export libPrefix="${python3.libPrefix}"
     substituteAllInPlace betanin/paths.py
   '';
 
-  buildInputs = with python3.pkgs; [ setuptools ];
-
-  propagatedBuildInputs = (with python3.pkgs; [
-    apprise
-    alembic
-    click
-    flask
-    flask-cors
-    flask-jwt-extended
-    flask_migrate
-    flask-restx
-    flask-socketio
-    flask-sqlalchemy
-    gevent
-    pyxdg
-    loguru
-    ptyprocess
-    python-engineio
-    python-socketio
-    sqlalchemy
-    sqlalchemy-utils
-    toml
-  ]) ++ [
-    beets
-  ];
+  propagatedBuildInputs =
+    (builtins.attrValues {
+      inherit (py)
+        apprise
+        alembic
+        click
+        flask
+        flask-cors
+        flask-jwt-extended
+        flask_migrate
+        flask-restx
+        flask-socketio
+        flask-sqlalchemy
+        gevent
+        pyxdg
+        loguru
+        ptyprocess
+        python-engineio
+        python-socketio
+        sqlalchemy
+        sqlalchemy-utils
+        toml;
+    }) ++ [
+      beets
+    ];
 
   meta = {
     homepage = "https://github.com/sentriz/betanin";
     description = "beets based mitm of your torrent client and music player";
     license = lib.licenses.gpl3Only;
     maintainers = [ ];
-    platforms = lib.platforms.linux;
+    platforms = python3.meta.platforms;
   };
 }

pkgs/by-name/sa/samrewritten/package.nix

@@ -0,0 +1,48 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, curl
+, gnumake
+, gnutls
+, gtk3
+, gtkmm3
+, pkg-config
+, yajl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "SamRewritten";
+  version = "2.1";
+
+  src = fetchFromGitHub {
+    owner = "PaulCombal";
+    repo = pname;
+    rev = "202008";
+    sha256 = "ab7903b997675b0d4d7eede15430fc5ca2736e6c25c7f95a7c97e1ce25582a1c";
+  };
+
+  nativeBuildInputs = [ gnumake pkg-config ];
+  buildInputs = [
+    curl
+    gnutls
+    gtk3
+    gtkmm3
+    yajl
+  ];
+
+  NIX_CFLAGS_LINK = "-pthread";
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postFixup = ''
+    substituteInPlace $out/share/applications/samrewritten.desktop \
+      --replace /usr/bin/samrewritten $out/bin/samrewritten
+  '';
+
+  meta = with lib; {
+    description = "Steam Achievement Manager For Linux";
+    homepage = "https://github.com/PaulCombal/SamRewritten";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}

pkgs/data/fonts/monaspace/default.nix

@@ -0,0 +1,73 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+let
+  mkMonaspace =
+    { pname
+    , variants ? [ ]
+    }: stdenvNoCC.mkDerivation rec {
+      inherit pname;
+      version = "1.000";
+
+      src = fetchFromGitHub {
+        owner = "githubnext";
+        repo = "monaspace";
+        rev = "v${version}";
+        hash = "sha256-Zo56r0QoLwxwGQtcWP5cDlasx000G9BFeGINvvwEpQs=";
+      };
+
+      _variants = map (builtins.replaceStrings [ " " ] [ "" ]) variants;
+
+      installPhase = ''
+        local out_font=$out/share/fonts/monaspace
+      '' + (if variants == [ ] then ''
+        install -m444 -Dt $out_font fonts/otf/*.otf
+        install -m444 -Dt $out_font fonts/variable/*.ttf
+      '' else ''
+        for variant in $_variants; do
+          install -m444 -Dt $out_font fonts/otf/"$variant"-*.otf
+          install -m444 -Dt $out_font fonts/variable/"$variant"Var*.ttf
+        done
+      '');
+
+      meta = {
+        description = "An innovative superfamily of fonts for code";
+        homepage = "https://monaspace.githubnext.com/";
+        longDescription = ''
+          Since the earliest days of the teletype machine, code has been set in
+          monospaced type — letters, on a grid. Monaspace is a new type system
+          that advances the state of the art for the display of code on screen.
+        '';
+        license = lib.licenses.ofl;
+        platforms = lib.platforms.all;
+      };
+    };
+in
+{
+  monaspace = mkMonaspace {
+    pname = "monaspace";
+  };
+
+  monaspace-argon = mkMonaspace {
+    pname = "monaspace-argon";
+    variants = [ "Monaspace Argon" ];
+  };
+  monaspace-krypton = mkMonaspace {
+    pname = "monaspace-krypton";
+    variants = [ "Monaspace Krypton" ];
+  };
+  monaspace-neon = mkMonaspace {
+    pname = "monaspace-neon";
+    variants = [ "Monaspace Neon" ];
+  };
+  monaspace-radon = mkMonaspace {
+    pname = "monaspace-radon";
+    variants = [ "Monaspace Radon" ];
+  };
+  monaspace-xenon = mkMonaspace {
+    pname = "monaspace-xenon";
+    variants = [ "Monaspace Xenon" ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -21,6 +21,15 @@ rec {
     ideaUltimateWithPlugins = ideaUltimatePlugins.jetbrainsWithPlugins;
   };
 
+  monaspace-fonts = pkgs.callPackage ../data/fonts/monaspace/default.nix { };
+  inherit (monaspace-fonts)
+    monaspace
+    monaspace-argon
+    monaspace-krypton
+    monaspace-neon
+    monaspace-radon
+    monaspace-xenon;
+
   mopidy-subidy = pkgs.callPackage ../applications/audio/mopidy/subidy.nix {
     python3Packages = pkgs.python3Packages // python3Packages;
   };