Update some packages, add some new ones
diff --git a/packages/enso.nix b/packages/enso.nix
new file mode 100644
index 0000000..f03831a
--- /dev/null
+++ b/packages/enso.nix
@@ -0,0 +1,27 @@
+{ lib, rustPlatform, fetchFromGitHub, packageSets, pkg-config, openssl, ... }:
+rustPlatform.buildRustPackage.override
+{
+ rustc = packageSets.fenix.minimal.rustc;
+}
+rec {
+ pname = "enso";
+ version = "2022.1.1-nightly.2022-10-19";
+
+ src = fetchFromGitHub {
+ owner = "enso-org";
+ repo = "enso";
+ rev = version;
+ sha256 = "sha256-YCTDxKVzrEDW+LWLyNC/GXh4WfcAuPtwo8VpSllYycI=";
+ };
+
+ buildInputs = [ openssl.dev ];
+ nativeBuildInputs = [ pkg-config ];
+
+ cargoLock = {
+ lockFile = "${src}/Cargo.lock";
+ outputHashes = {
+ "console_error_panic_hook-0.1.7" = "sha256-1RhnLNB04DlsOuBis0bjRLPlJ+hvMF+n+olOaTF2TjM=";
+ "octocrab-0.17.0" = "sha256-0qJvDrwi2FARHyi8597fYJ8V2LuKiZXh9+Hy/2DsBTM=";
+ };
+ };
+}
diff --git a/packages/hybridbar.nix b/packages/hybridbar.nix
new file mode 100644
index 0000000..1ecf2e5
--- /dev/null
+++ b/packages/hybridbar.nix
@@ -0,0 +1,32 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, libgee
+, libglibutil
+, gtk3
+, gtk-layer-shell
+, meson
+, vala
+, pkg-config
+, cmake
+, glib
+, ninja
+, hybridbar
+}: stdenv.mkDerivation rec {
+ pname = "Hybridbar";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "hcsubser";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-IiIkqsw+OMu6aqx9Et+cP0vXY19s+SGsTfikWX5r/cY=";
+ };
+
+ profile = ''
+ XDG_DATA_DIRS=$out/share/gsettings-schemas/$name:$XDG_DATA_DIRS";
+ '';
+
+ buildInputs = [ libgee libglibutil.dev gtk3.dev gtk-layer-shell glib.dev ];
+ nativeBuildInputs = [ meson vala cmake pkg-config ninja ];
+}
diff --git a/packages/prismlauncher.nix b/packages/prismlauncher.nix
deleted file mode 100644
index 3ad5ceb..0000000
--- a/packages/prismlauncher.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, jdk8
-, jdk
-, zlib
-, file
-, wrapQtAppsHook
-, xorg
-, libpulseaudio
-, qtbase
-, libGL
-, quazip
-, glfw
-, openal
-, msaClientID ? ""
-, jdks ? [ jdk jdk8 ]
-, extra-cmake-modules
-, tomlplusplus
-, ghc_filesystem
-, libnbtplusplus
-,
-}:
-let
- rev = "243600b75babc636bdd1ac0dc8fd5fa4a2db1a0c";
- sha256 = "sha256-cDwa6NeZew+MubtRmUViLA8gUaoH3AMxD9PdQcgSgSU=";
-
- libnbtplusplus = fetchFromGitHub {
- owner = "ljfa-ag";
- repo = "libnbtplusplus";
- rev = "v2.5";
- sha256 = "sha256-4PHKPbWIWAy9ym25M4SnllTkrqnR+g/0AOqyMBZcdX4=";
- };
-in
-stdenv.mkDerivation {
- pname = "prismlauncher";
- version = builtins.substring 0 7 rev;
-
- src = fetchFromGitHub {
- owner = "PlaceholderMC";
- repo = "PrismLauncher";
- inherit rev sha256;
- };
-
- postUnpack = ''
- rm -rf source/libraries/libnbtplusplus
- mkdir source/libraries/libnbtplusplus
- cp -a ${libnbtplusplus}/* source/libraries/libnbtplusplus
- chmod -R a+r+w source/libraries/libnbtplusplus
- chown -R $USER: source/libraries/libnbtplusplus
- ls source/libraries/libnbtplusplus/*
- '';
-
- nativeBuildInputs = [ extra-cmake-modules tomlplusplus ghc_filesystem cmake file jdk wrapQtAppsHook ];
- buildInputs = [ qtbase zlib quazip ];
-
- cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
-
- dontWrapQtApps = true;
-
- postInstall =
- let
- libpath = with xorg;
- lib.makeLibraryPath [
- libX11
- libXext
- libXcursor
- libXrandr
- libXxf86vm
- libpulseaudio
- libGL
- glfw
- openal
- stdenv.cc.cc.lib
- ];
- in
- ''
- # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
- wrapQtApp $out/bin/prismlauncher \
- --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
- --prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \
- --prefix PATH : ${lib.makeBinPath [xorg.xrandr]}
- '';
-
- meta = with lib; {
- homepage = "https://github.com/PlaceholderMC/PrismLauncher/";
- description = "A free, open source launcher for Minecraft";
- longDescription = ''
- Allows you to have multiple, separate instances of Minecraft (each with
- their own mods, texture packs, saves, etc) and helps you manage them and
- their associated options with a simple interface.
- '';
- platforms = platforms.linux;
- /*
- changelog = "https://github.com/PlaceholderMC/PrismLauncher/releases/tag/${version}";
- */
- license = licenses.gpl3Only;
- maintainers = with maintainers; [ minion3665 ];
- };
-}
diff --git a/packages/sfs-select.nix b/packages/sfs-select.nix
new file mode 100644
index 0000000..959232a
--- /dev/null
+++ b/packages/sfs-select.nix
@@ -0,0 +1,49 @@
+{ stdenv, p7zip, zip, python3, qt5 }: stdenv.mkDerivation {
+ pname = "sfs-select";
+ version = "0.5.0";
+
+ src = builtins.fetchurl {
+ url = "https://www.unix-ag.uni-kl.de/~t_schmid/sfs-select/sfs-select-0.5.0-full.7z";
+ sha256 = "sha256:130ks9vc33r9aycbbz3i8agcy7gjijmfvv94pd4ndxmwl2ndmrh2";
+ };
+ unpackPhase = ''
+ runHook preUnpack
+
+ ${p7zip}/bin/7z x $src -o. -y
+
+ runHook postUnpack
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+
+ mv ./sfs-select/python/sfs-select.py ./sfs-select/python/__main__.py
+ ${zip}/bin/zip -rj sfs-select.zip ./sfs-select/python/*
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preBuild
+
+ mkdir -p $out/bin
+
+ echo '#!/usr/bin/env python' | cat - sfs-select.zip > $out/bin/sfs-select
+
+ chmod +x $out/bin/sfs-select
+
+ makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+ wrapQtApp $out/bin/sfs-select $makeWrapperArgs
+
+ runHook postBuild
+ '';
+
+ nativeBuildInputs = [ p7zip zip qt5.wrapQtAppsHook ];
+ buildInputs = [
+ (python3.withPackages (pythonPackages: with pythonPackages; [
+ psutil
+ pyqt5
+ ]))
+ ];
+ dontWrapQtApps = true;
+}
diff --git a/packages/vim-ctrlspace.nix b/packages/vim-ctrlspace.nix
index 7e03353..171b952 100644
--- a/packages/vim-ctrlspace.nix
+++ b/packages/vim-ctrlspace.nix
@@ -6,9 +6,9 @@
vimUtils.buildVimPlugin {
name = "vim-ctrlspace";
src = fetchFromGitHub {
- owner = "minion3665";
+ owner = "vim-ctrlspace";
repo = "vim-ctrlspace";
- rev = "c1dfc35a208a86256763cbadb6770636b4720b6f";
- sha256 = "sha256-R3TC56UFEjXNpmmPn5XAw0H07leFt5NR2eKow93NkJI=";
+ rev = "5e444c6af06de58d5ed7d7bd0dcbb958f292cd2e";
+ sha256 = "sha256-EJFaWTVPqQpAewPq7VT0EOgMnL3+6Hl9u5oQZJqItUM=";
};
}
diff --git a/packages/waycorner.nix b/packages/waycorner.nix
index dc54aca..eb9d876 100644
--- a/packages/waycorner.nix
+++ b/packages/waycorner.nix
@@ -16,8 +16,8 @@
src = fetchFromGitHub {
owner = "Minion3665";
repo = "waycorner";
- rev = "4a42d986cffa66c535082b3f8fb1c7e7bf278272";
- sha256 = "sha256-OjQPYWtR3a9HZ6h1yXutHlMAfK0G2aRCdtSg9LZh1I0=";
+ rev = "ef3bd723a9a8673328c12fc8c7f210864787e5d1";
+ sha256 = "sha256-iPeF84tC3IEYECm04KwmTjOaYVSUMh2dBlijzGnxoyw=";
};
cargoLock.lockFile = "${src}/Cargo.lock";