Merge branch 'staging' into staging-next
This commit is contained in:
commit
c89f5c4fbe
|
@ -28,6 +28,8 @@
|
|||
|
||||
- `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues.
|
||||
|
||||
- `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms).
|
||||
|
||||
- `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides
|
||||
|
||||
- `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details.
|
||||
|
|
|
@ -64,11 +64,9 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG"
|
||||
'';
|
||||
|
||||
# Use shared libraries to decrease size
|
||||
buildFlags = [ "shared" ];
|
||||
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"shared=yes"
|
||||
"USE_SYSTEM_LIBS=yes"
|
||||
"PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
|
||||
] ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ]
|
||||
|
|
|
@ -34,6 +34,9 @@ mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
# HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qt5.qtbase`
|
||||
sandboxProfile = toString qtbase.__propagatedSandboxProfile;
|
||||
|
||||
qmakeFlags = [
|
||||
# setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too:
|
||||
"QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
|
||||
|
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xterm";
|
||||
version = "380";
|
||||
version = "382";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
|
||||
];
|
||||
hash = "sha256-DB3B+oAPpktcWNFt25BecAsnylOKZb6MA7K6V2EQbDg=";
|
||||
hash = "sha256-DNC889CqdGqEDqPxNm6imnQmNpTVNbXHd/J+tl1/zu0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -175,12 +175,6 @@
|
|||
"https://download.qt.io/"
|
||||
];
|
||||
|
||||
# Roy marples mirrors
|
||||
roy = [
|
||||
"https://roy.marples.name/downloads/"
|
||||
"https://cflags.cc/roy/"
|
||||
];
|
||||
|
||||
# Sage mirrors (https://www.sagemath.org/mirrors.html)
|
||||
sageupstream = [
|
||||
# Africa (HTTPS)
|
||||
|
|
|
@ -5,6 +5,10 @@ cargoBuildHook() {
|
|||
|
||||
runHook preBuild
|
||||
|
||||
# Let stdenv handle stripping, for consistency and to not break
|
||||
# separateDebugInfo.
|
||||
export "CARGO_PROFILE_${cargoBuildType@U}_STRIP"=false
|
||||
|
||||
if [ ! -z "${buildAndTestSubdir-}" ]; then
|
||||
# ensure the output doesn't end up in the subdirectory
|
||||
export CARGO_TARGET_DIR="$(pwd)/target"
|
||||
|
|
|
@ -166,11 +166,11 @@ makeShellWrapper() {
|
|||
elif [[ "$p" == "--add-flags" ]]; then
|
||||
flags="${params[$((n + 1))]}"
|
||||
n=$((n + 1))
|
||||
flagsBefore="$flagsBefore $flags"
|
||||
flagsBefore="${flagsBefore-} $flags"
|
||||
elif [[ "$p" == "--append-flags" ]]; then
|
||||
flags="${params[$((n + 1))]}"
|
||||
n=$((n + 1))
|
||||
flagsAfter="$flagsAfter $flags"
|
||||
flagsAfter="${flagsAfter-} $flags"
|
||||
elif [[ "$p" == "--argv0" ]]; then
|
||||
argv0="${params[$((n + 1))]}"
|
||||
n=$((n + 1))
|
||||
|
@ -183,7 +183,7 @@ makeShellWrapper() {
|
|||
done
|
||||
|
||||
echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \
|
||||
"$flagsBefore" '"$@"' "$flagsAfter" >> "$wrapper"
|
||||
"${flagsBefore-}" '"$@"' "${flagsAfter-}" >> "$wrapper"
|
||||
|
||||
chmod +x "$wrapper"
|
||||
}
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "327b3bfd1c14e15bf6c7fb4d0c6c3f9406c1282a16e24b1424215d764f687cb6",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz",
|
||||
"version": "11.0.16"
|
||||
"build": "7",
|
||||
"sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -18,10 +18,10 @@
|
|||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "4cdebb54ead80e6dff562ad51db850244b1b419ba72062782156df59854a6b22",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz",
|
||||
"version": "11.0.16"
|
||||
"build": "7",
|
||||
"sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -30,36 +30,36 @@
|
|||
"jdk": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "101",
|
||||
"sha256": "79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"armv6l": {
|
||||
"build": "101",
|
||||
"sha256": "f4d53a1753cdde830d7872c6a1279df441f3f9aeb5d5037a568b3a392ebce9c2",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"armv7l": {
|
||||
"build": "101",
|
||||
"sha256": "f4d53a1753cdde830d7872c6a1279df441f3f9aeb5d5037a568b3a392ebce9c2",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"packageType": "jdk",
|
||||
"powerpc64le": {
|
||||
"build": "101",
|
||||
"sha256": "9750e11721282a9afd18a07743f19c699b2b71ce20d02f3f0a906088b9ae6d9a",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
|
@ -88,36 +88,36 @@
|
|||
"jre": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "101",
|
||||
"sha256": "6426ce7dfdacaa798ec7779e0bec30ec8510df491fb2c965e8e6bf2f88af27e9",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"armv6l": {
|
||||
"build": "101",
|
||||
"sha256": "964a5d3c1f63209e5ad908a302220b3ba2e81a6574b7b7a5020f736e1496835f",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"armv7l": {
|
||||
"build": "101",
|
||||
"sha256": "964a5d3c1f63209e5ad908a302220b3ba2e81a6574b7b7a5020f736e1496835f",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"packageType": "jre",
|
||||
"powerpc64le": {
|
||||
"build": "101",
|
||||
"sha256": "8c9efc13680f43b742a54ecb3be614efd62749d401e780143fef3ac5403a6284",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "b5a6960bc6bb0b1a967e307f908ea9b06ad7adbbd9df0b8954ab51374faa8a98",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_linux_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
|
@ -147,13 +147,19 @@
|
|||
"mac": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "7",
|
||||
"sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "8c69808f5d9d209b195575e979de0e43cdf5d0f1acec1853a569601fe2c1f743",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
|
@ -169,13 +175,19 @@
|
|||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "7",
|
||||
"sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
},
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "1b2f792ad05af9dba876db962c189527e645b48f50ceb842b4e39169de553303",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_mac_hotspot_11.0.14.1_1.tar.gz",
|
||||
"version": "11.0.14"
|
||||
"build": "7",
|
||||
"sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89",
|
||||
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz",
|
||||
"version": "11.0.19"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
|
@ -852,10 +864,10 @@
|
|||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "1a1706304c26da0d8d2e05127c5aa7dba00e5401b2c0228c8ae894d2812beee0",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz",
|
||||
"version": "17.0.4"
|
||||
"build": "7",
|
||||
"sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -864,10 +876,10 @@
|
|||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "101",
|
||||
"sha256": "cd0300449a26b3141e313f6ab55b20edfa4b289dc44a7a3989fa2c29152bf7fb",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz",
|
||||
"version": "17.0.4"
|
||||
"build": "7",
|
||||
"sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -876,60 +888,72 @@
|
|||
"jdk": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "8",
|
||||
"sha256": "302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"armv6l": {
|
||||
"build": "8",
|
||||
"sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"armv7l": {
|
||||
"build": "8",
|
||||
"sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"packageType": "jdk",
|
||||
"powerpc64le": {
|
||||
"build": "7",
|
||||
"sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "8",
|
||||
"sha256": "288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "8",
|
||||
"sha256": "6ef7a28d0d844fe347ab18f65a91db744547321fe8a101d883bd80722183ab64",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"armv6l": {
|
||||
"build": "8",
|
||||
"sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"armv7l": {
|
||||
"build": "8",
|
||||
"sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"packageType": "jre",
|
||||
"powerpc64le": {
|
||||
"build": "7",
|
||||
"sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "8",
|
||||
"sha256": "292ed702d95f5690e52e171afe9f3050b9d2fb803456b155c831735fad0f17c0",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -938,36 +962,36 @@
|
|||
"jdk": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "8",
|
||||
"sha256": "157518e999d712b541b883c6c167f8faabbef1d590da9fe7233541b4adb21ea4",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "8",
|
||||
"sha256": "3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "8",
|
||||
"sha256": "f2f23d6629060eb1692c714bfda27dd5f100cc560578c7cdd9df920a8ac1d453",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
},
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "8",
|
||||
"sha256": "4e2e5e9c079ccc48b056959b2808a96398ebbc92d6b13ee5beb3159b89469aa8",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
"build": "7",
|
||||
"sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz",
|
||||
"version": "17.0.7"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -980,10 +1004,10 @@
|
|||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "e5dcb8f947b687597f92fa80c008a2a17ce86f739dd6dce7ca741921621acb21",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u345b01.tar.gz",
|
||||
"version": "8.0.345"
|
||||
"build": "7",
|
||||
"sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -992,10 +1016,10 @@
|
|||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "1",
|
||||
"sha256": "6352a4d55373266af90b2f2ec13f4397ada58f5cdc57944ea046c9c538341fd3",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u345b01.tar.gz",
|
||||
"version": "8.0.345"
|
||||
"build": "7",
|
||||
"sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1004,36 +1028,36 @@
|
|||
"jdk": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "6",
|
||||
"sha256": "42ed3ff5a859f9015a1362fb7e650026b913d688eab471714f795651120be173",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
},
|
||||
"armv6l": {
|
||||
"build": "6",
|
||||
"sha256": "0666c466b8aefcc66ab25aea9c0605f5c6eda3b174b1b817a4e4e74da0de0365",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
},
|
||||
"armv7l": {
|
||||
"build": "6",
|
||||
"sha256": "0666c466b8aefcc66ab25aea9c0605f5c6eda3b174b1b817a4e4e74da0de0365",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
},
|
||||
"packageType": "jdk",
|
||||
"powerpc64le": {
|
||||
"build": "6",
|
||||
"sha256": "c7cc9c5b237e9e1f1e3296593aba427375823592e4604fadf89a8c234c2574e1",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
},
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "6",
|
||||
"sha256": "3d62362a78c9412766471b05253507a4cfc212daea5cdf122860173ce902400e",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
|
@ -1062,36 +1086,36 @@
|
|||
"jre": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "6",
|
||||
"sha256": "22496d5e677aaccc5a85e90584d0a012c51a08898f0e09e259eabe67ed81da2b",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
},
|
||||
"armv6l": {
|
||||
"build": "6",
|
||||
"sha256": "48181f17b85a13c0e2f260c8f4b39483e61664cf07ea00e6210a666fb5210492",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_arm_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
},
|
||||
"armv7l": {
|
||||
"build": "6",
|
||||
"sha256": "48181f17b85a13c0e2f260c8f4b39483e61664cf07ea00e6210a666fb5210492",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_arm_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
},
|
||||
"packageType": "jre",
|
||||
"powerpc64le": {
|
||||
"build": "6",
|
||||
"sha256": "f15b536a97c27d114c0b59c86de07ca80a271d3979ed0aa056318ea329e31e5d",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
},
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "6",
|
||||
"sha256": "9c4607cee01919a21c57a36e8c009a7aca7aefd63010c64d7a3023fe8590ebe1",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
|
@ -1124,10 +1148,10 @@
|
|||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "6",
|
||||
"sha256": "96a3124bf0f5ca777954239893cc89ea34c4bc9a9b7c1559aa2c69baa0ee84e3",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
|
@ -1146,10 +1170,10 @@
|
|||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "6",
|
||||
"sha256": "42d4ada88e39b0f222ffdcf3c833f442af22852687992997eca82c573e65b86f",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_mac_hotspot_8u322b06.tar.gz",
|
||||
"version": "8.0.322"
|
||||
"build": "7",
|
||||
"sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321",
|
||||
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz",
|
||||
"version": "8.0.372"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "binaryen";
|
||||
version = "112";
|
||||
version = "113";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WebAssembly";
|
||||
repo = "binaryen";
|
||||
rev = "version_${version}";
|
||||
hash = "sha256-xVumVmiLMHJp3SItE8eL8OBPeq58HtOOiK9LL8SP4CQ=";
|
||||
hash = "sha256-w93LIlLRn3PmVNytjFg6KI4CQ9zQUUM9kySiWAtPbOA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 67f54fde2b1683aae3800f7a86a4e507c1125be8 Mon Sep 17 00:00:00 2001
|
||||
From 4bbbb640934aa653bcfec0335798b77a8935b815 Mon Sep 17 00:00:00 2001
|
||||
From: Yureka <yuka@yuka.dev>
|
||||
Date: Sat, 7 Aug 2021 09:16:46 +0200
|
||||
Subject: [PATCH] emulate clang 'sysroot + /include' logic
|
||||
|
@ -20,23 +20,23 @@ but it doesn't appear to work
|
|||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/emcc.py b/emcc.py
|
||||
index 999314afc..0e23c066c 100755
|
||||
index ba8d1b556..7d89644c5 100755
|
||||
--- a/emcc.py
|
||||
+++ b/emcc.py
|
||||
@@ -759,7 +759,12 @@ def emsdk_ldflags(user_args):
|
||||
@@ -883,7 +883,12 @@ def parse_s_args(args):
|
||||
|
||||
|
||||
def emsdk_cflags(user_args):
|
||||
- cflags = ['--sysroot=' + shared.Cache.get_sysroot(absolute=True)]
|
||||
- cflags = ['--sysroot=' + cache.get_sysroot(absolute=True)]
|
||||
+ cflags = [
|
||||
+ '--sysroot=' + shared.Cache.get_sysroot(absolute=True),
|
||||
+ '--sysroot=' + cache.get_sysroot(absolute=True),
|
||||
+ '-resource-dir=@resourceDir@',
|
||||
+ '-idirafter' + shared.Cache.get_sysroot(absolute=True) + os.path.join('/include'),
|
||||
+ '-idirafter' + cache.get_sysroot(absolute=True) + os.path.join('/include'),
|
||||
+ '-iwithsysroot' + os.path.join('/include','c++','v1')
|
||||
+ ]
|
||||
|
||||
def array_contains_any_of(hay, needles):
|
||||
for n in needles:
|
||||
--
|
||||
2.32.0
|
||||
2.40.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler
|
||||
, jre, binaryen
|
||||
, llvmPackages
|
||||
, symlinkJoin, makeWrapper, substituteAll, fetchpatch
|
||||
, symlinkJoin, makeWrapper, substituteAll
|
||||
, buildNpmPackage
|
||||
, emscripten
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emscripten";
|
||||
version = "3.1.24";
|
||||
version = "3.1.41";
|
||||
|
||||
llvmEnv = symlinkJoin {
|
||||
name = "emscripten-llvm-${version}";
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
name = "emscripten-node-modules-${version}";
|
||||
inherit pname version src;
|
||||
|
||||
npmDepsHash = "sha256-ejuHR2BpAUStWjuvQuGE6ko4byF4GBl6FJBshxlknQk=";
|
||||
npmDepsHash = "sha256-QlKm6UvPUa7+VJ9ZvXdxYZzK+U96Ju/oAHPhZ/hyv/I=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "emscripten-core";
|
||||
repo = "emscripten";
|
||||
sha256 = "sha256-1jW6ThxK6dThOO90l4Mc5yehVF3tI4HWipBWZAOztrk=";
|
||||
sha256 = "sha256-yQZrAQfNZZd65a14AFObrLrBzePBDnK0J87oTEB1Dcw=";
|
||||
rev = version;
|
||||
};
|
||||
|
||||
|
@ -42,17 +42,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
(substituteAll {
|
||||
src = ./0001-emulate-clang-sysroot-include-logic.patch;
|
||||
resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/";
|
||||
})
|
||||
# https://github.com/emscripten-core/emscripten/pull/18219
|
||||
(fetchpatch {
|
||||
url = "https://github.com/emscripten-core/emscripten/commit/afbc14950f021513c59cbeaced8807ef8253530a.patch";
|
||||
sha256 = "sha256-+gJNTQJng9rWcGN3GAcMBB0YopKPnRp/r8CN9RSTClU=";
|
||||
})
|
||||
# https://github.com/emscripten-core/emscripten/pull/18220
|
||||
(fetchpatch {
|
||||
url = "https://github.com/emscripten-core/emscripten/commit/852982318f9fb692ba1dd1173f62e1eb21ae61ca.patch";
|
||||
sha256 = "sha256-hmIOtpRx3PD3sDAahUcreSydydqcdSqArYvyLGgUgd8=";
|
||||
resourceDir = "${llvmEnv}/lib/clang/16/";
|
||||
})
|
||||
];
|
||||
|
||||
|
@ -68,9 +58,6 @@ stdenv.mkDerivation rec {
|
|||
sed -i '/^def/!s/root_is_writable()/True/' tools/config.py
|
||||
sed -i "/^def check_sanity/a\\ return" tools/shared.py
|
||||
|
||||
# required for wasm2c
|
||||
ln -s ${nodeModules} node_modules
|
||||
|
||||
echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten
|
||||
echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten
|
||||
echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten
|
||||
|
@ -108,17 +95,17 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# precompile libc (etc.) in all variants:
|
||||
pushd $TMPDIR
|
||||
echo 'int __main_argc_argv() { return 42; }' >test.c
|
||||
echo 'int __main_argc_argv( int a, int b ) { return 42; }' >test.c
|
||||
for LTO in -flto ""; do
|
||||
# wasm2c doesn't work with PIC
|
||||
$out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c
|
||||
|
||||
for BIND in "" "--bind"; do
|
||||
for MT in "" "-s USE_PTHREADS"; do
|
||||
for RELOCATABLE in "" "-s RELOCATABLE"; do
|
||||
$out/bin/emcc $RELOCATABLE $BIND $MT $LTO test.c
|
||||
done
|
||||
done
|
||||
# starting with emscripten 3.1.32+,
|
||||
# if pthreads and relocatable are both used,
|
||||
# _emscripten_thread_exit_joinable must be exported
|
||||
# (see https://github.com/emscripten-core/emscripten/pull/18376)
|
||||
# TODO: get library cache to build with both enabled and function exported
|
||||
$out/bin/emcc $LTO $BIND test.c
|
||||
$out/bin/emcc $LTO $BIND -s RELOCATABLE test.c
|
||||
$out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c
|
||||
done
|
||||
done
|
||||
popd
|
||||
|
|
|
@ -55,7 +55,6 @@ let majorVersion = "10";
|
|||
# Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
|
||||
../fix-bug-80431.patch
|
||||
../11/fix-struct-redefinition-on-glibc-2.36.patch
|
||||
../install-info-files-serially.patch
|
||||
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
|
||||
++ optional noSysDirs ../no-sys-dirs.patch
|
||||
++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch
|
||||
|
@ -238,6 +237,9 @@ stdenv.mkDerivation ({
|
|||
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
inherit (callFile ../common/strip-attributes.nix { })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
|
|
|
@ -58,7 +58,6 @@ let majorVersion = "11";
|
|||
patches = [
|
||||
# Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
|
||||
../fix-bug-80431.patch
|
||||
../install-info-files-serially.patch
|
||||
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
|
||||
++ optional noSysDirs ../no-sys-dirs.patch
|
||||
++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch
|
||||
|
@ -253,6 +252,9 @@ lib.pipe (stdenv.mkDerivation ({
|
|||
+ lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap";
|
||||
in lib.optional (target != "") target;
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
inherit (callFile ../common/strip-attributes.nix { })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
|
|
|
@ -68,7 +68,6 @@ let majorVersion = "12";
|
|||
../gnat-cflags-11.patch
|
||||
../gcc-12-gfortran-driving.patch
|
||||
../ppc-musl.patch
|
||||
../install-info-files-serially.patch
|
||||
|
||||
# backport ICE fix on ccache code
|
||||
./lambda-ICE-PR109241.patch
|
||||
|
@ -300,6 +299,9 @@ lib.pipe (stdenv.mkDerivation ({
|
|||
lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap";
|
||||
in lib.optional (target != "") target;
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
inherit (callFile ../common/strip-attributes.nix { })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
|
|
|
@ -298,6 +298,9 @@ lib.pipe (stdenv.mkDerivation ({
|
|||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
|
||||
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
|
||||
|
||||
|
|
|
@ -74,7 +74,6 @@ let majorVersion = "4";
|
|||
../struct-ucontext-4.8.patch
|
||||
../sigsegv-not-declared.patch
|
||||
../res_state-not-declared.patch
|
||||
../install-info-files-serially.patch
|
||||
# gcc-11 compatibility
|
||||
(fetchpatch {
|
||||
name = "gcc4-char-reload.patch";
|
||||
|
@ -257,6 +256,9 @@ stdenv.mkDerivation ({
|
|||
stripDebugListTarget
|
||||
preFixup;
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
|
||||
|
||||
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
|
||||
|
|
|
@ -63,7 +63,6 @@ let majorVersion = "4";
|
|||
[ ../9/fix-struct-redefinition-on-glibc-2.36.patch ../use-source-date-epoch.patch
|
||||
../parallel-bconfig.patch ./parallel-strsignal.patch
|
||||
./libsanitizer.patch
|
||||
../install-info-files-serially.patch
|
||||
(fetchpatch {
|
||||
name = "avoid-ustat-glibc-2.28.patch";
|
||||
url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96";
|
||||
|
@ -273,6 +272,9 @@ stdenv.mkDerivation ({
|
|||
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
inherit (callFile ../common/strip-attributes.nix { })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
|
|
|
@ -68,7 +68,6 @@ let majorVersion = "6";
|
|||
|
||||
# Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
|
||||
../fix-bug-80431.patch
|
||||
../install-info-files-serially.patch
|
||||
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
|
||||
++ optional noSysDirs ../no-sys-dirs.patch
|
||||
++ optional langAda ../gnat-cflags.patch
|
||||
|
@ -291,6 +290,9 @@ stdenv.mkDerivation ({
|
|||
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
inherit (callFile ../common/strip-attributes.nix { })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
|
|
|
@ -61,7 +61,6 @@ let majorVersion = "7";
|
|||
../fix-bug-80431.patch
|
||||
|
||||
../9/fix-struct-redefinition-on-glibc-2.36.patch
|
||||
../install-info-files-serially.patch
|
||||
]
|
||||
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
|
||||
++ optionals targetPlatform.isNetBSD [
|
||||
|
@ -244,6 +243,9 @@ stdenv.mkDerivation ({
|
|||
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
inherit (callFile ../common/strip-attributes.nix { })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
|
|
|
@ -50,7 +50,6 @@ let majorVersion = "8";
|
|||
# Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
|
||||
../fix-bug-80431.patch
|
||||
../9/fix-struct-redefinition-on-glibc-2.36.patch
|
||||
../install-info-files-serially.patch
|
||||
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
|
||||
++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch
|
||||
++ optional noSysDirs ../no-sys-dirs.patch
|
||||
|
@ -221,6 +220,9 @@ stdenv.mkDerivation ({
|
|||
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
inherit (callFile ../common/strip-attributes.nix { })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
|
|
|
@ -59,7 +59,6 @@ let majorVersion = "9";
|
|||
./fix-struct-redefinition-on-glibc-2.36.patch
|
||||
# Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
|
||||
../fix-bug-80431.patch
|
||||
../install-info-files-serially.patch
|
||||
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
|
||||
++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch
|
||||
++ optional noSysDirs ../no-sys-dirs.patch
|
||||
|
@ -235,6 +234,9 @@ stdenv.mkDerivation ({
|
|||
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
|
||||
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
|
||||
|
||||
# https://gcc.gnu.org/PR109898
|
||||
enableParallelInstalling = false;
|
||||
|
||||
inherit (callFile ../common/strip-attributes.nix { })
|
||||
stripDebugList
|
||||
stripDebugListTarget
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
diff -Naur gcc-12.2.0/gcc/Makefile.in gcc-12.2.0-new/gcc/Makefile.in
|
||||
--- gcc-12.2.0/gcc/Makefile.in 2022-08-19 10:09:52.280658631 +0200
|
||||
+++ gcc-12.2.0-new/gcc/Makefile.in 2023-05-04 14:35:44.401420184 +0200
|
||||
@@ -3781,6 +3781,11 @@
|
||||
fi; \
|
||||
fi
|
||||
|
||||
+# We don't care about the order in which the info files are built, but
|
||||
+# install-info doesn't support multiple parallel invocations writing to
|
||||
+# the same `dir-file`, so we have to disable parallelism for that reason:
|
||||
+.NOTPARALLEL: install-info
|
||||
+
|
||||
# Install the info files.
|
||||
# $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
|
||||
# to do the install.
|
|
@ -29,8 +29,8 @@
|
|||
|
||||
openjdk17.overrideAttrs (oldAttrs: rec {
|
||||
pname = "jetbrains-jdk-jcef";
|
||||
javaVersion = "17.0.6";
|
||||
build = "829.9";
|
||||
javaVersion = "17.0.7";
|
||||
build = "829.16";
|
||||
# To get the new tag:
|
||||
# git clone https://github.com/jetbrains/jetbrainsruntime
|
||||
# cd jetbrainsruntime
|
||||
|
@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec {
|
|||
owner = "JetBrains";
|
||||
repo = "JetBrainsRuntime";
|
||||
rev = "jb${version}";
|
||||
hash = "sha256-E0pk2dz+iLKuQqMvczWNwy9ifLO8YGKXlKt3MQgiRXo=";
|
||||
hash = "sha256-b3wW52knkYUeG8h4naTQLGUedhAMiPnUsn3zFAiJCwM=";
|
||||
};
|
||||
|
||||
BOOT_JDK = openjdk17-bootstrap.home;
|
||||
|
|
|
@ -125,6 +125,14 @@ in stdenv.mkDerivation (rec {
|
|||
relative = "llvm";
|
||||
hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA=";
|
||||
})
|
||||
|
||||
# Backport gcc-13 fixes with missing includes.
|
||||
(fetchpatch {
|
||||
name = "signals-gcc-13.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch";
|
||||
hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs=";
|
||||
stripLen = 1;
|
||||
})
|
||||
] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch;
|
||||
|
||||
postPatch = optionalString stdenv.isDarwin ''
|
||||
|
|
|
@ -123,6 +123,20 @@ in stdenv.mkDerivation (rec {
|
|||
relative = "llvm";
|
||||
hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA=";
|
||||
})
|
||||
|
||||
# Backport gcc-13 fixes with missing includes.
|
||||
(fetchpatch {
|
||||
name = "signals-gcc-13.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch";
|
||||
hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs=";
|
||||
stripLen = 1;
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "base64-gcc-13.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch";
|
||||
hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U=";
|
||||
stripLen = 1;
|
||||
})
|
||||
] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch;
|
||||
|
||||
postPatch = optionalString stdenv.isDarwin ''
|
||||
|
|
|
@ -107,6 +107,20 @@ in stdenv.mkDerivation (rec {
|
|||
relative = "llvm";
|
||||
hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA=";
|
||||
})
|
||||
|
||||
# Backport gcc-13 fixes with missing includes.
|
||||
(fetchpatch {
|
||||
name = "signals-gcc-13.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch";
|
||||
hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs=";
|
||||
stripLen = 1;
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "base64-gcc-13.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch";
|
||||
hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U=";
|
||||
stripLen = 1;
|
||||
})
|
||||
] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch;
|
||||
|
||||
postPatch = optionalString stdenv.isDarwin ''
|
||||
|
|
|
@ -98,6 +98,20 @@ in stdenv.mkDerivation (rec {
|
|||
relative = "llvm";
|
||||
hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA=";
|
||||
})
|
||||
|
||||
# Backport gcc-13 fixes with missing includes.
|
||||
(fetchpatch {
|
||||
name = "signals-gcc-13.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch";
|
||||
hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs=";
|
||||
stripLen = 1;
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "base64-gcc-13.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch";
|
||||
hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U=";
|
||||
stripLen = 1;
|
||||
})
|
||||
] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch;
|
||||
|
||||
postPatch = optionalString stdenv.isDarwin ''
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
# rev-version = /* human readable version; i.e. "unstable-2022-26-07" */;
|
||||
# sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */;
|
||||
# }
|
||||
, officialRelease ? { version = "16.0.1"; sha256 = "sha256-Vr978ZY0i0NkdE/uuwcTccshfAT61KIN6KNq0TdwBNE="; }
|
||||
, officialRelease ? { version = "16.0.6"; sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; }
|
||||
# i.e.:
|
||||
# {
|
||||
# version = /* i.e. "15.0.0" */;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 45399dc0537e..5d946e9e6583 100644
|
||||
index 7e25e0407db2..72f031a82b75 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -942,7 +942,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
|
||||
@@ -995,7 +995,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
|
||||
add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
|
||||
${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
|
||||
install(TARGETS tf_xla_runtime EXPORT LLVMExports
|
||||
|
@ -12,10 +12,10 @@ index 45399dc0537e..5d946e9e6583 100644
|
|||
# Once we add more modules, we should handle this more automatically.
|
||||
if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)
|
||||
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
|
||||
index 057431208322..56f0dcb258da 100644
|
||||
index 93e6d67551de..8d367457af5a 100644
|
||||
--- a/cmake/modules/AddLLVM.cmake
|
||||
+++ b/cmake/modules/AddLLVM.cmake
|
||||
@@ -844,8 +844,8 @@ macro(add_llvm_library name)
|
||||
@@ -874,8 +874,8 @@ macro(add_llvm_library name)
|
||||
get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella})
|
||||
install(TARGETS ${name}
|
||||
${export_to_llvmexports}
|
||||
|
@ -26,7 +26,7 @@ index 057431208322..56f0dcb258da 100644
|
|||
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})
|
||||
|
||||
if (NOT LLVM_ENABLE_IDE)
|
||||
@@ -2007,7 +2007,7 @@ function(llvm_install_library_symlink name dest type)
|
||||
@@ -2043,7 +2043,7 @@ function(llvm_install_library_symlink name dest type)
|
||||
set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX})
|
||||
set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX})
|
||||
|
||||
|
@ -35,7 +35,7 @@ index 057431208322..56f0dcb258da 100644
|
|||
if(WIN32 AND "${type}" STREQUAL "SHARED")
|
||||
set(output_dir "${CMAKE_INSTALL_BINDIR}")
|
||||
endif()
|
||||
@@ -2271,15 +2271,15 @@ function(llvm_setup_rpath name)
|
||||
@@ -2312,16 +2312,37 @@ function(llvm_setup_rpath name)
|
||||
|
||||
if (APPLE)
|
||||
set(_install_name_dir INSTALL_NAME_DIR "@rpath")
|
||||
|
@ -49,7 +49,30 @@ index 057431208322..56f0dcb258da 100644
|
|||
- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
|
||||
+ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
|
||||
elseif(UNIX)
|
||||
- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
|
||||
- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
|
||||
- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")
|
||||
+ # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back
|
||||
+ # to `_install_rpath` here.
|
||||
+ #
|
||||
+ # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e.
|
||||
+ # clang); instead LLVM is its own package and thus lands at its own nix
|
||||
+ # store path. This makes it so that the default relative rpath (`../lib/`)
|
||||
+ # does not point at the LLVM shared objects.
|
||||
+ #
|
||||
+ # More discussion here:
|
||||
+ # - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329
|
||||
+ # - https://reviews.llvm.org/D146918 (16.0.5+)
|
||||
+ #
|
||||
+ # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is
|
||||
+ # no potential that this will result in us pulling in the "wrong" LLVM.
|
||||
+ # Adding this to the build rpath means we aren't forced to use
|
||||
+ # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build
|
||||
+ # dir, pre-install, will have the right rpath for LLVM).
|
||||
+ #
|
||||
+ # As noted in the differential above, an alternative solution is to have
|
||||
+ # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set
|
||||
+ # `CMAKE_INSTALL_RPATH`.
|
||||
+ set(_build_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
|
||||
+ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
|
||||
set_property(TARGET ${name} APPEND_STRING PROPERTY
|
||||
|
@ -71,10 +94,10 @@ index 891c9e6d618c..8d963f3b0069 100644
|
|||
list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")
|
||||
|
||||
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
|
||||
index d4b0ab959148..26ed981fd09f 100644
|
||||
index d99af79aa38e..21e794224b99 100644
|
||||
--- a/cmake/modules/CMakeLists.txt
|
||||
+++ b/cmake/modules/CMakeLists.txt
|
||||
@@ -128,7 +128,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS
|
||||
@@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS
|
||||
)
|
||||
list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)
|
||||
|
||||
|
@ -84,7 +107,7 @@ index d4b0ab959148..26ed981fd09f 100644
|
|||
"${LLVM_CONFIG_LIBRARY_DIR}"
|
||||
# FIXME: Should there be other entries here?
|
||||
diff --git a/docs/CMake.rst b/docs/CMake.rst
|
||||
index 879b7b231d4c..9c31d14e8950 100644
|
||||
index 7926de258ec8..5ae01adc3905 100644
|
||||
--- a/docs/CMake.rst
|
||||
+++ b/docs/CMake.rst
|
||||
@@ -250,7 +250,7 @@ description is in `LLVM-related variables`_ below.
|
||||
|
@ -120,10 +143,10 @@ index 370005cd8d7d..7e790bc52111 100644
|
|||
#define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"
|
||||
#define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
|
||||
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
|
||||
index 2c6c55f89d38..f6d2068a0827 100644
|
||||
index b1d795a0a349..de6cb1514f05 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -369,7 +369,11 @@ int main(int argc, char **argv) {
|
||||
@@ -366,7 +366,11 @@ int main(int argc, char **argv) {
|
||||
sys::fs::make_absolute(ActivePrefix, Path);
|
||||
ActiveBinDir = std::string(Path.str());
|
||||
}
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
let
|
||||
major = "11";
|
||||
minor = "0";
|
||||
update = "18";
|
||||
build = "10";
|
||||
update = "19";
|
||||
build = "7";
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; };
|
||||
|
@ -25,7 +25,7 @@ let
|
|||
owner = "openjdk";
|
||||
repo = "jdk${major}u";
|
||||
rev = "jdk-${version}";
|
||||
sha256 = "sha256-QGOpMIrWwOtIcUY/CLbTRDvcVTG2xioZu46v+n+IIQ4=";
|
||||
sha256 = "sha256-mp8toB1dWcwOtMqNFd7UwRg8pLJckovqD/LD5p9zUoA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
let
|
||||
version = {
|
||||
feature = "17";
|
||||
interim = ".0.6";
|
||||
build = "10";
|
||||
interim = ".0.7";
|
||||
build = "7";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
|
@ -26,7 +26,7 @@ let
|
|||
owner = "openjdk";
|
||||
repo = "jdk${version.feature}u";
|
||||
rev = "jdk-${version.feature}${version.interim}+${version.build}";
|
||||
sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc=";
|
||||
sha256 = "sha256-S6QOB4Tbi+K1yjvvywTfvwFI2eX8AiqIx5c3zfxcskc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rubygems";
|
||||
version = "3.4.13";
|
||||
version = "3.4.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
|
||||
sha256 = "sha256-s/7KCbf07zezuASA7E03t83UDY6W/fFw9bljOprXWls=";
|
||||
hash = "sha256-l5sYQoSKOb5NkO/J05nClKygtuZ9RfgAsmyTzCLQOYM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -55,11 +55,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SDL2";
|
||||
version = "2.26.5";
|
||||
version = "2.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-rY/qPaG+ZMg8RbHTY6a0uo/WD1veOyPsc4VXCexeq/c=";
|
||||
sha256 = "sha256-0hWuRUHmnWKJU3EUls17DouNXI2BHVsPmP3H/RQimYo=";
|
||||
};
|
||||
dontDisableStatic = if withStatic then 1 else 0;
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libopenmpt";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
|
||||
hash = "sha256-vxddJkSLsTP3RxTzqIWecAC5NSL7NXdVnf/ANxYZEPk=";
|
||||
hash = "sha256-UJFD5aTzsT3Zjq4om/7BtWTt3XG7x8p4ZLgoNeMTMOE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -161,14 +161,22 @@ stdenv.mkDerivation ({
|
|||
++ lib.optional withGd "--with-gd"
|
||||
++ lib.optional (!withLibcrypt) "--disable-crypt";
|
||||
|
||||
makeFlags = [
|
||||
makeFlags = (args.makeFlags or []) ++ [
|
||||
"OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
|
||||
];
|
||||
|
||||
postInstall = (args.postInstall or "") + ''
|
||||
moveToOutput bin/getent $getent
|
||||
'';
|
||||
|
||||
installFlags = [ "sysconfdir=$(out)/etc" ];
|
||||
|
||||
# out as the first output is an exception exclusive to glibc
|
||||
outputs = [ "out" "bin" "dev" "static" ];
|
||||
|
||||
# getent is its own output, not kept in bin, since many things
|
||||
# depend on getent but not on the locale generation tools in the bin
|
||||
# output. This saves a couple of megabytes of closure size in many cases.
|
||||
outputs = [ "out" "bin" "dev" "static" "getent" ];
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
@ -188,7 +196,7 @@ stdenv.mkDerivation ({
|
|||
passthru = { inherit version; minorRelease = version; };
|
||||
}
|
||||
|
||||
// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) //
|
||||
// (removeAttrs args [ "withLinuxHeaders" "withGd" "postInstall" "makeFlags" ]) //
|
||||
|
||||
{
|
||||
src = fetchurl {
|
||||
|
|
|
@ -94,7 +94,7 @@ in
|
|||
"user-defined-trusted-dirs=${stdenv.cc.cc.libgcc}/lib"
|
||||
];
|
||||
|
||||
postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then ''
|
||||
postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then ''
|
||||
echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED
|
||||
make -j''${NIX_BUILD_CORES:-1} localedata/install-locales
|
||||
'' else lib.optionalString stdenv.buildPlatform.isLinux ''
|
||||
|
|
|
@ -9,7 +9,7 @@ callPackage ./common.nix {} {
|
|||
|
||||
extraNativeBuildInputs = [ texinfo perl ];
|
||||
|
||||
buildPhase = "make info";
|
||||
makeFlags = [ "info" ];
|
||||
|
||||
# I don't know why the info is not generated in 'build'
|
||||
# Somehow building the info still does not work, because the final
|
||||
|
|
|
@ -10,8 +10,9 @@
|
|||
, allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ]
|
||||
}:
|
||||
|
||||
callPackage ./common.nix { inherit stdenv; } {
|
||||
(callPackage ./common.nix { inherit stdenv; } {
|
||||
pname = "glibc-locales";
|
||||
}).overrideAttrs(finalAttrs: previousAttrs: {
|
||||
|
||||
builder = ./locales-builder.sh;
|
||||
|
||||
|
@ -25,7 +26,7 @@ callPackage ./common.nix { inherit stdenv; } {
|
|||
else "--big-endian")
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
preBuild = (previousAttrs.preBuild or "") + ''
|
||||
# Awful hack: `localedef' doesn't allow the path to `locale-archive'
|
||||
# to be overriden, but you *can* specify a prefix, i.e. it will use
|
||||
# <prefix>/<path-to-glibc>/lib/locale/locale-archive. So we use
|
||||
|
@ -57,11 +58,15 @@ callPackage ./common.nix { inherit stdenv; } {
|
|||
fi
|
||||
|
||||
echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED
|
||||
'' + ''
|
||||
make localedata/install-locales \
|
||||
localedir=$out/lib/locale \
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = (previousAttrs.makeFlags or []) ++ [
|
||||
"localedata/install-locales"
|
||||
"localedir=${builtins.placeholder "out"}/lib/locale"
|
||||
];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p "$out/lib/locale" "$out/share/i18n"
|
||||
|
@ -75,4 +80,4 @@ callPackage ./common.nix { inherit stdenv; } {
|
|||
'';
|
||||
|
||||
meta.description = "Locale information for the GNU C Library";
|
||||
}
|
||||
})
|
||||
|
|
|
@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
|
|||
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Make.defaults \
|
||||
--replace "-Werror" ""
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
# No nicer place to find latest release.
|
||||
url = "https://git.code.sf.net/p/gnu-efi/code";
|
||||
|
|
|
@ -14,6 +14,8 @@
|
|||
, enableZbar ? false
|
||||
, faacSupport ? false
|
||||
, faac
|
||||
, opencvSupport ? false
|
||||
, opencv4
|
||||
, faad2
|
||||
, ldacbt
|
||||
, libass
|
||||
|
@ -54,7 +56,6 @@
|
|||
, libusb1
|
||||
, neon
|
||||
, openal
|
||||
, opencv4
|
||||
, openexr_3
|
||||
, openh264
|
||||
, libopenmpt
|
||||
|
@ -108,13 +109,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-bad";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-4XmP7i2GEn8GN0gcYH+YMpO/D9garXClx7RyBa82Idg=";
|
||||
hash = "sha256-6q9TIkVl6qvVBco5xtV2lxm0V5XPUyzhzrYOGy6+maw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -171,7 +172,6 @@ stdenv.mkDerivation rec {
|
|||
libusb1
|
||||
neon
|
||||
openal
|
||||
opencv4
|
||||
openexr_3
|
||||
openh264
|
||||
rtmpdump
|
||||
|
@ -192,6 +192,8 @@ stdenv.mkDerivation rec {
|
|||
libfreeaptx
|
||||
zxing-cpp
|
||||
usrsctp
|
||||
] ++ lib.optionals opencvSupport [
|
||||
opencv4
|
||||
] ++ lib.optionals enableZbar [
|
||||
zbar
|
||||
] ++ lib.optionals faacSupport [
|
||||
|
@ -292,6 +294,7 @@ stdenv.mkDerivation rec {
|
|||
"-Dgs=disabled" # depends on `google-cloud-cpp`
|
||||
"-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing
|
||||
"-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx`
|
||||
"-Dopencv=${if opencvSupport then "enabled" else "disabled"}" # Reduces rebuild size when `config.cudaSupport = true`
|
||||
"-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}"
|
||||
"-Dbluez=${if bluezSupport then "enabled" else "disabled"}"
|
||||
(lib.mesonEnable "doc" enableDocumentation)
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gst-plugins-base";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-HFliiaDUIHOAIz66jDapMsTRrOuhmTKTfZtXwkzvifM=";
|
||||
hash = "sha256-KSQk6C3qFwUoxCtFb2KolTK8q8BQjxkuNGcvuG9o5bg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gstreamer";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
|
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-n/6rlQU/n2mV6zs9oiXojyHBKc1g2gAtP3ldtw1tWXQ=";
|
||||
hash = "sha256-EcsEmLwWuT2LmdIvdfgpuNCr/YJUhAshIGGNtVMtxlU=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-devtools";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-RGrJxC1QLL/ZCBc3zBuFOzwfUNt3ynzNAa6hD2h1UME=";
|
||||
hash = "sha256-TFIFPOjB33L9gXIen1PeOxRu3PLeKPYHvnBbzkz5CdE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-editing-services";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-FaW85iUJseEl6FoJ7EHzIcD1SSZLUETACV/PstXAzqI=";
|
||||
hash = "sha256-RThGz6RxoMHIAUVRvUhPvPM08ORDBZIxevuyN3Xmm9I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -49,13 +49,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-good";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-r4EVSzou8/TS/ro5XyVpb+6m/RPsYsktPHqXNHBxAnM=";
|
||||
hash = "sha256-1xIMEUap1yPVPVv+gHTaJXWoHwWYQ4dSk385u3yDO2o=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-libav";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-LsXIBYCLQ3Gn4ysdoCAqHIprNrbOkFCAv1w0CX0SqSM=";
|
||||
hash = "sha256-mnUbx0Dedo55HDepXwqSTGpB0S/X839UzmpOg0vhItM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-rtsp-server";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-0Co536m9v5mj3S03jheUKzzkLf42+wwn4tCwFyL8Vh0=";
|
||||
hash = "sha256-RmZhLXqZxg3NbwvbobenTSVioFAbKj4FdvCRa/HYgRs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-ugly";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-PcmO1cIpM2izxObOVdib6DSgpi6b+I7xeSjPA7fVo2A=";
|
||||
hash = "sha256-/7Rh/abAbTFsS+VoJjLMiQFFTtcrEJix4CIbxV5nPNc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gstreamer-vaapi";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-onhnBi6LaTBfylt9PxPtfDGLcD59cnVslDlb0wXHsyw=";
|
||||
hash = "sha256-lnuONT2C0AgaaNxTY5sl2ftMqJv6HgYUA+DNfSNYW6Y=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
@ -1,45 +1,63 @@
|
|||
{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
|
||||
, gdk-pixbuf, gobject-introspection
|
||||
, xineramaSupport ? stdenv.isLinux
|
||||
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
|
||||
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
|
||||
, AppKit, Cocoa
|
||||
, fetchpatch, buildPackages
|
||||
{ config
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, atk
|
||||
, buildPackages
|
||||
, cairo
|
||||
, cups
|
||||
, gdk-pixbuf
|
||||
, gettext
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, libXcomposite
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, pango
|
||||
, perl
|
||||
, pkg-config
|
||||
, substituteAll
|
||||
, testers
|
||||
, AppKit
|
||||
, Cocoa
|
||||
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
|
||||
, cupsSupport ? config.gtk2.cups or stdenv.isLinux
|
||||
, xineramaSupport ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
gtkCleanImmodulesCache = substituteAll {
|
||||
src = ./hooks/clean-immodules-cache.sh;
|
||||
gtk_module_path = "gtk-2.0";
|
||||
gtk_binary_version = "2.10.0";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtk+";
|
||||
version = "2.24.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk+/2.24/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto=";
|
||||
url = "mirror://gnome/sources/gtk+/2.24/gtk+-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
setupHooks = [
|
||||
./hooks/drop-icon-theme-cache.sh
|
||||
gtkCleanImmodulesCache
|
||||
];
|
||||
|
||||
|
||||
nativeBuildInputs = finalAttrs.setupHooks ++ [
|
||||
perl pkg-config gettext gobject-introspection
|
||||
gettext
|
||||
gobject-introspection
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
@ -50,19 +68,31 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
./patches/2.0-darwin-x11.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with xorg;
|
||||
[ glib cairo pango gdk-pixbuf atk ]
|
||||
++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [
|
||||
libXrandr libXrender libXcomposite libXi libXcursor
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [ libXdamage ]
|
||||
++ lib.optional xineramaSupport libXinerama
|
||||
++ lib.optionals cupsSupport [ cups ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit Cocoa ];
|
||||
propagatedBuildInputs = [
|
||||
atk
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
pango
|
||||
] ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
libXrender
|
||||
] ++ lib.optional xineramaSupport libXinerama
|
||||
++ lib.optional cupsSupport cups
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
libXdamage
|
||||
AppKit
|
||||
Cocoa
|
||||
];
|
||||
|
||||
preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
|
||||
MACOSX_DEPLOYMENT_TARGET=10.16
|
||||
'' else null;
|
||||
preConfigure =
|
||||
lib.optionalString (stdenv.isDarwin
|
||||
&& lib.versionAtLeast
|
||||
stdenv.hostPlatform.darwinMinVersion "11")
|
||||
"MACOSX_DEPLOYMENT_TARGET=10.16";
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
|
@ -77,6 +107,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installFlags = [
|
||||
"sysconfdir=${placeholder "out"}/etc"
|
||||
];
|
||||
|
@ -98,11 +130,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://www.gtk.org/";
|
||||
description = "A multi-platform toolkit for creating graphical user interfaces";
|
||||
homepage = "https://www.gtk.org/";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ lovek323 raskin ];
|
||||
longDescription = ''
|
||||
GTK is a highly usable, feature rich toolkit for creating graphical user
|
||||
interfaces which boasts cross platform compatibility and an easy to use
|
||||
API. GTK it is written in C, but has bindings to many other popular
|
||||
programming languages such as C++, Python and C# among others. GTK is
|
||||
licensed under the GNU LGPL 2.1 allowing development of both free and
|
||||
proprietary software with GTK without any license fees or royalties.
|
||||
'';
|
||||
changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin ];
|
||||
platforms = lib.platforms.all;
|
||||
pkgConfigModules = [
|
||||
"gdk-2.0"
|
||||
"gtk+-2.0"
|
||||
|
@ -110,18 +152,5 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"gdk-x11-2.0"
|
||||
"gtk+-x11-2.0"
|
||||
];
|
||||
platforms = platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
GTK is a highly usable, feature rich toolkit for creating
|
||||
graphical user interfaces which boasts cross platform
|
||||
compatibility and an easy to use API. GTK it is written in C,
|
||||
but has bindings to many other popular programming languages
|
||||
such as C++, Python and C# among others. GTK is licensed
|
||||
under the GNU LGPL 2.1 allowing development of both free and
|
||||
proprietary software with GTK without any license fees or
|
||||
royalties.
|
||||
'';
|
||||
changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS";
|
||||
};
|
||||
})
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import ./base.nix {
|
||||
version = "73.1";
|
||||
sha256 = "sha256-pFdDHeFktKp+ygDtE00A37+Ip3xphqEK53dPwHa7jEU=";
|
||||
version = "73.2";
|
||||
sha256 = "sha256-gYqAcS7TyqzZtlIwXgGvx/oWfm8ulJltpEuQwqtgTOE=";
|
||||
}
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imath";
|
||||
version = "3.1.7";
|
||||
version = "3.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "imath";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8TkrRqQYnp9Ho8jT22EQCEBIjlRWYlOAZSNOnJ5zCM0=";
|
||||
sha256 = "sha256-NcGiYz7jbxLyVd80lOIyN3zXcC4mHh+dcFEY4Kqw9BY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = [
|
||||
./libclc-gnu-install-dirs.patch
|
||||
];
|
||||
|
||||
# cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
|
@ -35,9 +39,6 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake ninja python3 ];
|
||||
buildInputs = [ llvm_14 ];
|
||||
strictDeps = true;
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dt $dev/bin prepare_builtins
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
--- a/libclc.pc.in
|
||||
+++ b/libclc.pc.in
|
||||
@@ -1,5 +1,5 @@
|
||||
-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
-libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc
|
||||
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||
+libexecdir=@CMAKE_INSTALL_FULL_DATADIR@/clc
|
||||
|
||||
Name: libclc
|
||||
Description: Library requirements of the OpenCL C programming language
|
|
@ -0,0 +1,17 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index e47a3f1..f529e69 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -16,10 +16,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
-if test "x$PKG_CONFIG" = "xno"; then
|
||||
- AC_MSG_ERROR([You need to install pkg-config])
|
||||
-fi
|
||||
+PKG_PROG_PKG_CONFIG
|
||||
+
|
||||
GLIB_REQUIRED_VERSION="2.2.3"
|
||||
PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
|
||||
|
|
@ -1,18 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig
|
||||
{ lib, stdenv, fetchzip, pkg-config, glib, cairo, Carbon, fontconfig
|
||||
, libtiff, giflib, libjpeg, libpng
|
||||
, libXrender, libexif, autoreconfHook, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libgdiplus";
|
||||
version = "6.0.5";
|
||||
version = "6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mono";
|
||||
repo = "libgdiplus";
|
||||
rev = version;
|
||||
sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c";
|
||||
# Using source archive to avoid fetching Git submodules.
|
||||
# Git repo: https://github.com/mono/libgdiplus
|
||||
src = fetchzip {
|
||||
url = "https://download.mono-project.com/sources/libgdiplus/libgdiplus-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-+lP9ETlw3s0RUliQT1uBWZ2j6o3V9EECBQSppOYFq4Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pkg-config lookup when cross-compiling.
|
||||
./configure-pkg-config.patch
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lgif";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
@ -45,4 +50,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libjxl";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "libjxl";
|
||||
repo = "libjxl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WWuvUTMrlR6ePbEs01ulLnuMiUqGrh4qELWFh0QMaGU=";
|
||||
hash = "sha256-I3PGgh0XqRkCFz7lUZ3Q4eU0+0GwaQcVb6t4Pru1kKo=";
|
||||
# There are various submodules in `third_party/`.
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
, ninja
|
||||
, fixedPoint ? false
|
||||
, withCustomModes ? true
|
||||
, withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86
|
||||
, withAsm ? false
|
||||
|
||||
# tests
|
||||
, ffmpeg-headless
|
||||
|
@ -46,7 +48,9 @@ stdenv.mkDerivation rec {
|
|||
mesonFlags = [
|
||||
(lib.mesonBool "fixed-point" fixedPoint)
|
||||
(lib.mesonBool "custom-modes" withCustomModes)
|
||||
(lib.mesonEnable "asm" false)
|
||||
(lib.mesonEnable "intrinsics" withIntrinsics)
|
||||
(lib.mesonEnable "rtcd" (withIntrinsics || withAsm))
|
||||
(lib.mesonEnable "asm" withAsm)
|
||||
(lib.mesonEnable "docs" false)
|
||||
];
|
||||
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
From d4714fd7aac9c5f499c406703bc437dc6cf72ef3 Mon Sep 17 00:00:00 2001
|
||||
From: Steffen <steffen.winter@proton.me>
|
||||
Date: Mon, 13 Feb 2023 17:32:16 +0100
|
||||
Subject: [PATCH 1/3] Add custom error function for tests.
|
||||
|
||||
On musl systems, liburing cannot build examples and tests due to
|
||||
it's usage of error.h. t_error calls fprintf(stderr, ...) and
|
||||
exits.
|
||||
|
||||
Closes: #786
|
||||
|
||||
Signed-off-by: Steffen Winter <steffen.winter@proton.me>
|
||||
---
|
||||
test/helpers.c | 18 ++++++++++++++++++
|
||||
test/helpers.h | 2 ++
|
||||
2 files changed, 20 insertions(+)
|
||||
|
||||
diff --git a/test/helpers.c b/test/helpers.c
|
||||
index 8fb32b8..caa887e 100644
|
||||
--- a/test/helpers.c
|
||||
+++ b/test/helpers.c
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
+#include <stdarg.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <arpa/inet.h>
|
||||
@@ -266,3 +267,20 @@ bool t_probe_defer_taskrun(void)
|
||||
io_uring_queue_exit(&ring);
|
||||
return true;
|
||||
}
|
||||
+
|
||||
+/*
|
||||
+ * Implementation of error(3), prints an error message and exits.
|
||||
+ */
|
||||
+void t_error(int status, int errnum, const char *format, ...)
|
||||
+{
|
||||
+ va_list args;
|
||||
+ va_start(args, format);
|
||||
+
|
||||
+ vfprintf(stderr, format, args);
|
||||
+ if (errnum)
|
||||
+ fprintf(stderr, ": %s", strerror(errnum));
|
||||
+
|
||||
+ fprintf(stderr, "\n");
|
||||
+ va_end(args);
|
||||
+ exit(status);
|
||||
+}
|
||||
diff --git a/test/helpers.h b/test/helpers.h
|
||||
index 4375a9e..33b82cf 100644
|
||||
--- a/test/helpers.h
|
||||
+++ b/test/helpers.h
|
||||
@@ -87,6 +87,8 @@ bool t_probe_defer_taskrun(void);
|
||||
|
||||
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
||||
|
||||
+void t_error(int status, int errnum, const char *format, ...);
|
||||
+
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
--
|
||||
2.39.1
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
From e84f40ca872f0bce72b5686c95a11739d9c89494 Mon Sep 17 00:00:00 2001
|
||||
From: Steffen <steffen.winter@proton.me>
|
||||
Date: Mon, 13 Feb 2023 17:56:03 +0100
|
||||
Subject: [PATCH 2/3] test: Use t_error instead of glibc's error.
|
||||
|
||||
On musl systems, liburing cannot build examples and tests due to
|
||||
it's usage of error.h. Replacing calls to error() with t_error().
|
||||
|
||||
Closes: #786
|
||||
|
||||
Signed-off-by: Steffen Winter <steffen.winter@proton.me>
|
||||
---
|
||||
test/defer-taskrun.c | 1 -
|
||||
test/send-zerocopy.c | 1 -
|
||||
test/single-issuer.c | 15 +++++++--------
|
||||
3 files changed, 7 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/test/defer-taskrun.c b/test/defer-taskrun.c
|
||||
index 9283f28..87cd256 100644
|
||||
--- a/test/defer-taskrun.c
|
||||
+++ b/test/defer-taskrun.c
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
-#include <error.h>
|
||||
#include <sys/eventfd.h>
|
||||
#include <signal.h>
|
||||
#include <poll.h>
|
||||
diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c
|
||||
index 4db102b..be33094 100644
|
||||
--- a/test/send-zerocopy.c
|
||||
+++ b/test/send-zerocopy.c
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <stdint.h>
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
-#include <error.h>
|
||||
#include <limits.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
diff --git a/test/single-issuer.c b/test/single-issuer.c
|
||||
index 1d13f47..d71cd74 100644
|
||||
--- a/test/single-issuer.c
|
||||
+++ b/test/single-issuer.c
|
||||
@@ -5,7 +5,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
-#include <error.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
@@ -56,13 +55,13 @@ static int try_submit(struct io_uring *ring)
|
||||
return ret;
|
||||
|
||||
if (ret != 1)
|
||||
- error(1, ret, "submit %i", ret);
|
||||
+ t_error(1, ret, "submit %i", ret);
|
||||
ret = io_uring_wait_cqe(ring, &cqe);
|
||||
if (ret)
|
||||
- error(1, ret, "wait fail %i", ret);
|
||||
+ t_error(1, ret, "wait fail %i", ret);
|
||||
|
||||
if (cqe->res || cqe->user_data != 42)
|
||||
- error(1, ret, "invalid cqe");
|
||||
+ t_error(1, ret, "invalid cqe");
|
||||
|
||||
io_uring_cqe_seen(ring, cqe);
|
||||
return 0;
|
||||
@@ -106,7 +105,7 @@ int main(int argc, char *argv[])
|
||||
ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER |
|
||||
IORING_SETUP_R_DISABLED);
|
||||
if (ret)
|
||||
- error(1, ret, "ring init (2) %i", ret);
|
||||
+ t_error(1, ret, "ring init (2) %i", ret);
|
||||
|
||||
if (!fork_t()) {
|
||||
io_uring_enable_rings(&ring);
|
||||
@@ -122,7 +121,7 @@ int main(int argc, char *argv[])
|
||||
ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER |
|
||||
IORING_SETUP_R_DISABLED);
|
||||
if (ret)
|
||||
- error(1, ret, "ring init (3) %i", ret);
|
||||
+ t_error(1, ret, "ring init (3) %i", ret);
|
||||
|
||||
io_uring_enable_rings(&ring);
|
||||
if (!fork_t()) {
|
||||
@@ -137,7 +136,7 @@ int main(int argc, char *argv[])
|
||||
/* test that anyone can submit to a SQPOLL|SINGLE_ISSUER ring */
|
||||
ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER|IORING_SETUP_SQPOLL);
|
||||
if (ret)
|
||||
- error(1, ret, "ring init (4) %i", ret);
|
||||
+ t_error(1, ret, "ring init (4) %i", ret);
|
||||
|
||||
ret = try_submit(&ring);
|
||||
if (ret) {
|
||||
@@ -157,7 +156,7 @@ int main(int argc, char *argv[])
|
||||
/* test that IORING_ENTER_REGISTERED_RING doesn't break anything */
|
||||
ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER);
|
||||
if (ret)
|
||||
- error(1, ret, "ring init (5) %i", ret);
|
||||
+ t_error(1, ret, "ring init (5) %i", ret);
|
||||
|
||||
if (!fork_t()) {
|
||||
ret = try_submit(&ring);
|
||||
--
|
||||
2.39.1
|
||||
|
|
@ -1,226 +0,0 @@
|
|||
From 23704bbd1416ed1a051b32d5d44e46dd654b8ffe Mon Sep 17 00:00:00 2001
|
||||
From: Steffen <steffen.winter@proton.me>
|
||||
Date: Mon, 13 Feb 2023 18:23:44 +0100
|
||||
Subject: [PATCH 3/3] examples: Use t_error instead of glibc's error.
|
||||
|
||||
On musl systems, liburing cannot build examples and tests due to
|
||||
it's usage of error.h. t_error copied from test/helpers.c.
|
||||
Replacing calls to error() with t_error().
|
||||
|
||||
Closes: #786
|
||||
|
||||
Signed-off-by: Steffen Winter <steffen.winter@proton.me>
|
||||
---
|
||||
examples/send-zerocopy.c | 61 +++++++++++++++++++++++++---------------
|
||||
1 file changed, 39 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/examples/send-zerocopy.c b/examples/send-zerocopy.c
|
||||
index 7f5f2b1..6092af9 100644
|
||||
--- a/examples/send-zerocopy.c
|
||||
+++ b/examples/send-zerocopy.c
|
||||
@@ -5,11 +5,11 @@
|
||||
#include <stdint.h>
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
-#include <error.h>
|
||||
#include <limits.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <stdbool.h>
|
||||
+#include <stdarg.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <arpa/inet.h>
|
||||
@@ -57,6 +57,23 @@ static struct sockaddr_storage cfg_dst_addr;
|
||||
|
||||
static char payload[IP_MAXPACKET] __attribute__((aligned(4096)));
|
||||
|
||||
+/*
|
||||
+ * Implementation of error(3), prints an error message and exits.
|
||||
+ */
|
||||
+static void t_error(int status, int errnum, const char *format, ...)
|
||||
+{
|
||||
+ va_list args;
|
||||
+ va_start(args, format);
|
||||
+
|
||||
+ vfprintf(stderr, format, args);
|
||||
+ if (errnum)
|
||||
+ fprintf(stderr, ": %s", strerror(errnum));
|
||||
+
|
||||
+ fprintf(stderr, "\n");
|
||||
+ va_end(args);
|
||||
+ exit(status);
|
||||
+}
|
||||
+
|
||||
static unsigned long gettimeofday_ms(void)
|
||||
{
|
||||
struct timeval tv;
|
||||
@@ -68,7 +85,7 @@ static unsigned long gettimeofday_ms(void)
|
||||
static void do_setsockopt(int fd, int level, int optname, int val)
|
||||
{
|
||||
if (setsockopt(fd, level, optname, &val, sizeof(val)))
|
||||
- error(1, errno, "setsockopt %d.%d: %d", level, optname, val);
|
||||
+ t_error(1, errno, "setsockopt %d.%d: %d", level, optname, val);
|
||||
}
|
||||
|
||||
static void setup_sockaddr(int domain, const char *str_addr,
|
||||
@@ -84,7 +101,7 @@ static void setup_sockaddr(int domain, const char *str_addr,
|
||||
addr4->sin_port = htons(cfg_port);
|
||||
if (str_addr &&
|
||||
inet_pton(AF_INET, str_addr, &(addr4->sin_addr)) != 1)
|
||||
- error(1, 0, "ipv4 parse error: %s", str_addr);
|
||||
+ t_error(1, 0, "ipv4 parse error: %s", str_addr);
|
||||
break;
|
||||
case PF_INET6:
|
||||
memset(addr6, 0, sizeof(*addr6));
|
||||
@@ -92,10 +109,10 @@ static void setup_sockaddr(int domain, const char *str_addr,
|
||||
addr6->sin6_port = htons(cfg_port);
|
||||
if (str_addr &&
|
||||
inet_pton(AF_INET6, str_addr, &(addr6->sin6_addr)) != 1)
|
||||
- error(1, 0, "ipv6 parse error: %s", str_addr);
|
||||
+ t_error(1, 0, "ipv6 parse error: %s", str_addr);
|
||||
break;
|
||||
default:
|
||||
- error(1, 0, "illegal domain");
|
||||
+ t_error(1, 0, "illegal domain");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,12 +122,12 @@ static int do_setup_tx(int domain, int type, int protocol)
|
||||
|
||||
fd = socket(domain, type, protocol);
|
||||
if (fd == -1)
|
||||
- error(1, errno, "socket t");
|
||||
+ t_error(1, errno, "socket t");
|
||||
|
||||
do_setsockopt(fd, SOL_SOCKET, SO_SNDBUF, 1 << 21);
|
||||
|
||||
if (connect(fd, (void *) &cfg_dst_addr, cfg_alen))
|
||||
- error(1, errno, "connect");
|
||||
+ t_error(1, errno, "connect");
|
||||
return fd;
|
||||
}
|
||||
|
||||
@@ -125,7 +142,7 @@ static inline struct io_uring_cqe *wait_cqe_fast(struct io_uring *ring)
|
||||
|
||||
ret = io_uring_wait_cqe(ring, &cqe);
|
||||
if (ret)
|
||||
- error(1, ret, "wait cqe");
|
||||
+ t_error(1, ret, "wait cqe");
|
||||
return cqe;
|
||||
}
|
||||
|
||||
@@ -143,17 +160,17 @@ static void do_tx(int domain, int type, int protocol)
|
||||
|
||||
ret = io_uring_queue_init(512, &ring, IORING_SETUP_COOP_TASKRUN);
|
||||
if (ret)
|
||||
- error(1, ret, "io_uring: queue init");
|
||||
+ t_error(1, ret, "io_uring: queue init");
|
||||
|
||||
if (cfg_fixed_files) {
|
||||
ret = io_uring_register_files(&ring, &fd, 1);
|
||||
if (ret < 0)
|
||||
- error(1, ret, "io_uring: files registration");
|
||||
+ t_error(1, ret, "io_uring: files registration");
|
||||
}
|
||||
if (cfg_reg_ringfd) {
|
||||
ret = io_uring_register_ring_fd(&ring);
|
||||
if (ret < 0)
|
||||
- error(1, ret, "io_uring: io_uring_register_ring_fd");
|
||||
+ t_error(1, ret, "io_uring: io_uring_register_ring_fd");
|
||||
}
|
||||
|
||||
iov.iov_base = payload;
|
||||
@@ -161,7 +178,7 @@ static void do_tx(int domain, int type, int protocol)
|
||||
|
||||
ret = io_uring_register_buffers(&ring, &iov, 1);
|
||||
if (ret)
|
||||
- error(1, ret, "io_uring: buffer registration");
|
||||
+ t_error(1, ret, "io_uring: buffer registration");
|
||||
|
||||
tstop = gettimeofday_ms() + cfg_runtime_ms;
|
||||
do {
|
||||
@@ -193,14 +210,14 @@ static void do_tx(int domain, int type, int protocol)
|
||||
|
||||
ret = io_uring_submit(&ring);
|
||||
if (ret != cfg_nr_reqs)
|
||||
- error(1, ret, "submit");
|
||||
+ t_error(1, ret, "submit");
|
||||
|
||||
for (i = 0; i < cfg_nr_reqs; i++) {
|
||||
cqe = wait_cqe_fast(&ring);
|
||||
|
||||
if (cqe->flags & IORING_CQE_F_NOTIF) {
|
||||
if (cqe->flags & IORING_CQE_F_MORE)
|
||||
- error(1, -EINVAL, "F_MORE notif");
|
||||
+ t_error(1, -EINVAL, "F_MORE notif");
|
||||
compl_cqes--;
|
||||
i--;
|
||||
io_uring_cqe_seen(&ring, cqe);
|
||||
@@ -217,7 +234,7 @@ static void do_tx(int domain, int type, int protocol)
|
||||
fprintf(stderr, "Connection failure");
|
||||
goto out_fail;
|
||||
} else if (cqe->res != -EAGAIN) {
|
||||
- error(1, cqe->res, "send failed");
|
||||
+ t_error(1, cqe->res, "send failed");
|
||||
}
|
||||
io_uring_cqe_seen(&ring, cqe);
|
||||
}
|
||||
@@ -226,7 +243,7 @@ static void do_tx(int domain, int type, int protocol)
|
||||
out_fail:
|
||||
shutdown(fd, SHUT_RDWR);
|
||||
if (close(fd))
|
||||
- error(1, errno, "close");
|
||||
+ t_error(1, errno, "close");
|
||||
|
||||
fprintf(stderr, "tx=%lu (MB=%lu), tx/s=%lu (MB/s=%lu)\n",
|
||||
packets, bytes >> 20,
|
||||
@@ -254,7 +271,7 @@ static void do_test(int domain, int type, int protocol)
|
||||
|
||||
static void usage(const char *filepath)
|
||||
{
|
||||
- error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] "
|
||||
+ t_error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] "
|
||||
"(-4|-6) [-t<time s>] -D<dst_ip> udp", filepath);
|
||||
}
|
||||
|
||||
@@ -276,13 +293,13 @@ static void parse_opts(int argc, char **argv)
|
||||
switch (c) {
|
||||
case '4':
|
||||
if (cfg_family != PF_UNSPEC)
|
||||
- error(1, 0, "Pass one of -4 or -6");
|
||||
+ t_error(1, 0, "Pass one of -4 or -6");
|
||||
cfg_family = PF_INET;
|
||||
cfg_alen = sizeof(struct sockaddr_in);
|
||||
break;
|
||||
case '6':
|
||||
if (cfg_family != PF_UNSPEC)
|
||||
- error(1, 0, "Pass one of -4 or -6");
|
||||
+ t_error(1, 0, "Pass one of -4 or -6");
|
||||
cfg_family = PF_INET6;
|
||||
cfg_alen = sizeof(struct sockaddr_in6);
|
||||
break;
|
||||
@@ -311,9 +328,9 @@ static void parse_opts(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (cfg_nr_reqs > MAX_SUBMIT_NR)
|
||||
- error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR);
|
||||
+ t_error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR);
|
||||
if (cfg_payload_len > max_payload_len)
|
||||
- error(1, 0, "-s: payload exceeds max (%d)", max_payload_len);
|
||||
+ t_error(1, 0, "-s: payload exceeds max (%d)", max_payload_len);
|
||||
|
||||
setup_sockaddr(cfg_family, daddr, &cfg_dst_addr);
|
||||
|
||||
@@ -333,7 +350,7 @@ int main(int argc, char **argv)
|
||||
else if (!strcmp(cfg_test, "udp"))
|
||||
do_test(cfg_family, SOCK_DGRAM, 0);
|
||||
else
|
||||
- error(1, 0, "unknown cfg_test %s", cfg_test);
|
||||
+ t_error(1, 0, "unknown cfg_test %s", cfg_test);
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.39.1
|
||||
|
|
@ -1,45 +1,23 @@
|
|||
{ lib, stdenv, fetchgit
|
||||
, fetchpatch
|
||||
}:
|
||||
{ lib, stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liburing";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "http://git.kernel.dk/${pname}";
|
||||
rev = "liburing-${version}";
|
||||
sha256 = "sha256-vN6lLb5kpgHTKDxwibJPS61sdelILETVtJE2BYgp79k=";
|
||||
sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backported portability fixes from liburing master, needed for pkgsMusl.liburing
|
||||
./0001-Add-custom-error-function-for-tests.patch
|
||||
./0002-test-Use-t_error-instead-of-glibc-s-error.patch
|
||||
./0003-examples-Use-t_error-instead-of-glibc-s-error.patch
|
||||
|
||||
# More portability fixes, in the process of being upstreamed
|
||||
(fetchpatch {
|
||||
url = "https://github.com/axboe/liburing/pull/798/commits/0fbcc44fe1fb2dc6807660b2cff1c2995add095b.patch";
|
||||
hash = "sha256-xOMsw0VpYGst/+Isd2Tmq8CmBDK+uyLw3KNKPnsCSoA=";
|
||||
})
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
enableParallelBuilding = true;
|
||||
# Upstream's configure script is not autoconf generated, but a hand written one.
|
||||
setOutputFlags = false;
|
||||
preConfigure =
|
||||
# We cannot use configureFlags or configureFlagsArray directly, since we
|
||||
# don't have structuredAttrs yet and using placeholder causes permissions
|
||||
# denied errors. Using $dev / $man in configureFlags causes bash evaluation
|
||||
# errors
|
||||
''
|
||||
configureFlagsArray+=(
|
||||
"--includedir=$dev/include"
|
||||
"--mandir=$man/share/man"
|
||||
)
|
||||
'';
|
||||
configureFlags = [
|
||||
"--includedir=${placeholder "dev"}/include"
|
||||
"--mandir=${placeholder "man"}/share/man"
|
||||
];
|
||||
|
||||
# Doesn't recognize platform flags
|
||||
configurePlatforms = [];
|
||||
|
@ -61,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://git.kernel.dk/cgit/liburing/";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
maintainers = with maintainers; [ thoughtpolice nickcao ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -84,6 +84,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
propagatedNativeBuildInputs = [ lndir ];
|
||||
|
||||
# libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked
|
||||
# against it will crash during build unless they can access `/usr/share/icu/icudtXXl.dat`.
|
||||
propagatedSandboxProfile = lib.optionalString stdenv.isDarwin ''
|
||||
(allow file-read* (subpath "/usr/share/icu"))
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
|
|
@ -23,6 +23,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qtbase`
|
||||
sandboxProfile = toString qtbase.__propagatedSandboxProfile or null;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}"
|
||||
"-DQT_TRANSLATIONS_DIR=share/qt/translations"
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gst-python";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-cL7T+r5jS8Yi723k5uscM7yc79ZL2rIA9voxa0aMcxw=";
|
||||
hash = "sha256-4TAtzA8kUbZDgNzA3TuCc1eV6JUdyBLZONi6kfOIFj4=";
|
||||
};
|
||||
|
||||
# Python 2.x is not supported.
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatch-fancy-pypi-readme";
|
||||
version = "22.8.0";
|
||||
version = "23.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "hatch_fancy_pypi_readme";
|
||||
inherit version;
|
||||
hash = "sha256-2pEoLKCWAcGK3tjjeNr4tXjHAhSGbwlxFW7pu5zmwmo=";
|
||||
hash = "sha256-sd9EBjCUrx6CSM6s1HqSyc8xPWuYI79mr4qSfDlgKH0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, bash
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -26,6 +26,13 @@ buildPythonPackage rec {
|
|||
"invoke"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
mkdir -p $out/share/{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
|
||||
$out/bin/inv --print-completion-script=zsh >$out/share/zsh/site-functions/_inv
|
||||
$out/bin/inv --print-completion-script=bash >$out/share/bash-completion/completions/inv.bash
|
||||
$out/bin/inv --print-completion-script=fish >$out/share/fish/vendor_completions.d/inv.fish
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pythonic task execution";
|
||||
homepage = "https://www.pyinvoke.org/";
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
, devtools
|
||||
, email-validator
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, python-dotenv
|
||||
|
@ -32,7 +33,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydantic";
|
||||
version = "1.10.8";
|
||||
version = "1.10.9";
|
||||
format = "setuptools";
|
||||
|
||||
outputs = [
|
||||
|
@ -47,9 +48,18 @@ buildPythonPackage rec {
|
|||
owner = "pydantic";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4oJoDlP1grLblF0ppqYM1GYEyNMEM9FssFQjacipmms=";
|
||||
hash = "sha256-POqMxBJUFFS1TnO9h5W7jYwFlukBOng0zbtq4kzmMB4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes racy doctests build failures on really fast machines
|
||||
# FIXME: remove after next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pydantic/pydantic/pull/6103/commits/f05014a30340e608155683aaca17d275f93a0380.diff";
|
||||
hash = "sha256-sr47hpl37SSFFbK+/h3hGlF6Pl6L8XPKDU0lZZV7Vzs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/flake8/ d' Makefile
|
||||
'';
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, httpcore
|
||||
, httpx
|
||||
, flask
|
||||
|
@ -21,6 +22,14 @@ buildPythonPackage rec {
|
|||
hash = "sha256-Qs3+NWMKiAFlKTTosdyHOxWRPKFlYQD20+MKiKR371U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "httpx-0.24-test-compatibility.patch";
|
||||
url = "https://github.com/lundberg/respx/commit/b014780bde8e82a65fc6bb02d62b89747189565c.patch";
|
||||
hash = "sha256-wz9YYUtdptZw67ddnzUCet2iTozKaW0jrTIS62I/HXo=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
];
|
||||
|
|
|
@ -4,8 +4,8 @@ buildRubyGem rec {
|
|||
inherit ruby;
|
||||
name = "${gemName}-${version}";
|
||||
gemName = "bundler";
|
||||
version = "2.4.13";
|
||||
source.sha256 = "sha256-EWU6pa5QfG29Vb9+m+iSbZmvrJtsDAjToZOK/rPnWos=";
|
||||
version = "2.4.14";
|
||||
source.sha256 = "sha256-lIJKzVEK30D43O5q0YwJ+FcSyJxGij2uWlxH+mlIfHI=";
|
||||
dontPatchShebangs = true;
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
@ -35,16 +35,16 @@ in
|
|||
assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == [];
|
||||
# Minimal, bootstrap cmake does not have toolkits
|
||||
assert isBootstrap -> (uiToolkits == []);
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cmake"
|
||||
+ lib.optionalString isBootstrap "-boot"
|
||||
+ lib.optionalString cursesUI "-cursesUI"
|
||||
+ lib.optionalString qt5UI "-qt5UI";
|
||||
version = "3.25.3";
|
||||
version = "3.26.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
|
||||
sha256 = "sha256-zJlXAdWQym3rxCRemYmTkJnKUoJ91GtdNZLwk6/hkBw=";
|
||||
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-MTtogMKRvU/jHAqlHW5iZZKCpSHmlfMNXMDSWrvVwgg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = setupHooks ++ [
|
||||
nativeBuildInputs = finalAttrs.setupHooks ++ [
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals buildDocs [ texinfo ]
|
||||
|
@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [
|
||||
"CXXFLAGS=-Wno-elaborated-enum-base"
|
||||
"--docdir=share/doc/${pname}${version}"
|
||||
"--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}"
|
||||
] ++ (if useSharedLibraries
|
||||
then [ "--no-system-jsoncpp" "--system-libs" ]
|
||||
else [ "--no-system-libs" ]) # FIXME: cleanup
|
||||
|
@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = false; # fails
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://cmake.org/";
|
||||
description = "Cross-platform, open-source build system generator";
|
||||
longDescription = ''
|
||||
|
@ -164,10 +164,10 @@ stdenv.mkDerivation rec {
|
|||
configuration files, and generate native makefiles and workspaces that can
|
||||
be used in the compiler environment of your choice.
|
||||
'';
|
||||
changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/release/${lib.versions.majorMinor version}.html";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ttuegel lnl7 AndersonTorres ];
|
||||
platforms = platforms.all;
|
||||
changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor finalAttrs.version}/release/${lib.versions.majorMinor finalAttrs.version}.html";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ ttuegel lnl7 AndersonTorres ];
|
||||
platforms = lib.platforms.all;
|
||||
broken = (qt5UI && stdenv.isDarwin);
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "meson";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2WFsRM1sU2if+PBfxpWKaT8uF8NHKo2vg87lXav/gp8=";
|
||||
hash = "sha256-0EtUH5fKQ5+4L6t9DUgJiL5L1OYlY6XKNfrbVAByexw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -77,13 +77,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
"docs/yaml/objects/dep.yaml"
|
||||
];
|
||||
})
|
||||
|
||||
# Fix regression in precomputing CMAKE_SIZEOF_VOID_P
|
||||
# See https://github.com/mesonbuild/meson/pull/11761
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mesonbuild/meson/commit/7c78c2b5a0314078bdabb998ead56925dc8b0fc0.patch";
|
||||
sha256 = "sha256-vSnHhuOIXf/1X+bUkUmGND5b30ES0O8EDArwb4p2/w4=";
|
||||
})
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
|
|
@ -7,15 +7,15 @@ let
|
|||
rustfmt-nightly = rustfmt.override { asNightly = true; };
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-bindgen-unwrapped";
|
||||
version = "0.65.1";
|
||||
version = "0.66.0";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "bindgen-cli";
|
||||
inherit version;
|
||||
sha256 = "9JJXQQSbCxTh3fIbVSrc6WAYGivwomkoB8ZIquUNr9o=";
|
||||
sha256 = "sha256-Or5gaYXqfRcxAzBf4nOjmM9CQMvfwb8KbpD8hDJJQ4o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "Kz6Y+4F9Yu5oKYI9LgZKLh0AkQTwerPS4A758TZrkoc=";
|
||||
cargoHash = "sha256-rsowGeBSuqHyz90qozeCi5dXsH4EHKhIUQbDaNJKabI=";
|
||||
|
||||
buildInputs = [ clang.cc.lib ];
|
||||
|
||||
|
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-c";
|
||||
version = "0.9.13";
|
||||
version = "0.9.20";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname;
|
||||
# this version may need to be updated along with package version
|
||||
version = "${version}+cargo-0.65";
|
||||
sha256 = "sha256-f/p+ZIvDe9JQ8GM82SEud7sRTlimNs/ADPevfdkhsfg=";
|
||||
version = "${version}+cargo-0.71";
|
||||
hash = "sha256-T0/gqzeJxDSZDoi8tl4vgYEAFbJDlCoxuqoi6rnf5U4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-JrlEWgKbTqQG/JYFqBR53eB58fa29c/+vIdSNGoS5Y0=";
|
||||
cargoHash = "sha256-tArfCEGFRgJPERZW1HzfdDedc+FD8bpc+LX4wNwdv6Q=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config (lib.getDev curl) ];
|
||||
buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [
|
||||
|
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "maturin";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyO3";
|
||||
repo = "maturin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iVN6LpikU+TP4P9ZJUVQR/ZNkRHjYLgdDA0aQeWMZfA=";
|
||||
hash = "sha256-UH+qOKKQdWXQZZMtrihbWmKaUoSy1NciGh9UTtS/W5E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iX4cbZ0PV0/o42f1QKNlAkwHEif2fu+RvhdzH7tWOZE=";
|
||||
cargoHash = "sha256-EGgVPRaofia+AwXSr6X4Aa8jbk5qDkXg1XvMoEp0qMQ=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cups";
|
||||
version = "2.4.3";
|
||||
version = "2.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
|
||||
sha256 = "sha256-nd65jyDpyfSvEhwrEFPnQgt5vWdw8a3tKGYwPSdSb28=";
|
||||
sha256 = "sha256-mkBN5V90UlsKaFHfDP3r+hIVrsDnwve+a5sJtpFvsAA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
|
|
@ -62,6 +62,7 @@ let
|
|||
if stdenv.isAarch64 then stdenv
|
||||
else
|
||||
(overrideCC stdenv (mkCc stdenv.cc)).override {
|
||||
extraBuildInputs = [ pkgs.darwin.apple_sdk_11_0.frameworks.CoreFoundation ];
|
||||
targetPlatform = stdenv.targetPlatform // {
|
||||
darwinMinVersion = "10.12";
|
||||
darwinSdkVersion = "11.0";
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
{ appleDerivation', stdenvNoCC, ed, unifdef }:
|
||||
|
||||
appleDerivation' stdenvNoCC {
|
||||
nativeBuildInputs = [ ed unifdef ];
|
||||
|
||||
installPhase = ''
|
||||
export SRCROOT=$PWD
|
||||
export DSTROOT=$out
|
||||
export PUBLIC_HEADERS_FOLDER_PATH=include
|
||||
export PRIVATE_HEADERS_FOLDER_PATH=include
|
||||
bash xcodescripts/headers.sh
|
||||
'';
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{ appleDerivation', stdenvNoCC, ed, unifdef, Libc_old, Libc_10-9 }:
|
||||
{ appleDerivation', stdenvNoCC, ed, unifdef, Libc_10-9 }:
|
||||
|
||||
appleDerivation' stdenvNoCC {
|
||||
nativeBuildInputs = [ ed unifdef ];
|
||||
|
@ -7,7 +7,6 @@ appleDerivation' stdenvNoCC {
|
|||
./0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch
|
||||
];
|
||||
|
||||
# TODO: asl.h actually comes from syslog project now
|
||||
installPhase = ''
|
||||
export SRCROOT=$PWD
|
||||
export DSTROOT=$out
|
||||
|
@ -18,20 +17,6 @@ appleDerivation' stdenvNoCC {
|
|||
cp ${./CrashReporterClient.h} $out/include/CrashReporterClient.h
|
||||
|
||||
cp ${Libc_10-9}/include/NSSystemDirectories.h $out/include
|
||||
|
||||
# Ugh Apple stopped releasing this stuff so we need an older one...
|
||||
cp ${Libc_old}/include/spawn.h $out/include
|
||||
cp ${Libc_old}/include/setjmp.h $out/include
|
||||
cp ${Libc_old}/include/ucontext.h $out/include
|
||||
cp ${Libc_old}/include/pthread*.h $out/include
|
||||
cp ${Libc_old}/include/sched.h $out/include
|
||||
cp -R ${Libc_old}/include/malloc $out/include
|
||||
|
||||
mkdir -p $out/include/libkern
|
||||
cp ${Libc_old}/include/asl.h $out/include
|
||||
cp ${Libc_old}/include/libproc.h $out/include
|
||||
cp ${Libc_old}/include/libkern/OSAtomic.h $out/include/libkern
|
||||
cp ${Libc_old}/include/libkern/OSCacheControl.h $out/include/libkern
|
||||
'';
|
||||
|
||||
appleHeaders = builtins.readFile ./headers.txt;
|
||||
|
|
|
@ -21,7 +21,6 @@ arpa/inet.h
|
|||
arpa/nameser_compat.h
|
||||
arpa/telnet.h
|
||||
arpa/tftp.h
|
||||
asl.h
|
||||
assert.h
|
||||
bitstring.h
|
||||
cpio.h
|
||||
|
@ -49,12 +48,8 @@ langinfo.h
|
|||
libc.h
|
||||
libc_private.h
|
||||
libgen.h
|
||||
libkern/OSAtomic.h
|
||||
libkern/OSCacheControl.h
|
||||
libproc.h
|
||||
limits.h
|
||||
locale.h
|
||||
malloc/malloc.h
|
||||
memory.h
|
||||
monetary.h
|
||||
monitor.h
|
||||
|
@ -72,24 +67,17 @@ protocols/routed.h
|
|||
protocols/rwhod.h
|
||||
protocols/talkd.h
|
||||
protocols/timed.h
|
||||
pthread.h
|
||||
pthread_impl.h
|
||||
pthread_spis.h
|
||||
pthread_workqueue.h
|
||||
ranlib.h
|
||||
readpassphrase.h
|
||||
regex.h
|
||||
runetype.h
|
||||
sched.h
|
||||
search.h
|
||||
secure/_common.h
|
||||
secure/_stdio.h
|
||||
secure/_string.h
|
||||
semaphore.h
|
||||
setjmp.h
|
||||
sgtty.h
|
||||
signal.h
|
||||
spawn.h
|
||||
stab.h
|
||||
standards.h
|
||||
stddef.h
|
||||
|
@ -112,7 +100,6 @@ time.h
|
|||
timeconv.h
|
||||
ttyent.h
|
||||
tzfile.h
|
||||
ucontext.h
|
||||
ulimit.h
|
||||
unistd.h
|
||||
util.h
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildPackages, fetchzip
|
||||
{ lib, stdenv, buildPackages, fetchzip, fetchFromGitHub
|
||||
, appleDerivation', xnu, Libc, Libm, libdispatch, Libinfo
|
||||
, dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto
|
||||
, copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libplatform, libpthread
|
||||
, copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libmalloc, libplatform, libpthread
|
||||
, mDNSResponder, launchd, libutilHeaders, hfsHeaders, darwin-stubs
|
||||
, headersOnly ? false
|
||||
, withLibresolv ? !headersOnly
|
||||
|
@ -30,6 +30,15 @@ let
|
|||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
# Libsystem needs `asl.h` from syslog. This is the version corresponding to the 10.12 SDK
|
||||
# source release, but it hasn’t changed in newer versions.
|
||||
syslog.src = fetchFromGitHub {
|
||||
owner = "apple-oss-distributions";
|
||||
repo = "syslog";
|
||||
rev = "syslog-349.50.5";
|
||||
hash = "sha256-tXLW/TNsluhO1X9Rv3FANyzyOe5TE/hZz0gVo7JGvHA=";
|
||||
};
|
||||
in
|
||||
appleDerivation' stdenv {
|
||||
dontBuild = true;
|
||||
|
@ -57,12 +66,19 @@ appleDerivation' stdenv {
|
|||
${libclosure} ${CarbonHeaders} ${libdispatch} ${ncurses.dev} \
|
||||
${CommonCrypto} ${copyfile} ${removefile} ${libresolvHeaders} \
|
||||
${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} \
|
||||
${libutilHeaders} ${libpthread} ${hfsHeaders}; do
|
||||
${libutilHeaders} ${libmalloc} ${libpthread} ${hfsHeaders}; do
|
||||
(cd $dep/include && find . -name '*.h' | copyHierarchy $out/include)
|
||||
done
|
||||
|
||||
(cd ${buildPackages.darwin.cctools.dev}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o)
|
||||
|
||||
for header in pthread.h pthread_impl.h pthread_spis.h sched.h; do
|
||||
ln -s "$out/include/pthread/$header" "$out/include/$header"
|
||||
done
|
||||
|
||||
# Copy `asl.h` from the syslog sources since it is no longer provided as part of Libc.
|
||||
cp ${syslog.src}/libsystem_asl.tproj/include/asl.h $out/include
|
||||
|
||||
mkdir -p $out/include/os
|
||||
|
||||
cp ${darling.src}/src/libc/os/activity.h $out/include/os
|
||||
|
|
|
@ -1381,7 +1381,6 @@ protocols/routed.h
|
|||
protocols/rwhod.h
|
||||
protocols/talkd.h
|
||||
protocols/timed.h
|
||||
pthread.h
|
||||
pthread/introspection.h
|
||||
pthread/pthread.h
|
||||
pthread/pthread_impl.h
|
||||
|
@ -1389,9 +1388,6 @@ pthread/pthread_spis.h
|
|||
pthread/qos.h
|
||||
pthread/sched.h
|
||||
pthread/spawn.h
|
||||
pthread_impl.h
|
||||
pthread_spis.h
|
||||
pthread_workqueue.h
|
||||
pwd.h
|
||||
ranlib.h
|
||||
readpassphrase.h
|
||||
|
@ -1414,7 +1410,6 @@ rpc/xdr.h
|
|||
rpcsvc/yp_prot.h
|
||||
rpcsvc/ypclnt.h
|
||||
runetype.h
|
||||
sched.h
|
||||
search.h
|
||||
secure/_common.h
|
||||
secure/_stdio.h
|
||||
|
|
|
@ -19,6 +19,7 @@ let
|
|||
Libinfo = "503.50.4";
|
||||
Libsystem = "1238.60.2";
|
||||
removefile = "45";
|
||||
libmalloc = "116.50.8";
|
||||
libresolv = "64";
|
||||
libplatform = "126.50.8";
|
||||
mDNSResponder = "765.50.9";
|
||||
|
@ -265,7 +266,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
|
|||
rev = "Libc-997.90.3";
|
||||
hash = "sha256-B18RNO+Rai5XE52TKdJV7eknosTZ+bRERkiU12d/kPU=";
|
||||
};
|
||||
Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "sha256-JvPSY7FzraGpqF/jYLfhU2o/2195NuKrXsryYfVtx3s=" {};
|
||||
};
|
||||
libclosure = applePackage "libclosure" "osx-10.11.6" "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {};
|
||||
libdispatch = applePackage "libdispatch" "osx-10.10.5" "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {};
|
||||
|
@ -273,6 +273,9 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
|
|||
Libinfo = applePackage "Libinfo" "osx-10.11.6" "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {};
|
||||
Libm = applePackage "Libm" "osx-10.7.4" "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {};
|
||||
Libnotify = applePackage "Libnotify" "osx-10.12.6" "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {};
|
||||
libmalloc = if stdenv.isx86_64 then
|
||||
applePackage "libmalloc" "osx-10.12.6" "sha256-brfG4GEF2yZipKdhlPq6DhT2z5hKYSb2MAmffaikdO4=" {}
|
||||
else macosPackages_11_0_1.libmalloc;
|
||||
libplatform = applePackage "libplatform" "osx-10.12.6" "sha256-6McMTjw55xtnCsFI3AB1osRagnuB5pSTqeMKD3gpGtM=" {};
|
||||
libpthread = applePackage "libpthread" "osx-10.12.6" "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {};
|
||||
libresolv = applePackage "libresolv" "osx-10.12.6" "sha256-FtvwjJKSFX6j9APYPC8WLXVOjbHLZa1Gcoc8yxLy8qE=" {};
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
{ appleDerivation', stdenvNoCC }:
|
||||
|
||||
# Unfortunately, buiding libmalloc is not feasible due to its use of non-public headers, but its
|
||||
# headers are needed by Libsystem.
|
||||
appleDerivation' stdenvNoCC {
|
||||
installPhase = ''
|
||||
mkdir -p $out/include
|
||||
cp -R include/malloc $out/include/
|
||||
'';
|
||||
}
|
|
@ -28,6 +28,7 @@ hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "0a0s6b12b0q07wslfifna0bj51d
|
|||
libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "0vf9n0k3m8dbprv1bf45zqg0g43bidy2i5z1v9a826bsf8lv7am7" {};
|
||||
libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "1ck5srcjapg18vqb8wl08gacs7ndc6xr067qjn3ngx39q1jdcywz" {};
|
||||
libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0lwa4brdwm4lvrdnxylzsn1yph4m7csgri2zkc4xb4xiisz32pwp" {};
|
||||
libmalloc = applePackage' "libmalloc" "317.40.8" "macos-11.0.1" "sha256-Tdhb0mq3w4Hwvp3xHB79Vr22hCOQK6h28HCsd7jvITI=" {};
|
||||
libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1qf3ri0yd8b1xjln1j1gyx7ks6k3a2jhd63blyvfby75y9s7flky" {};
|
||||
libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "0zljbw8mpb80n1if65hhi9lkgwbgjr8vc9wvf7q1nl3mzyl35f8p" {};
|
||||
libresolv = applePackage' "libresolv" "68" "macos-11.0.1" "045ahh8nvaam9whryc2f5g5xagwp7d187r80kcff82snp5p66aq1" {};
|
||||
|
|
|
@ -116,6 +116,9 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) (
|
|||
cp EXTERNAL_HEADERS/Availability*.h $out/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/
|
||||
cp -r EXTERNAL_HEADERS/corecrypto $out/include
|
||||
|
||||
# These headers are needed by Libsystem.
|
||||
cp libsyscall/wrappers/{spawn/spawn.h,libproc/libproc.h} $out/include
|
||||
|
||||
# Build the mach headers we crave
|
||||
export SRCROOT=$PWD/libsyscall
|
||||
export DERIVED_SOURCES_DIR=$out/include
|
||||
|
|
|
@ -637,6 +637,7 @@ libkern/os/reason_private.h
|
|||
libkern/os/refcnt.h
|
||||
libkern/os/refcnt_internal.h
|
||||
libkern/os/trace.h
|
||||
libproc.h
|
||||
mach/arm/_structs.h
|
||||
mach/arm/asm.h
|
||||
mach/arm/boolean.h
|
||||
|
@ -1270,6 +1271,7 @@ servers/ls_defs.h
|
|||
servers/netname.h
|
||||
servers/netname_defs.h
|
||||
servers/nm_defs.h
|
||||
spawn.h
|
||||
sys/_endian.h
|
||||
sys/_posix_availability.h
|
||||
sys/_select.h
|
||||
|
|
|
@ -554,6 +554,7 @@ libkern/os/object.h
|
|||
libkern/os/object_private.h
|
||||
libkern/os/overflow.h
|
||||
libkern/os/trace.h
|
||||
libproc.h
|
||||
mach/audit_triggers.defs
|
||||
mach/boolean.h
|
||||
mach/bootstrap.h
|
||||
|
@ -1116,6 +1117,7 @@ servers/ls_defs.h
|
|||
servers/netname.h
|
||||
servers/netname_defs.h
|
||||
servers/nm_defs.h
|
||||
spawn.h
|
||||
sys/_endian.h
|
||||
sys/_posix_availability.h
|
||||
sys/_select.h
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
apparmor-version = "3.1.4";
|
||||
apparmor-version = "3.1.5";
|
||||
|
||||
apparmor-meta = component: with lib; {
|
||||
homepage = "https://apparmor.net/";
|
||||
|
@ -36,7 +36,7 @@ let
|
|||
owner = "apparmor";
|
||||
repo = "apparmor";
|
||||
rev = "v${apparmor-version}";
|
||||
hash = "sha256-YWPdIUd+2x74tqiW+YX8NKh3jxSKhD+5zdiDMjhPzpE=";
|
||||
hash = "sha256-nqIRs2REbSQNKglEEjAO/YSZc6r2ks128sUNq61gRWE=";
|
||||
};
|
||||
|
||||
aa-teardown = writeShellScript "aa-teardown" ''
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, lvm2, json_c, asciidoctor
|
||||
, openssl, libuuid, pkg-config, popt, nixosTests
|
||||
, libargon2, withInternalArgon2 ? false
|
||||
|
||||
# The release tarballs contain precomputed manpage files, so we don't need
|
||||
# to run asciidoctor on the man sources. By avoiding asciidoctor, we make
|
||||
|
@ -37,11 +38,12 @@ stdenv.mkDerivation rec {
|
|||
NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s";
|
||||
|
||||
configureFlags = [
|
||||
"--enable-cryptsetup-reencrypt"
|
||||
"--with-crypto_backend=openssl"
|
||||
"--disable-ssh-token"
|
||||
] ++ lib.optionals (!rebuildMan) [
|
||||
"--disable-asciidoc"
|
||||
] ++ lib.optionals (!withInternalArgon2) [
|
||||
"--enable-libargon2"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isStatic [
|
||||
"--disable-external-tokens"
|
||||
# We have to override this even though we're removing token
|
||||
|
@ -51,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals rebuildMan [ asciidoctor ];
|
||||
buildInputs = [ lvm2 json_c openssl libuuid popt ];
|
||||
buildInputs = [ lvm2 json_c openssl libuuid popt ] ++ lib.optional (!withInternalArgon2) libargon2;
|
||||
|
||||
# The test [7] header backup in compat-test fails with a mysterious
|
||||
# "out of memory" error, even though tons of memory is available.
|
||||
|
@ -76,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||
description = "LUKS for dm-crypt";
|
||||
changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${version}/docs/v${version}-ReleaseNotes";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ raitobezarius ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hwdata";
|
||||
version = "0.370";
|
||||
version = "0.371";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vcrhonek";
|
||||
repo = "hwdata";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fqhYPKqtuI+7h/SgdWI4i7jBTgluy/hI8Q6pq4LKtY4=";
|
||||
sha256 = "sha256-bK61nvuzm8LTotVSBtGyBMELZPqoENkPM4NKtgEx9qw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -720,6 +720,7 @@ let
|
|||
ZRAM = module;
|
||||
ZRAM_WRITEBACK = option yes;
|
||||
ZSWAP = option yes;
|
||||
ZPOOL = yes;
|
||||
ZBUD = option yes;
|
||||
ZSMALLOC = module;
|
||||
};
|
||||
|
|
|
@ -190,6 +190,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
./0017-core-don-t-taint-on-unmerged-usr.patch
|
||||
./0018-tpm2_context_init-fix-driver-name-checking.patch
|
||||
./0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch
|
||||
|
||||
# https://github.com/systemd/systemd/pull/28000
|
||||
(fetchpatch {
|
||||
name = "fix-service-exit";
|
||||
url = "https://github.com/systemd/systemd/commit/5f7f82ba625ee48d662c1f0286f44b8b0918d05d.patch";
|
||||
sha256 = "sha256-pFRXpZjeVl5ZG/mOjHEuMg9zXq4Orwvdp+/LYTbR09I=";
|
||||
})
|
||||
] ++ lib.optional stdenv.hostPlatform.isMusl (
|
||||
let
|
||||
oe-core = fetchzip {
|
||||
|
|
|
@ -892,11 +892,11 @@ self: with self; {
|
|||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans }: stdenv.mkDerivation {
|
||||
pname = "libX11";
|
||||
version = "1.8.4";
|
||||
version = "1.8.6";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/lib/libX11-1.8.4.tar.xz";
|
||||
sha256 = "067mgmsqck78b7pf5h25irz3zvcnzqbgbz7s7k70967smsjqg8n9";
|
||||
url = "mirror://xorg/individual/lib/libX11-1.8.6.tar.xz";
|
||||
sha256 = "1jawl8zp1h7hdmxx1sc6kmxkki187d9yixr2l03ai6wqqry5nlsr";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
|
|
|
@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2
|
|||
mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
|
||||
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
|
||||
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
|
||||
mirror://xorg/individual/lib/libX11-1.8.4.tar.xz
|
||||
mirror://xorg/individual/lib/libX11-1.8.6.tar.xz
|
||||
mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
|
||||
mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2
|
||||
mirror://xorg/individual/lib/libxcb-1.14.tar.xz
|
||||
|
|
|
@ -310,8 +310,7 @@ in
|
|||
};
|
||||
|
||||
# `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64.
|
||||
extraNativeBuildInputs =
|
||||
lib.optional (localSystem.isLoongArch64) prevStage.updateAutotoolsGnuConfigScriptsHook;
|
||||
extraNativeBuildInputs = [ prevStage.updateAutotoolsGnuConfigScriptsHook ];
|
||||
})
|
||||
|
||||
# First rebuild of gcc; this is linked against all sorts of junk
|
||||
|
@ -391,8 +390,7 @@ in
|
|||
};
|
||||
|
||||
# `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64.
|
||||
extraNativeBuildInputs =
|
||||
lib.optional (localSystem.isLoongArch64) prevStage.updateAutotoolsGnuConfigScriptsHook;
|
||||
extraNativeBuildInputs = [ prevStage.updateAutotoolsGnuConfigScriptsHook ];
|
||||
})
|
||||
|
||||
# 2nd stdenv that contains our own rebuilt binutils and is used for
|
||||
|
@ -477,8 +475,7 @@ in
|
|||
|
||||
# `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64.
|
||||
# `libtool` comes with obsolete config.sub/config.guess that don't recognize Risc-V.
|
||||
extraNativeBuildInputs =
|
||||
lib.optional (localSystem.isLoongArch64 || localSystem.isRiscV) prevStage.updateAutotoolsGnuConfigScriptsHook;
|
||||
extraNativeBuildInputs = [ prevStage.updateAutotoolsGnuConfigScriptsHook ];
|
||||
})
|
||||
|
||||
|
||||
|
@ -516,10 +513,11 @@ in
|
|||
passthru = a.passthru // { inherit (self) gmp mpfr libmpc isl; };
|
||||
});
|
||||
};
|
||||
extraNativeBuildInputs = [ prevStage.patchelf ] ++
|
||||
extraNativeBuildInputs = [
|
||||
prevStage.patchelf
|
||||
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
|
||||
lib.optional (!localSystem.isx86 || localSystem.libc == "musl")
|
||||
prevStage.updateAutotoolsGnuConfigScriptsHook;
|
||||
prevStage.updateAutotoolsGnuConfigScriptsHook
|
||||
];
|
||||
})
|
||||
|
||||
|
||||
|
@ -572,10 +570,11 @@ in
|
|||
shell = self.bash + "/bin/bash";
|
||||
};
|
||||
};
|
||||
extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
|
||||
extraNativeBuildInputs = [
|
||||
prevStage.patchelf prevStage.xz
|
||||
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
|
||||
lib.optional (!localSystem.isx86 || localSystem.libc == "musl")
|
||||
prevStage.updateAutotoolsGnuConfigScriptsHook;
|
||||
prevStage.updateAutotoolsGnuConfigScriptsHook
|
||||
];
|
||||
})
|
||||
|
||||
# Construct the final stdenv. It uses the Glibc and GCC, and adds
|
||||
|
@ -610,10 +609,11 @@ in
|
|||
initialPath =
|
||||
((import ../generic/common-path.nix) {pkgs = prevStage;});
|
||||
|
||||
extraNativeBuildInputs = [ prevStage.patchelf ] ++
|
||||
extraNativeBuildInputs = [
|
||||
prevStage.patchelf
|
||||
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
|
||||
lib.optional (!localSystem.isx86 || localSystem.libc == "musl")
|
||||
prevStage.updateAutotoolsGnuConfigScriptsHook;
|
||||
prevStage.updateAutotoolsGnuConfigScriptsHook
|
||||
];
|
||||
|
||||
cc = prevStage.gcc;
|
||||
|
||||
|
@ -645,8 +645,7 @@ in
|
|||
++ [ linuxHeaders # propagated from .dev
|
||||
binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params gcc.cc.libgcc glibc.passthru.libgcc
|
||||
]
|
||||
++ lib.optionals (!localSystem.isx86 || localSystem.libc == "musl")
|
||||
[ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]
|
||||
++ [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]
|
||||
++ (with gcc-unwrapped.passthru; [
|
||||
gmp libmpc mpfr isl
|
||||
])
|
||||
|
|
|
@ -29,6 +29,13 @@ stdenv.mkDerivation rec {
|
|||
excludes = [ "lib/ext2fs/hashmap.h" ];
|
||||
extraPrefix = "";
|
||||
})
|
||||
# Avoid trouble with older systems like NixOS 23.05.
|
||||
# TODO: most likely drop this at some point, e.g. when 23.05 loses support.
|
||||
(fetchurl {
|
||||
name = "mke2fs-avoid-incompatible-features.patch";
|
||||
url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default?h=debian/master&id=3fb3d18baba90e5d48d94f4c0b79b2d271b0c913";
|
||||
hash = "sha256-YD11K4s2bqv0rvzrxtaiodzLp3ztULlOlPUf1XcpxRY=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
|
|
|
@ -26,7 +26,7 @@ assert !cppSupport || !mpiSupport;
|
|||
let inherit (lib) optional optionals; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.14.0";
|
||||
version = "1.14.1-2";
|
||||
pname = "hdf5"
|
||||
+ lib.optionalString cppSupport "-cpp"
|
||||
+ lib.optionalString fortranSupport "-fortran"
|
||||
|
@ -34,8 +34,11 @@ stdenv.mkDerivation rec {
|
|||
+ lib.optionalString threadsafe "-threadsafe";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/hdf5-${version}/src/hdf5-${version}.tar.bz2";
|
||||
sha256 = "sha256-5OeUM0UO2uKGWkxjKBiLtFORsp10+MU47mmfCxFsK6A=";
|
||||
url = let
|
||||
majorMinor = lib.versions.majorMinor version;
|
||||
majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}";
|
||||
in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2";
|
||||
sha256 = "sha256-BsoUHRo8MStdfMSCahJzcpOuExAxdIhhaJ9qLsghnb0=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpcsvc-proto";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thkukuk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DXRLEpOanWcxCSTC8OxEw5SWKpgFz7oTPukzfnPrAOk=";
|
||||
sha256 = "sha256-DEXzSSmjMeMsr1PoU/ljaY+6b4COUU2Z8MJkGImsgzk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
outputs = [ "out" "man" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, udev
|
||||
|
@ -14,9 +14,11 @@ stdenv.mkDerivation rec {
|
|||
pname = "dhcpcd";
|
||||
version = "9.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://roy/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-gZNXY07+0epc9E7AGyTT0/iFL+yLQkmSXcxWZ8VON2w=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NetworkConfiguration";
|
||||
repo = "dhcpcd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qyxON+TsAKMwAI19b5P+dT/sgxpW6m1giGcf/boFpHc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue