diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-24 00:05:04 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-24 00:05:04 +0000 |
commit | 05b69d83daafb043d8fd193b61af3f9290174146 (patch) | |
tree | 1bb9eae93686cd1d255b8cc1001329827e79824e /pkgs/top-level | |
parent | 38fe12189506453de8e548b7149b7f0e317c9863 (diff) | |
parent | ab0caff134dbe8b5123feead5297708e6e3144b4 (diff) | |
download | nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.gz nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.bz2 nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.lz nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.xz nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.zst nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
4 files changed, 59 insertions, 9 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5412880b5f8..8ece1dde076 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -528,6 +528,7 @@ mapAliases ({ oauth2_proxy = oauth2-proxy; # added 2021-04-18 opencascade_oce = opencascade; # added 2018-04-25 oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 + ofp = throw "ofp is not compatible with odp-dpdk"; opencl-icd = ocl-icd; # added 2017-01-20 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 openexr_ctl = ctl; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af5b0a0275d..066abf31ea4 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 { }; @@ -2851,6 +2851,8 @@ in gping = callPackage ../tools/networking/gping { }; + gpu-burn = callPackage ../applications/misc/gpu-burn { }; + greg = callPackage ../applications/audio/greg { pythonPackages = python3Packages; }; @@ -7943,9 +7945,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 +10756,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 +17158,6 @@ in libtap = callPackage ../development/libraries/libtap { }; - libtgvoip = callPackage ../development/libraries/libtgvoip { }; - libtsm = callPackage ../development/libraries/libtsm { }; libgeotiff = callPackage ../development/libraries/libgeotiff { }; @@ -21625,8 +21625,6 @@ in odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; - ofp = callPackage ../os-specific/linux/ofp { }; - ofono = callPackage ../tools/networking/ofono { }; openpam = callPackage ../development/libraries/openpam { }; @@ -23589,6 +23587,7 @@ in infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; + statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { }; }; deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix { @@ -27532,7 +27531,10 @@ in tut = callPackage ../applications/misc/tut { }; - tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { + jre = jre8; + swt = swt_jdk8; + }; twister = callPackage ../applications/networking/p2p/twister { }; @@ -28789,6 +28791,8 @@ in cdogs-sdl = callPackage ../games/cdogs-sdl { }; + cgoban = callPackage ../games/cgoban { }; + chessdb = callPackage ../games/chessdb { }; chessx = libsForQt5.callPackage ../games/chessx { }; @@ -29005,6 +29009,8 @@ in gmad = callPackage ../games/gmad { }; + gnonograms = callPackage ../games/gnonograms { }; + gnubg = callPackage ../games/gnubg { }; gnuchess = callPackage ../games/gnuchess { }; @@ -30082,6 +30088,8 @@ in ### SCIENCE/MACHINE LEARNING + nengo-gui = callPackage ../applications/science/machine-learning/nengo-gui { }; + sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; ### SCIENCE/MATH @@ -32129,6 +32137,11 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; + bsnes-hd = callPackage ../misc/emulators/bsnes-hd { + inherit (gnome2) gtksourceview; + inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; + }; + yapesdl = callPackage ../misc/emulators/yapesdl { }; x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c17ea27a9e5..2e8a4fa59d1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -415,6 +415,8 @@ let h2 = callPackage ../development/ocaml-modules/h2 { }; + hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { }; + hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; hacl-star = callPackage ../development/ocaml-modules/hacl-star { }; @@ -794,6 +796,8 @@ let mparser = callPackage ../development/ocaml-modules/mparser { }; + mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { }; + mtime = callPackage ../development/ocaml-modules/mtime { }; mustache = callPackage ../development/ocaml-modules/mustache { }; @@ -1229,6 +1233,34 @@ let terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; + tezos-base = callPackage ../development/ocaml-modules/tezos/base.nix { }; + tezos-clic = callPackage ../development/ocaml-modules/tezos/clic.nix { }; + tezos-crypto = callPackage ../development/ocaml-modules/tezos/crypto.nix { }; + tezos-error-monad = callPackage ../development/ocaml-modules/tezos/error-monad.nix { }; + tezos-event-logging = callPackage ../development/ocaml-modules/tezos/event-logging.nix { }; + tezos-lmdb = callPackage ../development/ocaml-modules/tezos/lmdb.nix { }; + tezos-lwt-result-stdlib = callPackage ../development/ocaml-modules/tezos/lwt-result-stdlib.nix { }; + tezos-micheline = callPackage ../development/ocaml-modules/tezos/micheline.nix { }; + tezos-p2p-services = callPackage ../development/ocaml-modules/tezos/p2p-services.nix { }; + tezos-p2p = callPackage ../development/ocaml-modules/tezos/p2p.nix { }; + tezos-protocol-008-PtEdo2Zk-parameters = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix { }; + tezos-protocol-008-PtEdo2Zk = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix { }; + tezos-protocol-compiler = callPackage ../development/ocaml-modules/tezos/protocol-compiler.nix { }; + tezos-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/protocol-demo-noops.nix { }; + tezos-protocol-environment-packer = callPackage ../development/ocaml-modules/tezos/protocol-environment-packer.nix { }; + tezos-protocol-environment-sigs = callPackage ../development/ocaml-modules/tezos/protocol-environment-sigs.nix { }; + tezos-protocol-environment-structs = callPackage ../development/ocaml-modules/tezos/protocol-environment-structs.nix { }; + tezos-protocol-environment = callPackage ../development/ocaml-modules/tezos/protocol-environment.nix { }; + tezos-requester = callPackage ../development/ocaml-modules/tezos/requester.nix { }; + tezos-rpc = callPackage ../development/ocaml-modules/tezos/rpc.nix { }; + tezos-sapling = callPackage ../development/ocaml-modules/tezos/sapling.nix { }; + tezos-shell-services = callPackage ../development/ocaml-modules/tezos/shell-services.nix { }; + tezos-stdlib-unix = callPackage ../development/ocaml-modules/tezos/stdlib-unix.nix { }; + tezos-stdlib = callPackage ../development/ocaml-modules/tezos/stdlib.nix { }; + tezos-test-services = callPackage ../development/ocaml-modules/tezos/test-services.nix { }; + tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { }; + tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { }; + toml = callPackage ../development/ocaml-modules/toml { }; topkg = callPackage ../development/ocaml-modules/topkg { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cab2a4f0c7..80fec635408 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3102,6 +3102,8 @@ in { graphene = callPackage ../development/python-modules/graphene { }; + graphqlclient= callPackage ../development/python-modules/graphqlclient { }; + graphql-core = callPackage ../development/python-modules/graphql-core { }; graphql-relay = callPackage ../development/python-modules/graphql-relay { }; @@ -3979,6 +3981,8 @@ in { leather = callPackage ../development/python-modules/leather { }; + leb128 = callPackage ../development/python-modules/leb128 { }; + ledger_agent = callPackage ../development/python-modules/ledger_agent { }; ledgerblue = callPackage ../development/python-modules/ledgerblue { }; |