summary refs log tree commit diff
path: root/modules/packages
diff options
context:
space:
mode:
Diffstat (limited to 'modules/packages')
-rw-r--r--modules/packages/discord-screenaudio.nix27
-rw-r--r--modules/packages/dotnet-pack.nix12
-rwxr-xr-xmodules/packages/gitfs.nix22
-rw-r--r--modules/packages/mc/modloaders/forge/1.19.2/43.2.11.nix0
-rw-r--r--modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix36
-rw-r--r--modules/packages/mc/server/vanilla/1.19.2.nix31
-rw-r--r--modules/packages/mtxclient-git.nix34
-rw-r--r--modules/packages/nheko-git.nix125
-rw-r--r--modules/packages/overlays/haskell/basement/IntWord64.nix17
-rw-r--r--modules/packages/overlays/rocm-gfx1102.nix14
-rwxr-xr-xmodules/packages/vim.nix16
-rw-r--r--modules/packages/xdg-desktop-portal-gtk.nix53
12 files changed, 163 insertions, 224 deletions
diff --git a/modules/packages/discord-screenaudio.nix b/modules/packages/discord-screenaudio.nix
index 4bf7c11..2829381 100644
--- a/modules/packages/discord-screenaudio.nix
+++ b/modules/packages/discord-screenaudio.nix
@@ -1,16 +1,17 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, wrapQtAppsHook
-, pkg-config
-, qtbase
-, qtwebengine
-, knotifications
-, kxmlgui
-, kglobalaccel
-, pipewire
-, xdg-desktop-portal
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  wrapQtAppsHook,
+  pkg-config,
+  qtbase,
+  qtwebengine,
+  knotifications,
+  kxmlgui,
+  kglobalaccel,
+  pipewire,
+  xdg-desktop-portal,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/modules/packages/dotnet-pack.nix b/modules/packages/dotnet-pack.nix
index 75a01a1..0e4a9b4 100644
--- a/modules/packages/dotnet-pack.nix
+++ b/modules/packages/dotnet-pack.nix
@@ -1,12 +1,18 @@
-{ pkgs ? import <nixpkgs> {} }:
+{
+  pkgs ? import <nixpkgs> { },
+}:
 
 pkgs.symlinkJoin {
   name = "dotnet-pack";
-  paths = [ pkgs.dotnet-sdk_8 pkgs.dotnet-sdk_7 pkgs.dotnet-sdk ];
+  paths = [
+    pkgs.dotnet-sdk_8
+    pkgs.dotnet-sdk_7
+    pkgs.dotnet-sdk
+  ];
   postBuild = ''
     rm -rfv $out/bin
     rm -rfv $out/dotnet
     cp -rv ${pkgs.dotnet-sdk_8}/dotnet $out/
     cp -rv ${pkgs.dotnet-sdk_8}/bin $out/
   '';
-}
\ No newline at end of file
+}
diff --git a/modules/packages/gitfs.nix b/modules/packages/gitfs.nix
index 804a747..728e836 100755
--- a/modules/packages/gitfs.nix
+++ b/modules/packages/gitfs.nix
@@ -2,16 +2,16 @@
 {
   environment.systemPackages = with pkgs; [
     (gitfs.overrideAttrs (old: {
-  # TODO: pls fix the nixpkgs derivation
-  patchPhase = null;
-  postPatch = old.patchPhase;
-  patches = (old.patches or []) ++ [
-    (fetchpatch {
-      name = "fix-MutableMapping.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/presslabs/gitfs/pull/382.diff";
-      hash = "sha256-ZaIEhv37sorSq3P+6GeH346u/5xh3qE+49D9FRNujMQ=";
-    })
+      # TODO: pls fix the nixpkgs derivation
+      patchPhase = null;
+      postPatch = old.patchPhase;
+      patches = (old.patches or [ ]) ++ [
+        (fetchpatch {
+          name = "fix-MutableMapping.patch";
+          url = "https://patch-diff.githubusercontent.com/raw/presslabs/gitfs/pull/382.diff";
+          hash = "sha256-ZaIEhv37sorSq3P+6GeH346u/5xh3qE+49D9FRNujMQ=";
+        })
+      ];
+    }))
   ];
-})
-  )];
 }
