diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 33 | ||||
| -rw-r--r-- | pkgs/top-level/nim-overrides.nix | 8 |
3 files changed, 24 insertions, 18 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6756b0a58ef9..9466a2c52587 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -994,6 +994,7 @@ mapAliases ({ varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 + volatility = throw "'volatility' has been removed, as it was broken and unmaintained"; # Added 2023-12-10 ### W ### waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bcb16311887..0e490f31d6a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8673,6 +8673,8 @@ with pkgs; gnome-randr = callPackage ../tools/wayland/gnome-randr { }; + gnome-resources = callPackage ../tools/system/gnome-resources { }; + gnuapl = callPackage ../development/interpreters/gnu-apl { }; gnu-shepherd = callPackage ../misc/gnu-shepherd { }; @@ -14400,8 +14402,6 @@ with pkgs; vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger { }; - volatility = callPackage ../tools/security/volatility { }; - volatility3 = callPackage ../tools/security/volatility3 { }; vbetool = callPackage ../tools/system/vbetool { }; @@ -35475,6 +35475,18 @@ with pkgs; super-slicer-latest = super-slicer.latest; + bambu-studio = callPackage ../applications/misc/bambu-studio { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; + + glew = glew-egl; + + wxGTK31 = wxGTK31.override { + withCurl = true; + withPrivateFonts = true; + withWebKit = true; + }; + }; + snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; @@ -37520,21 +37532,6 @@ with pkgs; airstrike = callPackage ../games/airstrike { }; - alephone = callPackage ../games/alephone { }; - alephone-apotheosis-x = callPackage ../games/alephone/apotheosis-x { }; - alephone-durandal = callPackage ../games/alephone/durandal { }; - alephone-eternal = callPackage ../games/alephone/eternal { }; - alephone-evil = callPackage ../games/alephone/evil { }; - alephone-infinity = callPackage ../games/alephone/infinity { }; - alephone-marathon = callPackage ../games/alephone/marathon { }; - alephone-pheonix = callPackage ../games/alephone/pheonix { }; - alephone-red = callPackage ../games/alephone/red { }; - alephone-rubicon-x = callPackage ../games/alephone/rubicon-x { }; - alephone-pathways-into-darkness = - callPackage ../games/alephone/pathways-into-darkness { }; - alephone-yuge = - callPackage ../games/alephone/yuge { }; - alienarena = callPackage ../games/alienarena { }; amoeba = callPackage ../games/amoeba { }; @@ -40746,7 +40743,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_18; + nix = nixVersions.nix_2_19; }; nix-doc = callPackage ../tools/package-management/nix-doc { }; diff --git a/pkgs/top-level/nim-overrides.nix b/pkgs/top-level/nim-overrides.nix index 910f5c8bcae4..34db79a6a4ea 100644 --- a/pkgs/top-level/nim-overrides.nix +++ b/pkgs/top-level/nim-overrides.nix @@ -32,6 +32,14 @@ buildInputs = buildInputs ++ [ getdns ]; }; + hashlib = lockAttrs: + lib.trivial.warnIf + (lockAttrs.rev == "84e0247555e4488594975900401baaf5bbbfb531") + "the selected version of the hashlib Nim library is hardware specific" + # https://github.com/khchen/hashlib/pull/4 + # remove when fixed upstream + (_: _: { }); + nimraylib_now = lockAttrs: finalAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ [ raylib ]; |