From 3c6be4cec71023f4b88407b343c752a210afde45 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 12 Feb 2023 20:35:59 -0300 Subject: [PATCH 1/5] arcanPackages.arcan: cosmetic rewrite --- pkgs/desktops/arcan/arcan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index 22c214728f2b..03e73f6813cf 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -56,14 +56,14 @@ let cmakeFeatureFlag = feature: flag: "-D${feature}=${if flag then "on" else "off"}"; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; version = "0.6.2.1"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = finalAttrs.version; + rev = self.version; hash = "sha256-7H3fVSsW5VANLqwhykY+Q53fPjz65utaGksh/OpZnJM="; }; @@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_PRESET=everything" # The upstream project recommends tagging the distribution "-DDISTR_TAG=Nixpkgs" - "-DENGINE_BUILDTAG=${finalAttrs.version}" + "-DENGINE_BUILDTAG=${self.version}" (cmakeFeatureFlag "HYBRID_SDL" true) (cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua) (cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua) From 3cb73a653bd2e643c3effc78a29e5ba06ac3011a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 12 Feb 2023 20:38:36 -0300 Subject: [PATCH 2/5] arcanPackages.prio: cosmetic rewrite --- pkgs/desktops/arcan/prio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/desktops/arcan/prio/default.nix index 03a8f05908b5..a2acbfbdea49 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/desktops/arcan/prio/default.nix @@ -3,13 +3,13 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (self: { pname = "prio"; version = "unstable-2018-09-13"; src = fetchFromGitHub { owner = "letoram"; - repo = finalPackages.pname; + repo = "prio"; rev = "c3f97491339d15f063d6937d5f89bcfaea774dd1"; hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM="; }; From d39b1260365d040a0fef49082eb7cd3e622c3cce Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 12 Feb 2023 20:37:02 -0300 Subject: [PATCH 3/5] arcanPackages.cat9: unstable-2018-09-13 -> unstable-2023-02-11 --- pkgs/desktops/arcan/cat9/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/arcan/cat9/default.nix b/pkgs/desktops/arcan/cat9/default.nix index 909f4d57993b..d94f3c59c425 100644 --- a/pkgs/desktops/arcan/cat9/default.nix +++ b/pkgs/desktops/arcan/cat9/default.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (self: { pname = "cat9"; - version = "unstable-2018-09-13"; + version = "unstable-2023-02-11"; src = fetchFromGitHub { owner = "letoram"; - repo = finalPackages.pname; - rev = "754d9d2900d647a0fa264720528117471a32f295"; - hash = "sha256-UmbynVOJYvHz+deA99lj/BBFOauZzwSNs+qR28pASPY="; + repo = "cat9"; + rev = "1da9949c728e0734a883d258a8a05ca0e3dd5897"; + hash = "sha256-kit+H9u941oK2Ko8S/1w+3DN6ktnfBtd+3s9XgU+qOQ="; }; dontConfigure = true; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalPackages: { meta = with lib; { homepage = "https://github.com/letoram/cat9"; description = "A User shell for LASH"; - license = licenses.bsd3; + license = licenses.unlicense; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; From fbac91e0bab383d405b3150d98cc1c6ded2a5c74 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 12 Feb 2023 20:37:51 -0300 Subject: [PATCH 4/5] arcanPackages.durden: unstable-2022-10-16 -> unstable-2023-01-19 --- pkgs/desktops/arcan/durden/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index a18f33ef93aa..04492ee3db9a 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (self: { pname = "durden"; - version = "unstable-2022-10-16"; + version = "unstable-2023-01-19"; src = fetchFromGitHub { owner = "letoram"; repo = "durden"; - rev = "728a9f09ac8b306ab2619b4e2ec4f48decf1b7a8"; - hash = "sha256-ckOKdrz232Q6hAyFC2mAyZQLNuuR8JbVhbLy32qFn1o="; + rev = "bba1bcc8992ea5826fd3b1c798cb271141b7c8e2"; + hash = "sha256-PK9ObMJ3SbHZLnLjxk4smh5N0WaM/2H/Y+T5vKBdHWA="; }; dontConfigure = true; From f60c5a80b0d6074e86d7cee7f93e9955cf248587 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 12 Feb 2023 20:38:51 -0300 Subject: [PATCH 5/5] arcanPackages.pipeworld: unstable-2022-04-03 -> unstable-2023-02-05 --- pkgs/desktops/arcan/pipeworld/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index 1c1c66fd3fb0..a9a1e24a97b9 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalPackages: { pname = "pipeworld"; - version = "unstable-2022-04-03"; + version = "unstable-2023-02-05"; src = fetchFromGitHub { owner = "letoram"; repo = "pipeworld"; - rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef"; - hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E="; + rev = "58b2e9fe15ef0baa4b04c27079bfa386ec62b28e"; + hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM="; }; dontConfigure = true;