betanin: add glib

Some clients are encountering 'Namespace Gio not available' in
pygobject. Definitions for gio-2.0 are in glib.

README.md

@@ -2,9 +2,7 @@
 
 **My personal [NUR](https://github.com/nix-community/NUR) repository**
 
-[![Gitea Action](https://git.xeal.me/xeals/nur-packages/actions/workflows/build.yml/badge.svg)](https://git.xeals.me/xeals/nur-packages/actions)
+[CI](https://git.xeals.me/xeals/nur-packages/actions) [![Cachix Cache](https://img.shields.io/badge/cachix-xeals-blue.svg)](https://xeals.cachix.org)
-[![Cachix Cache](https://img.shields.io/badge/cachix-xeals-blue.svg)](https://xeals.cachix.org)
-
 
 ## Using
 

flake.lock

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

pkgs/by-name/am/amulet/deps.nix

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

pkgs/by-name/am/amulet/package.nix

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

pkgs/by-name/be/betanin/package.nix

@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , python3
 , beets
-, wrapGAppsHook3
+, glib
 }:
 
 let
@@ -47,9 +47,6 @@ 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; [
@@ -59,7 +56,7 @@ python3.pkgs.buildPythonApplication {
     flask
     flask-cors
     flask-jwt-extended
-    flask-migrate
+    flask_migrate
     flask-restx
     flask-socketio
     flask-sqlalchemy
@@ -74,6 +71,7 @@ python3.pkgs.buildPythonApplication {
     toml
   ]) ++ [
     beets
+    glib
   ];
 
   meta = {

pkgs/by-name/li/libhl/package.nix

@@ -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 ";
     license = licenses.lgpl3;
     platforms = platforms.all;
-    broken = true;
   };
 }

pkgs/by-name/sp/spotify-ripper/package.nix

@@ -6,6 +6,8 @@
 
 , aacSupport ? false
 , faac
+, alacSupport ? false
+, libav
 , flacSupport ? false
 , flac
 , m4aSupport ? false
@@ -18,6 +20,7 @@
 }:
 
 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;
@@ -45,6 +48,7 @@ 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)

pkgs/top-level/all-packages.nix

@@ -1,8 +1,8 @@
-{ pkgs, lib }:
+{ pkgs }:
 
 rec {
   # A functional Jetbrains IDE-with-plugins package set.
-  jetbrains = lib.dontRecurseIntoAttrs rec {
+  jetbrains = pkgs.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 = 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;
     ideaCommunityWithPlugins = ideaCommunityPlugins.jetbrainsWithPlugins;
@@ -25,7 +25,7 @@ rec {
     python3Packages = pkgs.python3Packages // python3Packages;
   };
 
-  python3Packages = lib.recurseIntoAttrs {
+  python3Packages = pkgs.recurseIntoAttrs {
     py-sonic = pkgs.python3.pkgs.callPackage ../development/python-modules/py-sonic { };
   };
 

pkgs/top-level/stage.nix

@@ -11,7 +11,7 @@ let
     import ./by-name-overlay.nix { inherit pkgs lib; } ../by-name;
 
   allPackages = _self: _super:
-    import ./all-packages.nix { inherit pkgs lib; };
+    import ./all-packages.nix { inherit pkgs; };
 
   toFix = (lib.flip lib.composeManyExtensions) (_self: { }) [
     autoCalledPackages