about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmily Trau <13267947+emilytrau@users.noreply.github.com>2023-12-02 00:12:07 +1100
committerGitHub <noreply@github.com>2023-12-02 00:12:07 +1100
commit91050ea1e57e50388fa87a3302ba12d188ef723a (patch)
tree01edb73498db00f8092989e17155fd446881ea22
parentca9b6bc0a755702153910fd8fe7228517957de5d (diff)
parent69b6e4df0ac1c348a8d8baf599ecd0f54f71817e (diff)
Merge pull request #271211 from ehmry/butt
butt: 0.1.39 -> 0.1.40
-rw-r--r--pkgs/by-name/bu/butt/package.nix (renamed from pkgs/applications/audio/butt/default.nix)12
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/audio/butt/default.nix b/pkgs/by-name/bu/butt/package.nix
index 01e35f9450e71..6f2e7729797c7 100644
--- a/pkgs/applications/audio/butt/default.nix
+++ b/pkgs/by-name/bu/butt/package.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchurl, pkg-config, fltk13, portaudio, lame, libvorbis, libogg
 , flac, libopus, libsamplerate, fdk_aac, dbus, openssl, curl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "butt";
-  version = "0.1.39";
+  version = "0.1.40";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-dh6NceHiqpN6PVwKIo2jV3qCO17P6E6QHdZGRVyd6/g=";
+    url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz";
+    hash = "sha256-wag177UIQ6YpBkJ5XQlxYtTdBFFNO5q+BLD/CiUkGoA=";
   };
 
   postPatch = ''
@@ -38,10 +38,12 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
+    changelog = "https://danielnoethen.de/butt/Changelog.html";
     description =
       "butt (broadcast using this tool) is an easy to use, multi OS streaming tool";
     homepage = "https://danielnoethen.de/butt/";
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ ehmry ];
+    mainProgram = "butt";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb0401e643065..545175af47f0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3594,8 +3594,6 @@ with pkgs;
 
   bunyan-rs = callPackage ../development/tools/bunyan-rs { };
 
-  butt = callPackage ../applications/audio/butt { };
-
   calcure = callPackage ../applications/misc/calcure { };
 
   callaudiod = callPackage ../applications/audio/callaudiod { };