Skip to content

Commit 71135ba

Browse files
committed
Merge #180: chore(deps): upgrade jquery
dd95195 chore(deps): upgrade jquery (Byron Hambly) 29ed91f deps: provide a Nix flake dev shell (Byron Hambly) Pull request description: Upgrades old jquery, and adds a Nix flake dev shell ACKs for top commit: delta1: ACK dd95195; tested locally Tree-SHA512: 9b240c09114a13297ad169085d8e12c0b83b800809c173956535f251a53a347c7c28b46d1c79cad62cead9782dc12eeebbe8f5e4ca71262f54a9812cb369993f
2 parents 6a54f2c + dd95195 commit 71135ba

6 files changed

Lines changed: 66 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
_site
22
Gemfile.lock
33
.directory
4+
.bundle

_includes/head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{%- seo -%}
66
<link href='{{ "/assets/open-sans.css" | relative_url }}' rel='stylesheet' type='text/css'>
77
<link rel="stylesheet" href="{{ "/assets/bootstrap-v3.3.7.min.css" | relative_url }}">
8-
<script src="{{ "/assets/jquery-v3.3.1.min.js" | relative_url }}"></script>
8+
<script src="{{ "/assets/jquery-v3.7.1.min.js" | relative_url }}"></script>
99
<script src="{{ "/assets/bootstrap-v3.3.7.min.js" | reltive_url }}"></script>
1010
<link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
1111
{%- feed_meta -%}

assets/jquery-v3.3.1.min.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

assets/jquery-v3.7.1.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.lock

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
description = "elementsproject.org Jekyll site";
3+
4+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
5+
6+
outputs = { self, nixpkgs }:
7+
let
8+
systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
9+
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f nixpkgs.legacyPackages.${system});
10+
in {
11+
devShells = forAllSystems (pkgs: {
12+
default = pkgs.mkShell {
13+
packages = with pkgs; [
14+
ruby_3_3
15+
bundler
16+
libxml2
17+
libxslt
18+
zlib
19+
openssl
20+
gnumake
21+
gcc
22+
pkg-config
23+
];
24+
25+
shellHook = ''
26+
export BUNDLE_PATH="$PWD/.bundle"
27+
export GEM_HOME="$PWD/.gems"
28+
export PATH="$GEM_HOME/bin:$PATH"
29+
export NOKOGIRI_USE_SYSTEM_LIBRARIES=true
30+
bundle config set --local path '.bundle'
31+
'';
32+
};
33+
});
34+
};
35+
}

0 commit comments

Comments
 (0)