From 3e204f058955d07756b60f8ffe189099b32208ba Mon Sep 17 00:00:00 2001 From: Ivar Date: Tue, 5 May 2020 15:22:25 +0200 Subject: [PATCH 01/13] betterdiscordctl: init at 1.7.0 --- pkgs/tools/misc/betterdiscordctl/default.nix | 37 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/misc/betterdiscordctl/default.nix diff --git a/pkgs/tools/misc/betterdiscordctl/default.nix b/pkgs/tools/misc/betterdiscordctl/default.nix new file mode 100644 index 000000000000..9d6159bda50e --- /dev/null +++ b/pkgs/tools/misc/betterdiscordctl/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "betterdiscordctl"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "bb010g"; + repo = "betterdiscordctl"; + rev = "v${version}"; + sha256 = "0qpmm5l8jhm7k0kqblc0bnr9fl4b6z8iddhjar03bb4kqgr962fa"; + }; + + patches = [ + (fetchpatch { # Required till https://github.com/bb010g/betterdiscordctl/pull/67 is merged upstream. + url = "https://github.com/bb010g/betterdiscordctl/pull/67/commits/f1c7170fc2626d9aec4d244977b5a73c401aa1d4.patch"; + sha256 = "003zqd9ljb9h674sjwjvvdfs7q4cw0p1ydg3lax132vb4vz9k0zi"; + }) + ]; + + preBuild = "sed -i 's/^nix=$/&yes/g;s/^DISABLE_UPGRADE=$/&yes/g' ./betterdiscordctl"; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/doc/betterdiscordctl + install -Dm744 betterdiscordctl $out/bin/betterdiscordctl + install -Dm644 README.md $out/share/doc/betterdiscordctl/README.md + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/bb010g/betterdiscordctl"; + description = "A utility for managing BetterDiscord on Linux"; + license = licenses.mit; + maintainers = with maintainers; [ ivar bb010g ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf92cae7a6ac..08887371b459 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -756,6 +756,8 @@ in berglas = callPackage ../tools/admin/berglas/default.nix { }; + betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; From dc0a708c02feec1f8d31a30988beb092e947898d Mon Sep 17 00:00:00 2001 From: Llathasa Veleth Date: Mon, 28 Dec 2020 22:30:54 +0300 Subject: [PATCH 02/13] maintainers: add vel --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 93c6422744f9..d58ce2fabd9b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9374,6 +9374,12 @@ fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; }]; }; + vel = { + email = "llathasa@outlook.com"; + github = "llathasa-veleth"; + githubId = 61933599; + name = "vel"; + }; velovix = { email = "xaviosx@gmail.com"; github = "velovix"; From 969356d3aeaf663d609b59389a6322a9556439bf Mon Sep 17 00:00:00 2001 From: Llathasa Veleth Date: Mon, 28 Dec 2020 22:31:16 +0300 Subject: [PATCH 03/13] disfetch: init at 1.12 --- pkgs/tools/misc/disfetch/default.nix | 29 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/disfetch/default.nix diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix new file mode 100644 index 000000000000..d80247801f0c --- /dev/null +++ b/pkgs/tools/misc/disfetch/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "disfetch"; + version = "1.12"; + + src = fetchFromGitHub { + owner = "llathasa-veleth"; + repo = "disfetch"; + rev = version; + sha256 = "1zm8q0fx695x28zg8ihzk3w41439v47n68cw6k551x31mls939yn"; + }; + + dontBuild = true; + + installPhase = '' + install -Dm755 -t $out/bin disfetch + ''; + + meta = with lib; { + description = "Yet another *nix distro fetching program, but less complex"; + homepage = "https://github.com/llathasa-veleth/disfetch"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.vel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b183ed808f06..6929af52b4fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2003,6 +2003,8 @@ in discocss = callPackage ../tools/misc/discocss { }; + disfetch = callPackage ../tools/misc/disfetch { }; + disk-filltest = callPackage ../tools/system/disk-filltest { }; diskscan = callPackage ../tools/misc/diskscan { }; From 22c90458daf3d989ff3e44ed37ba92ed96b135a0 Mon Sep 17 00:00:00 2001 From: Hiren Shah Date: Tue, 29 Dec 2020 18:09:41 +0000 Subject: [PATCH 04/13] maintainers: add hirenashah --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 93c6422744f9..b91983be0421 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3607,6 +3607,12 @@ email = "t@larkery.com"; name = "Tom Hinton"; }; + hirenashah = { + email = "hiren@hiren.io"; + github = "hirenashah"; + githubId = 19825977; + name = "Hiren Shah"; + }; hjones2199 = { email = "hjones2199@gmail.com"; github = "hjones2199"; From 0e5bad71c805eb167ec78f436e507d0fece2b175 Mon Sep 17 00:00:00 2001 From: Hiren Shah Date: Fri, 4 Sep 2020 18:12:39 +0100 Subject: [PATCH 05/13] plujain-ramp: init at v1.1.3 --- .../audio/plujain-ramp/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/audio/plujain-ramp/default.nix diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/applications/audio/plujain-ramp/default.nix new file mode 100644 index 000000000000..2523c5a56578 --- /dev/null +++ b/pkgs/applications/audio/plujain-ramp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, lv2 }: + +stdenv.mkDerivation rec { + version = "v1.1.3"; + pname = "plujain-ramp"; + + src = fetchFromGitHub { + owner = "Houston4444"; + repo = "plujain-ramp"; + rev = "1bc1fed211e140c7330d6035122234afe78e5257"; + sha256 = "1k7qpr8c15d623c4zqxwdklp98amildh03cqsnqq5ia9ba8z3016"; + }; + + buildInputs = [ + lv2 + ]; + + installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; + + meta = with stdenv.lib; { + description = "A mono rhythmic tremolo LV2 Audio Plugin"; + homepage = "https://github.com/Houston4444/plujain-ramp"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = [ maintainers.hirenashah ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27c565bce0c7..151975dafe6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6650,6 +6650,8 @@ in playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { }; + plujain-ramp = callPackage ../applications/audio/plujain-ramp { }; + plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; From a69b5bf7ec4a402c6eff2f46d418f8f805a6f5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Dec 2020 03:05:47 +0100 Subject: [PATCH 06/13] gitoxide: Fix build on darwin --- .../version-management/gitoxide/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index bdb3e4825b92..f7a17e510f4b 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; - meta = with lib; { - description = - "A command-line application for interacting with git repositories"; + meta = with stdenv.lib; { + description = "A command-line application for interacting with git repositories"; homepage = "https://github.com/Byron/gitoxide"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.syberant ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b17319f106d..ee98e83e9a26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21720,7 +21720,9 @@ in gitolite = callPackage ../applications/version-management/gitolite { }; - gitoxide = callPackage ../applications/version-management/gitoxide { }; + gitoxide = callPackage ../applications/version-management/gitoxide { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (gnome3) gitg; From a9ecac2538ac0ab3d1ce42ec34b0ea18699f7844 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 30 Dec 2020 00:23:21 -0600 Subject: [PATCH 07/13] tensorflow1: disable sysctl.h in hwloc We need to override tensorflow's hwloc configuration, since it forces sysctl.h usage which is removed since glibc 2.31. This does not appear to effect tensorflow2. See also https://github.com/tensorflow/tensorflow/issues/45861 Fixes #104801 --- pkgs/development/python-modules/tensorflow/1/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 599f809f8646..4dd30e4687ad 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -258,6 +258,11 @@ let substituteInPlace tensorflow/tools/pip_package/setup.py \ --replace "numpy >= 1.16.0, < 1.19.0" "numpy >= 1.16.0" + + # glibc 2.31+ does not have sys/sysctl.h + # see https://github.com/tensorflow/tensorflow/issues/45861 + substituteInPlace third_party/hwloc/BUILD.bazel\ + --replace "#define HAVE_SYS_SYSCTL_H 1" "#undef HAVE_SYS_SYSCTL_H" ''; preConfigure = let From 31f845840c2baf8aa56f602fae518b640a9bd220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 12 Dec 2020 12:44:57 +0000 Subject: [PATCH 08/13] mindforger: 1.48.2 -> 1.52.0 --- .../editors/mindforger/build.patch | 57 ++----------------- .../editors/mindforger/default.nix | 32 +++++------ 2 files changed, 20 insertions(+), 69 deletions(-) diff --git a/pkgs/applications/editors/mindforger/build.patch b/pkgs/applications/editors/mindforger/build.patch index e2745cbce2d0..e9b9244f8dbd 100644 --- a/pkgs/applications/editors/mindforger/build.patch +++ b/pkgs/applications/editors/mindforger/build.patch @@ -1,17 +1,8 @@ diff --git a/app/app.pro b/app/app.pro -index 4d47065..a39a320 100644 +index 29f9d9e..15fd2ff 100644 --- a/app/app.pro +++ b/app/app.pro -@@ -18,6 +18,8 @@ - TARGET = mindforger - TEMPLATE = app - -+include(../config.pri) -+ - QT += widgets - - mfner { -@@ -297,7 +299,7 @@ RESOURCES += \ +@@ -370,7 +370,7 @@ RESOURCES += \ # See http://doc.qt.io/qt-5/qmake-advanced-usage.html binfile.files += mindforger @@ -20,51 +11,11 @@ index 4d47065..a39a320 100644 INSTALLS += binfile # ######################################## -diff --git a/config.pri b/config.pri -new file mode 100644 -index 0000000..ce05df1 ---- /dev/null -+++ b/config.pri -@@ -0,0 +1,3 @@ -+isEmpty(PREFIX) { -+ PREFIX = /usr -+} -diff --git a/deps/discount/discount.pro b/deps/discount/discount.pro -index a8dfe35..ec16468 100644 ---- a/deps/discount/discount.pro -+++ b/deps/discount/discount.pro -@@ -5,6 +5,8 @@ - # Webpage: http://www.pell.portland.or.us/~orc/Code/discount/ - # - -+include(../../config.pri) -+ - QT -= core gui - - TARGET = discount -@@ -46,7 +48,7 @@ unix:!symbian { - maemo5 { - target.path = /opt/usr/lib - } else { -- target.path = /usr/lib -+ target.path = $$PREFIX/lib - } - INSTALLS += target - } diff --git a/mindforger.pro b/mindforger.pro -index ae627f2..0953856 100644 +index bd4f21d..6bb2dbc 100644 --- a/mindforger.pro +++ b/mindforger.pro -@@ -32,6 +32,8 @@ TEMPLATE = subdirs - - SUBDIRS = deps lib app - -+include(config.pri) -+ - # build dependencies - lib.depends = deps - app.depends = lib -@@ -44,20 +46,20 @@ app.depends = lib +@@ -43,20 +43,20 @@ app.depends = lib #IMPORTANT: binfile MUST be specified in app/app.pro (project next to/that builds binary) docfiles.files += doc/* diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 82aa38c14499..f7e244342257 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -1,35 +1,34 @@ -{ mkDerivation, stdenv, fetchurl, qmake, qtbase, qtwebkit }: +{ mkDerivation +, cmark-gfm +, fetchurl +, qmake +, qtbase +, qtwebkit +, stdenv +, wrapGAppsHook +}: mkDerivation rec { pname = "mindforger"; - version = "1.48.2"; + version = "1.52.0"; src = fetchurl { - url = "https://github.com/dvorka/mindforger/releases/download/1.48.0/mindforger_${version}.tgz"; - sha256 = "1wlrl8hpjcpnq098l3n2d1gbhbjylaj4z366zvssqvmafr72iyw4"; + url = "https://github.com/dvorka/mindforger/releases/download/${version}/mindforger_${version}.tgz"; + sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd"; }; - nativeBuildInputs = [ qmake ] ; - buildInputs = [ qtbase qtwebkit ] ; + nativeBuildInputs = [ qmake wrapGAppsHook ] ; + buildInputs = [ qtbase qtwebkit cmark-gfm ] ; doCheck = true; - enableParallelBuilding = true ; - patches = [ ./build.patch ] ; postPatch = '' - substituteInPlace deps/discount/version.c.in --subst-var-by TABSTOP 4 + substituteInPlace lib/src/install/installer.cpp --replace /usr "$out" substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out" ''; - preConfigure = '' - export AC_PATH="$PATH" - pushd deps/discount - ./configure.sh - popd - ''; - qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ; meta = with stdenv.lib; { @@ -41,5 +40,6 @@ mkDerivation rec { homepage = "https://www.mindforger.com"; license = licenses.gpl2Plus; platforms = platforms.all; + maintainers = with maintainers; [ cyplo ]; }; } From baf64804e72e373004a21136f63e0bac39fd235d Mon Sep 17 00:00:00 2001 From: jakeisnt Date: Wed, 30 Dec 2020 12:59:51 -0800 Subject: [PATCH 09/13] maintainers: add jakeisnt Sort jakeisnt in maintainer list maintainers: add jakeisnt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ce46ff64365..dd6afb408531 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3923,6 +3923,12 @@ githubId = 2179419; name = "Arseniy Seroka"; }; + jakeisnt = { + name = "Jacob Chvatal"; + email = "jake@isnt.online"; + github = "jakeisnt"; + githubId = 29869612; + }; jakelogemann = { email = "jake.logemann@gmail.com"; github = "jakelogemann"; From 0d3e387ff35498284ac70a4330e96cea5929ff7d Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Wed, 30 Dec 2020 15:28:26 -0600 Subject: [PATCH 10/13] koreader: license update agpl3 -> agpl3Only agpl3 license is now deprecated in nixpkgs. Upstream license does not indicate that future versions of agpl apply. --- pkgs/applications/misc/koreader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index e870986a50aa..54d6a66fc088 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; platforms = intersectLists platforms.x86_64 platforms.linux; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; }; } From 657c280e483214939245aef90fbb999f6b5bdbe3 Mon Sep 17 00:00:00 2001 From: jakeisnt Date: Thu, 31 Dec 2020 15:19:56 -0800 Subject: [PATCH 11/13] mopidy: sort package declarations --- pkgs/applications/audio/mopidy/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index fc532482cba4..b7e6b8c19c0c 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -14,9 +14,9 @@ let mopidy-gmusic = callPackage ./gmusic.nix { }; - mopidy-local = callPackage ./local.nix { }; + mopidy-iris = callPackage ./iris.nix { }; - mopidy-spotify = callPackage ./spotify.nix { }; + mopidy-local = callPackage ./local.nix { }; mopidy-moped = callPackage ./moped.nix { }; @@ -26,20 +26,19 @@ let mopidy-mpris = callPackage ./mpris.nix { }; + mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + mopidy-somafm = callPackage ./somafm.nix { }; - mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; - - mopidy-youtube = callPackage ./youtube.nix { }; - mopidy-soundcloud = callPackage ./soundcloud.nix { }; - mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + mopidy-spotify = callPackage ./spotify.nix { }; - mopidy-iris = callPackage ./iris.nix { }; + mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; mopidy-tunein = callPackage ./tunein.nix { }; + mopidy-youtube = callPackage ./youtube.nix { }; }; in self From c3920418a566cfeb041622be2242b6fbd40e58eb Mon Sep 17 00:00:00 2001 From: jakeisnt Date: Thu, 31 Dec 2020 16:53:38 -0800 Subject: [PATCH 12/13] mopidy-scrobbler: init at 2.0.1 --- pkgs/applications/audio/mopidy/default.nix | 2 ++ pkgs/applications/audio/mopidy/scrobbler.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 27 insertions(+) create mode 100644 pkgs/applications/audio/mopidy/scrobbler.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index b7e6b8c19c0c..f4d4e416de40 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -28,6 +28,8 @@ let mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + mopidy-scrobbler = callPackage ./scrobbler.nix { }; + mopidy-somafm = callPackage ./somafm.nix { }; mopidy-soundcloud = callPackage ./soundcloud.nix { }; diff --git a/pkgs/applications/audio/mopidy/scrobbler.nix b/pkgs/applications/audio/mopidy/scrobbler.nix new file mode 100644 index 000000000000..19c5a29c8a47 --- /dev/null +++ b/pkgs/applications/audio/mopidy/scrobbler.nix @@ -0,0 +1,24 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-Scrobbler"; + version = "2.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "11vxgax4xgkggnq4fr1rh2rcvzspkkimck5p3h4phdj3qpnj0680"; + }; + + propagatedBuildInputs = with python3Packages; [ mopidy pylast ]; + + # no tests implemented + doCheck = false; + pythonImportsCheck = [ "mopidy_scrobbler" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mopidy/mopidy-scrobbler"; + description = "Mopidy extension for scrobbling played tracks to Last.fm."; + license = licenses.asl20; + maintainers = with maintainers; [ jakeisnt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7c9bf7f5370..e85d7fb78d5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22913,6 +22913,7 @@ in mopidy-mpd mopidy-mpris mopidy-musicbox-webclient + mopidy-scrobbler mopidy-somafm mopidy-soundcloud mopidy-spotify From ac47ac9cb72b8b5f14def1d390d4227af7579974 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 11 Dec 2020 16:47:56 +0000 Subject: [PATCH 13/13] freenukum: init at 0.3.5 --- pkgs/games/freenukum/default.nix | 72 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/games/freenukum/default.nix diff --git a/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix new file mode 100644 index 000000000000..d428a0bf02f1 --- /dev/null +++ b/pkgs/games/freenukum/default.nix @@ -0,0 +1,72 @@ +{ stdenv +, rustPlatform +, fetchFromGitLab +, makeDesktopItem +, installShellFiles +, dejavu_fonts +, SDL2 +, SDL2_ttf +}: +let + pname = "freenukum"; + description = "Clone of the original Duke Nukum 1 Jump'n Run game"; + + desktopItem = makeDesktopItem { + desktopName = pname; + name = pname; + exec = pname; + icon = pname; + terminal = "false"; + comment = description; + type = "Application"; + categories = "Game;ArcadeGame;ActionGame"; + genericName = pname; + fileValidation = false; + }; + +in +rustPlatform.buildRustPackage rec { + inherit pname; + version = "0.3.5"; + + src = fetchFromGitLab { + owner = "silwol"; + repo = pname; + rev = "v${version}"; + sha256 = "0yqfzh0c8fqk92q9kmidy15dc5li0ak1gbn3v7p3xw5fkrzf99gy"; + }; + + cargoSha256 = "1mi98ccp4026gdc5x9jc6518zb7z4dplxl8vir78ivgdpifzz4pw"; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + SDL2 + SDL2_ttf + ]; + + postPatch = '' + substituteInPlace src/graphics.rs \ + --replace /usr $out + ''; + + postInstall = '' + mkdir -p $out/share/fonts/truetype/dejavu + ln -sf \ + ${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf \ + $out/share/fonts/truetype/dejavu/DejaVuSans.ttf + mkdir -p $out/share/doc/freenukum + install -Dm644 README.md CHANGELOG.md COPYING $out/share/doc/freenukum/ + installManPage doc/freenukum.6 + install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ + ''; + + meta = with stdenv.lib; { + description = "Clone of the original Duke Nukum 1 Jump'n Run game"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ _0x4A6F ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36dafc455852..0fca5d4920db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4051,6 +4051,8 @@ in freedroidrpg = callPackage ../games/freedroidrpg { }; + freenukum = callPackage ../games/freenukum { }; + freebind = callPackage ../tools/networking/freebind { }; freeipmi = callPackage ../tools/system/freeipmi {};