diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-18 00:02:44 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-18 00:02:44 +0000 |
commit | 5875423007b766548e1b7655338014e4d789b029 (patch) | |
tree | 04f2c56f8861bc6a1218508e985e37fca5fb8711 | |
parent | f2681f8bd194a492b2ac2bb0010d9b3bcd89ad0a (diff) | |
parent | b43f6f58c9dd275d933bd759284aa16f50048bbb (diff) | |
download | nixpkgs-5875423007b766548e1b7655338014e4d789b029.tar nixpkgs-5875423007b766548e1b7655338014e4d789b029.tar.gz nixpkgs-5875423007b766548e1b7655338014e4d789b029.tar.bz2 nixpkgs-5875423007b766548e1b7655338014e4d789b029.tar.lz nixpkgs-5875423007b766548e1b7655338014e4d789b029.tar.xz nixpkgs-5875423007b766548e1b7655338014e4d789b029.tar.zst nixpkgs-5875423007b766548e1b7655338014e4d789b029.zip |
Merge master into staging-next
27 files changed, 220 insertions, 170 deletions
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 6a7edb460ec..90d51827f14 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.1.0"; + version = "5.1.1"; kde-channel = "stable"; - sha256 = "sha256-mjs/WFhIC3CRvUhEmSbmE1OOqKTcBiSchg/+PaWs2II="; + sha256 = "sha256-Tdv4l6+nsYcTFpfRKiO6OYlGOAaLLq4Ss7Q0/kKtjiQ="; }) diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 97abbaca77a..c5d48ff454e 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -1,17 +1,32 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, jq }: rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.0.2"; + version = "1.1.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lZNVXBIYl9niqdwNcSzQwQTdxlA4kKQ/WrEt93cQDJU="; + sha256 = "sha256-Mw6mPOxiWnYu2QgqL4VccwwJhdxZ7zLJyX/oJWfGUhw="; }; - cargoSha256 = "sha256-9IiA7KAaj9bLJ7QSB/ojLEiUVv0FGYsu9by4NSfMtiE="; + cargoSha256 = "sha256-ygQklcRjdffGl0s77MwKsyHVJWqWJZHq4SU38cSMVug="; + + depsExtraArgs = { + nativeBuildInputs = [ jq ]; + postBuild = '' + pushd $name/humansize + + [ -d feature-tests ] && rm -r feature-tests + + jq '.files |= with_entries(select(.key | startswith("feature-tests") | not))' \ + -c .cargo-checksum.json > .cargo-checksum.json.new + mv .cargo-checksum.json{.new,} + + popd + ''; + }; meta = with lib; { description = "A nonsense activity generator"; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 44ce37c4564..45b12bab89e 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "rofimoji"; - version = "5.5.0"; + version = "5.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = "refs/tags/${version}"; - sha256 = "sha256-rYqEeAoHCx0j83R1vmtj+CVuR0QFEd3e1c5O454mANM="; + sha256 = "sha256-6W/59DjxrgejHSkNxpruDAws812Vjyf+GePDPbXzVbc="; }; # `rofi` and the `waylandSupport` and `x11Support` dependencies diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index aaac0c10657..cedd8701731 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "slides"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "sha256-Ca0/M4B6yAdV4hbJ95gH9MVZg3EFIY5bSMkkYy2+P+Q="; + sha256 = "sha256-K8VsqaNUPxh3/Yddy6DFiOyjRuZ6r6bU456Pm31A1og="; }; checkInputs = [ @@ -21,7 +21,7 @@ buildGoModule rec { go ]; - vendorSha256 = "sha256-pn7c/6RF/GpECQtaxsTau91T7pLg+ZAUBbnR7h8DfnY="; + vendorSha256 = "sha256-c3YCf22L5+rTmH5ePeJ0/goRj5rKY6v+Zon3183MhMY="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index d988e061f3a..a18e60f051b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ rec { }; kops_1_24 = mkKops rec { - version = "1.24.2"; - sha256 = "sha256-QEoaSkJ3fzUr2Fr3M2EOd/3iwq1ZX2YHEez2i0kjRmY="; + version = "1.24.3"; + sha256 = "sha256-o84060P2aHTIm61lSkz2/GqzYd2NYk1zKgGdNaHlWfA="; rev = "v${version}"; }; diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index 2c3bc3c6e8a..93d84928ab6 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.9"; + version = "0.2.11"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-lsxZBhXgLJIy39kaOj5cCQUgZEDhlylklOdD4qHXks0="; + sha256 = "sha256-RIHlAE+hsMXA/kWfazAmhsEi298tPY4Mt4RR6vmo1oQ="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index f702eb7bfd5..2cff80dd730 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.6"; + version = "0.10.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "Ag1rwBWeVUBKxnsIGNDwz9UmHwpklwF6UjM8IPudZTs="; + sha256 = "jeZh1vPXUN/jcf306S6KdIeHygci+4+uky4MXQgRlpA="; }; modRoot = "./agent"; - vendorSha256 = "sha256-UDsgfsdq8DecyTAFrmWO09V3JIuTA5YLCEAei0tYRy4="; + vendorSha256 = "sha256-AqtDI1GFw4cduFdWRSh9lYe/OwvEdu5iB0+ud8QPgXM="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index ab5006e424e..11cd1918896 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "why3"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256:0qjh49pyqmg3xi09fn4lyzz23i6h18y9sgc8ayscvx3bwr3vcqhr"; + sha256 = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; }; buildInputs = with ocamlPackages; [ diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 79f66a616b9..53a37da01fd 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , expat , libyamlcpp @@ -35,6 +36,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-e1PpWjjfSjtgN9Rs/+lsA45Z9S4y4T6nqrJ02DZ4vjs="; }; + patches = [ + (fetchpatch { + name = "darwin-no-hidden-l.patch"; + url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/48bab7c643ed8d108524d718e5038d836f906682.patch"; + revert = true; + sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ expat diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 70c9cedb098..6849bfb40b8 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/6.3/6.3.2/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 07bb7fd494f..d0ee4475b4f 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,259 +4,259 @@ { qt3d = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qt3d-everywhere-src-6.3.1.tar.xz"; - sha256 = "1zpdafqm82hd2bijw20hi1ng81xwihsn9mm7n5ns4gr5zdnvc6cr"; - name = "qt3d-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qt3d-everywhere-src-6.3.2.tar.xz"; + sha256 = "0gy73dlzj0hajxr0v68sljqvqclcryirm901icszg1mfvl4xw6zj"; + name = "qt3d-everywhere-src-6.3.2.tar.xz"; }; }; qt5compat = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qt5compat-everywhere-src-6.3.1.tar.xz"; - sha256 = "1zbcaswpl79ixcxzj85qzjq73962s4c7316pibwfrskqswmwcgm4"; - name = "qt5compat-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qt5compat-everywhere-src-6.3.2.tar.xz"; + sha256 = "1k30hnwnlbay1hnkdavgf6plsdzrryzcqd2qz8x11r477w7sr8wi"; + name = "qt5compat-everywhere-src-6.3.2.tar.xz"; }; }; qtactiveqt = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtactiveqt-everywhere-src-6.3.1.tar.xz"; - sha256 = "0axygqjqny6vjwmc5swn80xrcs97bcjwgxsg81f35srxpn9lxdb4"; - name = "qtactiveqt-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtactiveqt-everywhere-src-6.3.2.tar.xz"; + sha256 = "052mcwln989hp154kdrjxmif81glx4x3qcmnhss4n1ps4m28jw7w"; + name = "qtactiveqt-everywhere-src-6.3.2.tar.xz"; }; }; qtbase = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtbase-everywhere-src-6.3.1.tar.xz"; - sha256 = "00sfya41ihqb0zwg6wf1kiy02iymj6mk584hhk2c4s94khfl4r0a"; - name = "qtbase-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtbase-everywhere-src-6.3.2.tar.xz"; + sha256 = "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr"; + name = "qtbase-everywhere-src-6.3.2.tar.xz"; }; }; qtcharts = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtcharts-everywhere-src-6.3.1.tar.xz"; - sha256 = "1xvwsabyfln3sih9764xknl2s3w4w069k210kgbh94bj50iwqc7k"; - name = "qtcharts-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtcharts-everywhere-src-6.3.2.tar.xz"; + sha256 = "1xpv7vijamm1iwx71wbyc7wqw9s35j1iz1ycp5c1a33hhq9lxa5a"; + name = "qtcharts-everywhere-src-6.3.2.tar.xz"; }; }; qtconnectivity = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtconnectivity-everywhere-src-6.3.1.tar.xz"; - sha256 = "1c4mnrl7fa8j8fmv5zbqak48nylhxpib7vmsbmmbqqcw19qy8p5j"; - name = "qtconnectivity-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtconnectivity-everywhere-src-6.3.2.tar.xz"; + sha256 = "0n56z6vdf4pc4jqrimsl6gd30vgac2sirz7z2v29d71ca1n6ajg2"; + name = "qtconnectivity-everywhere-src-6.3.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtdatavis3d-everywhere-src-6.3.1.tar.xz"; - sha256 = "1wm8iigpml84zfkw3mb2kll0imszc2y19hkcfwq1wbr9w24xda43"; - name = "qtdatavis3d-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdatavis3d-everywhere-src-6.3.2.tar.xz"; + sha256 = "13xg4vs3wm47f3wbh56qnrd3wa130g0z4jhf494zd7y2n5vi4r7z"; + name = "qtdatavis3d-everywhere-src-6.3.2.tar.xz"; }; }; qtdeclarative = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtdeclarative-everywhere-src-6.3.1.tar.xz"; - sha256 = "1s268fha3650dn1lqxf8jfa07wxpw09f6p7rjyiwq3w24d0nkrq3"; - name = "qtdeclarative-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdeclarative-everywhere-src-6.3.2.tar.xz"; + sha256 = "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq"; + name = "qtdeclarative-everywhere-src-6.3.2.tar.xz"; }; }; qtdoc = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtdoc-everywhere-src-6.3.1.tar.xz"; - sha256 = "1qvhv2b9c6mz7r3sdx0l81a2jr9qri17y1y8k3d6qh488fxqrk32"; - name = "qtdoc-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdoc-everywhere-src-6.3.2.tar.xz"; + sha256 = "001mf5vrgjz0hbi90qcp66lbs5hv3iickfv6780j2nsc94wjc5mp"; + name = "qtdoc-everywhere-src-6.3.2.tar.xz"; }; }; qtimageformats = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtimageformats-everywhere-src-6.3.1.tar.xz"; - sha256 = "0br1vqgx0hcc2nx32xviic94mvj6fbagrnzskdr7zdmvvyw140xd"; - name = "qtimageformats-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtimageformats-everywhere-src-6.3.2.tar.xz"; + sha256 = "0fnfhlvd12v1gk81x5zhhrkmn6k80n3zfw5in0yrqxvcmr68mjqx"; + name = "qtimageformats-everywhere-src-6.3.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtlanguageserver-everywhere-src-6.3.1.tar.xz"; - sha256 = "1g2azb4mdzh5zp7xc57g8l2a8wfi44wfjm6js88q4mmchyj4f4br"; - name = "qtlanguageserver-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtlanguageserver-everywhere-src-6.3.2.tar.xz"; + sha256 = "00ya6lqwv2dq2g86c53aafisp5vnkgamylslg5fqd8ym29g6wraj"; + name = "qtlanguageserver-everywhere-src-6.3.2.tar.xz"; }; }; qtlottie = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtlottie-everywhere-src-6.3.1.tar.xz"; - sha256 = "1x8wmc6gwmxk92zjcsrbhrbqbfvnk7302ggghld5wk8jk5lsf2vl"; - name = "qtlottie-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtlottie-everywhere-src-6.3.2.tar.xz"; + sha256 = "1c092hmf114r8jfdhkhxnn3vywj93mg33whzav47gr9mbza44icq"; + name = "qtlottie-everywhere-src-6.3.2.tar.xz"; }; }; qtmultimedia = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtmultimedia-everywhere-src-6.3.1.tar.xz"; - sha256 = "0dkk3lmzi2fs13cnj8q1lpcs6gghj219826gkwnzyd6nmlm280vy"; - name = "qtmultimedia-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtmultimedia-everywhere-src-6.3.2.tar.xz"; + sha256 = "0hqwq0ad6z8c5kyyvbaddj00mciijn2ns2r60jc3mqh98nm2js3z"; + name = "qtmultimedia-everywhere-src-6.3.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtnetworkauth-everywhere-src-6.3.1.tar.xz"; - sha256 = "0apvsb2ip1m3kw8vi9spvf6f6q72ys8vr40rpyysi7shsjwm83yn"; - name = "qtnetworkauth-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtnetworkauth-everywhere-src-6.3.2.tar.xz"; + sha256 = "0mjnz87splyxq7jwydi5ws2aqb6j7czscrkns193w425x0dgy94l"; + name = "qtnetworkauth-everywhere-src-6.3.2.tar.xz"; }; }; qtpositioning = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtpositioning-everywhere-src-6.3.1.tar.xz"; - sha256 = "0v78wamvdw02kf9rq7m5v24q2g6jmgq4ch0fnfa014p1r978wy06"; - name = "qtpositioning-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtpositioning-everywhere-src-6.3.2.tar.xz"; + sha256 = "0zh45lf164nzwl1hh96qm64nyw9wzzrnm5s7sx761glz54q6l5xz"; + name = "qtpositioning-everywhere-src-6.3.2.tar.xz"; }; }; qtquick3d = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtquick3d-everywhere-src-6.3.1.tar.xz"; - sha256 = "0mhj0r6081bjkq3fsr1vh43zn587v9m20mdpnc979h5q8zp6d9rg"; - name = "qtquick3d-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtquick3d-everywhere-src-6.3.2.tar.xz"; + sha256 = "00wwla3crql4wwbaz116icgc4liszi497g692z8fxllvp4ysm80x"; + name = "qtquick3d-everywhere-src-6.3.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtquicktimeline-everywhere-src-6.3.1.tar.xz"; - sha256 = "1gpb51d8r707sr0dnvbz65d4zwisfdw40s10kximaxwfrvq3r8aq"; - name = "qtquicktimeline-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtquicktimeline-everywhere-src-6.3.2.tar.xz"; + sha256 = "0njidyr7ahvrq1x1676v16qcp7lz2v2rhz0x3iw2mql90vrhk2h4"; + name = "qtquicktimeline-everywhere-src-6.3.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtremoteobjects-everywhere-src-6.3.1.tar.xz"; - sha256 = "19jcxxxj3q8vnf9cbgrp3q1pvgwsln8n16nk1gg822f6265h6vga"; - name = "qtremoteobjects-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtremoteobjects-everywhere-src-6.3.2.tar.xz"; + sha256 = "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi"; + name = "qtremoteobjects-everywhere-src-6.3.2.tar.xz"; }; }; qtscxml = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtscxml-everywhere-src-6.3.1.tar.xz"; - sha256 = "06c6dwwx3z26k9ff6nqagg70lws4l1c6drz1yi4z1lb3c56ibg01"; - name = "qtscxml-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtscxml-everywhere-src-6.3.2.tar.xz"; + sha256 = "1h90kiin6n4629nlzqkilhvn30q4ppr9kwbcxbsck4zss91yc6n5"; + name = "qtscxml-everywhere-src-6.3.2.tar.xz"; }; }; qtsensors = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtsensors-everywhere-src-6.3.1.tar.xz"; - sha256 = "1k301lgbiw3fiyryfr18k0dq89ls4xgs4n2pffs456msxmchn92b"; - name = "qtsensors-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtsensors-everywhere-src-6.3.2.tar.xz"; + sha256 = "1r82rpn552737n04b0wvv8g9rzqxvsr1snd22bwfb4djjn5b47j5"; + name = "qtsensors-everywhere-src-6.3.2.tar.xz"; }; }; qtserialbus = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtserialbus-everywhere-src-6.3.1.tar.xz"; - sha256 = "1lkqv3r66fiddxbg0fv9w6l83adz3y8zq6i4pmd0hnxs0ivkz580"; - name = "qtserialbus-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtserialbus-everywhere-src-6.3.2.tar.xz"; + sha256 = "04j5q2lwvbzp977zayj48ixwg4mkq0x58fk88l4kfkgy1xmrwgnh"; + name = "qtserialbus-everywhere-src-6.3.2.tar.xz"; }; }; qtserialport = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtserialport-everywhere-src-6.3.1.tar.xz"; - sha256 = "0vk17cjj9jpdkgd8qwb1x0lijg0p2jxdzx4d67hd57brcl7didjf"; - name = "qtserialport-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtserialport-everywhere-src-6.3.2.tar.xz"; + sha256 = "0vsyqdibf8mn4481vb6sc4chgabbqzcxw1mxxm3kdik74cr0gln7"; + name = "qtserialport-everywhere-src-6.3.2.tar.xz"; }; }; qtshadertools = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtshadertools-everywhere-src-6.3.1.tar.xz"; - sha256 = "0nj35s2z5n438q7nqf6bnj3slwz2am3169ck1ixwqa0mjrv73dsr"; - name = "qtshadertools-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtshadertools-everywhere-src-6.3.2.tar.xz"; + sha256 = "1bmkrpk414clx8pnyrdslqlsnfmsdldmwrdcqzz6rwi8ymk2ggpn"; + name = "qtshadertools-everywhere-src-6.3.2.tar.xz"; }; }; qtsvg = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtsvg-everywhere-src-6.3.1.tar.xz"; - sha256 = "1xvxz2jfpr1al85rhwss7ji5vkxa812d0b888hry5f7pwqcg86bv"; - name = "qtsvg-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtsvg-everywhere-src-6.3.2.tar.xz"; + sha256 = "14i3f23k9k0731akpwa6zzhw5m3c0m2l5r7irvim4h4faah445ac"; + name = "qtsvg-everywhere-src-6.3.2.tar.xz"; }; }; qttools = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qttools-everywhere-src-6.3.1.tar.xz"; - sha256 = "1h96w4bzkbd80vr7lh6hnypdlmbzc1y52c2zrqzvkgm3587pa4n4"; - name = "qttools-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qttools-everywhere-src-6.3.2.tar.xz"; + sha256 = "1lmfk5bhgg4daxkqrhmx4iyln7pyiz40c9cp6plyp35nz8ppvc75"; + name = "qttools-everywhere-src-6.3.2.tar.xz"; }; }; qttranslations = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qttranslations-everywhere-src-6.3.1.tar.xz"; - sha256 = "15yvvxw1vngnjlly6cady05ljamg01qiaqn2vh0xkph855gdbgfp"; - name = "qttranslations-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qttranslations-everywhere-src-6.3.2.tar.xz"; + sha256 = "1h66n9cx4g65c9wrgp32h9gm3r47gyh1nrcn3ivbfbvngfawqxpg"; + name = "qttranslations-everywhere-src-6.3.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtvirtualkeyboard-everywhere-src-6.3.1.tar.xz"; - sha256 = "1f62q0gkz21nraaspy1nrg2ygjih5qgq37qns06snnfq0jr8kq2z"; - name = "qtvirtualkeyboard-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtvirtualkeyboard-everywhere-src-6.3.2.tar.xz"; + sha256 = "0czxh6wc1qgxns1qm6zcnck6i0nzaz3bzi3725qdw98738lyhvml"; + name = "qtvirtualkeyboard-everywhere-src-6.3.2.tar.xz"; }; }; qtwayland = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwayland-everywhere-src-6.3.1.tar.xz"; - sha256 = "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g"; - name = "qtwayland-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwayland-everywhere-src-6.3.2.tar.xz"; + sha256 = "0rwiirkibgpvx05pg2842j4dcq9ckxmcqxhaf50xx2i55z64ll83"; + name = "qtwayland-everywhere-src-6.3.2.tar.xz"; }; }; qtwebchannel = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebchannel-everywhere-src-6.3.1.tar.xz"; - sha256 = "0s16zx3qn3byldvhmsnwijm8rmizk8vpqj7fnwhjg6c67z10m8ma"; - name = "qtwebchannel-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebchannel-everywhere-src-6.3.2.tar.xz"; + sha256 = "0gqm09yqdq27kgb02idx5ycj14k5mjhh10ddp9jfs8lblimlgfni"; + name = "qtwebchannel-everywhere-src-6.3.2.tar.xz"; }; }; qtwebengine = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebengine-everywhere-src-6.3.1.tar.xz"; - sha256 = "0ivfsqd5c0cxsnssj6z37901cf6a47w50zaqgjiysvcm3ar36ymd"; - name = "qtwebengine-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebengine-everywhere-src-6.3.2.tar.xz"; + sha256 = "09j4w9ax8242d1yx3hmic7jcwidwdrn8sp7k89hj4l0n8mzkkd35"; + name = "qtwebengine-everywhere-src-6.3.2.tar.xz"; }; }; qtwebsockets = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebsockets-everywhere-src-6.3.1.tar.xz"; - sha256 = "06hj0pkdzjicmbiinjp1dk1ziz8cb3fgcwy7a0dxxjvzr680v64z"; - name = "qtwebsockets-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebsockets-everywhere-src-6.3.2.tar.xz"; + sha256 = "1smbvidaybphvsmaap9v1pbkibwmng11hb925g0ww4ghwzpxkb8q"; + name = "qtwebsockets-everywhere-src-6.3.2.tar.xz"; }; }; qtwebview = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebview-everywhere-src-6.3.1.tar.xz"; - sha256 = "0f4hx3rqwg5wqnw37nrhcvi2fxshgfx72xmdc416j4gxhra1i6xl"; - name = "qtwebview-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebview-everywhere-src-6.3.2.tar.xz"; + sha256 = "06v69xl0fnbv4i1xbjaw7338iqyvim8d3q91qrrg7r2nqzjhiav7"; + name = "qtwebview-everywhere-src-6.3.2.tar.xz"; }; }; } diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index 132f280a80e..26bf492d23a 100644 --- a/pkgs/development/misc/resholve/resholve-utils.nix +++ b/pkgs/development/misc/resholve/resholve-utils.nix @@ -185,6 +185,8 @@ rec { # retain a reference to the base passthru = unresholved.passthru // { unresholved = unresholved; + # fallback attr for update bot to query our src + originalSrc = unresholved.src; }; # do these imply that we should use NoCC or something? diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix index 100144c152e..02b973d145c 100644 --- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -21,10 +21,13 @@ buildPythonPackage rec { into-dbus-python dbus-python ]; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "dbus_python_client_gen" ]; + meta = with lib; { description = "A Python library for generating dbus-python client code"; homepage = "https://github.com/stratis-storage/dbus-python-client-gen"; diff --git a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix index 659fcc3ed59..8b0eb3f3cf9 100644 --- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix +++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { hs-dbus-signature ]; + pythonImportsCheck = [ "dbus_signature_pyparsing" ]; + meta = with lib; { description = "A Parser for a D-Bus Signature"; homepage = "https://github.com/stratis-storage/dbus-signature-pyparsing"; diff --git a/pkgs/development/python-modules/hs-dbus-signature/default.nix b/pkgs/development/python-modules/hs-dbus-signature/default.nix index 7d071b75c3b..657a1d8b24a 100644 --- a/pkgs/development/python-modules/hs-dbus-signature/default.nix +++ b/pkgs/development/python-modules/hs-dbus-signature/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { hypothesis ]; + pythonImportsCheck = [ "hs_dbus_signature" ]; + meta = with lib; { description = "A Hypothesis Strategy for Generating Arbitrary DBus Signatures"; homepage = "https://github.com/stratis-storage/hs-dbus-signature"; diff --git a/pkgs/development/python-modules/into-dbus-python/default.nix b/pkgs/development/python-modules/into-dbus-python/default.nix index 1d893cd6969..5ef92cf216a 100644 --- a/pkgs/development/python-modules/into-dbus-python/default.nix +++ b/pkgs/development/python-modules/into-dbus-python/default.nix @@ -23,12 +23,15 @@ buildPythonPackage rec { dbus-signature-pyparsing dbus-python ]; + checkInputs = [ pytestCheckHook hypothesis hs-dbus-signature ]; + pythonImportsCheck = [ "into_dbus_python" ]; + meta = with lib; { description = "A transformer to dbus-python types"; homepage = "https://github.com/stratis-storage/into-dbus-python"; diff --git a/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/pkgs/development/python-modules/korean-lunar-calendar/default.nix index a1b22a727ad..c4a1672dd5e 100644 --- a/pkgs/development/python-modules/korean-lunar-calendar/default.nix +++ b/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "korean-lunar-calendar"; - version = "0.2.1"; + version = "0.3.1"; src = fetchPypi { inherit version; pname = "korean_lunar_calendar"; - sha256 = "0p97r21298ipgvsqh978aq2n6cvybzp8bskcvj15mm1f76qm9khj"; + sha256 = "sha256-6yxIUSSgYQFpJr3qbYnv35uf2/FttViVts8eW+wXuFc="; }; # no real tests diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index 77141a69beb..d9664922867 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mage"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "magefile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+OhmV5+XNhJVCVYNKc6M5bNB4gyb/SV6bEohaZJXtLk="; + sha256 = "sha256-77RjA5gncKE3fhejlmA+Vkhud4nyaRZW84I3cYTk0Js="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 4b0aa6b6bbc..972c4071679 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cSgsEjOnaFUuf9Vf6UOCC7LsmVg47wEQKU0LxpngLYc="; + sha256 = "sha256-OuLA8Yq0ihvj4wCQxQ/GqN85KW8Cj5eTWN+UZ52T0DU="; }; vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix index 7a8a6be85cd..b96e618da23 100644 --- a/pkgs/development/tools/kube-linter/default.nix +++ b/pkgs/development/tools/kube-linter/default.nix @@ -34,6 +34,7 @@ buildGoModule rec { meta = with lib; { description = "A static analysis tool that checks Kubernetes YAML files and Helm charts"; homepage = "https://kubelinter.io"; + changelog = "https://github.com/stackrox/kube-linter/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ mtesseract stehessel ]; platforms = platforms.all; diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index d9a2782f336..235689d97e2 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-ScO2ih+Y8R1OrazSmLlz9QtTUjQ6tIPf5F5juj2nc7Y="; + sha256 = "sha256-iqPQD0oDPhhD7jgnbiJvUiaxj1YZeGkgQu6p1vr1Vlw="; }; - cargoSha256 = "sha256-pJZrNjgtYjribIKo4DWR47dnyoSuy9sSRPd+ginDlOU="; + cargoSha256 = "sha256-gl4vgS/164eYP3MWRBaI3NrmlqbYZUHOwySUA7/42Qg="; nativeBuildInputs = lib.optional robloxSupport pkg-config; diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 4879e689951..056d2047f2d 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -47,8 +47,8 @@ python3.pkgs.buildPythonPackage rec { " > $out/bin/mautrix-signal chmod +x $out/bin/mautrix-signal wrapProgram $out/bin/mautrix-signal \ - --set PATH ${python3}/bin \ - --set PYTHONPATH "$PYTHONPATH" + --prefix PATH : "${python3}/bin" \ + --prefix PYTHONPATH : "$PYTHONPATH" ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 45a3cbba163..8b927aaab70 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.1.4"; + version = "9.1.5"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-tMU8xfMbXdPpI8La036tzPozdUK7GsDGZklNetAZ3ho="; + sha256 = "sha256-R5gHd9lLXPV6Ck9mhPfdL41/O9ZN76wjBRDUBLtL2eA="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-+9Y2ymdlDfSvAsbaFcaTRl7e9NiH2GpNHvZIgssi7/w="; + sha256 = "sha256-P+QkpyGRSuZX/OJo/CgMP9z1Rq7tJbWAZCMOwAuEFhc="; }; vendorSha256 = "sha256-frY84+Tp9qVj9Xs9l0c0u1YyYywMbXO4KS0AF5mpnhQ="; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 78c2a9f399c..c99d40cbc92 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "dtrx"; - version = "8.3.1"; + version = "8.4.0"; src = fetchFromGitHub { owner = "dtrx-py"; repo = "dtrx"; rev = "refs/tags/${version}"; - sha256 = "sha256-a8ZHIPunWGwI992HfgdRvJGtDfYUP50kFt/ROAqDO7E="; + sha256 = "sha256-G+W0qY8s30cYSmOEy9Kkx+Wr48n7+6FuzL34GvwdKtg="; }; postInstall = diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/tools/filesystems/stratis-cli/default.nix index 813ecfa22c6..145d570b6a8 100644 --- a/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/pkgs/tools/filesystems/stratis-cli/default.nix @@ -25,6 +25,18 @@ python3Packages.buildPythonApplication rec { packaging ]; + checkInputs = with python3Packages; [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # tests below require dbus daemon + "tests/whitebox/integration" + "tests/whitebox/monkey_patching" + ]; + + pythonImportsCheck = [ "stratis_cli" ]; + passthru.tests = nixosTests.stratis; meta = with lib; { diff --git a/pkgs/tools/security/gitls/default.nix b/pkgs/tools/security/gitls/default.nix index f6ef854ce81..4cda10b3805 100644 --- a/pkgs/tools/security/gitls/default.nix +++ b/pkgs/tools/security/gitls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gitls"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "v${version}"; - hash = "sha256-snoWnq+xmaxWzFthhO/gOYQDUMbpIZR9VkqcPaHzS6g="; + hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; passthru.tests.version = testers.testVersion { package = gitls; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb007a63557..4cffb837508 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20956,8 +20956,8 @@ with pkgs; openssl = openssl_1_1; }; - opencolorio = callPackage ../development/libraries/opencolorio { - inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa; + opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { + inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; }; opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; |