Commit graph

256 commits

Author SHA1 Message Date
Eelco Dolstra 940d71c32d
Fix build 2020-07-08 13:25:30 +02:00
Eelco Dolstra 08e879c1fa
flake.lock: Update
Flake input changes:

* Updated 'nix': 'github:NixOS/nix/14a3a62bfca6c572b9a415cfa80cdbd7ad4326b3' -> 'github:NixOS/nix/1ab9da915422405452118ebb17b88cdfc90b1e10'
* Updated 'nix/nixpkgs': 'github:NixOS/nixpkgs/b88ff468e9850410070d4e0ccd68c7011f15b2be' -> 'github:NixOS/nixpkgs/70717a337f7ae4e486ba71a500367cad697e5f09'
* Updated 'nixpkgs': 'github:NixOS/nixpkgs/29eddfc36d720dcc4822581175217543b387b1e8' -> 'github:NixOS/nixpkgs/c9d124e39dbeefc53c7b3e09fbfc2c26bcbd4845'
2020-07-08 13:15:25 +02:00
Eelco Dolstra f3aa3bae4c
Fix build 2020-05-12 15:54:37 +02:00
Eelco Dolstra a37eefc59d
flake.lock: Update
Flake input changes:

* Updated 'nix': 'github:NixOS/nix/3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef' -> 'github:NixOS/nix/14a3a62bfca6c572b9a415cfa80cdbd7ad4326b3'
2020-05-12 15:54:37 +02:00
Graham Christensen 7a681103b2
Merge pull request #37 from NixOS/fixup-new-chan
curRelease: guard against missing channel
2020-04-12 21:40:26 -04:00
Graham Christensen 3e3304d0f7
curRelease: guard against missing channel 2020-04-12 21:38:18 -04:00
Rok Garbas ed29118df9
Merge pull request #36 from tilpner/mirror-store-paths
mirror: add redirection for store-paths.xz
2020-04-09 22:48:17 +02:00
tilpner 7fd06f9d8d
mirror: add redirection for store-paths.xz 2020-04-09 22:42:56 +02:00
Eelco Dolstra cd538a4286
Fix build 2020-04-09 17:28:32 +02:00
Eelco Dolstra 7ec2d94303
flake.lock: Update
Flake input changes:

* Updated 'nix': 'github:NixOS/nix/73769b28e376cf1fb3e7248bafaa17c35527925d' -> 'github:NixOS/nix/3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef'
* Updated 'nix/nixpkgs': 'github:edolstra/nixpkgs/43e283790fbe330b723ac44b584824cf6d85c1ee' -> 'github:NixOS/nixpkgs/b88ff468e9850410070d4e0ccd68c7011f15b2be'
* Updated 'nixpkgs': 'github:edolstra/nixpkgs/54a27fb2fc5fbd8927f9f6dc77fe1de1faa05266' -> 'github:NixOS/nixpkgs/29eddfc36d720dcc4822581175217543b387b1e8'
2020-04-09 17:27:41 +02:00
Eelco Dolstra 73cf003ecc Fix dependency on nixos-channel-native-programs 2020-03-26 08:24:46 +01:00
Samuel Dionne-Riel 3cd3da04a1 mirror: Add content-type and content-encoding for .json.br 2020-03-25 15:40:00 -04:00
Samuel Dionne-Riel 7d46561471 mirror: Add redirects for json data files 2020-03-25 14:20:05 -04:00
Samuel Dionne-Riel 51104d8cde mirror: Use shell-free calls when possible
Passing a list of parameters to `system` automatically gives us peace of
mind with regards to shell escaping. This is because it will not rely on
a shell invocation to run the given parameters, but directly exec to it.

The left-over shell invocations all use redirection.
2020-03-24 22:29:10 -04:00
Samuel Dionne-Riel 0568ef3c4a mirror: Download packages.json.br and options.json.br 2020-03-24 22:24:29 -04:00
Samuel Dionne-Riel badde7c674 mirror: allow downloadFile to select a specific product 2020-03-24 22:24:11 -04:00
Samuel Dionne-Riel 13154f8e86 mirror: Convert all system use to run* 2020-03-24 20:05:59 -04:00
Samuel Dionne-Riel 877e989376 mirror: Cosmetic change to the release info output 2020-03-24 19:59:57 -04:00
Samuel Dionne-Riel 84c6a24dac mirror: Add dry-run mode to better test script 2020-03-24 19:59:50 -04:00
Samuel Dionne-Riel f5d04ea038 mirror: Use experimental "nix-command" feature. 2020-03-24 19:59:45 -04:00
Samuel Dionne-Riel ab952e5863 mirror: Introduce two functions for running commands
They are thin wrappers over `system`, but two main points:

 * They log the (unescaped) command.
 * `run` will auto-die.

