From 5affe35ae19f8eac53a685c55ba67a01be55d1fa Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 15 Mar 2024 11:57:54 +0800 Subject: nixops-dns: use buildGoModule --- pkgs/by-name/ni/nixops-dns/deps.nix | 20 -------------------- pkgs/by-name/ni/nixops-dns/package.nix | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 pkgs/by-name/ni/nixops-dns/deps.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ni/nixops-dns/deps.nix b/pkgs/by-name/ni/nixops-dns/deps.nix deleted file mode 100644 index 7da38f83e7fe..000000000000 --- a/pkgs/by-name/ni/nixops-dns/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "75229eecb7af00b2736e93b779a78429dcb19472"; - sha256 = "1vsjy07kkyx11iz4qsihhykac3ddq3ywdgv6bwrv407504f7x6wl"; - }; - } -] diff --git a/pkgs/by-name/ni/nixops-dns/package.nix b/pkgs/by-name/ni/nixops-dns/package.nix index cf633a65ca53..624b6a0ae517 100644 --- a/pkgs/by-name/ni/nixops-dns/package.nix +++ b/pkgs/by-name/ni/nixops-dns/package.nix @@ -1,23 +1,24 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "nixops-dns"; - version = "1.0"; - - goDeps = ./deps.nix; - goPackagePath = "github.com/kamilchm/nixops-dns"; + version = "1.0.1"; src = fetchFromGitHub { - owner = "kamilchm"; + owner = "museoa"; repo = "nixops-dns"; rev = "v${version}"; - sha256 = "1fyqwk2knrv40zpf71a56bjyaycr3p6fzrqq7gaan056ydy83cai"; + hash = "sha256-d3vVm6YeQTOAE5HFSKI01L9ZqfbQKrdoLsMwHP5HulE="; }; + vendorHash = "sha256-3DVNjvW0AAdogpTi3GMnn92FqqOUWNdQvRBityyKwcI="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { - homepage = "https://github.com/kamilchm/nixops-dns/"; + homepage = "https://github.com/museoa/nixops-dns"; description = "DNS server for resolving NixOps machines"; license = licenses.mit; maintainers = with maintainers; [ kamilchm sorki ]; -- cgit 1.4.1 From 60452dc8715005ece22916d73c346247f35b9be3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 17 Mar 2024 01:32:23 +0100 Subject: unciv: move to pkgs/by-name --- pkgs/by-name/un/unciv/package.nix | 62 +++++++++++++++++++++++++++++++++++++++ pkgs/games/unciv/default.nix | 62 --------------------------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 62 insertions(+), 64 deletions(-) create mode 100644 pkgs/by-name/un/unciv/package.nix delete mode 100644 pkgs/games/unciv/default.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix new file mode 100644 index 000000000000..b017677e8b59 --- /dev/null +++ b/pkgs/by-name/un/unciv/package.nix @@ -0,0 +1,62 @@ +{ stdenv +, lib +, fetchurl +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, jre +, libGL +, libpulseaudio +, libXxf86vm +}: +let + desktopItem = makeDesktopItem { + name = "unciv"; + exec = "unciv"; + comment = "An open-source Android/Desktop remake of Civ V"; + desktopName = "Unciv"; + categories = [ "Game" ]; + }; + + envLibPath = lib.makeLibraryPath (lib.optionals stdenv.isLinux [ + libGL + libpulseaudio + libXxf86vm + ]); + +in +stdenv.mkDerivation rec { + pname = "unciv"; + version = "4.10.19"; + + src = fetchurl { + url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; + hash = "sha256-f9fg2Clz9CjoC8xzCguJ2A3Aczom+KjEyIlMJC2oS/o="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + + installPhase = '' + runHook preInstall + + makeWrapper ${jre}/bin/java $out/bin/unciv \ + --prefix LD_LIBRARY_PATH : "${envLibPath}" \ + --prefix PATH : ${lib.makeBinPath [ jre ]} \ + --add-flags "-jar ${src}" + + runHook postInstall + ''; + + desktopItems = [ desktopItem ]; + + meta = with lib; { + description = "An open-source Android/Desktop remake of Civ V"; + homepage = "https://github.com/yairm210/Unciv"; + maintainers = with maintainers; [ tex ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.mpl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix deleted file mode 100644 index b017677e8b59..000000000000 --- a/pkgs/games/unciv/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv -, lib -, fetchurl -, copyDesktopItems -, makeDesktopItem -, makeWrapper -, jre -, libGL -, libpulseaudio -, libXxf86vm -}: -let - desktopItem = makeDesktopItem { - name = "unciv"; - exec = "unciv"; - comment = "An open-source Android/Desktop remake of Civ V"; - desktopName = "Unciv"; - categories = [ "Game" ]; - }; - - envLibPath = lib.makeLibraryPath (lib.optionals stdenv.isLinux [ - libGL - libpulseaudio - libXxf86vm - ]); - -in -stdenv.mkDerivation rec { - pname = "unciv"; - version = "4.10.19"; - - src = fetchurl { - url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-f9fg2Clz9CjoC8xzCguJ2A3Aczom+KjEyIlMJC2oS/o="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; - - installPhase = '' - runHook preInstall - - makeWrapper ${jre}/bin/java $out/bin/unciv \ - --prefix LD_LIBRARY_PATH : "${envLibPath}" \ - --prefix PATH : ${lib.makeBinPath [ jre ]} \ - --add-flags "-jar ${src}" - - runHook postInstall - ''; - - desktopItems = [ desktopItem ]; - - meta = with lib; { - description = "An open-source Android/Desktop remake of Civ V"; - homepage = "https://github.com/yairm210/Unciv"; - maintainers = with maintainers; [ tex ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mpl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d03765c9b5c..a7a8abe2b2ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38027,8 +38027,6 @@ with pkgs; umoria = callPackage ../games/umoria { }; - unciv = callPackage ../games/unciv { }; - unnethack = callPackage ../games/unnethack { }; uqm = callPackage ../games/uqm { }; -- cgit 1.4.1 From 74f896c5ecb62769cc69bade9cb7bf049e3213aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 00:44:55 +0000 Subject: fleng: 19 -> 20 --- pkgs/by-name/fl/fleng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/fl/fleng/package.nix b/pkgs/by-name/fl/fleng/package.nix index 3f825bde28cc..e7010f3882bd 100644 --- a/pkgs/by-name/fl/fleng/package.nix +++ b/pkgs/by-name/fl/fleng/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fleng"; - version = "19"; + version = "20"; src = fetchurl { url = "http://www.call-with-current-continuation.org/fleng/fleng-${finalAttrs.version}.tgz"; - hash = "sha256-xYMNGS3avZ9JsR8kJlSHz+C2XsLmhsDO/KTr5JquRK8="; + hash = "sha256-kkouDNbdVGE7vskmu8kISA/RHIGed5vLY/ch4qgew3g="; }; doCheck = true; -- cgit 1.4.1 From 133b8d5e36cd02ea302b8f0d19bc4cbd0b2b0667 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 05:56:32 +0000 Subject: uxn: unstable-2024-03-10 -> unstable-2024-03-16 --- pkgs/by-name/ux/uxn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 86162829b87d..0569d11fa1f2 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "unstable-2024-03-10"; + version = "unstable-2024-03-16"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "cf964e43777bcce2e938964a5c764d1318e52ea6"; - hash = "sha256-NBIfpdZT9MjSUX+JUAoN1kkHKknsbRvaPMSaGmBXmac="; + rev = "5d3cf8b61457fea833d3e232297b378ba54c8350"; + hash = "sha256-PXXsMKAPRUs4/Y4s/NBorcJmv7RtNK7UlRgmyowrm3A="; }; outputs = [ "out" "projects" ]; -- cgit 1.4.1 From a89e9c88410251fb2a318947890cdf0ef8f24685 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 17 Mar 2024 10:16:23 +0100 Subject: nixos-anywhere: 1.1.1 -> 1.1.2 Diff: https://github.com/numtide/nixos-anywhere/compare/1.1.1...1.1.2 --- pkgs/by-name/ni/nixos-anywhere/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index e8b7790ab1c8..197a320d4c62 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -28,12 +28,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-GN0G3g3QEzb2ZG3zSzbRaRBsmQsWJu81CZy9mIofRZ0="; + hash = "sha256-JzgZnHQ4Bknh1ebE4iMVzR3cWZG+8k7MRy0X7cNSnBE="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' -- cgit 1.4.1 From 5a459174ce15e6f846edef049177b751d13d62f8 Mon Sep 17 00:00:00 2001 From: hexchen Date: Sun, 17 Mar 2024 14:13:35 +0000 Subject: VictoriaMetrics: re-include vmalert This was broken by https://github.com/NixOS/nixpkgs/pull/293328 / ee411f2c1ba132a5d96199b6e3132611b7443293 --- pkgs/by-name/vi/victoriametrics/package.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index f441e03d8371..ad76b67df1bd 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -21,6 +21,7 @@ buildGoModule rec { "app/vlstorage" "app/vmagent" "app/vmalert-tool" + "app/vmalert" "app/vmauth" "app/vmctl" "app/vminsert" -- cgit 1.4.1