7 Commits

Author SHA1 Message Date
github-actions[bot]
bc869eb000 flake: update inputs
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ed142ab1b3a092c4d149245d0c4126a5d7ea00b0' (2026-01-20)
  → 'github:NixOS/nixpkgs/fef9403a3e4d31b0a23f0bacebbec52c248fbb51' (2026-02-08)
2026-02-09 06:52:10 +00:00
7802f55a3b flake: update inputs
Some checks failed
CI / checks (nur) (push) Successful in 3m33s
CI / build-and-update (xeals, xeals) (push) Successful in 59m39s
Update flake inputs / update-flake (push) Failing after 2m31s
2026-01-22 21:32:25 +11:00
acbf989e52 amulet: init at 0.10.48 2026-01-22 21:32:10 +11:00
da8690addb libhl: mark as broken
Some checks failed
CI / checks (nur) (push) Successful in 3m26s
CI / build-and-update (xeals, xeals) (push) Successful in 19m39s
Update flake inputs / update-flake (push) Failing after 2m34s
probably related to https://github.com/NixOS/nixpkgs/issues/475479
2026-01-03 09:48:32 +11:00
9b4d32e8d9 betanin: flask_migrate -> flask-migrate
Some checks failed
CI / checks (nur) (push) Successful in 3m42s
CI / build-and-update (xeals, xeals) (push) Failing after 5m39s
2026-01-03 09:27:58 +11:00
059f3aa9ba pkgs: use recurseIntoAttrs from lib 2026-01-03 09:27:58 +11:00
11657f9c90 flake: update inputs 2026-01-03 09:27:58 +11:00
7 changed files with 229 additions and 11 deletions

6
flake.lock generated
View File

@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1765425892, "lastModified": 1770537093,
"narHash": "sha256-jlQpSkg2sK6IJVzTQBDyRxQZgKADC2HKMRfGCSgNMHo=", "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d6bdbddb4695a62f0d00a3620b37a15275a5093", "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
"type": "github" "type": "github"
}, },
"original": { "original": {

View 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
;
}

View 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";
}

View File

@@ -59,7 +59,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

View File

@@ -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 "; 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;
}; };
} }

View File

@@ -1,8 +1,8 @@
{ pkgs }: { pkgs, lib }:
rec { rec {
# A functional Jetbrains IDE-with-plugins package set. # A functional Jetbrains IDE-with-plugins package set.
jetbrains = pkgs.dontRecurseIntoAttrs rec { jetbrains = lib.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 = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion); clionPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion);
ideaCommunityPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community); ideaCommunityPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community);
ideaUltimatePlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate); ideaUltimatePlugins = lib.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 = pkgs.recurseIntoAttrs { python3Packages = lib.recurseIntoAttrs {
py-sonic = pkgs.python3.pkgs.callPackage ../development/python-modules/py-sonic { }; py-sonic = pkgs.python3.pkgs.callPackage ../development/python-modules/py-sonic { };
}; };

View File

@@ -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; }; import ./all-packages.nix { inherit pkgs lib; };
toFix = (lib.flip lib.composeManyExtensions) (_self: { }) [ toFix = (lib.flip lib.composeManyExtensions) (_self: { }) [
autoCalledPackages autoCalledPackages