Compare commits
26 Commits
5d8b61050c
...
update_fla
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ed69b4f21 | ||
|
7802f55a3b
|
|||
|
acbf989e52
|
|||
|
da8690addb
|
|||
|
9b4d32e8d9
|
|||
|
059f3aa9ba
|
|||
|
11657f9c90
|
|||
|
baca5953e3
|
|||
|
984919528a
|
|||
|
f7e982ac78
|
|||
|
f0f3f19c21
|
|||
|
f05330dd60
|
|||
|
1f4adea38e
|
|||
|
8fe36cfddc
|
|||
|
66fe96f8ce
|
|||
|
ac27bd0bec
|
|||
|
6df2a1a659
|
|||
|
5a6dd50718
|
|||
|
67d062e9b0
|
|||
|
de4bb6a60e
|
|||
|
101ab28b9b
|
|||
| d2e3803d2d | |||
|
|
cff7f6163f | ||
|
242f3e0052
|
|||
|
c340ee3659
|
|||
|
2940e7c5fb
|
@@ -2,7 +2,9 @@
|
||||
|
||||
**My personal [NUR](https://github.com/nix-community/NUR) repository**
|
||||
|
||||
[CI](https://git.xeals.me/xeals/nur-packages/actions) [](https://xeals.cachix.org)
|
||||
[](https://git.xeals.me/xeals/nur-packages/actions)
|
||||
[](https://xeals.cachix.org)
|
||||
|
||||
|
||||
## Using
|
||||
|
||||
|
||||
6
flake.lock
generated
6
flake.lock
generated
@@ -20,11 +20,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1739667012,
|
||||
"narHash": "sha256-6QWdUgz2O2Mm+pYx/AYB4Rot5/s1OR1C6bt30TI81yY=",
|
||||
"lastModified": 1769330179,
|
||||
"narHash": "sha256-yxgb4AmkVHY5OOBrC79Vv6EVd4QZEotqv+6jcvA212M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1dcdd535fef84d4671129a10e7072d56dca9a4d3",
|
||||
"rev": "48698d12cc10555a4f3e3222d9c669b884a49dfe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -18,6 +18,8 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = [ mopidy python3Packages.py-sonic ];
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -20,6 +20,8 @@ python3Packages.buildPythonApplication rec {
|
||||
pyyaml
|
||||
];
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace PROJECTVERSION "${version}"
|
||||
|
||||
149
pkgs/by-name/am/amulet/deps.nix
Normal file
149
pkgs/by-name/am/amulet/deps.nix
Normal file
@@ -0,0 +1,149 @@
|
||||
{ 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
|
||||
;
|
||||
}
|
||||
68
pkgs/by-name/am/amulet/package.nix
Normal file
68
pkgs/by-name/am/amulet/package.nix
Normal file
@@ -0,0 +1,68 @@
|
||||
{ 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,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, beets
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -46,6 +47,9 @@ python3.pkgs.buildPythonApplication {
|
||||
sed -i 's/Flask <3.0.0/Flask/' pyproject.toml
|
||||
'';
|
||||
|
||||
# required for apprise
|
||||
nativeBuildInputs = [ wrapGAppsHook3 ];
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
dependencies = (with python3.pkgs; [
|
||||
@@ -55,7 +59,7 @@ python3.pkgs.buildPythonApplication {
|
||||
flask
|
||||
flask-cors
|
||||
flask-jwt-extended
|
||||
flask_migrate
|
||||
flask-migrate
|
||||
flask-restx
|
||||
flask-socketio
|
||||
flask-sqlalchemy
|
||||
|
||||
@@ -31,5 +31,6 @@ 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 ";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.all;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ from dataclasses import dataclass, fields as datafields
|
||||
from enum import Enum, unique
|
||||
from typing import List, Optional
|
||||
|
||||
APIBASE = "https://porkbun.com/api/json/v3/dns"
|
||||
APIBASE = "https://api.porkbun.com/api/json/v3/dns"
|
||||
|
||||
|
||||
def dataclass_from_dict(klass: object, d: dict):
|
||||
|
||||
@@ -23,6 +23,7 @@ assert withGui -> gtk3.meta.available;
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "psst";
|
||||
version = "20221012.d70ed81";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpochyla";
|
||||
repo = "psst";
|
||||
@@ -30,7 +31,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-ZKhHN0ruLb6ZVKkrKv/YawRsVop6SP1QF/nrtkmA8P8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
cargoSha256 = "sha256-zH6+EV78FDVOYEFXk0f54pH2Su0QpK1I0bHqzIiMdBo=";
|
||||
cargoHash = "sha256-my15AXG9LLmdqZLqXdeZ81VLv+GbSMgNtuFAlYTEUvQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ optional withGui copyDesktopItems;
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
|
||||
, aacSupport ? false
|
||||
, faac
|
||||
, alacSupport ? false
|
||||
, libav
|
||||
, flacSupport ? false
|
||||
, flac
|
||||
, m4aSupport ? false
|
||||
@@ -20,7 +18,6 @@
|
||||
}:
|
||||
|
||||
assert aacSupport -> faac.meta.available;
|
||||
assert alacSupport -> libav.meta.available;
|
||||
assert flacSupport -> flac.meta.available;
|
||||
assert m4aSupport || mp4Support -> fdk-aac-encoder.meta.available;
|
||||
assert oggSupport -> vorbis-tools.meta.available;
|
||||
@@ -48,13 +45,14 @@ python3Packages.buildPythonApplication rec {
|
||||
]) ++ [
|
||||
lame
|
||||
(if flacSupport then flac else null)
|
||||
(if alacSupport then libav else null)
|
||||
(if aacSupport then faac else null)
|
||||
(if (m4aSupport || mp4Support) then fdk-aac-encoder else null)
|
||||
(if oggSupport then vorbis-tools else null)
|
||||
(if opusSupport then opusTools else null)
|
||||
];
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
# Remove impure executables.
|
||||
patches = [ ./fix-setup.patch ];
|
||||
|
||||
|
||||
@@ -24,6 +24,9 @@ buildDotnetModule rec {
|
||||
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 = {
|
||||
homepage = "https://github.com/Samsung-Loki/Thor";
|
||||
description = "An alternative to Heimdall";
|
||||
|
||||
@@ -12,6 +12,8 @@ buildPythonPackage rec {
|
||||
sha256 = "0wh2phg8h02a6vlpqd0widd6g8ng142vzmk8hpyx0bnwn2i45sjc";
|
||||
};
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ pkgs }:
|
||||
{ pkgs, lib }:
|
||||
|
||||
rec {
|
||||
# A functional Jetbrains IDE-with-plugins package set.
|
||||
jetbrains = pkgs.dontRecurseIntoAttrs rec {
|
||||
jetbrains = lib.dontRecurseIntoAttrs rec {
|
||||
jetbrainsPluginsFor = variant: import ../top-level/jetbrains-plugins.nix {
|
||||
inherit (pkgs) lib newScope stdenv fetchzip;
|
||||
inherit variant;
|
||||
@@ -12,9 +12,9 @@ rec {
|
||||
inherit jetbrains jetbrainsPlatforms;
|
||||
};
|
||||
|
||||
clionPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion);
|
||||
ideaCommunityPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community);
|
||||
ideaUltimatePlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate);
|
||||
clionPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion);
|
||||
ideaCommunityPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community);
|
||||
ideaUltimatePlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate);
|
||||
|
||||
clionWithPlugins = clionPlugins.jetbrainsWithPlugins;
|
||||
ideaCommunityWithPlugins = ideaCommunityPlugins.jetbrainsWithPlugins;
|
||||
@@ -25,7 +25,7 @@ rec {
|
||||
python3Packages = pkgs.python3Packages // python3Packages;
|
||||
};
|
||||
|
||||
python3Packages = pkgs.recurseIntoAttrs {
|
||||
python3Packages = lib.recurseIntoAttrs {
|
||||
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;
|
||||
|
||||
allPackages = _self: _super:
|
||||
import ./all-packages.nix { inherit pkgs; };
|
||||
import ./all-packages.nix { inherit pkgs lib; };
|
||||
|
||||
toFix = (lib.flip lib.composeManyExtensions) (_self: { }) [
|
||||
autoCalledPackages
|
||||
|
||||
Reference in New Issue
Block a user