b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208834 from panicgh/fmt-repin-7-9

Browse source
This commit is contained in:
Sandro 2023-01-23 12:57:16 +01:00 committed by GitHub
parent b380d382d3 fb9496a58f
commit 9d351dcac0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/fmt/default.nix
View file

@ -42,11 +42,6 @@ let
};
in
{
fmt_7 = generic {
version = "7.1.3";
sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29";
};
fmt_8 = generic {
version = "8.1.1";
sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308=";

5
pkgs/development/libraries/kompute/default.nix
View file

@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/KomputeProject/kompute/commit/9a791b161dd58ca927fe090f65fa2b0e5e85e7ca.diff";
sha256 = "OtFTN8sgPlyiMmVzUnqzCkVMKj6DWxbCXtYwkRdEprY=";
})
(fetchpatch {
name = "enum-class-fix-for-fmt-8-x.patch";
url = "https://github.com/KomputeProject/kompute/commit/f731f2e55c7aaaa804111106c3e469f9a642d4eb.patch";
sha256 = "sha256-scTCYqkgKQnH27xzuY4FVbiwRuwBvChmLPPU7ZUrrL0=";
})
];
cmakeFlags = [

20
pkgs/top-level/all-packages.nix
View file

@ -2212,6 +2212,7 @@ with pkgs;
dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
fmt = fmt_8;
};
### APPLICATIONS/EMULATORS/RETROARCH
@ -5796,6 +5797,7 @@ with pkgs;
libceph = ceph.lib;
inherit (callPackages ../tools/filesystems/ceph {
lua = lua5_4;
fmt = fmt_8;
})
ceph
ceph-client;
@ -19475,10 +19477,9 @@ with pkgs;
flyway = callPackage ../development/tools/flyway { };
inherit (callPackages ../development/libraries/fmt { }) fmt_7 fmt_8 fmt_9;
inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9;
fmt = fmt_7;
fmt_latest = fmt_9;
fmt = fmt_9;
fplll = callPackage ../development/libraries/fplll {};
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
@ -31306,7 +31307,10 @@ with pkgs;
oroborus = callPackage ../applications/window-managers/oroborus {};
osm2pgsql = callPackage ../tools/misc/osm2pgsql { };
osm2pgsql = callPackage ../tools/misc/osm2pgsql {
# fmt_9 is not supported: https://github.com/openstreetmap/osm2pgsql/issues/1859
fmt = fmt_8;
};
ostinato = libsForQt5.callPackage ../applications/networking/ostinato { };
@ -31637,7 +31641,9 @@ with pkgs;
boost = boost175;
};
openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { };
openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio {
fmt = fmt_8;
};
openjump = callPackage ../applications/misc/openjump { };
@ -37292,7 +37298,9 @@ with pkgs;
kompose = callPackage ../applications/networking/cluster/kompose { };
kompute = callPackage ../development/libraries/kompute { };
kompute = callPackage ../development/libraries/kompute {
fmt = fmt_8;
};
kontemplate = callPackage ../applications/networking/cluster/kontemplate { };