From cc48f11c417a451d53691f0394e246d95ea35a94 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 20 Dec 2021 19:34:48 +0100 Subject: [PATCH 1/3] remove broken code --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 937076d..664e02d 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ pkgs = nixpkgs.legacyPackages.${system}; in rec { - devShell."${system}" = pkgs.mkShell { + devShell = pkgs.mkShell { buildInputs = [ gnumake ]; }; }); From b546901623dda80caa97042e5f19f9b20137124a Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 20 Dec 2021 19:42:44 +0100 Subject: [PATCH 2/3] remove depricated urls --- network_inventory/urls.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/network_inventory/urls.py b/network_inventory/urls.py index 2759a3e..7120bc2 100644 --- a/network_inventory/urls.py +++ b/network_inventory/urls.py @@ -13,19 +13,19 @@ Including another URLconf 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ -from django.conf.urls import include, url +from django.conf.urls import include from django.contrib import admin from django.urls import path urlpatterns = [ - url(r'', include('backups.urls')), - url(r'', include('computers.urls')), - url(r'', include('core.urls')), - url(r'', include('customers.urls')), - url(r'', include('devices.urls')), - url(r'', include('licenses.urls')), - url(r'', include('nets.urls')), - url(r'', include('users.urls')), + path('', include('backups.urls')), + path(r'', include('computers.urls')), + path(r'', include('core.urls')), + path(r'', include('customers.urls')), + path(r'', include('devices.urls')), + path(r'', include('licenses.urls')), + path(r'', include('nets.urls')), + path(r'', include('users.urls')), path('admin/', admin.site.urls), - url(r'^_nested_admin/', include('nested_admin.urls')), + path('_nested_admin/', include('nested_admin.urls')), ] From 32e667a9a2bf521d1d60b242039f8feed9ebc101 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 20 Dec 2021 21:18:24 +0100 Subject: [PATCH 3/3] fix the flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 664e02d..1e739d3 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ in rec { devShell = pkgs.mkShell { - buildInputs = [ gnumake ]; + buildInputs = [ pkgs.gnumake ]; }; }); }