chore(3p/sources): Bump channels & overlays
* Remove use of aliases that have been removed in nixpkgs commit a36f455905d55838a0d284656e096fbdb857cf3a: - ncat - x11 - nologin - dbus_libs - emacsPackagesGen - man-pages - pulseaudioLight Change-Id: Ide603bf48bc7f77e10e4aa715ba025aece3644fd Reviewed-on: https://cl.tvl.fyi/c/depot/+/5387 Tested-by: BuildkiteCI Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com>
This commit is contained in:
parent
be87afae1d
commit
508a62b603
13 changed files with 28 additions and 28 deletions
|
@ -3,10 +3,10 @@
|
|||
{ name, src, deps ? (_: [ ]), emacs ? pkgs.emacs27-nox }:
|
||||
|
||||
let
|
||||
inherit (pkgs) emacsPackages emacsPackagesGen;
|
||||
inherit (pkgs) emacsPackages emacsPackagesFor;
|
||||
inherit (builtins) isString toFile;
|
||||
|
||||
finalEmacs = (emacsPackagesGen emacs).emacsWithPackages deps;
|
||||
finalEmacs = (emacsPackagesFor emacs).emacsWithPackages deps;
|
||||
|
||||
srcFile =
|
||||
if isString src
|
||||
|
|
|
@ -71,14 +71,14 @@
|
|||
users.isomer = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "git" ];
|
||||
shell = "${pkgs.nologin}/bin/nologin";
|
||||
shell = "${pkgs.shadow}/bin/nologin";
|
||||
openssh.authorizedKeys.keys = depot.users.isomer.keys.all;
|
||||
};
|
||||
|
||||
users.riking = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "git" ];
|
||||
shell = "${pkgs.nologin}/bin/nologin";
|
||||
shell = "${pkgs.shadow}/bin/nologin";
|
||||
openssh.authorizedKeys.keys = depot.users.riking.keys.u2f ++ depot.users.riking.keys.passworded;
|
||||
};
|
||||
};
|
||||
|
|
2
third_party/buzz/default.nix
vendored
2
third_party/buzz/default.nix
vendored
|
@ -10,7 +10,7 @@ depot.third_party.naersk.buildPackage {
|
|||
|
||||
buildInputs = with pkgs; [
|
||||
pkgconfig
|
||||
dbus_libs
|
||||
dbus
|
||||
glib
|
||||
openssl
|
||||
cairo
|
||||
|
|
24
third_party/sources/sources.json
vendored
24
third_party/sources/sources.json
vendored
|
@ -5,10 +5,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "9a35488970b3f33a6df6a0d9387a0c8c4c555c1d",
|
||||
"sha256": "0akpaw2j5b2jfil9jgyisl5w72np3jm0a3amq2xr5wss8fpnqgxl",
|
||||
"rev": "43fa2ef6dc8e0f9dbbbb26564b22b75478b7ef0b",
|
||||
"sha256": "1kv26dksbwfjkw7vkn366v23b5wk302jpqldrzjlqhmcc22f7bac",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/9a35488970b3f33a6df6a0d9387a0c8c4c555c1d.tar.gz",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/43fa2ef6dc8e0f9dbbbb26564b22b75478b7ef0b.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs": {
|
||||
|
@ -17,10 +17,10 @@
|
|||
"homepage": "",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d",
|
||||
"sha256": "03nb8sbzgc3c0qdr1jbsn852zi3qp74z4qcy7vrabvvly8rbixp2",
|
||||
"rev": "fcd48a5a0693f016a5c370460d0c2a8243b882dc",
|
||||
"sha256": "06nyvac1azpa9gqdhj9py6ljsvbfgx49ilp8kf6w0w9clxba64vg",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/7f9b6e2babf232412682c09e57ed666d8f84ac2d.tar.gz",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/fcd48a5a0693f016a5c370460d0c2a8243b882dc.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
|
@ -29,10 +29,10 @@
|
|||
"homepage": "",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4275a321beab5a71872fb7a5fe5da511bb2bec73",
|
||||
"sha256": "1p3pn7767ifbg08nmgjd93iqk0z87z4lv29ypalj9idwd3chsm69",
|
||||
"rev": "bacbfd713b4781a4a82c1f390f8fe21ae3b8b95b",
|
||||
"sha256": "1nlrizg1bxzihrhy4yfdjigpcg808imp7m1rg7wivq18vln6g4j5",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/4275a321beab5a71872fb7a5fe5da511bb2bec73.tar.gz",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/bacbfd713b4781a4a82c1f390f8fe21ae3b8b95b.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"rustsec-advisory-db": {
|
||||
|
@ -41,10 +41,10 @@
|
|||
"homepage": "https://rustsec.org",
|
||||
"owner": "RustSec",
|
||||
"repo": "advisory-db",
|
||||
"rev": "0ff38eb722fac2ef0f0f353b4775580bfd2067db",
|
||||
"sha256": "1xqlgc8fyv927v4khxbhmv5391r02a0zk3jnmrm1g30lsdhvxs69",
|
||||
"rev": "81e4691173c1506e9b8e7d24f3b191eb27fc1058",
|
||||
"sha256": "0hrlsi0h7mkqka85j84lfz89cbfvslkhmdxfz5mfpd85da0ysk8v",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/RustSec/advisory-db/archive/0ff38eb722fac2ef0f0f353b4775580bfd2067db.tar.gz",
|
||||
"url": "https://github.com/RustSec/advisory-db/archive/81e4691173c1506e9b8e7d24f3b191eb27fc1058.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@ with lib;
|
|||
|
||||
let
|
||||
|
||||
emacsWithPackages = (pkgs.emacsPackagesGen pkgs.emacs27).emacsWithPackages;
|
||||
emacsWithPackages = (pkgs.emacsPackagesFor pkgs.emacs27).emacsWithPackages;
|
||||
|
||||
emacs = emacsWithPackages (p: with p; [
|
||||
org
|
||||
|
|
|
@ -22,7 +22,7 @@ in
|
|||
zip
|
||||
unzip
|
||||
tree
|
||||
ncat
|
||||
nmap
|
||||
bc
|
||||
pv
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
zip
|
||||
unzip
|
||||
tree
|
||||
ncat
|
||||
nmap
|
||||
bc
|
||||
pv
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ let
|
|||
libtool
|
||||
autoconf
|
||||
automake
|
||||
x11
|
||||
xlibsWrapper
|
||||
xorg.libXtst
|
||||
xorg.libXinerama
|
||||
xorg.libxkbfile
|
||||
|
|
|
@ -51,7 +51,7 @@ in
|
|||
gdmap
|
||||
lsof
|
||||
tree
|
||||
ncat
|
||||
nmap
|
||||
iftop
|
||||
|
||||
# Security
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
pkgs.makeOverridable
|
||||
({ emacs ? pkgs.emacsGcc }:
|
||||
let
|
||||
emacsWithPackages = (pkgs.emacsPackagesGen emacs).emacsWithPackages;
|
||||
emacsWithPackages = (pkgs.emacsPackagesFor emacs).emacsWithPackages;
|
||||
|
||||
# If switching telega versions, use this variable because it will
|
||||
# keep the version check, binary path and so on in sync.
|
||||
|
|
|
@ -244,7 +244,7 @@ lib.fix (self: {
|
|||
jq
|
||||
kubectl
|
||||
linuxPackages.perf
|
||||
manpages
|
||||
man-pages
|
||||
miller
|
||||
msmtp
|
||||
nix-prefetch-github
|
||||
|
|
|
@ -294,7 +294,7 @@ lib.fix (self: {
|
|||
imagemagick
|
||||
jq
|
||||
lieer
|
||||
manpages
|
||||
man-pages
|
||||
mosh
|
||||
msmtp
|
||||
mullvad-vpn
|
||||
|
@ -309,7 +309,7 @@ lib.fix (self: {
|
|||
pavucontrol
|
||||
pinentry
|
||||
pinentry-emacs
|
||||
pulseaudioLight # for pactl
|
||||
pulseaudio # for pactl
|
||||
pwgen
|
||||
quasselClient
|
||||
rink
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# TODO(wpcarro): See if it's possible to expose emacsclient on PATH, so that I
|
||||
# don't need to depend on wpcarros-emacs and emacs in my NixOS configurations.
|
||||
let
|
||||
inherit (depot.third_party.nixpkgs) emacsPackagesGen emacs27;
|
||||
inherit (depot.third_party.nixpkgs) emacsPackagesFor emacs27;
|
||||
inherit (depot.users) wpcarro;
|
||||
inherit (lib) mapAttrsToList;
|
||||
inherit (lib.strings) concatStringsSep makeBinPath;
|
||||
|
@ -21,7 +21,7 @@ let
|
|||
])
|
||||
);
|
||||
|
||||
emacsWithPackages = (emacsPackagesGen emacs27).emacsWithPackages;
|
||||
emacsWithPackages = (emacsPackagesFor emacs27).emacsWithPackages;
|
||||
|
||||
wpcarrosEmacs = emacsWithPackages (epkgs:
|
||||
(with epkgs.tvlPackages; [
|
||||
|
|
Loading…
Reference in a new issue