diff --git a/.drone.yml b/.drone.yml index 55c3c1b..39f06a2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,26 +8,30 @@ steps: environment: NIX_REMOTE: daemon PATH: /nix/var/nix/profiles/system/sw/bin/ - SSL_CERT_FILE: /nix/var/nix/profiles/system/etc/ssl/certs/ca-certificates.crt - GIT_SSL_CAINFO: /nix/var/nix/profiles/system/etc/ssl/certs/ca-certificates.crt - CURL_CA_BUNDLE: /nix/var/nix/profiles/system/etc/ssl/certs/ca-certificates.crt PAGER: cat USER: root - volumes: - - name: socket - path: /nix/var/nix/daemon-socket/socket volumes: - name: nixstore path: /nix + - name: nixconf + path: /etc/nix + - name: sslcerts + path: /etc/ssl commands: - - nix-build -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixpkgs-unstable.tar.gz -A sops-install-secrets.tests - - nix-build -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-20.03.tar.gz -A sops-install-secrets.tests + - nix-build -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz -A sops-install-secrets.tests + - nix-build -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-20.09.tar.gz -A sops-install-secrets.tests volumes: - name: nixstore host: path: /nix +- name: nixconf + host: + path: /nix/var/nix/profiles/system/etc/nix +- name: sslcerts + host: + path: /nix/var/nix/profiles/system/etc/ssl --- kind: signature -hmac: d9b3b156902d9351d56c103b9c9f91588c9b3ed17a821dd14877bf8e567d939d +hmac: 5bb657faca0ecd18576534f7e486511d6f698595cc244d9617e660ef2ddb678d ... diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 947e168..14c71be 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,8 +9,8 @@ jobs: strategy: matrix: nixPath: - - nixpkgs=channel:nixos-20.03 - - nixpkgs=channel:nixpkgs-unstable + - nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-20.09.tar.gz + - nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz os: [ ubuntu-latest, macos-latest ] runs-on: ${{ matrix.os }} steps: diff --git a/flake.lock b/flake.lock index 888ded0..ddd08b2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,18 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1596792298, - "narHash": "sha256-DM1fPvyRKneMihzALrguof78FxzBfRw243EFggkpog0=", + "lastModified": 1604350474, + "narHash": "sha256-zz0g0YmgJJqSd9032LWJAjHUeEIgvbXVoN2y8SCBQ9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "585aa266d36fc6cc5f300d6f0696f89168f38c3c", + "rev": "0da76dab4c2acce5ebf404c400d38ad95c52b152", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "root": { diff --git a/flake.nix b/flake.nix index 1ea03cc..3880762 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,6 @@ { description = "Integrates sops into nixos"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; outputs = { self, nixpkgs }: let systems = [ "x86_64-linux"