From 9aea52cf10323205c120a8ae2ca11ee9ad2a358c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:32:06 -0300 Subject: [PATCH 1/5] arcan: fixup clone-sources --- pkgs/desktops/arcan/arcan/clone-sources.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/arcan/arcan/clone-sources.nix b/pkgs/desktops/arcan/arcan/clone-sources.nix index 2ade63e70bfa..c7c6bebb704a 100644 --- a/pkgs/desktops/arcan/arcan/clone-sources.nix +++ b/pkgs/desktops/arcan/arcan/clone-sources.nix @@ -11,7 +11,7 @@ rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57"; sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg="; }; - libuvc-src = fetchgit { + libuvc-src = fetchFromGitHub { owner = "libuvc"; repo = "libuvc"; rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837"; From 271f38b401cedd765edc084dfd382cd040dda0f9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:30:02 -0300 Subject: [PATCH 2/5] arcan.prio: reformat expression --- pkgs/desktops/arcan/prio/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/desktops/arcan/prio/default.nix index 34443baa8017..406aea740fc4 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/desktops/arcan/prio/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "prio"; - version = "0.pre+unstable=2018-09-13"; + version = "0.pre+date=2018-09-13"; src = fetchFromGitHub { owner = "letoram"; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM="; }; + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall From 70e183ec070a0f550240f40c2a0428bd6b417e2a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:30:39 -0300 Subject: [PATCH 3/5] arcan.pipeworld: 0.pre+date=2021-11-26 -> 0.pre+date=2021-12-03 --- pkgs/desktops/arcan/pipeworld/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index fa1a09230d9d..09f809aa4718 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -5,15 +5,19 @@ stdenv.mkDerivation rec { pname = "pipeworld"; - version = "0.pre+date=2021-11-26"; + version = "0.pre+date=2021-12-03"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "9f816db154ca5c54af952ad11c2186ccac5bdd2d"; - hash = "sha256-uwnrRsMP0RLEGr2mEVQ6kEtV/c6t5qSCHY0ynywPzkw="; + rev = "c653414670cafb0c73a57492aa3d9510460b16a9"; + hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk="; }; + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall From 546cad223d0a309e264ffb83046500521cd3039a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:31:37 -0300 Subject: [PATCH 4/5] arcan.durden: 0.6.1+date=2021-10-17 -> 0.6.1+date=2022-03-11 --- pkgs/desktops/arcan/durden/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index b5fc02127ece..46012d69d2dd 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -5,15 +5,19 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+date=2021-10-17"; + version = "0.6.1+date=2022-03-11"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "5fb8b0f9bc2952ed9cf7dc20a1c5c0cc44c02ff1"; - hash = "sha256-+EIsrCkMe9MrUQOCh0R+rsDg/Rqs3iQWO0GZCgZQ+No="; + rev = "fec2a1051500df28becce188d932645743091efa"; + hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA="; }; + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall From c0d91e28523d77abd3c86e14b16142125d810092 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:28:34 -0300 Subject: [PATCH 5/5] arcan.xarcan: 0.6.0+unstable=2021-06-14 -> 0.6.0+date=2021-08-26 --- pkgs/desktops/arcan/xarcan/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/desktops/arcan/xarcan/default.nix index d72bf4ad5bb3..0668754d6aa4 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/pkgs/desktops/arcan/xarcan/default.nix @@ -38,23 +38,15 @@ stdenv.mkDerivation rec { pname = "xarcan"; - version = "0.6.0+unstable=2021-06-14"; + version = "0.6.0+date=2021-08-26"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "98d28a5f2c6860bb191fbc1c9e577c18e4c9a9b7"; - hash = "sha256-UTIVDKnYD/q0K6G7NJUKh1tHcqnsuiJ/cQxWuPMJ2G4="; + rev = "e40f0176e495ffdad6e7405c58378df6532eb70d"; + hash = "sha256-T+1oL7P5MTDkeSfW6OXc1OgfZ8E6e/4YRonf1eXcfIA="; }; - patches = [ - # fix build with meson 0.60 - (fetchpatch { - url = "https://github.com/letoram/xarcan/commit/b67e514dbb59bffc23b75d47ca7f24e96c4aeb05.patch"; - sha256 = "sha256-tSQmNy1Id6nDIN+03dc1+rEEF8fMq0yJBiscNM60xic="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -122,6 +114,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + platforms = platforms.unix; }; }