don't pin nixpkgs

This commit is contained in:
Cadey Ratio 2020-03-15 09:24:27 -04:00
parent 208c3a4da8
commit 7796082dbc
8 changed files with 14 additions and 49 deletions

View File

@ -1,5 +1,4 @@
{ sources ? import ./nix/sources.nix, system ? builtins.currentSystem { sources ? import ./nix/sources.nix, system ? builtins.currentSystem, pkgs ? import <nixpkgs> { } }:
, pkgs ? import sources.nixpkgs { inherit system; } }:
let let
callPackage = pkgs.lib.callPackageWith (pkgs // self); callPackage = pkgs.lib.callPackageWith (pkgs // self);

View File

@ -5,10 +5,10 @@
"homepage": "", "homepage": "",
"owner": "pigpigyyy", "owner": "pigpigyyy",
"repo": "MoonPlus", "repo": "MoonPlus",
"rev": "acbfdb949bde46c0192719bbeffa8415f6976e1a", "rev": "8de88f4692efb1cf91b3721a9046b872e1013d84",
"sha256": "1ynvj9p33w8zr05mirv4g15gl217rialqwqs9wxzsc8hb3f5wad3", "sha256": "0lfabx9b98qri6glj564nj2jkpy6shwmzhca9ivnbdwk08qbq5gc",
"type": "tarball", "type": "tarball",
"url": "https://github.com/pigpigyyy/MoonPlus/archive/acbfdb949bde46c0192719bbeffa8415f6976e1a.tar.gz", "url": "https://github.com/pigpigyyy/MoonPlus/archive/8de88f4692efb1cf91b3721a9046b872e1013d84.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"easy-dhall-nix": { "easy-dhall-nix": {
@ -35,18 +35,6 @@
"url": "https://github.com/nmattia/niv/archive/98c74a80934123cb4c3bf3314567f67311eb711a.tar.gz", "url": "https://github.com/nmattia/niv/archive/98c74a80934123cb4c3bf3314567f67311eb711a.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": {
"branch": "nixpkgs-unstable",
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs-channels",
"rev": "04d6123309fa5f89b436472d7b4fd418f8c3106f",
"sha256": "06755h2cxrsgrsiclxbk3h5d7yqajvjjq3y4pl1dqbxfbjhq0h67",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs-channels/archive/04d6123309fa5f89b436472d7b4fd418f8c3106f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"quickserv": { "quickserv": {
"ref": "master", "ref": "master",
"repo": "https://tulpa.dev/Xe/quickserv.git", "repo": "https://tulpa.dev/Xe/quickserv.git",
@ -59,10 +47,10 @@
"homepage": "https://godoc.org/golang.org/x/tools", "homepage": "https://godoc.org/golang.org/x/tools",
"owner": "golang", "owner": "golang",
"repo": "tools", "repo": "tools",
"rev": "204d844ad48d13a8a6db39aec90b837cce2e46d9", "rev": "4303120df7d88143fd0803f9144b4f47ad3ea9fb",
"sha256": "0h6qrp8g2di50d7hkhcb9xn6ckzh9hybwj9m2bqhgrq27lnd3hlk", "sha256": "1b21zi5bn7ccx52dr325qzma442q6bjhw59skajdarbaz8b3yw01",
"type": "tarball", "type": "tarball",
"url": "https://github.com/golang/tools/archive/204d844ad48d13a8a6db39aec90b837cce2e46d9.tar.gz", "url": "https://github.com/golang/tools/archive/4303120df7d88143fd0803f9144b4f47ad3ea9fb.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }

View File

@ -1,21 +0,0 @@
let
sources = import ./nix/sources.nix;
pkgs = import sources.nixpkgs { };
withPkg = pkgs.lib.callPackageWith pkgs;
dhall = withPkg sources.easy-dhall-nix { };
in code:
let
file = builtins.toFile "dhall-expr" code;
drv = pkgs.stdenv.mkDerivation {
name = "dhall-expr-as-nix";
buildCommand = ''
dhall-to-nix <<< "${file}" > $out
'';
buildInputs = [ dhall.dhall-nix-simple ];
};
in
import "${drv}"

View File

@ -1,4 +1,4 @@
{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs { } }: { pkgs ? import <nixpkgs> }:
attrs: attrs:
let let

View File

@ -1,4 +1,4 @@
{ sources ? import ../../nix/sources.nix, pkgs ? import sources.nixpkgs { } }: { sources ? import ../../nix/sources.nix, pkgs ? import <nixpkgs> { } }:
with pkgs; with pkgs;
let let
out = buildGoPackage { out = buildGoPackage {

View File

@ -1,4 +1,4 @@
{ sources ? import ../../nix/sources.nix, pkgs ? import sources.nixpkgs { } }: { sources ? import ../../nix/sources.nix, pkgs ? import <nixpkgs> {} }:
with pkgs; with pkgs;
let let
defaultAttrs = { defaultAttrs = {

View File

@ -1,6 +1,4 @@
{ sources ? import ../../nix/sources.nix { pkgs ? import <nixpkgs> { } }:
, pkgs ? import sources.nixpkgs { }
}:
with pkgs; with pkgs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openrgb"; pname = "openrgb";
@ -35,7 +33,8 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Open source RGB lighting control that doesn't depend on manufacturer software."; description =
"Open source RGB lighting control that doesn't depend on manufacturer software.";
maintainers = with maintainers; [ evanjs ]; maintainers = with maintainers; [ evanjs ];
longDescription = '' longDescription = ''
The goal of this project is to create an easy-to-use open source The goal of this project is to create an easy-to-use open source

View File

@ -1,4 +1,4 @@
{ sources ? import ./sources.nix, pkgs ? import sources.nixpkgs { } }: {pkgs ? import <nixpkgs> {}}:
version: shasums: version: shasums: