Skip to content

update all nixpgs to 21.11 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavHau wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update all nixpgs to 21.11 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nix-portable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "build and test"
on:
pull_request:
push:
branches: [ "*" ]
branches: [ "ci", "master" ]
jobs:


Expand Down
16 changes: 0 additions & 16 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

nixpkgs.url = "nixpkgs/nixos-21.11";

# the nixpkgs version shipped with the nix-portable executable
# TODO: find out why updating this leads to error when building pkgs.hello:
# Error: checking whether build environment is sane... ls: cannot access './configure': No such file or directory
defaultChannel.url = "nixpkgs/nixos-20.09";

nix.url = "nix/2.5.1";
nix.inputs.nixpkgs.follows = "nixpkgs";
};
Expand Down Expand Up @@ -103,7 +98,6 @@

nixPortableForSystem = { system, crossSystem ? null, }:
let
pkgsDefaultChannel = import inp.defaultChannel { inherit system crossSystem; };
pkgs = import inp.nixpkgs { inherit system crossSystem; };
pkgsCached = if crossSystem == null then pkgs else import inp.nixpkgs { system = crossSystem; };

Expand All @@ -114,12 +108,10 @@
# crashes if nixpkgs updated: error: executing 'git': No such file or directory
pkgs.callPackage ./default.nix {

inherit proot;

pkgs = pkgsDefaultChannel;
inherit proot pkgs;

lib = inp.nixpkgs.lib;
compression = "zstd -3 -T1";
compression = "zstd -18 -T0";

nix = inp.nix.packages."${system}".nix;

Expand Down