Skip to content

Commit bebdde4

Browse files
InfinityGhostInfinityGhost
authored
Merge pull request #23 from jamesbt365/poise
TabletBot rewrite to poise
2 parents f7c5fd6 + 1c5ba1a commit bebdde4

20 files changed

Lines changed: 2409 additions & 1579 deletions

‎.editorconfig‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ trim_trailing_whitespace = true
77
insert_final_newline = true
88
indent_style = space
99

10-
[**.{nix,sh,rs,toml}]
10+
[**.{nix,sh,toml}]
1111
indent_size = 2
12+
13+
[**.rs]
14+
indent_size = 4

‎.envrc‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1-
use nix
1+
files=(
2+
./default.nix
3+
./flake.lock
4+
./flake.nix
5+
./shell.nix
6+
)
7+
8+
for file in ${files[@]}; do
9+
watch_file $file
10+
done
11+
12+
# outputs.devShells.$system.default
13+
eval "$(nix print-dev-env --no-write-lock-file)"

‎.github/workflows/nix.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
12-
- uses: cachix/install-nix-action@v18
11+
- uses: actions/checkout@v4
12+
- uses: cachix/install-nix-action@v24
1313
with:
1414
extra_nix_config: |
1515
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
1616
- uses: cachix/cachix-action@v12
17+
if: github.event_name == 'push'
1718
with:
1819
name: opentabletdriver
1920
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.build/
22
.history
33
result
4-
4+
target/
5+
state.json

