Skip to content

Commit

Permalink
nix: bump flake.lock, remove olm from complement now
Browse files Browse the repository at this point in the history
• Updated input 'attic':
    'github:zhaofengli/attic/bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234' (2024-09-02)
  → 'github:zhaofengli/attic/416687e59c4f0b32742423458cab2c5ff8fe748a' (2024-09-11)
• Removed input 'attic/flake-utils'
• Removed input 'attic/flake-utils/systems'
• Updated input 'attic/nixpkgs':
    'github:NixOS/nixpkgs/b96f849e725333eb2b1c7f1cb84ff102062468ba' (2024-08-30)
  → 'github:NixOS/nixpkgs/159be5db480d1df880a0135ca0bfed84c2f88353' (2024-09-11)
• Updated input 'cachix':
    'github:cachix/cachix/03b6cb3f953097bff378fb8b9ea094bd091a4ec7' (2024-08-21)
  → 'github:cachix/cachix/a7abc17d7d8c2b678e0c66968d865274d6e1ac7d' (2024-09-30)
• Updated input 'complement':
    'github:matrix-org/complement/39733c1b2f8314800776748cc7164f9a34650686' (2024-08-22)
  → 'github:matrix-org/complement/c246a092fda4178b0c97d1ab02f64f8b55ca139a' (2024-09-26)
• Updated input 'crane':
    'github:ipetkov/crane/7e4586bad4e3f8f97a9271def747cf58c4b68f3c' (2024-09-04)
  → 'github:ipetkov/crane/a376dd1efac7bce448857c62961c6311be26cb09' (2024-10-01)
• Updated input 'fenix':
    'github:nix-community/fenix/4b8d964df93d1f918ee6c4f003b3548c432cc866' (2024-09-07)
  → 'github:nix-community/fenix/b85dddb88366113db4616a64925a8b2a23854f98' (2024-10-02)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d' (2024-09-06)
  → 'github:rust-lang/rust-analyzer/e1a76671af2fbc74c84c18ba18fcda5e653d7531' (2024-10-01)
• Updated input 'flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
  → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9bb1e7571aadf31ddb4af77fc64b2d59580f9a39' (2024-09-05)
  → 'github:NixOS/nixpkgs/1839883cd0068572aed75fb9442b508bbd9ef09c' (2024-10-01)

Signed-off-by: strawberry <strawberry@puppygock.gay>
  • Loading branch information
girlbossceo committed Oct 3, 2024
1 parent c690157 commit acbb507
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 75 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ env:
show-trace = true
extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit https://cache.lix.systems https://conduwuit.cachix.org
extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=
# complement uses libolm
NIXPKGS_ALLOW_INSECURE: 1
permissions:
packages: write
Expand Down
96 changes: 31 additions & 65 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
outputs = inputs:
inputs.flake-utils.lib.eachDefaultSystem (system:
let
pkgsHost = import inputs.nixpkgs{
inherit system;
config.permittedInsecurePackages = [ "olm-3.2.16" ];
};
pkgsHost = inputs.nixpkgs.legacyPackages.${system};
pkgsHostStatic = pkgsHost.pkgsStatic;

# The Rust toolchain to use
Expand Down Expand Up @@ -99,10 +96,6 @@
# Convenient way to access a pinned version of Complement's source
# code.
COMPLEMENT_SRC = inputs.complement.outPath;

# Needed for Complement
CGO_CFLAGS = "-I${scope.pkgs.olm}/include";
CGO_LDFLAGS = "-L${scope.pkgs.olm}/lib";
};

# Development tools
Expand Down

0 comments on commit acbb507

Please sign in to comment.