From b67af84fdcf52551b389b94e7af7e45dfb27d09f Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Thu, 8 Feb 2024 11:07:33 -0800 Subject: [PATCH] Stripping out pkgs.glibc from imports (#231) [Reports online](https://discourse.nixos.org/t/conflict-between-glibc-and-glibclocales-tl-dr-i-messed-it-up/7608) suggest that glibc isn't intended to behave like a normal package, so we shouldn't automatically install it. --- internal/nix/python_map.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/nix/python_map.json b/internal/nix/python_map.json index 8dda5994..aa08c94a 100644 --- a/internal/nix/python_map.json +++ b/internal/nix/python_map.json @@ -177,7 +177,7 @@ "fuse-python":{"deps":["pkgs.pkg-config"]}, "fx2":{"deps":["pkgs.sdcc"]}, "gaphas":{"deps":["pkgs.gobject-introspection","pkgs.gtk3"]}, - "gattlib":{"deps":["pkgs.bluez","pkgs.glib","pkgs.glibc","pkgs.pkg-config"]}, + "gattlib":{"deps":["pkgs.bluez","pkgs.glib","pkgs.pkg-config"]}, "gb-io":{"deps":["pkgs.cargo","pkgs.rustc"]}, "gbinder-python":{"deps":["pkgs.libgbinder","pkgs.pkg-config"]}, "gbulb":{"deps":["pkgs.gobject-introspection","pkgs.gtk3"]}, @@ -362,7 +362,7 @@ "oslo-utils":{"deps":["pkgs.iana-etc"]}, "paddlepaddle":{"deps":["pkgs.openssl","pkgs.zlib"]}, "palace":{"deps":["pkgs.alure2"]}, - "pandas":{"deps":["pkgs.glibc","pkgs.glibcLocales"]}, + "pandas":{"deps":["pkgs.glibcLocales"]}, "pathlib2":{"deps":["pkgs.glibcLocales"]}, "pathspec":{"deps":["pkgs.awsebcli"]}, "patool":{"deps":["pkgs.bzip2","pkgs.cabextract","pkgs.diffutils","pkgs.file","pkgs.gnugrep","pkgs.gnutar","pkgs.gzip","pkgs.lzip","pkgs.p7zip","pkgs.xz","pkgs.zip","pkgs.zpaq"]}, @@ -402,7 +402,7 @@ "psycopg2":{"deps":["pkgs.openssl","pkgs.postgresql"]}, "psycopg2cffi":{"deps":["pkgs.postgresql"]}, "publicsuffixlist":{"deps":["pkgs.pandoc"]}, - "pulsectl":{"deps":["pkgs.glibc","pkgs.libpulseaudio","pkgs.pulseaudio"]}, + "pulsectl":{"deps":["pkgs.libpulseaudio","pkgs.pulseaudio"]}, "py-bip39-bindings":{"deps":["pkgs.libiconv"]}, "py-desmume":{"deps":["pkgs.SDL2","pkgs.alsa-lib","pkgs.openal","pkgs.pkg-config","pkgs.soundtouch"]}, "py-dmidecode":{"deps":["pkgs.dmidecode"]}, @@ -454,7 +454,7 @@ "pygdbmi":{"deps":["pkgs.gdb"]}, "pygeos":{"deps":["pkgs.geos"]}, "pygit2":{"deps":["pkgs.cacert","pkgs.libgit2"]}, - "pyglet":{"deps":["pkgs.ffmpeg-full","pkgs.fontconfig","pkgs.freetype","pkgs.gdk-pixbuf","pkgs.glibc","pkgs.gtk2-x11","pkgs.libGL","pkgs.libGLU","pkgs.libpulseaudio","pkgs.openal","pkgs.unzip"]}, + "pyglet":{"deps":["pkgs.ffmpeg-full","pkgs.fontconfig","pkgs.freetype","pkgs.gdk-pixbuf","pkgs.gtk2-x11","pkgs.libGL","pkgs.libGLU","pkgs.libpulseaudio","pkgs.openal","pkgs.unzip"]}, "pygmo":{"deps":["pkgs.eigen","pkgs.ipopt","pkgs.nlopt","pkgs.pagmo2"]}, "pygmt":{"deps":["pkgs.ghostscript","pkgs.gmt"]}, "pygobject-stubs":{"deps":["pkgs.pre-commit"]},