Update dependencies
This commit is contained in:
parent
f18d747c9f
commit
7f9849fe70
3 changed files with 56 additions and 19 deletions
36
flake.lock
generated
36
flake.lock
generated
|
@ -45,11 +45,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697989111,
|
"lastModified": 1698273713,
|
||||||
"narHash": "sha256-4W53dlz5bYXjTrtNH3BQ6p+MbP2tvq74FCez/u201yA=",
|
"narHash": "sha256-HwQzXKznxDnsK3leDZLFiCQISMnLAeuw3SmaCf204Bs=",
|
||||||
"owner": "accentor",
|
"owner": "accentor",
|
||||||
"repo": "api",
|
"repo": "api",
|
||||||
"rev": "8801a26c39e3c4993810a7b92bab45d4124e07bf",
|
"rev": "8d5001a3022020926c126801c63ebb59c0308e95",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -71,11 +71,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697881517,
|
"lastModified": 1698273805,
|
||||||
"narHash": "sha256-uaUD335S66OXs9d4FVixfXnIQ8fAJinpDqVW4AvfwiU=",
|
"narHash": "sha256-K3Tf2G4qbL2MCCe914/T+CoTrt17K9Uqb+N1iUH8R80=",
|
||||||
"owner": "accentor",
|
"owner": "accentor",
|
||||||
"repo": "web",
|
"repo": "web",
|
||||||
"rev": "903d189be6219b16795b11169fe9aa6ca539e35b",
|
"rev": "4c4744634e01003f95ce53a7fc5fb4e8b67b4fa9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -211,11 +211,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698259861,
|
"lastModified": 1698294534,
|
||||||
"narHash": "sha256-NaqlGTqSVOkJPs7m6wb2IBk5gCsOhP/r6t94oB3zlpE=",
|
"narHash": "sha256-PbJHPi9gGITjSNF9Vrcz19QqNjOYhRugx2QuQ2IAIwY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "5bf36bac3904c4138ffc2eb85523d2ffb60ef010",
|
"rev": "2a5b681a554bc4afdf840201b4f51a09ab23e9b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -431,11 +431,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697723726,
|
"lastModified": 1698134075,
|
||||||
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
|
"narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
|
"rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -509,11 +509,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698263176,
|
"lastModified": 1698301517,
|
||||||
"narHash": "sha256-leypcSTr3PfnK3s+t88waX5CnFzKXdZT6er9SOuBcxs=",
|
"narHash": "sha256-omZUrQefrUoluVlpRi2Ne06rA6bLyxZ/7nOH7vqwL0s=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "9aedcba51fa1da3c2ce70e25c13fe2ad6a8666bc",
|
"rev": "985450f07ced08b5dc248d7382d80b2defd42083",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -655,11 +655,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698220763,
|
"lastModified": 1698269770,
|
||||||
"narHash": "sha256-gHqyQYw0FFlrFozaMHvwMZU+U7sqHQF6OhQnQyrDj0A=",
|
"narHash": "sha256-kwMIkEWrqw3DUfBXi+7TpdvtPsTCT2sDpkGXi3oAiXk=",
|
||||||
"owner": "chvp",
|
"owner": "chvp",
|
||||||
"repo": "tetris",
|
"repo": "tetris",
|
||||||
"rev": "685c89feb9794733a80845d4cb30abb66216a654",
|
"rev": "1c07117badb79e439a6bed9bdb101f01e31e4b3d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -135,7 +135,11 @@
|
||||||
{
|
{
|
||||||
nixpkgs.pkgs = import nixpkgs {
|
nixpkgs.pkgs = import nixpkgs {
|
||||||
inherit overlays system;
|
inherit overlays system;
|
||||||
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.chvp.base.nix.unfreePackages;
|
config = {
|
||||||
|
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.chvp.base.nix.unfreePackages;
|
||||||
|
# I really need this for my PhD thesis
|
||||||
|
permittedInsecurePackages = [ "zotero-6.0.27" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
networking.hostName = name;
|
networking.hostName = name;
|
||||||
nix = {
|
nix = {
|
||||||
|
|
33
patches/263531.patch
Normal file
33
patches/263531.patch
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
|
||||||
|
index 2307c4db01e30e..15ef2f5d4f22c3 100644
|
||||||
|
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
|
||||||
|
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
, nodejs
|
||||||
|
, fetchYarnDeps
|
||||||
|
, fixup_yarn_lock
|
||||||
|
-, electron_24
|
||||||
|
+, electron_27
|
||||||
|
, libpulseaudio
|
||||||
|
, pipewire
|
||||||
|
, alsa-utils
|
||||||
|
@@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
|
yarn --offline electron-builder \
|
||||||
|
--dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
|
||||||
|
- -c.electronDist=${electron_24}/libexec/electron \
|
||||||
|
- -c.electronVersion=${electron_24.version}
|
||||||
|
+ -c.electronDist=${electron_27}/libexec/electron \
|
||||||
|
+ -c.electronVersion=${electron_27.version}
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
popd
|
||||||
|
|
||||||
|
# Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing
|
||||||
|
- makeWrapper '${electron_24}/bin/electron' "$out/bin/teams-for-linux" \
|
||||||
|
+ makeWrapper '${electron_27}/bin/electron' "$out/bin/teams-for-linux" \
|
||||||
|
${lib.optionalString stdenv.isLinux ''
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \
|
||||||
|
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
|
Loading…
Add table
Add a link
Reference in a new issue