Skip to content

Bump nixpkgs #4273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smatting merged 10 commits into from
Oct 21, 2024
Merged

Bump nixpkgs #4273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
abe2bc9
bump nixpkgs
smatting Sep 26, 2024
39a9d6c
hoogle: dont check dependencies
smatting Oct 9, 2024
e6d6ff7
fix and rename foo.sh
smatting Oct 9, 2024
87de216
patch hoogle
smatting Oct 9, 2024
bf30cd4
lint
smatting Oct 9, 2024
a00aac4
remove python from devEnv
smatting Oct 9, 2024
0dad095
re-introduce python env with default python3
smatting Oct 9, 2024
3dad1c9
Revert "patch hoogle"
smatting Oct 18, 2024
82e3762
jailbreak
smatting Oct 18, 2024
2ffa78b
it's doJailbreak
smatting Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nix/manual-overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ hself: hsuper: {
# -----------------
cryptostore = hlib.addBuildDepends (hlib.dontCheck (hlib.appendConfigureFlags hsuper.cryptostore [ "-fuse_crypton" ]))
[ hself.crypton hself.crypton-x509 hself.crypton-x509-validation ];
# Make hoogle static to reduce size of the hoogle image
hoogle = hlib.justStaticExecutables hsuper.hoogle;
# doJailbreak because upstreams requires a specific crypton-connection version we don't have
hoogle = hlib.justStaticExecutables (hlib.doJailbreak (hlib.dontCheck (hsuper.hoogle)));
http2-manager = hlib.enableCabalFlag hsuper.http2-manager "-f-test-trailing-dot";
sodium-crypto-sign = hlib.addPkgconfigDepend hsuper.sodium-crypto-sign libsodium.dev;
types-common-journal = hlib.addBuildTool hsuper.types-common-journal protobuf;
Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
"sha256": "0gv8wgjqldh9nr3lvpjas7sk0ffyahmvfrz5g4wd8l2r15wyk67f",
"rev": "4f31540079322e6013930b5b2563fd10f96917f0",
"sha256": "12748r3h44hy3a41slm5hcihn1nhrxjlgp75qz6iwzazkxnclx00",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/154bcb95ad51bc257c2ce4043a725de6ca700ef6.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/4f31540079322e6013930b5b2563fd10f96917f0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
2 changes: 1 addition & 1 deletion nix/wire-server.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ in
pkgs.netcat
pkgs.niv
pkgs.haskellPackages.apply-refact
(pkgs.python310.withPackages
(pkgs.python3.withPackages
(ps: with ps; [
black
bokeh
Expand Down
1 change: 1 addition & 0 deletions services/galley/test/resources/foo.sh → ...es/galley/test/resources/generate_keys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash
openssl genpkey -algorithm ed25519 > ed25519.pem
openssl genpkey -algorithm ec -pkeyopt ec_paramgen_curve:P-256 > ecdsa_secp256r1_sha256.pem
openssl genpkey -algorithm ec -pkeyopt ec_paramgen_curve:P-384 > ecdsa_secp384r1_sha384.pem
Expand Down