From 1a64deeb894dc95e2645a75771732c6cc53a79ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 01:35:06 +0200 Subject: Squash changes containing private information There were a lot of changes since the previous commit, but a lot of them contained personnal information about users. All thos changes got stashed into a single commit (history is kept in a different place) and private information was moved in a separate private repository --- nix/README.md | 2 - nix/sources.json | 209 ------------------------------------------------------- nix/sources.nix | 135 ----------------------------------- 3 files changed, 346 deletions(-) delete mode 100644 nix/README.md delete mode 100644 nix/sources.json delete mode 100644 nix/sources.nix (limited to 'nix') diff --git a/nix/README.md b/nix/README.md deleted file mode 100644 index 7bf996c..0000000 --- a/nix/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This directory is handled by niv, but it prefers to have a directory -named "nix" diff --git a/nix/sources.json b/nix/sources.json deleted file mode 100644 index 1a1cf5a..0000000 --- a/nix/sources.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "buildbot-cours-deps": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Cours", - "rev": "33f139f2e2ea0a16b8ed813c5436e5a5bb506f6d", - "type": "git" - }, - "buildbot-cours-nixpkgs": { - "branch": "nixos-unstable", - "description": "Frozen nixpkgs snapshot for texlive", - "homepage": "https://github.com/NixOS/nixpkgs", - "owner": "NixOS", - "repo": "nixpkgs-channels", - "rev": "fce7562cf46727fdaf801b232116bc9ce0512049", - "sha256": "14rvi69ji61x3z88vbn17rg5vxrnw2wbnanxb7y0qzyqrj7spapx", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "buildbot-denise-aventuriers-nixpkgs": { - "branch": "nixos-unstable", - "description": "Frozen nixpkgs snapshot for texlive", - "homepage": "https://github.com/NixOS/nixpkgs", - "owner": "NixOS", - "repo": "nixpkgs-channels", - "rev": "8e2b14aceb1d40c7e8b84c03a7c78955359872bb", - "sha256": "0zzjpd9smr7rxzrdf6raw9kbj42fbvafxb5bz36lcxgv290pgsm8", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/8e2b14aceb1d40c7e8b84c03a7c78955359872bb.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "buildbot-history-deps": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/History", - "rev": "5f2aae4f9c92107accfc6fb6db6cb3c1f97ed9dc", - "type": "git" - }, - "buildbot-normalesup-deps": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Sites/Normalesup", - "rev": "de294da4027e80a7b8bf7ec8c393ca0b60218575", - "type": "git" - }, - "buildbot-normalesup-nixpkgs": { - "description": "Frozen nixpkgs snapshot for texlive", - "revision": "173017.85f820d6e41", - "sha256": "0fs390gvz8d3n7v4zj538gf3n1b14sikbf0ijrxgxib5i0704mdb", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173017.85f820d6e41/nixexprs.tar.xz", - "url_template": "https://releases.nixos.org/nixos//nixos-./nixexprs.tar.xz", - "version": "19.03" - }, - "buildbot-plugin-buildslist": { - "ref": "master", - "repo": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist", - "rev": "fb8641f2badcec9f232cc5f727009911fc1c89b0", - "type": "git", - "version": "f1d42ba-master" - }, - "home-manager": { - "branch": "master", - "description": "Manage a user environment using Nix", - "homepage": "https://rycee.gitlab.io/home-manager/", - "owner": "rycee", - "repo": "home-manager", - "rev": "6cf6b587b575493e7718bf08b209013d7dcf4d58", - "sha256": "0666ayxazbphjn5xcrczv8m7k2q62k224fvf0kz1lx9qjn93wkvr", - "type": "tarball", - "url": "https://github.com/rycee/home-manager/archive/6cf6b587b575493e7718bf08b209013d7dcf4d58.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "niv": { - "branch": "master", - "description": "Easy dependency management for Nix projects", - "homepage": "https://github.com/nmattia/niv", - "owner": "nmattia", - "repo": "niv", - "rev": "372f96bff217a7a019de27667d04118cffa9841b", - "sha256": "1l0z6162zw60pdcdj03aq64qgf1vyzmf24i9pxca64i4sprl1b7p", - "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/372f96bff217a7a019de27667d04118cffa9841b.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs": { - "branch": "nixos-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": "fce7562cf46727fdaf801b232116bc9ce0512049", - "sha256": "14rvi69ji61x3z88vbn17rg5vxrnw2wbnanxb7y0qzyqrj7spapx", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs-home-manager": { - "branch": "nixos-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": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38", - "sha256": "1ak7jqx94fjhc68xh1lh35kh3w3ndbadprrb762qgvcfb8351x8v", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs-nix": { - "branch": "nixos-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", - "rev": "891f607d5301d6730cb1f9dcf3618bcb1ab7f10e", - "sha256": "1cr39f0sbr0h5d83dv1q34mcpwnkwwbdk5fqlyqp2mnxghzwssng", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/891f607d5301d6730cb1f9dcf3618bcb1ab7f10e.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs-nixops": { - "branch": "nixos-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": "840c782d507d60aaa49aa9e3f6d0b0e780912742", - "sha256": "14q3kvnmgz19pgwyq52gxx0cs90ddf24pnplmq33pdddbb6c51zn", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/840c782d507d60aaa49aa9e3f6d0b0e780912742.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "webapps-landing": { - "ref": "gitolite_local/local_changes", - "repo": "https://git.immae.eu/github/bastienwirtz/homer.git", - "rev": "bb60c5b869931f305f15c5bfa9cdb3f68702f01f", - "type": "git", - "version": "e0a72b7-local" - }, - "webapps-surfer": { - "ref": "master", - "repo": "https://git.immae.eu/perso/Immae/Projets/Nodejs/Surfer.git", - "rev": "476177380452c9c7c5b1624805feedc824c5995e", - "type": "git", - "version": "4761773-master" - }, - "webapps-ttrss": { - "ref": "master", - "repo": "https://git.tt-rss.org/fox/tt-rss.git", - "rev": "986ca251f995f7754a0470d3e0c44538a545081f", - "type": "git", - "version": "986ca25-master" - }, - "websites-chloe-app": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe", - "rev": "882f166999a59081ad896f26318e6a04db9f9f43", - "type": "git", - "version": "882f166-master" - }, - "websites-connexionswing-app": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing", - "rev": "ed5874396d35766e0810a6d4e78e1a8f6b170835", - "type": "git", - "version": "ed58743-master" - }, - "websites-florian-app": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo", - "rev": "1793d5c7912d1b20ad1df1ac59be9d7f1220e919", - "type": "git", - "version": "1793d5c-master" - }, - "websites-isabelle-aten": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten", - "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae", - "type": "git", - "version": "b99537f-master" - }, - "websites-isabelle-iridologie": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie", - "rev": "2f2ec6b003f4de97e9f8651db540c9114ac877c2", - "type": "git", - "version": "2f2ec6b-master" - }, - "websites-ludivine-app": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine", - "rev": "eae633b7c5e92184b24141ebf267d51dbc5d2acc", - "type": "git", - "version": "0dacc32-master" - }, - "websites-piedsjaloux-app": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite", - "rev": "2b67b9897180af3d34f87648362337dbf3981158", - "type": "git", - "version": "2b67b98-master" - }, - "websites-richie-app": { - "ref": "master", - "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie", - "rev": "2a09e29dd9fc4f6abc5add82744bedf1978a35d5", - "type": "git", - "version": "2a09e29-master" - } -} diff --git a/nix/sources.nix b/nix/sources.nix deleted file mode 100644 index 45c97d1..0000000 --- a/nix/sources.nix +++ /dev/null @@ -1,135 +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: name: spec: - let - ok = str: ! builtins.isNull (builtins.match "[a-zA-Z0-9+-._?=]" str); - # sanitize the name, though nix will still fail if name starts with period - name' = stringAsChars (x: if ! ok x then "-" else x) "${name}-src"; - in - if spec.builtin or true then - builtins_fetchTarball { name = name'; inherit (spec) url sha256; } - else - pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; - - fetch_git = spec: - builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; }; - - fetch_builtin-tarball = name: throw - ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=tarball -a builtin=true''; - - fetch_builtin-url = name: throw - ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=file -a builtin=true''; - - # - # 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 name spec - else if spec.type == "git" then fetch_git spec - else if spec.type == "builtin-tarball" then fetch_builtin-tarball name - else if spec.type == "builtin-url" then fetch_builtin-url name - 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)) - ); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 - range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 - stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 - stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); - concatStrings = builtins.concatStringsSep ""; - - # fetchTarball version that is compatible between all the versions of Nix - builtins_fetchTarball = { url, name, sha256 }@attrs: - let - inherit (builtins) lessThan nixVersion fetchTarball; - in - if lessThan nixVersion "1.12" then - fetchTarball { inherit name 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); } -- cgit v1.2.3