Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 804d272970f8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 962195d9777b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 9, 2019

  1. oxidized: fix gitcrypt dependencies

    Jan Hrnko committed Oct 9, 2019
    Copy the full SHA
    a3fe055 View commit details

  2. Merge pull request #70839 from 1000101/master 

    oxidized: fix git-crypt dependency
    @mmahut
    mmahut authored Oct 9, 2019
    Copy the full SHA
    962195d View commit details
Showing with 13 additions and 1 deletion.
  1. +2 −0 pkgs/tools/admin/oxidized/Gemfile.lock
  2. +11 −1 pkgs/tools/admin/oxidized/gemset.nix
2 changes: 2 additions & 0 deletions pkgs/tools/admin/oxidized/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ GEM
emk-sinatra-url-for (0.2.1)
sinatra (>= 0.9.1.1)
ffi (1.10.0)
git (1.5.0)
haml (5.0.4)
temple (>= 0.8.0)
tilt
@@ -17,6 +18,7 @@ GEM
net-telnet (0.1.1)
oxidized (0.26.3)
asetus (~> 0.1)
git (~> 1)
net-ssh (~> 5)
net-telnet (~> 0.1.1)
rugged (~> 0.21, >= 0.21.4)
12 changes: 11 additions & 1 deletion pkgs/tools/admin/oxidized/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,16 @@
};
version = "1.10.0";
};
git = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh";
type = "gem";
};
version = "1.5.0";
};
haml = {
dependencies = ["temple" "tilt"];
groups = ["default"];
@@ -112,7 +122,7 @@
version = "0.1.1";
};
oxidized = {
dependencies = ["asetus" "net-ssh" "net-telnet" "rugged" "slop"];
dependencies = ["asetus" "git" "net-ssh" "net-telnet" "rugged" "slop"];
groups = ["default"];
platforms = [];
source = {