From 89f6c97a8931c59075a2d30500563fc4483c467e Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Mon, 18 Dec 2023 15:19:06 +0100 Subject: [PATCH] zrythm: use zix from nixpkgs --- flake.lock | 6 +- pkgs/zrythm/_sources/generated.json | 192 ++++++++++++++-------------- pkgs/zrythm/_sources/generated.nix | 6 +- pkgs/zrythm/default.nix | 6 +- pkgs/zrythm/nvfetcher.toml | 8 -- 5 files changed, 103 insertions(+), 115 deletions(-) diff --git a/flake.lock b/flake.lock index 7ce981b2..fa63110c 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { diff --git a/pkgs/zrythm/_sources/generated.json b/pkgs/zrythm/_sources/generated.json index fa57db1a..7a3d44ba 100644 --- a/pkgs/zrythm/_sources/generated.json +++ b/pkgs/zrythm/_sources/generated.json @@ -1,101 +1,101 @@ { - "carla-git": { - "cargoLocks": null, - "date": "2023-12-13", - "extract": null, - "name": "carla-git", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "falkTX", - "repo": "Carla", - "rev": "68bbca2711626835157ef3a55938566f2ee3fe87", - "sha256": "sha256-2l2AD4bhYs7RSNYTVpI13Q4y2WgR3/yYIqWf/h6+09s=", - "type": "github" + "carla-git": { + "cargoLocks": null, + "date": "2023-12-13", + "extract": null, + "name": "carla-git", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "falkTX", + "repo": "Carla", + "rev": "68bbca2711626835157ef3a55938566f2ee3fe87", + "sha256": "sha256-2l2AD4bhYs7RSNYTVpI13Q4y2WgR3/yYIqWf/h6+09s=", + "type": "github" + }, + "version": "68bbca2711626835157ef3a55938566f2ee3fe87" }, - "version": "68bbca2711626835157ef3a55938566f2ee3fe87" - }, - "gtk-4_13_0": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "gtk-4_13_0", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "GNOME", - "repo": "gtk", - "rev": "4.13.0", - "sha256": "sha256-SiL+/wfpeIUF2sQpGN1nWVn/mna+m3UxfORAFq/8fl0=", - "type": "github" + "gtk-4_13_0": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "gtk-4_13_0", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "GNOME", + "repo": "gtk", + "rev": "4.13.0", + "sha256": "sha256-SiL+/wfpeIUF2sQpGN1nWVn/mna+m3UxfORAFq/8fl0=", + "type": "github" + }, + "version": "4.13.0" }, - "version": "4.13.0" - }, - "libadwaita-1_4": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "libadwaita-1_4", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "GNOME", - "repo": "libadwaita", - "rev": "1.4.rc", - "sha256": "sha256-VJV5kLoDXTPXb3gXz0iANmrfo+wiR4a59Z2tcjL5+/8=", - "type": "github" + "libadwaita-1_4": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "libadwaita-1_4", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "GNOME", + "repo": "libadwaita", + "rev": "1.4.rc", + "sha256": "sha256-VJV5kLoDXTPXb3gXz0iANmrfo+wiR4a59Z2tcjL5+/8=", + "type": "github" + }, + "version": "1.4.rc" }, - "version": "1.4.rc" - }, - "zix-git": { - "cargoLocks": null, - "date": "2023-12-02", - "extract": null, - "name": "zix-git", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "drobilla", - "repo": "zix", - "rev": "08954c900820320064d2e33445858e1ef5024a0b", - "sha256": "sha256-iMJUgobKNw+h8MRzziDHOD/3BBeuVd2tHvCYrRlF4G4=", - "type": "github" + "zix-git": { + "cargoLocks": null, + "date": "2023-12-02", + "extract": null, + "name": "zix-git", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "drobilla", + "repo": "zix", + "rev": "08954c900820320064d2e33445858e1ef5024a0b", + "sha256": "sha256-iMJUgobKNw+h8MRzziDHOD/3BBeuVd2tHvCYrRlF4G4=", + "type": "github" + }, + "version": "08954c900820320064d2e33445858e1ef5024a0b" }, - "version": "08954c900820320064d2e33445858e1ef5024a0b" - }, - "zrythm": { - "cargoLocks": null, - "date": "2023-09-02", - "extract": null, - "name": "zrythm", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "rev": "228c7ad526b354c9ba01bed71028b9cb422f73f0", - "sha256": "sha256-G7U9GI5B3o2MuS6saZk+yeu1YBdY2iY1QGbksoDpY58=", - "type": "git", - "url": "https://git.sr.ht/~alextee/zrythm" - }, - "version": "228c7ad526b354c9ba01bed71028b9cb422f73f0" - } -} + "zrythm": { + "cargoLocks": null, + "date": "2023-09-02", + "extract": null, + "name": "zrythm", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "rev": "228c7ad526b354c9ba01bed71028b9cb422f73f0", + "sha256": "sha256-G7U9GI5B3o2MuS6saZk+yeu1YBdY2iY1QGbksoDpY58=", + "type": "git", + "url": "https://git.sr.ht/~alextee/zrythm" + }, + "version": "228c7ad526b354c9ba01bed71028b9cb422f73f0" + } +} \ No newline at end of file diff --git a/pkgs/zrythm/_sources/generated.nix b/pkgs/zrythm/_sources/generated.nix index 1c930ce7..bbea2de5 100644 --- a/pkgs/zrythm/_sources/generated.nix +++ b/pkgs/zrythm/_sources/generated.nix @@ -1,10 +1,6 @@ # This file was generated by nvfetcher, please do not modify it manually. +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { - fetchgit, - fetchurl, - fetchFromGitHub, - dockerTools, -}: { carla-git = { pname = "carla-git"; version = "68bbca2711626835157ef3a55938566f2ee3fe87"; diff --git a/pkgs/zrythm/default.nix b/pkgs/zrythm/default.nix index 280b3325..ada72328 100644 --- a/pkgs/zrythm/default.nix +++ b/pkgs/zrythm/default.nix @@ -8,9 +8,9 @@ inherit (sources.carla-git) version src; }); - zix = pkgs.zix.overrideAttrs (_: { - inherit (sources.zix-git) src version; - }); + # zix = pkgs.zix.overrideAttrs (_: { + # inherit (sources.zix-git) src version; + # }); # remove when 4.13 gets added to nixpkgs gtk4 = pkgs.gtk4.overrideAttrs (oldAttrs: { diff --git a/pkgs/zrythm/nvfetcher.toml b/pkgs/zrythm/nvfetcher.toml index 0dd61ab7..7033e1ed 100644 --- a/pkgs/zrythm/nvfetcher.toml +++ b/pkgs/zrythm/nvfetcher.toml @@ -1,7 +1,3 @@ -[zix-git] -src.git = "https://github.com/drobilla/zix" -fetch.github = "drobilla/zix" - [carla-git] src.git = "https://github.com/falkTX/Carla" fetch.github = "falkTX/Carla" @@ -10,10 +6,6 @@ fetch.github = "falkTX/Carla" src.manual = "4.13.0" fetch.github = "GNOME/gtk" -[libadwaita-1_4] -src.manual = "1.4.rc" -fetch.github = "GNOME/libadwaita" - [zrythm] src.git = "https://git.sr.ht/~alextee/zrythm" fetch.git = "https://git.sr.ht/~alextee/zrythm"