This removes the need to pepper `== 0 or die` in the script.
2020-03-24 19:59:39 -04:00
Samuel Dionne-Riel f4d04077c6 Split native programs build from the main build for shell use
This way, we can fully run the mirror script in dry-run mode.
2020-03-24 19:59:30 -04:00
Samuel Dionne-Riel 55d80937ca Add flake-compat default.nix/shell.nix
Let's keep this repository as accessible to contributors as possible!
2020-03-24 19:59:10 -04:00
Samuel Dionne-Riel 9d6f0ceb77 Add .gitignore for result 2020-03-24 19:58:47 -04:00
Eelco Dolstra 10188a5679
Fix OVA redirects 2020-03-20 09:52:04 +01:00
Eelco Dolstra 6ba4a48263 Quick hack to fix status.nixos.org 2020-03-17 13:21:57 +01:00
Eelco Dolstra faa521b194 Fix redirects 2020-03-10 15:22:54 +01:00
Eelco Dolstra a55fc2149d Merge branch 'redirect-more' of https://github.com/garbas/nixos-channel-scripts 2020-03-10 13:50:04 +01:00
Rok Garbas 4d53dba964
wrong content 2020-03-10 12:52:59 +01:00
Rok Garbas 15ff4aff86
added error handling 2020-03-10 12:52:09 +01:00
Rok Garbas 0893b43140
channelsDir -> channelName 2020-03-10 12:51:19 +01:00
Rok Garbas a8671842d9
channelsDir -> channelName 2020-03-10 12:49:52 +01:00
Rok Garbas 1729eb92c8
remove not needed lines 2020-03-10 12:48:11 +01:00
Eelco Dolstra a49451a4f9 flake.lock: Update
Flake input changes:

* Added 'nix': 'github:NixOS/nix/73769b28e376cf1fb3e7248bafaa17c35527925d'
* Added 'nix/nixpkgs': 'github:edolstra/nixpkgs/43e283790fbe330b723ac44b584824cf6d85c1ee'
* Added 'nixpkgs': 'github:edolstra/nixpkgs/54a27fb2fc5fbd8927f9f6dc77fe1de1faa05266'
2020-03-10 12:18:59 +01:00
Rok Garbas a3e79347be
my poor attempt at perl 2020-03-10 12:15:53 +01:00
Eelco Dolstra e6183b61ac
Merge pull request #33 from garbas/push-channels-to-s3-bucket
Push channels to s3 bucket (fix)
2020-03-06 11:23:10 +01:00
Rok Garbas 0ec4463dbd
fixing copy paste typo 2020-03-06 10:32:44 +01:00
Rok Garbas a055dc2cdc
fix a typo and also add redirect for $channel/nixexprs.tar.xz 2020-03-06 10:24:35 +01:00
Eelco Dolstra abb56de99f
Merge pull request #32 from garbas/push-channels-to-s3-bucket
Push channels to s3 bucket
2020-03-05 21:57:09 +01:00
Rok Garbas 3ef68861db
Push channels to s3://nix-channels bucket 2020-03-05 21:48:33 +01:00
Rok Garbas d1fb4bf67a
Upload channels artifacts (or links to those artifacts) to download.nixos.org
This will enable us to move nixos.org website to other location as
described in nixos/nixos-homepage#326
2020-02-17 13:16:22 +01:00
Eelco Dolstra a04700b949
Merge pull request #25 from worldofpeace/plasma5-rename
rename iso_graphical to iso_plasma5
2020-01-30 14:32:42 +01:00
worldofpeace 751409599d rename iso_graphical to iso_plasma5 2020-01-30 08:28:20 -05:00
Eelco Dolstra 91f79b69a3
Fix adding nix to $PATH 2020-01-03 16:13:08 +01:00
Graham Christensen 579cbfc508
Merge pull request #31 from samueldr/fix/2020-01-02-mirror-issue-2
mirror-branch: Always exit with 1 on nix-instantiate error
2020-01-02 22:08:31 -05:00
Samuel Dionne-Riel c4a61dfe8a mirror-branch: Always exit with 1 on nix-instantiate error
Resolving the values and being fancy is harder than the actual benefits
would give out.

Return all the info we have, and let the pager'd person deal with the
data.
2020-01-02 22:04:43 -05:00
Graham Christensen 5146d2cb25
Merge pull request #30 from samueldr/fix/2020-01-02-mirror-issue
mirror-branch: Bails when failing to run nix-instantiate
2020-01-02 21:24:53 -05:00
Samuel Dionne-Riel cac10f5360 mirror-branch: Bails when failing to run nix-instantiate
A more durable solution would likely be to make a generic function that
wraps backticks and fails when $? is non-zero, rather than doing it
in-situ. There are other backtick uses that may be problematic
2020-01-02 21:19:58 -05:00
Eelco Dolstra 059ee08f5c Use nix-master 2019-12-30 21:51:21 +01:00
Eelco Dolstra aec148383a Convert to flake 2019-12-30 21:34:49 +01:00