Unverified Commit 25361ae8 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #313294 from adamcstephens/waylock/1.1.0 

waylock: 1.0.0 -> 1.1.0
parents 436ee133 dd928b50

pkgs/by-name/wa/waylock/build.zig.zon.nix

0 → 100644
+20 −0
Original line number Diff line number Diff line 
# generated by zon2nix (https://github.com/nix-community/zon2nix)



{ linkFarm, fetchzip }:



linkFarm "zig-packages" [

  {

    name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017";

    path = fetchzip {

      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz";

      hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg=";

    };

  }

  {

    name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d";

    path = fetchzip {

      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz";

      hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA=";

    };

  }

]

pkgs/applications/misc/waylock/default.nix→pkgs/by-name/wa/waylock/package.nix

+26 −15
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitea

, libxkbcommon

, pam

, pkg-config

, scdoc

, wayland

, wayland-protocols

, zig_0_11

{

  lib,

  stdenv,

  callPackage,

  fetchFromGitea,

  libxkbcommon,

  pam,

  pkg-config,

  scdoc,

  wayland,

  wayland-protocols,

  zig_0_12,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "waylock";

  version = "1.0.0";

  version = "1.1.0";



  src = fetchFromGitea {

    domain = "codeberg.org";
@@ -20,14 +22,16 @@ stdenv.mkDerivation (finalAttrs: { 
    repo = "waylock";

    rev = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-Z5YNaR+jocJ4hS7NT8oAlrMnqNfD8KRzOyyqdVGDSl0=";

    hash = "sha256-U8xJucLpmeLdmSUc+AVSH/mlv6UOXsxotJPTMK7lnkA=";

  };



  deps = callPackage ./build.zig.zon.nix { };



  nativeBuildInputs = [

    pkg-config

    scdoc

    wayland

    zig_0_11.hook

    zig_0_12.hook

  ];



  buildInputs = [
@@ -36,7 +40,11 @@ stdenv.mkDerivation (finalAttrs: { 
    pam

  ];



  zigBuildFlags = [ "-Dman-pages" ];

  zigBuildFlags = [

    "-Dman-pages"

    "--system"

    "${finalAttrs.deps}"

  ];



  passthru.updateScript = ./update.nu;
@@ -45,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: { 
    changelog = "https://codeberg.org/ifreund/waylock/releases/tag/v${finalAttrs.version}";

    description = "A small screenlocker for Wayland compositors";

    license = lib.licenses.isc;

    maintainers = with lib.maintainers; [ adamcstephens jordanisaacs ];

    maintainers = with lib.maintainers; [

      adamcstephens

      jordanisaacs

    ];

    mainProgram = "waylock";

    platforms = lib.platforms.linux;

  };

pkgs/applications/misc/waylock/update.nu→pkgs/by-name/wa/waylock/update.nu

+8 −0
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -i nu -p nushell common-updater-scripts

#!nix-shell -i nu -p nushell common-updater-scripts zon2nix



let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last

update-source-version waylock $latest_tag



http get $"https://codeberg.org/ifreund/waylock/raw/tag/v($latest_tag)/build.zig.zon" | save build.zig.zon

zon2nix > pkgs/by-name/wa/waylock/build.zig.zon.nix

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -31767,8 +31767,6 @@ with pkgs; 














  waycorner = callPackage ../applications/misc/waycorner { };



























  waylock = callPackage ../applications/misc/waylock { };



























  wayshot = callPackage ../tools/misc/wayshot { };





























  waylevel = callPackage ../tools/misc/waylevel { };