From 9c62c507ec2e7088ba2d4929d8558729398d4266 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sun, 8 Dec 2024 19:27:25 +0100 Subject: [PATCH] misc: update deps --- flake.lock | 8 ++++---- flake.nix | 7 ++----- derivation.nix => package.nix | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) rename derivation.nix => package.nix (94%) diff --git a/flake.lock b/flake.lock index 32f80cf..9676155 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730588020, - "narHash": "sha256-Dd9wMrUjBafU9v+MZs2MbZOZS9yMpQiur0/C+VI9ZUg=", + "lastModified": 1733582159, + "narHash": "sha256-oZOQxIWeK210fC9dROuzmd+cFjD6PIWPHVOlh3Q9QtY=", "owner": "NuschtOS", "repo": "nuschtpkgs", - "rev": "9bfdbb374af63369ae96e0f689e02afcfc30ed3f", + "rev": "4d28ce918594885de8d1f85d5485e8f68a159fea", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "backports-24.05", + "ref": "backports-24.11", "repo": "nuschtpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a862a7d..2dbba25 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { # backports needed for arouteserver - nixpkgs.url = "github:NuschtOS/nuschtpkgs/backports-24.05"; + nixpkgs.url = "github:NuschtOS/nuschtpkgs/backports-24.11"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -10,12 +10,9 @@ (system: let pkgs = (import nixpkgs) { inherit system; }; - derivation = pkgs.callPackage ./derivation.nix { }; in { - packages = { - inherit (derivation) ddix-ixp-deploy ddix-ixp-commit; - }; + packages = pkgs.callPackage ./package.nix { }; } ) // { overlays.default = _: prev: { diff --git a/derivation.nix b/package.nix similarity index 94% rename from derivation.nix rename to package.nix index 5b5388f..bb6d2e9 100644 --- a/derivation.nix +++ b/package.nix @@ -4,8 +4,8 @@ let ansible-general = fetchFromGitHub { owner = "ansible-collections"; repo = "community.general"; - rev = "9.0.1"; - hash = "sha256-3lAzegva3j1wy21d9xdWfXBXUjCVOrjYPU1jSRSg/E4="; + rev = "10.1.0"; + hash = "sha256-6AE5msRvzwl2MupQmi+tcet+67sVe5nh2XUEsBbSu8U="; }; ddix-ansible-ixp = stdenv.mkDerivation { name = "ddix-ansible-ixp";