From b41f79fe8418dab0d5aff6a6a08b8649f8a46acd Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 12 Jul 2020 00:09:47 +0300 Subject: [PATCH 1/7] openxray: 558 -> 730 --- pkgs/games/openxray/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 9e38852a02a5..fe2e978c4cc4 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -3,13 +3,13 @@ , pcre, makeWrapper }: let - version = "558"; + version = "730-july-preview"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; rev = version; - sha256 = "1wnkx9g0ww4f5pljrb0wzs054jzkig1i5hlz1p509rfvnhc50afp"; + sha256 = "1nish3sbpk0hsag7r4nyx8j6pl9mlgx58v8dhzg2vwj2q32isyb2"; fetchSubmodules = true; }; @@ -40,7 +40,6 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; - installFlags = [ "DESTDIR=${placeholder "out"}" ]; buildInputs = [ glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo @@ -54,11 +53,6 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - mv $out/var/empty/* $out - install -Dm755 $out/games/xr_3da $out/bin/xr_3da - install -Dm644 $src/License.txt $out/share/licenses/openxray/License.txt - rm -r $out/var $out/games - # needed because of SDL_LoadObject library loading code wrapProgram $out/bin/xr_3da \ --prefix LD_LIBRARY_PATH : $out/lib From 29bdfffddb9b028789aab8a95a61b991c48075db Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:21:31 +0300 Subject: [PATCH 2/7] adlplug, opnplug: 1.0.1 -> 1.0.2 --- pkgs/applications/audio/adlplug/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index bc626cbad114..7dcc13eb96d5 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor -, fetchpatch +, fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" , pname ? "ADLplug" }: stdenv.mkDerivation rec { inherit pname; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jpcima"; repo = "ADLplug"; rev = "v${version}"; - sha256 = "0n9srdlgl1j528ap5xmllrqs1w6ibc5yf9sphvl1q9kjnizxrs2c"; + sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f"; fetchSubmodules = true; }; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = [ adlplugChip ]; + cmakeFlags = [ adlplugChip "-DADLplug_USE_SYSTEM_FMT=ON" ]; buildInputs = [ libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext libXcursor ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig fmt ]; meta = with stdenv.lib; { description = "OPL3 and OPN2 FM Chip Synthesizer"; From eaf6ef8f006f99462716a0ed250985a05f1dd329 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:26:06 +0300 Subject: [PATCH 3/7] ArchiSteamFarm: 4.2.3.3 -> 4.2.3.6 --- pkgs/applications/misc/ArchiSteamFarm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 71404e735476..e5121ce6e7d9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.3.3"; + version = "4.2.3.6"; src = fetchurl { url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "0v69rrs5fr1n5llfx42xkiish52al7kb36fjy3ng0j9qfp3g8pj7"; + sha256 = "1a8baxrb8czndxxi16md1nyl2snfx215yvrygdpcblgngkp2z2y9"; }; nativeBuildInputs = [ unzip makeWrapper jq ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --run "[ -d config ] || cp --no-preserve=mode -r $dist/config ." \ --run "[ -d logs ] || cp --no-preserve=mode -r $dist/logs ." \ --run "[ -d plugins ] || cp --no-preserve=mode -r $dist/plugins ." \ - --run "[ -d www ] || ln -sf $dist/www ." + --run "ln -sf $dist/www ." ''; meta = with stdenv.lib; { From 2774941cc2f1286879b155fc17bbba36a1779be0 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:33:19 +0300 Subject: [PATCH 4/7] kmsxx: 2020-02-14 -> 2020-08-04 --- pkgs/development/libraries/kmsxx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 740248a7ae8f..5bd311af2d85 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation { pname = "kmsxx"; - version = "2020-02-14"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "tomba"; repo = "kmsxx"; fetchSubmodules = true; - rev = "7c5e645112a899ad018219365c3898b0e896353f"; - sha256 = "1hj4gk4gwlvpjprjbrmrbrzqjhdgszsndrb1i4f9z7mjvdv8gij2"; + rev = "38bee3092f2d477f1baebfcae464f888d3d04bbe"; + sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh"; }; enableParallelBuilding = true; From de0caa8e8970745a8ca6a83a79a6abc7f516e0a4 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:46:00 +0300 Subject: [PATCH 5/7] openjk: 2019-11-29 -> 2020-07-03 --- pkgs/games/openjk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 2d08a1da9998..0fe327b308e9 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation { pname = "OpenJK"; - version = "2019-11-29"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "eed60925ad1b0d513d3747264f3bf98615fa4b2a"; - sha256 = "0b33cr540vz7w7dlagqf3yldmyx9y2pri20j44pd8fxapq4krrmb"; + rev = "0a336ce4dffe6505e3f754b59732402a1db95752"; + sha256 = "1xagbz42hi3ivs208mnay2dbgh90pmwwbar2p1yfhj3zl3cghcs8"; }; dontAddPrefix = true; From 059675cd0de0616e42081d85a972da0f09b676cd Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:53:07 +0300 Subject: [PATCH 6/7] opl3bankeditor: 1.5 -> 1.5.1 --- pkgs/tools/audio/opl3bankeditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index 0503f9bad694..381591edb021 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: mkDerivation rec { - version = "1.5"; + version = "1.5.1"; pname = "OPL3BankEditor"; src = fetchFromGitHub { owner = "Wohlstand"; repo = pname; rev = "v${version}"; - sha256 = "16va5xfbyn2m63722ab5yph0l7kmghkbk6dkia93041mfhdyg9rc"; + sha256 = "1g59qrkcm4xnyxx0s2x28brqbf2ix6vriyx12pcdvfhhcdi55hxh"; fetchSubmodules = true; }; From 1ace84441511d92b3acd40ab58494d124131bfe7 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 10:01:18 +0300 Subject: [PATCH 7/7] opn2bankeditor: 1.3-beta -> 1.3 --- pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix index d8f15a65b45b..1d10452470ed 100644 --- a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix +++ b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix @@ -1,19 +1,14 @@ { opl3bankeditor, fetchFromGitHub }: opl3bankeditor.overrideAttrs (oldAttrs: rec { - version = "1.3-beta"; + version = "1.3"; pname = "OPN2BankEditor"; src = fetchFromGitHub { owner = "Wohlstand"; repo = pname; - rev = version; - sha256 = "0blcvqfj1yj6cmm079aw4jdzv3066jxqy9krp268i6cl2b3bmwvw"; + rev = "v${version}"; + sha256 = "0xsvv0gxqh1lx22f1jm384f7mq1jp57fmpsx1jjaxz435w5hf8s0"; fetchSubmodules = true; }; - - # to be removed with next release - postInstall = '' - install -Dm755 opn2_bank_editor $out/bin/opn2_bank_editor - ''; })