diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-22 12:02:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 12:02:02 +0000 |
| commit | e452d308f5c318e10309418f61d69a396a8a624b (patch) | |
| tree | 01c238456ebb0c47ce9a183e8745fe4a196e05d7 /pkgs/misc | |
| parent | c62314becb00868a0bb3d19d47fdbacc493926bd (diff) | |
| parent | b3073600d2b082cd6e8a9c0ed84096b6c7dc4aa4 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/screensavers/alock/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/xtrlock-pam/default.nix | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 5f0c5ad9e29e0..87c81531122a0 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchgit, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { pname = "alock"; version = "unstable-2017-07-20"; - src = fetchgit { - url = "https://github.com/Arkq/alock"; + src = fetchFromGitHub { + owner = "Arkq"; + repo = "alock"; rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; - sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6"; + sha256 = "sha256-Rm00ytSfEv5Wljz4f/4bbyrK3sCV/oRUwz4DKx0pya8="; }; PAM_DEFAULT_SERVICE = "login"; diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index ffb9d0da8570e..ac4c8197e554d 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }: +{ lib, stdenv, fetchFromGitHub, python2, pkg-config, xlibsWrapper, pam }: stdenv.mkDerivation { pname = "xtrlock-pam"; version = "3.4-post-20150909"; - src = fetchgit { - url = "https://github.com/aanatoly/xtrlock-pam"; + src = fetchFromGitHub { + owner = "aanatoly"; + repo = "xtrlock-pam"; rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6"; - sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc"; + sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw="; }; nativeBuildInputs = [ pkg-config ]; |