‎268075-nixpkgs.patch‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
From e9ca6038eb5f4398fc57feb4084b7df4afaa6d7d Mon Sep 17 00:00:00 2001
2+
From: Alyssa Ross <hi@alyssa.is>
3+
Date: Thu, 16 Nov 2023 19:07:23 +0100
4+
Subject: [PATCH] rustc,cargo: 1.73.0 -> 1.74.0
5+
6+
The BOOTSTRAP_ARGS patch is no longer necessary since
7+
863d2fddd79 ("Pass `-jN` from Make to `BOOTSTRAP_ARGS`").
8+
9+
We now have to set sysconfdir, because since
10+
350ead87205 ("add sanity checks for user write access on `x install`"),
11+
the build system will check it can write there, even though nothing
12+
actually gets installed there. (Previously it defaulted to /etc.)
13+
---
14+
.../compilers/rust/{1_73.nix => 1_74.nix} | 30 +++++++++----------
15+
pkgs/development/compilers/rust/rustc.nix | 9 +-----
16+
pkgs/top-level/all-packages.nix | 8 ++---
17+
3 files changed, 20 insertions(+), 27 deletions(-)
18+
rename pkgs/development/compilers/rust/{1_73.nix => 1_74.nix} (57%)
19+
20+
diff --git a/pkgs/development/compilers/rust/1_73.nix b/pkgs/development/compilers/rust/1_74.nix
21+
similarity index 57%
22+
rename from pkgs/development/compilers/rust/1_73.nix
23+
rename to pkgs/development/compilers/rust/1_74.nix
24+
index 37e75e0a7a4f1e..72169a7b4d3f28 100644
25+
--- a/pkgs/development/compilers/rust/1_73.nix
26+
+++ b/pkgs/development/compilers/rust/1_74.nix
27+
@@ -20,8 +20,8 @@
28+
} @ args:
29+
30+
import ./default.nix {
31+
- rustcVersion = "1.73.0";
32+
- rustcSha256 = "sha256-ltYubR8tId96yKyzuYgkEfnnxwNhc/fy7enh8faxuzo=";
33+
+ rustcVersion = "1.74.0";
34+
+ rustcSha256 = "sha256-iCtYS8Mhxdz+d82qafJ3kGuTYlXveAj81cdJKSXPEEk=";
35+
36+
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
37+
llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
38+
@@ -35,24 +35,24 @@ import ./default.nix {
39+
40+
# Note: the version MUST be one version prior to the version we're
41+
# building
42+
- bootstrapVersion = "1.72.1";
43+
+ bootstrapVersion = "1.73.0";
44+
45+
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
46+
bootstrapHashes = {
47+
- i686-unknown-linux-gnu = "a2a849a701dfd6643aaaa27e1ed5ac56aea00f7dee26c00d81c520808efd8911";
48+
- x86_64-unknown-linux-gnu = "4fbd8df2000cf73c632d67a219a7fc153537ceffa2e6474491e3db71fdd5a410";
49+
- x86_64-unknown-linux-musl = "94eddc044868a944a887d0b0375e393cb3acc6ebc034e3eac2ef2890ec7c0eac";
50+
- arm-unknown-linux-gnueabihf = "a4d90538882181722d3e7cb8d7f021770e29e6b6d28375452e31a98049600110";
51+
- armv7-unknown-linux-gnueabihf = "4c8e6b3c705a84d17894d3a1cfe744fb6083dd57c61868e67aac8b8512640ecb";
52+
- aarch64-unknown-linux-gnu = "190d0473cbe619f163d33a6c4e2ef982abdd4178f73abc3194631cd2d5c8ed8b";
53+
- aarch64-unknown-linux-musl = "c83778d1a95f6604bc3610a9070e8a8435c60a8bca5117aad71ffab36dea020f";
54+
- x86_64-apple-darwin = "d01e7e9a7482f88a51b4fd888f06234274b49f51b5476c2d14fd46fd6e99ba9e";
55+
- aarch64-apple-darwin = "42b0aaf269b6d9c60db13a64a920336d6064ab11d0c7043c9deeb9d4f67b3983";
56+
- powerpc64le-unknown-linux-gnu = "9310df247efc072f2ca27354a875c4989cf3c29c9e545255a7472895d830163c";
57+
- riscv64gc-unknown-linux-gnu = "1e08cd3ecd29d5bf247e3f7f4bc97318b439f0443dd9c99c36edcfa717d55101";
58+
+ i686-unknown-linux-gnu = "6a088acbbda734d27e8b431499f1d746de7781673b88fead3aeae072be1d1a5a";
59+
+ x86_64-unknown-linux-gnu = "aa4cf0b7e66a9f5b7c623d4b340bb1ac2864a5f2c2b981f39f796245dc84f2cb";
60+
+ x86_64-unknown-linux-musl = "c888457d106ccd40288ca8db1cb966b23d719c9a128daca701ecc574c53773d4";
61+
+ arm-unknown-linux-gnueabihf = "9c29bb42786aedbb16ea71564eb06068a8b01cca6c6b8857f0c37f91dfba7134";
62+
+ armv7-unknown-linux-gnueabihf = "092b32b82c602c18279d76d9a96763e85030aa62cda64c1bc73fc1f6355bb99c";
63+
+ aarch64-unknown-linux-gnu = "e54d7d886ba413ae573151f668e76ea537f9a44406d3d29598269a4a536d12f6";
64+
+ aarch64-unknown-linux-musl = "f4e9ff895aa55558777585ad4debe2ccf3c0298cb5d65db67814f62428de4a5b";
65+
+ x86_64-apple-darwin = "ece9646bb153d4bc0f7f1443989de0cbcd8989a7d0bf3b7fb9956e1223954f0c";
66+
+ aarch64-apple-darwin = "9c96e4c57328fb438ee2d87aa75970ce89b4426b49780ccb3c16af0d7c617cc6";
67+
+ powerpc64le-unknown-linux-gnu = "8fa215ee3e274fb64364e7084613bc570369488fa22cf5bc8e0fe6dc810fe2b9";
68+
+ riscv64gc-unknown-linux-gnu = "381379a2381835428b2e7a396b3046581517356b7cc851e39e385aebd5700623";
69+
};
70+
71+
- selectRustPackage = pkgs: pkgs.rust_1_73;
72+
+ selectRustPackage = pkgs: pkgs.rust_1_74;
73+
74+
rustcPatches = [ ];
75+
}
76+
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
77+
index 1758abb6bea518..3a32dfc0c1e8d5 100644
78+
--- a/pkgs/development/compilers/rust/rustc.nix
79+
+++ b/pkgs/development/compilers/rust/rustc.nix
80+
@@ -81,6 +81,7 @@ in stdenv.mkDerivation (finalAttrs: {
81+
ccForTarget = ccPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv;
82+
cxxForTarget = cxxPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv;
83+
in [
84+
+ "--sysconfdir=${placeholder "out"}/etc"
85+
"--release-channel=stable"
86+
"--set=build.rustc=${rustc}/bin/rustc"
87+
"--set=build.cargo=${cargo}/bin/cargo"
88+
@@ -178,14 +179,6 @@ in stdenv.mkDerivation (finalAttrs: {
89+
runHook postInstall
90+
'' else null;
91+
92+
- # The bootstrap.py will generated a Makefile that then executes the build.
93+
- # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass
94+
- # to the bootstrap builder.
95+
- postConfigure = ''
96+
- substituteInPlace Makefile \
97+
- --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)'
98+
- '';
99+
-
100+
# the rust build system complains that nix alters the checksums
101+
dontFixLibtool = true;
102+
103+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
104+
index 06a2c24625e0c6..d9b622f528b123 100644
105+
--- a/pkgs/top-level/all-packages.nix
106+
+++ b/pkgs/top-level/all-packages.nix
107+
@@ -16939,11 +16939,11 @@ with pkgs;
108+
inherit (darwin) apple_sdk;
109+
};
110+
111+
- rust_1_73 = callPackage ../development/compilers/rust/1_73.nix {
112+
+ rust_1_74 = callPackage ../development/compilers/rust/1_74.nix {
113+
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
114+
llvm_16 = llvmPackages_16.libllvm;
115+
};
116+
- rust = rust_1_73;
117+
+ rust = rust_1_74;
118+
119+
mrustc = callPackage ../development/compilers/mrustc { };
120+
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
121+
@@ -16951,8 +16951,8 @@ with pkgs;
122+
openssl = openssl_1_1;
123+
};
124+
125+
- rustPackages_1_73 = rust_1_73.packages.stable;
126+
- rustPackages = rustPackages_1_73;
127+
+ rustPackages_1_74 = rust_1_74.packages.stable;
128+
+ rustPackages = rustPackages_1_74;
129+
130+
inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
131+

0 commit comments

Comments
 (0)