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

Commits on Mar 12, 2018

  1. sambaMaster: 4.8.0_2018-01-25 -> 2018-03-09

    Luke Adams committed Mar 12, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    GPG key ID: D5C458DF6DD97EDF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    da45e8d View commit details

Commits on Mar 13, 2018

  1. Merge pull request #36874 from lukeadams/sambaMaster-update 

    sambaMaster: 4.8.0_2018-01-25 -> 2018-03-09
    @fpletz
    fpletz authored Mar 13, 2018
    Copy the full SHA
    b6990ed View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/servers/samba/master.nix
8 changes: 4 additions & 4 deletions pkgs/servers/samba/master.nix
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@
} :

(samba4.overrideAttrs(oldAttrs: rec {
name = "samba-master${version}";
version = "4.8.0_2018-01-25";
name = "samba-unstable-${version}";
version = "2018-03-09";

src = fetchFromGitHub {
owner = "samba-team";
repo = "samba";
rev = "849169a7b6ed0beb78bbddf25537521c1ed2f8e1";
sha256 = "1535w787cy1x5ia9arjrg6hhf926wi8wm9qj0k0jgydy3600zpbv";
rev = "9e954bcbf43d67a18ee55f84cda0b09028f96b92";
sha256 = "07j1pwm4kax6pq21gq9gpmp7dhj5afdyvkhgyl3yz334mb41q11g";
};

# Remove unnecessary install flags, same as <4.8 patch