Compare commits
1 Commits
update_fla
...
1978e1037d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1978e1037d |
@@ -2,9 +2,7 @@
|
|||||||
|
|
||||||
**My personal [NUR](https://github.com/nix-community/NUR) repository**
|
**My personal [NUR](https://github.com/nix-community/NUR) repository**
|
||||||
|
|
||||||
[](https://git.xeals.me/xeals/nur-packages/actions)
|
[CI](https://git.xeals.me/xeals/nur-packages/actions) [](https://xeals.cachix.org)
|
||||||
[](https://xeals.cachix.org)
|
|
||||||
|
|
||||||
|
|
||||||
## Using
|
## Using
|
||||||
|
|
||||||
|
|||||||
6
flake.lock
generated
6
flake.lock
generated
@@ -20,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769330179,
|
"lastModified": 1739019272,
|
||||||
"narHash": "sha256-yxgb4AmkVHY5OOBrC79Vv6EVd4QZEotqv+6jcvA212M=",
|
"narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "48698d12cc10555a4f3e3222d9c669b884a49dfe",
|
"rev": "fa35a3c8e17a3de613240fea68f876e5b4896aec",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -18,8 +18,6 @@ python3Packages.buildPythonApplication rec {
|
|||||||
|
|
||||||
propagatedBuildInputs = [ mopidy python3Packages.py-sonic ];
|
propagatedBuildInputs = [ mopidy python3Packages.py-sonic ];
|
||||||
|
|
||||||
format = "setuptools";
|
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|||||||
@@ -20,8 +20,6 @@ python3Packages.buildPythonApplication rec {
|
|||||||
pyyaml
|
pyyaml
|
||||||
];
|
];
|
||||||
|
|
||||||
format = "setuptools";
|
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
substituteInPlace setup.py \
|
substituteInPlace setup.py \
|
||||||
--replace PROJECTVERSION "${version}"
|
--replace PROJECTVERSION "${version}"
|
||||||
|
|||||||
@@ -1,149 +0,0 @@
|
|||||||
{ lib
|
|
||||||
, fetchPypi
|
|
||||||
, buildPythonPackage
|
|
||||||
# Package dependencies
|
|
||||||
, zlib
|
|
||||||
# Python dependencies
|
|
||||||
, setuptools
|
|
||||||
, cython
|
|
||||||
, lz4
|
|
||||||
, mutf8
|
|
||||||
, numpy_1
|
|
||||||
, pillow
|
|
||||||
, platformdirs
|
|
||||||
, portalocker
|
|
||||||
, versioneer
|
|
||||||
, distutils
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
build-system = [
|
|
||||||
setuptools
|
|
||||||
cython
|
|
||||||
versioneer
|
|
||||||
numpy_1
|
|
||||||
];
|
|
||||||
|
|
||||||
platformdirs31 = platformdirs.overrideAttrs (old: {
|
|
||||||
src = fetchPypi {
|
|
||||||
pname = "platformdirs";
|
|
||||||
version = "3.1.1";
|
|
||||||
hash = "sha256-AkmWVJ7ojsGpqpn/f4/IGbtZ4sNHe0ENkKFtMtbnB6o=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
amulet-core = buildPythonPackage rec {
|
|
||||||
pname = "amulet-core";
|
|
||||||
version = "1.9.35";
|
|
||||||
src = fetchPypi {
|
|
||||||
pname = "amulet_core";
|
|
||||||
inherit version;
|
|
||||||
hash = "sha256-JreloREOJ2FGtYDmhrZUMIIXlS+nSrML6ONP98Mc7tI=";
|
|
||||||
};
|
|
||||||
|
|
||||||
pyproject = true;
|
|
||||||
inherit build-system;
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
amulet-leveldb
|
|
||||||
amulet-nbt
|
|
||||||
lz4
|
|
||||||
platformdirs31
|
|
||||||
pymctranslate
|
|
||||||
|
|
||||||
((portalocker.overrideAttrs (old: {
|
|
||||||
src = fetchPypi {
|
|
||||||
pname = "portalocker";
|
|
||||||
version = "2.4.0";
|
|
||||||
hash = "sha256-pkitdhuOonNwy1kVNQEizYB7gg0hk+1cnMKPFj32N/Q=";
|
|
||||||
};
|
|
||||||
})).overridePythonAttrs (old: {
|
|
||||||
doCheck = false;
|
|
||||||
}))
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
amulet-leveldb = buildPythonPackage rec {
|
|
||||||
pname = "amulet-leveldb";
|
|
||||||
version = "1.0.2";
|
|
||||||
src = fetchPypi {
|
|
||||||
pname = "amulet_leveldb";
|
|
||||||
inherit version;
|
|
||||||
hash = "sha256-s6pRHvcb9rxrIeljlb3tDzkrHcCT71jVU1Bn2Aq0FUE=";
|
|
||||||
};
|
|
||||||
|
|
||||||
pyproject = true;
|
|
||||||
inherit build-system;
|
|
||||||
buildInputs = [ zlib ];
|
|
||||||
|
|
||||||
dependencies = [ lz4 ];
|
|
||||||
};
|
|
||||||
|
|
||||||
amulet-nbt = buildPythonPackage rec {
|
|
||||||
pname = "amulet-nbt";
|
|
||||||
version = "2.1.5";
|
|
||||||
src = fetchPypi {
|
|
||||||
pname = "amulet_nbt";
|
|
||||||
inherit version;
|
|
||||||
hash = "sha256-qyM3PvslGZOlJjgTEeXyXNy1oz7jc6eFGYczVD3vuxc=";
|
|
||||||
};
|
|
||||||
|
|
||||||
pyproject = true;
|
|
||||||
inherit build-system;
|
|
||||||
|
|
||||||
dependencies = [ mutf8 ];
|
|
||||||
};
|
|
||||||
|
|
||||||
pymctranslate = buildPythonPackage rec {
|
|
||||||
pname = "pymctranslate";
|
|
||||||
version = "1.2.36";
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit pname version;
|
|
||||||
hash = "sha256-XQmDu+5GnaWgHJrfO86Ndwi7GgNUtWPBN4Y10JAa97A=";
|
|
||||||
};
|
|
||||||
|
|
||||||
pyproject = true;
|
|
||||||
inherit build-system;
|
|
||||||
|
|
||||||
dependencies = [ amulet-nbt ];
|
|
||||||
};
|
|
||||||
|
|
||||||
minecraft-resource-pack = buildPythonPackage rec {
|
|
||||||
pname = "minecraft-resource-pack";
|
|
||||||
version = "1.4.6";
|
|
||||||
src = fetchPypi {
|
|
||||||
pname = "minecraft_resource_pack";
|
|
||||||
inherit version;
|
|
||||||
hash = "sha256-ZBl0r+Nxwf1hl51a17WZEXUeFFq5a08kUeD4VSI2Rhk=";
|
|
||||||
};
|
|
||||||
|
|
||||||
pyproject = true;
|
|
||||||
inherit build-system;
|
|
||||||
dependencies = [
|
|
||||||
pillow
|
|
||||||
amulet-nbt
|
|
||||||
platformdirs31
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# (buildPythonPackage {
|
|
||||||
# pname = "minecraft-model-reader";
|
|
||||||
# version = "";
|
|
||||||
# src = fetchPypi {
|
|
||||||
# pname = "amulet-nbt";
|
|
||||||
# version = "2.0.6";
|
|
||||||
# hash = "";
|
|
||||||
# };
|
|
||||||
# })
|
|
||||||
in
|
|
||||||
|
|
||||||
{
|
|
||||||
inherit
|
|
||||||
amulet-core
|
|
||||||
amulet-leveldb
|
|
||||||
amulet-nbt
|
|
||||||
pymctranslate
|
|
||||||
minecraft-resource-pack
|
|
||||||
platformdirs31
|
|
||||||
;
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
{ lib
|
|
||||||
, fetchPypi
|
|
||||||
, python312
|
|
||||||
, zlib
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
python = python312;
|
|
||||||
inherit (python.pkgs)
|
|
||||||
buildPythonApplication
|
|
||||||
buildPythonPackage
|
|
||||||
setuptools
|
|
||||||
cython
|
|
||||||
numpy_1
|
|
||||||
pillow
|
|
||||||
pyopengl
|
|
||||||
pyopengl-accelerate
|
|
||||||
versioneer
|
|
||||||
wxpython
|
|
||||||
;
|
|
||||||
|
|
||||||
build-system = [
|
|
||||||
setuptools
|
|
||||||
cython
|
|
||||||
versioneer
|
|
||||||
numpy_1
|
|
||||||
];
|
|
||||||
|
|
||||||
deps = python.pkgs.callPackage ./deps.nix { };
|
|
||||||
inherit (deps)
|
|
||||||
amulet-core
|
|
||||||
amulet-nbt
|
|
||||||
minecraft-resource-pack
|
|
||||||
platformdirs31
|
|
||||||
;
|
|
||||||
in
|
|
||||||
|
|
||||||
buildPythonApplication rec {
|
|
||||||
pname = "amulet-map-editor";
|
|
||||||
version = "0.10.48";
|
|
||||||
src = fetchPypi {
|
|
||||||
pname = "amulet_map_editor";
|
|
||||||
inherit version;
|
|
||||||
hash = "sha256-CWXutx9m/N8EZ0tNtPE61sjh5gQ1qb9gLixezonFrsY=";
|
|
||||||
};
|
|
||||||
|
|
||||||
pyproject = true;
|
|
||||||
inherit build-system;
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
amulet-core
|
|
||||||
amulet-nbt
|
|
||||||
minecraft-resource-pack
|
|
||||||
pillow
|
|
||||||
platformdirs31
|
|
||||||
pyopengl
|
|
||||||
pyopengl-accelerate
|
|
||||||
|
|
||||||
(wxpython.overridePythonAttrs (prev: {
|
|
||||||
propagatedBuildInputs =
|
|
||||||
lib.filter (p: p.pname != "numpy") prev.propagatedBuildInputs
|
|
||||||
++ [ numpy_1 ];
|
|
||||||
}))
|
|
||||||
|
|
||||||
];
|
|
||||||
|
|
||||||
meta.mainProgram = "amulet_map_editor";
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,6 @@
|
|||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, python3
|
, python3
|
||||||
, beets
|
, beets
|
||||||
, wrapGAppsHook3
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@@ -47,9 +46,6 @@ python3.pkgs.buildPythonApplication {
|
|||||||
sed -i 's/Flask <3.0.0/Flask/' pyproject.toml
|
sed -i 's/Flask <3.0.0/Flask/' pyproject.toml
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# required for apprise
|
|
||||||
nativeBuildInputs = [ wrapGAppsHook3 ];
|
|
||||||
|
|
||||||
build-system = with python3.pkgs; [ setuptools ];
|
build-system = with python3.pkgs; [ setuptools ];
|
||||||
|
|
||||||
dependencies = (with python3.pkgs; [
|
dependencies = (with python3.pkgs; [
|
||||||
@@ -59,7 +55,7 @@ python3.pkgs.buildPythonApplication {
|
|||||||
flask
|
flask
|
||||||
flask-cors
|
flask-cors
|
||||||
flask-jwt-extended
|
flask-jwt-extended
|
||||||
flask-migrate
|
flask_migrate
|
||||||
flask-restx
|
flask-restx
|
||||||
flask-socketio
|
flask-socketio
|
||||||
flask-sqlalchemy
|
flask-sqlalchemy
|
||||||
|
|||||||
@@ -31,6 +31,5 @@ stdenv.mkDerivation rec {
|
|||||||
description = "Simple and fast C library implementing a thread-safe API to manage hash-tables, linked lists, lock-free ring buffers and queues ";
|
description = "Simple and fast C library implementing a thread-safe API to manage hash-tables, linked lists, lock-free ring buffers and queues ";
|
||||||
license = licenses.lgpl3;
|
license = licenses.lgpl3;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
broken = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ from dataclasses import dataclass, fields as datafields
|
|||||||
from enum import Enum, unique
|
from enum import Enum, unique
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
|
|
||||||
APIBASE = "https://api.porkbun.com/api/json/v3/dns"
|
APIBASE = "https://porkbun.com/api/json/v3/dns"
|
||||||
|
|
||||||
|
|
||||||
def dataclass_from_dict(klass: object, d: dict):
|
def dataclass_from_dict(klass: object, d: dict):
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ assert withGui -> gtk3.meta.available;
|
|||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "psst";
|
pname = "psst";
|
||||||
version = "20221012.d70ed81";
|
version = "20221012.d70ed81";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jpochyla";
|
owner = "jpochyla";
|
||||||
repo = "psst";
|
repo = "psst";
|
||||||
@@ -31,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||||||
hash = "sha256-ZKhHN0ruLb6ZVKkrKv/YawRsVop6SP1QF/nrtkmA8P8=";
|
hash = "sha256-ZKhHN0ruLb6ZVKkrKv/YawRsVop6SP1QF/nrtkmA8P8=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
cargoHash = "sha256-my15AXG9LLmdqZLqXdeZ81VLv+GbSMgNtuFAlYTEUvQ=";
|
cargoSha256 = "sha256-zH6+EV78FDVOYEFXk0f54pH2Su0QpK1I0bHqzIiMdBo=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ]
|
nativeBuildInputs = [ pkg-config ]
|
||||||
++ optional withGui copyDesktopItems;
|
++ optional withGui copyDesktopItems;
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
|
|
||||||
, aacSupport ? false
|
, aacSupport ? false
|
||||||
, faac
|
, faac
|
||||||
|
, alacSupport ? false
|
||||||
|
, libav
|
||||||
, flacSupport ? false
|
, flacSupport ? false
|
||||||
, flac
|
, flac
|
||||||
, m4aSupport ? false
|
, m4aSupport ? false
|
||||||
@@ -18,6 +20,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
assert aacSupport -> faac.meta.available;
|
assert aacSupport -> faac.meta.available;
|
||||||
|
assert alacSupport -> libav.meta.available;
|
||||||
assert flacSupport -> flac.meta.available;
|
assert flacSupport -> flac.meta.available;
|
||||||
assert m4aSupport || mp4Support -> fdk-aac-encoder.meta.available;
|
assert m4aSupport || mp4Support -> fdk-aac-encoder.meta.available;
|
||||||
assert oggSupport -> vorbis-tools.meta.available;
|
assert oggSupport -> vorbis-tools.meta.available;
|
||||||
@@ -45,14 +48,13 @@ python3Packages.buildPythonApplication rec {
|
|||||||
]) ++ [
|
]) ++ [
|
||||||
lame
|
lame
|
||||||
(if flacSupport then flac else null)
|
(if flacSupport then flac else null)
|
||||||
|
(if alacSupport then libav else null)
|
||||||
(if aacSupport then faac else null)
|
(if aacSupport then faac else null)
|
||||||
(if (m4aSupport || mp4Support) then fdk-aac-encoder else null)
|
(if (m4aSupport || mp4Support) then fdk-aac-encoder else null)
|
||||||
(if oggSupport then vorbis-tools else null)
|
(if oggSupport then vorbis-tools else null)
|
||||||
(if opusSupport then opusTools else null)
|
(if opusSupport then opusTools else null)
|
||||||
];
|
];
|
||||||
|
|
||||||
format = "setuptools";
|
|
||||||
|
|
||||||
# Remove impure executables.
|
# Remove impure executables.
|
||||||
patches = [ ./fix-setup.patch ];
|
patches = [ ./fix-setup.patch ];
|
||||||
|
|
||||||
|
|||||||
@@ -24,9 +24,6 @@ buildDotnetModule rec {
|
|||||||
mv $out/bin/TheAirBlow.Thor.Shell $out/bin/thor
|
mv $out/bin/TheAirBlow.Thor.Shell $out/bin/thor
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# dotnet7 is unsupported but it still runs fine; just don't build it in CI.
|
|
||||||
# https://github.com/Samsung-Loki/Thor/issues/23
|
|
||||||
preferLocalBuild = true;
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/Samsung-Loki/Thor";
|
homepage = "https://github.com/Samsung-Loki/Thor";
|
||||||
description = "An alternative to Heimdall";
|
description = "An alternative to Heimdall";
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ buildPythonPackage rec {
|
|||||||
sha256 = "0wh2phg8h02a6vlpqd0widd6g8ng142vzmk8hpyx0bnwn2i45sjc";
|
sha256 = "0wh2phg8h02a6vlpqd0widd6g8ng142vzmk8hpyx0bnwn2i45sjc";
|
||||||
};
|
};
|
||||||
|
|
||||||
format = "setuptools";
|
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{ pkgs, lib }:
|
{ pkgs }:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
# A functional Jetbrains IDE-with-plugins package set.
|
# A functional Jetbrains IDE-with-plugins package set.
|
||||||
jetbrains = lib.dontRecurseIntoAttrs rec {
|
jetbrains = pkgs.dontRecurseIntoAttrs rec {
|
||||||
jetbrainsPluginsFor = variant: import ../top-level/jetbrains-plugins.nix {
|
jetbrainsPluginsFor = variant: import ../top-level/jetbrains-plugins.nix {
|
||||||
inherit (pkgs) lib newScope stdenv fetchzip;
|
inherit (pkgs) lib newScope stdenv fetchzip;
|
||||||
inherit variant;
|
inherit variant;
|
||||||
@@ -12,9 +12,9 @@ rec {
|
|||||||
inherit jetbrains jetbrainsPlatforms;
|
inherit jetbrains jetbrainsPlatforms;
|
||||||
};
|
};
|
||||||
|
|
||||||
clionPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion);
|
clionPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion);
|
||||||
ideaCommunityPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community);
|
ideaCommunityPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community);
|
||||||
ideaUltimatePlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate);
|
ideaUltimatePlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate);
|
||||||
|
|
||||||
clionWithPlugins = clionPlugins.jetbrainsWithPlugins;
|
clionWithPlugins = clionPlugins.jetbrainsWithPlugins;
|
||||||
ideaCommunityWithPlugins = ideaCommunityPlugins.jetbrainsWithPlugins;
|
ideaCommunityWithPlugins = ideaCommunityPlugins.jetbrainsWithPlugins;
|
||||||
@@ -25,7 +25,7 @@ rec {
|
|||||||
python3Packages = pkgs.python3Packages // python3Packages;
|
python3Packages = pkgs.python3Packages // python3Packages;
|
||||||
};
|
};
|
||||||
|
|
||||||
python3Packages = lib.recurseIntoAttrs {
|
python3Packages = pkgs.recurseIntoAttrs {
|
||||||
py-sonic = pkgs.python3.pkgs.callPackage ../development/python-modules/py-sonic { };
|
py-sonic = pkgs.python3.pkgs.callPackage ../development/python-modules/py-sonic { };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ let
|
|||||||
import ./by-name-overlay.nix { inherit pkgs lib; } ../by-name;
|
import ./by-name-overlay.nix { inherit pkgs lib; } ../by-name;
|
||||||
|
|
||||||
allPackages = _self: _super:
|
allPackages = _self: _super:
|
||||||
import ./all-packages.nix { inherit pkgs lib; };
|
import ./all-packages.nix { inherit pkgs; };
|
||||||
|
|
||||||
toFix = (lib.flip lib.composeManyExtensions) (_self: { }) [
|
toFix = (lib.flip lib.composeManyExtensions) (_self: { }) [
|
||||||
autoCalledPackages
|
autoCalledPackages
|
||||||
|
|||||||
Reference in New Issue
Block a user