diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-12-06 12:36:58 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-12-06 12:36:58 +0100 |
commit | 089fb184207c4092392cc7f2d1918ca3bf40b305 (patch) | |
tree | 8a64349b18f2eebfac136e4dcec57c034eb1f36d /pkgs/top-level | |
parent | dc412439e497c60edcde8ca9fa17d47f1e66810f (diff) | |
parent | a4405929328b8a6604a1c969c0f4bb6d2442ae60 (diff) |
Merge #203426: staging-next 2022-11-28
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 41 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/ruby-packages.nix | 105 |
4 files changed, 126 insertions, 23 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12604948af507..73917b7e24bf2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1245,6 +1245,7 @@ mapAliases ({ pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14 pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 + pyext = throw "pyext was removed because it does not support python 3.11, is upstream unmaintained and was unused"; # Added 2022-11-21 pygmentex = texlive.bin.pygmentex; # Added 2019-12-15 pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained"; # Added 2021-03-21 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f1f4c79fb946..71e2f653fc32b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15166,11 +15166,11 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_64 = callPackage ../development/compilers/rust/1_64.nix { + rust_1_65 = callPackage ../development/compilers/rust/1_65.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_14 = llvmPackages_14.libllvm; }; - rust = rust_1_64; + rust = rust_1_65; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -15179,8 +15179,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_64 = rust_1_64.packages.stable; - rustPackages = rustPackages_1_64; + rustPackages_1_65 = rust_1_65.packages.stable; + rustPackages = rustPackages_1_65; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -15447,7 +15447,8 @@ with pkgs; sbcl_2_2_4 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.4"; }; sbcl_2_2_6 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.6"; }; sbcl_2_2_9 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.9"; }; - sbcl = sbcl_2_2_9; + sbcl_2_2_10 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.10"; }; + sbcl = sbcl_2_2_10; roswell = callPackage ../development/tools/roswell { }; @@ -16130,12 +16131,10 @@ with pkgs; pipewire = callPackage ../development/libraries/pipewire { # ffmpeg depends on SDL2 which depends on pipewire by default. - # Break the cycle by disabling pipewire support in our ffmpeg. - ffmpeg = ffmpeg.override { - SDL2 = SDL2.override { - pipewireSupport = false; - }; - }; + # Break the cycle by depending on ffmpeg-headless. + # Pipewire only uses libavcodec (via an SPA plugin), which isn't + # affected by the *-headless changes. + ffmpeg = ffmpeg-headless; }; pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {}; @@ -19220,8 +19219,6 @@ with pkgs; gd = callPackage ../development/libraries/gd { automake = automake115x; - libtiff = null; - libXpm = null; }; gdal = callPackage ../development/libraries/gdal { }; @@ -19482,7 +19479,7 @@ with pkgs; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg; }); + callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg-headless; }); inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox; }); @@ -21884,7 +21881,9 @@ with pkgs; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; - openldap = callPackage ../development/libraries/openldap { }; + openldap = callPackage ../development/libraries/openldap { + openssl = openssl_legacy; + }; opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; @@ -21940,6 +21939,10 @@ with pkgs; openssl = openssl_3; + openssl_legacy = openssl.override { + conf = ../development/libraries/openssl/3.0/legacy.cnf; + }; + inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3; @@ -32678,9 +32681,7 @@ with pkgs; enableX11 = config.unison.enableX11 or true; }; - unpaper = callPackage ../tools/graphics/unpaper { - ffmpeg_5 = ffmpeg_5-headless; - }; + unpaper = callPackage ../tools/graphics/unpaper { }; unison-ucm = callPackage ../development/compilers/unison { }; @@ -38092,9 +38093,7 @@ with pkgs; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; - navidrome = callPackage ../servers/misc/navidrome { - ffmpeg = ffmpeg-headless; - }; + navidrome = callPackage ../servers/misc/navidrome { }; zalgo = callPackage ../tools/misc/zalgo { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4740dd8f40fec..0ae0f7f102abd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7820,8 +7820,6 @@ self: super: with self; { pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; - pyext = callPackage ../development/python-modules/pyext { }; - pyezviz = callPackage ../development/python-modules/pyezviz { }; pyface = callPackage ../development/python-modules/pyface { }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index bb25b2df7a08d..d702c04dac156 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -1166,6 +1166,16 @@ }; version = "2.14.3"; }; + htmlbeautifier = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y55dx25l3wwc025mwl6jsbcsqrm30gs2d2pxnaxg07yh22ckq4x"; + type = "gem"; + }; + version = "1.4.2"; + }; http-accept = { groups = ["default"]; platforms = []; @@ -1197,6 +1207,17 @@ }; version = "0.8.0"; }; + httparty = { + dependencies = ["multi_xml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q42553gp8brkkrn97m7ah4yr6bqs7fsn8lg84yzx6dr6y02bj5i"; + type = "gem"; + }; + version = "0.15.7"; + }; httpclient = { groups = ["default"]; platforms = []; @@ -1238,6 +1259,16 @@ }; version = "0.1.4"; }; + ipaddr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; + type = "gem"; + }; + version = "1.2.4"; + }; jaro_winkler = { groups = ["default"]; platforms = []; @@ -1664,6 +1695,17 @@ }; version = "2.2.1"; }; + jekyll-webmention_io = { + dependencies = ["htmlbeautifier" "jekyll" "json" "openssl" "string_inflection" "uglifier" "webmention"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "141bj7v068s6sdz3syhzrka47w3r6r9r69a6mhfxrzfyrkwqq8a1"; + type = "gem"; + }; + version = "3.3.6"; + }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; groups = ["default"]; @@ -1768,6 +1810,16 @@ }; version = "3.2.4"; }; + link_header = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yamrdq4rywmnpdhbygnkkl9fdy249fg5r851nrkkxr97gj5rihm"; + type = "gem"; + }; + version = "0.0.8"; + }; liquid = { groups = ["default"]; platforms = []; @@ -1954,6 +2006,16 @@ }; version = "1.15.0"; }; + multi_xml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; mustermann = { dependencies = ["ruby2_keywords"]; groups = ["default"]; @@ -2078,6 +2140,17 @@ }; version = "4.25.1"; }; + openssl = { + dependencies = ["ipaddr"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk"; + type = "gem"; + }; + version = "2.2.2"; + }; optimist = { groups = ["default"]; platforms = []; @@ -3015,6 +3088,16 @@ }; version = "1.5.3"; }; + string_inflection = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v57afc7rdr58xd6mayf9giifqgav3hqjr54kagi7iki3hn6vjag"; + type = "gem"; + }; + version = "0.1.2"; + }; syntax_tree = { dependencies = ["prettier_print"]; groups = ["default"]; @@ -3193,6 +3276,17 @@ }; version = "1.2.10"; }; + uglifier = { + dependencies = ["execjs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; + type = "gem"; + }; + version = "4.2.0"; + }; unf = { dependencies = ["unf_ext"]; groups = ["default"]; @@ -3234,6 +3328,17 @@ }; version = "0.2.0"; }; + webmention = { + dependencies = ["httparty" "json" "link_header" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s3p572rp1aifk7xxhnwvnpxwvn9sx8hx5zm0mz0ff4lgb2y4yq4"; + type = "gem"; + }; + version = "0.1.6"; + }; webrick = { groups = ["default"]; platforms = []; |