diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81dab38bdad0c..e5fd7bf1f4587 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13154,7 +13154,17 @@ with pkgs; smug = callPackage ../tools/misc/smug { }; - smpq = callPackage ../applications/misc/smpq { }; + smpq = callPackage ../by-name/sm/smpq/package.nix { + stormlib = stormlib.overrideAttrs (old: { + version = "9.22"; + src = fetchFromGitHub { + owner = "ladislav-zezula"; + repo = "StormLib"; + rev = "v9.22"; + hash = "sha256-jFUfxLzuRHAvFE+q19i6HfGcL6GX4vKL1g7l7LOhjeU="; + }; + }); + }; snabb = callPackage ../tools/networking/snabb { }; @@ -18061,7 +18071,7 @@ with pkgs; nixd = callPackage ../development/tools/language-servers/nixd { llvmPackages = llvmPackages_16; - nix = nixVersions.nix_2_16; + nix = nixVersions.nix_2_19; }; openscad-lsp = callPackage ../development/tools/language-servers/openscad-lsp { }; @@ -24073,16 +24083,7 @@ with pkgs; pylode = callPackage ../misc/pylode { }; - python-qt = (callPackage ../development/libraries/python-qt { - python = python3; - inherit (builtins.mapAttrs (_: pkg: pkg.override (previousArgs: lib.optionalAttrs (previousArgs ? stdenv) { stdenv = gcc12Stdenv; })) qt5) - qmake qttools qtwebengine qtxmlpatterns; - stdenv = gcc12Stdenv; - }) - .overrideAttrs(previousAttrs: { - NIX_CFLAGS_COMPILE = "-w"; - meta = previousAttrs.meta // { broken = true; }; - }); + python-qt = libsForQt5.callPackage ../development/libraries/python-qt { }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; @@ -30346,9 +30347,7 @@ with pkgs; csound-manual = callPackage ../applications/audio/csound/csound-manual { }; - csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { - python = python3; - }; + csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { }; codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; @@ -39919,7 +39918,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_19; + nix = nixVersions.nix_2_21; }; nix-doc = callPackage ../tools/package-management/nix-doc { }; |