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

Commits on Mar 15, 2018

  1. st: 0.7 -> 0.8

    @Ekleog
    Ekleog committed Mar 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ce6e336 View commit details

Commits on Mar 17, 2018

  1. Merge pull request #37105 from Ekleog/st-0.8 

    st: 0.7 -> 0.8
    @gebner
    gebner authored Mar 17, 2018
    Copy the full SHA
    fe8c36a View commit details
Showing with 3 additions and 18 deletions.
  1. +3 −3 pkgs/applications/misc/st/default.nix
  2. +0 −15 pkgs/applications/misc/st/st-fix-deletekey.patch
6 changes: 3 additions & 3 deletions pkgs/applications/misc/st/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,14 +5,14 @@ with stdenv.lib;

let patches' = if patches == null then [] else patches;
in stdenv.mkDerivation rec {
name = "st-0.7";
name = "st-0.8";

src = fetchurl {
url = "http://dl.suckless.org/st/${name}.tar.gz";
sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000";
sha256 = "0xkmb7f1qq01ny1667c7bkf2zi3h4ryc6zpml22ccrkxs0h3jdbp";
};

patches = patches' ++ [ ./st-fix-deletekey.patch ];
patches = patches';

configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
15 changes: 0 additions & 15 deletions pkgs/applications/misc/st/st-fix-deletekey.patch
View file

This file was deleted.