From 6a0bb38b276ccd7a31776b4defaa0f3842435567 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 11 Jul 2020 19:37:58 -0400 Subject: [PATCH 01/38] uboot: add hydra-build-products This allows users to easily download the bootloader for their device without having Nix installed. --- pkgs/misc/uboot/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 85df90a9fe11..1c5cbadb780b 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -83,6 +83,11 @@ let mkdir -p ${installDir} cp ${lib.concatStringsSep " " filesToInstall} ${installDir} + mkdir -p "$out/nix-support" + ${lib.concatMapStrings (file: '' + echo "file binary-dist ${installDir}/${builtins.baseNameOf file}" >> "$out/nix-support/hydra-build-products" + '') filesToInstall} + runHook postInstall ''; From ce3b463c7900a354775a35f8b75dbd2cd1ca2e7d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Jun 2021 23:44:58 +0200 Subject: [PATCH 02/38] games: /s/name/pname&version/ --- pkgs/desktops/gnome/games/atomix/default.nix | 6 ++--- .../gnome/games/gnome-klotski/default.nix | 6 ++--- pkgs/games/andyetitmoves/default.nix | 13 +++++------ pkgs/games/arena/default.nix | 15 +++++++------ pkgs/games/asc/default.nix | 5 +++-- pkgs/games/ball-and-paddle/default.nix | 5 +++-- pkgs/games/beret/default.nix | 3 ++- pkgs/games/bitsnbots/default.nix | 9 ++++---- pkgs/games/bsdgames/default.nix | 7 +++--- pkgs/games/chessdb/default.nix | 7 +++--- pkgs/games/crack-attack/default.nix | 7 +++--- pkgs/games/duckmarines/default.nix | 7 +----- pkgs/games/eboard/default.nix | 7 +++--- pkgs/games/eduke32/default.nix | 10 ++++----- pkgs/games/endless-sky/default.nix | 8 ++----- pkgs/games/exult/default.nix | 5 +++-- pkgs/games/fsg/default.nix | 9 ++++---- pkgs/games/gav/default.nix | 7 +++--- pkgs/games/gltron/default.nix | 5 +++-- pkgs/games/gmad/default.nix | 3 ++- pkgs/games/gtetrinet/default.nix | 3 ++- pkgs/games/icbm3d/default.nix | 7 +++--- pkgs/games/kobodeluxe/default.nix | 7 +++--- pkgs/games/macopix/default.nix | 5 +++-- pkgs/games/neverball/default.nix | 5 +++-- pkgs/games/njam/default.nix | 7 +++--- pkgs/games/openlierox/default.nix | 5 +++-- pkgs/games/openra/engine.nix | 1 - pkgs/games/orthorobot/default.nix | 22 +++++++------------ pkgs/games/pokerth/default.nix | 2 +- pkgs/games/pong3d/default.nix | 7 +++--- pkgs/games/prboom/default.nix | 5 +++-- pkgs/games/quake2/yquake2/games.nix | 2 +- pkgs/games/racer/default.nix | 9 ++++---- pkgs/games/rili/default.nix | 7 +++--- pkgs/games/rimshot/default.nix | 17 +++++--------- pkgs/games/rocksndiamonds/default.nix | 5 ++--- pkgs/games/rogue/default.nix | 11 +++++----- pkgs/games/scrolls/default.nix | 3 ++- pkgs/games/sgt-puzzles/default.nix | 2 +- pkgs/games/sienna/default.nix | 16 +++++--------- pkgs/games/snake4/default.nix | 5 +++-- pkgs/games/steam/fonts.nix | 3 ++- pkgs/games/tcl2048/default.nix | 7 +++--- pkgs/games/teetertorture/default.nix | 7 +++--- pkgs/games/tennix/default.nix | 5 +++-- pkgs/games/tibia/default.nix | 7 +++--- pkgs/games/tintin/default.nix | 5 +++-- pkgs/games/tome4/default.nix | 17 ++++++-------- pkgs/games/torcs/default.nix | 5 +++-- pkgs/games/torus-trooper/default.nix | 4 ++-- pkgs/games/tumiki-fighters/default.nix | 4 ++-- pkgs/games/typespeed/default.nix | 7 +++--- pkgs/games/ufoai/default.nix | 7 +++--- pkgs/games/uhexen2/default.nix | 2 +- pkgs/games/ultimatestunts/default.nix | 7 +++--- pkgs/games/vectoroids/default.nix | 7 +++--- pkgs/games/vessel/default.nix | 7 +++--- pkgs/games/xbomb/default.nix | 5 +++-- pkgs/games/xonotic/default.nix | 6 ++--- pkgs/games/zandronum/sqlite.nix | 3 ++- pkgs/games/zdoom/bcc-git.nix | 3 ++- pkgs/games/zod/default.nix | 8 +++---- pkgs/games/zoom/default.nix | 5 +++-- 64 files changed, 216 insertions(+), 212 deletions(-) diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index 43d9aaa7680c..e57191f0a1dd 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 , gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }: -let +stdenv.mkDerivation rec { pname = "atomix"; version = "3.34.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/atomix/${lib.versions.majorMinor version}/atomix-${version}.tar.xz"; sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; }; diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix index bb4cdae8fa35..e21cceb08509 100644 --- a/pkgs/desktops/gnome/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -3,14 +3,12 @@ , meson, ninja, python3 }: -let +stdenv.mkDerivation rec { pname = "gnome-klotski"; version = "3.38.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-klotski/${lib.versions.majorMinor version}/gnome-klotski-${version}.tar.xz"; sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi"; }; diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index f939f5b2bac9..9eb1c7594a10 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: -let plainName = "andyetitmoves"; - version = "1.2.2"; -in - -stdenv.mkDerivation { - name = "${plainName}-${version}"; +stdenv.mkDerivation rec { + pname = "andyetitmoves"; + version = "1.2.2"; src = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then let postfix = if stdenv.hostPlatform.system == "i686-linux" then "i386" else "x86_64"; - commercialName = "${plainName}-${version}_${postfix}.tar.gz"; - demoUrl = "http://www.andyetitmoves.net/demo/${plainName}Demo-${version}_${postfix}.tar.gz"; + commercialName = "${pname}-${version}_${postfix}.tar.gz"; + demoUrl = "http://www.andyetitmoves.net/demo/${pname}Demo-${version}_${postfix}.tar.gz"; in if commercialVersion then requireFile { diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix index 7320a405bb1c..16553a5f8ea6 100644 --- a/pkgs/games/arena/default.nix +++ b/pkgs/games/arena/default.nix @@ -12,10 +12,11 @@ let in stdenv.mkDerivation rec { - name = "arena-3.10-beta"; + pname = "arena"; + version = "3.10-beta"; src = fetchurl { - url = "http://www.playwitharena.de/downloads/arenalinux_64bit_3.10beta.tar.gz"; + url = "http://www.playwitharena.de/downloads/arenalinux_64bit_${lib.replaceStrings ["-"] [""] version}.tar.gz"; sha256 = "1pzb9sg4lzbbi4gbldvlb85p8xyl9xnplxwyb9pkk2mwzvvxkf0d"; }; @@ -25,19 +26,19 @@ stdenv.mkDerivation rec { unpackPhase = '' # This is is a tar bomb, i.e. it extract a dozen files and directories to # the top-level, so we must create a sub-directory first. - mkdir -p $out/lib/${name} - tar -C $out/lib/${name} -xf ${src} + mkdir -p $out/lib/${pname}-${version} + tar -C $out/lib/${pname}-${version} -xf ${src} # Remove executable bits from data files. This matters for the find command # we'll use below to find all bundled engines. - chmod -x $out/lib/${name}/Engines/*/*.{txt,bin,bmp,zip} + chmod -x $out/lib/${pname}-${version}/Engines/*/*.{txt,bin,bmp,zip} ''; buildPhase = '' # Arena has (at least) two executables plus a couple of bundled chess # engines that we need to patch. exes=( $(find $out -name '*x86_64_linux') - $(find $out/lib/${name}/Engines -type f -perm /u+x) + $(find $out/lib/${pname}-${version}/Engines -type f -perm /u+x) ) for i in "''${exes[@]}"; do # Arminius is statically linked. @@ -52,7 +53,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - ln -s $out/lib/${name}/Arena_x86_64_linux $out/bin/arena + ln -s $out/lib/${pname}-${version}/Arena_x86_64_linux $out/bin/arena ''; dontStrip = true; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 778f5224d2d8..af3f9f403100 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -3,10 +3,11 @@ , libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }: stdenv.mkDerivation rec { - name = "asc-2.6.0.0"; + pname = "asc"; + version = "2.6.0.0"; src = fetchurl { - url = "mirror://sourceforge/asc-hq/${name}.tar.bz2"; + url = "mirror://sourceforge/asc-hq/asc-${version}.tar.bz2"; sha256 = "1fybasb6srqfg6pqbvh0s0vvzjq9r0n6aq0z44hs7n68kmaam775"; }; diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index 7fe74dc47d93..a935f3d46863 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_ttf, guile, gettext }: stdenv.mkDerivation rec { - name = "ballandpaddle-0.8.1"; + pname = "ballandpaddle"; + version = "0.8.1"; src = fetchurl { - url = "mirror://gnu/ballandpaddle/${name}.tar.gz"; + url = "mirror://gnu/ballandpaddle/ballandpaddle-${version}.tar.gz"; sha256 = "0zgpydad0mj7fbkippw3n9hlda6nac084dq5xfbsks9jn1xd30ny"; }; diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index e59fc7eb2740..5d1bf0dd47c8 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer }: stdenv.mkDerivation { - name = "beret-1.2.0"; + pname = "beret"; + version = "1.2.0"; buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ]; diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index a3bd399a5ffd..e5e718e3ca5b 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, SDL, lua, libGLU, libGL }: stdenv.mkDerivation rec { - name = "bitsnbots-20111230"; + pname = "bitsnbots"; + version = "20111230"; src = fetchurl { url = "http://moikmellah.org/downloads/bitsnbots/bitsnbots.source.tgz"; @@ -19,10 +20,10 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lGL"; installPhase = '' - mkdir -p $out/share/${name} - cp -R bitsnbots resource scripts README $out/share/${name} + mkdir -p $out/share/${pname}-${version} + cp -R bitsnbots resource scripts README $out/share/${pname}-${version} mkdir -p $out/bin - ln -s $out/share/${name}/bitsnbots $out/bin + ln -s $out/share/${pname}-${version}/bitsnbots $out/bin ''; buildInputs = [ SDL lua libGLU libGL ]; diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 04a86c0b83cf..837fb4e17682 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles }: -stdenv.mkDerivation { - name = "bsd-games-2.17"; +stdenv.mkDerivation rec { + pname = "bsd-games"; + version = "2.17"; src = fetchurl { - url = "ftp://metalab.unc.edu/pub/Linux/games/bsd-games-2.17.tar.gz"; + url = "ftp://metalab.unc.edu/pub/Linux/games/bsd-games-${version}.tar.gz"; sha256 = "0q7zdyyfvn15y0w4g54kq3gza89h61py727m8slmw73cxx594vq6"; }; diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 40f90e75ff82..6de8726722ec 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, tcl, tk, libX11, makeWrapper }: -stdenv.mkDerivation { - name = "chessdb-3.6.19-beta-1"; +stdenv.mkDerivation rec { + pname = "chessdb"; + version = "3.6.19-beta-1"; src = fetchurl { - url = "mirror://sourceforge/chessdb/ChessDB-3.6.19-beta-1.tar.gz"; + url = "mirror://sourceforge/chessdb/ChessDB-${version}.tar.gz"; sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62"; }; diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index f5296e8ce6b9..fb13ce8c1638 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: -stdenv.mkDerivation { - name = "crack-attack-1.1.14"; +stdenv.mkDerivation rec { + pname = "crack-attack"; + version = "1.1.14"; src = fetchurl { - url = "mirror://savannah/crack-attack/crack-attack-1.1.14.tar.gz"; + url = "mirror://savannah/crack-attack/crack-attack-${version}.tar.gz"; sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; }; diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index 013ebcc7ec5f..ca2a74391416 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: -let +stdenv.mkDerivation rec { pname = "duckmarines"; version = "1.0c"; @@ -19,11 +19,6 @@ let categories = "Game;"; }; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - src = fetchurl { url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0c.love"; sha256 = "1rvgpkvi4h9zhc4fwb4knhsa789yjcx4a14fi4vqfdyybhvg5sh9"; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 67d7d38018e8..293811e9b040 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, pkg-config, gtk2 }: -stdenv.mkDerivation { - name = "eboard-1.1.1"; +stdenv.mkDerivation rec { + pname = "eboard"; + version = "1.1.1"; src = fetchurl { - url = "mirror://sourceforge/eboard/eboard-1.1.1.tar.bz2"; + url = "mirror://sourceforge/eboard/eboard-${version}.tar.bz2"; sha256 = "0vm25j1s2zg1lipwjv9qrcm877ikfmk1yh34i8f5l3bwd63115xd"; }; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 3fb8236947f4..e15cf241f759 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -3,10 +3,6 @@ , SDL2, SDL2_mixer }: let - version = "20200907"; - rev = "9257"; - revExtra = "93f62bbad"; - desktopItem = makeDesktopItem { name = "eduke32"; exec = "@out@/bin/${wrapper}"; @@ -18,9 +14,11 @@ let wrapper = "eduke32-wrapper"; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "eduke32"; - inherit version; + version = "20200907"; + rev = "9257"; + revExtra = "93f62bbad"; src = fetchurl { url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 010f90a049bd..0c9871037f85 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -2,13 +2,9 @@ , SDL2, libpng, libjpeg, glew, openal, scons, libmad }: -let - version = "0.9.12"; - -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "endless-sky"; - inherit version; + version = "0.9.12"; src = fetchFromGitHub { owner = "endless-sky"; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 40d7300e9c5a..fe401a627b5b 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -12,10 +12,11 @@ let in stdenv.mkDerivation rec { - name = "exult-1.6"; + pname = "exult"; + version = "1.6"; src = fetchurl { - url = "mirror://sourceforge/exult/${name}.tar.gz"; + url = "mirror://sourceforge/exult/exult-${version}.tar.gz"; sha256 = "1dm27qkxj30567zb70q4acddsizn0xyi3z87hg7lysxdkyv49s3s"; }; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index dd6d46ec6a29..3869ad988494 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, gtk2, glib, pkg-config, libGLU, libGL, wxGTK, libX11, xorgproto , runtimeShell }: -stdenv.mkDerivation { - name = "fsg-4.4"; +stdenv.mkDerivation rec { + pname = "fsg"; + version = "4.4"; src = fetchurl { - name = "fsg-src-4.4.tar.gz"; - url = "https://github.com/ctrlcctrlv/wxsand/blob/master/fsg-src-4.4-ORIGINAL.tar.gz?raw=true"; + name = "fsg-src-${version}.tar.gz"; + url = "https://github.com/ctrlcctrlv/wxsand/blob/master/fsg-src-${version}-ORIGINAL.tar.gz?raw=true"; sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; }; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index b8390455377b..e94b73d763c5 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net} : -stdenv.mkDerivation { - name = "gav-0.9.0"; +stdenv.mkDerivation rec { + pname = "gav"; + version = "0.9.0"; src = fetchurl { - url = "mirror://sourceforge/gav/gav-0.9.0.tar.gz"; + url = "mirror://sourceforge/gav/gav-${version}.tar.gz"; sha256 = "8f0deb8b2cd775b339229054f4f282583a4cfbcba9d27a6213cf910bab944f3e"; }; diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index 45267579c9b9..540170c49b21 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, SDL, libGLU, libGL, zlib, libpng, libvorbis, libmikmod, SDL_sound } : stdenv.mkDerivation rec { - name = "gltron-0.70"; + pname = "gltron"; + version = "0.70"; src = fetchurl { - url = "mirror://sourceforge/gltron/${name}-source.tar.gz"; + url = "mirror://sourceforge/gltron/gltron-${version}-source.tar.gz"; sha256 = "e0c8ebb41a18a1f8d7302a9c2cb466f5b1dd63e9a9966c769075e6b6bdad8bb0"; }; diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix index eb893882ff58..8f43c75f06a8 100644 --- a/pkgs/games/gmad/default.nix +++ b/pkgs/games/gmad/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, premake4, bootil }: stdenv.mkDerivation rec { - name = "gmad-unstable-2015-04-16"; + pname = "gmad"; + version = "unstable-2015-04-16"; meta = { description = "Garry's Mod Addon Creator and Extractor"; diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index 32ee954408da..d34b3775bd1b 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.nix @@ -1,7 +1,8 @@ { fetchFromGitHub, lib, stdenv, autoreconfHook, intltool, pkg-config, libgnome, libgnomeui, GConf }: stdenv.mkDerivation { - name = "gtetrinet-0.7.11"; + pname = "gtetrinet"; + version = "0.7.11"; src = fetchFromGitHub { owner = "GNOME"; diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index 7edf7cd477e1..a166b4f83f2b 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, libX11}: -stdenv.mkDerivation { - name = "icbm3d-0.4"; +stdenv.mkDerivation rec { + pname = "icbm3d"; + version = "0.4"; src = fetchurl { - url = "ftp://ftp.tuxpaint.org/unix/x/icbm3d/icbm3d.0.4.tar.gz"; + url = "ftp://ftp.tuxpaint.org/unix/x/icbm3d/icbm3d.${version}.tar.gz"; sha256 = "1z9q01mj0v9qbwby5cajjc9wpvdw2ma5v1r639vraxpl9qairm4s"; }; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index cd5dc3cc2bc7..9dea90824204 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, SDL, SDL_image, libGLU, libGL} : -stdenv.mkDerivation { - name = "kobodeluxe-0.5.1"; +stdenv.mkDerivation rec { + pname = "kobodeluxe"; + version = "0.5.1"; src = fetchurl { - url = "http://olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2"; + url = "http://olofson.net/kobodl/download/KoboDeluxe-${version}.tar.bz2"; sha256 = "0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c"; }; diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index bb91891a6826..8f226f3cef06 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, gtk, openssl }: stdenv.mkDerivation rec { - name = "macopix-1.7.4"; + pname = "macopix"; + version = "1.7.4"; src = fetchurl { - url = "http://rosegray.sakura.ne.jp/macopix/${name}.tar.bz2"; + url = "http://rosegray.sakura.ne.jp/macopix/macopix-${version}.tar.bz2"; sha256 = "0sgnr0wrw3hglcnsyvipll7icfv69ssmyw584zfhk1rgramlkzyb"; }; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 431dfd58a81c..ba1d403207a9 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -2,9 +2,10 @@ , physfs }: stdenv.mkDerivation rec { - name = "neverball-1.6.0"; + pname = "neverball"; + version = "1.6.0"; src = fetchurl { - url = "https://neverball.org/${name}.tar.gz"; + url = "https://neverball.org/neverball-${version}.tar.gz"; sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk"; }; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 1833840d2e35..6fbffc37d034 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }: -stdenv.mkDerivation { - name = "njam-1.25"; +stdenv.mkDerivation rec { + pname = "njam"; + version = "1.25"; src = fetchurl { - url = "mirror://sourceforge/njam/njam-1.25-src.tar.gz"; + url = "mirror://sourceforge/njam/njam-${version}-src.tar.gz"; sha256 = "0ysvqw017xkvddj957pdfmbmji7qi20nyr7f0zxvcvm6c7d3cc7s"; }; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index fefac190b0a3..12d00f28ffc1 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib , libxml2, pkg-config, curl, cmake, libzip }: -stdenv.mkDerivation { - name = "openlierox-0.58rc3"; +stdenv.mkDerivation rec { + pname = "openlierox"; + version = "0.58rc3"; src = fetchurl { url = "mirror://sourceforge/openlierox/OpenLieroX_0.58_rc3.src.tar.bz2"; diff --git a/pkgs/games/openra/engine.nix b/pkgs/games/openra/engine.nix index 365dc3d26793..adc1bf76e005 100644 --- a/pkgs/games/openra/engine.nix +++ b/pkgs/games/openra/engine.nix @@ -17,7 +17,6 @@ with lib; stdenv.mkDerivation (recursiveUpdate packageAttrs rec { - name = "${pname}-${version}"; pname = "openra"; version = "${engine.name}-${engine.version}"; diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index e1067645b620..170fed9d46e6 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -1,9 +1,15 @@ { lib, stdenv, fetchurl, fetchFromGitHub, zip, love, lua, makeWrapper, makeDesktopItem }: - -let +stdenv.mkDerivation rec { pname = "orthorobot"; version = "1.1.1"; + src = fetchFromGitHub { + owner = "Stabyourself"; + repo = pname; + rev = "v${version}"; + sha256 = "1ca6hvd890kxmamsmsfiqzw15ngsvb4lkihjb6kabgmss61a6s5p"; + }; + icon = fetchurl { url = "http://stabyourself.net/images/screenshots/orthorobot-5.png"; sha256 = "13fa4divdqz4vpdij1lcs5kf6w2c4jm3cc9q6bz5h7lkng31jzi6"; @@ -19,18 +25,6 @@ let categories = "Game;"; }; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "Stabyourself"; - repo = pname; - rev = "v${version}"; - sha256 = "1ca6hvd890kxmamsmsfiqzw15ngsvb4lkihjb6kabgmss61a6s5p"; - }; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love zip ]; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 59555a8ac240..349dd5d85cba 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -15,7 +15,7 @@ let in mkDerivation rec { - name = "pokerth-${target}-${version}"; + pname = "pokerth-${target}"; version = "1.1.2"; src = fetchFromGitHub { diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index 3cd017e8d3b1..9e965c95482a 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, libX11}: -stdenv.mkDerivation { - name = "3dpong-0.5"; +stdenv.mkDerivation rec { + pname = "3dpong"; + version = "0.5"; src = fetchurl { - url = "ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-0.5.tar.gz"; + url = "ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-${version}.tar.gz"; sha256 = "1ibb79sbzlbn4ra3n0qk22gqr6fg7q0jy6cm0wg2qj4z64c7hmdi"; }; diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index 4bd59c9e39d1..8adc9645b7ae 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -7,9 +7,10 @@ assert useOpenGL -> libGL != null && libGLU != null; stdenv.mkDerivation rec { - name = "prboom-2.5.0"; + pname = "prboom"; + version = "2.5.0"; src = fetchurl { - url = "mirror://sourceforge/prboom/prboom-2.5.0.tar.gz"; + url = "mirror://sourceforge/prboom/prboom-${version}.tar.gz"; sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12"; }; diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix index 02b130489115..0c9b24963ba7 100644 --- a/pkgs/games/quake2/yquake2/games.nix +++ b/pkgs/games/quake2/yquake2/games.nix @@ -28,7 +28,7 @@ let inherit (data) id version description sha256; inherit title; - name = "yquake2-${title}-${version}"; + pname = "yquake2-${title}"; src = fetchFromGitHub { inherit sha256; diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index 16507fa219e0..bdb56c85dbff 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -1,13 +1,14 @@ { fetchurl, lib, stdenv, allegro, libjpeg, makeWrapper }: -stdenv.mkDerivation { - name = "racer-1.1"; +stdenv.mkDerivation rec { + pname = "racer"; + version = "1.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "http://hippo.nipax.cz/src/racer-1.1.tar.gz"; + url = "http://hippo.nipax.cz/src/racer-${version}.tar.gz"; sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://hippo.nipax.cz/src/racer-1.1.64.tar.gz"; + url = "https://hippo.nipax.cz/src/racer-${version}.64.tar.gz"; sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0"; } else throw "System not supported"; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 0e3fa9b8cc88..a0082d28d506 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, SDL_mixer, SDL, autoreconfHook }: -stdenv.mkDerivation { - name = "ri_li-2.0.1"; +stdenv.mkDerivation rec { + pname = "ri_li"; + version = "2.0.1"; src = fetchurl { - url = "mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2"; + url = "mirror://sourceforge/ri-li/Ri-li-${version}.tar.bz2"; sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd"; }; diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index e7f2f2e781a4..1f4efa5097bd 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -1,9 +1,14 @@ { lib, stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: -let +stdenv.mkDerivation rec { pname = "rimshot"; version = "1.0"; + src = fetchurl { + url = "https://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip"; + sha256 = "08pdkyvki92549605m9bqnr24ipkbwkp5nkr5aagdqnr8ai4rgmi"; + }; + icon = fetchurl { url = "http://stabyourself.net/images/screenshots/rimshot-2.png"; sha256 = "08fyiqym3gcpq2vgb5dvafkban42fsbzfcr3iiyw03hz99q53psd"; @@ -19,16 +24,6 @@ let categories = "Audio;AudioVideo;Music"; }; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip"; - sha256 = "08pdkyvki92549605m9bqnr24ipkbwkp5nkr5aagdqnr8ai4rgmi"; - }; - nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ lua love ]; diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index c31bf78a3552..fd570e4d7c63 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, makeDesktopItem, SDL2, SDL2_image, SDL2_mixer, SDL2_net }: stdenv.mkDerivation rec { - name = "${project}-${version}"; - project = "rocksndiamonds"; + pname = "rocksndiamonds"; version = "4.1.1.0"; src = fetchurl { - url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz"; + url = "https://www.artsoft.org/RELEASES/unix/${pname}/rocksndiamonds-${version}.tar.gz"; sha256 = "1k0m6l5g886d9mwwh6q0gw75qsb85mpf8i0rglh047app56nsk72"; }; diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 1e215c813b53..127d65ff362f 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -1,13 +1,14 @@ {lib, stdenv, fetchurl, ncurses}: -stdenv.mkDerivation { - name = "rogue-5.4.4"; +stdenv.mkDerivation rec { + pname = "rogue"; + version = "5.4.4"; src = fetchurl { urls = [ - "https://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" - "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz" - "http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz" + "https://src.fedoraproject.org/repo/pkgs/rogue/rogue${version}-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue${version}-src.tar.gz" + "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue${version}-src.tar.gz" + "http://rogue.rogueforge.net/files/rogue${lib.versions.majorMinor version}/rogue${version}-src.tar.gz" ]; sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx"; }; diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 13079e159840..cdeab7b10d35 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -2,7 +2,8 @@ , libGLU, libX11, libXext, libXcursor, libpulseaudio }: stdenv.mkDerivation { - name = "scrolls-2015-10-13"; + pname = "scrolls"; + version = "2015-10-13"; meta = { description = "A strategy collectible card game"; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 2582161eee4b..1c0b7aeda493 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "sgt-puzzles-r${version}"; + pname = "sgt-puzzles"; version = "20200610.9aa7b7c"; src = fetchurl { diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 1a1e82b7d64d..24f5fc088769 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -1,8 +1,12 @@ { lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: -let +stdenv.mkDerivation rec { pname = "sienna"; version = "1.0c"; + src = fetchurl { + url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love"; + sha256 = "1x15276fhqspgrrv8fzkp032i2qa8piywc0yy061x59mxhdndzj6"; + }; icon = fetchurl { url = "http://tangramgames.dk/img/thumb/sienna.png"; @@ -19,16 +23,6 @@ let categories = "Game;"; }; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love"; - sha256 = "1x15276fhqspgrrv8fzkp032i2qa8piywc0yy061x59mxhdndzj6"; - }; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index c0cad5f05d33..aee8b9e0810c 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, shhmsg, shhopt, xorg }: stdenv.mkDerivation rec { - name = "snake4-1.0.14"; + pname = "snake4"; + version = "1.0.14"; src = fetchurl { - url = "https://shh.thathost.com/pub-unix/files/${name}.tar.gz"; + url = "https://shh.thathost.com/pub-unix/files/snake4-${version}.tar.gz"; sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9"; }; diff --git a/pkgs/games/steam/fonts.nix b/pkgs/games/steam/fonts.nix index 9cf68f2c29b0..65efd42a22a4 100644 --- a/pkgs/games/steam/fonts.nix +++ b/pkgs/games/steam/fonts.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "steam-fonts-1"; + pname = "steam-fonts"; + version = "1"; src = fetchurl { url = "https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"; diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index dbc429746846..93286058b49c 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, tcl, tcllib, runtimeShell }: -tcl.mkTclDerivation { - name = "tcl2048-0.4.0"; +tcl.mkTclDerivation rec { + pname = "tcl2048"; + version = "0.4.0"; src = fetchurl { - url = "https://raw.githubusercontent.com/dbohdan/2048.tcl/v0.4.0/2048.tcl"; + url = "https://raw.githubusercontent.com/dbohdan/2048.tcl/v${version}/2048.tcl"; sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e"; }; diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 9df0843c5e47..6e18dbae07b2 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: -stdenv.mkDerivation { - name = "teeter-torture-20051018"; +stdenv.mkDerivation rec { + pname = "teeter-torture"; + version = "2005-10-18"; src = fetchurl { - url = "ftp://ftp.tuxpaint.org/unix/x/teetertorture/source/teetertorture-2005-10-18.tar.gz"; + url = "ftp://ftp.tuxpaint.org/unix/x/teetertorture/source/teetertorture-${version}.tar.gz"; sha256 = "175gdbkx3m82icyzvwpyzs4v2fd69c695k5n8ca0lnjv81wnw2hr"; }; diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index c8b2a415923f..f81ddb7edf95 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } : stdenv.mkDerivation rec { - name = "tennix-1.1"; + pname = "tennix"; + version = "1.1"; src = fetchurl { - url = "https://icculus.org/tennix/downloads/${name}.tar.gz"; + url = "https://icculus.org/tennix/downloads/tennix-${version}.tar.gz"; sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; }; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 0892dc2dedd8..0fee9ce6c6cb 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU, libGL }: -stdenv.mkDerivation { - name = "tibia-10.90"; +stdenv.mkDerivation rec { + pname = "tibia"; + version = "10.90"; src = fetchurl { - url = "http://static.tibia.com/download/tibia1090.tgz"; + url = "http://static.tibia.com/download/tibia${lib.replaceStrings ["."] [""] version}.tgz"; sha256 = "11mkh2dynmbpay51yfaxm5dmcys3rnpk579s9ypfkhblsrchbkhx"; }; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 29c41d2d787e..73070db244f0 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -6,10 +6,11 @@ assert tlsSupport -> gnutls != null; stdenv.mkDerivation rec { - name = "tintin-2.02.05"; + pname = "tintin"; + version = "2.02.05"; src = fetchurl { - url = "mirror://sourceforge/tintin/${name}.tar.gz"; + url = "mirror://sourceforge/tintin/tintin-${version}.tar.gz"; sha256 = "sha256-Y6cAUhItJNade8ASOVdF8aBBLf/UVqjoqrhXBNRL1aE="; }; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 70a032171582..ace9b384663e 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,8 +1,14 @@ { lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, premake4, unzip , openal, libpng, libvorbis, libGLU, SDL2, SDL2_image, SDL2_ttf }: -let +stdenv.mkDerivation rec { pname = "tome4"; + version = "1.6.7"; + + src = fetchurl { + url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; + sha256 = "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68"; + }; desktop = makeDesktopItem { desktopName = pname; @@ -16,15 +22,6 @@ let genericName = pname; }; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "1.6.7"; - - src = fetchurl { - url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68"; - }; - prePatch = '' # http://forums.te4.org/viewtopic.php?f=42&t=49478&view=next#p234354 sed -i 's|#include ||' src/tgl.h diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index d1dafb85ce3f..e3ec82b549ae 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -3,10 +3,11 @@ libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, makeWrapper }: stdenv.mkDerivation rec { - name = "torcs-1.3.7"; + pname = "torcs"; + version = "1.3.7"; src = fetchurl { - url = "mirror://sourceforge/torcs/${name}.tar.bz2"; + url = "mirror://sourceforge/torcs/torcs-${version}.tar.bz2"; sha256 = "0kdq0sc7dsfzlr0ggbxggcbkivc6yp30nqwjwcaxg9295s3b06wa"; }; diff --git a/pkgs/games/torus-trooper/default.nix b/pkgs/games/torus-trooper/default.nix index 441cffbdf04d..645abc76c807 100644 --- a/pkgs/games/torus-trooper/default.nix +++ b/pkgs/games/torus-trooper/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "torus-trooper"; version = "0.22"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/tt0_22.zip"; + url = "http://abagames.sakura.ne.jp/windows/tt${lib.replaceStrings ["."] ["_"] version}.zip"; sha256 = "1yhki1fdp3fi4y2iq12vca69f6k38dqjaw9z4lwcxky5kbgb7jvg"; }; diff --git a/pkgs/games/tumiki-fighters/default.nix b/pkgs/games/tumiki-fighters/default.nix index 2f3cf869f8db..b4becea65756 100644 --- a/pkgs/games/tumiki-fighters/default.nix +++ b/pkgs/games/tumiki-fighters/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "tumiki-fighters"; version = "0.21"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/tf0_21.zip"; + url = "http://abagames.sakura.ne.jp/windows/tf${lib.replaceStrings ["."] ["_"] version}.zip"; sha256 = "0djykfc1r8ysapklm621h89ana1c4qzc1m5nr9bqw4iccnmvwk3p"; }; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 396e41c46714..1581ab138945 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ncurses }: -stdenv.mkDerivation { - name = "typespeed-0.6.5"; +stdenv.mkDerivation rec { + pname = "typespeed"; + version = "0.6.5"; buildInputs = [ ncurses ]; src = fetchurl { - url = "http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz"; + url = "http://typespeed.sourceforge.net/typespeed-${version}.tar.gz"; sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961"; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 7694821d44f5..89f8f5ec91bf 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -2,14 +2,15 @@ , curl, libjpeg, libpng, gettext, cunit, enableEditor?false }: stdenv.mkDerivation rec { - name = "ufoai-2.4"; + pname = "ufoai"; + version = "2.4"; src = fetchurl { - url = "mirror://sourceforge/ufoai/${name}-source.tar.bz2"; + url = "mirror://sourceforge/ufoai/ufoai-${version}-source.tar.bz2"; sha256 = "0kxrbcjrharcwz319s90m789i4my9285ihp5ax6kfhgif2vn2ji5"; }; srcData = fetchurl { - url = "mirror://sourceforge/ufoai/${name}-data.tar"; + url = "mirror://sourceforge/ufoai/ufoai-${version}-data.tar"; sha256 = "1drhh08cqqkwv1yz3z4ngkplr23pqqrdx6cp8c3isy320gy25cvb"; }; diff --git a/pkgs/games/uhexen2/default.nix b/pkgs/games/uhexen2/default.nix index dac081cd7b44..78c38753f790 100644 --- a/pkgs/games/uhexen2/default.nix +++ b/pkgs/games/uhexen2/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, SDL, stdenv, libogg, libvorbis, libmad, xdelta }: stdenv.mkDerivation rec { - name = "uhexen2"; + pname = "uhexen2"; version = "1.5.9"; src = fetchgit { diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index 9f38e43222c1..2e3d54459186 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, SDL, libGLU, libGL, SDL_image, freealut, openal, libvorbis, pkg-config}: -stdenv.mkDerivation { - name = "ultimate-stunts-0.7.6.1"; +stdenv.mkDerivation rec { + pname = "ultimate-stunts"; + version = "0.7.6.1"; src = fetchurl { - url = "mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz"; + url = "mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-${lib.replaceStrings ["."] [""] version}.tar.gz"; sha256 = "0rd565ml6l927gyq158klhni7myw8mgllhv0xl1fg9m8hlzssgrv"; }; diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index e0b7e13c91ea..765f21465805 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer}: -stdenv.mkDerivation { - name = "vectoroids-1.1.0"; +stdenv.mkDerivation rec { + pname = "vectoroids"; + version = "1.1.0"; src = fetchurl { - url = "ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/vectoroids-1.1.0.tar.gz"; + url = "ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/vectoroids-${version}.tar.gz"; sha256 = "0bkvd4a1v496w0vlvqyi1a6p25ssgpkchxxxi8899sb72wlds54d"; }; diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 4a25d26f8cc5..7c535cb323ec 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, requireFile, SDL, libpulseaudio, alsa-lib, runtimeShell }: stdenv.mkDerivation rec { - name = "vessel-12082012"; + pname = "vessel"; + version = "12082012"; goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://\$PWD/${name}-bin" in the + You can do this by using "nix-prefetch-url file://\$PWD/vessel-${version}-bin" in the directory where you saved it. ''; src = if (stdenv.isi686) then requireFile { message = goBuyItNow; - name = "${name}-bin"; + name = "vessel-${version}-bin"; sha256 = "1vpwcrjiln2mx43h7ib3jnccyr3chk7a5x2bw9kb4lw8ycygvg96"; } else throw "unsupported platform ${stdenv.hostPlatform.system} only i686-linux supported for now."; diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix index 2d9f57d1e73f..093f822a7e31 100644 --- a/pkgs/games/xbomb/default.nix +++ b/pkgs/games/xbomb/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, libX11, libXaw }: stdenv.mkDerivation rec { - name = "xbomb-2.2b"; + pname = "xbomb"; + version = "2.2b"; src = fetchurl { - url = "https://www.gedanken.org.uk/software/xbomb/download/${name}.tgz"; + url = "https://www.gedanken.org.uk/software/xbomb/download/xbomb-${version}.tgz"; sha256 = "0692gjw28qvh8wj9l58scjw6kxj7jdyb3yzgcgs9wcznq11q839m"; }; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 38a0450168ef..0a5a58885d0f 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -58,7 +58,7 @@ let inherit version; src = fetchurl { - url = "https://dl.xonotic.org/${name}-source.zip"; + url = "https://dl.xonotic.org/${pname}-${version}-source.zip"; sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"; }; @@ -119,8 +119,8 @@ let in rec { xonotic-data = fetchzip { - name = "xonotic-data-${version}"; - url = "https://dl.xonotic.org/${name}.zip"; + name = "xonotic-data"; + url = "https://dl.xonotic.org/xonotic-data-${version}.zip"; sha256 = "1ygkh0v68y4sd1w5vpk8dgb65h5jm599hwszdfgjp3ax4d3ml81x"; extraPostFetch = '' cd $out diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index 48dd2be9973a..c9baefcf0af6 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "sqlite-zandronum-3.0"; + pname = "sqlite-zandronum"; + version = "3.0"; src = fetchurl { url = "https://www.sqlite.org/2017/sqlite-autoconf-3180000.tar.gz"; diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix index 2e9f1a9c2b91..aa3fdeca183a 100644 --- a/pkgs/games/zdoom/bcc-git.nix +++ b/pkgs/games/zdoom/bcc-git.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "doom-bcc-git-0.8.0.2018.01.04"; + pname = "doom-bcc"; + version = "unstable-2018-01-04"; src = fetchFromGitHub { owner = "wormt"; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index f7d7a5612d82..6bf24ed6cb9f 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -16,8 +16,8 @@ , substituteAll }: let + name = "zod-engine"; version = "2011-09-06"; - name = "zod-engine-${version}"; src = fetchzip { url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz"; sha256 = "017v96aflrv07g8j8zk9mq8f8rqxl5228rjff5blq8dxpsv1sx7h"; @@ -37,7 +37,7 @@ let hardeningDisable = [ "format" ]; NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; zod_engine = stdenv.mkDerivation { - inherit name version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; + inherit version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; pname = "${name}-engine"; enableParallelBuilding = true; preBuild = "cd zod_src"; @@ -48,7 +48,7 @@ let ''; }; zod_map_editor = stdenv.mkDerivation { - inherit name version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; + inherit version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; pname = "${name}-map_editor"; enableParallelBuilding = true; preBuild = "cd zod_src"; @@ -60,7 +60,7 @@ let ''; }; zod_launcher = stdenv.mkDerivation { - inherit name version src nativeBuildInputs buildInputs zod_engine zod_map_editor; + inherit version src nativeBuildInputs buildInputs zod_engine zod_map_editor; pname = "${name}-launcher"; # This is necessary because the zod_launcher has terrible fixed-width window # the Idea is to apply the scalingFactor to all positions and sizes and I tested 1,2,3 and 4 diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 086d860872c7..02cfc28ebeef 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -3,10 +3,11 @@ # !!! assert freetype == xorg.freetype stdenv.mkDerivation rec { - name = "zoom-1.1.5"; + pname = "zoom"; + version = "1.1.5"; src = fetchurl { - url = "https://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz"; + url = "https://www.logicalshift.co.uk/unix/zoom/zoom-${version}.tar.gz"; sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; From ada25b1a983557c690d42b8d7de153b989f55bad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jun 2021 14:52:45 +0000 Subject: [PATCH 03/38] bear: 3.0.12 -> 3.0.13 --- pkgs/development/tools/build-managers/bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index a94ca34d0364..42fa584a8935 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.12"; + version = "3.0.13"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "0nalvmkl9iwbs4wbsacryrwr46vk3x6jzqj9v5wfyf6aim3s1szs"; + sha256 = "sha256-oMrTH3GjxiLBKX0i3ZuV+bNqpA7PkoAQAb/08Q/uELs="; }; nativeBuildInputs = [ cmake pkg-config ]; From e1d6051d81835079f0e37e1d5fc5f029f32df512 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 25 Jun 2021 10:41:59 +0300 Subject: [PATCH 04/38] imagej: reformat expression - Use 1 line per input argument. - Don't use let ... in if not needed. - Use ${version} in url string. - Run hooks in explicit installPhase. --- pkgs/applications/graphics/imagej/default.nix | 93 ++++++++++--------- 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 65d3c9735dfd..5050669c5242 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -1,48 +1,51 @@ -{ lib, stdenv, fetchurl, jre, unzip, makeWrapper }: +{ lib +, stdenv +, fetchurl +, jre +, unzip +, makeWrapper +}: -# Note: -# - User config dir is hard coded by upstream to $HOME/.imagej on linux systems -# and to $HOME/Library/Preferences on macOS. -# (The current trend appears to be to use $HOME/.config/imagej -# on linux systems, but we here do not attempt to fix it.) +stdenv.mkDerivation { + pname = "imagej"; + version = "150"; -let - imagej150 = stdenv.mkDerivation { - pname = "imagej"; - version = "150"; - - src = fetchurl { - url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip"; - sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; - }; - nativeBuildInputs = [ makeWrapper unzip ]; - inherit jre; - - # JAR files that are intended to be used by other packages - # should go to $out/share/java. - # (Some uses ij.jar as a library not as a standalone program.) - installPhase = '' - mkdir -p $out/share/java - # Read permisssion suffices for the jar and others. - # Simple cp shall clear suid bits, if any. - cp ij.jar $out/share/java - cp -dR luts macros plugins $out/share - mkdir $out/bin - makeWrapper ${jre}/bin/java $out/bin/imagej \ - --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" - ''; - meta = with lib; { - homepage = "https://imagej.nih.gov/ij/"; - description = "Image processing and analysis in Java"; - longDescription = '' - ImageJ is a public domain Java image processing program - inspired by NIH Image for the Macintosh. - It runs on any computer with a Java 1.4 or later virtual machine. - ''; - license = licenses.publicDomain; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ yuriaisaka ]; - }; + src = fetchurl { + url = "https://wsr.imagej.net/distros/cross-platform/ij${version}.zip"; + sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; }; -in - imagej150 + nativeBuildInputs = [ makeWrapper unzip ]; + passthru = { + inherit jre; + }; + + # JAR files that are intended to be used by other packages + # should go to $out/share/java. + # (Some uses ij.jar as a library not as a standalone program.) + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java $out/bin + # Read permisssion suffices for the jar and others. + # Simple cp shall clear suid bits, if any. + cp ij.jar $out/share/java + cp -dR luts macros plugins $out/share + makeWrapper ${jre}/bin/java $out/bin/imagej \ + --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://imagej.nih.gov/ij/"; + description = "Image processing and analysis in Java"; + longDescription = '' + ImageJ is a public domain Java image processing program + inspired by NIH Image for the Macintosh. + It runs on any computer with a Java 1.4 or later virtual machine. + ''; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = with maintainers; [ yuriaisaka ]; + }; +} From 0750062126633db814ead9298902e845102ab1ba Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 25 Jun 2021 10:44:59 +0300 Subject: [PATCH 05/38] imagej: Add desktop item and icon --- pkgs/applications/graphics/imagej/default.nix | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 5050669c5242..ac1ea9560ae2 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -4,9 +4,16 @@ , jre , unzip , makeWrapper +, makeDesktopItem +, copyDesktopItems }: -stdenv.mkDerivation { +let + icon = fetchurl { + url = "https://imagej.net/media/icons/imagej.png"; + sha256 = "sha256-nU2nWI1wxZB/xlOKsZzdUjj+qiCTjO6GwEKYgZ5Risg="; + }; +in stdenv.mkDerivation rec { pname = "imagej"; version = "150"; @@ -14,7 +21,17 @@ stdenv.mkDerivation { url = "https://wsr.imagej.net/distros/cross-platform/ij${version}.zip"; sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper unzip ]; + desktopItems = lib.optionals stdenv.isLinux [ + (makeDesktopItem { + name = "ImageJ"; + desktopName = "ImageJ"; + icon = "imagej"; + categories = "Science;Utility;Graphics;"; + exec = "imagej"; + }) + ]; + passthru = { inherit jre; }; @@ -36,6 +53,12 @@ stdenv.mkDerivation { runHook postInstall ''; + postFixup = lib.optionalString stdenv.isLinux '' + install -Dm644 ${icon} $out/share/icons/hicolor/128x128/apps/imagej.png + substituteInPlace $out/share/applications/ImageJ.desktop \ + --replace Exec=imagej Exec=$out/bin/imagej + ''; + meta = with lib; { homepage = "https://imagej.nih.gov/ij/"; description = "Image processing and analysis in Java"; From 796ae067c4b6348e900c1384ef3759dc90fef01c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 25 Jun 2021 10:57:17 +0300 Subject: [PATCH 06/38] imagej: 150 -> 153 --- pkgs/applications/graphics/imagej/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index ac1ea9560ae2..0dbc2d5d4e14 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -15,11 +15,11 @@ let }; in stdenv.mkDerivation rec { pname = "imagej"; - version = "150"; + version = "153"; src = fetchurl { url = "https://wsr.imagej.net/distros/cross-platform/ij${version}.zip"; - sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; + sha256 = "sha256-MGuUdUDuW3s/yGC68rHr6xxzmYScUjdXRawDpc1UQqw="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper unzip ]; desktopItems = lib.optionals stdenv.isLinux [ From 664d835d7ecbe173fe11d8089575a14c60f6f9ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jun 2021 18:09:41 +0000 Subject: [PATCH 07/38] ginkgo: 1.16.3 -> 1.16.4 --- pkgs/development/tools/ginkgo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 0f54d7ca53eb..4bc550165c21 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "1.16.3"; + version = "1.16.4"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-MDxDDZaNgjZz98lAoIIpWbIg7Cr/6kohSh+WL/1Ljyo="; + sha256 = "sha256-p9kam1pRP0Am02o7vM+VzeAht+Qtn4DZ12NM8TaA/2Y="; }; vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y="; doCheck = false; From 29b2c507b8489c60fe0e2bdd4d445e1547bed069 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jun 2021 18:41:04 +0000 Subject: [PATCH 08/38] goreleaser: 0.168.0 -> 0.172.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 19840144cda4..f5ed58f84fd2 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.168.0"; + version = "0.172.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+WDKpkjUlwR39nVB99saSB03NScPzPiyR8xvRBfASTQ="; + sha256 = "sha256-QHtxrdmtmvnyMmtpvbEw5VjGz2XN1iqHu+5dHS9yiNo="; }; - vendorSha256 = "sha256-W/G5AMfYyA9adVFOT/IXI+Bds/6osBOrQ6CtgeHZ8R8="; + vendorSha256 = "sha256-Zd48I7e5zCbSXz5RVckMXQMpqvf6gAoajx5yLk2ODmU="; buildFlagsArray = [ "-ldflags=" From b16dbf99b6dca94a4c5468fee649e04de51017d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jun 2021 19:53:45 +0000 Subject: [PATCH 09/38] hyprspace: 0.1.4 -> 0.1.5 --- pkgs/applications/networking/hyprspace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix index 048f6b85049e..7f792957199c 100644 --- a/pkgs/applications/networking/hyprspace/default.nix +++ b/pkgs/applications/networking/hyprspace/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hyprspace"; - version = "0.1.4"; + version = "0.1.5"; propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; @@ -10,10 +10,10 @@ buildGoModule rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rw82m0NJcWgtcXRIb1YNv+Kpe2YufKMNAn1Ph9RB3W8="; + sha256 = "sha256-aLODIaDbSLVEog/F0FVx6ykadCggE0Vebzwjw0sqYJ0="; }; - vendorSha256 = "sha256-ErqK2jDTpqUyvll+epdGKRYCJvyvCa90W1GVbbhF0a4="; + vendorSha256 = "sha256-rw75xNBBV58F+HBVtD/EslPWxZxLbI3/mJVdJF4usKI="; meta = with lib; { description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks."; From 9fdc5e10eea0b7f36d7712ae64a943787a807e00 Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Sat, 26 Jun 2021 14:52:53 +0100 Subject: [PATCH 10/38] smlnj: fix x86_64-darwin build --- pkgs/development/compilers/smlnj/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 3e987e8ccdaf..d6d50f0303f6 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, Libsystem }: let version = "110.95"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; - isArch64 = stdenv.system == "x86_64-linux"; - - arch = if isArch64 + arch = if stdenv.is64bit then "64" else "32"; @@ -14,7 +12,7 @@ let boot64 = { url = "${baseurl}/boot.amd64-unix.tgz"; sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; }; - bootBinary = if isArch64 + bootBinary = if stdenv.is64bit then boot64 else boot32; @@ -53,6 +51,10 @@ in stdenv.mkDerivation { sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl patch --verbose config/_heap2exec ${./heap2exec.diff} + '' + lib.optionalString stdenv.isDarwin '' + # Locate standard headers like + substituteInPlace base/runtime/config/gen-posix-names.sh \ + --replace "\$SDK_PATH/usr" "${Libsystem}" ''; unpackPhase = '' @@ -83,7 +85,7 @@ in stdenv.mkDerivation { description = "Standard ML of New Jersey, a compiler"; homepage = "http://smlnj.org"; license = licenses.bsd3; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c829a3210ebf..cc045d7d474d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12056,7 +12056,9 @@ in shmig = callPackage ../development/tools/database/shmig { }; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; - smlnj = callPackage ../development/compilers/smlnj { }; + smlnj = callPackage ../development/compilers/smlnj { + inherit (darwin) Libsystem; + }; smlpkg = callPackage ../tools/package-management/smlpkg { }; From 4a4fc6c9c91b895f39c0b402426751f2174b43d9 Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Sat, 26 Jun 2021 23:05:58 +0100 Subject: [PATCH 11/38] smlnjBootstrap: move dependents over to regular smlnj smlnjBootstrap seems to exist as a workaround for a failing x86_64-darwin build of regular smlnj. Now this is fixed, the workaround can be removed. (aarch64-darwin is being actively worked on by the smlnj project, and currently is supported by neither derivation.) --- .../development/compilers/smlnj/bootstrap.nix | 4 ++++ pkgs/top-level/all-packages.nix | 19 ++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index 91eb9fc84172..aacebd48e9e3 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -1,3 +1,7 @@ +# This derivation should be redundant, now that regular smlnj works on Darwin, +# and is preserved only for pre-existing direct usage. New use cases should +# just use the regular smlnj derivation. + { lib, stdenv, fetchurl, cpio, rsync, xar, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc045d7d474d..0718e299a7bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12055,6 +12055,7 @@ in shmig = callPackage ../development/tools/database/shmig { }; + # smlnjBootstrap should be redundant, now that smlnj works on Darwin natively smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage ../development/compilers/smlnj { inherit (darwin) Libsystem; @@ -30058,11 +30059,7 @@ in iprover = callPackage ../applications/science/logic/iprover { }; - jonprl = callPackage ../applications/science/logic/jonprl { - smlnj = if stdenv.isDarwin - then smlnjBootstrap - else smlnj; - }; + jonprl = callPackage ../applications/science/logic/jonprl { }; key = callPackage ../applications/science/logic/key { }; @@ -30121,19 +30118,11 @@ in tptp = callPackage ../applications/science/logic/tptp {}; - celf = callPackage ../applications/science/logic/celf { - smlnj = if stdenv.isDarwin - then smlnjBootstrap - else smlnj; - }; + celf = callPackage ../applications/science/logic/celf { }; fast-downward = callPackage ../applications/science/logic/fast-downward { }; - twelf = callPackage ../applications/science/logic/twelf { - smlnj = if stdenv.isDarwin - then smlnjBootstrap - else smlnj; - }; + twelf = callPackage ../applications/science/logic/twelf { }; verifast = callPackage ../applications/science/logic/verifast {}; From 1c450db3cca4a3aa1f00bf2c454dc7e17b21f661 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Mon, 28 Jun 2021 11:55:05 +0200 Subject: [PATCH 12/38] yq: fix build --- pkgs/development/python-modules/yq/jq-path.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/yq/jq-path.patch b/pkgs/development/python-modules/yq/jq-path.patch index 784a28feaf18..ed98ec86aa51 100644 --- a/pkgs/development/python-modules/yq/jq-path.patch +++ b/pkgs/development/python-modules/yq/jq-path.patch @@ -1,26 +1,26 @@ diff --git a/test/test.py b/test/test.py -index a81f41b..9e80f04 100755 +index f25dced..cd308c8 100755 --- a/test/test.py +++ b/test/test.py -@@ -112,7 +112,7 @@ class TestYq(unittest.TestCase): +@@ -105,7 +105,7 @@ class TestYq(unittest.TestCase): tf2.seek(0) self.assertEqual(self.run_yq("", ["-y", arg, tf.name, self.fd_path(tf2)]), '1\n...\n') - + - @unittest.skipIf(subprocess.check_output(["jq", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6") + @unittest.skipIf(subprocess.check_output(["@jq@", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6") def test_jq16_arg_passthrough(self): self.assertEqual(self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]), "a:\n- a\n- b\n") diff --git a/yq/__init__.py b/yq/__init__.py -index afeb42c..a0d7970 100755 +index 91212d0..ee5a799 100755 --- a/yq/__init__.py +++ b/yq/__init__.py @@ -146,7 +146,7 @@ def yq(input_streams=None, output_stream=None, input_format="yaml", output_forma - try: - # Note: universal_newlines is just a way to induce subprocess to make stdin a text buffer and encode it for us + # Notes: universal_newlines is just a way to induce subprocess to make stdin a text buffer and encode it for us; + # close_fds must be false for command substitution to work (yq . t.yml --slurpfile t <(yq . t.yml)) - jq = subprocess.Popen(["jq"] + list(jq_args), + jq = subprocess.Popen(["@jq@"] + list(jq_args), stdin=subprocess.PIPE, stdout=subprocess.PIPE if converting_output else None, - universal_newlines=True) + close_fds=False, From 2b41f19f791abc139695a9fe8c4c0015eae36f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 28 Jun 2021 12:58:44 +0200 Subject: [PATCH 13/38] volk: 2.4.1 -> 2.5.0 --- pkgs/development/libraries/volk/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 574a90d22724..34f7a7d8a8e1 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , cppunit , python3 @@ -11,23 +10,16 @@ stdenv.mkDerivation rec { pname = "volk"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "gnuradio"; repo = pname; rev = "v${version}"; - sha256 = "fuHJ+p5VN4ThdbQFbzB08VCuy/Zo7m/I1Gs5EQGPeNY="; + sha256 = "XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; fetchSubmodules = true; }; - patches = [ - # Fixes a failing test: https://github.com/gnuradio/volk/pull/434 - (fetchpatch { - url = "https://github.com/gnuradio/volk/pull/434/commits/bce8531b6f1a3c5abe946ed6674b283d54258281.patch"; - sha256 = "OLW9uF6iL47z63kjvYqwsWtkINav8Xhs+Htqg6Kr4uI="; - }) - ]; cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; postInstall = '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) From ee8bdde2cea283e4ca01736d07626852fda7d3bc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 28 Jun 2021 13:53:14 +0000 Subject: [PATCH 14/38] emacs.pkgs.ebuild-mode: init at 1.52 --- .../elisp-packages/ebuild-mode/default.nix | 17 +++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix new file mode 100644 index 000000000000..1e4036b4c27d --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix @@ -0,0 +1,17 @@ +{ lib, trivialBuild, fetchurl }: + +trivialBuild rec { + pname = "ebuild-mode"; + version = "1.52"; + + src = fetchurl { + url = "https://dev.gentoo.org/~ulm/emacs/ebuild-mode-${version}.tar.xz"; + sha256 = "10nikbbwh612qlnms2i31963a0h3ccyg85vrxlizdpsqs4cjpg6h"; + }; + + meta = with lib; { + description = "Major modes for Gentoo package files"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qyliss ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 7ccd96a9ca08..b2a66c92aea2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -199,6 +199,8 @@ # Packages made the classical callPackage way + ebuild-mode = callPackage ./ebuild-mode { }; + emacspeak = callPackage ./emacspeak { }; ess-R-object-popup = callPackage ./ess-R-object-popup { }; From 78df2079fce786a020a2d8fb9a07ea7241ee2a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 28 Jun 2021 16:18:10 +0200 Subject: [PATCH 15/38] python3Packages.starline: init at 0.1.5 --- .../python-modules/starline/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/starline/default.nix diff --git a/pkgs/development/python-modules/starline/default.nix b/pkgs/development/python-modules/starline/default.nix new file mode 100644 index 000000000000..4f4ad545f2df --- /dev/null +++ b/pkgs/development/python-modules/starline/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, requests +}: + +buildPythonPackage rec { + pname = "starline"; + version = "0.1.5"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1753f5fcd2a6976aed775afb03f8392159f040c673917cc0c634510d95c13cb9"; + }; + + propagatedBuildInputs = [ + aiohttp + requests + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "starline" ]; + + meta = with lib; { + description = "Unofficial python library for StarLine API"; + homepage = "https://github.com/Anonym-tsk/starline"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec1b8aaad6f7..057ab33f67e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8248,6 +8248,8 @@ in { starkbank-ecdsa = callPackage ../development/python-modules/starkbank-ecdsa { }; + starline = callPackage ../development/python-modules/starline { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; statistics = callPackage ../development/python-modules/statistics { }; From 831807d65ac46e71372fd1c2bc8161b4fff13d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 28 Jun 2021 16:18:35 +0200 Subject: [PATCH 16/38] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d83bb5fa2a87..91bd3582c751 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -801,7 +801,7 @@ "squeezebox" = ps: with ps; [ pysqueezebox ]; "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr netdisco zeroconf ]; - "starline" = ps: with ps; [ ]; # missing inputs: starline + "starline" = ps: with ps; [ starline ]; "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank "startca" = ps: with ps; [ xmltodict ]; "statistics" = ps: with ps; [ sqlalchemy ]; From 0e6f2e2201a78f663f4cb159ebf79f03c61c778b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 28 Jun 2021 16:20:03 +0200 Subject: [PATCH 17/38] home-assistant: test starline component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3de4b2d22b0b..e3f799cc0848 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -674,6 +674,7 @@ in with py.pkgs; buildPythonApplication rec { "sql" "squeezebox" "ssdp" + "starline" "startca" "statistics" "statsd" From 568ca86168da1cb778c4a1adec2f3f781f87d037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 28 Jun 2021 16:27:19 +0200 Subject: [PATCH 18/38] dpdk: make myself maintainer --- pkgs/os-specific/linux/dpdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 32aa4b41f30b..a4bad12b7165 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -72,6 +72,6 @@ in stdenv.mkDerivation rec { homepage = "http://dpdk.org/"; license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ magenbluten orivej ]; + maintainers = with maintainers; [ magenbluten orivej mic92 ]; }; } From 24da590943a28b20bfd9c3dbae3210068c5bc817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 28 Jun 2021 16:29:11 +0200 Subject: [PATCH 19/38] python3Packages.srpenergy: init at 1.3.2 --- .../python-modules/srpenergy/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/srpenergy/default.nix diff --git a/pkgs/development/python-modules/srpenergy/default.nix b/pkgs/development/python-modules/srpenergy/default.nix new file mode 100644 index 000000000000..140062edf1f0 --- /dev/null +++ b/pkgs/development/python-modules/srpenergy/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, python-dateutil +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "srpenergy"; + version = "1.3.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "lamoreauxlab"; + repo = "srpenergy-api-client-python"; + rev = version; + sha256 = "03kldjk90mrnzf2hpd7xky0lpph853mjxc34kfa2m5mbpbpkxz9c"; + }; + + propagatedBuildInputs = [ + python-dateutil + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "srpenergy.client" ]; + + meta = with lib; { + description = "Unofficial Python module for interacting with Srp Energy data"; + homepage = "https://github.com/lamoreauxlab/srpenergy-api-client-python"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec1b8aaad6f7..7900230f43a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8218,6 +8218,8 @@ in { srp = callPackage ../development/python-modules/srp { }; + srpenergy = callPackage ../development/python-modules/srpenergy { }; + srptools = callPackage ../development/python-modules/srptools { }; srsly = callPackage ../development/python-modules/srsly { }; From 12fd96ae06482d8da6601cc2b41ae7a4d3bfae32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 28 Jun 2021 16:30:33 +0200 Subject: [PATCH 20/38] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d83bb5fa2a87..423d703f1172 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -799,7 +799,7 @@ "spotify" = ps: with ps; [ aiohttp-cors spotipy ]; "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ pysqueezebox ]; - "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy + "srp_energy" = ps: with ps; [ srpenergy ]; "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr netdisco zeroconf ]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank From 6b21275e586453b19c0dd2cb68aa9b31c9a80bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 28 Jun 2021 16:32:51 +0200 Subject: [PATCH 21/38] home-assistant: test srp_energy component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3de4b2d22b0b..b7a0fc25abe1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -673,6 +673,7 @@ in with py.pkgs; buildPythonApplication rec { "spotify" "sql" "squeezebox" + "srp_energy" "ssdp" "startca" "statistics" From 25eb4871dedaffd054b97c099cf436d2992850c8 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sun, 27 Jun 2021 14:06:41 +0200 Subject: [PATCH 22/38] polkadot: 0.9.6 -> 0.9.7 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index f2ec18b3927f..8c549ee4e796 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-waoNCEGHFjY91ted4oBtwxW6/beqW/8IwRIE4rG+fKQ="; + sha256 = "sha256-swPLJIcm8XD0+/e9pGK2bDqUb7AS/5FdQ3A7Ceh5dZc="; }; - cargoSha256 = "17c45xi1wr77jbkcl1mkxflc8f9hilil02c43fihvlh2lm8kcs5j"; + cargoSha256 = "sha256-4njx8T3kzyN63Jo0aHee5ImqcObiADvi+dHKWcRmbQw="; nativeBuildInputs = [ clang ]; From 254a1f32a6a4664b7a6072c9f7419f1802b3a5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Jun 2021 17:19:39 +0200 Subject: [PATCH 23/38] libsForQt5.kimageformats: fix build after libavif update --- .../libraries/kde-frameworks/kimageformats.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 505cfe05d287..4ad3ba741008 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, ilmbase, karchive, openexr, libavif, qtbase }: @@ -8,6 +8,15 @@ let inherit (lib) getDev; in mkDerivation { name = "kimageformats"; + + patches = [ + (fetchpatch { # included in kimageformats >= 5.83 + name = "avif-0.9.2.diff"; + url = "https://invent.kde.org/frameworks/kimageformats/-/commit/bf3f94da766d66a0470ab744dbe1ced4697b572d.diff"; + sha256 = "18d67l5kj9sv88jdpi061k9rl3adzkx9l51ng7saylrkfddwc3ig"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive openexr libavif qtbase ]; outputs = [ "out" ]; # plugins only From 98336c223b7778053bf8136c2f269ce4dfec29f5 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 15 Nov 2020 11:54:15 -0500 Subject: [PATCH 24/38] pkgs-lib: allow paths in TOML, YAML and JSON Paths get automatically added to the store. The INI generator currently chokes on paths, so it is not supported for now. --- pkgs/pkgs-lib/formats.nix | 2 ++ pkgs/pkgs-lib/tests/formats.nix | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 4b6982f387d0..4d5395664612 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -30,6 +30,7 @@ rec { int float str + path (attrsOf valueType) (listOf valueType) ]) // { @@ -112,6 +113,7 @@ rec { int float str + path (attrsOf valueType) (listOf valueType) ] // { diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 2c117e29e9ba..679fde015228 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -38,6 +38,7 @@ in runBuildTests { str = "foo"; attrs.foo = null; list = [ null null ]; + path = ./formats.nix; }; expected = '' { @@ -52,6 +53,7 @@ in runBuildTests { null ], "null": null, + "path": "${./formats.nix}", "str": "foo", "true": true } @@ -67,6 +69,7 @@ in runBuildTests { str = "foo"; attrs.foo = null; list = [ null null ]; + path = ./formats.nix; }; expected = '' { @@ -80,6 +83,7 @@ in runBuildTests { null ], "null": null, + "path": "${./formats.nix}", "str": "foo", "true": true } From 2ced8f24554648c6a8b1bb27a9cc087600c3644b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jun 2021 18:06:56 +0000 Subject: [PATCH 25/38] checkstyle: 8.43 -> 8.44 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 11c2178b6987..4c735de89de9 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.43"; + version = "8.44"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-jb864Kr5Hx/e2OIRYPLJGkRIsxT/cebLnOGGy1YtJY8="; + sha256 = "sha256-tXTU5A4mKQ0DDWCE3VUXB3fbanHyFNSIcTMJ3NRlj6A="; }; nativeBuildInputs = [ makeWrapper ]; From a8c0b77793f90283b9e652504de63f8086d98c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 28 Jun 2021 20:27:28 +0200 Subject: [PATCH 26/38] volk: remove unused argument --- pkgs/development/libraries/volk/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 34f7a7d8a8e1..3a26344d1552 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitHub , cmake -, cppunit , python3 , enableModTool ? true , removeReferencesTo From 6fe65621771fa409c1ad0cbd61b138eb384a5a4e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Jun 2021 04:49:14 +0000 Subject: [PATCH 27/38] go-minimock: 3.0.8 -> 3.0.9 --- pkgs/development/tools/go-minimock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index 3131fc59b414..60f53e1e253c 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h"; + sha256 = "sha256-l+ngvmTb9yVgQYT+OeaVd0zz/xNZeXWrjMpVkMpbQIw="; }; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc"; + vendorSha256 = "sha256-hn222ifKRYbASAHBJyMTCDwhykf2Jg9IqIUlK/GabJA="; doCheck = true; From b3beccf6798936bac20c687e81c58f5c7efc04db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Jun 2021 22:41:08 +0000 Subject: [PATCH 28/38] kodiPackages.inputstream-adaptive: 2.6.16 -> 2.6.17 --- .../video/kodi-packages/inputstream-adaptive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index 3ec8b19aed7e..e3cf4621ca67 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.16"; + version = "2.6.17"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "0c9cy284crmki2pmg9gvf443hrg13x1cr4vzd4yjsnpk6xpifad6"; + sha256 = "sha256-MHwLTSyMF7vYiVTof3xePW2eOySCr4/xYlPvWSzBZUg="; }; extraNativeBuildInputs = [ gtest ]; From 3b77eb173434e366b26b5e95975f4556e80ce9d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Jun 2021 04:01:26 +0000 Subject: [PATCH 29/38] fluent-bit: 1.7.6 -> 1.7.9 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 5fdd4b72e1e4..5a5ad121b391 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.7.6"; + version = "1.7.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-/Mpdi414LNzavh4nUY2pnflyshzwTYv1XK1HmnAHJaQ="; + sha256 = "sha256-rL2IJYTMs0Yzo/oqrcI56krmVnxxxRWCebSjjbjiP/k="; }; nativeBuildInputs = [ cmake flex bison ]; From 87f2fe53663c0fc6c6d6eee6f0d773b50ecd3020 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Jun 2021 17:05:50 +0000 Subject: [PATCH 30/38] fuzzel: 1.5.4 -> 1.6.0 --- pkgs/applications/misc/fuzzel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 71c494d311a9..1e51f69f1c1f 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.5.4"; + version = "1.6.0"; src = fetchzip { url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"; - sha256 = "sha256-Zg9KrRf2ntg2FU6lhllt/Fd63KJak6zB7hu4ujj/9AI="; + sha256 = "sha256-iTpUWvQszDtNc1gDqkPbhvgUVNWydpivhnOCHMJVtSw="; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; From 886c38abb8dc139652169a11044a0f61f0afa69e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Jun 2021 11:36:48 +0000 Subject: [PATCH 31/38] gophernotes: 0.7.2 -> 0.7.3 --- pkgs/applications/editors/gophernotes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/applications/editors/gophernotes/default.nix index 468b3ff03838..fe694c1add4f 100644 --- a/pkgs/applications/editors/gophernotes/default.nix +++ b/pkgs/applications/editors/gophernotes/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gophernotes"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "gopherdata"; repo = "gophernotes"; rev = "v${version}"; - sha256 = "sha256-EEMKV+k5qcep4z7J5r1nSLxmb0fbfpJOPmz5bE91cd8="; + sha256 = "sha256-LiYPos6Ic+se5bTTkvggmyxyS20uhgALkDU2LoXTci8="; }; - vendorSha256 = "sha256-Wy4HcPlrlYUjRQHhw+UPAa+Rn1FvJobWGxgFiJKJTAg="; + vendorSha256 = "sha256-wDMx3B47Vv87/3YEPX8/70Q5/REJ7IPvw8dA/viJiSY="; meta = with lib; { description = "Go kernel for Jupyter notebooks"; From f1413d34e9fb60d5f93ae737ed5c41365e59e441 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Jun 2021 05:58:52 +0000 Subject: [PATCH 32/38] cargo-flash: 0.10.1 -> 0.11.0 --- pkgs/development/tools/rust/cargo-flash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index a2679b53c4b0..fe9f6c9dff6d 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aQ5647woODs/A4fcxSsQoQHL6YQ0TpfQFegtXETqlHk="; + sha256 = "sha256-yTtnRdDy3wGBe0SlO0165uooWu6ZMhUQw3hdDUK1e8A="; }; - cargoSha256 = "sha256-P7xyg9I1MhmiKlyAI9cvABcYKNxB6TSvTgMsMk5KxAQ="; + cargoSha256 = "sha256-f5vUMdyz3vDh2yE0pMKZiknsqTAKkuvTCtlgb6/gaLc="; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; From a54553eff6527994bd6efab15f9023aa28066135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 28 Jun 2021 20:47:28 +0200 Subject: [PATCH 33/38] volk: fix darwin build --- pkgs/development/libraries/volk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 3a26344d1552..40ae88bf71bb 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; - postInstall = '' + postInstall = lib.optionalString (!stdenv.isDarwin) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) ''; From d71d7ecef16788f717ba5d1ae739fb8915648205 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 28 Jun 2021 08:11:37 +0200 Subject: [PATCH 34/38] tinc_pre: 1.1pre17 -> 1.1pre18 --- pkgs/tools/networking/tinc/pre.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 2379338e51d9..5bd1858c195c 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -2,24 +2,16 @@ stdenv.mkDerivation rec { pname = "tinc"; - version = "1.1pre17"; + version = "1.1pre18"; src = fetchgit { - rev = "refs/tags/release-${version}"; + rev = "release-${version}"; url = "git://tinc-vpn.org/tinc"; - sha256 = "12abmx9qglchgn94a1qwgzldf2kaz77p8705ylpggzyncxv6bw2q"; + sha256 = "0a7d1xg34p54sv66lckn8rz2bpg7bl01najm2rxiwbsm956y7afm"; }; outputs = [ "out" "man" "info" ]; - patches = [ - (fetchpatch { - name = "tinc-openssl-1.0.2r.patch"; - url = "http://git.tinc-vpn.org/git/browse?p=tinc;a=patch;h=2b0aeec02d64bb4724da9ff1dbc19b7d35d7c904"; - sha256 = "0kidzlmgl0cin4g54ygcxa0jbq9vwlk3dyq5f65nkjd8yvayfzi8"; - }) - ]; - nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ ncurses readline zlib lzo openssl ]; From 7f07b70d08e19322c2b982be8e37746419e26add Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 28 Jun 2021 22:40:40 +0200 Subject: [PATCH 35/38] Revert "writers: Allow string paths" This reverts commit 33ffb05d390987802fe939f9c9a3d6a451076535. --- pkgs/build-support/writers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 5a70bcbe3cf6..47919c251af1 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -15,12 +15,12 @@ rec { name = last (builtins.split "/" nameOrPath); in - pkgs.runCommandLocal name (if types.path.check content then { - inherit interpreter; - contentPath = content; - } else { + pkgs.runCommandLocal name (if (types.str.check content) then { inherit content interpreter; passAsFile = [ "content" ]; + } else { + inherit interpreter; + contentPath = content; }) '' # On darwin a script cannot be used as an interpreter in a shebang but # there doesn't seem to be a limit to the size of shebang and multiple From b9317c2afe0dc44e7243327d25c6799d6c553d0d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Jun 2021 22:53:06 +0200 Subject: [PATCH 36/38] python3Packages.hstspreload: 2021.6.21 -> 2021.6.28 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 7d509d31b2b9..e6a3837522e6 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.6.21"; + version = "2021.6.28"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-mo3DqEiuieCSM5d3Z+tKvtmazlh53pgsM4bkawSvuSM="; + sha256 = "sha256-SZGyn79R3+IwtoZ+khgFnl0WosRoCcKNk8efGxbOugc="; }; # tests require network connection From 56d11e1467123fb1cd6212418aa2703520415524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <303897+fabianhjr@users.noreply.github.com> Date: Mon, 28 Jun 2021 16:13:42 -0500 Subject: [PATCH 37/38] gupnp: revert #128448 (#128543) --- pkgs/development/libraries/gupnp/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index eaec28d88e09..c91d25123f61 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -20,15 +20,23 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.2.7"; + version = "1.2.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hEEnbxr9AXbm9ZUCajpQfu0YCav6BAJrrT8hYis1I+w="; + sha256 = "sha256-96AwfqUfXkTRuDL0k92QRURKOk4hHvhd/Zql3W6up9E="; }; + patches = [ + (fetchpatch { + name = "CVE-2021-33516.patch"; + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/ca6ec9dcb26fd7a2a630eb6a68118659b589afac.patch"; + sha256 = "sha256-G7e/xNQB7Kp2fPzqVeD/cH3h1co9hZXh55QOUBnAnvU="; + }) + ]; + nativeBuildInputs = [ meson ninja From 0dccbe2729efbaee995605bff8de3c83ca61860f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 28 Jun 2021 22:40:41 +0000 Subject: [PATCH 38/38] nixos/tests/kernel-generic: fix evaluation This is breaking the tarball build, because #128502 depends on this test existing. After this commit, nixpkgs.tarball once again evaluates. --- nixos/tests/kernel-generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index cb23bb2fc2d4..cd32049dff46 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -32,6 +32,7 @@ with pkgs; { linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; + linux_5_13 = makeKernelTest "5.13" linuxPackages_5_13; linux_testing = makeKernelTest "testing" linuxPackages_testing; }