diff --git a/modules/packages/mc/modloaders/forge/1.19.2/43.2.11.nix b/modules/packages/mc/modloaders/forge/1.19.2/43.2.11.nix
deleted file mode 100644
index e69de29..0000000
--- a/modules/packages/mc/modloaders/forge/1.19.2/43.2.11.nix
+++ /dev/null
diff --git a/modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix b/modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix
deleted file mode 100644
index e150b7f..0000000
--- a/modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, pkgs, jdk17, makeWrapper }:
-
-let 
-  url = "https://mediafilez.forgecdn.net/files/4824/587/Techopolis_2_server_pack.zip";
-  hash = "sha256-4Ig4v8c14kxzJFeHPYv/w44c0/KkayoFc3rOuxxB+9s=";
-  name = "techopolis-2";
-  version = "5.4";
-  
-in stdenv.mkDerivation {
-  name = name;
-  
-  #sources
-  src = pkgs.fetchzip {
-    url = url;
-    stripRoot = false;
-    hash = hash;
-    name = "server";
-  };
-  forgeJar = import ../../../../modloaders/forge/1.19.2/43.2.11.nix;
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-  buildInputs = [ jdk17 makeWrapper ];
-  installPhase = ''
-  ls -lah
-    # Create the wrapper script
-    mkdir -p $out/bin
-    mkdir -p $out/lib
-    cp -r * $out/lib
-    makeWrapper ${jdk17}/bin/java $out/bin/mc-${name}-${version}-server \
-      --set JAVA_HOME ${jdk17} \
-      --add-args "-Dlog4j2.formatMsgNoLookups=true"
-  '';
-}
diff --git a/modules/packages/mc/server/vanilla/1.19.2.nix b/modules/packages/mc/server/vanilla/1.19.2.nix
deleted file mode 100644
index 3ad79e8..0000000
--- a/modules/packages/mc/server/vanilla/1.19.2.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, pkgs, jdk17, makeWrapper }:
-
-let 
-  url = "https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar";
-  hash = "sha256-4Ig4v8c14kxzJFeHPYv/w44c0/KkayoFc3rOuxxB+9s=";
-  name = "vanilla";
-  version = "1.19.2";
-in stdenv.mkDerivation {
-  name = name;
-  src = pkgs.fetchzip {
-    url = url;
-    stripRoot = false;
-    hash = hash;
-    name = "server";
-  };
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-  buildInputs = [ jdk17 makeWrapper ];
-  installPhase = ''
-  ls -lah
-    # Create the wrapper script
-    mkdir -p $out/bin
-    mkdir -p $out/lib
-    cp -r * $out/lib
-    makeWrapper ${jdk17}/bin/java $out/bin/mc-${name}-${version}-server \
-      --set JAVA_HOME ${jdk17} \
-      --add-args "-Dlog4j2.formatMsgNoLookups=true"
-  '';
-}
diff --git a/modules/packages/mtxclient-git.nix b/modules/packages/mtxclient-git.nix
index d2a9d6a..2392312 100644
--- a/modules/packages/mtxclient-git.nix
+++ b/modules/packages/mtxclient-git.nix
@@ -1,19 +1,21 @@
 # This file was copied from NUR: https://github.com/nix-community/nur-combined/blob/master/repos/deeunderscore/pkgs/mtxclient/default.nix
 # This file is a modified version of nixpkgs/pkgs/development/libraries/mtxclient/default.nix (copied at 5c4b9be)
 
