diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/servers/bird-lg | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/bird-lg')
| -rw-r--r-- | nixpkgs/pkgs/servers/bird-lg/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/servers/bird-lg/default.nix b/nixpkgs/pkgs/servers/bird-lg/default.nix index f5294c2a191a..3bd0df7072b3 100644 --- a/nixpkgs/pkgs/servers/bird-lg/default.nix +++ b/nixpkgs/pkgs/servers/bird-lg/default.nix @@ -3,13 +3,13 @@ let generic = { modRoot, vendorSha256 }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "unstable-2022-05-08"; + version = "1.2.0"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; - rev = "348295b9aa954a92df2cf6b1179846a9486dafc0"; - sha256 = "sha256-2t8ZP9Uc0sJlqWiJMq3MVoARfMKsuTXJkuOid0oWgyY="; + rev = "v${version}"; + sha256 = "sha256-Ldp/c1UU5EFnKjlUqQ+Hh6rVEOYEX7kaDL36edr9pNA="; }; doDist = false; @@ -24,6 +24,7 @@ let meta = with lib; { description = "Bird Looking Glass"; homepage = "https://github.com/xddxdd/bird-lg-go"; + changelog = "https://github.com/xddxdd/bird-lg-go/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ tchekda ]; }; @@ -31,12 +32,17 @@ let bird-lg-frontend = generic { modRoot = "frontend"; - vendorSha256 = "sha256-WKuVGiSV5LZrJ8/672TRN6tZNQxdCktHV6nx0ZxCP4A="; + vendorSha256 = "sha256-lYOi3tfXYhsFaWgikDUoJYRm8sxFNFKiFQMlVx/8AkA="; }; bird-lg-proxy = generic { modRoot = "proxy"; - vendorSha256 = "sha256-7LZeCY4xSxREsQ+Dc2XSpu2ZI8CLE0mz0yoThP7/OO4="; + vendorSha256 = "sha256-QHLq4RuQaCMjefs7Vl7zSVgjLMDXvIZcM8d6/B5ECZc="; }; in -symlinkJoin { name = "bird-lg"; paths = [ bird-lg-frontend bird-lg-proxy ]; } +symlinkJoin { + name = "bird-lg-${bird-lg-frontend.version}"; + paths = [ bird-lg-frontend bird-lg-proxy ]; +} // { + inherit (bird-lg-frontend) version meta; +} |