Compare commits

3 Commits

Author SHA1 Message Date
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
4 changed files with 11 additions and 11 deletions

6
flake.lock generated
View File

@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1765425892, "lastModified": 1767273430,
"narHash": "sha256-jlQpSkg2sK6IJVzTQBDyRxQZgKADC2HKMRfGCSgNMHo=", "narHash": "sha256-kDpoFwQ8GLrPiS3KL+sAwreXrph2KhdXuJzo5+vSLoo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d6bdbddb4695a62f0d00a3620b37a15275a5093", "rev": "76eec3925eb9bbe193934987d3285473dbcfad50",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@@ -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