diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-23 12:02:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 12:02:01 +0000 |
| commit | 3bc17773a5238c508c6f330744db5970ea62e88e (patch) | |
| tree | 68f6787ec2dad2fc93aac86e551b07d126f97c1f /pkgs/top-level/all-packages.nix | |
| parent | 7bf8b97d6851a79ad6d4101befd30069827f70b3 (diff) | |
| parent | 55a4a2d60a420ca83f31e3f659beb295fd6b8626 (diff) | |
| download | nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.gz nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.bz2 nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.lz nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.xz nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.zst nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27d4468a189..6dd03ddb89d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1747,7 +1747,7 @@ in xcodeenv = callPackage ../development/mobile/xcodeenv { }; gomobile = callPackage ../development/mobile/gomobile { - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; @@ -7943,9 +7943,7 @@ in pdfarranger = callPackage ../applications/misc/pdfarranger { }; - pdfread = callPackage ../tools/graphics/pdfread { - inherit (pythonPackages) pillow; - }; + pdfread = throw "pdfread has been remove from nixpkgs, because it is unmaintained for years and the sources are no longer available"; briss = callPackage ../tools/graphics/briss { }; @@ -10756,6 +10754,8 @@ in cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; + comby = callPackage ../development/tools/comby { }; + compcert = coqPackages.compcert.override { version = "3.9"; }; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; @@ -17156,8 +17156,6 @@ in libtap = callPackage ../development/libraries/libtap { }; - libtgvoip = callPackage ../development/libraries/libtgvoip { }; - libtsm = callPackage ../development/libraries/libtsm { }; libgeotiff = callPackage ../development/libraries/libgeotiff { }; @@ -28789,6 +28787,8 @@ in cdogs-sdl = callPackage ../games/cdogs-sdl { }; + cgoban = callPackage ../games/cgoban { }; + chessdb = callPackage ../games/chessdb { }; chessx = libsForQt5.callPackage ../games/chessx { }; |