Skip to content
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

Jump to bottom

Bump the flake lock #769

Closed
wants to merge 4 commits into from
Closed

Bump the flake lock #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5bac3d
Bump the flake lock
brianmcgillion Sep 2, 2024
b71a43e
Use the version of nixpkgs defined by anduril
brianmcgillion Sep 2, 2024
5530c1d
jitsi meet has some depricated crypto
brianmcgillion Sep 2, 2024
219794f
labwc: rebase patches from 0.7.2 -> 0.8.0
humaidq-tii Sep 2, 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
147 changes: 61 additions & 86 deletions flake.lock
View file
Open in desktop

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

9 changes: 5 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

inputs = {
#TODO: clean this up before merging to main
nixpkgs.url = "github:tiiuae/nixpkgs/nixos-unstable-texinfo"; # "flake:mylocalnixpkgs"; #
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
#nixpkgs.url = "github:tiiuae/nixpkgs/nixos-unstable-texinfo"; # "flake:mylocalnixpkgs"; #
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

ghafpkgs = {
url = "github:tiiuae/ghafpkgs";
Expand Down Expand Up @@ -117,8 +117,9 @@
nixos-hardware.url = "github:NixOS/nixos-hardware";

jetpack-nixos = {
#url = "github:anduril/jetpack-nixos";
url = "github:anduril/jetpack-nixos/793716c1ca29a1be6d9bea84296a933c4acdddc1";
inputs.nixpkgs.follows = "nixpkgs";
# inputs.nixpkgs.follows = "nixpkgs";
};

disko = {
Expand All @@ -145,7 +146,7 @@
};

givc = {
url = "github:tiiuae/ghaf-givc";
url = "github:tiiuae/ghaf-givc/ff9f60e3059f940fad610c27393b4d101bf6693d";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
Expand Down
7 changes: 6 additions & 1 deletion modules/hardware/x86_64-generic/x86_64-linux.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ in

# Increase the support for different devices by allowing the use
# of proprietary drivers from the respective vendors
nixpkgs.config.allowUnfree = true;
nixpkgs.config = {
allowUnfree = true;
permittedInsecurePackages = [
"jitsi-meet-1.0.8043"
];
};

# Add this for x86_64 hosts to be able to more generically support hardware.
# For example Intel NUC 11's graphics card needs this in order to be able to
Expand Down
3 changes: 3 additions & 0 deletions nix/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
inherit system inputs;
config = {
allowUnfree = true;
permittedInsecurePackages = [
"jitsi-meet-1.0.8043"
];
};
};
# make custom top-level lib available to all `perSystem` functions
Expand Down
Loading
Loading