Skip to content

Commit

Permalink
Working on bumping channels, only 9 failures now
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasjm committed Jul 11, 2024
1 parent 3db7785 commit 60deddb
Show file tree
Hide file tree
Showing 19 changed files with 95 additions and 339 deletions.
2 changes: 1 addition & 1 deletion .aliases/update-default-nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ for input in nixpkgs nixpkgs-unstable nixpkgs-master; do
echo "Got ${input} rev: $rev"
echo "Got ${input} hash: $hash"
sed -i "s/rev = \".*\"; # ${input}-rev/rev = \"$rev\"; # ${input}-rev/g" ./default.nix
sed -i "s/sha256 = \".*\"; # ${input}-sha256/sha256 = \"$hash\"; # ${input}-sha256/g" ./default.nix
sed -i "s/hash = \".*\"; # ${input}-sha256/hash = \"$hash\"; # ${input}-sha256/g" ./default.nix
done
2 changes: 1 addition & 1 deletion codedown.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ let
};
})
(callPackage ./languages/r {})
(callPackage ./languages/ruby {})
(pkgsMaster.callPackage ./languages/ruby {})
(pkgsMaster.callPackage ./languages/rust {})
];

Expand Down
12 changes: 6 additions & 6 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ let
pkgsStable = import (fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "c6149db25c6ca2d606c5f2425a08f458e7f0123b"; # nixpkgs-rev
sha256 = "sha256-AYZLTctK+w2Xh/BXl5fm7DOecq7rnsfL+UAWbI0VXyw="; # nixpkgs-sha256
rev = "de429c2a20520e0f81a1fd9d2677686a68cae739"; # nixpkgs-rev
hash = "sha256-D2YTs7K33zAzoQdAcVzePgDn6bdIEexGgHluoB07+Yw="; # nixpkgs-sha256
}) { inherit overlays; };

pkgsUnstable = import (fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f"; # nixpkgs-unstable-rev
sha256 = "sha256-FBVpEX0eLiqX3jnSL3rmJHqHhbuCikJZyDyV3Cl3qAY="; # nixpkgs-unstable-sha256
rev = "ab82a9612aa45284d4adf69ee81871a389669a9e"; # nixpkgs-unstable-rev
hash = "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ="; # nixpkgs-unstable-sha256
}) { inherit overlays; };

pkgsMaster = import (fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "a9f70e6bba466a6db6f0e5689608bf76c1e126c2"; # nixpkgs-master-rev
sha256 = "sha256-y6v4t6UZMjwbDU5QMgHQEkb5jAFu1V0KUHVoeSSXUik="; # nixpkgs-master-sha256
rev = "05bbf675397d5366259409139039af8077d695ce"; # nixpkgs-master-rev
hash = "sha256-IE7PZn9bSjxI4/MugjAEx49oPoxu0uKXdfC+X7HcRuQ="; # nixpkgs-master-sha256
}) { inherit overlays; };

in
Expand Down
20 changes: 10 additions & 10 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
description = "CodeDown languages";

inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.nixpkgs-master.url = "github:NixOS/nixpkgs/master";

Expand Down
4 changes: 1 addition & 3 deletions languages/bash/kernel.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
let
common = callPackage ../common.nix {};

python = python3.withPackages (ps: [
(ps.bash_kernel.override { bash = bashInteractive; })
]);
python = python3.withPackages (ps: [ps.bash_kernel]);

in

Expand Down
168 changes: 0 additions & 168 deletions languages/cpp/cling/default.nix

This file was deleted.

24 changes: 0 additions & 24 deletions languages/cpp/cling/fix-llvm-dylib-usage.patch

This file was deleted.

27 changes: 0 additions & 27 deletions languages/cpp/cling/fix-llvm-include.patch

This file was deleted.

16 changes: 0 additions & 16 deletions languages/cpp/cling/force-install-cling-targets.patch

This file was deleted.

13 changes: 0 additions & 13 deletions languages/cpp/cling/no-clang-cpp.patch

This file was deleted.

Loading

0 comments on commit 60deddb

Please sign in to comment.