From 9101259ecf4a69fe724eeecc91336d4371c8fbdc Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Fri, 27 Jun 2025 18:22:16 +0200 Subject: [PATCH] remove unsupported configurations from flake --- nix-build-all.sh | 14 ---------- packages.nix | 66 ------------------------------------------------ 2 files changed, 80 deletions(-) diff --git a/nix-build-all.sh b/nix-build-all.sh index 2d247e7..9472cc5 100755 --- a/nix-build-all.sh +++ b/nix-build-all.sh @@ -13,17 +13,3 @@ $BUILD .#servicepoint-binding-c-nightly-release -o result-nightly-release $BUILD .#all-examples -o result-examples $BUILD .#all-examples-size -o result-examples-size - -# works, but needs to bootstrap a C and Rust compiler -# $BUILD .#servicepoint-binding-c-musl-stable-release -o result-musl-release -# $BUILD .#servicepoint-binding-c-musl-stable-size -o result-musl-size -# $BUILD .#all-examples-musl-static -o result-examples-musl-static -# $BUILD .#all-examples-musl-static-size -o result-examples-musl-static-size -# $BUILD .#all-examples-musl -o result-examples-musl - -# do not work yet: -# $BUILD .#servicepoint-binding-c-nightly-size -o result-nightly-size -# $BUILD .#servicepoint-binding-c-musl-nightly-release -# $BUILD .#servicepoint-binding-c-musl-nightly-size -# $BUILD .#all-examples-nightly-size -o result-examples-nightly-size - diff --git a/packages.nix b/packages.nix index d47ef6f..e01882e 100644 --- a/packages.nix +++ b/packages.nix @@ -153,31 +153,12 @@ in rec { servicepoint-binding-c-stable-release = mkServicepoint stable-release-args; servicepoint-binding-c-nightly-release = mkServicepoint nightly-release-args; - servicepoint-binding-c-musl-stable-release = mkServicepoint musl-stable-release-args; - servicepoint-binding-c-musl-nightly-release = mkServicepoint musl-nightly-release-args; - servicepoint-binding-c-stable-size = mkServicepoint (stable-release-args // stable-size-args); - servicepoint-binding-c-nightly-size = mkServicepoint ( - nightly-release-args // stable-size-args // nightly-size-args - ); - servicepoint-binding-c-musl-stable-size = mkServicepoint ( - musl-stable-release-args // stable-size-args - ); - servicepoint-binding-c-musl-nightly-size = mkServicepoint ( - musl-nightly-release-args // stable-size-args // nightly-size-args - ); - # default variants servicepoint-binding-c = servicepoint-binding-c-stable-release; - servicepoint-binding-c-musl = servicepoint-binding-c-musl-stable-release; all-examples = mkAllExamples ""; all-examples-size = mkAllExamples "-size"; - all-examples-nightly-size = mkAllExamples "-nightly-size"; - # TODO: musl targets do not work on darwin - all-examples-musl = mkAllExamples "-musl"; - all-examples-musl-static = mkAllExamples "-musl-static"; - all-examples-musl-static-size = mkAllExamples "-musl-static-size"; } # construct one package per example // (lib.genAttrs examples ( @@ -198,50 +179,3 @@ rec { } ) )) -# construct another pakage per example, but optimized for size with unstable rust -// (lib.mapAttrs' (name: value: lib.nameValuePair ("${name}-unstable-size") value) ( - lib.genAttrs examples ( - name: - mkExample { - inherit name pkgs; - servicepointBinding = selfPkgs.servicepoint-binding-c-nightly-size; - EXTRA_CFLAGS = builtins.toString size-cflags; - } - ) -)) -# construct another pakage per example, but with musl -// (lib.mapAttrs' (name: value: lib.nameValuePair ("${name}-musl") value) ( - lib.genAttrs examples ( - name: - mkExample { - inherit name; - pkgs = pkgs.pkgsMusl; - servicepointBinding = selfPkgs.servicepoint-binding-c-musl-stable-release; - } - ) -)) -# construct another pakage per example, but statically linked with musl -// (lib.mapAttrs' (name: value: lib.nameValuePair ("${name}-musl-static") value) ( - lib.genAttrs examples ( - name: - mkExample { - inherit name; - pkgs = pkgs.pkgsMusl; - servicepointBinding = selfPkgs.servicepoint-binding-c-musl-stable-release; - static = true; - } - ) -)) -# construct another pakage per example, but statically linked with musl and size optimized -// (lib.mapAttrs' (name: value: lib.nameValuePair ("${name}-musl-static-size") value) ( - lib.genAttrs examples ( - name: - mkExample { - inherit name; - pkgs = pkgs.pkgsMusl; - servicepointBinding = selfPkgs.servicepoint-binding-c-musl-stable-size; - static = true; - EXTRA_CFLAGS = builtins.toString size-cflags; - } - ) -))