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: 3c18afa091b7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6d6d93c8decc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 9, 2018

  1. dislocker: 0.6.1 -> 0.7.1

    @xeji
    xeji committed Mar 9, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2d70431 View commit details

Commits on Mar 12, 2018

  1. Merge pull request #36694 from xeji/dislocker 

    dislocker: 0.6.1 -> 0.7.1
    @fpletz
    fpletz authored Mar 12, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6d6d93c View commit details
Showing with 2 additions and 17 deletions.
  1. +0 −13 pkgs/tools/filesystems/dislocker/cmake_dirfix.patch
  2. +2 −4 pkgs/tools/filesystems/dislocker/default.nix
13 changes: 0 additions & 13 deletions pkgs/tools/filesystems/dislocker/cmake_dirfix.patch
View file

This file was deleted.

6 changes: 2 additions & 4 deletions pkgs/tools/filesystems/dislocker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
}:
with stdenv.lib;
let
version = "0.6.1";
version = "0.7.1";
in
stdenv.mkDerivation rec {
name = "dislocker-${version}";
@@ -13,13 +13,11 @@ stdenv.mkDerivation rec {
owner = "aorimn";
repo = "dislocker";
rev = "v${version}";
sha256 = "1s2pvsf4jgzxk9d9m2ik7v7g81lvj8mhmhh7f53vwy0vmihf9h0d";
sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb";
};

buildInputs = [ cmake fuse polarssl ];

patches = [ ./cmake_dirfix.patch ];

meta = {
description = "Read BitLocker encrypted partitions in Linux";
homepage = https://github.com/aorimn/dislocker;