niv update (#46)

* remove vpsadmin

We're not using this at the moment

* niv update

build01/gitlab.nix

@@ -11,5 +11,9 @@ in
   ];
 
   services.gitlab-runner2.enable = true;
+  # The module depends on gitlab-runner to have a "bin" output.
+  services.gitlab-runner2.package = pkgs.gitlab-runner // {
+    bin = pkgs.gitlab-runner;
+  };
   services.gitlab-runner2.registrationConfigFile = "/run/keys/gitlab-runner-registration";
 }

build01/hydra.nix

@@ -107,10 +107,10 @@ in
 
     services.postgresql = {
       enable = true;
-      extraConfig = ''
-        shared_buffers = 4GB
-        effective_cache_size = 4GB
-      '';
+      settings = {
+        effective_cache_size = "4GB";
+        shared_buffers = "4GB";
+      };
     };
 
     nix = {

nix/overlays.nix

@@ -6,15 +6,11 @@ let
       nixops
       ;
 
-    terraform-provider-vpsadmin =
-      pkgs.callPackage ./terraform-provider-vpsadmin.nix { };
-
     terraform = pkgs.terraform.withPlugins (
       p: [
         p.cloudflare
         p.null
         p.external
-        terraform-provider-vpsadmin
       ]
     );
   };

nix/sources.json

@@ -13,14 +13,14 @@
     },
     "nixpkgs": {
         "branch": "nixos-unstable",
-        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
+        "description": "Nix Packages collection",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
-        "repo": "nixpkgs-channels",
-        "rev": "b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb",
-        "sha256": "0cggpdks4qscyirqwfprgdl91mlhjlw24wkg0riapk5f2g2llbpq",
+        "repo": "nixpkgs",
+        "rev": "733e537a8ad76fd355b6f501127f7d0eb8861775",
+        "sha256": "1rjvbycd8dkkflal8qysi9d571xmgqq46py3nx0wvbzwbkvzf7aw",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/733e537a8ad76fd355b6f501127f7d0eb8861775.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-update": {
@@ -82,17 +82,5 @@
         "type": "tarball",
         "url": "https://github.com/ElvishJerricco/simple-hydra/archive/0d28b0b66136082d0cbfd90ede4436a580e3e8d0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "terraform-provider-vpsadmin": {
-        "branch": "master",
-        "description": "Terraform provider for vpsAdmin",
-        "homepage": null,
-        "owner": "vpsfreecz",
-        "repo": "terraform-provider-vpsadmin",
-        "rev": "55a9bbec968fcc1966b6362bd087d46e3e2b21b1",
-        "sha256": "182s23xcakbjbc3wy3kg4j5bx67ayw3lca9prk82rcj76lwdjwcb",
-        "type": "tarball",
-        "url": "https://github.com/vpsfreecz/terraform-provider-vpsadmin/archive/55a9bbec968fcc1966b6362bd087d46e3e2b21b1.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

nix/terraform-provider-vpsadmin.nix

@@ -1,8 +0,0 @@
-{ buildGoModule, fetchFromGitHub, sources }:
-buildGoModule {
-  pname = "terraform-provider-vpsadmin";
-  version = "latest";
-  src = sources.terraform-provider-vpsadmin;
-  modSha256 = "sha256-gz+t50uHFj4BQnJg6kOJI/joJVE+usLpVzTqziek2wY=";
-  subPackages = [ "." ];
-}

shell.nix

@@ -22,6 +22,5 @@ pkgs.mkShell {
 
   shellHooks = ''
     export CLOUDFLARE_API_TOKEN=$(< ./secrets/cloudflare-api-token)
-    export VPSADMIN_API_TOKEN=$(< ./secrets/vpsadmin-token)
   '';
 }