diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/libraries/mdds | |
parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mdds')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/mdds/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/mdds/default.upstream | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mdds/default.nix b/nixpkgs/pkgs/development/libraries/mdds/default.nix index 4ddd3b40d364..8ca137e66119 100644 --- a/nixpkgs/pkgs/development/libraries/mdds/default.nix +++ b/nixpkgs/pkgs/development/libraries/mdds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mdds"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OrM/zljmrPlUDMGlImS+aGPvgPVawocZTMmM2kjnH+Y="; + sha256 = "sha256-EyEfLy44fvO3TXOh3O5Soa1c4G34+OZkdnnfknijEWo="; }; postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/mdds/default.upstream b/nixpkgs/pkgs/development/libraries/mdds/default.upstream deleted file mode 100644 index 96c5bc35d169..000000000000 --- a/nixpkgs/pkgs/development/libraries/mdds/default.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url https://gitlab.com/mdds/mdds -version_link 'mdds-.*[.]tar[.][a-z0-9]+$' -version '.*-([0-9.]+)[.]tar[.].*' '\1' - -do_overwrite(){ - ensure_hash - ensure_version - set_var_value version $CURRENT_VERSION - set_var_value sha256 $CURRENT_HASH -} |