From cda712cdf320952b74dfe1ebbaead62fda026e89 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 20 Jul 2023 20:57:19 +1000 Subject: [PATCH] nix: remove niv --- nix/sources.json | 107 ----------------------------------- nix/sources.nix | 141 ----------------------------------------------- 2 files changed, 248 deletions(-) delete mode 100644 nix/sources.json delete mode 100644 nix/sources.nix diff --git a/nix/sources.json b/nix/sources.json deleted file mode 100644 index de58cc7..0000000 --- a/nix/sources.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "cardano-node": { - "branch": "refs/tags/1.35.7", - "description": "The core component that is used to participate in a Cardano decentralised blockchain.", - "homepage": "https://cardano.org", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "f0b4ac897dcbefba9fa0d247b204a24543cf55f6", - "sha256": "0s2jkj4mwl03hxg4ff9kyw41s32xbf31rnhag2m1qrglgsh8wzw9", - "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/f0b4ac897dcbefba9fa0d247b204a24543cf55f6.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "daedalus": { - "branch": "release/5.2.0", - "description": "The open source cryptocurrency wallet for ada, built to grow with the community", - "homepage": "https://daedaluswallet.io/", - "owner": "input-output-hk", - "repo": "daedalus", - "rev": "2990f5a44189097b3de2e7e7a19caa8062a8ae7b", - "sha256": "1w2w7qfashbqimcywzvhh0z5jrlfaja04sgi6p5hp08adwad6r92", - "type": "tarball", - "url": "https://github.com/input-output-hk/daedalus/archive/2990f5a44189097b3de2e7e7a19caa8062a8ae7b.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "iohk-nix": { - "branch": "master", - "description": "nix scripts shared across projects", - "homepage": null, - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "df1da282f996ec46b33379407df99613a1fbafdd", - "sha256": "0vpcyrswxkynn2q37qsrhvf62whk2ijpcwqnamxcchcq6lwfpn0l", - "type": "tarball", - "url": "https://github.com/input-output-hk/iohk-nix/archive/df1da282f996ec46b33379407df99613a1fbafdd.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "mcwhirter-io": { - "branch": "nixos-23.11", - "rev": "2ca0244e2ff130ca851bb2487b03b606b701286a", - "sha256": "1alh4z2qpnh1wv3mclnmh8f3cqnks4h6hcrq1kwl5xz4xs2pc1ss", - "type": "tarball", - "url": "https://reciproka.dev/sercanto/mcwhirter.io/archive/2ca0244e2ff130ca851bb2487b03b606b701286a.tar.gz", - "url_template": "https://reciproka.dev/sercanto/mcwhirter.io/archive/.tar.gz" - }, - "niv": { - "branch": "master", - "description": "Easy dependency management for Nix projects", - "homepage": "https://github.com/nmattia/niv", - "owner": "nmattia", - "repo": "niv", - "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41", - "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7", - "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixos-23.05": { - "branch": "nixos-23.05", - "description": "Nix Packages collection & NixOS", - "homepage": "", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "sha256": "05cbl1k193c9la9xhlz4y6y8ijpb2mkaqrab30zij6z4kqgclsrd", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/70bdadeb94ffc8806c0570eb5c2695ad29f0e421.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixos2111": { - "branch": "nixos-21.11", - "description": "Nix Packages collection", - "homepage": "", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "63198c9ccefdbd337cef0d85db0ea2689f4ce418", - "sha256": "05gc6xyv8a2dppngm1q44j85j769lr90lg20s6jv62gfg344i50r", - "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/63198c9ccefdbd337cef0d85db0ea2689f4ce418.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs": { - "branch": "nixos-24.05", - "builtin": false, - "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", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", - "sha256": "1qwbrn2cb1x9clkhqmdnx5r8v11168p3nx14h3r9wcml0bgblpvr", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6e99f2a27d600612004fbd2c3282d614bfee6421.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgsUnstable": { - "branch": "nixos-unstable", - "description": "Nix Packages collection", - "homepage": "", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", - "sha256": "1dmng7f5rv4hgd0b61chqx589ra7jajsrzw21n8gp8makw5khvb2", - "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/12228ff1752d7b7624a54e9c1af4b222b3c1073b.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - } -} diff --git a/nix/sources.nix b/nix/sources.nix deleted file mode 100644 index fae06a4..0000000 --- a/nix/sources.nix +++ /dev/null @@ -1,141 +0,0 @@ -# This file has been generated by Niv. -let - # - # The fetchers. fetch_ fetches specs of type . - # - fetch_file = pkgs: spec: - if spec.builtin or true - then builtins_fetchurl {inherit (spec) url sha256;} - else pkgs.fetchurl {inherit (spec) url sha256;}; - - fetch_tarball = pkgs: spec: - if spec.builtin or true - then builtins_fetchTarball {inherit (spec) url sha256;} - else pkgs.fetchzip {inherit (spec) url sha256;}; - - fetch_git = spec: - builtins.fetchGit { - url = spec.repo; - inherit (spec) rev ref; - }; - - fetch_builtin-tarball = spec: - builtins.trace '' - WARNING: - The niv type "builtin-tarball" will soon be deprecated. You should - instead use `builtin = true`. - - $ niv modify -a type=tarball -a builtin=true - '' - builtins_fetchTarball {inherit (spec) url sha256;}; - - fetch_builtin-url = spec: - builtins.trace '' - WARNING: - The niv type "builtin-url" will soon be deprecated. You should - instead use `builtin = true`. - - $ niv modify -a type=file -a builtin=true - '' (builtins_fetchurl {inherit (spec) url sha256;}); - - # - # Various helpers - # - - # The set of packages used when specs are fetched using non-builtins. - mkPkgs = sources: let - sourcesNixpkgs = - import (builtins_fetchTarball {inherit (sources.nixpkgs) url sha256;}) - {}; - hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; - hasThisAsNixpkgsPath = == ./.; - in - if builtins.hasAttr "nixpkgs" sources - then sourcesNixpkgs - else if hasNixpkgsPath && !hasThisAsNixpkgsPath - then import {} - else - abort '' - Please specify either (through -I or NIX_PATH=nixpkgs=...) or - add a package called "nixpkgs" to your sources.json. - ''; - - # The actual fetching function. - fetch = pkgs: name: spec: - if !builtins.hasAttr "type" spec - then abort "ERROR: niv spec ${name} does not have a 'type' attribute" - else if spec.type == "file" - then fetch_file pkgs spec - else if spec.type == "tarball" - then fetch_tarball pkgs spec - else if spec.type == "git" - then fetch_git spec - else if spec.type == "builtin-tarball" - then fetch_builtin-tarball spec - else if spec.type == "builtin-url" - then fetch_builtin-url spec - else - abort - "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; - - # Ports of functions for older nix versions - - # a Nix version of mapAttrs if the built-in doesn't exist - mapAttrs = - builtins.mapAttrs - or (f: set: - with builtins; - listToAttrs (map (attr: { - name = attr; - value = f attr set.${attr}; - }) (attrNames set))); - - # fetchTarball version that is compatible between all the versions of Nix - builtins_fetchTarball = { - url, - sha256, - } @ attrs: let - inherit (builtins) lessThan nixVersion fetchTarball; - in - if lessThan nixVersion "1.12" - then fetchTarball {inherit url;} - else fetchTarball attrs; - - # fetchurl version that is compatible between all the versions of Nix - builtins_fetchurl = { - url, - sha256, - } @ attrs: let - inherit (builtins) lessThan nixVersion fetchurl; - in - if lessThan nixVersion "1.12" - then fetchurl {inherit url;} - else fetchurl attrs; - - # Create the final "sources" from the config - mkSources = config: - mapAttrs (name: spec: - if builtins.hasAttr "outPath" spec - then - abort - "The values in sources.json should not have an 'outPath' attribute" - else spec // {outPath = fetch config.pkgs name spec;}) - config.sources; - - # The "config" used by the fetchers - mkConfig = { - sourcesFile ? ./sources.json, - sources ? builtins.fromJSON (builtins.readFile sourcesFile), - pkgs ? mkPkgs sources, - }: rec { - # The sources, i.e. the attribute set of spec name to spec - inherit sources; - - # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers - inherit pkgs; - }; -in - mkSources (mkConfig {}) - // { - __functor = _: settings: mkSources (mkConfig settings); - }