-{ lib, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, openssl
-, olm
-, spdlog
-, nlohmann_json
-, libevent
-, curl
-, coeurl
-, re2
-, mtxclientSrc
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  openssl,
+  olm,
+  spdlog,
+  nlohmann_json,
+  libevent,
+  curl,
+  coeurl,
+  re2,
+  mtxclientSrc,
 }:
 stdenv.mkDerivation {
   pname = "mtxclient";
@@ -32,7 +34,6 @@ stdenv.mkDerivation {
     sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt
   '';
 
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -52,7 +53,10 @@ stdenv.mkDerivation {
     description = "Client API library for Matrix, built on top of Boost.Asio";
     homepage = "https://github.com/Nheko-Reborn/mtxclient";
     license = licenses.mit;
-    maintainers = with maintainers; [ fpletz pstn ];
+    maintainers = with maintainers; [
+      fpletz
+      pstn
+    ];
     platforms = platforms.all;
     # Should be fixable if a higher clang version is used, see:
     # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
diff --git a/modules/packages/nheko-git.nix b/modules/packages/nheko-git.nix
index adc3a09..c38e622 100644
--- a/modules/packages/nheko-git.nix
+++ b/modules/packages/nheko-git.nix
@@ -1,37 +1,38 @@
 # This file was copied from NUR: https://github.com/nix-community/nur-combined/blob/master/repos/deeunderscore/pkgs/nheko/default.nix#L93
 # This file is a modified version of nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix (copied at 2e896fce)
 
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-#, wrapQtAppsHook
-, asciidoctor
-, qt6
-, qt6Packages
-#, qtmultimedia
-#, qtimageformats
-#, qtkeychain
-, cmark
-, coeurl
-, curl
-, libevent
-, lmdb
-, lmdbxx
-#, mtxclient
-, nlohmann_json
-, olm
-, pkg-config
-, re2
-, spdlog
-, httplib
-, voipSupport ? true
-, gst_all_1
-, libnice
-, kdsingleapplication
-, pkgs
-, nhekoSrc
-, mtxclientSrc
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  #, wrapQtAppsHook
+  asciidoctor,
+  qt6,
+  qt6Packages,
+  #, qtmultimedia
+  #, qtimageformats
+  #, qtkeychain
+  cmark,
+  coeurl,
+  curl,
+  libevent,
+  lmdb,
+  lmdbxx,
+  #, mtxclient
+  nlohmann_json,
+  olm,
+  pkg-config,
+  re2,
+  spdlog,
+  httplib,
+  voipSupport ? true,
+  gst_all_1,
+  libnice,
+  kdsingleapplication,
+  pkgs,
+  nhekoSrc,
+  mtxclientSrc,
 }:
 
 stdenv.mkDerivation {
@@ -47,32 +48,37 @@ stdenv.mkDerivation {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qt6.qtbase
-    qt6.qttools
-    qt6.qtsvg
-    qt6.qtmultimedia
-    qt6.qtimageformats
-    qt6Packages.qtkeychain
-    kdsingleapplication
-    cmark
-    coeurl
-    curl
-    libevent
-    lmdb
-    (pkgs.callPackage ./mtxclient-git.nix { inherit mtxclientSrc; })
-    nlohmann_json
-    olm
-    re2
-    spdlog
-    httplib
-  ] ++ lib.optionals voipSupport (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    (gst-plugins-good.override { qt5Support = true; })
-    gst-plugins-bad
-    libnice
-  ]);
+  buildInputs =
+    [
+      qt6.qtbase
+      qt6.qttools
+      qt6.qtsvg
+      qt6.qtmultimedia
+      qt6.qtimageformats
+      qt6Packages.qtkeychain
+      kdsingleapplication
+      cmark
+      coeurl
+      curl
+      libevent
+      lmdb
+      (pkgs.callPackage ./mtxclient-git.nix { inherit mtxclientSrc; })
+      nlohmann_json
+      olm
+      re2
+      spdlog
+      httplib
+    ]
+    ++ lib.optionals voipSupport (
+      with gst_all_1;
+      [
+        gstreamer
+        gst-plugins-base
+        (gst-plugins-good.override { qt5Support = true; })
+        gst-plugins-bad
+        libnice
+      ]
+    );
 
   LC_ALL = lib.optionalString (!stdenv.isDarwin) "C.UTF-8";
 
@@ -82,11 +88,8 @@ stdenv.mkDerivation {
     "-DBUILD_SHARED_LIBS=OFF"
     #Rory&
     "-DMAN=OFF"
-    
-  ] ++ lib.optionals (!voipSupport) [
-    "-DVOIP=OFF"
-  ];
 
+  ] ++ lib.optionals (!voipSupport) [ "-DVOIP=OFF" ];
 
   preFixup = lib.optionalString voipSupport ''
     # add gstreamer plugins path to the wrapper
diff --git a/modules/packages/overlays/haskell/basement/IntWord64.nix b/modules/packages/overlays/haskell/basement/IntWord64.nix
index 6cf5b86..d407bf0 100644
--- a/modules/packages/overlays/haskell/basement/IntWord64.nix
+++ b/modules/packages/overlays/haskell/basement/IntWord64.nix
@@ -2,16 +2,13 @@
 {
   nixpkgs.overlays = [
     (self: super: {
-        haskellPackages = super.haskellPackages.override {
-          overrides = haskellPackages-self: haskellPackages-super: {
-            basement = haskellPackages-super.basement.overrideAttrs (oldAttrs: {
-              patches = [
-                ./IntWord64.patch
-              ];
-            });
-          };
+      haskellPackages = super.haskellPackages.override {
+        overrides = haskellPackages-self: haskellPackages-super: {
+          basement = haskellPackages-super.basement.overrideAttrs (oldAttrs: {
+            patches = [ ./IntWord64.patch ];
+          });
         };
-      }
-    )
+      };
+    })
   ];
 }
diff --git a/modules/packages/overlays/rocm-gfx1102.nix b/modules/packages/overlays/rocm-gfx1102.nix
deleted file mode 100644
index f5c650e..0000000
--- a/modules/packages/overlays/rocm-gfx1102.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-#{ pkgs, ... }:
-#{
-#  nixpkgs.overlays = [
-#    (final: old: {
-#        rocmPackages = old.rocmPackages.override {
-#          rocblas = (old.rocmPackages.rocblas.overrideAttrs (oldAttrs: {
-#            gpuTargets = [ "gfx1102" ];
-#          }));
-#        };
-#      }
-#    )
-#  ];
-#}
-#
\ No newline at end of file
diff --git a/modules/packages/vim.nix b/modules/packages/vim.nix
index 3524e2c..eaec336 100755
--- a/modules/packages/vim.nix
+++ b/modules/packages/vim.nix
@@ -1,14 +1,20 @@
 { pkgs, ... }:
 {
-  environment.variables = { EDITOR = "vim"; };
+  environment.variables = {
+    EDITOR = "vim";
+  };
 
   environment.systemPackages = with pkgs; [
     (neovim.override {
       vimAlias = true;
       configure = {
         packages.myPlugins = with pkgs.vimPlugins; {
-          start = [ vim-lastplace vim-nix vim-airline ]; 
-          opt = [];
+          start = [
+            vim-lastplace
+            vim-nix
+            vim-airline
+          ];
+          opt = [ ];
         };
         customRC = ''
           " your custom vimrc
@@ -17,6 +23,6 @@
           " ...
         '';
       };
-    }
-  )];
+    })
+  ];
 }
diff --git a/modules/packages/xdg-desktop-portal-gtk.nix b/modules/packages/xdg-desktop-portal-gtk.nix
index fa32730..cfe48d4 100644
--- a/modules/packages/xdg-desktop-portal-gtk.nix
+++ b/modules/packages/xdg-desktop-portal-gtk.nix
@@ -1,17 +1,18 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, xdg-desktop-portal
-, gtk3
-, gnome
-, gnome-desktop
-, glib
-, wrapGAppsHook
-, gsettings-desktop-schemas
-, buildPortalsInGnome ? true
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  xdg-desktop-portal,
+  gtk3,
+  gnome,
+  gnome-desktop,
+  glib,
+  wrapGAppsHook,
+  gsettings-desktop-schemas,
+  buildPortalsInGnome ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,17 +33,19 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook
   ];
 
-  buildInputs = [
-    glib
-    gtk3
-    xdg-desktop-portal
-    gsettings-desktop-schemas # settings exposed by settings portal
-    #fontconfig
-  ] ++ lib.optionals buildPortalsInGnome [
-    gsettings-desktop-schemas # settings exposed by settings portal
-    gnome-desktop
-    gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings)
-  ];
+  buildInputs =
+    [
+      glib
+      gtk3
+      xdg-desktop-portal
+      gsettings-desktop-schemas # settings exposed by settings portal
+      #fontconfig
+    ]
+    ++ lib.optionals buildPortalsInGnome [
+      gsettings-desktop-schemas # settings exposed by settings portal
+      gnome-desktop
+      gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings)
+    ];
 
   mesonFlags = lib.optionals (!buildPortalsInGnome) [
     "-Dwallpaper=disabled"
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-19 16:36:20 +0000