diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bba96bca992c..77374d6eae9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6804,12 +6804,11 @@ with pkgs; cirrusgo = callPackage ../tools/security/cirrusgo { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) - citrix_workspace_23_02_0 - citrix_workspace_23_07_0 citrix_workspace_23_09_0 citrix_workspace_23_11_0 + citrix_workspace_24_02_0 ; - citrix_workspace = citrix_workspace_23_11_0; + citrix_workspace = citrix_workspace_24_02_0; clima = callPackage ../tools/text/clima { }; @@ -9788,9 +9787,7 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - kube-router = callPackage ../applications/networking/cluster/kube-router { - buildGoModule = buildGo120Module; - }; + kube-router = callPackage ../applications/networking/cluster/kube-router { }; kubedock = callPackage ../development/tools/kubedock { }; @@ -18293,10 +18290,11 @@ with pkgs; electron_23 = electron_23-bin; electron_24 = electron_24-bin; electron_25 = electron_25-bin; - electron_26 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_26 then electron-source.electron_26 else electron_26-bin; + electron_26 = electron_26-bin; electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; - electron = electron_28; + electron_29 = electron-source.electron_29; + electron = electron_29; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -29907,11 +29905,6 @@ with pkgs; qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; - saga = callPackage ../applications/gis/saga { - inherit (darwin.apple_sdk.frameworks) Cocoa; - inherit (libsForQt5) dxflib; - }; - spatialite_gui = callPackage ../applications/gis/spatialite-gui { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; wxGTK = wxGTK32; @@ -30772,7 +30765,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_20_10 docker_24 docker_25; + docker_24 docker_25; docker = docker_24; docker-client = docker.override { clientOnly = true; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41856355323d..545fe4a7dae3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4939,6 +4939,8 @@ self: super: with self; { gpsoauth = callPackage ../development/python-modules/gpsoauth { }; + gpuctypes = callPackage ../development/python-modules/gpuctypes { }; + gpustat = callPackage ../development/python-modules/gpustat { }; gpxpy = callPackage ../development/python-modules/gpxpy { }; @@ -14763,6 +14765,8 @@ self: super: with self; { tinydb = callPackage ../development/python-modules/tinydb { }; + tinygrad = callPackage ../development/python-modules/tinygrad { }; + tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; tinyrecord = callPackage ../development/python-modules/tinyrecord { }; |