Unverified Commit 24d7abb5 authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

waylock: 1.4.0 -> 1.5.0 

Changelog: https://codeberg.org/ifreund/waylock/releases/tag/v1.5.0
parent 8b54da40

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

+8 −4
Original line number Diff line number Diff line 
# generated by zon2nix (https://github.com/nix-community/zon2nix)



{ linkFarm, fetchzip }:

{

  linkFarm,

  fetchzip,

  fetchgit,

}:



linkFarm "zig-packages" [

  {

    name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl";

    name = "wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27";

    path = fetchzip {

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

      hash = "sha256-ydEavD9z20wRwn9ZVX56ZI2T5i1tnm3LupVxfa30o84=";

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

      hash = "sha256-ulIII5iJpM/W/VJB0HcdktEO2eb9T9J0ln2A1Z94dU4=";

    };

  }

  {

pkgs/by-name/wa/waylock/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -10,23 +10,23 @@ 
  wayland,

  wayland-scanner,

  wayland-protocols,

  zig_0_14,

  zig_0_15,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "waylock";

  version = "1.4.0";

  version = "1.5.0";



  src = fetchFromGitea {

    domain = "codeberg.org";

    owner = "ifreund";

    repo = "waylock";

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

    hash = "sha256-lshXVqSn50AujTjIJIcbyhe5GeLLMdmF+Vh3/QvZt00=";

    hash = "sha256-TSCE6HSGUkXh76epNuJ+AuG/ZCgR0O8EWRDxz9YDuq8=";

  };



  postPatch = ''

    substituteInPlace build.zig --replace-fail "1.4.0-dev" "1.4.0"

    substituteInPlace build.zig --replace-fail "1.4.0-dev" "${finalAttrs.version}"

  '';



  deps = callPackage ./build.zig.zon.nix { };
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { 
    pkg-config

    scdoc

    wayland-scanner

    zig_0_14.hook

    zig_0_15.hook

  ];



  buildInputs = [

pkgs/by-name/wa/waylock/update.sh

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

#!nix-shell -i bash -p bash common-updater-scripts gnused zon2nix



set -e



latest_tag=$(list-git-tags --url=https://codeberg.org/ifreund/waylock | sed 's/^v//' | tail -n 1)



update-source-version waylock "$latest_tag"



wget "https://codeberg.org/ifreund/waylock/raw/tag/v${latest_tag}/build.zig.zon"

nix --extra-experimental-features 'nix-command flakes' run github:nix-community/zon2nix# -- build.zig.zon >pkgs/by-name/wa/waylock/build.zig.zon.nix

# strip file protocol

sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/wa/waylock/build.zig.zon.nix

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

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



rm -f build.zig.zon build.zig.zon2json-lock